[or-cvs] r15410: Fixed some locale and keyboard layout issues. (in incognito/trunk/root_overlay: etc/init.d var/lib/kdesession var/patches)

[anonym@xxxxxxxx]

Author: anonym
Date: 2008-06-22 05:33:18 -0400 (Sun, 22 Jun 2008)
New Revision: 15410

Added:
   incognito/trunk/root_overlay/var/patches/clean-locale.patch
Modified:
   incognito/trunk/root_overlay/etc/init.d/external-locale
   incognito/trunk/root_overlay/var/lib/kdesession/kxkbrc
Log:
Fixed some locale and keyboard layout issues.


Modified: incognito/trunk/root_overlay/etc/init.d/external-locale
===================================================================
--- incognito/trunk/root_overlay/etc/init.d/external-locale	2008-06-22 09:09:34 UTC (rev 15409)
+++ incognito/trunk/root_overlay/etc/init.d/external-locale	2008-06-22 09:33:18 UTC (rev 15410)
@@ -32,13 +32,15 @@
 		echo "user_pref(\"general.useragent.locale\", \"${LANGUAGE}\");" >> "${PREFS}"
 	    done
 
-	    # Localize KDE
+	    # Set keyboard layout in KDE
 	    case "${LANGUAGE}" in
 		"ar") XKB_LANG="ara";;
 		"en") XKB_LANG="us";;
 		"fa") XKB_LANG="ir";;
 		"he") XKB_LANG="il";;
                 "ja") XKB_LANG="jp";;
+                "sv") XKB_LANG="se";;
+                "zh") XKB_LANG="cn";;
 		*) XKB_LANG="${LANGUAGE}";;
 	    esac
 

Modified: incognito/trunk/root_overlay/var/lib/kdesession/kxkbrc
===================================================================
--- incognito/trunk/root_overlay/var/lib/kdesession/kxkbrc	2008-06-22 09:09:34 UTC (rev 15409)
+++ incognito/trunk/root_overlay/var/lib/kdesession/kxkbrc	2008-06-22 09:33:18 UTC (rev 15410)
@@ -2,7 +2,7 @@
 DisplayNames=
 EnableXkbOptions=false
 IncludeGroups=
-LayoutList=us,de,es,fr,it,jp,pt,ru,se,ara,il,ir
+LayoutList=us,ara,cn,de,es,fr,il,ir,it,jp,pt,ru,se
 Model=pc105
 Options=
 ResetOldOptions=false

Added: incognito/trunk/root_overlay/var/patches/clean-locale.patch
===================================================================
--- incognito/trunk/root_overlay/var/patches/clean-locale.patch	                        (rev 0)
+++ incognito/trunk/root_overlay/var/patches/clean-locale.patch	2008-06-22 09:33:18 UTC (rev 15410)
@@ -0,0 +1,11 @@
+--- usr/sbin/clean-locale.orig	2008-06-22 00:20:06.668768700 +0200
++++ usr/sbin/clean-locale	2008-06-22 00:21:19.834768412 +0200
+@@ -5,7 +5,7 @@
+ 
+ KDE="${ROOT}/usr/kde/3.5"
+ 
+-AVAILABLE=$(for GLIBC_LC in $(ls ${ROOT}/usr/lib/locale); do 
++AVAILABLE=$(for GLIBC_LC in $(localedef --list-archive); do 
+ 	echo "_${GLIBC_LC/_*/}_"
+ done | sort | uniq)
+