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

Bug#171502: locales: improve localization of locales.templates



Package: locales
Version: 2.3.1-5
Severity: minor
Tags: patch

Hi,

strings "Leave alone" and "None" are hardcoded and cannot be localized
in the templates file.  Here is a patch 

Denis

-- System Information:
Debian Release: testing/unstable
Architecture: i386
Kernel: Linux france0danemark2 2.4.18-386 #2 Sun Apr 14 10:38:08 EST 2002 i586
Locale: LANG=fr_FR@euro, LC_CTYPE=fr_FR@euro (ignored: LC_ALL set)

Versions of packages locales depends on:
ii  debconf                       1.2.16     Debian configuration management sy
ii  libc6 [glibc-2.3.1-5]         2.3.1-5    GNU C Library: Shared libraries an

-- debconf information excluded

Index: config
===================================================================
RCS file: /cvs/glibc/glibc-package/debian/locales/DEBIAN/config,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 config
--- config	25 Jul 2002 14:37:00 -0000	1.1.1.1
+++ config	2 Dec 2002 22:48:59 -0000
@@ -23,7 +23,11 @@
 
 db_get locales/locales_to_be_generated && DEFAULT_LOCALES=$(echo $RET | sed -e 's/ [^ ]*,/,/g' -e 's/ [^ ]*$//')
 
-test -z "$DEFAULT_LOCALES" || DEFAULT_LOCALES=", $DEFAULT_LOCALES"
-db_subst locales/default_environment_locale locales Leave alone, None, C$DEFAULT_LOCALES
+if test -z "$DEFAULT_LOCALES"; then
+    DEFAULT_LOCALES=C
+else
+    DEFAULT_LOCALES="C, $DEFAULT_LOCALES"
+fi
+db_subst locales/default_environment_locale locales $DEFAULT_LOCALES
 db_input medium locales/default_environment_locale || true
 db_go
Index: templates
===================================================================
RCS file: /cvs/glibc/glibc-package/debian/locales/DEBIAN/templates,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 templates
--- templates	25 Jul 2002 14:37:00 -0000	1.1.1.1
+++ templates	2 Dec 2002 22:48:59 -0000
@@ -1,6 +1,6 @@
 Template: locales/locales_to_be_generated
 Type: multiselect
-Choices: ${locales}
+Choices: Leave alone, None, ${locales}
 Description: Select locales to be generated.
  You can choose locales to be generated by selecting locales you want.
  Selected locales will be saved to `/etc/locale.gen' file. You can also

Reply to: