Группа :: Графические оболочки/GNOME
Пакет: mintlocale
Главная Изменения Спек Патчи Sources Загрузить Gear Bugs and FR Repocop
Патч: mintlocale-1.5.5-alt2.patch
Скачать
Скачать
generate_desktop_files | 2 +-
usr/lib/linuxmint/mintlocale/add.py | 2 +-
usr/lib/linuxmint/mintlocale/install_remove.py | 2 +-
usr/lib/linuxmint/mintlocale/mintlocale.py | 9 ++++++---
4 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/generate_desktop_files b/generate_desktop_files
index ee71820..2d6dffd 100755
--- a/generate_desktop_files
+++ b/generate_desktop_files
@@ -1,7 +1,7 @@
#!/usr/bin/python3
DOMAIN = "mintlocale"
-PATH = "/usr/share/linuxmint/locale"
+PATH = "/usr/share/locale"
import os
import gettext
diff --git a/usr/lib/linuxmint/mintlocale/add.py b/usr/lib/linuxmint/mintlocale/add.py
index b9f3fe8..48fcc8b 100755
--- a/usr/lib/linuxmint/mintlocale/add.py
+++ b/usr/lib/linuxmint/mintlocale/add.py
@@ -13,7 +13,7 @@ from gi.repository import Gtk, Gdk, GdkPixbuf
# i18n
APP = 'mintlocale'
-LOCALE_DIR = "/usr/share/linuxmint/locale"
+LOCALE_DIR = "/usr/share/locale"
locale.bindtextdomain(APP, LOCALE_DIR)
gettext.bindtextdomain(APP, LOCALE_DIR)
gettext.textdomain(APP)
diff --git a/usr/lib/linuxmint/mintlocale/install_remove.py b/usr/lib/linuxmint/mintlocale/install_remove.py
index 9ee7cb4..1e1ed98 100755
--- a/usr/lib/linuxmint/mintlocale/install_remove.py
+++ b/usr/lib/linuxmint/mintlocale/install_remove.py
@@ -14,7 +14,7 @@ from gi.repository import Gtk, Gdk, GdkPixbuf
# i18n
APP = 'mintlocale'
-LOCALE_DIR = "/usr/share/linuxmint/locale"
+LOCALE_DIR = "/usr/share/locale"
locale.bindtextdomain(APP, LOCALE_DIR)
gettext.bindtextdomain(APP, LOCALE_DIR)
gettext.textdomain(APP)
diff --git a/usr/lib/linuxmint/mintlocale/mintlocale.py b/usr/lib/linuxmint/mintlocale/mintlocale.py
index 7b9a2a7..a0783ff 100755
--- a/usr/lib/linuxmint/mintlocale/mintlocale.py
+++ b/usr/lib/linuxmint/mintlocale/mintlocale.py
@@ -22,12 +22,15 @@ from gi.repository import Gtk, AccountsService, GLib, Gdk, GdkPixbuf, XApp
# Used to detect Debian derivatives (we don't want to show APT features in other distros)
IS_DEBIAN = os.path.exists("/etc/debian_version")
+if IS_DEBIAN:
+ import mintcommon
+
if IS_DEBIAN:
import apt
# i18n
APP = 'mintlocale'
-LOCALE_DIR = "/usr/share/linuxmint/locale"
+LOCALE_DIR = "/usr/share/locale"
locale.bindtextdomain(APP, LOCALE_DIR)
gettext.bindtextdomain(APP, LOCALE_DIR)
gettext.textdomain(APP)
@@ -568,7 +571,7 @@ class MintLocale:
self.system_label.set_markup("<b>%s</b>\n<small>%s <i>%s</i>\n%s <i>%s</i>\n%s <i>%s</i></small>" % (_("System locale"), language_prefix, language_str, region_prefix, region_str, time_prefix, time_str))
def set_num_installed(self):
- num_installed = int(subprocess.check_output("localedef --list-archive | wc -l", shell=True))
+ num_installed = int(subprocess.check_output("localectl list-locales | wc -l", shell=True))
self.install_label.set_markup("<b>%s</b>\n<small>%s</small>" % (_("Language support"), gettext.ngettext("%d language installed", "%d languages installed", num_installed) % num_installed))
def accountservice_ready(self, user, param):
@@ -602,7 +605,7 @@ class MintLocale:
self.languages[split[0]] = split[1]
cur_index = -1 # find the locale :P
- locales = subprocess.check_output("localedef --list-archive", shell=True)
+ locales = subprocess.check_output("localectl list-locales", shell=True)
locales = locales.decode('utf-8')
built_locales = {}