diff options
author | Jeremy Katz <katzj@redhat.com> | 2006-03-01 03:09:35 +0000 |
---|---|---|
committer | Jeremy Katz <katzj@redhat.com> | 2006-03-01 03:09:35 +0000 |
commit | 5c78603187ec35c8c539673dbc42024493f63476 (patch) | |
tree | 4f25d554b3befa7e3342dbfb69a1f26caca84154 /language.py | |
parent | 7d620f6e04161e36c86141cc63bf14341cee1810 (diff) | |
download | anaconda-5c78603187ec35c8c539673dbc42024493f63476.tar.gz anaconda-5c78603187ec35c8c539673dbc42024493f63476.tar.xz anaconda-5c78603187ec35c8c539673dbc42024493f63476.zip |
2006-02-28 Jeremy Katz <katzj@redhat.com>
* language.py (expandLangs): Handle locales like sr@Latn
properly (#182591)
Diffstat (limited to 'language.py')
-rw-r--r-- | language.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/language.py b/language.py index 3667a62cb..589fc311d 100644 --- a/language.py +++ b/language.py @@ -28,15 +28,17 @@ log = logging.getLogger("anaconda") # fr_FR.utf8@euro would become "fr_FR.utf8@eueo fr_FR.utf8 fr_FR fr" def expandLangs(astring): langs = [astring] + charset = None # remove charset ... if '.' in astring: langs.append(string.split(astring, '.')[0]) if '@' in astring: - langs.append(string.split(astring, '@')[0]) + charset = string.split(astring, '@')[1] # also add 2 character language code ... if len(astring) > 2: + if charset: langs.append("%s@%s" %(astring[:2], charset)) langs.append(astring[:2]) return langs |