Fix i18n issues

bzr-revno: 629
This commit is contained in:
raoul.snyman@saturnlaboratories.co.za 2009-10-26 05:34:44 +00:00 committed by Tim Bentley
commit 706db6923b
2 changed files with 9 additions and 8 deletions

View File

@ -674,10 +674,10 @@ class AmendThemeForm(QtGui.QDialog, Ui_AmendThemeDialog):
self.theme.font_main_italics)# italic self.theme.font_main_italics)# italic
mainFont.setPixelSize(int(self.theme.font_main_proportion)) mainFont.setPixelSize(int(self.theme.font_main_proportion))
metrics = QtGui.QFontMetrics(mainFont) metrics = QtGui.QFontMetrics(mainFont)
page_length = (int(self.FontMainHeightSpinBox.value()) / metrics.height() - 2 ) - 1 page_length = (int(self.FontMainHeightSpinBox.value()) / metrics.height() - 2) - 1
log.debug(u'Page Length area height %s , metrics %s , lines %s' % log.debug(u'Page Length area height %s, metrics %s, lines %s' %
(int(self.FontMainHeightSpinBox.value()), metrics.height(), page_length )) (int(self.FontMainHeightSpinBox.value()), metrics.height(), page_length))
self.FontMainLinesPageLabel.setText( page_length_text = unicode(self.trUtf8(u'Slide Height is %s rows'))
self.trUtf8((u'Slide Height is %s rows') % page_length)) self.FontMainLinesPageLabel.setText(page_length_text % page_length)
frame = self.thememanager.generateImage(theme) frame = self.thememanager.generateImage(theme)
self.ThemePreview.setPixmap(QtGui.QPixmap.fromImage(frame)) self.ThemePreview.setPixmap(QtGui.QPixmap.fromImage(frame))

View File

@ -528,10 +528,11 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow):
applicationVersion = self.generalConfig.get_config(u'Application version', u'1.9.0-595') applicationVersion = self.generalConfig.get_config(u'Application version', u'1.9.0-595')
version = check_latest_version(self.generalConfig, applicationVersion) version = check_latest_version(self.generalConfig, applicationVersion)
if applicationVersion != version: if applicationVersion != version:
version_text = unicode(self.trUtf8(u'OpenLP version %s has been updated '
u'to version %s'))
QtGui.QMessageBox.question(None, QtGui.QMessageBox.question(None,
self.trUtf8(u'OpenLP version Updated'), self.trUtf8(u'OpenLP Version Updated'),
self.trUtf8(u'OpenLP version %s has been updated to version %s') version_text % (applicationVersion, version),
% (applicationVersion, version),
QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.Ok), QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.Ok),
QtGui.QMessageBox.Ok) QtGui.QMessageBox.Ok)
self.generalConfig.set_config(u'Application version', version) self.generalConfig.set_config(u'Application version', version)