diff --git a/hplip/align.py b/hplip/align.py index c5a66fe24..970012764 100755 --- a/hplip/align.py +++ b/hplip/align.py @@ -247,6 +247,7 @@ try: #try: if 1: app = QApplication(sys.argv) + utils.l10n(app, ui_package) dlg = ui.AlignDialog(None, device_uri) dlg.show() try: diff --git a/hplip/base/utils.py b/hplip/base/utils.py index f268cf830..ef7ab7ba9 100644 --- a/hplip/base/utils.py +++ b/hplip/base/utils.py @@ -2490,6 +2490,24 @@ def import_dialog(ui_toolkit): log.error("Unable to load Qt support. Is it installed?") sys.exit(1) +def l10n(app, ui): + if ui == "ui5": + from PyQt5.QtCore import QTranslator, QLocale, QLibraryInfo + else: + return + + qtTranslator = QTranslator() + qtTranslator.load('qt_' + QLocale.system().name(), QLibraryInfo.location(QLibraryInfo.TranslationsPath)) + app.installTranslator(qtTranslator) + + qtBaseTranslator = QTranslator() + qtBaseTranslator.load('qtbase_' + QLocale.system().name(), QLibraryInfo.location(QLibraryInfo.TranslationsPath)) + app.installTranslator(qtBaseTranslator) + + hplipTranslator = QTranslator() + hplipTranslator.load('hplip_' + QLocale.system().name(), "/usr/share/hplip/data/localization") + app.installTranslator(hplipTranslator) + def dyn_import_mod(mod_name_as_str): components = mod_name_as_str.split('.') diff --git a/hplip/clean.py b/hplip/clean.py index 3d41f0485..836d14e24 100755 --- a/hplip/clean.py +++ b/hplip/clean.py @@ -199,6 +199,7 @@ try: #try: if 1: app = QApplication(sys.argv) + utils.l10n(app, ui_package) dlg = ui.CleanDialog(None, device_uri) dlg.show() try: diff --git a/hplip/colorcal.py b/hplip/colorcal.py index 4eedbc42d..2e5374d88 100755 --- a/hplip/colorcal.py +++ b/hplip/colorcal.py @@ -239,6 +239,7 @@ try: #try: if 1: app = QApplication(sys.argv) + utils.l10n(app, ui_package) dlg = ColorCalDialog(None, device_uri) dlg.show() try: diff --git a/hplip/devicesettings.py b/hplip/devicesettings.py index 071051928..3fd9c0f1c 100755 --- a/hplip/devicesettings.py +++ b/hplip/devicesettings.py @@ -78,6 +78,7 @@ try: ui = import_module(ui_package + ".devicesetupdialog") app = QApplication(sys.argv) + utils.l10n(app, ui_package) dlg = ui.DeviceSetupDialog(None, device_uri) dlg.show() try: diff --git a/hplip/diagnose_plugin.py b/hplip/diagnose_plugin.py index e4e6ebd35..e609c4ab9 100755 --- a/hplip/diagnose_plugin.py +++ b/hplip/diagnose_plugin.py @@ -98,6 +98,7 @@ if mode == GUI_MODE: from installer import pluginhandler app = QApplication(sys.argv) + utils.l10n(app, ui_package) pluginObj = pluginhandler.PluginHandle() plugin_sts = pluginObj.getStatus() if plugin_sts == PLUGIN_INSTALLED: diff --git a/hplip/fab.py b/hplip/fab.py index 9bd6166de..1f4d23497 100755 --- a/hplip/fab.py +++ b/hplip/fab.py @@ -861,6 +861,7 @@ if mode == GUI_MODE: if 1: app = QApplication(sys.argv) + utils.l10n(app, ui_package) fab = ui.FABWindow(None) fab.show() diff --git a/hplip/faxsetup.py b/hplip/faxsetup.py index dd704d2c3..e8b1e181e 100755 --- a/hplip/faxsetup.py +++ b/hplip/faxsetup.py @@ -76,6 +76,7 @@ try: ui = import_module(ui_package + ".faxsetupdialog") app = QApplication(sys.argv) + utils.l10n(app, ui_package) dlg = ui.FaxSetupDialog(None, device_uri) dlg.show() try: diff --git a/hplip/firmware.py b/hplip/firmware.py index 33e044dd8..26a89e060 100755 --- a/hplip/firmware.py +++ b/hplip/firmware.py @@ -136,6 +136,7 @@ try: if device_uri: app = QApplication(sys.argv) + utils.l10n(app, ui_package) dialog = ui.FirmwareDialog(None, device_uri) dialog.show() try: diff --git a/hplip/info.py b/hplip/info.py index 6c28531ff..a0a53cbb4 100755 --- a/hplip/info.py +++ b/hplip/info.py @@ -176,6 +176,7 @@ try: if 1: app = QApplication(sys.argv) + utils.l10n(app, ui_package) dlg = ui.InfoDialog(None, device_uri) dlg.show() try: diff --git a/hplip/linefeedcal.py b/hplip/linefeedcal.py index d99d9c541..42f2ec6cf 100755 --- a/hplip/linefeedcal.py +++ b/hplip/linefeedcal.py @@ -70,6 +70,7 @@ try: #try: if 1: app = QApplication(sys.argv) + utils.l10n(app, ui_package) dlg = LineFeedCalDialog(None, device_uri) dlg.show() try: diff --git a/hplip/makecopies.py b/hplip/makecopies.py index f0978d134..a9ba8aa37 100755 --- a/hplip/makecopies.py +++ b/hplip/makecopies.py @@ -241,6 +241,7 @@ if mode == GUI_MODE: #try: if 1: app = QApplication(sys.argv) + utils.l10n(app, ui_package) dlg = MakeCopiesDialog(None, device_uri) dlg.show() try: diff --git a/hplip/plugin.py b/hplip/plugin.py index f54f72619..241aeb47f 100755 --- a/hplip/plugin.py +++ b/hplip/plugin.py @@ -258,6 +258,7 @@ if mode == GUI_MODE: elif ui_toolkit == "qt4": from PyQt4.QtGui import QMessageBox app = QApplication(sys.argv) + utils.l10n(app, ui_package) if plugin_installed: if QMessageBox.question(None, " ", diff --git a/hplip/print.py b/hplip/print.py index ab37047e5..f70e6dfe6 100755 --- a/hplip/print.py +++ b/hplip/print.py @@ -144,6 +144,7 @@ else: # qt4 if 1: app = QApplication(sys.argv) + utils.l10n(app, ui_package) dlg = ui.PrintDialog(None, printer_name, mod.args) dlg.show() try: diff --git a/hplip/printsettings.py b/hplip/printsettings.py index 76b662e3e..6921aced0 100755 --- a/hplip/printsettings.py +++ b/hplip/printsettings.py @@ -88,6 +88,7 @@ try: ui = import_module(ui_package + ".printsettingsdialog") app = QApplication(sys.argv) + utils.l10n(app, ui_package) dialog = ui.PrintSettingsDialog(None, printer_name, fax_mode) dialog.show() try: diff --git a/hplip/sendfax.py b/hplip/sendfax.py index 491c8f9ee..f54e53d13 100755 --- a/hplip/sendfax.py +++ b/hplip/sendfax.py @@ -214,6 +214,7 @@ if mode == GUI_MODE: ui = import_module(ui_package + ".sendfaxdialog") app = QApplication(sys.argv) + utils.l10n(app, ui_package) dlg = ui.SendFaxDialog(None, printer_name, device_uri, mod.args) dlg.show() diff --git a/hplip/setup.py b/hplip/setup.py index 2608f959f..dd4435324 100755 --- a/hplip/setup.py +++ b/hplip/setup.py @@ -313,6 +313,7 @@ if mode == GUI_MODE: ui = import_module(ui_package + ".setupdialog") app = QApplication(sys.argv) + utils.l10n(app, ui_package) log.debug("Sys.argv=%s printer_name=%s param=%s jd_port=%s device_uri=%s remove=%s" % (sys.argv, printer_name, param, jd_port, device_uri, remove)) dlg = ui.SetupDialog(None, param, jd_port, device_uri, remove) dlg.show() diff --git a/hplip/testpage.py b/hplip/testpage.py index a5ed2bc8a..6a5dcd5c5 100755 --- a/hplip/testpage.py +++ b/hplip/testpage.py @@ -83,6 +83,7 @@ try: if 1: app = QApplication(sys.argv) + utils.l10n(app, ui_package) dialog = ui.PrintTestPageDialog(None, printer_name) dialog.show() try: diff --git a/hplip/toolbox.py b/hplip/toolbox.py index 2a6750476..d8c32302a 100755 --- a/hplip/toolbox.py +++ b/hplip/toolbox.py @@ -276,6 +276,7 @@ else: # qt4 if 1: #try: app = QApplication(sys.argv) + utils.l10n(app, ui_package) toolbox = ui.DevMgr5(__version__, device_uri, None) toolbox.show() diff --git a/hplip/wificonfig.py b/hplip/wificonfig.py index b21e83abb..f27c15e4b 100755 --- a/hplip/wificonfig.py +++ b/hplip/wificonfig.py @@ -75,6 +75,7 @@ try: ui = import_module(ui_package + ".wifisetupdialog") app = QApplication(sys.argv) + utils.l10n(app, ui_package) dlg = ui.WifiSetupDialog(None, device_uri, standalone=True) dlg.show() try: