From 8296b8dc84dab179c178ff4927669df8a5a935c2 Mon Sep 17 00:00:00 2001 From: M2j Date: Wed, 9 Jun 2010 23:15:37 +0200 Subject: [PATCH] Additional translatable strings Removed string_to_unicode and variant_to_unicode --- openlp/core/lib/__init__.py | 4 +-- openlp/core/lib/mediamanageritem.py | 2 +- openlp/core/lib/renderer.py | 2 +- openlp/core/ui/pluginform.py | 11 ++++--- openlp/core/utils/__init__.py | 21 ------------ .../plugins/bibles/forms/importwizardform.py | 32 +++++++++---------- openlp/plugins/bibles/lib/mediaitem.py | 2 +- openlp/plugins/images/lib/mediaitem.py | 4 +-- openlp/plugins/media/lib/mediaitem.py | 4 +-- openlp/plugins/presentations/lib/mediaitem.py | 4 +-- openlp/plugins/songs/forms/editsongform.py | 8 ++--- openlp/plugins/songs/forms/songimportform.py | 16 +++++----- 12 files changed, 45 insertions(+), 65 deletions(-) diff --git a/openlp/core/lib/__init__.py b/openlp/core/lib/__init__.py index d5b46e6cb..7ecffbe5b 100644 --- a/openlp/core/lib/__init__.py +++ b/openlp/core/lib/__init__.py @@ -80,9 +80,9 @@ def str_to_bool(stringvalue): ``stringvalue`` The string value to examine and convert to a boolean type. """ - if stringvalue is True or stringvalue is False: + if isinstance(stringvalue, bool): return stringvalue - return stringvalue.strip().lower() in (u'true', u'yes', u'y') + return unicode(stringvalue).strip().lower() in (u'true', u'yes', u'y') def build_icon(icon): """ diff --git a/openlp/core/lib/mediamanageritem.py b/openlp/core/lib/mediamanageritem.py index 8bfefceb0..7804b3d1b 100644 --- a/openlp/core/lib/mediamanageritem.py +++ b/openlp/core/lib/mediamanageritem.py @@ -345,7 +345,7 @@ class MediaManagerItem(QtGui.QWidget): filelist = [] while count < self.ListView.count(): bitem = self.ListView.item(count) - filename = unicode((bitem.data(QtCore.Qt.UserRole)).toString()) + filename = unicode(bitem.data(QtCore.Qt.UserRole).toString()) filelist.append(filename) count += 1 return filelist diff --git a/openlp/core/lib/renderer.py b/openlp/core/lib/renderer.py index 55700ebac..eab0e4d60 100644 --- a/openlp/core/lib/renderer.py +++ b/openlp/core/lib/renderer.py @@ -468,7 +468,7 @@ class Renderer(object): self._get_extent_and_render(line, footer, tlcorner=(x + display_shadow_size, y + display_shadow_size), - draw=True, color = self._theme.display_shadow_color) + draw=True, color=self._theme.display_shadow_color) self._get_extent_and_render(line, footer, tlcorner=(x, y), draw=True, outline_size=display_outline_size) y += h diff --git a/openlp/core/ui/pluginform.py b/openlp/core/ui/pluginform.py index 9969ed165..7100a19a4 100644 --- a/openlp/core/ui/pluginform.py +++ b/openlp/core/ui/pluginform.py @@ -27,6 +27,7 @@ import logging from PyQt4 import QtCore, QtGui +from openlp.core.lib import translate from openlp.core.lib.plugin import PluginStatus from plugindialog import Ui_PluginViewDialog @@ -63,14 +64,14 @@ class PluginForm(QtGui.QDialog, Ui_PluginViewDialog): # sometimes when it's loaded from the config, it isn't cast to int. plugin.status = int(plugin.status) # Set the little status text in brackets next to the plugin name. - status_text = 'Inactive' + status_text = unicode(translate(u'PluginForm', u'%s (Inactive)')) if plugin.status == PluginStatus.Active: - status_text = 'Active' + status_text = unicode(translate(u'PluginForm', u'%s (Active)')) elif plugin.status == PluginStatus.Inactive: - status_text = 'Inactive' + status_text = unicode(translate(u'PluginForm', u'%s (Inactive)')) elif plugin.status == PluginStatus.Disabled: - status_text = 'Disabled' - item.setText(u'%s (%s)' % (plugin.name, status_text)) + status_text = unicode(translate(u'PluginForm', u'%s (Disabled)')) + item.setText(status_text % plugin.name) # If the plugin has an icon, set it! if plugin.icon: item.setIcon(plugin.icon) diff --git a/openlp/core/utils/__init__.py b/openlp/core/utils/__init__.py index 8cbf7657a..00e9c7d6b 100644 --- a/openlp/core/utils/__init__.py +++ b/openlp/core/utils/__init__.py @@ -146,27 +146,6 @@ def check_latest_version(current_version): log.exception(u'Reason for failure: %s', e.reason) return version_string -def string_to_unicode(string): - """ - Converts a QString to a Python unicode object. - """ - if isinstance(string, QtCore.QString): - string = unicode(string.toUtf8(), u'utf8') - return string - -def variant_to_unicode(variant): - """ - Converts a QVariant to a Python unicode object. - - ``variant`` - The QVariant instance to convert to unicode. - """ - if isinstance(variant, QtCore.QVariant): - string = variant.toString() - if not isinstance(string, unicode): - string = string_to_unicode(string) - return string - def add_actions(target, actions): """ Adds multiple actions to a menu or toolbar in one command. diff --git a/openlp/plugins/bibles/forms/importwizardform.py b/openlp/plugins/bibles/forms/importwizardform.py index b1eafcd61..c312b36ec 100644 --- a/openlp/plugins/bibles/forms/importwizardform.py +++ b/openlp/plugins/bibles/forms/importwizardform.py @@ -32,7 +32,7 @@ from PyQt4 import QtCore, QtGui from bibleimportwizard import Ui_BibleImportWizard from openlp.core.lib import Receiver, SettingsManager, translate -from openlp.core.utils import AppLocation, variant_to_unicode +from openlp.core.utils import AppLocation from openlp.plugins.bibles.lib.manager import BibleFormat log = logging.getLogger(__name__) @@ -167,9 +167,9 @@ class ImportWizardForm(QtGui.QWizard, Ui_BibleImportWizard): return True elif self.currentId() == 2: # License details - license_version = variant_to_unicode(self.field(u'license_version')) - license_copyright = variant_to_unicode( - self.field(u'license_copyright')) + license_version = unicode(self.field(u'license_version').toString()) + license_copyright = \ + unicode(self.field(u'license_copyright').toString()) if license_version == u'': QtGui.QMessageBox.critical(self, translate(u'BiblesPlugin.ImportWizardForm', @@ -391,29 +391,29 @@ class ImportWizardForm(QtGui.QWizard, Ui_BibleImportWizard): def performImport(self): bible_type = self.field(u'source_format').toInt()[0] - license_version = variant_to_unicode(self.field(u'license_version')) - license_copyright = variant_to_unicode(self.field(u'license_copyright')) - license_permission = variant_to_unicode( - self.field(u'license_permission')) + license_version = unicode(self.field(u'license_version').toString()) + license_copyright = unicode(self.field(u'license_copyright').toString()) + license_permission = \ + unicode(self.field(u'license_permission').toString()) importer = None if bible_type == BibleFormat.OSIS: # Import an OSIS bible importer = self.manager.import_bible(BibleFormat.OSIS, name=license_version, - filename=variant_to_unicode(self.field(u'osis_location')) + filename=unicode(self.field(u'osis_location').toString()) ) elif bible_type == BibleFormat.CSV: # Import a CSV bible importer = self.manager.import_bible(BibleFormat.CSV, name=license_version, - booksfile=variant_to_unicode(self.field(u'csv_booksfile')), - versefile=variant_to_unicode(self.field(u'csv_versefile')) + booksfile=unicode(self.field(u'csv_booksfile').toString()), + versefile=unicode(self.field(u'csv_versefile').toString()) ) elif bible_type == BibleFormat.OpenSong: # Import an OpenSong bible importer = self.manager.import_bible(BibleFormat.OpenSong, name=license_version, - filename=variant_to_unicode(self.field(u'opensong_file')) + filename=unicode(self.field(u'opensong_file').toString()) ) elif bible_type == BibleFormat.WebDownload: # Import a bible from the web @@ -433,10 +433,10 @@ class ImportWizardForm(QtGui.QWizard, Ui_BibleImportWizard): name=license_version, download_source=WebDownload.get_name(download_location), download_name=bible, - proxy_server=variant_to_unicode(self.field(u'proxy_server')), - proxy_username=variant_to_unicode( - self.field(u'proxy_username')), - proxy_password=variant_to_unicode(self.field(u'proxy_password')) + proxy_server=unicode(self.field(u'proxy_server').toString()), + proxy_username=\ + unicode(self.field(u'proxy_username').toString()), + proxy_password=unicode(self.field(u'proxy_password').toString()) ) success = importer.do_import() if success: diff --git a/openlp/plugins/bibles/lib/mediaitem.py b/openlp/plugins/bibles/lib/mediaitem.py index d922cb446..6c5f21f23 100644 --- a/openlp/plugins/bibles/lib/mediaitem.py +++ b/openlp/plugins/bibles/lib/mediaitem.py @@ -454,7 +454,7 @@ class BibleMediaItem(MediaManagerItem): def onQuickSearchButton(self): log.debug(u'Quick Search Button pressed') bible = unicode(self.QuickVersionComboBox.currentText()) - text = unicode(self.QuickSearchEdit.displayText()) + text = unicode(self.QuickSearchEdit.text()) if self.ClearQuickSearchComboBox.currentIndex() == 0: self.ListView.clear() self.lastReference = [] diff --git a/openlp/plugins/images/lib/mediaitem.py b/openlp/plugins/images/lib/mediaitem.py index f846e102f..5abf080bf 100644 --- a/openlp/plugins/images/lib/mediaitem.py +++ b/openlp/plugins/images/lib/mediaitem.py @@ -158,7 +158,7 @@ class ImageMediaItem(MediaManagerItem): service_item.add_capability(ItemCapabilities.AllowsAdditions) for item in items: bitem = self.ListView.item(item.row()) - filename = unicode((bitem.data(QtCore.Qt.UserRole)).toString()) + filename = unicode(bitem.data(QtCore.Qt.UserRole).toString()) frame = QtGui.QImage(unicode(filename)) (path, name) = os.path.split(filename) service_item.add_from_image(path, name, frame) @@ -175,7 +175,7 @@ class ImageMediaItem(MediaManagerItem): items = self.ListView.selectedIndexes() for item in items: bitem = self.ListView.item(item.row()) - filename = unicode((bitem.data(QtCore.Qt.UserRole)).toString()) + filename = unicode(bitem.data(QtCore.Qt.UserRole).toString()) frame = QtGui.QImage(unicode(filename)) self.parent.maindisplay.addImageWithText(frame) diff --git a/openlp/plugins/media/lib/mediaitem.py b/openlp/plugins/media/lib/mediaitem.py index dc3cc837e..dd64658cc 100644 --- a/openlp/plugins/media/lib/mediaitem.py +++ b/openlp/plugins/media/lib/mediaitem.py @@ -112,7 +112,7 @@ class MediaMediaItem(MediaManagerItem): items = self.ListView.selectedIndexes() for item in items: bitem = self.ListView.item(item.row()) - filename = unicode((bitem.data(QtCore.Qt.UserRole)).toString()) + filename = unicode(bitem.data(QtCore.Qt.UserRole).toString()) Receiver.send_message(u'videodisplay_background', filename) def generateSlideData(self, service_item, item=None): @@ -120,7 +120,7 @@ class MediaMediaItem(MediaManagerItem): item = self.ListView.currentItem() if item is None: return False - filename = unicode((item.data(QtCore.Qt.UserRole)).toString()) + filename = unicode(item.data(QtCore.Qt.UserRole).toString()) service_item.title = unicode( translate(u'MediaPlugin.MediaItem', u'Media')) service_item.add_capability(ItemCapabilities.RequiresMedia) diff --git a/openlp/plugins/presentations/lib/mediaitem.py b/openlp/plugins/presentations/lib/mediaitem.py index 54c6a9488..be2cecff4 100644 --- a/openlp/plugins/presentations/lib/mediaitem.py +++ b/openlp/plugins/presentations/lib/mediaitem.py @@ -180,7 +180,7 @@ class PresentationMediaItem(MediaManagerItem): self.ListView.takeItem(row) SettingsManager.set_list(self.settingsSection, self.settingsSection, self.getFileList()) - filepath = unicode((item.data(QtCore.Qt.UserRole)).toString()) + filepath = unicode(item.data(QtCore.Qt.UserRole).toString()) #not sure of this has errors #John please can you look at . for cidx in self.controllers: @@ -198,7 +198,7 @@ class PresentationMediaItem(MediaManagerItem): if shortname: for item in items: bitem = self.ListView.item(item.row()) - filename = unicode((bitem.data(QtCore.Qt.UserRole)).toString()) + filename = unicode(bitem.data(QtCore.Qt.UserRole).toString()) if shortname == self.Automatic: service_item.shortname = self.findControllerByType(filename) if not service_item.shortname: diff --git a/openlp/plugins/songs/forms/editsongform.py b/openlp/plugins/songs/forms/editsongform.py index b8b2e905f..e6c162d0b 100644 --- a/openlp/plugins/songs/forms/editsongform.py +++ b/openlp/plugins/songs/forms/editsongform.py @@ -291,7 +291,7 @@ class EditSongForm(QtGui.QDialog, Ui_EditSongDialog): rowLabel = [] for row in range(0, self.VerseListWidget.rowCount()): item = self.VerseListWidget.item(row, 0) - data = unicode((item.data(QtCore.Qt.UserRole)).toString()) + data = unicode(item.data(QtCore.Qt.UserRole).toString()) bit = data.split(u':') rowTag = u'%s\n%s' % (bit[0][0:1], bit[1]) rowLabel.append(rowTag) @@ -382,7 +382,7 @@ class EditSongForm(QtGui.QDialog, Ui_EditSongDialog): item = self.VerseListWidget.currentItem() if item: tempText = item.text() - verseId = unicode((item.data(QtCore.Qt.UserRole)).toString()) + verseId = unicode(item.data(QtCore.Qt.UserRole).toString()) self.verse_form.setVerse(tempText, True, verseId) if self.verse_form.exec_(): afterText, verse, subVerse = self.verse_form.getVerse() @@ -413,7 +413,7 @@ class EditSongForm(QtGui.QDialog, Ui_EditSongDialog): if self.VerseListWidget.rowCount() > 0: for row in range(0, self.VerseListWidget.rowCount()): item = self.VerseListWidget.item(row, 0) - field = unicode((item.data(QtCore.Qt.UserRole)).toString()) + field = unicode(item.data(QtCore.Qt.UserRole).toString()) verse_list += u'---[%s]---\n' % field verse_list += item.text() verse_list += u'\n' @@ -562,7 +562,7 @@ class EditSongForm(QtGui.QDialog, Ui_EditSongDialog): text = u' ' for i in range (0, self.VerseListWidget.rowCount()): item = self.VerseListWidget.item(i, 0) - verseId = unicode((item.data(QtCore.Qt.UserRole)).toString()) + verseId = unicode(item.data(QtCore.Qt.UserRole).toString()) bits = verseId.split(u':') sxml.add_verse_to_lyrics(bits[0], bits[1], unicode(item.text())) text = text + unicode(self.VerseListWidget.item(i, 0).text()) \ diff --git a/openlp/plugins/songs/forms/songimportform.py b/openlp/plugins/songs/forms/songimportform.py index 75659da70..b4bb9f4b0 100644 --- a/openlp/plugins/songs/forms/songimportform.py +++ b/openlp/plugins/songs/forms/songimportform.py @@ -29,7 +29,7 @@ from PyQt4 import QtCore, QtGui from songimportwizard import Ui_SongImportWizard from openlp.core.lib import Receiver, SettingsManager, translate -#from openlp.core.utils import AppLocation, variant_to_unicode +#from openlp.core.utils import AppLocation from openlp.plugins.songs.lib.manager import SongFormat log = logging.getLogger(__name__) @@ -203,20 +203,20 @@ class ImportWizardForm(QtGui.QWizard, Ui_SongImportWizard): # # Import an OSIS bible # importer = self.manager.import_bible(BibleFormat.OSIS, # name=license_version, -# filename=variant_to_unicode(self.field(u'osis_location')) +# filename=unicode(self.field(u'osis_location').toString()) # ) # elif bible_type == BibleFormat.CSV: # # Import a CSV bible # importer = self.manager.import_bible(BibleFormat.CSV, # name=license_version, -# booksfile=variant_to_unicode(self.field(u'csv_booksfile')), -# versefile=variant_to_unicode(self.field(u'csv_versefile')) +# booksfile=unicode(self.field(u'csv_booksfile').toString()), +# versefile=unicode(self.field(u'csv_versefile').toString()) # ) # elif bible_type == BibleFormat.OpenSong: # # Import an OpenSong bible # importer = self.manager.import_bible(BibleFormat.OpenSong, # name=license_version, -# filename=variant_to_unicode(self.field(u'opensong_file')) +# filename=unicode(self.field(u'opensong_file').toString()) # ) # elif bible_type == BibleFormat.WebDownload: # # Import a bible from the web @@ -234,9 +234,9 @@ class ImportWizardForm(QtGui.QWizard, Ui_SongImportWizard): # name=license_version, # download_source=WebDownload.get_name(download_location), # download_name=bible, -# proxy_server=variant_to_unicode(self.field(u'proxy_server')), -# proxy_username=variant_to_unicode(self.field(u'proxy_username')), -# proxy_password=variant_to_unicode(self.field(u'proxy_password')) +# proxy_server=unicode(self.field(u'proxy_server').toString()), +# proxy_username=unicode(self.field(u'proxy_username').toString()), +# proxy_password=unicode(self.field(u'proxy_password').toString()) # ) # success = importer.do_import() # if success: