From 6e1ef3cc707d41c638cf74f0844f3a6aa5741acb Mon Sep 17 00:00:00 2001 From: Frode Woldsund Date: Sun, 6 Jun 2010 16:22:00 +0200 Subject: [PATCH] Fixed translate() function in songsPlugin and songusagePlugin --- openlp/plugins/songs/forms/authorsdialog.py | 12 ++- openlp/plugins/songs/forms/authorsform.py | 19 +++-- openlp/plugins/songs/forms/editsongdialog.py | 76 ++++++++++++------- openlp/plugins/songs/forms/editsongform.py | 30 +++++--- openlp/plugins/songs/forms/editversedialog.py | 30 +++++--- .../plugins/songs/forms/openlpexportdialog.py | 56 +++++++++----- .../plugins/songs/forms/openlpimportdialog.py | 57 +++++++++----- .../songs/forms/opensongexportdialog.py | 54 ++++++++----- .../songs/forms/opensongimportdialog.py | 18 +++-- openlp/plugins/songs/forms/songbookdialog.py | 8 +- openlp/plugins/songs/forms/songbookform.py | 5 +- openlp/plugins/songs/forms/songimportform.py | 38 ++++++---- .../plugins/songs/forms/songimportwizard.py | 75 +++++++++++------- .../songs/forms/songmaintenancedialog.py | 39 ++++++---- .../songs/forms/songmaintenanceform.py | 72 +++++++++++------- openlp/plugins/songs/forms/topicsdialog.py | 6 +- openlp/plugins/songs/forms/topicsform.py | 5 +- openlp/plugins/songs/lib/mediaitem.py | 43 +++++++---- openlp/plugins/songs/lib/songimport.py | 4 +- openlp/plugins/songs/lib/songstab.py | 9 ++- openlp/plugins/songs/songsplugin.py | 11 ++- .../songusage/forms/songusagedeletedialog.py | 3 +- .../songusage/forms/songusagedeleteform.py | 6 +- .../songusage/forms/songusagedetaildialog.py | 13 +++- .../songusage/forms/songusagedetailform.py | 3 +- openlp/plugins/songusage/songusageplugin.py | 7 +- 26 files changed, 454 insertions(+), 245 deletions(-) diff --git a/openlp/plugins/songs/forms/authorsdialog.py b/openlp/plugins/songs/forms/authorsdialog.py index dbd7af077..082b1133d 100644 --- a/openlp/plugins/songs/forms/authorsdialog.py +++ b/openlp/plugins/songs/forms/authorsdialog.py @@ -74,7 +74,11 @@ class Ui_AuthorsDialog(object): QtCore.QMetaObject.connectSlotsByName(AuthorsDialog) def retranslateUi(self, AuthorsDialog): - AuthorsDialog.setWindowTitle(translate('AuthorsForm', 'Author Maintenance')) - self.DisplayLabel.setText(translate('AuthorsForm', 'Display name:')) - self.FirstNameLabel.setText(translate('AuthorsForm', 'First name:')) - self.LastNameLabel.setText(translate('AuthorsForm', 'Last name:')) + AuthorsDialog.setWindowTitle( + translate(u'SongsPlugin.AuthorsForm', u'Author Maintenance')) + self.DisplayLabel.setText( + translate(u'SongsPlugin.AuthorsForm', u'Display name:')) + self.FirstNameLabel.setText( + translate(u'SongsPlugin.AuthorsForm', u'First name:')) + self.LastNameLabel.setText( + translate(u'SongsPlugin.AuthorsForm', u'Last name:')) diff --git a/openlp/plugins/songs/forms/authorsform.py b/openlp/plugins/songs/forms/authorsform.py index 27ec33294..04d0f8c28 100644 --- a/openlp/plugins/songs/forms/authorsform.py +++ b/openlp/plugins/songs/forms/authorsform.py @@ -78,24 +78,27 @@ class AuthorsForm(QtGui.QDialog, Ui_AuthorsDialog): def accept(self): if not self.FirstNameEdit.text(): QtGui.QMessageBox.critical( - self, translate('AuthorsForm','Error'), - translate('AuthorsForm','You need to type in the first name of the author.'), + self, translate(u'SongsPlugin.AuthorsForm', u'Error'), + translate(u'SongsPlugin.AuthorsForm', + u'You need to type in the first name of the author.'), QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.Ok)) self.FirstNameEdit.setFocus() return False elif not self.LastNameEdit.text(): QtGui.QMessageBox.critical( - self, translate('AuthorsForm','Error'), - translate('AuthorsForm','You need to type in the last name of the author.'), + self, translate(u'SongsPlugin.AuthorsForm', u'Error'), + translate(u'SongsPlugin.AuthorsForm', + u'You need to type in the last name of the author.'), QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.Ok)) self.LastNameEdit.setFocus() return False elif not self.DisplayEdit.text(): if QtGui.QMessageBox.critical( - self, translate('AuthorsForm','Error'), - translate('AuthorsForm','You haven\'t set a display name for the ' - 'author, would you like me to combine the first and ' - 'last names for you?'), + self, translate(u'SongsPlugin.AuthorsForm', u'Error'), + translate(u'SongsPlugin.AuthorsForm', + u'You haven\'t set a display name for the ' + u'author, would you like me to combine the first and ' + u'last names for you?'), QtGui.QMessageBox.StandardButtons( QtGui.QMessageBox.Yes | QtGui.QMessageBox.No) ) == QtGui.QMessageBox.Yes: diff --git a/openlp/plugins/songs/forms/editsongdialog.py b/openlp/plugins/songs/forms/editsongdialog.py index a6f2f5b56..a5a525acb 100644 --- a/openlp/plugins/songs/forms/editsongdialog.py +++ b/openlp/plugins/songs/forms/editsongdialog.py @@ -423,36 +423,60 @@ class Ui_EditSongDialog(object): EditSongDialog.setTabOrder(self.CommentsEdit, self.ButtonBox) def retranslateUi(self, EditSongDialog): - EditSongDialog.setWindowTitle(translate('EditSongForm', 'Song Editor')) - self.TitleLabel.setText(translate('EditSongForm', 'Title:')) - self.AlternativeTitleLabel.setText(translate('EditSongForm', 'Alternative Title:')) - self.LyricsLabel.setText(translate('EditSongForm', 'Lyrics:')) - self.VerseOrderLabel.setText(translate('EditSongForm', 'Verse Order:')) - self.VerseAddButton.setText(translate('EditSongForm', 'Add')) - self.VerseEditButton.setText(translate('EditSongForm', 'Edit')) - self.VerseEditAllButton.setText(translate('EditSongForm', 'Edit All')) - self.VerseDeleteButton.setText(translate('EditSongForm', 'Delete')) + EditSongDialog.setWindowTitle( + translate(u'SongsPlugin.EditSongForm', u'Song Editor')) + self.TitleLabel.setText( + translate(u'SongsPlugin.EditSongForm', u'Title:')) + self.AlternativeTitleLabel.setText( + translate(u'SongsPlugin.EditSongForm', u'Alternative Title:')) + self.LyricsLabel.setText( + translate(u'SongsPlugin.EditSongForm', u'Lyrics:')) + self.VerseOrderLabel.setText( + translate(u'SongsPlugin.EditSongForm', u'Verse Order:')) + self.VerseAddButton.setText( + translate(u'SongsPlugin.EditSongForm', u'Add')) + self.VerseEditButton.setText( + translate(u'SongsPlugin.EditSongForm', u'Edit')) + self.VerseEditAllButton.setText( + translate(u'SongsPlugin.EditSongForm', u'Edit All')) + self.VerseDeleteButton.setText( + translate(u'SongsPlugin.EditSongForm', u'Delete')) self.SongTabWidget.setTabText( self.SongTabWidget.indexOf(self.LyricsTab), - translate('EditSongForm', 'Title && Lyrics')) - self.AuthorsGroupBox.setTitle(translate('EditSongForm', 'Authors')) - self.AuthorAddButton.setText(translate('EditSongForm', '&Add to Song')) - self.AuthorRemoveButton.setText(translate('EditSongForm', '&Remove')) + translate(u'SongsPlugin.EditSongForm', u'Title && Lyrics')) + self.AuthorsGroupBox.setTitle( + translate(u'SongsPlugin.EditSongForm', u'Authors')) + self.AuthorAddButton.setText( + translate(u'SongsPlugin.EditSongForm', u'&Add to Song')) + self.AuthorRemoveButton.setText( + translate(u'SongsPlugin.EditSongForm', u'&Remove')) self.MaintenanceButton.setText( - translate('EditSongForm', '&Manage Authors, Topics, Books')) - self.TopicGroupBox.setTitle(translate('EditSongForm', 'Topic')) - self.TopicAddButton.setText(translate('EditSongForm', 'A&dd to Song')) - self.TopicRemoveButton.setText(translate('EditSongForm', 'R&emove')) - self.SongBookGroup.setTitle(translate('EditSongForm', 'Song Book')) + translate(u'SongsPlugin.EditSongForm', + u'&Manage Authors, Topics, Books')) + self.TopicGroupBox.setTitle( + translate(u'SongsPlugin.EditSongForm', u'Topic')) + self.TopicAddButton.setText( + translate(u'SongsPlugin.EditSongForm', u'A&dd to Song')) + self.TopicRemoveButton.setText( + translate(u'SongsPlugin.EditSongForm', u'R&emove')) + self.SongBookGroup.setTitle( + translate(u'SongsPlugin.EditSongForm', u'Song Book')) self.SongTabWidget.setTabText( self.SongTabWidget.indexOf(self.AuthorsTab), - translate('EditSongForm', 'Authors, Topics && Book')) - self.ThemeGroupBox.setTitle(translate('EditSongForm', 'Theme')) - self.ThemeAddButton.setText(translate('EditSongForm', 'Add a Theme')) - self.CopyrightGroupBox.setTitle(translate('EditSongForm', 'Copyright Information')) - self.CopyrightInsertButton.setText(translate('EditSongForm', u'\xa9')) - self.CCLILabel.setText(translate('EditSongForm', 'CCLI Number:')) - self.CommentsGroupBox.setTitle(translate('EditSongForm', 'Comments')) + translate(u'SongsPlugin.EditSongForm', u'Authors, Topics && Book')) + self.ThemeGroupBox.setTitle( + translate(u'SongsPlugin.EditSongForm', u'Theme')) + self.ThemeAddButton.setText( + translate(u'SongsPlugin.EditSongForm', u'Add a Theme')) + self.CopyrightGroupBox.setTitle( + translate(u'SongsPlugin.EditSongForm', u'Copyright Information')) + self.CopyrightInsertButton.setText( + translate('EditSongForm', u'\xa9')) + self.CCLILabel.setText( + translate(u'SongsPlugin.EditSongForm', u'CCLI Number:')) + self.CommentsGroupBox.setTitle( + translate(u'SongsPlugin.EditSongForm', u'Comments')) self.SongTabWidget.setTabText( self.SongTabWidget.indexOf(self.ThemeTab), - translate('EditSongForm', 'Theme, Copyright Info && Comments')) + translate(u'SongsPlugin.EditSongForm', + u'Theme, Copyright Info && Comments')) diff --git a/openlp/plugins/songs/forms/editsongform.py b/openlp/plugins/songs/forms/editsongform.py index 1c61458e0..7c258387d 100644 --- a/openlp/plugins/songs/forms/editsongform.py +++ b/openlp/plugins/songs/forms/editsongform.py @@ -101,7 +101,8 @@ class EditSongForm(QtGui.QDialog, Ui_EditSongDialog): QtCore.QObject.connect(self.VerseOrderEdit, QtCore.SIGNAL(u'lostFocus()'), self.onVerseOrderEditLostFocus) self.previewButton = QtGui.QPushButton() - self.previewButton.setText(translate('EditSongForm','Save && Preview')) + self.previewButton.setText( + translate(u'SongsPlugin.EditSongForm', u'Save && Preview')) self.ButtonBox.addButton( self.previewButton, QtGui.QDialogButtonBox.ActionRole) QtCore.QObject.connect(self.ButtonBox, @@ -460,27 +461,32 @@ class EditSongForm(QtGui.QDialog, Ui_EditSongDialog): if len(self.TitleEditItem.displayText()) == 0: self.SongTabWidget.setCurrentIndex(0) self.TitleEditItem.setFocus() - return False, translate('EditSongForm','You need to enter a song title.') + return False, translate(u'SongsPlugin.EditSongForm', + u'You need to enter a song title.') if self.VerseListWidget.rowCount() == 0: self.SongTabWidget.setCurrentIndex(0) self.VerseListWidget.setFocus() - return False, translate('EditSongForm','You need to enter some verses.') + return False, translate(u'SongsPlugin.EditSongForm', + u'You need to enter some verses.') if self.AuthorsListView.count() == 0: self.SongTabWidget.setCurrentIndex(1) self.AuthorsListView.setFocus() #split the verse list by space and mark lower case for testing - taglist = unicode(translate('EditSongForm',' bitped')) + taglist = unicode(translate(u'SongsPlugin.EditSongForm', u' bitped')) for verse in unicode(self.VerseOrderEdit.text()).lower().split(u' '): if len(verse) > 1: - if (verse[0:1] == u'%s' % translate('EditSongForm','v') or - verse[0:1] == u'%s' % translate('EditSongForm','c')) \ + if (verse[0:1] == u'%s' % translate(u'SongsPlugin.EditSongForm', + u'v') or + verse[0:1] == u'%s' % translate(u'SongsPlugin.EditSongForm', + u'c')) \ and verse[1:].isdigit(): pass else: self.SongTabWidget.setCurrentIndex(0) self.VerseOrderEdit.setFocus() return False, \ - translate('EditSongForm','Invalid verse entry - Vx or Cx') + translate(u'SongsPlugin.EditSongForm', + u'Invalid verse entry - Vx or Cx') else: if taglist.find(verse) > -1: pass @@ -488,8 +494,9 @@ class EditSongForm(QtGui.QDialog, Ui_EditSongDialog): self.SongTabWidget.setCurrentIndex(0) self.VerseOrderEdit.setFocus() return False, \ - translate('EditSongForm',\ - 'Invalid verse entry, values must be I,B,T,P,E,O,Vx,Cx') + translate(u'SongsPlugin.EditSongForm',\ + u'Invalid verse entry, values must be ' + u'I,B,T,P,E,O,Vx,Cx') return True, u'' def onTitleEditItemLostFocus(self): @@ -524,7 +531,8 @@ class EditSongForm(QtGui.QDialog, Ui_EditSongDialog): The Song is valid so as the plugin to add it to preview to see. """ log.debug(u'onPreview') - if button.text() == unicode(translate('EditSongForm','Save && Preview')) \ + if button.text() == unicode( + translate(u'SongsPlugin.EditSongForm', u'Save && Preview')) \ and self.saveSong(): Receiver.send_message(u'songs_preview') @@ -542,7 +550,7 @@ class EditSongForm(QtGui.QDialog, Ui_EditSongDialog): valid, message = self._validate_song() if not valid: QtGui.QMessageBox.critical( - self, translate('EditSongForm','Error'), message, + self, translate(u'SongsPlugin.EditSongForm', u'Error'), message, QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.Ok)) return False self.song.title = unicode(self.TitleEditItem.displayText()) diff --git a/openlp/plugins/songs/forms/editversedialog.py b/openlp/plugins/songs/forms/editversedialog.py index d7a059215..81db6303d 100644 --- a/openlp/plugins/songs/forms/editversedialog.py +++ b/openlp/plugins/songs/forms/editversedialog.py @@ -90,15 +90,25 @@ class Ui_EditVerseDialog(object): QtCore.QMetaObject.connectSlotsByName(EditVerseDialog) def retranslateUi(self, EditVerseDialog): - EditVerseDialog.setWindowTitle(translate('EditVerseForm', 'Edit Verse')) - self.VerseTypeLabel.setText(translate('EditVerseForm', 'Verse Type:')) - self.VerseTypeComboBox.setItemText(0, translate('EditVerseForm', 'Verse')) - self.VerseTypeComboBox.setItemText(1, translate('EditVerseForm', 'Chorus')) - self.VerseTypeComboBox.setItemText(2, translate('EditVerseForm', 'Bridge')) - self.VerseTypeComboBox.setItemText(3, translate('EditVerseForm', 'Pre-Chorus')) - self.VerseTypeComboBox.setItemText(4, translate('EditVerseForm', 'Intro')) - self.VerseTypeComboBox.setItemText(5, translate('EditVerseForm', 'Ending')) - self.VerseTypeComboBox.setItemText(6, translate('EditVerseForm', 'Other')) - self.InsertButton.setText(translate('EditVerseForm', 'Insert')) + EditVerseDialog.setWindowTitle( + translate(u'SongsPlugin.EditVerseForm', u'Edit Verse')) + self.VerseTypeLabel.setText( + translate(u'SongsPlugin.EditVerseForm', u'Verse Type:')) + self.VerseTypeComboBox.setItemText(0, + translate(u'SongsPlugin.EditVerseForm', u'Verse')) + self.VerseTypeComboBox.setItemText(1, + translate(u'SongsPlugin.EditVerseForm', u'Chorus')) + self.VerseTypeComboBox.setItemText(2, + translate(u'SongsPlugin.EditVerseForm', u'Bridge')) + self.VerseTypeComboBox.setItemText(3, + translate(u'SongsPlugin.EditVerseForm', u'Pre-Chorus')) + self.VerseTypeComboBox.setItemText(4, + translate(u'SongsPlugin.EditVerseForm', u'Intro')) + self.VerseTypeComboBox.setItemText(5, + translate(u'SongsPlugin.EditVerseForm', u'Ending')) + self.VerseTypeComboBox.setItemText(6, + translate(u'SongsPlugin.EditVerseForm', u'Other')) + self.InsertButton.setText( + translate(u'SongsPlugin.EditVerseForm', u'Insert')) diff --git a/openlp/plugins/songs/forms/openlpexportdialog.py b/openlp/plugins/songs/forms/openlpexportdialog.py index 2046f2f95..bf8d06349 100644 --- a/openlp/plugins/songs/forms/openlpexportdialog.py +++ b/openlp/plugins/songs/forms/openlpexportdialog.py @@ -286,21 +286,41 @@ class Ui_OpenLPExportDialog(object): QtCore.QMetaObject.connectSlotsByName(OpenLPExportDialog) def retranslateUi(self, OpenLPExportDialog): - OpenLPExportDialog.setWindowTitle(translate('OpenLPExportForm', 'openlp.org Song Exporter')) - self.ExportFileLabel.setText(translate('OpenLPExportForm', 'Select openlp.org export filename:')) - self.ExportListLabel.setText(translate('OpenLPExportForm', 'Full Song List')) - self.ExportListTable.horizontalHeaderItem(0).setText(translate('OpenLPExportForm', 'Song Title')) - self.ExportListTable.horizontalHeaderItem(1).setText(translate('OpenLPExportForm', 'Author')) - self.ExportSelectAllPushButton.setText(translate('OpenLPExportForm', 'Select All')) - self.ExportFilterComboBox.setItemText(0, translate('OpenLPExportForm', 'Lyrics')) - self.ExportFilterComboBox.setItemText(1, translate('OpenLPExportForm', 'Title')) - self.ExportFilterComboBox.setItemText(2, translate('OpenLPExportForm', 'Author')) - self.SelectedListLabel.setText(translate('OpenLPExportForm', 'Song Export List')) - self.SelectedListTable.horizontalHeaderItem(0).setText(translate('OpenLPExportForm', 'Song Title')) - self.SelectedListTable.horizontalHeaderItem(1).setText(translate('OpenLPExportForm', 'Author')) - self.SelectedSelectAllPushButton.setText(translate('OpenLPExportForm', 'Select All')) - self.SelectedRemoveSelectedButton.setText(translate('OpenLPExportForm', 'Remove Selected')) - self.ProgressGroupBox.setTitle(translate('OpenLPExportForm', 'Progress:')) - self.ProgressLabel.setText(translate('OpenLPExportForm', 'Ready to export')) - self.ExportPushButton.setText(translate('OpenLPExportForm', 'Export')) - self.ClosePushButton.setText(translate('OpenLPExportForm', 'Close')) + OpenLPExportDialog.setWindowTitle( + translate(u'SongsPlugin.OpenLPExportForm', + u'openlp.org Song Exporter')) + self.ExportFileLabel.setText( + translate(u'SongsPlugin.OpenLPExportForm', + u'Select openlp.org export filename:')) + self.ExportListLabel.setText( + translate(u'SongsPlugin.OpenLPExportForm', u'Full Song List')) + self.ExportListTable.horizontalHeaderItem(0).setText( + translate(u'SongsPlugin.OpenLPExportForm', u'Song Title')) + self.ExportListTable.horizontalHeaderItem(1).setText( + translate(u'SongsPlugin.OpenLPExportForm', u'Author')) + self.ExportSelectAllPushButton.setText( + translate(u'SongsPlugin.OpenLPExportForm', u'Select All')) + self.ExportFilterComboBox.setItemText(0, + translate(u'SongsPlugin.OpenLPExportForm', u'Lyrics')) + self.ExportFilterComboBox.setItemText(1, + translate(u'SongsPlugin.OpenLPExportForm', u'Title')) + self.ExportFilterComboBox.setItemText(2, + translate(u'SongsPlugin.OpenLPExportForm', u'Author')) + self.SelectedListLabel.setText( + translate(u'SongsPlugin.OpenLPExportForm', u'Song Export List')) + self.SelectedListTable.horizontalHeaderItem(0).setText( + translate(u'SongsPlugin.OpenLPExportForm', u'Song Title')) + self.SelectedListTable.horizontalHeaderItem(1).setText( + translate(u'SongsPlugin.OpenLPExportForm', u'Author')) + self.SelectedSelectAllPushButton.setText( + translate(u'SongsPlugin.OpenLPExportForm', u'Select All')) + self.SelectedRemoveSelectedButton.setText( + translate(u'SongsPlugin.OpenLPExportForm', u'Remove Selected')) + self.ProgressGroupBox.setTitle( + translate(u'SongsPlugin.OpenLPExportForm', u'Progress:')) + self.ProgressLabel.setText( + translate(u'SongsPlugin.OpenLPExportForm', u'Ready to export')) + self.ExportPushButton.setText( + translate(u'SongsPlugin.OpenLPExportForm', u'Export')) + self.ClosePushButton.setText( + translate(u'SongsPlugin.OpenLPExportForm', u'Close')) diff --git a/openlp/plugins/songs/forms/openlpimportdialog.py b/openlp/plugins/songs/forms/openlpimportdialog.py index 8080b5a25..87366d442 100644 --- a/openlp/plugins/songs/forms/openlpimportdialog.py +++ b/openlp/plugins/songs/forms/openlpimportdialog.py @@ -286,21 +286,42 @@ class Ui_OpenLPImportDialog(object): QtCore.QMetaObject.connectSlotsByName(OpenLPImportDialog) def retranslateUi(self, OpenLPImportDialog): - OpenLPImportDialog.setWindowTitle(translate('OpenLPImportForm', 'openlp.org Song Importer')) - self.ImportFileLabel.setText(translate('OpenLPImportForm', 'Select openlp.org songfile to import:')) - self.ImportListLabel.setText(translate('OpenLPImportForm', 'Import File Song List')) - self.ImportListTable.horizontalHeaderItem(0).setText(translate('OpenLPImportForm', 'Song Title')) - self.ImportListTable.horizontalHeaderItem(1).setText(translate('OpenLPImportForm', 'Author')) - self.ImportSelectAllPushButton.setText(translate('OpenLPImportForm', 'Select All')) - self.ImportFilterComboBox.setItemText(0, translate('OpenLPImportForm', 'Lyrics')) - self.ImportFilterComboBox.setItemText(1, translate('OpenLPImportForm', 'Title')) - self.ImportFilterComboBox.setItemText(2, translate('OpenLPImportForm', 'Author')) - self.SelectedListLabel.setText(translate('OpenLPImportForm', 'Song Import List')) - self.SelectedListTable.horizontalHeaderItem(0).setText(translate('OpenLPImportForm', 'Song Title')) - self.SelectedListTable.horizontalHeaderItem(1).setText(translate('OpenLPImportForm', 'Author')) - self.SelectedSelectAllPushButton.setText(translate('OpenLPImportForm', 'Select All')) - self.SelectedRemoveSelectedButton.setText(translate('OpenLPImportForm', 'Remove Selected')) - self.ProgressGroupBox.setTitle(translate('OpenLPImportForm', 'Progress:')) - self.ProgressLabel.setText(translate('OpenLPImportForm', 'Ready to import')) - self.ImportPushButton.setText(translate('OpenLPImportForm', 'Import')) - self.ClosePushButton.setText(translate('OpenLPImportForm', 'Close')) + OpenLPImportDialog.setWindowTitle( + translate(u'SongsPlugin.OpenLPImportForm', + u'openlp.org Song Importer')) + self.ImportFileLabel.setText( + translate(u'SongsPlugin.OpenLPImportForm', + u'Select openlp.org songfile to import:')) + self.ImportListLabel.setText( + translate(u'SongsPlugin.OpenLPImportForm', + u'Import File Song List')) + self.ImportListTable.horizontalHeaderItem(0).setText( + translate(u'SongsPlugin.OpenLPImportForm', u'Song Title')) + self.ImportListTable.horizontalHeaderItem(1).setText( + translate(u'SongsPlugin.OpenLPImportForm', u'Author')) + self.ImportSelectAllPushButton.setText( + translate(u'SongsPlugin.OpenLPImportForm', u'Select All')) + self.ImportFilterComboBox.setItemText(0, + translate(u'SongsPlugin.OpenLPImportForm', u'Lyrics')) + self.ImportFilterComboBox.setItemText(1, + translate(u'SongsPlugin.OpenLPImportForm', u'Title')) + self.ImportFilterComboBox.setItemText(2, + translate(u'SongsPlugin.OpenLPImportForm', u'Author')) + self.SelectedListLabel.setText( + translate(u'SongsPlugin.OpenLPImportForm', u'Song Import List')) + self.SelectedListTable.horizontalHeaderItem(0).setText( + translate(u'SongsPlugin.OpenLPImportForm', u'Song Title')) + self.SelectedListTable.horizontalHeaderItem(1).setText( + translate(u'SongsPlugin.OpenLPImportForm', u'Author')) + self.SelectedSelectAllPushButton.setText( + translate(u'SongsPlugin.OpenLPImportForm', u'Select All')) + self.SelectedRemoveSelectedButton.setText( + translate(u'SongsPlugin.OpenLPImportForm', u'Remove Selected')) + self.ProgressGroupBox.setTitle( + translate(u'SongsPlugin.OpenLPImportForm', u'Progress:')) + self.ProgressLabel.setText( + translate(u'SongsPlugin.OpenLPImportForm', u'Ready to import')) + self.ImportPushButton.setText( + translate(u'SongsPlugin.OpenLPImportForm', u'Import')) + self.ClosePushButton.setText( + translate(u'SongsPlugin.OpenLPImportForm', u'Close')) diff --git a/openlp/plugins/songs/forms/opensongexportdialog.py b/openlp/plugins/songs/forms/opensongexportdialog.py index 1821145ee..8e92879f0 100644 --- a/openlp/plugins/songs/forms/opensongexportdialog.py +++ b/openlp/plugins/songs/forms/opensongexportdialog.py @@ -286,21 +286,39 @@ class Ui_OpenSongExportDialog(object): QtCore.QMetaObject.connectSlotsByName(OpenSongExportDialog) def retranslateUi(self, OpenSongExportDialog): - OpenSongExportDialog.setWindowTitle(translate('OpenSongExportForm', 'OpenSong Song Exporter')) - self.ExportFileLabel.setText(translate('OpenSongExportForm', 'Select OpenSong song folder:')) - self.ExportListLabel.setText(translate('OpenSongExportForm', 'Full Song List')) - self.ExportListTable.horizontalHeaderItem(0).setText(translate('OpenSongExportForm', 'Song Title')) - self.ExportListTable.horizontalHeaderItem(1).setText(translate('OpenSongExportForm', 'Author')) - self.ExportSelectAllPushButton.setText(translate('OpenSongExportForm', 'Select All')) - self.ExportFilterComboBox.setItemText(0, translate('OpenSongExportForm', 'Lyrics')) - self.ExportFilterComboBox.setItemText(1, translate('OpenSongExportForm', 'Title')) - self.ExportFilterComboBox.setItemText(2, translate('OpenSongExportForm', 'Author')) - self.SelectedListLabel.setText(translate('OpenSongExportForm', 'Song Export List')) - self.SelectedListTable.horizontalHeaderItem(0).setText(translate('OpenSongExportForm', 'Song Title')) - self.SelectedListTable.horizontalHeaderItem(1).setText(translate('OpenSongExportForm', 'Author')) - self.SelectedSelectAllPushButton.setText(translate('OpenSongExportForm', 'Select All')) - self.SelectedRemoveSelectedButton.setText(translate('OpenSongExportForm', 'Remove Selected')) - self.ProgressGroupBox.setTitle(translate('OpenSongExportForm', 'Progress:')) - self.ProgressLabel.setText(translate('OpenSongExportForm', 'Ready to export')) - self.ExportPushButton.setText(translate('OpenSongExportForm', 'Export')) - self.ClosePushButton.setText(translate('OpenSongExportForm', 'Close')) + OpenSongExportDialog.setWindowTitle( + translate(u'SongsPlugin.OpenSongExportForm', u'OpenSong Song Exporter')) + self.ExportFileLabel.setText( + translate(u'SongsPlugin.OpenSongExportForm', u'Select OpenSong song folder:')) + self.ExportListLabel.setText( + translate(u'SongsPlugin.OpenSongExportForm', u'Full Song List')) + self.ExportListTable.horizontalHeaderItem(0).setText( + translate(u'SongsPlugin.OpenSongExportForm', u'Song Title')) + self.ExportListTable.horizontalHeaderItem(1).setText( + translate(u'SongsPlugin.OpenSongExportForm', u'Author')) + self.ExportSelectAllPushButton.setText( + translate(u'SongsPlugin.OpenSongExportForm', u'Select All')) + self.ExportFilterComboBox.setItemText(0, + translate(u'SongsPlugin.OpenSongExportForm', u'Lyrics')) + self.ExportFilterComboBox.setItemText(1, + translate(u'SongsPlugin.OpenSongExportForm', u'Title')) + self.ExportFilterComboBox.setItemText(2, + translate(u'SongsPlugin.OpenSongExportForm', u'Author')) + self.SelectedListLabel.setText( + translate(u'SongsPlugin.OpenSongExportForm', u'Song Export List')) + self.SelectedListTable.horizontalHeaderItem(0).setText( + translate(u'SongsPlugin.OpenSongExportForm', u'Song Title')) + self.SelectedListTable.horizontalHeaderItem(1).setText( + translate(u'SongsPlugin.OpenSongExportForm', u'Author')) + self.SelectedSelectAllPushButton.setText( + translate(u'SongsPlugin.OpenSongExportForm', u'Select All')) + self.SelectedRemoveSelectedButton.setText( + translate(u'SongsPlugin.OpenSongExportForm', u'Remove Selected')) + self.ProgressGroupBox.setTitle( + translate(u'SongsPlugin.OpenSongExportForm', u'Progress:')) + self.ProgressLabel.setText( + translate(u'SongsPlugin.OpenSongExportForm', u'Ready to export')) + self.ExportPushButton.setText( + translate(u'SongsPlugin.OpenSongExportForm', u'Export')) + self.ClosePushButton.setText( + translate(u'SongsPlugin.OpenSongExportForm', u'Close')) diff --git a/openlp/plugins/songs/forms/opensongimportdialog.py b/openlp/plugins/songs/forms/opensongimportdialog.py index 9091e08ad..46b135eae 100644 --- a/openlp/plugins/songs/forms/opensongimportdialog.py +++ b/openlp/plugins/songs/forms/opensongimportdialog.py @@ -101,9 +101,15 @@ class Ui_OpenSongImportDialog(object): QtCore.QMetaObject.connectSlotsByName(OpenSongImportDialog) def retranslateUi(self, OpenSongImportDialog): - OpenSongImportDialog.setWindowTitle(translate('OpenSongImportForm', 'OpenSong Song Importer')) - self.ImportFileLabel.setText(translate('OpenSongImportForm', 'OpenSong Folder:')) - self.ProgressGroupBox.setTitle(translate('OpenSongImportForm', 'Progress:')) - self.ProgressLabel.setText(translate('OpenSongImportForm', 'Ready to import')) - self.ImportPushButton.setText(translate('OpenSongImportForm', 'Import')) - self.ClosePushButton.setText(translate('OpenSongImportForm', 'Close')) + OpenSongImportDialog.setWindowTitle( + translate(u'SongsPlugin.OpenSongImportForm', u'OpenSong Song Importer')) + self.ImportFileLabel.setText( + translate(u'SongsPlugin.OpenSongImportForm', u'OpenSong Folder:')) + self.ProgressGroupBox.setTitle( + translate(u'SongsPlugin.OpenSongImportForm', u'Progress:')) + self.ProgressLabel.setText( + translate(u'SongsPlugin.OpenSongImportForm', u'Ready to import')) + self.ImportPushButton.setText( + translate(u'SongsPlugin.OpenSongImportForm', u'Import')) + self.ClosePushButton.setText( + translate(u'SongsPlugin.OpenSongImportForm', u'Close')) diff --git a/openlp/plugins/songs/forms/songbookdialog.py b/openlp/plugins/songs/forms/songbookdialog.py index 3122ed21b..06e27d04e 100644 --- a/openlp/plugins/songs/forms/songbookdialog.py +++ b/openlp/plugins/songs/forms/songbookdialog.py @@ -66,6 +66,8 @@ class Ui_SongBookDialog(object): QtCore.QMetaObject.connectSlotsByName(SongBookDialog) def retranslateUi(self, SongBookDialog): - SongBookDialog.setWindowTitle(translate('SongBookForm', 'Edit Book')) - self.NameLabel.setText(translate('SongBookForm', 'Name:')) - self.PublisherLabel.setText(translate('SongBookForm', 'Publisher:')) + SongBookDialog.setWindowTitle( + translate(u'SongsPlugin.SongBookForm', u'Edit Book')) + self.NameLabel.setText(translate(u'SongsPlugin.SongBookForm', u'Name:')) + self.PublisherLabel.setText( + translate(u'SongsPlugin.SongBookForm', u'Publisher:')) diff --git a/openlp/plugins/songs/forms/songbookform.py b/openlp/plugins/songs/forms/songbookform.py index e3dfb25d7..ad85990f0 100644 --- a/openlp/plugins/songs/forms/songbookform.py +++ b/openlp/plugins/songs/forms/songbookform.py @@ -50,8 +50,9 @@ class SongBookForm(QtGui.QDialog, Ui_SongBookDialog): def accept(self): if not self.NameEdit.text(): QtGui.QMessageBox.critical( - self, translate('SongBookForm','Error'), - translate('SongBookForm','You need to type in a book name!'), + self, translate(u'SongsPlugin.SongBookForm', u'Error'), + translate(u'SongsPlugin.SongBookForm', + u'You need to type in a book name!'), QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.Ok)) self.NameEdit.setFocus() return False diff --git a/openlp/plugins/songs/forms/songimportform.py b/openlp/plugins/songs/forms/songimportform.py index c44a49506..75659da70 100644 --- a/openlp/plugins/songs/forms/songimportform.py +++ b/openlp/plugins/songs/forms/songimportform.py @@ -104,36 +104,43 @@ class ImportWizardForm(QtGui.QWizard, Ui_SongImportWizard): if source_format == SongFormat.OpenLyrics: if self.OpenLyricsFileListWidget.count() == 0: QtGui.QMessageBox.critical(self, - translate('SongImportForm','No OpenLyrics Files Selected'), - translate('SongImportForm','You need to add at least one OpenLyrics ' - 'song file to import from.'), + translate(u'SongsPlugin.SongImportForm', + u'No OpenLyrics Files Selected'), + translate(u'SongsPlugin.SongImportForm', + u'You need to add at least one OpenLyrics ' + u'song file to import from.'), QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.Ok)) self.OpenLyricsAddButton.setFocus() return False elif source_format == SongFormat.OpenSong: if self.OpenSongFileListWidget.count() == 0: QtGui.QMessageBox.critical(self, - translate('SongImportForm','No OpenSong Files Selected'), - translate('SongImportForm','You need to add at least one OpenSong ' - 'song file to import from.'), + translate(u'SongsPlugin.SongImportForm', + u'No OpenSong Files Selected'), + translate(u'SongsPlugin.SongImportForm', + u'You need to add at least one OpenSong ' + u'song file to import from.'), QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.Ok)) self.OpenSongAddButton.setFocus() return False elif source_format == SongFormat.CCLI: if self.CCLIFileListWidget.count() == 0: QtGui.QMessageBox.critical(self, - translate('SongImportForm','No CCLI Files Selected'), - translate('SongImportForm','You need to add at least one CCLI file ' - 'to import from.'), + translate(u'SongsPlugin.SongImportForm', + u'No CCLI Files Selected'), + translate(u'SongsPlugin.SongImportForm', + u'You need to add at least one CCLI file ' + u'to import from.'), QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.Ok)) self.CCLIAddButton.setFocus() return False elif source_format == SongFormat.CSV: if self.CSVFilenameEdit.text().isEmpty(): QtGui.QMessageBox.critical(self, - translate('SongImportForm','No CSV File Selected'), - translate('SongImportForm','You need to specify a CSV file to import ' - 'from.'), + translate(u'SongsPlugin.SongImportForm', + u'No CSV File Selected'), + translate(u'SongsPlugin.SongImportForm', + u'You need to specify a CSV file to import from.'), QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.Ok)) self.CSVFilenameEdit.setFocus() return False @@ -184,7 +191,8 @@ class ImportWizardForm(QtGui.QWizard, Ui_SongImportWizard): self.ImportProgressBar.setMinimum(0) self.ImportProgressBar.setMaximum(1188) self.ImportProgressBar.setValue(0) - self.ImportProgressLabel.setText(translate('SongImportForm','Starting import...')) + self.ImportProgressLabel.setText( + translate(u'SongsPlugin.SongImportForm', u'Starting import...')) Receiver.send_message(u'process_events') def performImport(self): @@ -235,10 +243,10 @@ class ImportWizardForm(QtGui.QWizard, Ui_SongImportWizard): # self.manager.save_meta_data(license_version, license_version, # license_copyright, license_permission) # self.manager.reload_bibles() -# self.ImportProgressLabel.setText(translate('SongImportForm','Finished import.')) +# self.ImportProgressLabel.setText(translate(u'SongsPlugin.SongImportForm', u'Finished import.')) # else: # self.ImportProgressLabel.setText( -# translate('SongImportForm','Your Bible import failed.')) +# translate(u'SongsPlugin.SongImportForm', u'Your Bible import failed.')) # importer.delete() def postImport(self): diff --git a/openlp/plugins/songs/forms/songimportwizard.py b/openlp/plugins/songs/forms/songimportwizard.py index 508195f8b..0556d1665 100644 --- a/openlp/plugins/songs/forms/songimportwizard.py +++ b/openlp/plugins/songs/forms/songimportwizard.py @@ -226,32 +226,55 @@ class Ui_SongImportWizard(object): QtCore.QMetaObject.connectSlotsByName(SongImportWizard) def retranslateUi(self, SongImportWizard): - SongImportWizard.setWindowTitle(translate('SongImportWizard','Song Import Wizard')) + SongImportWizard.setWindowTitle( + translate(u'SongsPlugin.SongImportWizard', u'Song Import Wizard')) self.TitleLabel.setText( '%s' % \ - translate('SongImportWizard','Welcome to the Song Import Wizard')) - self.InformationLabel.setText(translate('SongImportWizard','This wizard will help you ' - 'to import songs from a variety of formats. Click the next button ' - 'below to start the process by selecting a format to import from.')) - self.SourcePage.setTitle(translate('SongImportWizard','Select Import Source')) - self.SourcePage.setSubTitle(translate('SongImportWizard','Select the import format, ' - 'and where to import from.')) - self.FormatLabel.setText(translate('SongImportWizard','Format:')) - self.FormatComboBox.setItemText(0, translate('SongImportWizard','OpenLyrics')) - self.FormatComboBox.setItemText(1, translate('SongImportWizard','OpenSong')) - self.FormatComboBox.setItemText(2, translate('SongImportWizard','CCLI')) - self.FormatComboBox.setItemText(3, translate('SongImportWizard','CSV')) - self.OpenLyricsAddButton.setText(translate('SongImportWizard','Add Files...')) - self.OpenLyricsRemoveButton.setText(translate('SongImportWizard','Remove File(s)')) - self.OpenSongAddButton.setText(translate('SongImportWizard','Add Files...')) - self.OpenSongRemoveButton.setText(translate('SongImportWizard','Remove File(s)')) - self.CCLIAddButton.setText(translate('SongImportWizard','Add Files...')) - self.CCLIRemoveButton.setText(translate('SongImportWizard','Remove File(s)')) - self.CSVFilenameLabel.setText(translate('SongImportWizard','Filename:')) - self.CSVBrowseButton.setText(translate('SongImportWizard','Browse...')) - self.ImportPage.setTitle(translate('SongImportWizard','Importing')) - self.ImportPage.setSubTitle(translate('SongImportWizard','Please wait while your songs ' - 'are imported.')) - self.ImportProgressLabel.setText(translate('SongImportWizard','Ready.')) - self.ImportProgressBar.setFormat(translate('SongImportWizard','%p%')) + translate(u'SongsPlugin.SongImportWizard', + u'Welcome to the Song Import Wizard')) + self.InformationLabel.setText( + translate(u'SongsPlugin.SongImportWizard', + u'This wizard will help you to import songs from a variety of ' + u'formats. Click the next button below to start the process by ' + u'selecting a format to import from.')) + self.SourcePage.setTitle( + translate(u'SongsPlugin.SongImportWizard', u'Select Import Source')) + self.SourcePage.setSubTitle( + translate(u'SongsPlugin.SongImportWizard', + u'Select the import format, and where to import from.')) + self.FormatLabel.setText( + translate(u'SongsPlugin.SongImportWizard', u'Format:')) + self.FormatComboBox.setItemText(0, + translate(u'SongsPlugin.SongImportWizard', u'OpenLyrics')) + self.FormatComboBox.setItemText(1, + translate(u'SongsPlugin.SongImportWizard', u'OpenSong')) + self.FormatComboBox.setItemText(2, + translate(u'SongsPlugin.SongImportWizard', u'CCLI')) + self.FormatComboBox.setItemText(3, + translate(u'SongsPlugin.SongImportWizard', u'CSV')) + self.OpenLyricsAddButton.setText( + translate(u'SongsPlugin.SongImportWizard', u'Add Files...')) + self.OpenLyricsRemoveButton.setText( + translate(u'SongsPlugin.SongImportWizard', u'Remove File(s)')) + self.OpenSongAddButton.setText( + translate(u'SongsPlugin.SongImportWizard', u'Add Files...')) + self.OpenSongRemoveButton.setText( + translate(u'SongsPlugin.SongImportWizard', u'Remove File(s)')) + self.CCLIAddButton.setText( + translate(u'SongsPlugin.SongImportWizard', u'Add Files...')) + self.CCLIRemoveButton.setText( + translate(u'SongsPlugin.SongImportWizard', u'Remove File(s)')) + self.CSVFilenameLabel.setText( + translate(u'SongsPlugin.SongImportWizard', u'Filename:')) + self.CSVBrowseButton.setText( + translate(u'SongsPlugin.SongImportWizard', u'Browse...')) + self.ImportPage.setTitle( + translate(u'SongsPlugin.SongImportWizard', u'Importing')) + self.ImportPage.setSubTitle( + translate(u'SongsPlugin.SongImportWizard', + u'Please wait while your songs are imported.')) + self.ImportProgressLabel.setText( + translate(u'SongsPlugin.SongImportWizard', u'Ready.')) + self.ImportProgressBar.setFormat( + translate(u'SongsPlugin.SongImportWizard', u'%p%')) diff --git a/openlp/plugins/songs/forms/songmaintenancedialog.py b/openlp/plugins/songs/forms/songmaintenancedialog.py index a8751b132..bb20dd6e0 100644 --- a/openlp/plugins/songs/forms/songmaintenancedialog.py +++ b/openlp/plugins/songs/forms/songmaintenancedialog.py @@ -208,16 +208,29 @@ class Ui_SongMaintenanceDialog(object): QtCore.QMetaObject.connectSlotsByName(SongMaintenanceDialog) def retranslateUi(self, SongMaintenanceDialog): - SongMaintenanceDialog.setWindowTitle(translate('SongMaintenanceForm', 'Song Maintenance')) - self.TypeListWidget.item(0).setText(translate('SongMaintenanceForm', 'Authors')) - self.TypeListWidget.item(1).setText(translate('SongMaintenanceForm', 'Topics')) - self.TypeListWidget.item(2).setText(translate('SongMaintenanceForm', 'Books/Hymnals')) - self.AuthorAddButton.setText(translate('SongMaintenanceForm', 'Add')) - self.AuthorEditButton.setText(translate('SongMaintenanceForm', 'Edit')) - self.AuthorDeleteButton.setText(translate('SongMaintenanceForm', 'Delete')) - self.TopicAddButton.setText(translate('SongMaintenanceForm', 'Add')) - self.TopicEditButton.setText(translate('SongMaintenanceForm', 'Edit')) - self.TopicDeleteButton.setText(translate('SongMaintenanceForm', 'Delete')) - self.BookAddButton.setText(translate('SongMaintenanceForm', 'Add')) - self.BookEditButton.setText(translate('SongMaintenanceForm', 'Edit')) - self.BookDeleteButton.setText(translate('SongMaintenanceForm', 'Delete')) + SongMaintenanceDialog.setWindowTitle( + translate(u'SongsPlugin.SongMaintenanceForm', u'Song Maintenance')) + self.TypeListWidget.item(0).setText( + translate(u'SongsPlugin.SongMaintenanceForm', u'Authors')) + self.TypeListWidget.item(1).setText( + translate(u'SongsPlugin.SongMaintenanceForm', u'Topics')) + self.TypeListWidget.item(2).setText( + translate(u'SongsPlugin.SongMaintenanceForm', u'Books/Hymnals')) + self.AuthorAddButton.setText( + translate(u'SongsPlugin.SongMaintenanceForm', u'Add')) + self.AuthorEditButton.setText( + translate(u'SongsPlugin.SongMaintenanceForm', u'Edit')) + self.AuthorDeleteButton.setText( + translate(u'SongsPlugin.SongMaintenanceForm', u'Delete')) + self.TopicAddButton.setText( + translate(u'SongsPlugin.SongMaintenanceForm', u'Add')) + self.TopicEditButton.setText( + translate(u'SongsPlugin.SongMaintenanceForm', u'Edit')) + self.TopicDeleteButton.setText( + translate(u'SongsPlugin.SongMaintenanceForm', u'Delete')) + self.BookAddButton.setText( + translate(u'SongsPlugin.SongMaintenanceForm', u'Add')) + self.BookEditButton.setText( + translate(u'SongsPlugin.SongMaintenanceForm', u'Edit')) + self.BookDeleteButton.setText( + translate(u'SongsPlugin.SongMaintenanceForm', u'Delete')) diff --git a/openlp/plugins/songs/forms/songmaintenanceform.py b/openlp/plugins/songs/forms/songmaintenanceform.py index 219c2e213..33d158e6e 100644 --- a/openlp/plugins/songs/forms/songmaintenanceform.py +++ b/openlp/plugins/songs/forms/songmaintenanceform.py @@ -140,8 +140,10 @@ class SongMaintenanceForm(QtGui.QDialog, Ui_SongMaintenanceDialog): self.resetAuthors() else: QtGui.QMessageBox.critical( - self, translate('SongMaintenanceForm','Error'), - translate('SongMaintenanceForm','Couldn\'t add your author.')) + self, translate(u'SongsPlugin.SongMaintenanceForm', + u'Error'), + translate(u'SongsPlugin.SongMaintenanceForm', + u'Couldn\'t add your author.')) def onTopicAddButtonClick(self): if self.topicform.exec_(): @@ -151,8 +153,10 @@ class SongMaintenanceForm(QtGui.QDialog, Ui_SongMaintenanceDialog): self.resetTopics() else: QtGui.QMessageBox.critical( - self, translate('SongMaintenanceForm','Error'), - translate('SongMaintenanceForm','Couldn\'t add your topic.')) + self, translate(u'SongsPlugin.SongMaintenanceForm', + u'Error'), + translate(u'SongsPlugin.SongMaintenanceForm', + u'Couldn\'t add your topic.')) def onBookAddButtonClick(self): if self.bookform.exec_(): @@ -163,8 +167,10 @@ class SongMaintenanceForm(QtGui.QDialog, Ui_SongMaintenanceDialog): self.resetBooks() else: QtGui.QMessageBox.critical( - self, translate('SongMaintenanceForm','Error'), - translate('SongMaintenanceForm','Couldn\'t add your book.')) + self, translate(u'SongsPlugin.SongMaintenanceForm', + u'Error'), + translate(u'SongsPlugin.SongMaintenanceForm', + u'Couldn\'t add your book.')) def onAuthorEditButtonClick(self): author_id = self._getCurrentItemId(self.AuthorsListWidget) @@ -185,8 +191,10 @@ class SongMaintenanceForm(QtGui.QDialog, Ui_SongMaintenanceDialog): self.resetAuthors() else: QtGui.QMessageBox.critical( - self, translate('SongMaintenanceForm','Error'), - translate('SongMaintenanceForm','Couldn\'t save your author.')) + self, translate(u'SongsPlugin.SongMaintenanceForm', + u'Error'), + translate(u'SongsPlugin.SongMaintenanceForm', + u'Couldn\'t save your author.')) def onTopicEditButtonClick(self): topic_id = self._getCurrentItemId(self.TopicsListWidget) @@ -199,8 +207,10 @@ class SongMaintenanceForm(QtGui.QDialog, Ui_SongMaintenanceDialog): self.resetTopics() else: QtGui.QMessageBox.critical( - self, translate('SongMaintenanceForm','Error'), - translate('SongMaintenanceForm','Couldn\'t save your topic.')) + self, translate(u'SongsPlugin.SongMaintenanceForm', + u'Error'), + translate(u'SongsPlugin.SongMaintenanceForm', + u'Couldn\'t save your topic.')) def onBookEditButtonClick(self): book_id = self._getCurrentItemId(self.BooksListWidget) @@ -216,8 +226,10 @@ class SongMaintenanceForm(QtGui.QDialog, Ui_SongMaintenanceDialog): self.resetBooks() else: QtGui.QMessageBox.critical( - self, translate('SongMaintenanceForm','Error'), - translate('SongMaintenanceForm','Couldn\'t save your book.')) + self, translate(u'SongsPlugin.SongMaintenanceForm', + u'Error'), + translate(u'SongsPlugin.SongMaintenanceForm', + u'Couldn\'t save your book.')) def onAuthorDeleteButtonClick(self): """ @@ -226,11 +238,13 @@ class SongMaintenanceForm(QtGui.QDialog, Ui_SongMaintenanceDialog): self._deleteItem( self.AuthorsListWidget, self.songmanager.get_author, self.songmanager.delete_author, self.resetAuthors, - translate('SongMaintenanceForm','Delete Author'), - translate('SongMaintenanceForm','Are you sure you want to delete the selected author?'), - translate('SongMaintenanceForm','This author can\'t be deleted, they are currently ' - 'assigned to at least one song.'), - translate('SongMaintenanceForm','No author selected!')) + translate(u'SongsPlugin.SongMaintenanceForm', u'Delete Author'), + translate(u'SongsPlugin.SongMaintenanceForm', + u'Are you sure you want to delete the selected author?'), + translate(u'SongsPlugin.SongMaintenanceForm', + u'This author can\'t be deleted, they are currently ' + u'assigned to at least one song.'), + translate(u'SongsPlugin.SongMaintenanceForm', u'No author selected!')) def onTopicDeleteButtonClick(self): """ @@ -239,11 +253,13 @@ class SongMaintenanceForm(QtGui.QDialog, Ui_SongMaintenanceDialog): self._deleteItem( self.TopicsListWidget, self.songmanager.get_topic, self.songmanager.delete_topic, self.resetTopics, - translate('SongMaintenanceForm','Delete Topic'), - translate('SongMaintenanceForm','Are you sure you want to delete the selected topic?'), - translate('SongMaintenanceForm','This topic can\'t be deleted, it is currently ' - 'assigned to at least one song.'), - translate('SongMaintenanceForm','No topic selected!')) + translate(u'SongsPlugin.SongMaintenanceForm', u'Delete Topic'), + translate(u'SongsPlugin.SongMaintenanceForm', + u'Are you sure you want to delete the selected topic?'), + translate(u'SongsPlugin.SongMaintenanceForm', + u'This topic can\'t be deleted, it is currently ' + u'assigned to at least one song.'), + translate(u'SongsPlugin.SongMaintenanceForm', u'No topic selected!')) def onBookDeleteButtonClick(self): """ @@ -252,8 +268,10 @@ class SongMaintenanceForm(QtGui.QDialog, Ui_SongMaintenanceDialog): self._deleteItem( self.BooksListWidget, self.songmanager.get_book, self.songmanager.delete_book, self.resetBooks, - translate('SongMaintenanceForm','Delete Book'), - translate('SongMaintenanceForm','Are you sure you want to delete the selected book?'), - translate('SongMaintenanceForm','This book can\'t be deleted, it is currently ' - 'assigned to at least one song.'), - translate('SongMaintenanceForm','No book selected!')) + translate(u'SongsPlugin.SongMaintenanceForm', u'Delete Book'), + translate(u'SongsPlugin.SongMaintenanceForm', + u'Are you sure you want to delete the selected book?'), + translate(u'SongsPlugin.SongMaintenanceForm', + u'This book can\'t be deleted, it is currently ' + u'assigned to at least one song.'), + translate(u'SongsPlugin.SongMaintenanceForm', u'No book selected!')) diff --git a/openlp/plugins/songs/forms/topicsdialog.py b/openlp/plugins/songs/forms/topicsdialog.py index a78d905f4..3ed9da3c3 100644 --- a/openlp/plugins/songs/forms/topicsdialog.py +++ b/openlp/plugins/songs/forms/topicsdialog.py @@ -60,5 +60,7 @@ class Ui_TopicsDialog(object): QtCore.QMetaObject.connectSlotsByName(TopicsDialog) def retranslateUi(self, TopicsDialog): - TopicsDialog.setWindowTitle(translate('TopicsForm', 'Topic Maintenance')) - self.NameLabel.setText(translate('TopicsForm', 'Topic name:')) + TopicsDialog.setWindowTitle( + translate(u'SongsPlugin.TopicsForm', u'Topic Maintenance')) + self.NameLabel.setText( + translate(u'SongsPlugin.TopicsForm', u'Topic name:')) diff --git a/openlp/plugins/songs/forms/topicsform.py b/openlp/plugins/songs/forms/topicsform.py index 1784fae16..fa9eeb7c0 100644 --- a/openlp/plugins/songs/forms/topicsform.py +++ b/openlp/plugins/songs/forms/topicsform.py @@ -49,8 +49,9 @@ class TopicsForm(QtGui.QDialog, Ui_TopicsDialog): def accept(self): if not self.NameEdit.text(): QtGui.QMessageBox.critical( - self, translate('TopicsForm','Error'), - translate('TopicsForm','You need to type in a topic name!'), + self, translate(u'SongsPlugin.TopicsForm', u'Error'), + translate(u'SongsPlugin.TopicsForm', + u'You need to type in a topic name!'), QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.Ok)) self.NameEdit.setFocus() return False diff --git a/openlp/plugins/songs/lib/mediaitem.py b/openlp/plugins/songs/lib/mediaitem.py index 1d1a96623..240b5ea93 100644 --- a/openlp/plugins/songs/lib/mediaitem.py +++ b/openlp/plugins/songs/lib/mediaitem.py @@ -60,7 +60,7 @@ class SongMediaItem(MediaManagerItem): self.remoteSong = -1 def initPluginNameVisible(self): - self.PluginNameVisible = translate('mediaItem','Song') + self.PluginNameVisible = translate(u'SongsPlugin.MediaItem', u'Song') def requiredIcons(self): MediaManagerItem.requiredIcons(self) @@ -69,8 +69,10 @@ class SongMediaItem(MediaManagerItem): def addEndHeaderBar(self): self.addToolbarSeparator() ## Song Maintenance Button ## - self.addToolbarButton(translate('mediaItem','Song Maintenance'), - translate('mediaItem','Maintain the lists of authors, topics and books'), + self.addToolbarButton( + translate(u'SongsPlugin.MediaItem', u'Song Maintenance'), + translate(u'SongsPlugin.MediaItem', + u'Maintain the lists of authors, topics and books'), ':/songs/song_maintenance.png', self.onSongMaintenanceClick) self.PageLayout.setSpacing(4) self.SearchLayout = QtGui.QFormLayout() @@ -139,15 +141,22 @@ class SongMediaItem(MediaManagerItem): QtCore.QVariant(u'False')).toBool() def retranslateUi(self): - self.SearchTextLabel.setText(translate('mediaItem','Search:')) - self.SearchTypeLabel.setText(translate('mediaItem','Type:')) - self.ClearTextButton.setText(translate('mediaItem','Clear')) - self.SearchTextButton.setText(translate('mediaItem','Search')) + self.SearchTextLabel.setText( + translate(u'SongsPlugin.MediaItem', u'Search:')) + self.SearchTypeLabel.setText( + translate(u'SongsPlugin.MediaItem', u'Type:')) + self.ClearTextButton.setText( + translate(u'SongsPlugin.MediaItem', u'Clear')) + self.SearchTextButton.setText( + translate(u'SongsPlugin.MediaItem', u'Search')) def initialise(self): - self.SearchTypeComboBox.addItem(translate('mediaItem','Titles')) - self.SearchTypeComboBox.addItem(translate('mediaItem','Lyrics')) - self.SearchTypeComboBox.addItem(translate('mediaItem','Authors')) + self.SearchTypeComboBox.addItem( + translate(u'SongsPlugin.MediaItem', u'Titles')) + self.SearchTypeComboBox.addItem( + translate(u'SongsPlugin.MediaItem', u'Lyrics')) + self.SearchTypeComboBox.addItem( + translate(u'SongsPlugin.MediaItem', u'Authors')) self.configUpdated() def onSearchTextButtonClick(self): @@ -203,7 +212,8 @@ class SongMediaItem(MediaManagerItem): self.ListView.clear() for author in searchresults: for song in author.songs: - song_detail = unicode(translate('mediaItem','%s (%s)' % \ + song_detail = unicode( + translate(u'SongsPlugin.MediaItem', u'%s (%s)' % \ (unicode(author.display_name), unicode(song.title)))) song_name = QtGui.QListWidgetItem(song_detail) song_name.setData(QtCore.Qt.UserRole, QtCore.QVariant(song.id)) @@ -281,12 +291,15 @@ class SongMediaItem(MediaManagerItem): items = self.ListView.selectedIndexes() if items: if len(items) == 1: - del_message = translate('mediaItem','Delete song?') + del_message = translate(u'SongsPlugin.MediaItem', + u'Delete song?') else: del_message = unicode( - translate('mediaItem','Delete %d songs?')) % len(items) + translate(u'SongsPlugin.MediaItem', + u'Delete %d songs?')) % len(items) ans = QtGui.QMessageBox.question(self, - translate('mediaItem','Delete Confirmation'), del_message, + translate(u'SongsPlugin.MediaItem', u'Delete Confirmation'), + del_message, QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.Ok| QtGui.QMessageBox.Cancel), QtGui.QMessageBox.Ok) @@ -367,7 +380,7 @@ class SongMediaItem(MediaManagerItem): raw_footer.append(author_list) raw_footer.append(song.copyright ) raw_footer.append(unicode( - translate('mediaItem','CCLI Licence: ') + ccli)) + translate(u'SongsPlugin.MediaItem', u'CCLI Licence: ') + ccli)) service_item.raw_footer = raw_footer service_item.audit = [ song.title, author_audit, song.copyright, song.ccli_number diff --git a/openlp/plugins/songs/lib/songimport.py b/openlp/plugins/songs/lib/songimport.py index 08f39954e..b697f508c 100644 --- a/openlp/plugins/songs/lib/songimport.py +++ b/openlp/plugins/songs/lib/songimport.py @@ -63,9 +63,9 @@ class SongImport(object): self.versecount = 0 self.choruscount = 0 self.copyright_string = unicode(QtGui.QApplication.translate( \ - u'SongImport', u'copyright')) + u'SongsPlugin.SongImport', u'copyright')) self.copyright_symbol = unicode(QtGui.QApplication.translate( \ - u'SongImport', u'©')) + u'SongsPlugin.SongImport', u'©')) @staticmethod def process_songs_text(manager, text): diff --git a/openlp/plugins/songs/lib/songstab.py b/openlp/plugins/songs/lib/songstab.py index 327105554..f4dab9d20 100644 --- a/openlp/plugins/songs/lib/songstab.py +++ b/openlp/plugins/songs/lib/songstab.py @@ -36,7 +36,7 @@ class SongsTab(SettingsTab): def setupUi(self): self.setObjectName(u'SongsTab') - self.tabTitleVisible = translate('SongsTab','Songs') + self.tabTitleVisible = translate(u'SongsPlugin.SongsTab', u'Songs') self.SongsLayout = QtGui.QFormLayout(self) self.SongsLayout.setObjectName(u'SongsLayout') self.SongsModeGroupBox = QtGui.QGroupBox(self) @@ -61,11 +61,12 @@ class SongsTab(SettingsTab): self.SongBarActiveCheckBoxChanged) def retranslateUi(self): - self.SongsModeGroupBox.setTitle(translate('SongsTab','Songs Mode')) + self.SongsModeGroupBox.setTitle( + translate(u'SongsPlugin.SongsTab', u'Songs Mode')) self.SearchAsTypeCheckBox.setText( - translate('SongsTab','Enable search as you type')) + translate(u'SongsPlugin.SongsTab', u'Enable search as you type')) self.SongBarActiveCheckBox.setText( - translate('SongsTab','Display Verses on Live Tool bar')) + translate(u'SongsPlugin.SongsTab', u'Display Verses on Live Tool bar')) def onSearchAsTypeCheckBoxChanged(self, check_state): self.song_search = False diff --git a/openlp/plugins/songs/songsplugin.py b/openlp/plugins/songs/songsplugin.py index 06f3b5656..f13cf80ec 100644 --- a/openlp/plugins/songs/songsplugin.py +++ b/openlp/plugins/songs/songsplugin.py @@ -150,7 +150,8 @@ class SongsPlugin(Plugin): def onImportSofItemClick(self): filenames = QtGui.QFileDialog.getOpenFileNames( - None, translate('Songsplugin','Open Songs of Fellowship file'), + None, translate(u'SongsPlugin.Songsplugin', + u'Open Songs of Fellowship file'), u'', u'Songs of Fellowship file (*.rtf *.RTF)') try: for filename in filenames: @@ -170,15 +171,17 @@ class SongsPlugin(Plugin): def onImportOooItemClick(self): filenames = QtGui.QFileDialog.getOpenFileNames( - None, translate('Songsplugin','Open documents or presentations'), + None, translate(u'SongsPlugin.Songsplugin', + u'Open documents or presentations'), u'', u'All Files(*.*)') oooimport = OooImport(self.manager) oooimport.import_docs(filenames) Receiver.send_message(u'songs_load_list') def about(self): - about_text = translate('Songsplugin','Song Plugin
' - 'This plugin allows songs to be managed and displayed.') + about_text = translate(u'SongsPlugin.Songsplugin', + u'Song Plugin
' + u'This plugin allows songs to be managed and displayed.') return about_text def can_delete_theme(self, theme): diff --git a/openlp/plugins/songusage/forms/songusagedeletedialog.py b/openlp/plugins/songusage/forms/songusagedeletedialog.py index 02b7496b2..fc44a1c18 100644 --- a/openlp/plugins/songusage/forms/songusagedeletedialog.py +++ b/openlp/plugins/songusage/forms/songusagedeletedialog.py @@ -58,4 +58,5 @@ class Ui_SongUsageDeleteDialog(object): QtCore.QMetaObject.connectSlotsByName(SongUsageDeleteDialog) def retranslateUi(self, SongUsageDeleteDialog): - SongUsageDeleteDialog.setWindowTitle(translate('AuditDeleteDialog', 'Song Usage Delete')) + SongUsageDeleteDialog.setWindowTitle( + translate(u'SongsPlugin.AuditDeleteDialog', u'Song Usage Delete')) diff --git a/openlp/plugins/songusage/forms/songusagedeleteform.py b/openlp/plugins/songusage/forms/songusagedeleteform.py index a494dd49f..92aad690b 100644 --- a/openlp/plugins/songusage/forms/songusagedeleteform.py +++ b/openlp/plugins/songusage/forms/songusagedeleteform.py @@ -42,8 +42,10 @@ class SongUsageDeleteForm(QtGui.QDialog, Ui_SongUsageDeleteDialog): def accept(self): ret = QtGui.QMessageBox.question(self, - translate('SongUsageDeleteForm','Delete Selected Song Usage Events?'), - translate('SongUsageDeleteForm','Are you sure you want to delete selected Song Usage data?'), + translate(u'SongsPlugin.SongUsageDeleteForm', + u'Delete Selected Song Usage Events?'), + translate(u'SongsPlugin.SongUsageDeleteForm', + u'Are you sure you want to delete selected Song Usage data?'), QtGui.QMessageBox.StandardButtons( QtGui.QMessageBox.Ok | QtGui.QMessageBox.Cancel), diff --git a/openlp/plugins/songusage/forms/songusagedetaildialog.py b/openlp/plugins/songusage/forms/songusagedetaildialog.py index 9e25651ab..7b69e21fa 100644 --- a/openlp/plugins/songusage/forms/songusagedetaildialog.py +++ b/openlp/plugins/songusage/forms/songusagedetaildialog.py @@ -87,7 +87,12 @@ class Ui_SongUsageDetailDialog(object): QtCore.QMetaObject.connectSlotsByName(SongUsageDetailDialog) def retranslateUi(self, SongUsageDetailDialog): - SongUsageDetailDialog.setWindowTitle(translate('AuditDetailDialog', 'Song Usage Extraction')) - self.DateRangeGroupBox.setTitle(translate('AuditDetailDialog', 'Select Date Range')) - self.ToLabel.setText(translate('AuditDetailDialog', 'to')) - self.FileGroupBox.setTitle(translate('AuditDetailDialog', 'Report Location')) + SongUsageDetailDialog.setWindowTitle( + translate(u'SongsPlugin.AuditDetailDialog', + u'Song Usage Extraction')) + self.DateRangeGroupBox.setTitle( + translate(u'SongsPlugin.AuditDetailDialog', u'Select Date Range')) + self.ToLabel.setText( + translate(u'SongsPlugin.AuditDetailDialog', u'to')) + self.FileGroupBox.setTitle( + translate(u'SongsPlugin.AuditDetailDialog', u'Report Location')) diff --git a/openlp/plugins/songusage/forms/songusagedetailform.py b/openlp/plugins/songusage/forms/songusagedetailform.py index 7a39480b6..2a4dfb39e 100644 --- a/openlp/plugins/songusage/forms/songusagedetailform.py +++ b/openlp/plugins/songusage/forms/songusagedetailform.py @@ -61,7 +61,8 @@ class SongUsageDetailForm(QtGui.QDialog, Ui_SongUsageDetailDialog): def defineOutputLocation(self): path = QtGui.QFileDialog.getExistingDirectory(self, - translate('SongUsageDetailForm','Output File Location'), + translate(u'SongsPlugin.SongUsageDetailForm', + u'Output File Location'), SettingsManager.get_last_dir(self.parent.settingsSection, 1)) path = unicode(path) if path != u'': diff --git a/openlp/plugins/songusage/songusageplugin.py b/openlp/plugins/songusage/songusageplugin.py index c05562428..6cbb08e1a 100644 --- a/openlp/plugins/songusage/songusageplugin.py +++ b/openlp/plugins/songusage/songusageplugin.py @@ -156,7 +156,8 @@ class SongUsagePlugin(Plugin): self.SongUsagedetailform.exec_() def about(self): - about_text = translate('SongUsagePlugin','SongUsage Plugin
This plugin ' - 'records the use of songs and when they have been used during ' - 'a live service') + about_text = translate(u'SongsPlugin.SongUsagePlugin', + u'SongUsage Plugin
This plugin ' + u'records the use of songs and when they have been used during ' + u'a live service') return about_text