openlp-core team mailing list archive

[Ken Roberts <alisonken1@xxxxxxxxx>]

Ken Roberts has proposed merging lp:~alisonken1/openlp/bug-1404967 into lp:openlp.

Requested reviews:
  Tim Bentley (trb143)
Related bugs:
  Bug #1404967 in OpenLP: "Change label text in song editor for  "CCLI Number""
  https://bugs.launchpad.net/openlp/+bug/1404967

For more details, see:
https://code.launchpad.net/~alisonken1/openlp/bug-1404967/+merge/245431

Cosmetic only.

Change Song edit Theme/Copyright/Comment tab to say 'CCLI song number' to avoid confusion with church CCLI license number

lp:~alisonken1/openlp/bug-1404967 (revision 2460)
[SUCCESS] http://ci.openlp.org/job/Branch-01-Pull/834/
[SUCCESS] http://ci.openlp.org/job/Branch-02-Functional-Tests/766/
[SUCCESS] http://ci.openlp.org/job/Branch-03-Interface-Tests/712/
[FAILURE] http://ci.openlp.org/job/Branch-04a-Windows_Functional_Tests/616/
Stopping after failure

Passed local nosetest
Passed local pep8

-- 
Your team OpenLP Core is subscribed to branch lp:openlp.

=== modified file 'openlp/core/common/uistrings.py'
--- openlp/core/common/uistrings.py	2014-12-22 17:34:43 +0000
+++ openlp/core/common/uistrings.py	2014-12-29 17:47:24 +0000
@@ -67,6 +67,7 @@
         self.Browse = translate('OpenLP.Ui', 'Browse...')
         self.Cancel = translate('OpenLP.Ui', 'Cancel')
         self.CCLINumberLabel = translate('OpenLP.Ui', 'CCLI number:')
+        self.CCLISongNumberLabel = translate('OpenLP.Ui', 'CCLI song number:')
         self.CreateService = translate('OpenLP.Ui', 'Create a new service.')
         self.ConfirmDelete = translate('OpenLP.Ui', 'Confirm Delete')
         self.Continuous = translate('OpenLP.Ui', 'Continuous')

=== modified file 'openlp/plugins/songs/forms/editsongdialog.py'
--- openlp/plugins/songs/forms/editsongdialog.py	2014-07-14 16:25:59 +0000
+++ openlp/plugins/songs/forms/editsongdialog.py	2014-12-29 17:47:24 +0000
@@ -323,7 +323,7 @@
         self.theme_add_button.setText(translate('SongsPlugin.EditSongForm', 'New &Theme'))
         self.rights_group_box.setTitle(translate('SongsPlugin.EditSongForm', 'Copyright Information'))
         self.copyright_insert_button.setText(SongStrings.CopyrightSymbol)
-        self.ccli_label.setText(UiStrings().CCLINumberLabel)
+        self.ccli_label.setText(UiStrings().CCLISongNumberLabel)
         self.comments_group_box.setTitle(translate('SongsPlugin.EditSongForm', 'Comments'))
         self.song_tab_widget.setTabText(self.song_tab_widget.indexOf(self.theme_tab),
                                         translate('SongsPlugin.EditSongForm', 'Theme, Copyright Info && Comments'))

=== modified file 'tests/interfaces/openlp_plugins/songs/forms/test_editsongform.py'
--- tests/interfaces/openlp_plugins/songs/forms/test_editsongform.py	2014-10-22 20:43:05 +0000
+++ tests/interfaces/openlp_plugins/songs/forms/test_editsongform.py	2014-12-29 17:47:24 +0000
@@ -34,6 +34,7 @@
 from PyQt4 import QtGui
 
 from openlp.core.common import Registry
+from openlp.core.common.uistrings import UiStrings
 from openlp.plugins.songs.forms.editsongform import EditSongForm
 from tests.interfaces import MagicMock
 from tests.helpers.testmixin import TestMixin
@@ -136,3 +137,15 @@
         # THEN: The no-verse-order message should be shown.
         assert self.form.warning_label.text() == self.form.no_verse_order_entered_warning,  \
             'The no-verse-order message should be shown.'
+
+    def bug_1404967_test(self):
+        """
+        Test for CCLI label showing correct text
+        """
+        # GIVEN; Mocked methods
+        form = self.form
+        # THEN: CCLI label should be CCLI song label
+        self.assertNotEquals(form.ccli_label.text(), UiStrings().CCLINumberLabel,
+                             'CCLI label should not be "{}"'.format(UiStrings().CCLINumberLabel))
+        self.assertEquals(form.ccli_label.text(), UiStrings().CCLISongNumberLabel,
+                          'CCLI label text should be "{}"'.format(UiStrings().CCLISongNumberLabel))