openlp-core team mailing list archive
-
openlp-core team
-
Mailing list archive
-
Message #10814
[Merge] lp:~trb143/openlp/bug-796440 into lp:openlp
Tim Bentley has proposed merging lp:~trb143/openlp/bug-796440 into lp:openlp.
Requested reviews:
Andreas Preikschat (googol)
Raoul Snyman (raoul-snyman)
Related bugs:
Bug #796440 in OpenLP: "String errors in OpenLP 1.9.6"
https://bugs.launchpad.net/openlp/+bug/796440
For more details, see:
https://code.launchpad.net/~trb143/openlp/bug-796440/+merge/67871
Fix all outstanding (I hope) string errors except #2 with is different to bug!
--
https://code.launchpad.net/~trb143/openlp/bug-796440/+merge/67871
Your team OpenLP Core is subscribed to branch lp:openlp.
=== modified file 'openlp/core/ui/firsttimewizard.py'
--- openlp/core/ui/firsttimewizard.py 2011-06-12 16:02:52 +0000
+++ openlp/core/ui/firsttimewizard.py 2011-07-13 17:44:31 +0000
@@ -209,7 +209,7 @@
'Select the Plugins you wish to use. '))
self.songsCheckBox.setText(translate('OpenLP.FirstTimeWizard', 'Songs'))
self.customCheckBox.setText(translate('OpenLP.FirstTimeWizard',
- 'Custom Text'))
+ 'Custom Slides'))
self.bibleCheckBox.setText(translate('OpenLP.FirstTimeWizard', 'Bible'))
self.imageCheckBox.setText(translate('OpenLP.FirstTimeWizard',
'Images'))
=== modified file 'openlp/core/ui/generaltab.py'
--- openlp/core/ui/generaltab.py 2011-06-12 16:02:52 +0000
+++ openlp/core/ui/generaltab.py 2011-07-13 17:44:31 +0000
@@ -44,7 +44,7 @@
"""
self.screens = ScreenList.get_instance()
self.icon_path = u':/icon/openlp-logo-16x16.png'
- generalTranslated = translate('GeneralTab', 'General')
+ generalTranslated = translate('OpenLP.GeneralTab', 'General')
SettingsTab.__init__(self, parent, u'General', generalTranslated)
def setupUi(self):
=== modified file 'openlp/core/ui/themestab.py'
--- openlp/core/ui/themestab.py 2011-06-12 16:02:52 +0000
+++ openlp/core/ui/themestab.py 2011-07-13 17:44:31 +0000
@@ -37,7 +37,7 @@
"""
def __init__(self, parent, mainwindow):
self.mainwindow = mainwindow
- generalTranslated = translate('ThemeTab', 'Themes')
+ generalTranslated = translate('OpenLP.ThemesTab', 'Themes')
SettingsTab.__init__(self, parent, u'Themes', generalTranslated)
self.icon_path = u':/themes/theme_new.png'
=== modified file 'openlp/plugins/alerts/alertsplugin.py'
--- openlp/plugins/alerts/alertsplugin.py 2011-06-12 16:02:52 +0000
+++ openlp/plugins/alerts/alertsplugin.py 2011-07-13 17:44:31 +0000
@@ -104,7 +104,7 @@
def about(self):
about_text = translate('AlertsPlugin', '<strong>Alerts Plugin</strong>'
'<br />The alert plugin controls the displaying of nursery alerts '
- 'on the display screen')
+ 'on the display screen.')
return about_text
def setPluginTextStrings(self):
=== modified file 'openlp/plugins/alerts/forms/alertform.py'
--- openlp/plugins/alerts/forms/alertform.py 2011-06-12 16:02:52 +0000
+++ openlp/plugins/alerts/forms/alertform.py 2011-07-13 17:44:31 +0000
@@ -176,8 +176,8 @@
# We found '<>' in the alert text, but the ParameterEdit field is empty.
if text.find(u'<>') != -1 and not self.parameterEdit.text() and \
QtGui.QMessageBox.question(self,
- translate('AlertPlugin.AlertForm', 'No Parameter Found'),
- translate('AlertPlugin.AlertForm', 'You have not entered a '
+ translate('AlertsPlugin.AlertForm', 'No Parameter Found'),
+ translate('AlertsPlugin.AlertForm', 'You have not entered a '
'parameter to be replaced.\nDo you want to continue anyway?'),
QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.No |
QtGui.QMessageBox.Yes)) == QtGui.QMessageBox.No:
@@ -187,8 +187,8 @@
# in the alert text.
elif text.find(u'<>') == -1 and self.parameterEdit.text() and \
QtGui.QMessageBox.question(self,
- translate('AlertPlugin.AlertForm', 'No Placeholder Found'),
- translate('AlertPlugin.AlertForm', 'The alert text does not'
+ translate('AlertsPlugin.AlertForm', 'No Placeholder Found'),
+ translate('AlertsPlugin.AlertForm', 'The alert text does not'
' contain \'<>\'.\nDo you want to continue anyway?'),
QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.No |
QtGui.QMessageBox.Yes)) == QtGui.QMessageBox.No:
=== modified file 'openlp/plugins/bibles/bibleplugin.py'
--- openlp/plugins/bibles/bibleplugin.py 2011-06-12 16:02:52 +0000
+++ openlp/plugins/bibles/bibleplugin.py 2011-07-13 17:44:31 +0000
@@ -117,9 +117,9 @@
self.toolsUpgradeItem = QtGui.QAction(tools_menu)
self.toolsUpgradeItem.setObjectName(u'toolsUpgradeItem')
self.toolsUpgradeItem.setText(
- translate('BiblePlugin', '&Upgrade older Bibles'))
+ translate('BiblesPlugin', '&Upgrade older Bibles'))
self.toolsUpgradeItem.setStatusTip(
- translate('BiblePlugin', 'Upgrade the Bible databases to the '
+ translate('BiblesPlugin', 'Upgrade the Bible databases to the '
'latest format.'))
tools_menu.addAction(self.toolsUpgradeItem)
QtCore.QObject.connect(self.toolsUpgradeItem,
=== modified file 'openlp/plugins/bibles/forms/bibleupgradeform.py'
--- openlp/plugins/bibles/forms/bibleupgradeform.py 2011-06-11 08:41:32 +0000
+++ openlp/plugins/bibles/forms/bibleupgradeform.py 2011-07-13 17:44:31 +0000
@@ -413,7 +413,7 @@
if not backup_path:
critical_error_message_box(UiStrings().EmptyField,
translate('BiblesPlugin.UpgradeWizardForm',
- 'You need to specify a Backup Directory for your '
+ 'You need to specify a backup directory for your '
'Bibles.'))
self.backupDirectoryEdit.setFocus()
return False
@@ -520,7 +520,7 @@
OpenLPWizard.preWizard(self)
self.progressLabel.setText(translate(
'BiblesPlugin.UpgradeWizardForm',
- 'Starting Bible upgrade...'))
+ 'Starting upgrade...'))
Receiver.send_message(u'openlp_process_events')
def performWizard(self):
@@ -532,7 +532,7 @@
if self.maxBibles == 0:
self.progressLabel.setText(
translate('BiblesPlugin.UpgradeWizardForm', 'There are no '
- 'Bibles available to upgrade.'))
+ 'Bibles that need to be upgraded.'))
self.progressBar.hide()
return
self.maxBibles = 0
=== modified file 'openlp/plugins/bibles/lib/csvbible.py'
--- openlp/plugins/bibles/lib/csvbible.py 2011-06-12 16:02:52 +0000
+++ openlp/plugins/bibles/lib/csvbible.py 2011-07-13 17:44:31 +0000
@@ -115,7 +115,8 @@
if self.stop_import_flag:
break
self.wizard.incrementProgressBar(unicode(
- translate('BibleDB.Wizard', 'Importing books... %s')) %
+ translate('BiblesPlugin.CSVBible',
+ 'Importing books... %s')) %
unicode(line[2], details['encoding']))
book_ref_id = self.get_book_ref_id_by_name(
unicode(line[2], details['encoding']), 67, language_id)
@@ -155,7 +156,7 @@
book = self.get_book(line_book)
book_ptr = book.name
self.wizard.incrementProgressBar(unicode(translate(
- 'BibleDB.Wizard', 'Importing verses from %s...',
+ 'BiblesPlugin.CSVBible', 'Importing verses from %s...',
'Importing verses from <book name>...')) % book.name)
self.session.commit()
try:
@@ -163,7 +164,7 @@
except UnicodeError:
verse_text = unicode(line[3], u'cp1252')
self.create_verse(book.id, line[1], line[2], verse_text)
- self.wizard.incrementProgressBar(translate('BibleDB.Wizard',
+ self.wizard.incrementProgressBar(translate('BiblesPlugin.CSVBible',
'Importing verses... done.'))
Receiver.send_message(u'openlp_process_events')
self.session.commit()
=== modified file 'openlp/plugins/bibles/lib/http.py'
--- openlp/plugins/bibles/lib/http.py 2011-07-08 05:57:39 +0000
+++ openlp/plugins/bibles/lib/http.py 2011-07-13 17:44:31 +0000
@@ -69,10 +69,10 @@
``chapter``
Chapter number.
"""
- log.debug(u'BGExtract.get_bible_chapter("%s", "%s", "%s")', version,
+ log.debug(u'BGExtract.get_bible_chapter("%s", "%s", "%s")', version,
bookname, chapter)
urlbookname = urllib.quote(bookname.encode("utf-8"))
- url_params = u'search=%s+%s&version=%s' % (urlbookname, chapter,
+ url_params = u'search=%s+%s&version=%s' % (urlbookname, chapter,
version)
cleaner = [(re.compile(' |<br />|\'\+\''), lambda match: '')]
soup = get_soup_for_bible_ref(
@@ -203,7 +203,7 @@
``chapter``
Chapter number
"""
- log.debug(u'BSExtract.get_bible_chapter("%s", "%s", "%s")', version,
+ log.debug(u'BSExtract.get_bible_chapter("%s", "%s", "%s")', version,
bookname, chapter)
urlversion = urllib.quote(version.encode("utf-8"))
urlbookname = urllib.quote(bookname.encode("utf-8"))
@@ -230,7 +230,7 @@
def get_books_from_http(self, version):
"""
- Load a list of all books a Bible contains from Bibleserver mobile
+ Load a list of all books a Bible contains from Bibleserver mobile
website.
``version``
@@ -276,7 +276,7 @@
``chapter``
Chapter number
"""
- log.debug(u'CWExtract.get_bible_chapter("%s", "%s", "%s")', version,
+ log.debug(u'CWExtract.get_bible_chapter("%s", "%s", "%s")', version,
bookname, chapter)
urlbookname = bookname.replace(u' ', u'-')
urlbookname = urlbookname.lower()
@@ -389,7 +389,7 @@
"""
self.wizard.progressBar.setMaximum(68)
self.wizard.incrementProgressBar(unicode(translate(
- 'BiblesPlugin.HTTPBible',
+ 'BiblesPlugin.HTTPBible',
'Registering Bible and loading books...')))
self.create_meta(u'download source', self.download_source)
self.create_meta(u'download name', self.download_name)
@@ -415,7 +415,7 @@
self.wizard.progressBar.setMaximum(len(books)+2)
self.wizard.incrementProgressBar(unicode(translate(
'BiblesPlugin.HTTPBible', 'Registering Language...')))
- bible = BiblesResourcesDB.get_webbible(self.download_name,
+ bible = BiblesResourcesDB.get_webbible(self.download_name,
self.download_source.lower())
if bible[u'language_id']:
language_id = bible[u'language_id']
@@ -432,14 +432,14 @@
self.wizard.incrementProgressBar(unicode(translate(
'BiblesPlugin.HTTPBible', 'Importing %s...',
'Importing <book name>...')) % book)
- book_ref_id = self.get_book_ref_id_by_name(book, len(books),
+ book_ref_id = self.get_book_ref_id_by_name(book, len(books),
language_id)
if not book_ref_id:
log.exception(u'Importing books from %s - download name: "%s" '\
'failed' % (self.download_source, self.download_name))
return False
book_details = BiblesResourcesDB.get_book_by_id(book_ref_id)
- log.debug(u'Book details: Name:%s; id:%s; testament_id:%s',
+ log.debug(u'Book details: Name:%s; id:%s; testament_id:%s',
book, book_ref_id, book_details[u'testament_id'])
self.create_book(book, book_ref_id, book_details[u'testament_id'])
if self.stop_import_flag:
@@ -524,7 +524,7 @@
def get_chapter_count(self, book):
"""
Return the number of chapters in a particular book.
-
+
``book``
The book object to get the chapter count for.
"""
@@ -597,14 +597,14 @@
"""
if error_type == u'download':
critical_error_message_box(
- translate('BiblePlugin.HTTPBible', 'Download Error'),
- translate('BiblePlugin.HTTPBible', 'There was a '
+ translate('BiblesPlugin.HTTPBible', 'Download Error'),
+ translate('BiblesPlugin.HTTPBible', 'There was a '
'problem downloading your verse selection. Please check your '
'Internet connection, and if this error continues to occur '
'please consider reporting a bug.'))
elif error_type == u'parse':
critical_error_message_box(
- translate('BiblePlugin.HTTPBible', 'Parse Error'),
- translate('BiblePlugin.HTTPBible', 'There was a '
+ translate('BiblesPlugin.HTTPBible', 'Parse Error'),
+ translate('BiblesPlugin.HTTPBible', 'There was a '
'problem extracting your verse selection. If this error continues '
'to occur please consider reporting a bug.'))
=== modified file 'openlp/plugins/bibles/lib/mediaitem.py'
--- openlp/plugins/bibles/lib/mediaitem.py 2011-07-02 06:48:17 +0000
+++ openlp/plugins/bibles/lib/mediaitem.py 2011-07-13 17:44:31 +0000
@@ -87,7 +87,7 @@
not second_bible:
self.displayResults(bible, second_bible)
elif critical_error_message_box(
- message=translate('BiblePlugin.MediaItem',
+ message=translate('BiblesPlugin.MediaItem',
'You cannot combine single and dual Bible verse search results. '
'Do you want to delete your search results and start a new '
'search?'),
@@ -437,7 +437,7 @@
if verse_count == 0:
self.advancedSearchButton.setEnabled(False)
critical_error_message_box(
- message=translate('BiblePlugin.MediaItem',
+ message=translate('BiblesPlugin.MediaItem',
'Bible not fully loaded.'))
else:
self.advancedSearchButton.setEnabled(True)
@@ -694,8 +694,8 @@
verse.verse, verse.verse))
if passage_not_found:
QtGui.QMessageBox.information(self,
- translate('BiblePlugin.MediaItem', 'Information'),
- unicode(translate('BiblePlugin.MediaItem',
+ translate('BiblesPlugin.MediaItem', 'Information'),
+ unicode(translate('BiblesPlugin.MediaItem',
'The second Bible does not contain all the verses '
'that are in the main Bible. Only verses found in both '
'Bibles will be shown. %d verses have not been '
Follow ups
