grml-lang and grml-quickconfig: add support for spanish keyboards

diff --git a/debian/changelog b/debian/changelog
index 7d947fa..494ce1f 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+grml-scripts (1.1.20) unstable; urgency=low
+
+  * grml-lang and grml-quickconfig: add support for spanish keyboards,
+    thanks to Ernesto Domato!
+
+ -- Michael Prokop <mika@grml.org>  Fri, 12 Jun 2009 23:18:13 +0200
+
 grml-scripts (1.1.19) unstable; urgency=low
 
   [ Michael Prokop ]

diff --git a/usr_bin/grml-lang b/usr_bin/grml-lang
index bc9fa17..9d69929 100755 (executable)
--- a/usr_bin/grml-lang
+++ b/usr_bin/grml-lang
@@ -4,12 +4,11 @@
 # 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 Jun 04 22:33:29 CEST 2007 [mika]
 ################################################################################
 
 usage(){
     echo "Usage: $0 <language>"
-    echo "supported values: at, de, dvorak, ch, jp, us"
+    echo "supported values: at, ch, de, dvorak, es, jp, us"
 }
 
 if [ $# -lt "1" ] ; then
@@ -42,6 +41,10 @@ if [ -z "$DISPLAY" ] ;then
     echo 'Loading keymap jp...'
     sudo loadkeys i386/qwerty/jp106.kmap.gz
     echo -e "\nDone."
+  elif [ "$1" = "es" ] ; then
+    echo 'Loading keymap es...'
+    sudo loadkeys i386/qwerty/es.kmap.gz
+    echo -e "\nDone."
   else echo "No valid parameter given.
 
 Notice: Use loadkeys on console and setxkbmap when running X for
@@ -77,6 +80,10 @@ else
       echo 'Loading keymap us...'
       [ -r $HOME/.Xmodmap ] && xmodmap $HOME/.Xmodmap || setxkbmap us
       echo -e "\nDone."
+    elif [ "$1" = "es" ] ; then
+      echo "Loading keymap es..."
+      setxkbmap es
+      echo -e "\nDone."
     else
       echo "No valid parameter given."
       echo

diff --git a/usr_sbin/grml-quickconfig b/usr_sbin/grml-quickconfig
index c5a5db2..cb4ab85 100755 (executable)
--- a/usr_sbin/grml-quickconfig
+++ b/usr_sbin/grml-quickconfig
@@ -4,7 +4,6 @@
 # Authors:       Michael Schierl <schierlm-public@gmx.de>, Alexander Wirt <formorer@grml.org>
 # Bug-Reports:   see http://grml.org/bugs/
 # License:       This file is licensed under the GPL v2.
-# Latest change: Die Mär 25 20:37:17 CET 2008 [mika]
 ################################################################################
 
 # menu with quick config options
@@ -40,6 +39,7 @@ $HLINE=$B."x".$N;      # A single horizontal line drawing character
     a => 'grml-lang at',
     c => 'grml-lang ch',
     u => 'grml-lang us',
+    s => 'grml-lang es',
     n => 'grml-network',
     e => 'netcardconfig',
     i => 'grml-info',
@@ -96,7 +96,7 @@ while(1) {
    $HLINE Press a highlighted key to perform an action, or press $HLINE
    $HLINE ${W}Return${N} or ${W}q${N} to go back to the shell.                   $HLINE
    ${B}tqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqu${N}
-   $HLINE Set keyboard layout (${M}grml-lang${N}): ${W}d${N}e ${W}a${N}t ${W}c${N}h ${W}u${N}s           $HLINE
+   $HLINE Set keyboard layout (${M}grml-lang${N}): ${W}d${N}e ${W}a${N}t ${W}c${N}h e${W}s${N} ${W}u${N}s        $HLINE
    $HLINE Configure ${W}n${N}etwork (${M}grml-network${N})                       $HLINE
    $HLINE -> Configure ${W}e${N}thernet card directly (${M}netcardconfig${N})    $HLINE
    ${B}tqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqu${N}