diff --git a/openlp/core/common/uistrings.py b/openlp/core/common/uistrings.py index e9f0a78e7..5ba7f20db 100644 --- a/openlp/core/common/uistrings.py +++ b/openlp/core/common/uistrings.py @@ -67,6 +67,7 @@ class UiStrings(object): 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') diff --git a/openlp/plugins/songs/forms/editsongdialog.py b/openlp/plugins/songs/forms/editsongdialog.py index cdbac7fdb..d20b723e4 100644 --- a/openlp/plugins/songs/forms/editsongdialog.py +++ b/openlp/plugins/songs/forms/editsongdialog.py @@ -323,7 +323,7 @@ class Ui_EditSongDialog(object): 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')) diff --git a/tests/interfaces/openlp_plugins/songs/forms/test_editsongform.py b/tests/interfaces/openlp_plugins/songs/forms/test_editsongform.py index e84079f98..3ac938608 100644 --- a/tests/interfaces/openlp_plugins/songs/forms/test_editsongform.py +++ b/tests/interfaces/openlp_plugins/songs/forms/test_editsongform.py @@ -34,6 +34,7 @@ from unittest import TestCase 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 @@ class TestEditSongForm(TestCase, TestMixin): # 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))