From c426f998e2b84eacc399fb0a828202bebe834533 Mon Sep 17 00:00:00 2001 From: Calum Lind Date: Tue, 27 Nov 2012 02:34:11 +0000 Subject: [PATCH] Fix #2147 : Missing translations for plugin preferences page --- deluge/plugins/AutoAdd/deluge/plugins/autoadd/gtkui.py | 4 ++-- deluge/plugins/Extractor/deluge/plugins/extractor/gtkui.py | 4 ++-- .../Notifications/deluge/plugins/notifications/gtkui.py | 4 ++-- deluge/plugins/Scheduler/deluge/plugins/scheduler/gtkui.py | 4 ++-- deluge/plugins/WebUi/deluge/plugins/webui/gtkui.py | 4 ++-- deluge/ui/gtkui/preferences.py | 6 ++++-- 6 files changed, 14 insertions(+), 12 deletions(-) diff --git a/deluge/plugins/AutoAdd/deluge/plugins/autoadd/gtkui.py b/deluge/plugins/AutoAdd/deluge/plugins/autoadd/gtkui.py index 6803755d2..1c3e925b3 100644 --- a/deluge/plugins/AutoAdd/deluge/plugins/autoadd/gtkui.py +++ b/deluge/plugins/AutoAdd/deluge/plugins/autoadd/gtkui.py @@ -403,12 +403,12 @@ class GtkUI(GtkPluginBase): sw.add(self.treeView) sw.show_all() component.get("Preferences").add_page( - "AutoAdd", self.glade.get_widget("prefs_box") + _("AutoAdd"), self.glade.get_widget("prefs_box") ) self.on_show_prefs() def disable(self): - component.get("Preferences").remove_page("AutoAdd") + component.get("Preferences").remove_page(_("AutoAdd")) component.get("PluginManager").deregister_hook( "on_apply_prefs", self.on_apply_prefs ) diff --git a/deluge/plugins/Extractor/deluge/plugins/extractor/gtkui.py b/deluge/plugins/Extractor/deluge/plugins/extractor/gtkui.py index 6f0469200..8ee08ee92 100644 --- a/deluge/plugins/Extractor/deluge/plugins/extractor/gtkui.py +++ b/deluge/plugins/Extractor/deluge/plugins/extractor/gtkui.py @@ -54,13 +54,13 @@ class GtkUI(GtkPluginBase): def enable(self): self.glade = gtk.glade.XML(get_resource("extractor_prefs.glade")) - component.get("Preferences").add_page("Extractor", self.glade.get_widget("extractor_prefs_box")) + component.get("Preferences").add_page(_("Extractor"), self.glade.get_widget("extractor_prefs_box")) component.get("PluginManager").register_hook("on_apply_prefs", self.on_apply_prefs) component.get("PluginManager").register_hook("on_show_prefs", self.on_show_prefs) self.on_show_prefs() def disable(self): - component.get("Preferences").remove_page("Extractor") + component.get("Preferences").remove_page(_("Extractor")) component.get("PluginManager").deregister_hook("on_apply_prefs", self.on_apply_prefs) component.get("PluginManager").deregister_hook("on_show_prefs", self.on_show_prefs) del self.glade diff --git a/deluge/plugins/Notifications/deluge/plugins/notifications/gtkui.py b/deluge/plugins/Notifications/deluge/plugins/notifications/gtkui.py index 2400c7966..b3e5acbb3 100644 --- a/deluge/plugins/Notifications/deluge/plugins/notifications/gtkui.py +++ b/deluge/plugins/Notifications/deluge/plugins/notifications/gtkui.py @@ -287,7 +287,7 @@ class GtkUI(GtkPluginBase, GtkUiNotifications): if parent: parent.remove(self.prefs) index = prefs.notebook.append_page(self.prefs) - prefs.liststore.append([index, "Notifications"]) + prefs.liststore.append([index, _("Notifications")]) component.get("PluginManager").register_hook("on_apply_prefs", self.on_apply_prefs) @@ -320,7 +320,7 @@ class GtkUI(GtkPluginBase, GtkUiNotifications): def disable(self): GtkUiNotifications.disable(self) - component.get("Preferences").remove_page("Notifications") + component.get("Preferences").remove_page(_("Notifications")) component.get("PluginManager").deregister_hook("on_apply_prefs", self.on_apply_prefs) component.get("PluginManager").deregister_hook("on_show_prefs", diff --git a/deluge/plugins/Scheduler/deluge/plugins/scheduler/gtkui.py b/deluge/plugins/Scheduler/deluge/plugins/scheduler/gtkui.py index 580eba2d8..5d16e660a 100644 --- a/deluge/plugins/Scheduler/deluge/plugins/scheduler/gtkui.py +++ b/deluge/plugins/Scheduler/deluge/plugins/scheduler/gtkui.py @@ -170,7 +170,7 @@ class GtkUI(GtkPluginBase): client.register_event_handler("SchedulerEvent", self.on_scheduler_event) def disable(self): - component.get("Preferences").remove_page("Scheduler") + component.get("Preferences").remove_page(_("Scheduler")) # Remove status item component.get("StatusBar").remove_item(self.status_item) del self.status_item @@ -294,4 +294,4 @@ class GtkUI(GtkPluginBase): vbox.pack_start(frame, False, False) vbox.show_all() - component.get("Preferences").add_page("Scheduler", vbox) + component.get("Preferences").add_page(_("Scheduler"), vbox) diff --git a/deluge/plugins/WebUi/deluge/plugins/webui/gtkui.py b/deluge/plugins/WebUi/deluge/plugins/webui/gtkui.py index 978ac5fe4..c13f0b755 100644 --- a/deluge/plugins/WebUi/deluge/plugins/webui/gtkui.py +++ b/deluge/plugins/WebUi/deluge/plugins/webui/gtkui.py @@ -53,14 +53,14 @@ class GtkUI(GtkPluginBase): def enable(self): self.glade = gtk.glade.XML(get_resource("config.glade")) - component.get("Preferences").add_page("WebUi", self.glade.get_widget("prefs_box")) + component.get("Preferences").add_page(_("WebUi"), self.glade.get_widget("prefs_box")) component.get("PluginManager").register_hook("on_apply_prefs", self.on_apply_prefs) component.get("PluginManager").register_hook("on_show_prefs", self.on_show_prefs) client.webui.get_config().addCallback(self.cb_get_config) client.webui.got_deluge_web().addCallback(self.cb_chk_deluge_web) def disable(self): - component.get("Preferences").remove_page("WebUi") + component.get("Preferences").remove_page(_("WebUi")) component.get("PluginManager").deregister_hook("on_apply_prefs", self.on_apply_prefs) component.get("PluginManager").deregister_hook("on_show_prefs", self.on_show_prefs) diff --git a/deluge/ui/gtkui/preferences.py b/deluge/ui/gtkui/preferences.py index eeb264c69..2755a330c 100644 --- a/deluge/ui/gtkui/preferences.py +++ b/deluge/ui/gtkui/preferences.py @@ -121,7 +121,8 @@ class Preferences(component.Component): self.accounts_frame = self.builder.get_object("AccountsFrame") # Setup plugin tab listview - self.plugin_liststore = gtk.ListStore(str, bool) + # The third entry is for holding translated plugin names + self.plugin_liststore = gtk.ListStore(str, bool, str) self.plugin_liststore.set_sort_column_id(0, gtk.SORT_ASCENDING) self.plugin_listview = self.builder.get_object("plugin_listview") self.plugin_listview.set_model(self.plugin_liststore) @@ -131,7 +132,7 @@ class Preferences(component.Component): self.plugin_listview.append_column( gtk.TreeViewColumn(_("Enabled"), render, active=1)) self.plugin_listview.append_column( - gtk.TreeViewColumn(_("Plugin"), gtk.CellRendererText(), text=0)) + gtk.TreeViewColumn(_("Plugin"), gtk.CellRendererText(), text=2)) # Connect to the 'changed' event of TreeViewSelection to get selection # changes. @@ -585,6 +586,7 @@ class Preferences(component.Component): row = self.plugin_liststore.append() self.plugin_liststore.set_value(row, 0, plugin) self.plugin_liststore.set_value(row, 1, enabled) + self.plugin_liststore.set_value(row, 2, _(plugin)) # Now show the dialog self.pref_dialog.show()