diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | language.py | 4 |
2 files changed, 8 insertions, 1 deletions
@@ -1,3 +1,8 @@ +2006-02-28 Jeremy Katz <katzj@redhat.com> + + * language.py (expandLangs): Handle locales like sr@Latn + properly (#182591) + 2006-02-28 David Cantrell <dcantrell@redhat.com> * iw/autopart_type.py: Make the partitioning type combo box wider. 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 |