[PC-BSD Commits] r6970 - in pcbsd: current/pc-sysinstall/backend stable/pc-sysinstall/backend

[svn at pcbsd.org]

Author: kris
Date: 2010-06-17 10:59:37 -0700 (Thu, 17 Jun 2010)
New Revision: 6970

Modified:
   pcbsd/current/pc-sysinstall/backend/functions-localize.sh
   pcbsd/stable/pc-sysinstall/backend/functions-localize.sh
Log:

Small fix to kxkbrc generation, don't need to have "us," in LayoutList, makes gui get confused



Modified: pcbsd/current/pc-sysinstall/backend/functions-localize.sh
===================================================================
--- pcbsd/current/pc-sysinstall/backend/functions-localize.sh	2010-06-17 09:04:09 UTC (rev 6969)
+++ pcbsd/current/pc-sysinstall/backend/functions-localize.sh	2010-06-17 17:59:37 UTC (rev 6970)
@@ -44,8 +44,7 @@
    OPTION="grp:alt_shift_toggle"
    SETXKBMAP=""
 
-   if [ "${COUNTRY}" = "NONE" ] || [ "${COUNTRY}" = "us" ];
-   then
+   if [ "${COUNTRY}" = "NONE" -o "${COUNTRY}" = "us" -o "${COUNTRY}" = "C" ] ; then
      #In this case we don't need any additional language
      COUNTRY=""
      OPTION=""
@@ -374,7 +373,6 @@
   KEYLAYOUT="NONE"
   KEYMOD="NONE"
   KEYVAR="NONE"
-  LANGUAGE="NONE"
 
   while read line
   do
@@ -392,7 +390,6 @@
       if [ "${INSTALLTYPE}" != "FreeBSD" ]
       then
         localize_pcbsd "$VAL"
-        LANGUAGE="$VAL"
       fi
       localize_freebsd "$VAL"
     fi

Modified: pcbsd/stable/pc-sysinstall/backend/functions-localize.sh
===================================================================
--- pcbsd/stable/pc-sysinstall/backend/functions-localize.sh	2010-06-17 09:04:09 UTC (rev 6969)
+++ pcbsd/stable/pc-sysinstall/backend/functions-localize.sh	2010-06-17 17:59:37 UTC (rev 6970)
@@ -44,8 +44,7 @@
    OPTION="grp:alt_shift_toggle"
    SETXKBMAP=""
 
-   if [ "${COUNTRY}" = "NONE" ] || [ "${COUNTRY}" = "us" ];
-   then
+   if [ "${COUNTRY}" = "NONE" -o "${COUNTRY}" = "us" -o "${COUNTRY}" = "C" ] ; then
      #In this case we don't need any additional language
      COUNTRY=""
      OPTION=""