diff --git a/openlp/core/common/uistrings.py b/openlp/core/common/uistrings.py index 3c8477864..25df5ac75 100644 --- a/openlp/core/common/uistrings.py +++ b/openlp/core/common/uistrings.py @@ -59,6 +59,13 @@ class UiStrings(object): self.Automatic = translate('OpenLP.Ui', 'Automatic') self.BackgroundColor = translate('OpenLP.Ui', 'Background Color') self.BackgroundColorColon = translate('OpenLP.Ui', 'Background color:') + self.BibleShortSearchTitle = translate('OpenLP.Ui', 'Search is Empty or too Short') + self.BibleShortSearch = translate('OpenLP.Ui', 'The search you have entered is empty or shorter ' + 'than 3 characters long.

Please try again with ' + 'a longer search.') + self.BibleNoBiblesTitle = translate('OpenLP.Ui', 'No Bibles Available') + self.BibleNoBibles = translate('OpenLP.Ui', 'There are no Bibles currently installed.

' + 'Please use the Import Wizard to install one or more Bibles.') self.Bottom = translate('OpenLP.Ui', 'Bottom') self.Browse = translate('OpenLP.Ui', 'Browse...') self.Cancel = translate('OpenLP.Ui', 'Cancel') @@ -117,6 +124,8 @@ class UiStrings(object): self.OLPV2x = "{name} {version}".format(name=self.OLP, version="2.4") self.OpenLPStart = translate('OpenLP.Ui', 'OpenLP is already running. Do you wish to continue?') self.OpenService = translate('OpenLP.Ui', 'Open service.') + self.OptionalShowInFooter = translate('OpenLP.Ui', 'Optional, this will be displayed in footer.') + self.OptionalHideInFooter = translate('OpenLP.Ui', 'Optional, this won\'t be displayed in footer.') self.PlaySlidesInLoop = translate('OpenLP.Ui', 'Play Slides in Loop') self.PlaySlidesToEnd = translate('OpenLP.Ui', 'Play Slides to End') self.Preview = translate('OpenLP.Ui', 'Preview') @@ -130,6 +139,7 @@ class UiStrings(object): 'player is disabled.') self.ResetBG = translate('OpenLP.Ui', 'Reset Background') self.ResetLiveBG = translate('OpenLP.Ui', 'Reset live background.') + self.RequiredShowInFooter = translate('OpenLP.Ui', 'Required, this will be displayed in footer.') self.Seconds = translate('OpenLP.Ui', 's', 'The abbreviated unit for seconds') self.SaveAndPreview = translate('OpenLP.Ui', 'Save && Preview') self.Search = translate('OpenLP.Ui', 'Search') @@ -157,13 +167,6 @@ class UiStrings(object): self.View = translate('OpenLP.Ui', 'View') self.ViewMode = translate('OpenLP.Ui', 'View Mode') self.Video = translate('OpenLP.Ui', 'Video') - self.BibleShortSearchTitle = translate('OpenLP.Ui', 'Search is Empty or too Short') - self.BibleShortSearch = translate('OpenLP.Ui', 'The search you have entered is empty or shorter ' - 'than 3 characters long.

Please try again with ' - 'a longer search.') - self.BibleNoBiblesTitle = translate('OpenLP.Ui', 'No Bibles Available') - self.BibleNoBibles = translate('OpenLP.Ui', 'There are no Bibles currently installed.

' - 'Please use the Import Wizard to install one or more Bibles.') book_chapter = translate('OpenLP.Ui', 'Book Chapter') chapter = translate('OpenLP.Ui', 'Chapter') verse = translate('OpenLP.Ui', 'Verse') diff --git a/openlp/plugins/bibles/forms/bibleimportform.py b/openlp/plugins/bibles/forms/bibleimportform.py index dd60b264a..dc794b58f 100644 --- a/openlp/plugins/bibles/forms/bibleimportform.py +++ b/openlp/plugins/bibles/forms/bibleimportform.py @@ -750,9 +750,13 @@ class BibleImportForm(OpenLPWizard): self.setField('proxy_username', settings.value('proxy username')) self.setField('proxy_password', settings.value('proxy password')) self.setField('license_version', self.version_name_edit.text()) + self.version_name_edit.setPlaceholderText(UiStrings().RequiredShowInFooter) self.setField('license_copyright', self.copyright_edit.text()) + self.copyright_edit.setPlaceholderText(UiStrings().RequiredShowInFooter) self.setField('license_permissions', self.permissions_edit.text()) + self.permissions_edit.setPlaceholderText(UiStrings().OptionalShowInFooter) self.setField('license_full_license', self.full_license_edit.toPlainText()) + self.full_license_edit.setPlaceholderText(UiStrings().OptionalHideInFooter) self.on_web_source_combo_box_index_changed(WebDownload.Crosswalk) settings.endGroup() diff --git a/openlp/plugins/bibles/forms/editbibleform.py b/openlp/plugins/bibles/forms/editbibleform.py index 16b1b38f4..fb11bf36a 100644 --- a/openlp/plugins/bibles/forms/editbibleform.py +++ b/openlp/plugins/bibles/forms/editbibleform.py @@ -68,13 +68,13 @@ class EditBibleForm(QtWidgets.QDialog, Ui_EditBibleDialog, RegistryProperties): """ try: self.version_name_edit.setText(self.manager.get_meta_data(self.bible, 'name').value) - self.version_name_edit.setPlaceholderText('Required, this will be displayed in footer.') + self.version_name_edit.setPlaceholderText(UiStrings().RequiredShowInFooter) self.copyright_edit.setText(self.manager.get_meta_data(self.bible, 'copyright').value) - self.copyright_edit.setPlaceholderText('Required, this will be displayed in footer.') + self.copyright_edit.setPlaceholderText(UiStrings().RequiredShowInFooter) self.permissions_edit.setText(self.manager.get_meta_data(self.bible, 'permissions').value) - self.permissions_edit.setPlaceholderText('Optional, this will be displayed in footer.') + self.permissions_edit.setPlaceholderText(UiStrings().OptionalShowInFooter) self.full_license_edit.setPlainText(self.manager.get_meta_data(self.bible, 'full_license').value) - self.full_license_edit.setPlaceholderText('Optional, this won\'t be displayed in footer.') + self.full_license_edit.setPlaceholderText(UiStrings().OptionalHideInFooter) book_name_language = self.manager.get_meta_data(self.bible, 'book_name_language') except AttributeError: book_name_language = self.manager.get_meta_data(self.bible, 'book_name_language')