[PC-BSD Commits] r1945 - pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts

[svn at pcbsd.org]

Author: melkor
Date: 2008-05-21 14:22:14 -0700 (Wed, 21 May 2008)
New Revision: 1945

Modified:
   pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.Localize.sh
Log:

Some localization fixes


Modified: pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.Localize.sh
===================================================================
--- pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.Localize.sh	2008-05-21 20:54:52 UTC (rev 1944)
+++ pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.Localize.sh	2008-05-21 21:22:14 UTC (rev 1945)
@@ -163,7 +163,7 @@
 
 # Change the keyboard layout tool
 ##########################################################################
-sed -e "s/CHANGEME/${KEYLAYOUT},us/g" /mnt/usr/share/skel/.kde/share/config/kxkbrc > /mnt/tmp/sed
+sed -e "s/CHANGEME/us,${KEYLAYOUT}/g" /mnt/usr/share/skel/.kde/share/config/kxkbrc > /mnt/tmp/sed
 
 mv /mnt/tmp/sed /mnt/usr/share/skel/.kde/share/config/kxkbrc
 
@@ -198,9 +198,9 @@
 
 
 # Add Locale Profile to /etc/login.conf
-echo "${LANG}-utf|PCBSD Users Accounts:\
-        :charset=UTF-8:\
-        :lang=${LOCALE}.UTF-8:\
+echo "${LANG}-utf|PCBSD Users Accounts:\\
+        :charset=UTF-8:\\
+        :lang=${LOCALE}.UTF-8:\\
         :tc=default:
 " >> /mnt/etc/login.conf
 
@@ -229,7 +229,7 @@
   fi
 
   # Change the keyboard layout tool
-  sed -e "s/CHANGEME/${KEYLAYOUT},us/g" /mnt/usr/home/${i}/.kde/share/config/kxkbrc > /mnt/tmp/sed
+  sed -e "s/CHANGEME/us,${KEYLAYOUT}/g" /mnt/usr/home/${i}/.kde/share/config/kxkbrc > /mnt/tmp/sed
 
   mv /mnt/tmp/sed /mnt/usr/home/${i}/.kde/share/config/kxkbrc
 done
@@ -248,6 +248,7 @@
    nl) KEYLAYOUT_CONSOLE="dutch.iso.acc" ;;
    no) KEYLAYOUT_CONSOLE="norwegian.iso" ;;
    pl) KEYLAYOUT_CONSOLE="pl_PL.ISO8859-2" ;;
+   ru) KEYLAYOUT_CONSOLE="ru.koi8-r" ;;
    sk) KEYLAYOUT_CONSOLE="sk.iso2" ;;
    se) KEYLAYOUT_CONSOLE="swedish.iso" ;;
    tr) KEYLAYOUT_CONSOLE="tr.iso9.q" ;;