From: Michael Prokop <mika@grml.org>
Date: Mon, 28 May 2007 11:30:43 +0000 (+0200)
Subject: grml-lang: add support for 'jp'
X-Git-Tag: 1.0.2~1
X-Git-Url: http://git.grml.org/?p=grml-scripts.git;a=commitdiff_plain;h=43479260b590c38cd4a3a3f4d6e53ff5b858ffef

grml-lang: add support for 'jp'
---

diff --git a/debian/changelog b/debian/changelog
index aa9cf0a..493223d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+grml-scripts (1.0.2) unstable; urgency=low
+
+  * grml-lang: add support for 'jp'.
+
+ -- Michael Prokop <mika@grml.org>  Mon, 28 May 2007 13:30:11 +0200
+
 grml-scripts (1.0.1) unstable; urgency=low
 
   * grml-lock: allow using it on grml-small too. Thanks for
diff --git a/usr_bin/grml-lang b/usr_bin/grml-lang
index 69926ea..6221705 100755
--- a/usr_bin/grml-lang
+++ b/usr_bin/grml-lang
@@ -4,12 +4,12 @@
 # Authors:       grml-team (grml.org), (c) Michael Prokop <mika@grml.org>
 # Bug-Reports:   see http://grml.org/bugs/
 # License:       This file is licensed under the GPL v2.
-# Latest change: Mon Apr 09 13:04:40 CEST 2007 [mika]
+# Latest change: Mon Mai 28 13:30:05 CEST 2007 [mika]
 ################################################################################
 
 usage(){
     echo "Usage: $0 <language>"
-    echo "supported values: at, de, ch, us"
+    echo "supported values: at, de, ch, jp, us"
 }
 
 if [ $# -lt "1" ] ; then
@@ -34,6 +34,10 @@ if [ -z "$DISPLAY" ] ;then
     echo 'Loading keymap us...'
     sudo loadkeys i386/qwerty/us-latin1.kmap.gz
     echo -e "\nDone."
+  elif [ "$1" = "jp" ] ; then
+    echo 'Loading keymap jp...'
+    sudo loadkeys i386/qwerty/jp106.kmap.gz
+    echo -e "\nDone."
   else echo "No valid parameter given.
 
 Notice: Use loadkeys on console and setxkbmap when running X for
@@ -43,8 +47,7 @@ modifying keyboard layout. Adjust \$LANG and \$LC_ALL for setting locales." ; ex
   case $LANG in *UTF-8) kbd_mode -u ; ;; esac
 else
   if [ $# = 0 ] ; then
-      echo "Usage: $0 <language>"
-      echo "supported values: at, de, ch, us"
+     usage
   else
     if [ "$1" = "de" ] ; then
       echo "Loading keymap for Germany..."
@@ -58,6 +61,10 @@ else
       echo "Loading keymap for Switzerland..."
       setxkbmap ch
       echo -e "\nDone."
+    elif [ "$1" = "jp" ] ; then
+      echo "Loading keymap for Japan..."
+      setxkbmap jp
+      echo -e "\nDone."
     elif [ "$1"  = "us" ] ; then
       echo 'Loading keymap us...'
       [ -r $HOME/.Xmodmap ] && xmodmap $HOME/.Xmodmap || setxkbmap us