[PATCH 1/3] Store "en" as the default, not "en_US".

Chris Lumens clumens at redhat.com
Wed Sep 5 21:25:56 UTC 2012


---
 pyanaconda/localization.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pyanaconda/localization.py b/pyanaconda/localization.py
index d3dda8a..0ac0532 100644
--- a/pyanaconda/localization.py
+++ b/pyanaconda/localization.py
@@ -133,9 +133,9 @@ def get_available_translations(domain=None, localedir=None):
     messagefiles = gettext.find(domain, localedir, langdict.keys(), all=True)
     languages = [path.split(os.path.sep)[-3] for path in messagefiles]
 
-    # usually there are no message files for en_US
-    if 'en_US' not in languages:
-        languages.append('en_US')
+    # usually there are no message files for en
+    if 'en' not in languages:
+        languages.append('en')
 
     for langcode in languages:
         try:
@@ -243,8 +243,8 @@ class Language(object):
     def __init__(self, preferences={}, territory=None):
         self.translations = {repr(locale):locale for locale in get_available_translations()}
         self.locales = {repr(locale):locale for locale in get_all_locales()}
-        self.preferred_translation = self.translations['en_US']
-        self.preferred_locales = [self.locales['en_US']]
+        self.preferred_translation = self.translations['en']
+        self.preferred_locales = [self.locales['en']]
         self.preferred_locale = self.preferred_locales[0]
 
         self.all_preferences = preferences
-- 
1.7.11.2



More information about the anaconda-patches mailing list