language-functions: improve setup for japan

diff --git a/debian/changelog b/debian/changelog
index 8d66c43..7f7d117 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+grml-autoconfig (0.7.2) unstable; urgency=low
+
+  * language-functions: improve setup for japan, add support for 'jp'
+    but still support 'ja' of course.
+
+ -- Michael Prokop <mika@grml.org>  Mon, 28 May 2007 13:55:21 +0200
+

 grml-autoconfig (0.7.1) unstable; urgency=low
 
   * Bumbing version to 0.7, we have a new stable release!
 grml-autoconfig (0.7.1) unstable; urgency=low
 
   * Bumbing version to 0.7, we have a new stable release!

diff --git a/language-functions b/language-functions
index 839b583..2fc86ff 100644 (file)
--- a/language-functions
+++ b/language-functions
@@ -560,26 +560,28 @@ case "$LANGUAGE" in
                 KDEKEYBOARDS="fr,us,de"
                 TZ="Europe/Rome"
                 ;;
                 KDEKEYBOARDS="fr,us,de"
                 TZ="Europe/Rome"
                 ;;

-        ja-iso)
+        ja-iso|jp-iso)

                 # (limited) Japanese version
                 COUNTRY="jp"
                 LANG="ja_JP"
                 LANGUAGE="ja"
                 # (limited) Japanese version
                 COUNTRY="jp"
                 LANG="ja_JP"
                 LANGUAGE="ja"

-                KEYTABLE="us"
-                XKEYBOARD="us"
+                KEYTABLE="jp106"
+                XKEYMODEL="jp106"
+                XKEYBOARD="jp"

                 KDEKEYBOARD="us"
                 CHARSET="iso8859-15"
                 KDEKEYBOARDS="fr,us,de"
                 TZ="Asia/Tokyo"
                 ;;
                 KDEKEYBOARD="us"
                 CHARSET="iso8859-15"
                 KDEKEYBOARDS="fr,us,de"
                 TZ="Asia/Tokyo"
                 ;;

-        ja|ja-utf8)
+        ja|ja-utf8|jp|jp-utf8)

                 # (limited) Japanese version (UTF8)
                 LANGUAGE="ja_JP:ja"
                 COUNTRY="jp"
                 LANG="ja_JP.UTF-8"
                 LANGUAGE="ja"
                 # (limited) Japanese version (UTF8)
                 LANGUAGE="ja_JP:ja"
                 COUNTRY="jp"
                 LANG="ja_JP.UTF-8"
                 LANGUAGE="ja"

-                KEYTABLE="us"
-                XKEYBOARD="us"
+                KEYTABLE="jp106"
+                XKEYMODEL="jp106"
+                XKEYBOARD="jp"

                 KDEKEYBOARD="us"
                 CHARSET="utf8"
                 # Additional KDE Keyboards
                 KDEKEYBOARD="us"
                 CHARSET="utf8"
                 # Additional KDE Keyboards