openlp-core team mailing list archive
-
openlp-core team
-
Mailing list archive
-
Message #27670
[Merge] lp:~trb143/openlp/bug-about into lp:openlp
Tim Bentley has proposed merging lp:~trb143/openlp/bug-about into lp:openlp.
Requested reviews:
OpenLP Core (openlp-core)
For more details, see:
https://code.launchpad.net/~trb143/openlp/bug-about/+merge/275464
Refactor the about dialog so it is not possible for translators to break OpenLP.
--
Your team OpenLP Core is requested to review the proposed merge of lp:~trb143/openlp/bug-about into lp:openlp.
=== modified file 'openlp/core/ui/aboutdialog.py'
--- openlp/core/ui/aboutdialog.py 2015-03-01 13:29:47 +0000
+++ openlp/core/ui/aboutdialog.py 2015-10-22 21:25:17 +0000
@@ -154,114 +154,147 @@
'zh_CN': [' "executor" ']
}
documentors = ['Wesley "wrst" Stout', 'John "jseagull1" Cegalis (lead)']
+ project_lead = translate('OpenLP.AboutForm', 'Project Lead')
+ devs = translate('OpenLP.AboutForm', 'Developers')
+ cons = translate('OpenLP.AboutForm', 'Contributors')
+ packs = translate('OpenLP.AboutForm', 'Packagers')
+ tests = translate('OpenLP.AboutForm', 'Testers')
+ laters = translate('OpenLP.AboutForm', 'Translators')
+ af = translate('OpenLP.AboutForm', 'Afrikaans (af)')
+ cs = translate('OpenLP.AboutForm', 'Czech (cs)')
+ da = translate('OpenLP.AboutForm', 'Danish (da)')
+ de = translate('OpenLP.AboutForm', 'German (de)')
+ el = translate('OpenLP.AboutForm', 'Greek (el)')
+ gb = translate('OpenLP.AboutForm', 'English, United Kingdom (en_GB)')
+ enza = translate('OpenLP.AboutForm', 'English, South Africa (en_ZA)')
+ es = translate('OpenLP.AboutForm', 'Spanish (es)')
+ et = translate('OpenLP.AboutForm', 'Estonian (et)')
+ fi = translate('OpenLP.AboutForm', 'Finnish (fi)')
+ fr = translate('OpenLP.AboutForm', 'French (fr)')
+ hu = translate('OpenLP.AboutForm', 'Hungarian (hu)')
+ id = translate('OpenLP.AboutForm', 'Indonesian (id)')
+ ja = translate('OpenLP.AboutForm', 'Japanese (ja)')
+ nb = translate('OpenLP.AboutForm', 'Norwegian Bokm\xe5l (nb)')
+ nl = translate('OpenLP.AboutForm', 'Dutch (nl)')
+ pl = translate('OpenLP.AboutForm', 'Polish (pl)')
+ ptbr = translate('OpenLP.AboutForm', 'Portuguese, Brazil (pt_BR)')
+ ru = translate('OpenLP.AboutForm', 'Russian (ru)')
+ sv = translate('OpenLP.AboutForm', 'Swedish (sv)')
+ talk = translate('OpenLP.AboutForm', 'Tamil(Sri-Lanka) (ta_LK)')
+ zhcn = translate('OpenLP.AboutForm', 'Chinese(China) (zh_CN)')
+ documentation = translate('OpenLP.AboutForm', 'Documentation')
+ built_with = translate('OpenLP.AboutForm', 'Built With\n'
+ ' Python: http://www.python.org/\n'
+ ' Qt4: http://qt.io\n'
+ ' PyQt4: http://www.riverbankcomputing.co.uk/software/pyqt/intro\n'
+ ' Oxygen Icons: http://techbase.kde.org/Projects/Oxygen/\n'
+ ' MuPDF: http://www.mupdf.com/\n')
+ final_credit = translate('OpenLP.AboutForm', 'Final Credit\n'
+ ' "For God so loved the world that He gave\n'
+ ' His one and only Son, so that whoever\n'
+ ' believes in Him will not perish but inherit\n'
+ ' eternal life." -- John 3:16\n\n'
+ ' And last but not least, final credit goes to\n'
+ ' God our Father, for sending His Son to die\n'
+ ' on the cross, setting us free from sin. We\n'
+ ' bring this software to you for free because\n'
+ ' He has set us free.')
self.credits_text_edit.setPlainText(
- translate('OpenLP.AboutForm',
- 'Project Lead\n'
- ' %s\n'
- '\n'
- 'Developers\n'
- ' %s\n'
- '\n'
- 'Contributors\n'
- ' %s\n'
- '\n'
- 'Testers\n'
- ' %s\n'
- '\n'
- 'Packagers\n'
- ' %s\n'
- '\n'
- 'Translators\n'
- ' Afrikaans (af)\n'
- ' %s\n'
- ' Czech (cs)\n'
- ' %s\n'
- ' Danish (da)\n'
- ' %s\n'
- ' German (de)\n'
- ' %s\n'
- ' Greek (el)\n'
- ' %s\n'
- ' English, United Kingdom (en_GB)\n'
- ' %s\n'
- ' English, South Africa (en_ZA)\n'
- ' %s\n'
- ' Spanish (es)\n'
- ' %s\n'
- ' Estonian (et)\n'
- ' %s\n'
- ' Finnish (fi)\n'
- ' %s\n'
- ' French (fr)\n'
- ' %s\n'
- ' Hungarian (hu)\n'
- ' %s\n'
- ' Indonesian (id)\n'
- ' %s\n'
- ' Japanese (ja)\n'
- ' %s\n'
- ' Norwegian Bokm\xe5l (nb)\n'
- ' %s\n'
- ' Dutch (nl)\n'
- ' %s\n'
- ' Polish (pl)\n'
- ' %s\n'
- ' Portuguese, Brazil (pt_BR)\n'
- ' %s\n'
- ' Russian (ru)\n'
- ' %s\n'
- ' Swedish (sv)\n'
- ' %s\n'
- ' Tamil(Sri-Lanka) (ta_LK)\n'
- ' %s\n'
- ' Chinese(China) (zh_CN)\n'
- ' %s\n'
- '\n'
- 'Documentation\n'
- ' %s\n'
- '\n'
- 'Built With\n'
- ' Python: http://www.python.org/\n'
- ' Qt4: http://qt.io\n'
- ' PyQt4: http://www.riverbankcomputing.co.uk/software/pyqt/intro\n'
- ' Oxygen Icons: http://techbase.kde.org/Projects/Oxygen/\n'
- ' MuPDF: http://www.mupdf.com/\n'
- '\n'
- 'Final Credit\n'
- ' "For God so loved the world that He gave\n'
- ' His one and only Son, so that whoever\n'
- ' believes in Him will not perish but inherit\n'
- ' eternal life." -- John 3:16\n\n'
- ' And last but not least, final credit goes to\n'
- ' God our Father, for sending His Son to die\n'
- ' on the cross, setting us free from sin. We\n'
- ' bring this software to you for free because\n'
- ' He has set us free.') %
- (lead, '\n '.join(developers),
- '\n '.join(contributors), '\n '.join(testers),
- '\n '.join(packagers), '\n '.join(translators['af']),
- '\n '.join(translators['cs']),
- '\n '.join(translators['da']),
- '\n '.join(translators['de']),
- '\n '.join(translators['el']),
- '\n '.join(translators['en_GB']),
- '\n '.join(translators['en_ZA']),
- '\n '.join(translators['es']),
- '\n '.join(translators['et']),
- '\n '.join(translators['fi']),
- '\n '.join(translators['fr']),
- '\n '.join(translators['hu']),
- '\n '.join(translators['id']),
- '\n '.join(translators['ja']),
- '\n '.join(translators['nb']),
- '\n '.join(translators['nl']),
- '\n '.join(translators['pl']),
- '\n '.join(translators['pt_BR']),
- '\n '.join(translators['ru']),
- '\n '.join(translators['sv']),
- '\n '.join(translators['ta_LK']),
- '\n '.join(translators['zh_CN']),
- '\n '.join(documentors)))
+ '%s\n'
+ ' %s\n'
+ '\n'
+ '%s\n'
+ ' %s\n'
+ '\n'
+ '%s\n'
+ ' %s\n'
+ '\n'
+ '%s\n'
+ ' %s\n'
+ '\n'
+ '%s\n'
+ ' %s\n'
+ '\n'
+ '%s\n'
+ ' %s\n'
+ ' %s\n'
+ ' %s\n'
+ ' %s\n'
+ ' %s\n'
+ ' %s\n'
+ ' %s\n'
+ ' %s\n'
+ ' %s\n'
+ ' %s\n'
+ ' %s\n'
+ ' %s\n'
+ ' %s\n'
+ ' %s\n'
+ ' %s\n'
+ ' %s\n'
+ ' %s\n'
+ ' %s\n'
+ ' %s\n'
+ ' %s\n'
+ ' %s\n'
+ ' %s\n'
+ ' %s\n'
+ ' %s\n'
+ ' %s\n'
+ ' %s\n'
+ ' %s\n'
+ ' %s\n'
+ ' %s\n'
+ ' %s\n'
+ ' %s\n'
+ ' %s\n'
+ ' %s\n'
+ ' %s\n'
+ ' %s\n'
+ ' %s\n'
+ ' %s\n'
+ ' %s\n'
+ ' %s\n'
+ ' %s\n'
+ ' %s\n'
+ ' %s\n'
+ ' %s\n'
+ ' %s\n'
+ '\n'
+ '%s\n'
+ ' %s\n'
+ '\n'
+ '%s\n%s' %
+ (project_lead, lead,
+ devs, '\n '.join(developers),
+ cons, '\n '.join(contributors),
+ tests, '\n '.join(testers),
+ packs, '\n '.join(packagers),
+ laters,
+ af, '\n '.join(translators['af']),
+ cs, '\n '.join(translators['cs']),
+ da, '\n '.join(translators['da']),
+ de, '\n '.join(translators['de']),
+ el, '\n '.join(translators['el']),
+ gb, '\n '.join(translators['en_GB']),
+ enza, '\n '.join(translators['en_ZA']),
+ es, '\n '.join(translators['es']),
+ et, '\n '.join(translators['et']),
+ fi, '\n '.join(translators['fi']),
+ fr, '\n '.join(translators['fr']),
+ hu, '\n '.join(translators['hu']),
+ id, '\n '.join(translators['id']),
+ ja, '\n '.join(translators['ja']),
+ nb, '\n '.join(translators['nb']),
+ nl, '\n '.join(translators['nl']),
+ pl, '\n '.join(translators['pl']),
+ ptbr, '\n '.join(translators['pt_BR']),
+ ru, '\n '.join(translators['ru']),
+ sv, '\n '.join(translators['sv']),
+ talk, '\n '.join(translators['ta_LK']),
+ zhcn, '\n '.join(translators['zh_CN']),
+ documentation, '\n '.join(documentors),
+ built_with, final_credit))
self.about_notebook.setTabText(self.about_notebook.indexOf(self.credits_tab),
translate('OpenLP.AboutForm', 'Credits'))
copyright_note = translate('OpenLP.AboutForm',
Follow ups