From 8844d89cec84162a3441ed6d91556962eb11bbea Mon Sep 17 00:00:00 2001 From: gm10 <13855078+gm10@users.noreply.github.com> Date: Mon, 11 Feb 2019 20:49:27 +0100 Subject: [PATCH] Clean up i18n, remove unnecessary duplication --- usr/lib/linuxmint/mintMenu/mintMenuConfig.py | 66 +------------------ .../mintMenu/plugins/applications.glade | 38 +++++++++-- .../mintMenu/plugins/applications.py | 11 +--- 3 files changed, 35 insertions(+), 80 deletions(-) diff --git a/usr/lib/linuxmint/mintMenu/mintMenuConfig.py b/usr/lib/linuxmint/mintMenu/mintMenuConfig.py index 4473bd9..2971482 100755 --- a/usr/lib/linuxmint/mintMenu/mintMenuConfig.py +++ b/usr/lib/linuxmint/mintMenu/mintMenuConfig.py @@ -29,76 +29,12 @@ class mintMenuConfig(object): self.builder = Gtk.Builder() self.builder.add_from_file(os.path.join(self.path, "mintMenuConfig.glade")) - self.mainWindow=self.builder.get_object("mainWindow") + self.mainWindow = self.builder.get_object("mainWindow") #i18n self.mainWindow.set_title(_("Menu preferences")) self.mainWindow.set_icon_from_file("/usr/lib/linuxmint/mintMenu/icon.svg") - self.builder.get_object("startWithFavorites").set_label(_("Always start with favorites pane")) - self.builder.get_object("showButtonIcon").set_label(_("Show button icon")) - self.builder.get_object("enableInternetSearch").set_label(_("Enable Internet search")) - self.builder.get_object("useCustomColors").set_label(_("Use custom colors")) - self.builder.get_object("showRecentPlugin").set_label(_("Show recent documents plugin")) - self.builder.get_object("showApplicationsPlugin").set_label(_("Show applications plugin")) - self.builder.get_object("showSystemPlugin").set_label(_("Show system plugin")) - self.builder.get_object("showPlacesPlugin").set_label(_("Show places plugin")) - - self.builder.get_object("showAppComments").set_label(_("Show application comments")) - self.builder.get_object("showCategoryIcons").set_label(_("Show category icons")) - self.builder.get_object("hover").set_label(_("Hover")) - self.builder.get_object("remember_filter").set_label(_("Remember the last category or search")) - self.builder.get_object("use_apt").set_label(_("Search for packages to install")) - self.builder.get_object("swapGeneric").set_label(_("Swap name and generic name")) - - self.builder.get_object("buttonTextLabel").set_text(_("Button text:")) - self.builder.get_object("label1").set_text(_("Options")) - self.builder.get_object("applicationsLabel").set_text(_("Applications")) - - self.builder.get_object("colorsLabel").set_text(_("Theme")) - self.builder.get_object("favLabel").set_text(_("Favorites")) - self.builder.get_object("mainbuttonLabel").set_text(_("Main button")) - self.builder.get_object("pluginsLabel").set_text(_("Plugins")) - - self.builder.get_object("backgroundColorLabel").set_text(_("Background:")) - self.builder.get_object("headingColorLabel").set_text(_("Headings:")) - self.builder.get_object("themeLabel").set_text(_("Theme:")) - - #self.builder.get_object("applicationsLabel").set_text(_("Applications")) - #self.builder.get_object("favoritesLabel").set_text(_("Favorites")) - self.builder.get_object("numberColumnsLabel").set_text(_("Number of columns:")) - self.builder.get_object("iconSizeLabel").set_text(_("Icon size:")) - self.builder.get_object("iconSizeLabel2").set_text(_("Icon size:")) - self.builder.get_object("placesIconSizeLabel").set_text(_("Icon size:")) - self.builder.get_object("systemIconSizeLabel").set_text(_("Icon size:")) - self.builder.get_object("hoverLabel").set_text(_("Hover delay (ms):")) - self.builder.get_object("label4").set_text(_("Button icon:")) - self.builder.get_object("label5").set_text(_("Search command:")) - - self.builder.get_object("placesLabel").set_text(_("Places")) - self.builder.get_object("allowscrollbarcheckbutton").set_label(_("Allow Scrollbar")) - self.builder.get_object("showgtkbookmarkscheckbutton").set_label(_("Show GTK Bookmarks")) - self.builder.get_object("placesHeightEntryLabel").set_text(_("Height:")) - self.builder.get_object("defaultPlacesFrameLabel").set_text(_("Toggle Default Places:")) - self.builder.get_object("computercheckbutton").set_label(_("Computer")) - self.builder.get_object("homecheckbutton").set_label(_("Home Folder")) - self.builder.get_object("networkcheckbutton").set_label(_("Network")) - self.builder.get_object("desktopcheckbutton").set_label(_("Desktop")) - self.builder.get_object("trashcheckbutton").set_label(_("Trash")) - self.builder.get_object("customPlacesFrameLabel").set_text(_("Custom Places:")) - - self.builder.get_object("systemLabel").set_text(_("System")) - self.builder.get_object("allowscrollbarcheckbutton1").set_label(_("Allow Scrollbar")) - self.builder.get_object("systemHeightEntryLabel").set_text(_("Height:")) - self.builder.get_object("defaultItemsFrameLabel").set_text(_("Toggle Default Items:")) - self.builder.get_object("softwaremanagercheckbutton").set_label(_("Software Manager")) - self.builder.get_object("packagemanagercheckbutton").set_label(_("Package Manager")) - self.builder.get_object("controlcentercheckbutton").set_label(_("Control Center")) - self.builder.get_object("terminalcheckbutton").set_label(_("Terminal")) - self.builder.get_object("lockcheckbutton").set_label(_("Lock Screen")) - self.builder.get_object("logoutcheckbutton").set_label(_("Log Out")) - self.builder.get_object("quitcheckbutton").set_label(_("Quit")) - self.editPlaceDialogTitle = _("Edit Place") self.newPlaceDialogTitle = _("New Place") self.folderChooserDialogTitle = _("Select a folder") diff --git a/usr/lib/linuxmint/mintMenu/plugins/applications.glade b/usr/lib/linuxmint/mintMenu/plugins/applications.glade index 9722395..db78884 100644 --- a/usr/lib/linuxmint/mintMenu/plugins/applications.glade +++ b/usr/lib/linuxmint/mintMenu/plugins/applications.glade @@ -1,4 +1,5 @@ + @@ -8,6 +9,9 @@ mouse static + + + True @@ -42,7 +46,7 @@ False 15 10 - <span weight="bold">Favorites</span> + Favorites True 0 @@ -70,7 +74,7 @@ True False - All _Applications + All applications True @@ -128,6 +132,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + @@ -160,7 +188,7 @@ False 15 10 - <span weight="bold">All Applications</span> + Applications True 0 @@ -188,7 +216,7 @@ True False - _Favorites + Favorites True @@ -328,7 +356,6 @@ - 227 30 True False @@ -374,6 +401,7 @@ True True False + Show additional search options none diff --git a/usr/lib/linuxmint/mintMenu/plugins/applications.py b/usr/lib/linuxmint/mintMenu/plugins/applications.py index 5c2dbd6..ffc8fbe 100755 --- a/usr/lib/linuxmint/mintMenu/plugins/applications.py +++ b/usr/lib/linuxmint/mintMenu/plugins/applications.py @@ -177,16 +177,6 @@ class pluginclass(object): self.favoritesBox =self.builder.get_object("favoritesBox") self.applicationsScrolledWindow =self.builder.get_object("applicationsScrolledWindow") - #i18n - self.builder.get_object("searchLabel").set_text("" + _("Search:") + "") - self.builder.get_object("searchLabel").set_use_markup(True) - self.builder.get_object("label6").set_text(_("Favorites")) - self.builder.get_object("label3").set_text(_("Favorites")) - self.builder.get_object("label7").set_text(_("All applications")) - self.builder.get_object("label2").set_text(_("Applications")) - - self.headingstocolor = [self.builder.get_object("label6"),self.builder.get_object("label2")] - self.numApps = 0 # These properties are NECESSARY to maintain consistency @@ -238,6 +228,7 @@ class pluginclass(object): self.settings.bindGSettingsEntryToVar("int", "default-tab", self, "defaultTab") except Exception as e: print(e) + self.currentFavCol = 0 self.favorites = []