summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJames Meyer <james.meyer@operamail.com>2012-11-07 21:16:58 (GMT)
committerJames Meyer <james.meyer@operamail.com>2012-11-07 21:16:58 (GMT)
commit8c854f27d31425891fd3cb58eeb91ac704a2c16c (patch)
treeebd95a0f9c9432292fe2b95e41536f6a25f1fb0c
parente12e4345d54841a38374590a23d12832fcbdbba6 (diff)
downloadlinhes_pkgbuild-8c854f27d31425891fd3cb58eeb91ac704a2c16c.zip
linhes_pkgbuild-8c854f27d31425891fd3cb58eeb91ac704a2c16c.tar.gz
linhes_pkgbuild-8c854f27d31425891fd3cb58eeb91ac704a2c16c.tar.bz2
LinHES-config: use all lowercase when looking up the locale in the language map.
refs #738 refs #100 refs #680
-rwxr-xr-xabs/core/LinHES-config/PKGBUILD4
-rw-r--r--abs/core/LinHES-config/mv_locale.py3
2 files changed, 4 insertions, 3 deletions
diff --git a/abs/core/LinHES-config/PKGBUILD b/abs/core/LinHES-config/PKGBUILD
index 1fcba1b..1134402 100755
--- a/abs/core/LinHES-config/PKGBUILD
+++ b/abs/core/LinHES-config/PKGBUILD
@@ -1,6 +1,6 @@
pkgname=LinHES-config
pkgver=2.3
-pkgrel=183
+pkgrel=184
conflicts=(MythVantage-config MythVantage-config-dev LinHES-config-dev LinHes-config )
pkgdesc="Install and configure your system"
depends=('bc' 'libstatgrab' 'mysql-python' 'expect' 'curl' 'dnsutils' 'parted'
@@ -163,7 +163,7 @@ md5sums=('ecd120a453dd185fc2b345086bfd62f5'
'b4900090d841d3e390cb840cf16afd85'
'f2a19e3e864984ec95ac5ea090cbfa69'
'c9c9390ac12145169dfe9a76896db328'
- '882830885b852af5a9a5c6df017504e0'
+ 'e4b61402858058f7575b776d62d5ee89'
'c2ef0f1140bd3fbeb44294fdf5415a32'
'2596460462cf6c889cf8f95485537b20'
'dc3c5270691a62600475705f4cb78b56'
diff --git a/abs/core/LinHES-config/mv_locale.py b/abs/core/LinHES-config/mv_locale.py
index e1bc59c..973be31 100644
--- a/abs/core/LinHES-config/mv_locale.py
+++ b/abs/core/LinHES-config/mv_locale.py
@@ -9,6 +9,7 @@ lan_map = {'bg':'bg_BG',
'de':'de_DE',
'el':'el_GR',
'en_ca':'en_CA',
+ 'en_ca':'en_CA',
'en_gb':'en_US',
'en_GB':'en_US',
'en_us':'en_US',
@@ -74,7 +75,7 @@ def setup_locale(systemconfig):
return
try:
- language = systemconfig.get("language")
+ language = systemconfig.get("language").lower()
except:
language = "en_us"