File smolt-1.3.2-unicode-all.patch of Package smolt

Overview Repositories Revisions Requests Users Attributes Meta

File smolt-1.3.2-unicode-all.patch of Package smolt

Index: smolt-1.4/client/gui.py
===================================================================
--- smolt-1.4.orig/client/gui.py
+++ smolt-1.4/client/gui.py
@@ -32,9 +32,9 @@ class MainTabWidget(QTabWidget):
 		QTabWidget.__init__(self)
 
 		if generalTab != None:
-			self.addTab(generalTab, unicode(_('General'), 'UTF-8'))
+			self.addTab(generalTab, _('General'))
 		if distroTab != None:
-			self.addTab(distroTab, unicode(_('Distribution'), 'UTF-8'))
+			self.addTab(distroTab, _('Distribution'))
 
 
 class GeneralTab(QWidget):
@@ -79,12 +79,12 @@ class HostTable:
 	def set_profile(self, profile):
 		self.profile = profile
 		model = QStandardItemModel(0, 2, self.host_table)
-		model.setHeaderData(0, Qt.Horizontal, QVariant(unicode(_('Label'), 'UTF-8')))
-		model.setHeaderData(1, Qt.Horizontal, QVariant(unicode(_('Data'), 'UTF-8')))
+		model.setHeaderData(0, Qt.Horizontal, QVariant(_('Label')))
+		model.setHeaderData(1, Qt.Horizontal, QVariant(_('Data')))
 		if self.profile:
 			for label, data in self.profile.hostIter():
 				model.insertRow(0)
-				label = QStandardItem(unicode(label, 'UTF-8'))
+				label = QStandardItem(label)
 				label.setEditable(False)
 				data = QStandardItem(str(data))
 				data.setEditable(False)
@@ -112,10 +112,10 @@ class DeviceTable:
 	def set_profile(self, profile):
 		self.profile = profile
 		model = QStandardItemModel(0, 4, self.device_table)
-		model.setHeaderData(0, Qt.Horizontal, QVariant(unicode(_('Bus'), 'UTF-8')))
-		model.setHeaderData(1, Qt.Horizontal, QVariant(unicode(_('Driver'), 'UTF-8')))
-		model.setHeaderData(2, Qt.Horizontal, QVariant(unicode(_('Type'), 'UTF-8')))
-		model.setHeaderData(3, Qt.Horizontal, QVariant(unicode(_('Description'), 'UTF-8')))
+		model.setHeaderData(0, Qt.Horizontal, QVariant(_('Bus')))
+		model.setHeaderData(1, Qt.Horizontal, QVariant(_('Driver')))
+		model.setHeaderData(2, Qt.Horizontal, QVariant(_('Type')))
+		model.setHeaderData(3, Qt.Horizontal, QVariant(_('Description')))
 		if self.profile:
 			for VendorID, DeviceID, SubsysVendorID, SubsysDeviceID, Bus, \
 					Driver, Type, Description in self.profile.deviceIter():
Index: smolt-1.4/client/i18n.py
===================================================================
--- smolt-1.4.orig/client/i18n.py
+++ smolt-1.4/client/i18n.py
@@ -39,4 +39,5 @@ except IndexError:
 locale.setlocale(locale.LC_ALL, 'C')
 t = gettext.translation('smolt', '/usr/share/locale/', fallback=True, languages='en_US')
 
-_ = t.gettext
+def _(str):
+ return unicode(t.gettext(str), 'UTF-8')
Index: smolt-1.4/client/smoltGui.py
===================================================================
--- smolt-1.4.orig/client/smoltGui.py
+++ smolt-1.4/client/smoltGui.py
@@ -91,21 +91,21 @@ class SmoltGui(QMainWindow):
 		''' Main Window '''
 		QMainWindow.__init__(self)
 		self.setMinimumSize(500, 600)
-		self.setWindowTitle(unicode(_('Smolt'), 'UTF-8'))
+		self.setWindowTitle(_('Smolt'))
 		self.setWindowIcon(QIcon(os.path.join(CLIENT_PATH, 'icons', 'smolt.png')))
 
 		''' Menu Bar '''
 		self.menuBar = self.menuBar()
-		self.fileMenu = self.menuBar.addMenu(unicode(_('&File'), 'UTF-8'))
-		self.helpMenu = self.menuBar.addMenu(unicode(_('&Help'), 'UTF-8'))
+		self.fileMenu = self.menuBar.addMenu(_('&File'))
+		self.helpMenu = self.menuBar.addMenu(_('&Help'))
 
 		''' Actions '''
-		self.sendAction= QAction(QIcon(os.path.join(CLIENT_PATH, 'icons', 'send-profile.png')), unicode(_('&Send Profile'), 'UTF-8'), self)
-		self.mySmoltPageAction = QAction(QIcon(os.path.join(CLIENT_PATH, 'icons', 'home.png')), unicode(_('&My Smolt Page'), 'UTF-8'), self)
-		self.exitAction = QAction(QIcon(os.path.join(CLIENT_PATH, 'icons', 'exit.png')), unicode(_('&Exit'), 'UTF-8'), self)
-		self.showPPAction = QAction(QIcon(os.path.join(CLIENT_PATH, 'icons', 'privacy.png')), unicode(_('Show &Privacy Policy'), 'UTF-8'), self)
-		self.aboutAction = QAction(QIcon(os.path.join(CLIENT_PATH, 'icons', 'smolt.png')), unicode(_('&About'), 'UTF-8'), self)
-		self.aboutQtAction = QAction(unicode(_("About &Qt"), 'UTF-8'), self)
+		self.sendAction= QAction(QIcon(os.path.join(CLIENT_PATH, 'icons', 'send-profile.png')), _('&Send Profile'), self)
+		self.mySmoltPageAction = QAction(QIcon(os.path.join(CLIENT_PATH, 'icons', 'home.png')), _('&My Smolt Page'), self)
+		self.exitAction = QAction(QIcon(os.path.join(CLIENT_PATH, 'icons', 'exit.png')), _('&Exit'), self)
+		self.showPPAction = QAction(QIcon(os.path.join(CLIENT_PATH, 'icons', 'privacy.png')), _('Show &Privacy Policy'), self)
+		self.aboutAction = QAction(QIcon(os.path.join(CLIENT_PATH, 'icons', 'smolt.png')), _('&About'), self)
+		self.aboutQtAction = QAction(_("About &Qt"), self)
 
 		''' Fill Menus '''
 		self.fileMenu.addAction(self.sendAction)
@@ -119,7 +119,7 @@ class SmoltGui(QMainWindow):
 		self.helpMenu.addAction(self.aboutQtAction)
 
 		''' Tool Bar '''
-		self.toolBar = self.addToolBar(unicode(_('Main Tool Bar'), 'UTF-8'))
+		self.toolBar = self.addToolBar(_('Main Tool Bar'))
 		self.toolBar.setIconSize(QSize(24, 24))
 		self.toolBar.setToolButtonStyle(Qt.ToolButtonTextBesideIcon)
 		self.toolBar.addAction(self.sendAction)
@@ -169,12 +169,12 @@ class SmoltGui(QMainWindow):
 		self.host_table.set_profile(self._gather_thread.hardware)
 		self.device_table.set_profile(self._gather_thread.hardware)
 		self.distro_document = QTextDocument()
-		self.distro_document.setHtml(unicode(_('No distribution-specific data yet'), 'UTF-8'))
+		self.distro_document.setHtml(_('No distribution-specific data yet'))
 		self.distroInfo.setDocument(self.distro_document)
 
 	def _on_system_bus_error(self):
 		self._on_gathering_completed()
-		QMessageBox(QMessageBox.Critical, unicode(_('Error'), 'UTF-8'),
+		QMessageBox(QMessageBox.Critical, _('Error'),
 				self._gather_thread.error_message,
 				QMessageBox.Ok, self).exec_()
 		QCoreApplication.exit(1)
@@ -237,8 +237,8 @@ class SmoltGui(QMainWindow):
 
 	def _on_submission_failed(self):
 		self._tear_progress_down(success=False)
-		QMessageBox(QMessageBox.Critical, unicode(_('Error'), 'UTF-8'),
-				unicode(_('An error occurred while sending the data to the server.'), 'UTF-8'),
+		QMessageBox(QMessageBox.Critical, _('Error'),
+				_('An error occurred while sending the data to the server.'),
 				QMessageBox.Ok, self).exec_()
 
 	def _on_submission_completed(self):
@@ -246,13 +246,13 @@ class SmoltGui(QMainWindow):
 		self._tear_progress_down(success=True)
 		url = smolt.get_profile_link(server_url, self._submit_thread.pub_uuid)
 		admin_password = self._submit_thread.admin
-		QMessageBox(QMessageBox.Information, unicode(_('Profile Sent'), 'UTF-8'),
-				unicode(_('Your profile was sent successfully! \
+		QMessageBox(QMessageBox.Information, _('Profile Sent'),
+				_('Your profile was sent successfully! \
 				 \
 				Your profiles is available online at: \
 				<a href="%(url)s">%(url)s</a> \
 				 \
-				Your profile admin password is: %(password)s'), 'UTF-8') % \
+				Your profile admin password is: %(password)s') % \
 					{'url':url, 'password':admin_password},
 				QMessageBox.NoButton, self).exec_()
 
@@ -271,8 +271,8 @@ class SmoltGui(QMainWindow):
 	def showPP(self):
 
 		''' Show Privacy Policy '''
-		self.privacyPolicy = QMessageBox(QMessageBox.NoIcon, unicode(_('Privacy Policy'), 'UTF-8'),
-					QString(unicode(privacypolicy.PRIVACY_POLICY, 'UTF-8')), QMessageBox.Close, self)
+		self.privacyPolicy = QMessageBox(QMessageBox.NoIcon, _('Privacy Policy'),
+					QString(privacypolicy.PRIVACY_POLICY), QMessageBox.Close, self)
 		self.privacyPolicy.exec_()
 
 	def about(self):
@@ -285,19 +285,19 @@ class SmoltGui(QMainWindow):
 		label = QLabel(self)
 		label.setPixmap(QPixmap(os.path.join(CLIENT_PATH, 'icons' , 'smolt.png')))
 
-		title = QString(unicode(_("<h3>Smolt Qt</h3>Version %(version)s "), 'UTF-8') % {'version':smolt.clientVersion})
-		title.append(unicode(_(" Smolt Qt is a Smolt GUI client to submit Smolt hardware profiles \
-				to a Smoon server. "), 'UTF-8'))
+		title = QString(_("<h3>Smolt Qt</h3>Version %(version)s ") % {'version':smolt.clientVersion})
+		title.append(_(" Smolt Qt is a Smolt GUI client to submit Smolt hardware profiles \
+				to a Smoon server. "))
 
-		description = QString(unicode(_("About Smolt: The smolt hardware profiler is a server-client \
+		description = QString(_("About Smolt: The smolt hardware profiler is a server-client \
 				system that does a hardware scan against a machine and sends the results \
 				to a public Fedora Project turbogears server. The sends are anonymous \
 				and should not contain any private information other than the physical \
-				hardware information and basic OS info. "), 'UTF-8'))
+				hardware information and basic OS info. "))
 
-		authors = unicode(_("Authors: Carlos Gonçalves &lt;mail@cgoncalves.info&gt;"), 'UTF-8')
+		authors = _("Authors: Carlos Gonçalves &lt;mail@cgoncalves.info&gt;")
 
-		lbl = QLabel(unicode(_("%(title)s \
+		lbl = QLabel(_("%(title)s \
 				%(description)s \
 				%(authors)s \
 				 \
@@ -305,7 +305,7 @@ class SmoltGui(QMainWindow):
 				This program is free software; you can redistribute it and/or \
 				modify it under the terms of the GNU General Public License \
 				as published by the Free Software Foundation; either version 3 \
-				of the License, or (at your option) any later version."), 'UTF-8') % \
+				of the License, or (at your option) any later version.") % \
 				{'title':title, 'description':description, 'authors':authors})
 
 		lbl.setWordWrap(True)
@@ -328,7 +328,7 @@ if __name__ == '__main__':
 dest = 'the_only_config_file',
 default = None,
 metavar = 'file.cfg',
- help = unicode(_('specify the location of the (only) config file to use'), 'UTF-8'))
+ help = _('specify the location of the (only) config file to use'))
 parser.add_option('-s', '--server',
 dest = 'smoonURL',
 default = smolt.smoonURL,

Places

File smolt-1.3.2-unicode-all.patch of Package smolt

Places