openlp-core team mailing list archive

[Andreas Preikschat <andreaspreikschat@xxxxxxxxxx>]

Andreas Preikschat has proposed merging lp:~googol/openlp/bug-1100277 into lp:openlp.

Requested reviews:
  OpenLP Core (openlp-core)
Related bugs:
  Bug #1100277 in OpenLP: "Songs don't load with latest build"
  https://bugs.launchpad.net/openlp/+bug/1100277

For more details, see:
https://code.launchpad.net/~googol/openlp/bug-1100277/+merge/146689

Hello,

- fixed Bug #1100277 (Songs don't load with latest build)

The translate() returns a unicode object instead of a QString since the sip change. And %1 is a QString feature, but as a unicode object is returned, we cannot use this. At leasts that my explanation. ;)

http://ci.openlp.org/view/Specific%20Branch/job/OpenLP-Pull_and_Run_Functional_Tests/33/

NOTE: Fix has to verified by ElderP!
-- 
https://code.launchpad.net/~googol/openlp/bug-1100277/+merge/146689
Your team OpenLP Core is requested to review the proposed merge of lp:~googol/openlp/bug-1100277 into lp:openlp.

=== modified file 'openlp/core/lib/__init__.py'
--- openlp/core/lib/__init__.py	2013-02-02 20:54:34 +0000
+++ openlp/core/lib/__init__.py	2013-02-05 17:43:38 +0000
@@ -373,16 +373,15 @@
     elif len(stringlist) == 1:
         return stringlist[0]
     elif len(stringlist) == 2:
-        return translate('OpenLP.core.lib', '%1 and %2',
+        return translate('OpenLP.core.lib', '%s and %s',
             'Locale list separator: 2 items') % (stringlist[0], stringlist[1])
     else:
-        merged = translate('OpenLP.core.lib', '%1, and %2',
+        merged = translate('OpenLP.core.lib', '%s, and %s',
             u'Locale list separator: end') % (stringlist[-2], stringlist[-1])
         for index in reversed(range(1, len(stringlist) - 2)):
-            merged = translate('OpenLP.core.lib', '%1, %2',
-            u'Locale list separator: middle') % (stringlist[index], merged)
-        return translate('OpenLP.core.lib', '%1, %2',
-            u'Locale list separator: start') % (stringlist[0], merged)
+            merged = translate('OpenLP.core.lib', '%s, %s',
+                u'Locale list separator: middle') % (stringlist[index], merged)
+        return translate('OpenLP.core.lib', '%s, %s', u'Locale list separator: start') % (stringlist[0], merged)
 
 
 from registry import Registry