openlp-core team mailing list archive

[Andreas Preikschat <andreaspreikschat@xxxxxxxxxx>]

Andreas Preikschat has proposed merging lp:~googol/openlp/ticket-299 into lp:openlp.

Requested reviews:
  OpenLP Core (openlp-core)

For more details, see:
https://code.launchpad.net/~googol/openlp/ticket-299/+merge/79500

Hello,

- fixed ticket 299

http://support.openlp.org/issues/299
-- 
https://code.launchpad.net/~googol/openlp/ticket-299/+merge/79500
Your team OpenLP Core is requested to review the proposed merge of lp:~googol/openlp/ticket-299 into lp:openlp.

=== modified file 'openlp/plugins/songs/lib/easislidesimport.py'
--- openlp/plugins/songs/lib/easislidesimport.py	2011-09-06 05:47:33 +0000
+++ openlp/plugins/songs/lib/easislidesimport.py	2011-10-16 20:37:26 +0000
@@ -258,7 +258,7 @@
                     verses[reg][vt][vn] = {}
                 if not verses[reg][vt][vn].has_key(inst):
                     verses[reg][vt][vn][inst] = []
-                words = self.tidy_text(line)
+                words = self.tidyText(line)
                 verses[reg][vt][vn][inst].append(words)
         # done parsing
 

=== modified file 'openlp/plugins/songs/lib/sofimport.py'
--- openlp/plugins/songs/lib/sofimport.py	2011-09-06 05:47:33 +0000
+++ openlp/plugins/songs/lib/sofimport.py	2011-10-16 20:37:26 +0000
@@ -194,7 +194,7 @@
         into line
         """
         text = textportion.getString()
-        text = self.tidy_text(text)
+        text = self.tidyText(text)
         if text.strip() == u'':
             return text
         if textportion.CharWeight == BOLD: