From 7fda8043f5a3a95c108bc894fee4a02f6efe1cc5 Mon Sep 17 00:00:00 2001 From: Phill Ridout Date: Tue, 20 Jan 2015 21:38:34 +0000 Subject: [PATCH 1/4] Improve translation string Fixes: https://launchpad.net/bugs/1412234 --- openlp/core/ui/firsttimeform.py | 2 +- .../plugins/bibles/forms/bibleimportform.py | 2 +- openlp/plugins/bibles/lib/__init__.py | 30 ++++++++++++++++--- .../openlp_plugins/bibles/test_lib.py | 26 ++++++++++++++++ 4 files changed, 54 insertions(+), 6 deletions(-) diff --git a/openlp/core/ui/firsttimeform.py b/openlp/core/ui/firsttimeform.py index 553cd9ba6..9c3b7bf09 100644 --- a/openlp/core/ui/firsttimeform.py +++ b/openlp/core/ui/firsttimeform.py @@ -182,7 +182,7 @@ class FirstTimeForm(QtGui.QWizard, UiFirstTimeWizard, RegistryProperties): title = translate('OpenLP.FirstTimeWizard', 'Network Error') msg.setText('{} {}'.format(title, err.code if hasattr(err, 'code') else '')) msg.setInformativeText(translate('OpenLP.FirstTimeWizard', - 'There was a network error attempting to' + 'There was a network error attempting to ' 'connect to retrieve initial configuration information')) msg.setStandardButtons(msg.Ok) ans = msg.exec_() diff --git a/openlp/plugins/bibles/forms/bibleimportform.py b/openlp/plugins/bibles/forms/bibleimportform.py index 042be0ce2..019286a68 100644 --- a/openlp/plugins/bibles/forms/bibleimportform.py +++ b/openlp/plugins/bibles/forms/bibleimportform.py @@ -602,7 +602,7 @@ class BibleImportForm(OpenLPWizard): if bible_type == BibleFormat.WebDownload: self.progress_label.setText( translate('BiblesPlugin.ImportWizardForm', 'Registered Bible. Please note, that verses will be ' - 'downloaded on\ndemand and thus an internet connection is required.')) + 'downloaded on demand and thus an internet connection is required.')) else: self.progress_label.setText(WizardStrings.FinishedImport) else: diff --git a/openlp/plugins/bibles/lib/__init__.py b/openlp/plugins/bibles/lib/__init__.py index 4bba04811..12313d0b4 100644 --- a/openlp/plugins/bibles/lib/__init__.py +++ b/openlp/plugins/bibles/lib/__init__.py @@ -175,10 +175,32 @@ def update_reference_separators(): """ Updates separators and matches for parsing and formating scripture references. """ - default_separators = \ - translate('BiblesPlugin', - ':|v|V|verse|verses;;-|to;;,|and;;end Double-semicolon delimited separators for parsing references. ' - 'Consult the developers for further information.').split(';;') + default_separators = ['|'.join([translate('BiblesPlugin', ':', + 'Verse identifier e.g. Genisis 1 : 1 = Genisis Chapter 1 Verse 1'), + translate('BiblesPlugin', 'v', + 'Verse identifier e.g. Genisis 1 v 1 = Genisis Chapter 1 Verse 1'), + translate('BiblesPlugin', 'V', + 'Verse identifier e.g. Genisis 1 V 1 = Genisis Chapter 1 Verse 1'), + translate('BiblesPlugin', 'verse', + 'Verse identifier e.g. Genisis 1 verse 1 = Genisis Chapter 1 Verse 1'), + translate('BiblesPlugin', 'verses', + 'Verse identifier e.g. Genisis 1 verses 1 - 2 = ' + 'Genisis Chapter 1 Verses 1 to 2')]), + '|'.join([translate('BiblesPlugin', '-', + 'range identifier e.g. Genisis 1 verse 1 - 2 = ' + 'Genisis Chapter 1 Verses 1 To 2'), + translate('BiblesPlugin', 'to', + 'range identifier e.g. Genisis 1 verse 1 - 2 = ' + 'Genisis Chapter 1 Verses 1 To 2')]), + '|'.join([translate('BiblesPlugin', ',', + 'connecting identifier e.g. Genisis 1 verse 1 - 2, 4 - 5 = ' + 'Genisis Chapter 1 Verses 1 To 2 And Verses 4 To 5'), + translate('BiblesPlugin', 'and', + 'connecting identifier e.g. Genisis 1 verse 1 - 2 and 4 - 5 = ' + 'Genisis Chapter 1 Verses 1 To 2 And Verses 4 To 5')]), + '|'.join([translate('BiblesPlugin', 'end', + 'ending identifier e.g. Genisis 1 verse 1 - end = ' + 'Genisis Chapter 1 Verses 1 To The Last Verse')])] settings = Settings() settings.beginGroup('bibles') custom_separators = [ diff --git a/tests/functional/openlp_plugins/bibles/test_lib.py b/tests/functional/openlp_plugins/bibles/test_lib.py index cdecd31ab..c596f9513 100644 --- a/tests/functional/openlp_plugins/bibles/test_lib.py +++ b/tests/functional/openlp_plugins/bibles/test_lib.py @@ -24,13 +24,39 @@ This module contains tests for the lib submodule of the Bibles plugin. """ from unittest import TestCase +from openlp.plugins.bibles import lib from openlp.plugins.bibles.lib import SearchResults +from tests.functional import MagicMock, patch class TestLib(TestCase): """ Test the functions in the :mod:`lib` module. """ + def get_reference_separator_test(self): + """ + Test the get_reference_separator method + """ + # GIVEN: A list of expected separators + separators = {'sep_r': '\\s*(?:e)\\s*', 'sep_e_default': 'end', 'sep_v_display': 'w', 'sep_l_display': 'r', + 'sep_v_default': ':|v|V|verse|verses', 'sep_l': '\\s*(?:r)\\s*', 'sep_l_default': ',|and', + 'sep_e': '\\s*(?:t)\\s*', 'sep_v': '\\s*(?:w)\\s*', 'sep_r_display': 'e', + 'sep_r_default': '-|to'} + + def side_effect(): + lib.REFERENCE_SEPARATORS = separators + + with patch('openlp.plugins.bibles.lib.update_reference_separators', + **{'side_effect': side_effect}) as mocked_update_reference_separators: + + # WHEN: Calling get_reference_separator + for key, value in separators.items(): + ret = lib.get_reference_separator(key) + + # THEN: get_reference_separator should return the correct separator + self.assertEqual(separators[key], value) + mocked_update_reference_separators.assert_called_once_with() + def search_results_creation_test(self): """ Test the creation and construction of the SearchResults class From e7793fc9fa837541e41c694e5904a67ddd08865c Mon Sep 17 00:00:00 2001 From: Phill Ridout Date: Tue, 20 Jan 2015 21:45:37 +0000 Subject: [PATCH 2/4] Pep fixes --- tests/functional/openlp_plugins/bibles/test_lib.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/tests/functional/openlp_plugins/bibles/test_lib.py b/tests/functional/openlp_plugins/bibles/test_lib.py index c596f9513..f0c17f4da 100644 --- a/tests/functional/openlp_plugins/bibles/test_lib.py +++ b/tests/functional/openlp_plugins/bibles/test_lib.py @@ -39,9 +39,8 @@ class TestLib(TestCase): """ # GIVEN: A list of expected separators separators = {'sep_r': '\\s*(?:e)\\s*', 'sep_e_default': 'end', 'sep_v_display': 'w', 'sep_l_display': 'r', - 'sep_v_default': ':|v|V|verse|verses', 'sep_l': '\\s*(?:r)\\s*', 'sep_l_default': ',|and', - 'sep_e': '\\s*(?:t)\\s*', 'sep_v': '\\s*(?:w)\\s*', 'sep_r_display': 'e', - 'sep_r_default': '-|to'} + 'sep_v_default': ':|v|V|verse|verses', 'sep_l': '\\s*(?:r)\\s*', 'sep_l_default': ',|and', + 'sep_e': '\\s*(?:t)\\s*', 'sep_v': '\\s*(?:w)\\s*', 'sep_r_display': 'e', 'sep_r_default': '-|to'} def side_effect(): lib.REFERENCE_SEPARATORS = separators From 88684425da1c129272237b42e1ec61049d1aa071 Mon Sep 17 00:00:00 2001 From: Phill Ridout Date: Tue, 20 Jan 2015 22:43:38 +0000 Subject: [PATCH 3/4] spelling --- openlp/plugins/bibles/lib/__init__.py | 32 +++++++++++++-------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/openlp/plugins/bibles/lib/__init__.py b/openlp/plugins/bibles/lib/__init__.py index 12313d0b4..7485c667d 100644 --- a/openlp/plugins/bibles/lib/__init__.py +++ b/openlp/plugins/bibles/lib/__init__.py @@ -176,31 +176,31 @@ def update_reference_separators(): Updates separators and matches for parsing and formating scripture references. """ default_separators = ['|'.join([translate('BiblesPlugin', ':', - 'Verse identifier e.g. Genisis 1 : 1 = Genisis Chapter 1 Verse 1'), + 'Verse identifier e.g. Genesis 1 : 1 = Genesis Chapter 1 Verse 1'), translate('BiblesPlugin', 'v', - 'Verse identifier e.g. Genisis 1 v 1 = Genisis Chapter 1 Verse 1'), + 'Verse identifier e.g. Genesis 1 v 1 = Genesis Chapter 1 Verse 1'), translate('BiblesPlugin', 'V', - 'Verse identifier e.g. Genisis 1 V 1 = Genisis Chapter 1 Verse 1'), + 'Verse identifier e.g. Genesis 1 V 1 = Genesis Chapter 1 Verse 1'), translate('BiblesPlugin', 'verse', - 'Verse identifier e.g. Genisis 1 verse 1 = Genisis Chapter 1 Verse 1'), + 'Verse identifier e.g. Genesis 1 verse 1 = Genesis Chapter 1 Verse 1'), translate('BiblesPlugin', 'verses', - 'Verse identifier e.g. Genisis 1 verses 1 - 2 = ' - 'Genisis Chapter 1 Verses 1 to 2')]), + 'Verse identifier e.g. Genesis 1 verses 1 - 2 = ' + 'Genesis Chapter 1 Verses 1 to 2')]), '|'.join([translate('BiblesPlugin', '-', - 'range identifier e.g. Genisis 1 verse 1 - 2 = ' - 'Genisis Chapter 1 Verses 1 To 2'), + 'range identifier e.g. Genesis 1 verse 1 - 2 = ' + 'Genesis Chapter 1 Verses 1 To 2'), translate('BiblesPlugin', 'to', - 'range identifier e.g. Genisis 1 verse 1 - 2 = ' - 'Genisis Chapter 1 Verses 1 To 2')]), + 'range identifier e.g. Genesis 1 verse 1 - 2 = ' + 'Genesis Chapter 1 Verses 1 To 2')]), '|'.join([translate('BiblesPlugin', ',', - 'connecting identifier e.g. Genisis 1 verse 1 - 2, 4 - 5 = ' - 'Genisis Chapter 1 Verses 1 To 2 And Verses 4 To 5'), + 'connecting identifier e.g. Genesis 1 verse 1 - 2, 4 - 5 = ' + 'Genesis Chapter 1 Verses 1 To 2 And Verses 4 To 5'), translate('BiblesPlugin', 'and', - 'connecting identifier e.g. Genisis 1 verse 1 - 2 and 4 - 5 = ' - 'Genisis Chapter 1 Verses 1 To 2 And Verses 4 To 5')]), + 'connecting identifier e.g. Genesis 1 verse 1 - 2 and 4 - 5 = ' + 'Genesis Chapter 1 Verses 1 To 2 And Verses 4 To 5')]), '|'.join([translate('BiblesPlugin', 'end', - 'ending identifier e.g. Genisis 1 verse 1 - end = ' - 'Genisis Chapter 1 Verses 1 To The Last Verse')])] + 'ending identifier e.g. Genesis 1 verse 1 - end = ' + 'Genesis Chapter 1 Verses 1 To The Last Verse')])] settings = Settings() settings.beginGroup('bibles') custom_separators = [ From 7870cecd142102182ad92e219f7f9d151ae138c3 Mon Sep 17 00:00:00 2001 From: Phill Ridout Date: Thu, 22 Jan 2015 13:19:10 +0000 Subject: [PATCH 4/4] pep fixes --- openlp/plugins/bibles/lib/__init__.py | 46 ++++++++++++--------------- 1 file changed, 20 insertions(+), 26 deletions(-) diff --git a/openlp/plugins/bibles/lib/__init__.py b/openlp/plugins/bibles/lib/__init__.py index 7485c667d..1d7216ee5 100644 --- a/openlp/plugins/bibles/lib/__init__.py +++ b/openlp/plugins/bibles/lib/__init__.py @@ -175,32 +175,26 @@ def update_reference_separators(): """ Updates separators and matches for parsing and formating scripture references. """ - default_separators = ['|'.join([translate('BiblesPlugin', ':', - 'Verse identifier e.g. Genesis 1 : 1 = Genesis Chapter 1 Verse 1'), - translate('BiblesPlugin', 'v', - 'Verse identifier e.g. Genesis 1 v 1 = Genesis Chapter 1 Verse 1'), - translate('BiblesPlugin', 'V', - 'Verse identifier e.g. Genesis 1 V 1 = Genesis Chapter 1 Verse 1'), - translate('BiblesPlugin', 'verse', - 'Verse identifier e.g. Genesis 1 verse 1 = Genesis Chapter 1 Verse 1'), - translate('BiblesPlugin', 'verses', - 'Verse identifier e.g. Genesis 1 verses 1 - 2 = ' - 'Genesis Chapter 1 Verses 1 to 2')]), - '|'.join([translate('BiblesPlugin', '-', - 'range identifier e.g. Genesis 1 verse 1 - 2 = ' - 'Genesis Chapter 1 Verses 1 To 2'), - translate('BiblesPlugin', 'to', - 'range identifier e.g. Genesis 1 verse 1 - 2 = ' - 'Genesis Chapter 1 Verses 1 To 2')]), - '|'.join([translate('BiblesPlugin', ',', - 'connecting identifier e.g. Genesis 1 verse 1 - 2, 4 - 5 = ' - 'Genesis Chapter 1 Verses 1 To 2 And Verses 4 To 5'), - translate('BiblesPlugin', 'and', - 'connecting identifier e.g. Genesis 1 verse 1 - 2 and 4 - 5 = ' - 'Genesis Chapter 1 Verses 1 To 2 And Verses 4 To 5')]), - '|'.join([translate('BiblesPlugin', 'end', - 'ending identifier e.g. Genesis 1 verse 1 - end = ' - 'Genesis Chapter 1 Verses 1 To The Last Verse')])] + default_separators = [ + '|'.join([ + translate('BiblesPlugin', ':', 'Verse identifier e.g. Genesis 1 : 1 = Genesis Chapter 1 Verse 1'), + translate('BiblesPlugin', 'v','Verse identifier e.g. Genesis 1 v 1 = Genesis Chapter 1 Verse 1'), + translate('BiblesPlugin', 'V', 'Verse identifier e.g. Genesis 1 V 1 = Genesis Chapter 1 Verse 1'), + translate('BiblesPlugin', 'verse', 'Verse identifier e.g. Genesis 1 verse 1 = Genesis Chapter 1 Verse 1'), + translate('BiblesPlugin', 'verses', + 'Verse identifier e.g. Genesis 1 verses 1 - 2 = Genesis Chapter 1 Verses 1 to 2')]), + '|'.join([ + translate('BiblesPlugin', '-', + 'range identifier e.g. Genesis 1 verse 1 - 2 = Genesis Chapter 1 Verses 1 To 2'), + translate('BiblesPlugin', 'to', + 'range identifier e.g. Genesis 1 verse 1 - 2 = Genesis Chapter 1 Verses 1 To 2')]), + '|'.join([ + translate('BiblesPlugin', ',', 'connecting identifier e.g. Genesis 1 verse 1 - 2, 4 - 5 = ' + 'Genesis Chapter 1 Verses 1 To 2 And Verses 4 To 5'), + translate('BiblesPlugin', 'and', 'connecting identifier e.g. Genesis 1 verse 1 - 2 and 4 - 5 = ' + 'Genesis Chapter 1 Verses 1 To 2 And Verses 4 To 5')]), + '|'.join([translate('BiblesPlugin', 'end', 'ending identifier e.g. Genesis 1 verse 1 - end = ' + 'Genesis Chapter 1 Verses 1 To The Last Verse')])] settings = Settings() settings.beginGroup('bibles') custom_separators = [