From 62643d7d5e3d94660fe5085b7d5b5c70194f85a9 Mon Sep 17 00:00:00 2001 From: Andreas Preikschat Date: Sat, 11 Dec 2010 10:40:52 +0100 Subject: [PATCH] string change, close file, MarkType --- openlp/plugins/songs/lib/songbeamerimport.py | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/openlp/plugins/songs/lib/songbeamerimport.py b/openlp/plugins/songs/lib/songbeamerimport.py index 4980c2cff..30d29c1be 100644 --- a/openlp/plugins/songs/lib/songbeamerimport.py +++ b/openlp/plugins/songs/lib/songbeamerimport.py @@ -32,6 +32,7 @@ import os import chardet import codecs +from openlp.core.lib import translate from openlp.plugins.songs.lib.songimport import SongImport log = logging.getLogger(__name__) @@ -54,7 +55,8 @@ class SongBeamerTypes(object): u'Pre-Bridge': u'O', u'Pre-Coda': u'O', u'Unbekannt': u'O', - u'Unknown': u'O' + u'Unknown': u'O', + u'Unbenannt': u'O' } @@ -100,6 +102,7 @@ class SongBeamerImport(SongImport): detect_file.close() infile = codecs.open(file, u'r', details['encoding']) self.songData = infile.readlines() + infile.close() else: return False for line in self.songData: @@ -127,8 +130,9 @@ class SongBeamerImport(SongImport): self.replace_html_tags() self.add_verse(self.current_verse, self.current_verse_type) self.finish() - self.import_wizard.incrementProgressBar( - "Importing %s" % (self.file_name)) + self.import_wizard.incrementProgressBar(u'%s %s...' % + (translate('SongsPlugin.SongBeamerImport', 'Importing'), + self.file_name)) return True def replace_html_tags(self): @@ -263,6 +267,9 @@ class SongBeamerImport(SongImport): pass elif tag_val[0] == u'#Version': pass + elif tag_val[0] == u'#VerseOrder': + # TODO: add the verse order. + pass def check_verse_marks(self, line): """