[ocrfeeder/introspection] Fix issues when no locale is set
- From: Joaquim Manuel Pereira Rocha <jrocha src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [ocrfeeder/introspection] Fix issues when no locale is set
- Date: Sun, 13 Jul 2014 09:04:53 +0000 (UTC)
commit 38ca5cce9d2c3deb1b918f235747595468448e96
Author: Joaquim Rocha <me joaquimrocha com>
Date: Sat Jul 12 21:18:00 2014 +0200
Fix issues when no locale is set
gb#704786
src/ocrfeeder/studio/widgetPresenter.py | 1 +
src/ocrfeeder/util/configuration.py | 4 +++-
src/ocrfeeder/util/lib.py | 2 --
3 files changed, 4 insertions(+), 3 deletions(-)
---
diff --git a/src/ocrfeeder/studio/widgetPresenter.py b/src/ocrfeeder/studio/widgetPresenter.py
index a4b7db7..86cb30c 100644
--- a/src/ocrfeeder/studio/widgetPresenter.py
+++ b/src/ocrfeeder/studio/widgetPresenter.py
@@ -257,6 +257,7 @@ class LanguagesComboBox(Gtk.ComboBox):
self.add_attribute(renderer, 'text', self._LANG_COLUMN)
languages = lib.getLanguages()
+
sorted_keys = sorted(languages, key = lambda k: languages[k])
if sorted_keys:
values = ('', _('No language'))
diff --git a/src/ocrfeeder/util/configuration.py b/src/ocrfeeder/util/configuration.py
index 7de817c..8e9134d 100644
--- a/src/ocrfeeder/util/configuration.py
+++ b/src/ocrfeeder/util/configuration.py
@@ -103,6 +103,8 @@ class ConfigurationManager(object):
TEMPORARY_FOLDER = tempfile.mkdtemp(prefix = OCRFEEDER_COMPACT_NAME + '_')
+ DEFAULT_LOCALE = locale.getdefaultlocale()[0]
+
DEFAULTS = {TEXT_FILL: (94, 156, 235, 150),
BOXES_STROKE: (94, 156, 235, 250),
IMAGE_FILL: (0, 183, 0, 150),
@@ -120,7 +122,7 @@ class ConfigurationManager(object):
DESKEW_IMAGES_AFTER_ADDITION: False,
UNPAPER_IMAGES_AFTER_ADDITION: False,
UNPAPER_EXTRA_OPTIONS: '',
- LANGUAGE: locale.getdefaultlocale()[0].split('_')[0],
+ LANGUAGE: DEFAULT_LOCALE.split('_')[0] if DEFAULT_LOCALE else '',
}
conf = dict(DEFAULTS)
diff --git a/src/ocrfeeder/util/lib.py b/src/ocrfeeder/util/lib.py
index 4a088bf..e972c3b 100644
--- a/src/ocrfeeder/util/lib.py
+++ b/src/ocrfeeder/util/lib.py
@@ -180,8 +180,6 @@ languages = {}
def getLanguages():
global languages
if not languages:
- lc, encoding = locale.getdefaultlocale()
- language_country = lc.split('_')
root = etree.parse(ISO_CODES_PATH + 'iso_639.xml')
for element in root.findall('//iso_639_entry[ iso_639_1_code]'):
languages[element.get('iso_639_1_code')] = element.get('name')
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]