openlp-core team mailing list archive
-
openlp-core team
-
Mailing list archive
-
Message #20998
[Merge] lp:~trb143/openlp/json-2 into lp:openlp/2.0
Tim Bentley has proposed merging lp:~trb143/openlp/json-2 into lp:openlp/2.0.
Requested reviews:
OpenLP Core (openlp-core)
For more details, see:
https://code.launchpad.net/~trb143/openlp/json-2/+merge/173550
Too much testing on python 3.
Fix data types for translations.
--
https://code.launchpad.net/~trb143/openlp/json-2/+merge/173550
Your team OpenLP Core is requested to review the proposed merge of lp:~trb143/openlp/json-2 into lp:openlp/2.0.
=== modified file 'openlp/core/ui/formattingtagform.py'
--- openlp/core/ui/formattingtagform.py 2012-12-30 19:41:24 +0000
+++ openlp/core/ui/formattingtagform.py 2013-07-08 17:00:38 +0000
@@ -123,11 +123,11 @@
return
# Add new tag to list
tag = {
- u'desc': translate('OpenLP.FormattingTagForm', 'New Tag'),
+ u'desc': unicode(translate('OpenLP.FormattingTagForm', 'New Tag')),
u'start tag': u'{n}',
- u'start html': translate('OpenLP.FormattingTagForm', '<HTML here>'),
+ u'start html': unicode(translate('OpenLP.FormattingTagForm', '<HTML here>')),
u'end tag': u'{/n}',
- u'end html': translate('OpenLP.FormattingTagForm', '</and here>'),
+ u'end html': unicode(translate('OpenLP.FormattingTagForm', '</and here>')),
u'protected': False,
u'temporary': False
}
Follow ups
