raoul/openlp
1
0
Fork 0
forked from openlp/openlp
Code Issues Pull Requests Projects Releases Wiki Activity

Fix a few more strings

Browse Source 
bzr-revno: 1629
This commit is contained in:
Jonathan Corwin 2011-06-11 10:41:11 +01:00
commit 02a0a72b7d
7 changed files with 69 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
openlp/core/lib/mediamanageritem.py
View File

@ -341,8 +341,8 @@ class MediaManagerItem(QtGui.QWidget):
critical_error_message_box( critical_error_message_box(
UiStrings().Duplicate, UiStrings().Duplicate,
unicode(translate('OpenLP.MediaManagerItem', unicode(translate('OpenLP.MediaManagerItem',
'Duplicate file name %s.\nFilename already exists in ' 'Duplicate filename %s.\nThis filename is already in '
'list')) % filename) 'the list')) % filename)
else: else:
newFiles.append(file) newFiles.append(file)
self.loadList(newFiles) self.loadList(newFiles)

2
openlp/core/ui/displaytagform.py
View File

@ -128,7 +128,7 @@ class DisplayTagForm(QtGui.QDialog, Ui_DisplayTagDialog):
tag = { tag = {
u'desc': translate('OpenLP.DisplayTagTab', 'New Tag'), u'desc': translate('OpenLP.DisplayTagTab', 'New Tag'),
u'start tag': u'{n}', u'start tag': u'{n}',
u'start html': translate('OpenLP.DisplayTagTab', '<Html_here>'), u'start html': translate('OpenLP.DisplayTagTab', '<HTML here>'),
u'end tag': u'{/n}', u'end tag': u'{/n}',
u'end html': translate('OpenLP.DisplayTagTab', '</and here>'), u'end html': translate('OpenLP.DisplayTagTab', '</and here>'),
u'protected': False u'protected': False

2
openlp/core/ui/servicemanager.py
View File

@ -629,7 +629,7 @@ class ServiceManager(QtGui.QWidget):
QtGui.QMessageBox.information(self, QtGui.QMessageBox.information(self,
translate('OpenLP.ServiceManager', 'Corrupt File'), translate('OpenLP.ServiceManager', 'Corrupt File'),
translate('OpenLP.ServiceManager', 'This file is either ' translate('OpenLP.ServiceManager', 'This file is either '
'corrupt or not an OpenLP 2.0 service file.')) 'corrupt or it is not an OpenLP 2.0 service file.'))
return return
finally: finally:
if fileTo: if fileTo:

4
openlp/core/ui/starttimeform.py
View File

@ -74,14 +74,14 @@ class StartTimeForm(QtGui.QDialog, Ui_StartTimeDialog):
title=translate('OpenLP.StartTimeForm', title=translate('OpenLP.StartTimeForm',
'Time Validation Error'), 'Time Validation Error'),
message=translate('OpenLP.StartTimeForm', message=translate('OpenLP.StartTimeForm',
'End time is set after the end of the media item')) 'Finish time is set after the end of the media item'))
return return
elif start > end: elif start > end:
critical_error_message_box( critical_error_message_box(
title=translate('OpenLP.StartTimeForm', title=translate('OpenLP.StartTimeForm',
'Time Validation Error'), 'Time Validation Error'),
message=translate('OpenLP.StartTimeForm', message=translate('OpenLP.StartTimeForm',
'Start time is after the End Time of the media item')) 'Start time is after the finish time of the media item'))
return return
self.item[u'service_item'].start_time = start self.item[u'service_item'].start_time = start
self.item[u'service_item'].end_time = end self.item[u'service_item'].end_time = end

10
openlp/plugins/bibles/bibleplugin.py
View File

@ -81,11 +81,11 @@ class BiblePlugin(Plugin):
Perform tasks on application starup Perform tasks on application starup
""" """
if len(self.manager.old_bible_databases): if len(self.manager.old_bible_databases):
if QtGui.QMessageBox.information(self.formparent, if QtGui.QMessageBox.information(self.formparent,
translate('OpenLP', 'Information'), translate('OpenLP', translate('OpenLP', 'Information'), translate('OpenLP',
'Bible format has changed.\nYou have to upgrade your ' 'Bible format has changed.\nYou have to upgrade your '
'existing Bibles.\nShould OpenLP upgrade now?'), 'existing Bibles.\nShould OpenLP upgrade now?'),
QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.Yes | QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.Yes |
QtGui.QMessageBox.No)) == QtGui.QMessageBox.Yes: QtGui.QMessageBox.No)) == QtGui.QMessageBox.Yes:
self.onToolsUpgradeItemTriggered() self.onToolsUpgradeItemTriggered()
@ -120,7 +120,7 @@ class BiblePlugin(Plugin):
translate('BiblePlugin', '&Upgrade older Bibles')) translate('BiblePlugin', '&Upgrade older Bibles'))
self.toolsUpgradeItem.setStatusTip( self.toolsUpgradeItem.setStatusTip(
translate('BiblePlugin', 'Upgrade the Bible databases to the ' translate('BiblePlugin', 'Upgrade the Bible databases to the '
'latest format')) 'latest format.'))
tools_menu.addAction(self.toolsUpgradeItem) tools_menu.addAction(self.toolsUpgradeItem)
QtCore.QObject.connect(self.toolsUpgradeItem, QtCore.QObject.connect(self.toolsUpgradeItem,
QtCore.SIGNAL(u'triggered()'), self.onToolsUpgradeItemTriggered) QtCore.SIGNAL(u'triggered()'), self.onToolsUpgradeItemTriggered)
@ -131,7 +131,7 @@ class BiblePlugin(Plugin):
Upgrade older bible databases. Upgrade older bible databases.
""" """
if not hasattr(self, u'upgrade_wizard'): if not hasattr(self, u'upgrade_wizard'):
self.upgrade_wizard = BibleUpgradeForm(self.formparent, self.upgrade_wizard = BibleUpgradeForm(self.formparent,
self.manager, self) self.manager, self)
# If the import was not cancelled then reload. # If the import was not cancelled then reload.
if self.upgrade_wizard.exec_(): if self.upgrade_wizard.exec_():

116
openlp/plugins/bibles/forms/bibleupgradeform.py
View File

@ -139,7 +139,7 @@ class BibleUpgradeForm(OpenLPWizard):
self.plugin.settingsSection, 1))) self.plugin.settingsSection, 1)))
if filename: if filename:
self.backupDirectoryEdit.setText(filename) self.backupDirectoryEdit.setText(filename)
SettingsManager.set_last_dir(self.plugin.settingsSection, SettingsManager.set_last_dir(self.plugin.settingsSection,
filename, 1) filename, 1)
def onNoBackupCheckBoxToggled(self, checked): def onNoBackupCheckBoxToggled(self, checked):
@ -211,7 +211,7 @@ class BibleUpgradeForm(OpenLPWizard):
self.backupBrowseButton.setIcon(self.openIcon) self.backupBrowseButton.setIcon(self.openIcon)
self.backupBrowseButton.setObjectName(u'BackupBrowseButton') self.backupBrowseButton.setObjectName(u'BackupBrowseButton')
self.backupDirectoryLayout.addWidget(self.backupBrowseButton) self.backupDirectoryLayout.addWidget(self.backupBrowseButton)
self.formLayout.addRow(self.backupDirectoryLabel, self.formLayout.addRow(self.backupDirectoryLabel,
self.backupDirectoryLayout) self.backupDirectoryLayout)
self.backupLayout.addLayout(self.formLayout) self.backupLayout.addLayout(self.formLayout)
self.noBackupCheckBox = QtGui.QCheckBox(self.backupPage) self.noBackupCheckBox = QtGui.QCheckBox(self.backupPage)
@ -282,7 +282,7 @@ class BibleUpgradeForm(OpenLPWizard):
self.verticalWidget[number]) self.verticalWidget[number])
versionInfoLabelName = u'versionInfoLabel[%d]' % number versionInfoLabelName = u'versionInfoLabel[%d]' % number
self.versionInfoLabel[number].setObjectName(versionInfoLabelName) self.versionInfoLabel[number].setObjectName(versionInfoLabelName)
sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Expanding, sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Expanding,
QtGui.QSizePolicy.Preferred) QtGui.QSizePolicy.Preferred)
sizePolicy.setHorizontalStretch(0) sizePolicy.setHorizontalStretch(0)
sizePolicy.setVerticalStretch(0) sizePolicy.setVerticalStretch(0)
@ -304,12 +304,12 @@ class BibleUpgradeForm(OpenLPWizard):
self.versionNameLabel[number] = QtGui.QLabel( self.versionNameLabel[number] = QtGui.QLabel(
self.formWidget[number]) self.formWidget[number])
self.versionNameLabel[number].setObjectName(u'VersionNameLabel') self.versionNameLabel[number].setObjectName(u'VersionNameLabel')
self.formLayoutAttention[number].setWidget(0, self.formLayoutAttention[number].setWidget(0,
QtGui.QFormLayout.LabelRole, self.versionNameLabel[number]) QtGui.QFormLayout.LabelRole, self.versionNameLabel[number])
self.versionNameEdit[number] = QtGui.QLineEdit( self.versionNameEdit[number] = QtGui.QLineEdit(
self.formWidget[number]) self.formWidget[number])
self.versionNameEdit[number].setObjectName(u'VersionNameEdit') self.versionNameEdit[number].setObjectName(u'VersionNameEdit')
self.formLayoutAttention[number].setWidget(0, self.formLayoutAttention[number].setWidget(0,
QtGui.QFormLayout.FieldRole, self.versionNameEdit[number]) QtGui.QFormLayout.FieldRole, self.versionNameEdit[number])
self.versionNameEdit[number].setText(bible.get_name()) self.versionNameEdit[number].setText(bible.get_name())
self.formLayout.addWidget(self.formWidget[number]) self.formLayout.addWidget(self.formWidget[number])
@ -346,13 +346,13 @@ class BibleUpgradeForm(OpenLPWizard):
self.versionNameEdit[number].setParent(None) self.versionNameEdit[number].setParent(None)
self.formLayout.removeWidget(self.formWidget[number]) self.formLayout.removeWidget(self.formWidget[number])
self.formWidget[number].setParent(None) self.formWidget[number].setParent(None)
self.formLayout.removeItem(self.spacerItem) self.formLayout.removeItem(self.spacerItem)
def retranslateUi(self): def retranslateUi(self):
""" """
Allow for localisation of the bible import wizard. Allow for localisation of the bible import wizard.
""" """
self.setWindowTitle(translate('BiblesPlugin.UpgradeWizardForm', self.setWindowTitle(translate('BiblesPlugin.UpgradeWizardForm',
'Bible Upgrade Wizard')) 'Bible Upgrade Wizard'))
self.titleLabel.setText(WizardStrings.HeaderStyle % self.titleLabel.setText(WizardStrings.HeaderStyle %
translate('OpenLP.Ui', 'Welcome to the Bible Upgrade Wizard')) translate('OpenLP.Ui', 'Welcome to the Bible Upgrade Wizard'))
@ -379,7 +379,7 @@ class BibleUpgradeForm(OpenLPWizard):
self.backupDirectoryLabel.setText( self.backupDirectoryLabel.setText(
translate('BiblesPlugin.UpgradeWizardForm', 'Backup Directory:')) translate('BiblesPlugin.UpgradeWizardForm', 'Backup Directory:'))
self.noBackupCheckBox.setText( self.noBackupCheckBox.setText(
translate('BiblesPlugin.UpgradeWizardForm', translate('BiblesPlugin.UpgradeWizardForm',
'There is no need to backup my Bibles')) 'There is no need to backup my Bibles'))
self.selectPage.setTitle( self.selectPage.setTitle(
translate('BiblesPlugin.UpgradeWizardForm', translate('BiblesPlugin.UpgradeWizardForm',
@ -423,8 +423,7 @@ class BibleUpgradeForm(OpenLPWizard):
translate('BiblesPlugin.UpgradeWizardForm', translate('BiblesPlugin.UpgradeWizardForm',
'The backup was not successful.\nTo backup your ' 'The backup was not successful.\nTo backup your '
'Bibles you need permission to write to the given ' 'Bibles you need permission to write to the given '
'directory. If you have write permissions and this ' 'directory.'))
'error still occurs, please report a bug.'))
return False return False
return True return True
elif self.currentPage() == self.selectPage: elif self.currentPage() == self.selectPage:
@ -440,7 +439,7 @@ class BibleUpgradeForm(OpenLPWizard):
return False return False
elif self.manager.exists(version_name): elif self.manager.exists(version_name):
critical_error_message_box( critical_error_message_box(
translate('BiblesPlugin.UpgradeWizardForm', translate('BiblesPlugin.UpgradeWizardForm',
'Bible Exists'), 'Bible Exists'),
translate('BiblesPlugin.UpgradeWizardForm', translate('BiblesPlugin.UpgradeWizardForm',
'This Bible already exists. Please upgrade ' 'This Bible already exists. Please upgrade '
@ -451,15 +450,15 @@ class BibleUpgradeForm(OpenLPWizard):
elif os.path.exists(os.path.join(self.path, clean_filename( elif os.path.exists(os.path.join(self.path, clean_filename(
version_name))) and version_name == filename[1]: version_name))) and version_name == filename[1]:
newfilename = u'old_database_%s' % filename[0] newfilename = u'old_database_%s' % filename[0]
if not os.path.exists(os.path.join(self.path, if not os.path.exists(os.path.join(self.path,
newfilename)): newfilename)):
os.rename(os.path.join(self.path, filename[0]), os.rename(os.path.join(self.path, filename[0]),
os.path.join(self.path, newfilename)) os.path.join(self.path, newfilename))
self.files[number] = [newfilename, filename[1]] self.files[number] = [newfilename, filename[1]]
continue continue
else: else:
critical_error_message_box( critical_error_message_box(
translate('BiblesPlugin.UpgradeWizardForm', translate('BiblesPlugin.UpgradeWizardForm',
'Bible Exists'), 'Bible Exists'),
translate('BiblesPlugin.UpgradeWizardForm', translate('BiblesPlugin.UpgradeWizardForm',
'This Bible already exists. Please upgrade ' 'This Bible already exists. Please upgrade '
@ -469,10 +468,10 @@ class BibleUpgradeForm(OpenLPWizard):
self.formWidget[number].show() self.formWidget[number].show()
self.versionNameEdit[number].setFocus() self.versionNameEdit[number].setFocus()
return False return False
elif os.path.exists(os.path.join(self.path, elif os.path.exists(os.path.join(self.path,
clean_filename(version_name))): clean_filename(version_name))):
critical_error_message_box( critical_error_message_box(
translate('BiblesPlugin.UpgradeWizardForm', translate('BiblesPlugin.UpgradeWizardForm',
'Bible Exists'), 'Bible Exists'),
translate('BiblesPlugin.UpgradeWizardForm', translate('BiblesPlugin.UpgradeWizardForm',
'This Bible already exists. Please upgrade ' 'This Bible already exists. Please upgrade '
@ -521,7 +520,7 @@ class BibleUpgradeForm(OpenLPWizard):
OpenLPWizard.preWizard(self) OpenLPWizard.preWizard(self)
self.progressLabel.setText(translate( self.progressLabel.setText(translate(
'BiblesPlugin.UpgradeWizardForm', 'BiblesPlugin.UpgradeWizardForm',
'Starting upgrading Bible(s)...')) 'Starting Bible upgrade...'))
Receiver.send_message(u'openlp_process_events') Receiver.send_message(u'openlp_process_events')
def performWizard(self): def performWizard(self):
@ -550,21 +549,21 @@ class BibleUpgradeForm(OpenLPWizard):
if not self.checkBox[biblenumber].checkState() == QtCore.Qt.Checked: if not self.checkBox[biblenumber].checkState() == QtCore.Qt.Checked:
continue continue
self.progressBar.reset() self.progressBar.reset()
oldbible = OldBibleDB(self.mediaItem, path=self.path, oldbible = OldBibleDB(self.mediaItem, path=self.path,
file=filename[0]) file=filename[0])
name = filename[1] name = filename[1]
if name is None: if name is None:
delete_file(os.path.join(self.path, filename[0])) delete_file(os.path.join(self.path, filename[0]))
self.incrementProgressBar(unicode(translate( self.incrementProgressBar(unicode(translate(
'BiblesPlugin.UpgradeWizardForm', 'BiblesPlugin.UpgradeWizardForm',
'Upgrading Bible %s of %s: "%s"\nFailed')) % 'Upgrading Bible %s of %s: "%s"\nFailed')) %
(number + 1, self.maxBibles, name), (number + 1, self.maxBibles, name),
self.progressBar.maximum() - self.progressBar.value()) self.progressBar.maximum() - self.progressBar.value())
number += 1 number += 1
continue continue
self.progressLabel.setText(unicode(translate( self.progressLabel.setText(unicode(translate(
'BiblesPlugin.UpgradeWizardForm', 'BiblesPlugin.UpgradeWizardForm',
'Upgrading Bible %s of %s: "%s"\nUpgrading ...')) % 'Upgrading Bible %s of %s: "%s"\nUpgrading ...')) %
(number + 1, self.maxBibles, name)) (number + 1, self.maxBibles, name))
if os.path.exists(os.path.join(self.path, filename[0])): if os.path.exists(os.path.join(self.path, filename[0])):
name = unicode(self.versionNameEdit[biblenumber].text()) name = unicode(self.versionNameEdit[biblenumber].text())
@ -596,26 +595,25 @@ class BibleUpgradeForm(OpenLPWizard):
if not books: if not books:
log.error(u'Upgrading books from %s - download '\ log.error(u'Upgrading books from %s - download '\
u'name: "%s" failed' % ( u'name: "%s" failed' % (
meta_data[u'download source'], meta_data[u'download source'],
meta_data[u'download name'])) meta_data[u'download name']))
delete_database(self.path, clean_filename(name)) delete_database(self.path, clean_filename(name))
del self.newbibles[number] del self.newbibles[number]
critical_error_message_box( critical_error_message_box(
translate('BiblesPlugin.UpgradeWizardForm', translate('BiblesPlugin.UpgradeWizardForm',
'Download Error'), 'Download Error'),
translate('BiblesPlugin.UpgradeWizardForm', translate('BiblesPlugin.UpgradeWizardForm',
'To upgrade your Web Bibles an Internet connection is ' 'To upgrade your Web Bibles an Internet connection is '
'required. If you have a working Internet connection ' 'required.'))
'and this error still occurs, please report a bug.'))
self.incrementProgressBar(unicode(translate( self.incrementProgressBar(unicode(translate(
'BiblesPlugin.UpgradeWizardForm', 'BiblesPlugin.UpgradeWizardForm',
'Upgrading Bible %s of %s: "%s"\nFailed')) % 'Upgrading Bible %s of %s: "%s"\nFailed')) %
(number + 1, self.maxBibles, name), (number + 1, self.maxBibles, name),
self.progressBar.maximum() - self.progressBar.value()) self.progressBar.maximum() - self.progressBar.value())
number += 1 number += 1
continue continue
bible = BiblesResourcesDB.get_webbible( bible = BiblesResourcesDB.get_webbible(
meta_data[u'download name'], meta_data[u'download name'],
meta_data[u'download source'].lower()) meta_data[u'download source'].lower())
if bible and bible[u'language_id']: if bible and bible[u'language_id']:
language_id = bible[u'language_id'] language_id = bible[u'language_id']
@ -628,8 +626,8 @@ class BibleUpgradeForm(OpenLPWizard):
delete_database(self.path, clean_filename(name)) delete_database(self.path, clean_filename(name))
del self.newbibles[number] del self.newbibles[number]
self.incrementProgressBar(unicode(translate( self.incrementProgressBar(unicode(translate(
'BiblesPlugin.UpgradeWizardForm', 'BiblesPlugin.UpgradeWizardForm',
'Upgrading Bible %s of %s: "%s"\nFailed')) % 'Upgrading Bible %s of %s: "%s"\nFailed')) %
(number + 1, self.maxBibles, name), (number + 1, self.maxBibles, name),
self.progressBar.maximum() - self.progressBar.value()) self.progressBar.maximum() - self.progressBar.value())
number += 1 number += 1
@ -640,23 +638,23 @@ class BibleUpgradeForm(OpenLPWizard):
bible_failed = True bible_failed = True
break break
self.incrementProgressBar(unicode(translate( self.incrementProgressBar(unicode(translate(
'BiblesPlugin.UpgradeWizardForm', 'BiblesPlugin.UpgradeWizardForm',
'Upgrading Bible %s of %s: "%s"\n' 'Upgrading Bible %s of %s: "%s"\n'
'Upgrading %s ...')) % 'Upgrading %s ...')) %
(number + 1, self.maxBibles, name, book)) (number + 1, self.maxBibles, name, book))
book_ref_id = self.newbibles[number].\ book_ref_id = self.newbibles[number].\
get_book_ref_id_by_name(book, len(books), language_id) get_book_ref_id_by_name(book, len(books), language_id)
if not book_ref_id: if not book_ref_id:
log.warn(u'Upgrading books from %s - download '\ log.warn(u'Upgrading books from %s - download '\
u'name: "%s" aborted by user' % ( u'name: "%s" aborted by user' % (
meta_data[u'download source'], meta_data[u'download source'],
meta_data[u'download name'])) meta_data[u'download name']))
delete_database(self.path, clean_filename(name)) delete_database(self.path, clean_filename(name))
del self.newbibles[number] del self.newbibles[number]
bible_failed = True bible_failed = True
break break
book_details = BiblesResourcesDB.get_book_by_id(book_ref_id) book_details = BiblesResourcesDB.get_book_by_id(book_ref_id)
db_book = self.newbibles[number].create_book(book, db_book = self.newbibles[number].create_book(book,
book_ref_id, book_details[u'testament_id']) book_ref_id, book_details[u'testament_id'])
# Try to import still downloaded verses # Try to import still downloaded verses
oldbook = oldbible.get_book(book) oldbook = oldbible.get_book(book)
@ -670,8 +668,8 @@ class BibleUpgradeForm(OpenLPWizard):
if self.stop_import_flag: if self.stop_import_flag:
bible_failed = True bible_failed = True
break break
self.newbibles[number].create_verse(db_book.id, self.newbibles[number].create_verse(db_book.id,
int(verse[u'chapter']), int(verse[u'chapter']),
int(verse[u'verse']), unicode(verse[u'text'])) int(verse[u'verse']), unicode(verse[u'text']))
Receiver.send_message(u'openlp_process_events') Receiver.send_message(u'openlp_process_events')
self.newbibles[number].session.commit() self.newbibles[number].session.commit()
@ -685,9 +683,9 @@ class BibleUpgradeForm(OpenLPWizard):
delete_database(self.path, clean_filename(name)) delete_database(self.path, clean_filename(name))
del self.newbibles[number] del self.newbibles[number]
self.incrementProgressBar(unicode(translate( self.incrementProgressBar(unicode(translate(
'BiblesPlugin.UpgradeWizardForm', 'BiblesPlugin.UpgradeWizardForm',
'Upgrading Bible %s of %s: "%s"\nFailed')) % 'Upgrading Bible %s of %s: "%s"\nFailed')) %
(number + 1, self.maxBibles, name), (number + 1, self.maxBibles, name),
self.progressBar.maximum() - self.progressBar.value()) self.progressBar.maximum() - self.progressBar.value())
number += 1 number += 1
continue continue
@ -698,12 +696,12 @@ class BibleUpgradeForm(OpenLPWizard):
bible_failed = True bible_failed = True
break break
self.incrementProgressBar(unicode(translate( self.incrementProgressBar(unicode(translate(
'BiblesPlugin.UpgradeWizardForm', 'BiblesPlugin.UpgradeWizardForm',
'Upgrading Bible %s of %s: "%s"\n' 'Upgrading Bible %s of %s: "%s"\n'
'Upgrading %s ...')) % 'Upgrading %s ...')) %
(number + 1, self.maxBibles, name, book[u'name'])) (number + 1, self.maxBibles, name, book[u'name']))
book_ref_id = self.newbibles[number].\ book_ref_id = self.newbibles[number].\
get_book_ref_id_by_name(book[u'name'], len(books), get_book_ref_id_by_name(book[u'name'], len(books),
language_id) language_id)
if not book_ref_id: if not book_ref_id:
log.warn(u'Upgrading books from %s " '\ log.warn(u'Upgrading books from %s " '\
@ -725,8 +723,8 @@ class BibleUpgradeForm(OpenLPWizard):
if self.stop_import_flag: if self.stop_import_flag:
bible_failed = True bible_failed = True
break break
self.newbibles[number].create_verse(db_book.id, self.newbibles[number].create_verse(db_book.id,
int(verse[u'chapter']), int(verse[u'chapter']),
int(verse[u'verse']), unicode(verse[u'text'])) int(verse[u'verse']), unicode(verse[u'text']))
Receiver.send_message(u'openlp_process_events') Receiver.send_message(u'openlp_process_events')
self.newbibles[number].session.commit() self.newbibles[number].session.commit()
@ -735,16 +733,16 @@ class BibleUpgradeForm(OpenLPWizard):
oldbible.close_connection() oldbible.close_connection()
delete_file(os.path.join(self.path, filename[0])) delete_file(os.path.join(self.path, filename[0]))
self.incrementProgressBar(unicode(translate( self.incrementProgressBar(unicode(translate(
'BiblesPlugin.UpgradeWizardForm', 'BiblesPlugin.UpgradeWizardForm',
'Upgrading Bible %s of %s: "%s"\n' 'Upgrading Bible %s of %s: "%s"\n'
'Done')) % 'Complete')) %
(number + 1, self.maxBibles, name)) (number + 1, self.maxBibles, name))
self.success[biblenumber] = True self.success[biblenumber] = True
else: else:
self.incrementProgressBar(unicode(translate( self.incrementProgressBar(unicode(translate(
'BiblesPlugin.UpgradeWizardForm', 'BiblesPlugin.UpgradeWizardForm',
'Upgrading Bible %s of %s: "%s"\nFailed')) % 'Upgrading Bible %s of %s: "%s"\nFailed')) %
(number + 1, self.maxBibles, name), (number + 1, self.maxBibles, name),
self.progressBar.maximum() - self.progressBar.value()) self.progressBar.maximum() - self.progressBar.value())
delete_database(self.path, clean_filename(name)) delete_database(self.path, clean_filename(name))
number += 1 number += 1
@ -762,7 +760,7 @@ class BibleUpgradeForm(OpenLPWizard):
failed_import += 1 failed_import += 1
if failed_import > 0: if failed_import > 0:
failed_import_text = unicode(translate( failed_import_text = unicode(translate(
'BiblesPlugin.UpgradeWizardForm', 'BiblesPlugin.UpgradeWizardForm',
', %s failed')) % failed_import ', %s failed')) % failed_import
else: else:
failed_import_text = u'' failed_import_text = u''
@ -770,14 +768,14 @@ class BibleUpgradeForm(OpenLPWizard):
if self.include_webbible: if self.include_webbible:
self.progressLabel.setText(unicode( self.progressLabel.setText(unicode(
translate('BiblesPlugin.UpgradeWizardForm', 'Upgrading ' translate('BiblesPlugin.UpgradeWizardForm', 'Upgrading '
'Bible(s): %s successful%s\nPlease note, that verses from ' 'Bible(s): %s successful%s\nPlease note that verses from '
'Web Bibles will be downloaded\non demand and so an ' 'Web Bibles will be downloaded on demand and so an '
'Internet connection is required.')) % 'Internet connection is required.')) %
(successful_import, failed_import_text)) (successful_import, failed_import_text))
else: else:
self.progressLabel.setText(unicode( self.progressLabel.setText(unicode(
translate('BiblesPlugin.UpgradeWizardForm', 'Upgrading ' translate('BiblesPlugin.UpgradeWizardForm', 'Upgrading '
'Bible(s): %s successful%s')) % (successful_import, 'Bible(s): %s successful%s')) % (successful_import,
failed_import_text)) failed_import_text))
else: else:
self.progressLabel.setText( self.progressLabel.setText(

2
openlp/plugins/bibles/lib/mediaitem.py
View File

@ -695,7 +695,7 @@ class BibleMediaItem(MediaManagerItem):
QtGui.QMessageBox.information(self, QtGui.QMessageBox.information(self,
translate('BiblePlugin.MediaItem', 'Information'), translate('BiblePlugin.MediaItem', 'Information'),
unicode(translate('BiblePlugin.MediaItem', unicode(translate('BiblePlugin.MediaItem',
'The second Bibles does not contain all the verses ' 'The second Bible does not contain all the verses '
'that are in the main Bible. Only verses found in both ' 'that are in the main Bible. Only verses found in both '
'Bibles will be shown. %d verses have not been ' 'Bibles will be shown. %d verses have not been '
'included in the results.')) % count, 'included in the results.')) % count,