The existing templates for the four main questions in localechooser all have problems: they cause Lintian warnings and don't really help the user with what he's doing.
Below a proposed patch to improve them. The patch also includes the changes needed because of #552560 ("locale selection incomplete"). Test images (i386) this time that use the new templates and include the change for #552560 (use expert mode!) are available at: http://people.debian.org/~fjp/tmp/d-i/madduck/ Cheers, FJP commit 330cff17ef17481bc98d8b80656f12984017e10a Author: Frans Pop <f...@debian.org> Date: Sun Nov 1 17:19:40 2009 +0100 Update templates diff --git a/packages/localechooser/debian/localechooser.templates-in b/packages/localechooser/debian/localechooser.templates-in index c8203fb..75a8353 100644 --- a/packages/localechooser/debian/localechooser.templates-in +++ b/packages/localechooser/debian/localechooser.templates-in @@ -11,9 +11,8 @@ Template: debian-installer/locale Type: select Choices: ${LOCALELIST} # :sl2: -_Description: Choose a locale: - Based on your language and country choices, the following locale - parameters are supported. +_Description: System locale: + Select the default locale for the installed system. Template: debian-installer/fallbacklocale Type: select @@ -49,9 +48,9 @@ Choices-C: ${CODES} Choices: ${NAMES_EN} Choices-en.UTF-8: ${NAMES_BOTH} Default: en -Description: Choose a language: - Please choose the language used for the installation process. This - language will be the default language for the final system. +Description: Language: + Choose the language to be used for the installation process. The selected + language will also be the default language for the installed system. Template: localechooser/translation/none-yet Type: note @@ -141,16 +140,25 @@ Type: select # :sl1: __Choices: ${SHORTLIST}, other # :sl1: -_Description: Choose a country, territory or area: - Based on your language, you are probably located in one of these countries - or regions. +_Description: Country, territory or area: + Select the country where you live. The selection will be used for example to + select a default locale and time zone. + . + Choose "other" if your country is not listed. Template: localechooser/supported-locales Type: multiselect Choices: ${LOCALELIST} # :sl2: -_Description: Choose other locales to be supported: - You may choose additional locales to be installed from this list. +_Description: Additional locales: + A locale determines character encoding and contains information on e.g. + currency, date format and alphabetical sort order. Based on the selected + language and country, the default locale selected for the installed system + is '${LOCALE}'. + . + If you wish to use a different default or to also have other locales available, + you may choose additional locales to be installed. If you are unsure it is + best to simply stick with the default. # This template does not really belong in localechooser, but it is probably # the best place for it. It is used to display the language currently being diff --git a/packages/localechooser/mktemplates.continents b/packages/localechooser/mktemplates.continents index 4023f58..992b019 100755 --- a/packages/localechooser/mktemplates.continents +++ b/packages/localechooser/mktemplates.continents @@ -100,6 +100,9 @@ foreach my $region (@known_regions) { print TOUT "#flag:partial\n"; print TOUT "__Choices: ", join(", ", @countries), "\n"; print TOUT "_Description: ", gettext("Choose a country, territory or area:"), "\n"; + print TOUT " ", gettext("Select the country where you live. The selection will be used for example to select a default locale and time zone."), "\n"; + print TOUT " .\n"; + print TOUT " ", gettext("Choose \"other\" if your country is not listed."), "\n"; print TOUT "\n"; } else { print STDERR "I: skipping region $region: no associated countries in $regionmap\n"; @@ -111,8 +114,8 @@ print TOUT "Template: localechooser/continentlist\n"; print TOUT "Type: select\n"; print TOUT "#flag:partial\n"; print TOUT "__Choices: ", join(", ", @regions), "\n"; -print TOUT "_Description: ", gettext("Choose a continent or region:"), "\n"; -print TOUT " ", gettext("The continent or region in which the desired country is located."), "\n"; +print TOUT "_Description: ", gettext("Continent or region:"), "\n"; +print TOUT " ", gettext("Select the continent or region in which the country where you live is located."), "\n"; close(TOUT) || warn; -- To UNSUBSCRIBE, email to debian-boot-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org