← Back to team overview

openlp-core team mailing list archive

[Merge] lp:~alisonken1/openlp/bug-1404967 into lp:openlp

 

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

Requested reviews:
  OpenLP Core (openlp-core)

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

Cosmetic only.

Change Song edit Theme/Copyright/Comment tab to say 'CCLI song number' to avoid confusion with church CCLI license number
-- 
Your team OpenLP Core is requested to review the proposed merge of lp:~alisonken1/openlp/bug-1404967 into lp:openlp.
=== modified file 'openlp/core/common/uistrings.py'
--- openlp/core/common/uistrings.py	2014-10-09 20:30:07 +0000
+++ openlp/core/common/uistrings.py	2014-12-22 20:27:12 +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-22 20:27:12 +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'))


Follow ups