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

[svn at pcbsd.org]

Author: kris
Date: 2008-08-01 13:40:06 -0700 (Fri, 01 Aug 2008)
New Revision: 2516

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

Fixed the localization script to enable the correct locale data in KDE4



Modified: pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.Localize.sh
===================================================================
--- pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.Localize.sh	2008-08-01 20:35:25 UTC (rev 2515)
+++ pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.Localize.sh	2008-08-01 20:40:06 UTC (rev 2516)
@@ -10,7 +10,7 @@
 SETLANG="${LANG}"
 SETKDMLANG="${LANG}"
 
-FILE="$LANG-kde-i18n-*.tbz"
+FILE="$LANG-kde-l10n-*.tbz"
 
 
 # Setup the presets for the specific lang
@@ -155,35 +155,33 @@
 #Change the skel files
 ##########################################################################
 sed -e "s/Country=us/Country=${COUNTRY}/g" ${FSMNT}/usr/share/skel/.kde4/share/config/kdeglobals  > ${FSMNT}/tmp/sed
-
 mv ${FSMNT}/tmp/sed ${FSMNT}/usr/share/skel/.kde4/share/config/kdeglobals
 
 # Change the language
 ##########################################################################
 sed -e "s/Language=en_US/Language=${SETLANG}/g" ${FSMNT}/usr/share/skel/.kde4/share/config/kdeglobals > ${FSMNT}/tmp/sed
-
 mv ${FSMNT}/tmp/sed ${FSMNT}/usr/share/skel/.kde4/share/config/kdeglobals 
 
 # Change the keyboard layout tool
 ##########################################################################
-sed -e "s/CHANGEME/us,${KEYLAYOUT}/g" ${FSMNT}/usr/share/skel/.kde4/share/config/kxkbrc > ${FSMNT}/tmp/sed
-
+sed -e "s/CHANGEME/${KEYLAYOUT},us/g" ${FSMNT}/usr/share/skel/.kde4/share/config/kxkbrc > ${FSMNT}/tmp/sed
 mv ${FSMNT}/tmp/sed ${FSMNT}/usr/share/skel/.kde4/share/config/kxkbrc
 
 #Change the root files
 ##########################################################################
 sed -e "s/Country=C/Country=${COUNTRY}/g" ${FSMNT}/root/.kde4/share/config/kdeglobals  > ${FSMNT}/tmp/sed
-
 mv ${FSMNT}/tmp/sed ${FSMNT}/root/.kde4/share/config/kdeglobals
 
 sed -e "s/Language=en_US/Language=${SETLANG}/g" ${FSMNT}/root/.kde4/share/config/kdeglobals > ${FSMNT}/tmp/sed
-
 mv ${FSMNT}/tmp/sed ${FSMNT}/root/.kde4/share/config/kdeglobals 
 
+sed -e "s/CHANGEME/${KEYLAYOUT},us/g" ${FSMNT}/root/.kde4/share/config/kxkbrc > ${FSMNT}/tmp/sed
+mv ${FSMNT}/tmp/sed ${FSMNT}/root/.kde4/share/config/kxkbrc
+
+
 #Change KDM Langs
 ##########################################################################
 sed -e "s/Language=en_US/Language=${SETKDMLANG}/g" ${FSMNT}/usr/local/kde4/share/config/kdm/kdmrc > ${FSMNT}/tmp/sed
-
 mv ${FSMNT}/tmp/sed ${FSMNT}/usr/local/kde4/share/config/kdm/kdmrc
 
 # Change the profile and csh.cshrc file
@@ -240,7 +238,7 @@
   fi
 
   # Change the keyboard layout tool
-  sed -e "s/CHANGEME/us,${KEYLAYOUT}/g" ${FSMNT}/usr/home/${i}/.kde4/share/config/kxkbrc > ${FSMNT}/tmp/sed
+  sed -e "s/CHANGEME/${KEYLAYOUT},us/g" ${FSMNT}/usr/home/${i}/.kde4/share/config/kxkbrc > ${FSMNT}/tmp/sed
 
   mv ${FSMNT}/tmp/sed ${FSMNT}/usr/home/${i}/.kde4/share/config/kxkbrc
 done