[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#274491: Followup...



This is still present in unstable.
And it works plain wrong.
For instance, if I select de_DE.UTF-8@euro, it generates the locale for 
de_DE@euro instead, and the keyboard becomes unusable.
Please remove those bogus locales.
And second, if the used locale is different than the one requested, locale-gen 
should always write this warning into its output message.

Patch for the latter one is attached.

Josef
--- locale-gen.unstable	2005-03-16 15:12:54.000000000 +0100
+++ locale-gen	2005-03-16 15:12:59.000000000 +0100
@@ -30,12 +30,16 @@
 while read locale charset; do \
 	case $locale in \#*) continue;; "") continue;; esac; \
 	is_entry_ok || continue
-	echo -n "  `echo $locale | sed 's/\([^.\@]*\).*/\1/'`"; \
-	echo -n ".$charset"; \
-	echo -n `echo $locale | sed 's/\([^\@]*\)\(\@.*\)*/\2/'`; \
+        lang=`echo $locale | sed 's/\([^.\@]*\).*/\1/'`
+	flavour=`echo $locale | sed 's/\([^\@]*\)\(\@.*\)*/\2/'`
+	echo -n "  $lang.$charset$flavour"; \
 	echo -n '...'; \
-        if [ -f $LOCALES/$locale ]; then input=$locale; else \
-        input=`echo $locale | sed 's/\([^.]*\)[^@]*\(.*\)/\1\2/'`; fi; \
+        if [ -f $LOCALES/$locale ]; then \
+                input=$locale; \
+        else \
+                input=`echo $locale | sed 's/\([^.]*\)[^@]*\(.*\)/\1\2/'`; \
+		echo -n " (using $input)"; \
+        fi; \
 	localedef -i $input -c -f $charset -A /etc/locale.alias $locale; \
 	echo ' done'; \
 done < $LOCALEGEN

Reply to: