some i18n fixes from Peter Ivanyi (ivanyi@internet.sk)

- sysconfig.txt was wrong
- add latin2-ucw to ACMs

3 files changed, 35 insertions, 33 deletions

diff --git a/lang.csh b/lang.csh
index ebc7f9cb..dde51a01 100755
--- a/lang.csh
+++ b/lang.csh
@@ -8,7 +8,7 @@ if ($status == 0) then
 
     if ($?SYSFONTACM) then
         switch ($SYSFONTACM)
-	    case iso01*|iso02*|iso15*|koi*:
+	    case iso01*|iso02*|iso15*|koi*|latin2-ucw*:
 		if ( "$TERM" == "linux" ) then
 		    if ( ls -l /proc/$$/fd/0 2>/dev/null | grep -- '-> /dev/tty[0-9]*$' >/dev/null 2>&1)  then
 			echo -n -e '\033(K' > /proc/$$/fd/0
diff --git a/lang.sh b/lang.sh
index c6996015..f6d6a44f 100755
--- a/lang.sh
+++ b/lang.sh
@@ -16,7 +16,7 @@ if [ -f /etc/sysconfig/i18n ]; then
 
     if [ -n "$SYSFONTACM" ]; then
 	case $SYSFONTACM in
-	    iso01*|iso02*|iso15*|koi*)
+	    iso01*|iso02*|iso15*|koi*|latin2-ucw*)
 		if [ "$TERM" = "linux" ]; then
 		    if ls -l /proc/$$/fd/0 2>/dev/null | grep -- '-> /dev/tty[0-9]*$' >/dev/null 2>&1; then
 			echo -n -e '\033(K' > /proc/$$/fd/0
diff --git a/sysconfig.txt b/sysconfig.txt
index 36a8f0e3..377725b6 100644
--- a/sysconfig.txt
+++ b/sysconfig.txt
@@ -195,6 +195,39 @@ Files in /etc/sysconfig
     -q option is not given to sendmail if /etc/sysconfig/sendmail
     exists and QUEUE is empty or undefined.
 
+/etc/sysconfig/i18n
+
+  LANG= set locale for all categories, can be any two letter ISO
+    language code
+  LC_CTYPE= localedata configuration for classification and conversion
+    of characters
+  LC_COLLATE= localedata configuration for collation (sort order) of
+    strings
+  LC_MESSAGES= localedata configuration for translation of yes and no
+    messages
+  LC_NUMERIC= localedata configuration for non-monetary numeric data
+  LC_MONETARY= localedata configuration for monetary data
+  LC_TIME= localedata configuration for date and time
+  LC_ALL= localedata configuration overriding all of the above
+  LANGUAGE= can be a : separated list of ISO language codes
+  LINGUAS= can be a ' ' separated list of ISO language codes
+
+  The above variables are used in /etc/profile.d/lang.sh.
+
+  SYSFONT= any font that is legal when used as
+	/usr/bin/consolechars -f $SYSFONT ...
+    (See console-tools package for consolechars command)
+
+  UNIMAP= any SFM (screen font map, formerly called Unicode mapping
+    table - see consolechars(8))
+	/usr/bin/consolechars -f $SYSFONT --sfm $UNIMAP
+ 
+  SYSFONTACM= any ACM (application charset map - see consolechars(8))
+        /usr/bin/consolechars -f $SYSFONT --acm $SYSFONTACM
+ 
+  The above is used by the /sbin/setsysfont command (which is run
+  by rc.sysinit at boot time.)
+
 
 Files in /etc/sysconfig/network-scripts/
 ========================================
@@ -349,34 +382,3 @@ Files in /etc/sysconfig/network-scripts/
   up /etc/resolv.conf from the version dhcpcd dropped in
   /etc/dhcpc/resolv.conf
 
-/etc/sysconfig/i18n
-
-  LANG= can be any two letter ISO language code
-  LC_CTYPE= localedata configuration for classification and conversion
-    of characters
-  LC_COLLATE= localedata configuration for collation (sort order) of
-    strings
-  LC_MESSAGES= localedata configuration for translation of yes and no
-    messages
-  LC_NUMERIC= localedata configuration for non-monetary numeric data
-  LC_MONETARY= localedata configuration for monetary data
-  LC_TIME= localedata configuration for date and time
-  LC_ALL= localedata configuration overriding all the above
-  LANGUAGE= can be any two letter ISO language code
-  LINGUAS= can be a : separated list of ISO language codes
-
-  The above variables are used in /etc/profile.d/lang.sh.
-
-  SYSFONT= any font that is legal when used as
-	/usr/bin/consolechars -f $SYSFONT ...
-    (See console-tools package for consolechars command)
-
-  UNIMAP= any SFM (screen font map, formerly called Unicode mapping
-    table - see consolechars(8))
-	/usr/bin/consolechars -f $SYSFONT --sfm $UNIMAP
- 
-  SYSFONTACM= any ACM (application charset map - see consolechars(8))
-        /usr/bin/consolechars -f $SYSFONT --acm $SYSFONTACM
- 
-  The above is used by the /sbin/setsysfont command (which is run
-  by rc.sysinit at boot time.)