diff -Nru localechooser-2.89/debian/changelog localechooser-2.89ubuntu1/debian/changelog --- localechooser-2.89/debian/changelog 2020-10-31 11:40:30.000000000 +0000 +++ localechooser-2.89ubuntu1/debian/changelog 2020-10-31 15:17:02.000000000 +0000 @@ -1,3 +1,37 @@ +localechooser (2.89ubuntu1) hirsute; urgency=low + + * Merge from Debian unstable. Remaining changes: + - Add encoding field to languagelist file and use the full SUPPORTED + file rather than SUPPORTED-short. + - Add a localechooser-data package containing lists useful for packages + that create automatic installation scripts. + - Drop fallbacks for Norwegian Bokmål and Nynorsk. + - If OVERRIDE_SHOW_ALL_LANGUAGES is set in the environment, display all + languages regardless of frontend. + - localechooser: Use grep -a to make sure grep sees our language list data + as ASCII and not random binary since it contains some glyphs for language + name translations. Fixes at least one crash in Ubiquity. + - Always support English, unless preseeded otherwise. + - If the language question was already marked as seen and the answer + didn't change, then don't recalculate the locale. + - Cancel any locale preseeding if the user changes the language. + - Simplify use of locale-gen using the new command-line argument + facility in Ubuntu's locales package. + - For cases where selecting a different location may imply a different + dialect of the language, i.e. Portuguese and Chinese, take care to set + LANG and LANGUAGE to something reflecting the language and LC_NUMERIC, + LC_TIME, LC_MONETARY, LC_PAPER, LC_NAME, LC_ADDRESS, LC_TELEPHONE, + LC_MEASUREMENT, and LC_IDENTIFICATION to something reflecting the + location. + - Allow localechooser to write out preferences to /etc/default/locale + even if we're installing to a pre-configured rootfs. (LP: #1759442) + - Make C.UTF-8 a configurable option and use the same codepaths as C. + - Set C.UTF-8 as default when localechooser is not seen or preseeded. + - Add Silesian (szl) to languagelist (LP: #1844653) + - Add Kurdish, Central (ckb) to languagelist (LP: #1864680) + + -- Dave Jones Sat, 31 Oct 2020 15:17:02 +0000 + localechooser (2.89) unstable; urgency=medium * Team upload @@ -186,6 +220,63 @@ -- Christian Perrier Sat, 25 Nov 2017 09:18:26 +0100 +localechooser (2.71ubuntu5) groovy; urgency=medium + + * Add Kurdish, Central (ckb) to languagelist (LP: #1864680) + + -- Gunnar Hjalmarsson Sat, 25 Apr 2020 22:13:00 +0200 + +localechooser (2.71ubuntu4) eoan; urgency=medium + + * Add Silesian (szl) to languagelist (LP: #1844653) + + -- Gunnar Hjalmarsson Thu, 19 Sep 2019 18:06:00 +0200 + +localechooser (2.71ubuntu3) bionic; urgency=medium + + * Fix a missing operator in localechooser that throws spurious errors. + + -- Adam Conrad Tue, 24 Jul 2018 16:20:33 -0600 + +localechooser (2.71ubuntu2) bionic; urgency=medium + + * Allow localechooser to write out preferences to /etc/default/locale + even if we're installing to a pre-configured rootfs. (LP: #1759442) + * Make C.UTF-8 a configurable option and use the same codepaths as C. + * Set C.UTF-8 as default when localechooser is not seen or preseeded. + + -- Adam Conrad Fri, 20 Apr 2018 09:08:00 -0600 + +localechooser (2.71ubuntu1) bionic; urgency=low + + * Merge with Debian. Remaining changes: + - Add encoding field to languagelist file and use the full SUPPORTED + file rather than SUPPORTED-short. + - Add a localechooser-data package containing lists useful for packages + that create automatic installation scripts. + - Drop fallbacks for Norwegian Bokmål and Nynorsk. + - If OVERRIDE_SHOW_ALL_LANGUAGES is set in the environment, display all + languages regardless of frontend. + - localechooser: Use grep -a to make sure grep sees our language list data + as ASCII and not random binary since it contains some glyphs for language + name translations. Fixes at least one crash in Ubiquity. + - Always support English, unless preseeded otherwise. + - If the language question was already marked as seen and the answer + didn't change, then don't recalculate the locale. + - Cancel any locale preseeding if the user changes the language. + - Simplify use of locale-gen using the new command-line argument + facility in Ubuntu's locales package. + - For cases where selecting a different location may imply a different + dialect of the language, i.e. Portuguese and Chinese, take care to set + LANG and LANGUAGE to something reflecting the language and LC_NUMERIC, + LC_TIME, LC_MONETARY, LC_PAPER, LC_NAME, LC_ADDRESS, LC_TELEPHONE, + LC_MEASUREMENT, and LC_IDENTIFICATION to something reflecting the + location. + - Better match for commented lines and preseeded values in the list of + supported locales. + + -- Mathieu Trudel-Lapierre Tue, 07 Nov 2017 14:51:02 -0500 + localechooser (2.71) unstable; urgency=medium [ Updated translations ] @@ -230,6 +321,57 @@ -- Christian Perrier Thu, 25 Jun 2015 11:39:37 +0200 +localechooser (2.65ubuntu4) xenial; urgency=medium + + * localechooser: Use grep -a to make sure grep sees our language list data + as ASCII and not random binary since it contains some glyphs for language + name translations. Fixes at least one crash in Ubiquity. (LP: #1551285) + + -- Mathieu Trudel-Lapierre Wed, 13 Apr 2016 10:04:25 -0400 + +localechooser (2.65ubuntu3) wily; urgency=medium + + * Re-drop fallbacks for Norwegian Bokmål and Nynorsk. Sorry! (LP: #1507985) + + -- Mathieu Trudel-Lapierre Tue, 20 Oct 2015 15:12:20 +0100 + +localechooser (2.65ubuntu2) wily; urgency=medium + + * Properly handle Portugese and Chinese special-cases for LANG and LANGUAGE: + the format of languagelist has changed a bit so the cut commands need to + be updated accordingly. (LP: #1465530) + + -- Mathieu Trudel-Lapierre Mon, 19 Oct 2015 11:07:05 +0100 + +localechooser (2.65ubuntu1) wily; urgency=medium + + * Resynchronise with Debian. Remaining changes: + - Add a localechooser-data package containing lists useful for packages + that create automatic installation scripts. + - Always support English, unless preseeded otherwise. + - Simplify use of locale-gen using the new command-line argument + facility in Ubuntu's locales package. + - Add encoding field to languagelist file and use the full SUPPORTED + file rather than SUPPORTED-short. + - If the language question was already marked as seen and the answer + didn't change, then don't recalculate the locale. + - If OVERRIDE_SHOW_ALL_LANGUAGES is set in the environment, display all + languages regardless of frontend. + - Cancel any locale preseeding if the user changes the language. + - For cases where selecting a different location may imply a different + dialect of the language, i.e. Portuguese and Chinese, take care to set + LANG and LANGUAGE to something reflecting the language and LC_NUMERIC, + LC_TIME, LC_MONETARY, LC_PAPER, LC_NAME, LC_ADDRESS, LC_TELEPHONE, + LC_MEASUREMENT, and LC_IDENTIFICATION to something reflecting the + location. + - Create skeleton locale-langpack subdirectories for each language being + installed, so that accountsservice knows to offer the + incomplete-language-support prompt (LP: #1307983). + * Add Breaks for system-config-kickstart and casper due to change in the + languagelist file format. + + -- Mathieu Trudel-Lapierre Wed, 27 May 2015 17:24:38 -0400 + localechooser (2.65) unstable; urgency=medium [ Mathieu Trudel-Lapierre ] @@ -351,6 +493,61 @@ -- Christian Perrier Tue, 01 Jan 2013 09:19:44 +0100 +localechooser (2.49ubuntu5) trusty; urgency=medium + + * Create skeleton locale-langpack subdirectories for each language being + installed, so that accountsservice knows to offer the + incomplete-language-support prompt (LP: #1307983). + + -- Colin Watson Tue, 15 Apr 2014 19:50:37 +0100 + +localechooser (2.49ubuntu4) raring; urgency=low + + * Revert previous change since at least language-selector also needs to be + brought into sync, and it's too late for 13.04. + + -- Colin Watson Thu, 18 Apr 2013 17:31:57 +0100 + +localechooser (2.49ubuntu3) raring; urgency=low + + * Set LC_TIME to reflect the language rather than the location, as the + lesser of two evils since it includes translations of day and month + names (LP: #1160441). + + -- Colin Watson Thu, 18 Apr 2013 12:30:53 +0100 + +localechooser (2.49ubuntu2) raring; urgency=low + + * languagelist: Use the official name Bangla for the language spoken + in Bangladesh (LP: #991002). + + -- Gunnar Hjalmarsson Sun, 03 Feb 2013 04:51:00 +0100 + +localechooser (2.49ubuntu1) raring; urgency=low + + * Resynchronise with Debian. Remaining changes: + - Add a localechooser-data package containing lists useful for packages + that create automatic installation scripts. + - Always support English, unless preseeded otherwise. + - Drop fallbacks for Norwegian Bokmål and Nynorsk. + - Simplify use of locale-gen using the new command-line argument + facility in Ubuntu's locales package. + - Add encoding field to languagelist file and use the full SUPPORTED + file rather than SUPPORTED-short. + - If the language question was already marked as seen and the answer + didn't change, then don't recalculate the locale. + - If OVERRIDE_SHOW_ALL_LANGUAGES is set in the environment, display all + languages regardless of frontend. + - Cancel any locale preseeding if the user changes the language. + - For cases where selecting a different location may imply a different + dialect of the language, i.e. Portuguese and Chinese, take care to set + LANG and LANGUAGE to something reflecting the language and LC_NUMERIC, + LC_TIME, LC_MONETARY, LC_PAPER, LC_NAME, LC_ADDRESS, LC_TELEPHONE, + LC_MEASUREMENT, and LC_IDENTIFICATION to something reflecting the + location. + + -- Colin Watson Thu, 13 Dec 2012 16:01:01 +0000 + localechooser (2.49) unstable; urgency=low [ Updated translations ] @@ -429,6 +626,31 @@ -- Christian Perrier Thu, 14 Jun 2012 22:23:04 +0200 +localechooser (2.40ubuntu1) quantal; urgency=low + + * Resynchronise with Debian. Remaining changes: + - Add a localechooser-data package containing lists useful for packages + that create automatic installation scripts. + - Always support English, unless preseeded otherwise. + - Drop fallbacks for Norwegian Bokmål and Nynorsk. + - Simplify use of locale-gen using the new command-line argument + facility in Ubuntu's locales package. + - Add encoding field to languagelist file and use the full SUPPORTED + file rather than SUPPORTED-short. + - If the language question was already marked as seen and the answer + didn't change, then don't recalculate the locale. + - If OVERRIDE_SHOW_ALL_LANGUAGES is set in the environment, display all + languages regardless of frontend. + - Cancel any locale preseeding if the user changes the language. + - For cases where selecting a different location may imply a different + dialect of the language, i.e. Portuguese and Chinese, take care to set + LANG and LANGUAGE to something reflecting the language and LC_NUMERIC, + LC_TIME, LC_MONETARY, LC_PAPER, LC_NAME, LC_ADDRESS, LC_TELEPHONE, + LC_MEASUREMENT, and LC_IDENTIFICATION to something reflecting the + location. + + -- Colin Watson Wed, 02 May 2012 11:16:58 +0100 + localechooser (2.40) unstable; urgency=low * Add commented entry for Sindhi @@ -437,6 +659,39 @@ -- Christian Perrier Tue, 17 Apr 2012 19:37:13 +0200 +localechooser (2.39ubuntu2) precise; urgency=low + + * Invert the set of locale categories set in case of a language/location + conflict, so we now set LC_NUMERIC, LC_TIME, LC_MONETARY, LC_PAPER, + LC_NAME, LC_ADDRESS, LC_TELEPHONE, LC_MEASUREMENT, and LC_IDENTIFICATION + instead (LP: #926207). + + -- Colin Watson Fri, 23 Mar 2012 16:32:43 +0000 + +localechooser (2.39ubuntu1) precise; urgency=low + + * Resynchronise with Debian. Remaining changes: + - Add a localechooser-data package containing lists useful for packages + that create automatic installation scripts. + - Always support English, unless preseeded otherwise. + - Drop fallbacks for Norwegian Bokmål and Nynorsk. + - Simplify use of locale-gen using the new command-line argument + facility in Ubuntu's locales package. + - Add encoding field to languagelist file and use the full SUPPORTED + file rather than SUPPORTED-short. + - If the language question was already marked as seen and the answer + didn't change, then don't recalculate the locale. + - If OVERRIDE_SHOW_ALL_LANGUAGES is set in the environment, display all + languages regardless of frontend. + - Cancel any locale preseeding if the user changes the language. + - For cases where selecting a different location may imply a different + dialect of the language, i.e. Portuguese and Chinese, take care to set + LANG to something reflecting the location and + LANGUAGE/LC_MESSAGES/LC_CTYPE/LC_COLLATE to something reflecting the + language. + + -- Colin Watson Sun, 27 Nov 2011 15:22:57 +0000 + localechooser (2.39) unstable; urgency=low [ Christian Perrier ] @@ -461,6 +716,30 @@ -- Aurelien Jarno Sun, 06 Nov 2011 20:21:27 +0100 +localechooser (2.38ubuntu1) precise; urgency=low + + * Resynchronise with Debian. Remaining changes: + - Add a localechooser-data package containing lists useful for packages + that create automatic installation scripts. + - Always support English, unless preseeded otherwise. + - Drop fallbacks for Norwegian Bokmål and Nynorsk. + - Simplify use of locale-gen using the new command-line argument + facility in Ubuntu's locales package. + - Add encoding field to languagelist file and use the full SUPPORTED + file rather than SUPPORTED-short. + - If the language question was already marked as seen and the answer + didn't change, then don't recalculate the locale. + - If OVERRIDE_SHOW_ALL_LANGUAGES is set in the environment, display all + languages regardless of frontend. + - Cancel any locale preseeding if the user changes the language. + - For cases where selecting a different location may imply a different + dialect of the language, i.e. Portuguese and Chinese, take care to set + LANG to something reflecting the location and + LANGUAGE/LC_MESSAGES/LC_CTYPE/LC_COLLATE to something reflecting the + language. + + -- Colin Watson Sun, 23 Oct 2011 20:16:18 +0100 + localechooser (2.38) unstable; urgency=low [ Samuel Thibault ] @@ -475,6 +754,36 @@ -- Colin Watson Fri, 29 Jul 2011 15:04:16 +0100 +localechooser (2.37ubuntu2) oneiric; urgency=low + + * For cases where selecting a different location may imply a different + dialect of the language, i.e. Portuguese and Chinese, take care to set + LANG to something reflecting the location and + LANGUAGE/LC_MESSAGES/LC_CTYPE/LC_COLLATE to something reflecting the + language (LP: #590108). This roughly matches the behaviour of + language-selector. + + -- Colin Watson Wed, 05 Oct 2011 23:27:33 +0100 + +localechooser (2.37ubuntu1) oneiric; urgency=low + + * Resynchronise with Debian. Remaining changes: + - Add a localechooser-data package containing lists useful for packages + that create automatic installation scripts. + - Always support English, unless preseeded otherwise. + - Drop fallbacks for Norwegian Bokmål and Nynorsk. + - Simplify use of locale-gen using the new command-line argument + facility in Ubuntu's locales package. + - Add encoding field to languagelist file and use the full SUPPORTED + file rather than SUPPORTED-short. + - If the language question was already marked as seen and the answer + didn't change, then don't recalculate the locale. + - If OVERRIDE_SHOW_ALL_LANGUAGES is set in the environment, display all + languages regardless of frontend. + - Cancel any locale preseeding if the user changes the language. + + -- Colin Watson Wed, 04 May 2011 00:04:37 +0100 + localechooser (2.37) unstable; urgency=low * Correct (again) name of Uyghur language (missing first letter) @@ -503,6 +812,43 @@ -- Christian Perrier Thu, 21 Apr 2011 20:06:03 +0200 +localechooser (2.34ubuntu4) natty; urgency=low + + * Cancel any locale preseeding if the user changes the language + (LP: #741304). + + -- Colin Watson Sun, 10 Apr 2011 21:59:41 +0100 + +localechooser (2.34ubuntu3) natty; urgency=low + + * Filter out commented lines from /usr/share/i18n/SUPPORTED (LP: #465120). + + -- Colin Watson Wed, 23 Mar 2011 16:36:38 +0000 + +localechooser (2.34ubuntu2) natty; urgency=low + + * Fix architecture-dependent-only builds. + + -- Colin Watson Tue, 15 Mar 2011 16:29:07 +0000 + +localechooser (2.34ubuntu1) natty; urgency=low + + * Resynchronise with Debian. Remaining changes: + - Add a localechooser-data package containing lists useful for packages + that create automatic installation scripts. + - Always support English, unless preseeded otherwise. + - Drop fallbacks for Norwegian Bokmål and Nynorsk. + - Simplify use of locale-gen using the new command-line argument + facility in Ubuntu's locales package. + - Add encoding field to languagelist file and use the full SUPPORTED + file rather than SUPPORTED-short. + - If the language question was already marked as seen and the answer + didn't change, then don't recalculate the locale. + - If OVERRIDE_SHOW_ALL_LANGUAGES is set in the environment, display all + languages regardless of frontend. + + -- Colin Watson Tue, 15 Mar 2011 15:33:13 +0000 + localechooser (2.34) unstable; urgency=low [ Updated translations ] @@ -906,6 +1252,40 @@ -- Otavio Salvador Thu, 23 Jul 2009 12:55:06 -0300 +localechooser (2.12ubuntu3) lucid; urgency=low + + * Make sure /target/etc/default exists before creating + /target/etc/default/locale (LP: #491198). + + -- Colin Watson Tue, 19 Jan 2010 18:17:03 +0000 + +localechooser (2.12ubuntu2) karmic; urgency=low + + * mktemplates.shortlist sometimes seems to hang in "sed -e 's/,/\\\\,/'" + when running in a UTF-8 locale. Work around this by forcing LC_ALL=C, + which we need to be able to operate in anyway for buildds. + + -- Colin Watson Thu, 25 Jun 2009 20:20:52 +0100 + +localechooser (2.12ubuntu1) karmic; urgency=low + + * Resynchronise with Debian. Remaining changes: + - Add a localechooser-data package containing lists useful for packages + that create automatic installation scripts. + - Always support English, unless preseeded otherwise. + - Drop fallbacks for Norwegian Bokmål and Nynorsk. + - Simplify use of locale-gen using the new command-line argument + facility in Ubuntu's locales package. + - Add encoding field to languagelist file and use the full SUPPORTED + file rather than SUPPORTED-short. + - If the language question was already marked as seen and the answer + didn't change, then don't recalculate the locale. + - If OVERRIDE_SHOW_ALL_LANGUAGES is set in the environment, display all + languages regardless of frontend. + - Allow preseeding of debian-installer/language. + + -- Colin Watson Thu, 25 Jun 2009 01:09:45 +0100 + localechooser (2.12) unstable; urgency=low [ Christian Perrier ] @@ -929,6 +1309,25 @@ -- Christian Perrier Sat, 13 Jun 2009 12:06:09 +0200 +localechooser (2.11ubuntu1) karmic; urgency=low + + * Resynchronise with Debian. Remaining changes: + - Add a localechooser-data package containing lists useful for packages + that create automatic installation scripts. + - Always support English, unless preseeded otherwise. + - Drop fallbacks for Norwegian Bokmål and Nynorsk. + - Simplify use of locale-gen using the new command-line argument + facility in Ubuntu's locales package. + - Add encoding field to languagelist file and use the full SUPPORTED + file rather than SUPPORTED-short. + - If the language question was already marked as seen and the answer + didn't change, then don't recalculate the locale. + - If OVERRIDE_SHOW_ALL_LANGUAGES is set in the environment, display all + languages regardless of frontend. + - Allow preseeding of debian-installer/language. + + -- Colin Watson Tue, 05 May 2009 10:14:04 +0100 + localechooser (2.11) unstable; urgency=low * Add commented entry for Sinhala in languagelist @@ -960,12 +1359,67 @@ -- Christian Perrier Sat, 28 Feb 2009 11:01:16 +0100 +localechooser (2.09ubuntu2) jaunty; urgency=low + + * Don't add en_US.UTF-8 to the supported language pack set if the locale + is set to C; this is probably fine by people using the C locale, and it + means that lowmem installations avoid installing language-pack-en and + thereby calling localedef lots of times. + + -- Colin Watson Fri, 27 Feb 2009 04:34:00 +0000 + +localechooser (2.09ubuntu1) jaunty; urgency=low + + * Resynchronise with Debian. Remaining changes: + - Add a localechooser-data package containing lists useful for packages + that create automatic installation scripts. + - Always support English, unless preseeded otherwise. + - Drop fallbacks for Norwegian Bokmål and Nynorsk. + - Simplify use of locale-gen using the new command-line argument + facility in Ubuntu's locales package. + - Add encoding field to languagelist file and use the full SUPPORTED + file rather than SUPPORTED-short. + - If the language question was already marked as seen and the answer + didn't change, then don't recalculate the locale. + - If OVERRIDE_SHOW_ALL_LANGUAGES is set in the environment, display all + languages regardless of frontend. + - Allow preseeding of debian-installer/language. + - Install kbd rather than console-tools. Remove configuration file + changes that: (a) modify a dpkg-handled conffile and so are policy + violations; (b) are partly composed of workarounds for console-tools + bugs not present in kbd; (c) are superseded by console-setup anyway. + + -- Colin Watson Wed, 28 Jan 2009 11:43:23 +0000 + localechooser (2.09) unstable; urgency=low * Fix incorrect use of no longer existing variable. -- Frans Pop Sat, 03 Jan 2009 16:37:28 +0000 +localechooser (2.08ubuntu1) jaunty; urgency=low + + * Resynchronise with Debian. Remaining changes: + - Add a localechooser-data package containing lists useful for packages + that create automatic installation scripts. + - Always support English, unless preseeded otherwise. + - Drop fallbacks for Norwegian Bokmål and Nynorsk. + - Simplify use of locale-gen using the new command-line argument + facility in Ubuntu's locales package. + - Add encoding field to languagelist file and use the full SUPPORTED + file rather than SUPPORTED-short. + - If the language question was already marked as seen and the answer + didn't change, then don't recalculate the locale. + - If OVERRIDE_SHOW_ALL_LANGUAGES is set in the environment, display all + languages regardless of frontend. + - Allow preseeding of debian-installer/language. + - Install kbd rather than console-tools. Remove configuration file + changes that: (a) modify a dpkg-handled conffile and so are policy + violations; (b) are partly composed of workarounds for console-tools + bugs not present in kbd; (c) are superseded by console-setup anyway. + + -- Colin Watson Mon, 17 Nov 2008 14:08:00 +0000 + localechooser (2.08) unstable; urgency=low * Use isoquery instead of a python script to generate iso_3166.tab. @@ -1068,6 +1522,43 @@ -- Christian Perrier Sat, 12 Jul 2008 15:24:31 +0200 +localechooser (2.03ubuntu3) intrepid; urgency=low + + * Install kbd rather than console-tools. Remove configuration file changes + that: (a) modify a dpkg-handled conffile and so are policy violations; + (b) are partly composed of workarounds for console-tools bugs not + present in kbd; (c) are superseded by console-setup anyway. + + -- Colin Watson Tue, 16 Sep 2008 10:39:42 +0100 + +localechooser (2.03ubuntu2) intrepid; urgency=low + + * Fix preseeding of languages that only have country variants (e.g. zh_CN) + in languagelist. + + -- Colin Watson Sat, 26 Jul 2008 10:51:02 +0100 + +localechooser (2.03ubuntu1) intrepid; urgency=low + + * Resynchronise with Debian. Remaining changes: + - Add a localechooser-data package containing lists useful for packages + that create automatic installation scripts. + - Always support English, unless preseeded otherwise. + - Drop fallbacks for Norwegian Bokmål and Nynorsk. + - Simplify use of locale-gen using the new command-line argument + facility in Ubuntu's locales package. + - Add encoding field to languagelist file and use the full SUPPORTED + file rather than SUPPORTED-short. + - If the language question was already marked as seen and the answer + didn't change, then don't recalculate the locale. + - If OVERRIDE_SHOW_ALL_LANGUAGES is set in the environment, display all + languages regardless of frontend. + - Allow preseeding of debian-installer/language. + * localechooser-data Breaks: system-config-kickstart (<< 2.5.20-0ubuntu17) + due to languagelist format changes. + + -- Colin Watson Mon, 16 Jun 2008 15:52:37 +0100 + localechooser (2.03) unstable; urgency=low [ Frans Pop ] @@ -1282,6 +1773,53 @@ -- Joey Hess Wed, 19 Dec 2007 16:07:12 -0500 +localechooser (1.42ubuntu5) hardy; urgency=low + + * Don't assume that /etc/lsb-release is valid shell (LP: #214861). + + -- Colin Watson Thu, 10 Apr 2008 00:35:24 +0100 + +localechooser (1.42ubuntu4) hardy; urgency=low + + * Allow preseeding of debian-installer/language (LP: #85162). + + -- Colin Watson Sun, 06 Apr 2008 13:46:16 +0100 + +localechooser (1.42ubuntu3) hardy; urgency=low + + * If OVERRIDE_SHOW_ALL_LANGUAGES is set in the environment, display all + languages regardless of frontend (LP: #202291). + + -- Colin Watson Mon, 17 Mar 2008 20:07:38 +0000 + +localechooser (1.42ubuntu2) hardy; urgency=low + + * Drop build dependency on python-xml. + * iso3166tab.py: Include ErrorPrinter and DefaultHandler from obsolete + saxutils.py + + -- Matthias Klose Fri, 29 Feb 2008 16:45:05 +0000 + +localechooser (1.42ubuntu1) hardy; urgency=low + + * Resynchronise with Debian. Remaining changes: + - Add a localechooser-data package containing lists useful for packages + that create automatic installation scripts. + - Always support English, unless preseeded otherwise. + - Check whether the language has changed after asking the country + question, and recalculate a number of things if so. + - Drop fallbacks for Norwegian Bokmål and Nynorsk. + - Simplify use of locale-gen using the new command-line argument + facility in Ubuntu's locales package. + - Move Portuguese above Portuguese (Brazil) in languagelist.l10n. + - Add encoding field to languagelist file and use the full SUPPORTED + file rather than SUPPORTED-short. + - If the language question was already marked as seen and the answer + didn't change, then don't recalculate the locale. + * Set Vcs-Bzr for Ubuntu. + + -- Colin Watson Tue, 27 Nov 2007 12:24:59 +0000 + localechooser (1.42) unstable; urgency=low * Since /etc/default/locale is now a conffile provided by locales, @@ -1382,6 +1920,34 @@ -- Christian Perrier Mon, 21 May 2007 20:55:03 +0200 +localechooser (1.38ubuntu2) gutsy; urgency=low + + * Backport from trunk (Christian Perrier, LP: #140931): + - Add the new Serbia and Montenegro entries to Europe. + Remove the former entry for "Serbia and Montenegro" + Thanks to Piotr Engelking for the patch. Closes: #426821 + + -- Colin Watson Thu, 20 Sep 2007 02:30:59 +0100 + +localechooser (1.38ubuntu1) gutsy; urgency=low + + * Resynchronise with Debian. Remaining changes: + - Add a localechooser-data package containing lists useful for packages + that create automatic installation scripts. + - Always support English, unless preseeded otherwise. + - Check whether the language has changed after asking the country + question, and recalculate a number of things if so. + - Drop fallbacks for Norwegian Bokmål and Nynorsk. + - Simplify use of locale-gen using the new command-line argument + facility in Ubuntu's locales package. + - Move Portuguese above Portuguese (Brazil) in languagelist.l10n. + - Add encoding field to languagelist file and use the full SUPPORTED + file rather than SUPPORTED-short. + - If the language question was already marked as seen and the answer + didn't change, then don't recalculate the locale. + + -- Colin Watson Tue, 15 May 2007 14:11:57 +0100 + localechooser (1.38) unstable; urgency=low * Multiply menu-item-numbers by 100 @@ -1392,6 +1958,26 @@ -- Joey Hess Tue, 10 Apr 2007 14:41:33 -0400 +localechooser (1.37ubuntu1) feisty; urgency=low + + * Resynchronise with Debian. Remaining changes: + - Add a localechooser-data package containing lists useful for packages + that create automatic installation scripts. + - Always support English, unless preseeded otherwise. + - Check whether the language has changed after asking the country + question, and recalculate a number of things if so. + - Drop fallbacks for Norwegian Bokmål and Nynorsk. + - Simplify use of locale-gen using the new command-line argument + facility in Ubuntu's locales package. + - Move Portuguese above Portuguese (Brazil) in languagelist.l10n. + - Add encoding field to languagelist file and use the full SUPPORTED + file rather than SUPPORTED-short. + - If the language question was already marked as seen and the answer + didn't change, then don't recalculate the locale. + * Set Maintainer to ubuntu-installer@lists.ubuntu.com. + + -- Colin Watson Tue, 6 Mar 2007 10:41:47 +0000 + localechooser (1.37) unstable; urgency=low [ Christian Perrier ] @@ -1449,6 +2035,25 @@ -- Frans Pop Wed, 24 Jan 2007 02:17:05 +0100 +localechooser (1.33ubuntu1) feisty; urgency=low + + * Resynchronise with Debian. Remaining changes: + - Add a localechooser-data package containing lists useful for packages + that create automatic installation scripts. + - Always support English, unless preseeded otherwise. + - Check whether the language has changed after asking the country + question, and recalculate a number of things if so. + - Drop fallbacks for Norwegian Bokmål and Nynorsk. + - Simplify use of locale-gen using the new command-line argument + facility in Ubuntu's locales package. + - Move Portuguese above Portuguese (Brazil) in languagelist.l10n. + - Add encoding field to languagelist file and use the full SUPPORTED + file rather than SUPPORTED-short. + - If the language question was already marked as seen and the answer + didn't change, then don't recalculate the locale. + + -- Colin Watson Fri, 15 Dec 2006 10:34:14 +0000 + localechooser (1.33) unstable; urgency=low * Switch default font used in graphical installer based on selected @@ -1493,6 +2098,29 @@ -- Christian Perrier Thu, 16 Nov 2006 08:12:21 +0100 +localechooser (1.30ubuntu1) feisty; urgency=low + + * Resynchronise with Debian. Remaining changes: + - Add a localechooser-data package containing lists useful for packages + that create automatic installation scripts. + - Always support English, unless preseeded otherwise. + - Check whether the language has changed after asking the country + question, and recalculate a number of things if so. + - Drop fallbacks for Norwegian Bokmål and Nynorsk. + - Simplify use of locale-gen using the new command-line argument + facility in Ubuntu's locales package. + - Move Portuguese above Portuguese (Brazil) in languagelist.l10n. + - Add encoding field to languagelist file and use the full SUPPORTED + file rather than SUPPORTED-short. + - If the language question was already marked as seen and the answer + didn't change, then don't recalculate the locale. + * Drop wording change in location question. I think the wording in Debian + is sufficiently better now than it was back in the dawn of time when we + changed this that we no longer need to carry around a giant diff for all + the resulting translation changes. + + -- Colin Watson Mon, 27 Nov 2006 13:44:11 +0000 + localechooser (1.30) unstable; urgency=low * Added localized name for Amharic @@ -1637,6 +2265,69 @@ -- Christian Perrier Mon, 24 Jul 2006 17:55:34 +0200 +localechooser (1.20ubuntu8) edgy; urgency=low + + * Fetch the previous language before processing preseeding, so that + preseeding still works properly (closes: Malone #66532). + + -- Colin Watson Tue, 17 Oct 2006 12:58:44 +0100 + +localechooser (1.20ubuntu7) edgy; urgency=low + + * If the language question was already marked as seen and the answer + didn't change, then don't recalculate the locale (closes: Malone #63569; + also see Malone #60067). + + -- Colin Watson Mon, 9 Oct 2006 10:40:02 +0100 + +localechooser (1.20ubuntu6) edgy; urgency=low + + * Remove oem-config-locale package, moved into oem-config proper. + + -- Colin Watson Tue, 22 Aug 2006 16:37:08 +0100 + +localechooser (1.20ubuntu5) edgy; urgency=low + + * Ignore failures from locale-gen. + * Backport from trunk: + - Fix check-data target. + - Fix incorrect field ordering in Finnish languagelist line. + * Add encoding field to languagelist file and use the full SUPPORTED file + rather than SUPPORTED-short, so that we can tell that (e.g.) se_NO and + vi_VN are really UTF-8 locales (closes: Malone #47742). + + -- Colin Watson Thu, 3 Aug 2006 04:55:38 +0100 + +localechooser (1.20ubuntu4) edgy; urgency=low + + * Backport from trunk: + - Fix mktemplates.country to avoid bashisms and reliance on multiple + counterintuitive backslash expansions. + + -- Colin Watson Wed, 19 Jul 2006 15:59:16 +0100 + +localechooser (1.20ubuntu3) edgy; urgency=low + + * Backport from trunk: + - Fix mk_shortlist_templates to avoid literal "EN_DESCR" showing up in + templates files when countrychooser/shortlist is untranslated in the + associated language. + + -- Colin Watson Sun, 16 Jul 2006 13:07:52 +0100 + +localechooser (1.20ubuntu2) edgy; urgency=low + + * Ignore errors while unregistering shortlist templates (e.g. not + previously registered). + + -- Colin Watson Thu, 13 Jul 2006 14:52:50 +0100 + +localechooser (1.20ubuntu1) edgy; urgency=low + + * Resynchronise with Debian. + + -- Colin Watson Mon, 10 Jul 2006 16:30:37 +0100 + localechooser (1.20) unstable; urgency=low [ Christian Perrier ] @@ -1659,6 +2350,22 @@ -- Christian Perrier Sat, 8 Jul 2006 08:12:49 +0200 +localechooser (1.19ubuntu1) edgy; urgency=low + + * Resynchronise with Debian. + * Unregister shortlist templates before registering new ones, to ensure + that the question gets effectively reset. The debconf specification does + not say what happens when you re-register an existing template, and + cdebconf and debconf have different (reasonable) interpretations; + unregistration forces the old question to go away. This replaces + previous hacks done for the benefit of oem-config. + * Restore build-dependency on dash | ash, as dash is in Ubuntu's base + system again. + * Drop Default-$LANG.UTF-8: -> Default: shortlist template change, which + is no longer needed thanks to the unregistration fix above. + + -- Colin Watson Mon, 10 Jul 2006 12:12:31 +0100 + localechooser (1.19) unstable; urgency=low * Rename prebaseconfig progress template. @@ -1967,6 +2674,197 @@ -- Christian Perrier Wed, 4 Jan 2006 10:24:37 +0100 +localechooser (0.27ubuntu22) dapper; urgency=low + + * Fix handling of debian-installer/locale preseeding to cope with + languages that only have ll_CC in shortlists (closes: Malone #43911). + + -- Colin Watson Tue, 30 May 2006 23:13:02 +0100 + +localechooser (0.27ubuntu21) dapper; urgency=low + + * oem-config/locale: Fix /etc/environment modification to avoid + accidentally clobbering other variables (closes: Malone #40328). + + -- Colin Watson Wed, 24 May 2006 11:22:02 +0100 + +localechooser (0.27ubuntu20) dapper; urgency=low + + * Change button order in oem-config's glade file. Malone #40226. + + -- Tollef Fog Heen Mon, 15 May 2006 12:25:21 +0200 + +localechooser (0.27ubuntu19) dapper; urgency=low + + * Stop running locale-gen on live CDs and in oem-config when changing + language. localedef is extremely memory-hungry, and it turns out that + it's possible to get correct debconf translations (which is all we + actually care about) by setting LANGUAGE instead (closes: Malone + #43071). + + -- Colin Watson Fri, 12 May 2006 15:20:23 +0100 + +localechooser (0.27ubuntu18) dapper; urgency=low + + * Set default $LANGUAGE for English installs to just "en" rather than + "en_US:en_GB:en" (it will be prefixed with the appropriate en_* for the + selected country), since fallbacks from American to British English and + vice versa are too annoying (closes: Malone #10822). Previously fixed in + localechooser 0.04.0ubuntu9, but lost in localechooser 0.22ubuntu1. + + -- Colin Watson Wed, 3 May 2006 10:36:40 +0100 + +localechooser (0.27ubuntu17) dapper; urgency=low + + * Use vi_VN (which is UTF-8) rather than the non-existent vi_VN.UTF-8 for + Vietnamese (bug misfiled as a comment in Malone #42260). + + -- Colin Watson Tue, 2 May 2006 20:13:35 +0100 + +localechooser (0.27ubuntu16) dapper; urgency=low + + * Set Thai console font to tis-phaisarn.f16 (closes: Malone #35022). + + -- Colin Watson Thu, 13 Apr 2006 15:14:39 +0100 + +localechooser (0.27ubuntu15) dapper; urgency=low + + * Guard locale-gen calls to make sure that we don't try to call locale-gen + with C or with an empty argument list, neither of which will work as + desired. + + -- Colin Watson Wed, 12 Apr 2006 17:00:58 +0100 + +localechooser (0.27ubuntu14) dapper; urgency=low + + * Never select C when preseeding debian-installer/locale=en_*. + * Set countrychooser/shortlist as well as countrychooser/shortlist-$LANG; + debconf doesn't always take the default value of a question from its + registered template. + + -- Colin Watson Wed, 12 Apr 2006 14:26:03 +0100 + +localechooser (0.27ubuntu13) dapper; urgency=low + + * Remove espresso-locale package, moved into espresso proper. + * Re-enable country name sorting for Turkish now that the tr_TR locale has + been fixed. + + -- Colin Watson Wed, 5 Apr 2006 15:51:23 +0100 + +localechooser (0.27ubuntu12) dapper; urgency=low + + * Update Portuguese translation from Rosetta. + * Add Thai (thanks, Theppitak Karoonboonyanan; closes: Malone #35022). + * Allow country selection for Catalan (thanks, Robert Millan; closes: + Malone #37007). + + -- Colin Watson Sat, 1 Apr 2006 21:15:32 +0100 + +localechooser (0.27ubuntu11) dapper; urgency=low + + * espresso/language.py: Change values in dictionary passed to + frontend.set_language_choices() to be (English name, code). Requires + espresso (>= 0.99.30). + + -- Colin Watson Fri, 17 Mar 2006 00:27:16 +0000 + +localechooser (0.27ubuntu10) dapper; urgency=low + + * Backport from trunk (Christian Perrier, closes: Malone #31722): + - Re-add some code to install the bterm-unifont package which brings a + complete unifont font for later steps of d-i + Closes: #346339 + + -- Colin Watson Thu, 2 Mar 2006 11:04:01 +0000 + +localechooser (0.27ubuntu9) dapper; urgency=low + + * espresso/language.py, oem-config/locale.py: Explicitly decode strings + returned by debconf as UTF-8, since apparently we get confused when + running with the KDE frontend otherwise (which presumably does something + funky with Python's default encoding). + + -- Colin Watson Wed, 22 Feb 2006 17:44:29 +0000 + +localechooser (0.27ubuntu8) dapper; urgency=low + + * Generate the locale immediately if locale-gen is present; improves + support for running localechooser on a live CD. + * Add a cleanup method to espresso/language.py to switch the LANG + environment variable according to the result of localechooser. + + -- Colin Watson Tue, 21 Feb 2006 12:38:29 +0000 + +localechooser (0.27ubuntu7) dapper; urgency=low + + * Add an espresso-locale package, providing localechooser as an Espresso + module (only language selection for now). + * Fix a couple of bugs introduced into locale2langname in 0.27ubuntu5. + + -- Colin Watson Tue, 21 Feb 2006 11:25:25 +0000 + +localechooser (0.27ubuntu6) dapper; urgency=low + + * post-base-installer: Don't clobber existing contents of + /etc/environment. + + -- Colin Watson Thu, 16 Feb 2006 15:21:28 +0000 + +localechooser (0.27ubuntu5) dapper; urgency=low + + * oem-config/locale: Add /usr/lib/oem-config/locale to localechooser's + $PATH. + * locale2langname: If there are multiple matches for a given language + code, try matching the country as well; improves handling of preseeding + for Portuguese and Chinese (closes: Malone #31477). + * Move Portuguese above Portuguese (Brazil) in languagelist so that + debian-installer/locale=pt selects Portuguese. + + -- Colin Watson Thu, 16 Feb 2006 13:49:20 +0000 + +localechooser (0.27ubuntu4) dapper; urgency=low + + * oem-config/locale.mnu: Update Repeat-If-Changed template names. + + -- Colin Watson Sat, 28 Jan 2006 10:23:39 +0000 + +localechooser (0.27ubuntu3) dapper; urgency=low + + * Remove language pack installation from here, since it doesn't work + properly before apt-setup in all cases; moved to pkgsel. + * Remove anna-install, apt-install, and udpkg oem-config compatibility + helpers; moved to oem-config. + + -- Colin Watson Tue, 17 Jan 2006 15:35:39 +0000 + +localechooser (0.27ubuntu2) dapper; urgency=low + + * Disable country name sorting for Turkish for now, since glibc's ISO 4217 + list is out of sync with the LC_MONETARY definition for tr_TR in locales + and so our build fails. + + -- Colin Watson Fri, 13 Jan 2006 10:25:59 +0000 + +localechooser (0.27ubuntu1) dapper; urgency=low + + * Resynchronise with Debian. + * Various languagelist updates for UTF-8 consistency. + * Drop casper symlinks, no longer required following casper's + reimplementation as initramfs hooks. + * Drop neutralisation of some templates to apply to both the installer and + live CDs; the live CD no longer uses localechooser, and we never did get + the new text fully translated, so just drop back to Debian's versions. + * Put back the sorting of country names by each language's collation + order, since locales now provides actual locale data again. + * Simplify use of locale-gen using the new command-line argument facility + in locales (>= 2.3.7-1). Drop oem-config-locale's dependency on + base-config since we no longer use validlocale. + * Drop build-dependency on dash | ash; only check scripts if one of these + happens to be installed. + + -- Colin Watson Sun, 1 Jan 2006 18:36:38 +0000 + localechooser (0.27) unstable; urgency=low * Kazakh is now supported @@ -2041,6 +2939,38 @@ -- Christian Perrier Sun, 20 Nov 2005 13:08:50 +0100 +localechooser (0.22ubuntu4) dapper; urgency=low + + * Disable the nice sorting of country names by each language's collation + order for now, to avoid having to build-depend on all language packs. + + -- Colin Watson Tue, 13 Dec 2005 16:28:02 +0000 + +localechooser (0.22ubuntu3) dapper; urgency=low + + * Arrange for the appropriate language pack to be installed after + installing the base system. + + -- Colin Watson Mon, 12 Dec 2005 22:39:36 +0000 + +localechooser (0.22ubuntu2) dapper; urgency=low + + * Update oem-config handling to check $langname_all rather than $langname. + * Make oem-config hooks executable. + + -- Colin Watson Tue, 15 Nov 2005 18:16:27 +0000 + +localechooser (0.22ubuntu1) dapper; urgency=low + + * Resynchronise with Debian. + - UTF-8-ise all locales again + - Remove locale generation part from prebaseconfig + - Ship casper hooks + - Fix up English in templates. + - Ship oem-config + + -- Tollef Fog Heen Mon, 14 Nov 2005 16:24:51 +0100 + localechooser (0.22) unstable; urgency=low * Load jfbterm and unifont for Wolof and Vietnamese which will need it @@ -2178,6 +3108,105 @@ -- Christian Perrier Sat, 3 Sep 2005 07:49:21 +0200 +localechooser (0.13ubuntu12) breezy; urgency=low + + * Set labels in oem-config locale window to the translated descriptions of + the same questions in the installer (Ubuntu #17366). + + -- Colin Watson Tue, 11 Oct 2005 21:45:44 +0100 + +localechooser (0.13ubuntu11) breezy; urgency=low + + * Make nb_NO.UTF8 the locale for Norwegian installs, not no_NO.UTF8. + Ubuntu #16780 + + -- Tollef Fog Heen Mon, 3 Oct 2005 10:50:06 +0200 + +localechooser (0.13ubuntu10) breezy; urgency=low + + * Update French translation (thanks, Sebastien Bacher). + * Update Ubuntu-specific translations from Rosetta (with some strings from + Debian where available): Finnish, Hungarian, Indonesian, Macedonian, + Portuguese, Slovak, Swedish. + + -- Colin Watson Fri, 30 Sep 2005 17:56:27 +0100 + +localechooser (0.13ubuntu9) breezy; urgency=low + + * Backport from trunk (Christian Perrier, closes: Ubuntu #14670): + - languagemap: always set LOCALE, FALLBACKLOCALE, LANGUAGE, COUNTRY + even when they were already set before calling the script + Closes: #315929 + + -- Colin Watson Tue, 20 Sep 2005 15:49:18 +0100 + +localechooser (0.13ubuntu8) breezy; urgency=low + + * oem-config/locale.glade: Set window gravity to center. + + -- Colin Watson Wed, 14 Sep 2005 13:22:15 +0100 + +localechooser (0.13ubuntu7) breezy; urgency=low + + * List pt_PT ahead of pt in LANGUAGE for Portuguese (Portugal) + installations, otherwise pt_BR translations get displayed in preference + if the pt translations are shipped as pt_PT. + + -- Colin Watson Fri, 2 Sep 2005 14:26:22 +0100 + +localechooser (0.13ubuntu6) breezy; urgency=low + + * Drop fallbacks for Norwegian bokmål and nynorsk (Ubuntu #4172) + + -- Tollef Fog Heen Wed, 24 Aug 2005 10:47:06 +0200 + +localechooser (0.13ubuntu5) breezy; urgency=low + + * oem-config-locale: Forcibly fetch languagechooser/language-name's list + of choices in English, to match how the templates file is laid out. + + -- Colin Watson Tue, 9 Aug 2005 16:31:03 +0100 + +localechooser (0.13ubuntu4) breezy; urgency=low + + * oem-config-locale: Write the new default LANG to /etc/default/gdm too. + + -- Colin Watson Fri, 29 Jul 2005 16:30:43 +0100 + +localechooser (0.13ubuntu3) breezy; urgency=low + + * oem-config-locale: + - Generate the new locale even when backing up out of localechooser, so + that the debconf frontend can be restarted under it. Yes, this does + mean that if you select lots of languages in turn you'll end up with a + huge /etc/locale.gen ... + - Don't reset debian-installer/locale at the end of localechooser; + oem-config needs the value, and will reset it itself. + - When changing the language, continue through localechooser until + localechooser/supported-locales is asked, so that + debian-installer/locale gets set. + - Check whether the language has changed after asking the country + question, and recalculate a number of things if so. + - Recover from broken debian-installer/locale settings. + * Just use Default: rather than Default-$LANG.UTF-8: in shortlist + templates, so that they can be reset without having to switch debconf's + locale. + * Set a sensible default when re-registering countrychooser/shortlist. + + -- Colin Watson Fri, 29 Jul 2005 15:32:09 +0100 + +localechooser (0.13ubuntu2) breezy; urgency=low + + * Add oem-config-locale, providing localechooser as an oem-config module. + + -- Colin Watson Thu, 28 Jul 2005 18:51:44 +0100 + +localechooser (0.13ubuntu1) breezy; urgency=low + + * Resynchronise with Debian. + + -- Colin Watson Tue, 19 Jul 2005 17:16:30 +0100 + localechooser (0.13) unstable; urgency=low [ Frans Pop ] @@ -2311,6 +3340,133 @@ -- Christian Perrier Tue, 3 May 2005 17:32:14 +0200 +localechooser (0.04.0ubuntu17) hoary; urgency=low + + * Update Norwegian Bokmål translation (thanks, Terance Edward Sola). + + -- Colin Watson Tue, 5 Apr 2005 16:40:36 +0100 + +localechooser (0.04.0ubuntu16) hoary; urgency=low + + * Add symlink to post-base-installer hook in /usr/lib/casper/pre.d/, + restoring locale generation on the live CD. + * Update Greek translation (thanks, Giorgos Logiotatidis). + + -- Colin Watson Tue, 5 Apr 2005 13:58:45 +0100 + +localechooser (0.04.0ubuntu15) hoary; urgency=low + + * Actually create /usr/lib/post-base-installer.d. + * Include copyright file and changelog in localechooser-data. + + -- Colin Watson Thu, 31 Mar 2005 18:21:35 +0100 + +localechooser (0.04.0ubuntu14) hoary; urgency=low + + * Move locale generation to a post-base-installer hook, so that + base-config questions that are pulled back to the first stage are + properly translated. Requires base-installer 1.15ubuntu14. + * Update Romanian translation (thanks, Ovidiu Damian). + + -- Colin Watson Thu, 31 Mar 2005 17:30:14 +0100 + +localechooser (0.04.0ubuntu13) hoary; urgency=low + + * anna-install bterm-unifont rather than trying to apt-install it (closes: + Ubuntu #8172). + * Update Spanish translation (thanks, Enrique Matías Sánchez). + * Update Xhosa translation (thanks, Adi Attar). + + -- Colin Watson Tue, 29 Mar 2005 16:48:20 +0100 + +localechooser (0.04.0ubuntu12) hoary; urgency=low + + * Update Hungarian translation (thanks, Gabor Burjan). + * Update Indonesian translation (thanks, Yoppy Hidayanto). + * Update Polish translation (thanks, Dominik Zabłotny). + + -- Colin Watson Mon, 28 Mar 2005 20:05:05 +0100 + +localechooser (0.04.0ubuntu11) hoary; urgency=low + + * Update Brazilian Portuguese translation (thanks, Carlos Eduardo Pedroza + Santiviago). + * Update French translation (thanks, Sebastien Bacher). + * Update German translation (thanks, Herbert Straub). + + -- Colin Watson Sat, 26 Mar 2005 01:20:00 +0000 + +localechooser (0.04.0ubuntu10) hoary; urgency=low + + * Add draft Xhosa translation (thanks, Adi Attar). + + -- Colin Watson Tue, 22 Mar 2005 13:25:49 +0000 + +localechooser (0.04.0ubuntu9) hoary; urgency=low + + * Set default $LANGUAGE for English installs to just "en" rather than + "en_US:en_GB:en" (it will be prefixed with the appropriate en_* for the + selected country), since fallbacks from American to British English and + vice versa are too annoying (closes: Ubuntu #4271). + * Add Xhosa, xh_ZA (thanks, Adi Attar). + * Don't try to install localization-config, since it's not in Ubuntu. + + -- Colin Watson Thu, 17 Mar 2005 18:36:27 +0000 + +localechooser (0.04.0ubuntu8) hoary; urgency=low + + * Use locale-gen --keep-existing, for better performance on the live CD. + + -- Colin Watson Thu, 10 Mar 2005 18:32:03 +0000 + +localechooser (0.04.0ubuntu7) hoary; urgency=low + + * Fix missing space while adding en_US.UTF-8 to + localechooser/supported-locales. + + -- Colin Watson Wed, 9 Mar 2005 01:24:25 +0000 + +localechooser (0.04.0ubuntu6) hoary; urgency=low + + * Always support English (unless preseeded otherwise), so that we get + English language packs (closes: Ubuntu #7103). + + -- Colin Watson Tue, 8 Mar 2005 02:00:28 +0000 + +localechooser (0.04.0ubuntu5) hoary; urgency=low + + * Run debconf-updatepo. + + -- Colin Watson Tue, 8 Feb 2005 11:55:37 +0000 + +localechooser (0.04.0ubuntu4) hoary; urgency=low + + * Add localechooser/supported-locales, asked at medium priority, to allow + the user to select support for extra locales in expert mode. + + -- Colin Watson Tue, 8 Feb 2005 11:30:10 +0000 + +localechooser (0.04.0ubuntu3) hoary; urgency=low + + * Add a localechooser-data package containing lists useful for packages + (like the Kickstart user interface) that create automatic installation + scripts. + + -- Colin Watson Thu, 3 Feb 2005 12:09:41 +0000 + +localechooser (0.04.0ubuntu2) hoary; urgency=low + + * Re-merge changes from 0.03ubuntu1 to 0.03ubuntu4. + + -- Colin Watson Fri, 28 Jan 2005 16:56:05 +0000 + +localechooser (0.04.0ubuntu1) hoary; urgency=low + + * Neutralize template text so that it applies to both the installer and live + CDs + + -- Matt Zimmerman Tue, 25 Jan 2005 23:19:17 -0800 + localechooser (0.04) unstable; urgency=low * Colin Watson @@ -2323,6 +3479,30 @@ -- Colin Watson Thu, 13 Jan 2005 18:06:10 +0000 +localechooser (0.03ubuntu4) hoary; urgency=low + + * Add link to prebaseconfig script in /usr/lib/casper/pre.d. + + -- Colin Watson Tue, 18 Jan 2005 19:40:38 +0000 + +localechooser (0.03ubuntu3) hoary; urgency=low + + * Fix prebaseconfig progress bar template name. + + -- Colin Watson Wed, 12 Jan 2005 23:23:27 +0000 + +localechooser (0.03ubuntu2) hoary; urgency=low + + * Drop country question priority back to high. + + -- Colin Watson Sat, 1 Jan 2005 23:54:11 +0000 + +localechooser (0.03ubuntu1) hoary; urgency=low + + * Resynchronise with Debian. + + -- Colin Watson Fri, 24 Dec 2004 16:46:15 +0000 + localechooser (0.03) unstable; urgency=low * Christian Perrier @@ -2331,6 +3511,18 @@ -- Christian Perrier Thu, 23 Dec 2004 09:01:07 +0100 +localechooser (0.02ubuntu1) hoary; urgency=low + + * Merge changes from Ubuntu languagechooser and countrychooser: + - Switch to UTF-8 for all languages where it's available in + /usr/share/i18n/SUPPORTED (all except Bosnian and Tagalog). + - Ask about your "location" rather than "country, territory or area" + (Ubuntu #1686). + - Go back to asking country question at critical priority, not high. + * Ubuntu branding. + + -- Colin Watson Thu, 23 Dec 2004 12:56:56 +0000 + localechooser (0.02) unstable; urgency=low * Christian Perrier @@ -2372,3 +3564,4 @@ - Add entries for post-sarge supported languages -- Christian Perrier Sun, 28 Nov 2004 11:08:35 +0100 + diff -Nru localechooser-2.89/debian/clean localechooser-2.89ubuntu1/debian/clean --- localechooser-2.89/debian/clean 2018-08-10 20:22:36.000000000 +0100 +++ localechooser-2.89ubuntu1/debian/clean 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -debian/SUPPORTED-short diff -Nru localechooser-2.89/debian/compat localechooser-2.89ubuntu1/debian/compat --- localechooser-2.89/debian/compat 2018-08-10 20:22:36.000000000 +0100 +++ localechooser-2.89ubuntu1/debian/compat 2020-10-31 15:17:02.000000000 +0000 @@ -1 +1 @@ -9 +11 diff -Nru localechooser-2.89/debian/control localechooser-2.89ubuntu1/debian/control --- localechooser-2.89/debian/control 2019-04-22 08:12:02.000000000 +0100 +++ localechooser-2.89ubuntu1/debian/control 2020-10-31 15:17:02.000000000 +0000 @@ -1,10 +1,13 @@ Source: localechooser Section: debian-installer Priority: optional -Maintainer: Debian Install System Team -Build-Depends: debhelper (>= 9), dpkg-dev (>= 1.9), locales, intltool-debian (>= 0.30+20040212), po-debconf, iso-codes, isoquery -Vcs-Browser: https://salsa.debian.org/installer-team/localechooser -Vcs-Git: https://salsa.debian.org/installer-team/localechooser.git +Maintainer: Ubuntu Installer Team +XSBC-Original-Maintainer: Debian Install System Team +Build-Depends: debhelper (>= 11), dpkg-dev (>= 1.9), locales, intltool-debian (>= 0.30+20040212), po-debconf, iso-codes, isoquery +Standards-Version: 4.5.0 +Vcs-Git: https://git.launchpad.net/~ubuntu-core-dev/localechooser/+git/localechooser +XS-Debian-Vcs-Browser: https://salsa.debian.org/installer-team/localechooser +XS-Debian-Vcs-Git: https://salsa.debian.org/installer-team/localechooser.git Package: localechooser Package-Type: udeb @@ -12,3 +15,14 @@ Depends: cdebconf-udeb (>= 0.129) XB-Installer-Menu-Item: ${menuitemnum} Description: choose language/country/locale + +Package: localechooser-data +Section: devel +Priority: optional +Architecture: all +Depends: iso-codes, ${misc:Depends} +Breaks: system-config-kickstart (<< 2.5.20-0ubuntu24), casper (<< 1.361) +Description: Lists of locales supported by the installer + This package contains lists of languages, countries, and locales supported + by the installer, for use by programs that create automatic installation + scripts. diff -Nru localechooser-2.89/debian/install localechooser-2.89ubuntu1/debian/install --- localechooser-2.89/debian/install 2018-08-10 20:22:36.000000000 +0100 +++ localechooser-2.89ubuntu1/debian/install 2020-10-31 15:17:01.000000000 +0000 @@ -1,6 +1,3 @@ localechooser languagemap translation-check usr/bin post-base-installer.d finish-install.d usr/lib -# The following while we have no other way to get SUPPORTED -# Should become useless when we will have it -debian/SUPPORTED-short etc debian/short-tmp/shortlists etc diff -Nru localechooser-2.89/debian/localechooser-data.install localechooser-2.89ubuntu1/debian/localechooser-data.install --- localechooser-2.89/debian/localechooser-data.install 1970-01-01 01:00:00.000000000 +0100 +++ localechooser-2.89ubuntu1/debian/localechooser-data.install 2017-11-07 19:48:10.000000000 +0000 @@ -0,0 +1 @@ +regionmap debian/short-tmp/shortlists usr/share/localechooser diff -Nru localechooser-2.89/debian/rules localechooser-2.89ubuntu1/debian/rules --- localechooser-2.89/debian/rules 2019-01-13 17:06:53.000000000 +0000 +++ localechooser-2.89ubuntu1/debian/rules 2020-10-31 15:17:01.000000000 +0000 @@ -3,6 +3,7 @@ dh $@ PACKAGE=localechooser +DATAPACKAGE=localechooser-data ARCH=$(shell dpkg-architecture -qDEB_HOST_ARCH) @@ -25,6 +26,12 @@ gzip -c debian/languagelist.data \ >debian/$(PACKAGE)/usr/share/localechooser/languagelist.data.gz chmod 0644 debian/$(PACKAGE)/usr/share/localechooser/languagelist.data.gz +ifneq (,$(filter $(DATAPACKAGE),$(shell dh_listpackages))) + cp -a debian/$(PACKAGE)/usr/share/localechooser/languagelist \ + debian/$(PACKAGE)/usr/share/localechooser/languagelist.data.gz \ + debian/$(DATAPACKAGE)/usr/share/localechooser/ +endif + install -m644 /usr/share/i18n/SUPPORTED debian/$(PACKAGE)/usr/share/localechooser/SUPPORTED override_dh_installdebconf: dh_installdebconf diff -Nru localechooser-2.89/finish-install.d/05localechooser localechooser-2.89ubuntu1/finish-install.d/05localechooser --- localechooser-2.89/finish-install.d/05localechooser 2018-08-10 20:22:36.000000000 +0100 +++ localechooser-2.89ubuntu1/finish-install.d/05localechooser 2020-10-31 15:17:01.000000000 +0000 @@ -11,13 +11,13 @@ # Set locale to C if it has not yet been set # This can happen during e.g. s390 installs where localechooser is not run -[ -z "$LOCALE" ] && LOCALE="C" +[ -z "$LOCALE" ] && LOCALE="C.UTF-8" LANGUAGE=${LOCALE%%_*} # Install specific packages depending on selected language -if [ "$LOCALE" != "C" ] ; then +if [ "$LOCALE" != "C" ] && [ "$LOCALE" != "C.UTF-8" ]; then # Other language specific packages case "$LANGUAGE" in ar|he|fa) diff -Nru localechooser-2.89/get-SUPPORTED localechooser-2.89ubuntu1/get-SUPPORTED --- localechooser-2.89/get-SUPPORTED 2018-08-10 20:22:36.000000000 +0100 +++ localechooser-2.89ubuntu1/get-SUPPORTED 1970-01-01 01:00:00.000000000 +0100 @@ -1,8 +0,0 @@ -#!/bin/sh - -# Get the SUPPORTED list of locales -set -e - -[ -r /usr/share/i18n/SUPPORTED ] || exit 1 -rm -rf debian/SUPPORTED-short >/dev/null 2>&1 -grep -v '^#' /usr/share/i18n/SUPPORTED | cut -f1 -d ' ' | uniq >debian/SUPPORTED-short diff -Nru localechooser-2.89/languagelist localechooser-2.89ubuntu1/languagelist --- localechooser-2.89/languagelist 2020-10-31 11:40:30.000000000 +0000 +++ localechooser-2.89ubuntu1/languagelist 2020-10-31 15:17:01.000000000 +0000 @@ -14,7 +14,8 @@ bo;Tibetan;བོད་ཡིག;4;IN;bo_IN;; # For C locale, set language to 'en' to make sure questions are "translated" # to English instead of showing codes. -C;C;No localization;0;;C;en; +C;C;No localization (ASCII);0;;C;en; +C.UTF-8;C.UTF-8;No localization (UTF-8);0;;C.UTF-8;en; ca;Catalan;Català;1;ES;ca_ES.UTF-8;;console-setup # Special case for Chinese as the two flavours share the same ISO 639 code # Both will trigger countrychooser. Each will be the backup for the other @@ -56,6 +57,7 @@ kn;Kannada;ಕನ್ನಡ;4;IN;kn_IN;; ko;Korean;한국어;3;KR;ko_KR.UTF-8;; ku;Kurdish;Kurdî;2;TR;ku_TR.UTF-8;;console-setup +ckb;Kurdish, Central;کوردیی ناوەندی;3;IQ;ckb_IQ;; #X ky;Kirghiz;Кыргызча;2;KG;ky_KG;;console-setup lo;Lao;ລາວ;3;LA;lo_LA;;console-setup lv;Latvian;Latviski;2;LV;lv_LV.UTF-8;;console-setup @@ -71,8 +73,8 @@ # of Skolelinux as a kind of reward to them..:-). They need to be able to # choose Sami as an option so that the Sami locale is set as default se_NO;Northern Sami;Sámegillii;1;NO;se_NO;se_NO:nb_NO:nb:no_NO:no:nn_NO:nn:da:sv:en;console-setup -nb_NO;Norwegian Bokmaal;Norsk bokmål;1;NO;nb_NO.UTF-8;nb_NO:nb:no_NO:no:nn_NO:nn:da:sv:en;console-setup -nn_NO;Norwegian Nynorsk;Norsk nynorsk;1;NO;nn_NO.UTF-8;nn_NO:nn:no_NO:no:nb_NO:nb:da:sv:en;console-setup +nb_NO;Norwegian Bokmaal;Norsk bokmål;1;NO;nb_NO.UTF-8;nb_NO:nb:no_NO:no:nn_NO:nn:en;console-setup +nn_NO;Norwegian Nynorsk;Norsk nynorsk;1;NO;nn_NO.UTF-8;nn_NO:nn:no_NO:no:nb_NO:nb:en;console-setup #X os;Ossetian;Ирон æвзаг;3;RU;os_RU;;console-setup oc;Occitan;Occitan;1;FR;oc_FR.UTF-8;;console-setup fa;Persian;فارسی;3;IR;fa_IR;;console-setup @@ -87,6 +89,7 @@ si;Sinhala;සිංහල;4;LK;si_LK;; sr;Serbian (Cyrillic);Српски;2;RS;sr_RS;;console-setup #X sr@latin;Serbian (Latin);Srpski;2;RS;sr_RS@latin;;console-setup +szl;Silesian;Ślůnski;2;PL;szl_PL;; sk;Slovak;Slovenčina;2;SK;sk_SK.UTF-8;;console-setup sl;Slovenian;Slovenščina;2;SI;sl_SI.UTF-8;;console-setup es;Spanish;Español;1;ES;es_ES.UTF-8;;console-setup diff -Nru localechooser-2.89/languagemap localechooser-2.89ubuntu1/languagemap --- localechooser-2.89/languagemap 2018-08-10 20:22:36.000000000 +0100 +++ localechooser-2.89ubuntu1/languagemap 2020-10-31 15:17:01.000000000 +0000 @@ -39,8 +39,8 @@ fi else log "error: Unable to locate info for language '$LANGUAGE'" - LANGUAGE=C + LANGUAGE=C.UTF-8 DEFAULT_COUNTRY=US - DEFAULT_LOCALE=C + DEFAULT_LOCALE=C.UTF-8 LANGUAGELIST=en fi diff -Nru localechooser-2.89/localechooser localechooser-2.89ubuntu1/localechooser --- localechooser-2.89/localechooser 2018-08-10 20:22:36.000000000 +0100 +++ localechooser-2.89ubuntu1/localechooser 2020-10-31 15:17:01.000000000 +0000 @@ -17,8 +17,14 @@ tpl_supportedlocales="localechooser/supported-locales" tpl_preferredlocale="localechooser/preferred-locale" -SUPPORTEDLOCALES=/etc/SUPPORTED-short +SUPPORTEDLOCALES=/usr/share/localechooser/SUPPORTED +if [ ! -f "$SUPPORTEDLOCALES" ]; then + SUPPORTEDLOCALES=/usr/share/i18n/SUPPORTED +fi SHORTLISTS=/etc/shortlists +if [ ! -f "$SHORTLISTS" ]; then + SHORTLISTS=/usr/share/localechooser/shortlists +fi LANGUAGELISTFILE=/usr/share/localechooser/languagelist LANGUAGELISTDATA=/usr/share/localechooser/languagelist.data.gz @@ -89,6 +95,9 @@ ;; esac + if [ "$OVERRIDE_SHOW_ALL_LANGUAGES" ]; then + level=4 + fi #log "Language display level is $level" echo $level } @@ -106,7 +115,7 @@ rm -f /var/lib/localechooser/langlevel IFS="$NL" - for line in $(zcat $LANGUAGELISTDATA | grep "^[0-$level]:"); do + for line in $(zcat $LANGUAGELISTDATA | grep -a "^[0-$level]:"); do name="$(echo "$line" | cut -d: -f3)" codes="$(choices_add "$codes" \ "$(echo "$line" | cut -d: -f2)")" @@ -160,7 +169,7 @@ country_preseeded=1 fi if [ "$ps_locale" ]; then - if grep -q "^$ps_locale$" $SUPPORTEDLOCALES; then + if grep -q "^$ps_locale " $SUPPORTEDLOCALES; then db_fset $tpl_di_locale seen $seenflag || true db_fset $tpl_supportedlocales seen $seenflag || true locale_preseeded=1 @@ -196,7 +205,7 @@ # Avoid (accidental) preseeding of legacy locales if [ "$ps_locale" != "${ps_language}_$ps_country" ] && \ - grep -q "^$ps_locale$" $SUPPORTEDLOCALES; then + grep -q "^$ps_locale " $SUPPORTEDLOCALES; then db_set $tpl_di_locale $ps_locale db_fset $tpl_di_locale seen $seenflag || true db_fset $tpl_supportedlocales seen $seenflag || true @@ -210,7 +219,7 @@ # Those we install here are those required immediately # Otherwise we will install them in finish-install install_lang_specific() { - if [ "$DEFAULT_LOCALE" != C ]; then + if [ "$DEFAULT_LOCALE" != C ] && [ "$DEFAULT_LOCALE" != C.UTF-8 ]; then case "$LANGUAGE" in ar|el|fa|he|ja|ko|ku|tr|vi|wo|zh*) # We need a complete font for later steps @@ -375,7 +384,7 @@ # Check if a valid locale exists for the selected language + country for entry in ${lang}_$COUNTRYCODE$DEFAULT_LOCALE_POSTFIX \ ${lang}_$COUNTRYCODE; do - if grep -q "^$entry$" $SUPPORTEDLOCALES; then + if grep -q "^$entry " $SUPPORTEDLOCALES; then echo "$entry" break fi @@ -404,9 +413,9 @@ country="$(echo "$sl_choices" | cut -d, -f $i)" i=$(($i + 1)) - if grep -q "^${lang}_$ccode\.UTF-8$" $SUPPORTEDLOCALES; then + if grep -q "^${lang}_$ccode\.UTF-8 " $SUPPORTEDLOCALES; then locale=${lang}_$ccode.UTF-8 - elif grep -q "^${lang}_$ccode$" $SUPPORTEDLOCALES; then + elif grep -q "^${lang}_$ccode " $SUPPORTEDLOCALES; then locale=${lang}_$ccode else continue @@ -428,6 +437,7 @@ validate_supportedlocales() { local choices="$1" local locale current new + local english= db_get $tpl_supportedlocales current="$(echo "$RET" | sed 's/, */ /g')" @@ -435,8 +445,17 @@ if echo ", $choices, " | grep -q ", $locale, "; then new="${new:+$new, }$locale" fi + if [ "$locale" = C ] || [ "$locale" = C.UTF-8 ] || [ "$locale" = en_US.UTF-8 ]; then + english=1 + fi done - db_set $tpl_supportedlocales "$new" + # Always support English (unless preseeded otherwise), so that we + # get English language packs etc. + if [ "$english" ]; then + db_set $tpl_supportedlocales "$new" + else + db_set $tpl_supportedlocales "${new:+$new, }en_US.UTF-8" + fi } # Extract a value from /etc/lsb-release @@ -472,6 +491,14 @@ >/var/lib/localechooser/preseeded fi +db_fget $tpl_languagelist seen +if [ "$RET" = true ]; then + db_get $tpl_languagelist + PREVIOUS_LANGUAGE="$RET" +else + PREVIOUS_LANGUAGE="" +fi + # Main loop starts here # Use a state machine to allow jumping back to previous questions. @@ -512,7 +539,7 @@ set_debconf_language $INITIAL_LANGUAGE db_get $tpl_languagelist - if [ "$RET" != C ]; then + if [ "$RET" != C ] && [ "$RET" != C.UTF-8 ]; then current_language=$(get_current_language) if [ "$current_language" ]; then db_set $tpl_languagelist $current_language @@ -540,6 +567,14 @@ /usr/lib/espeakup/espeakup.restart "$LANGUAGE" fi + if [ "$LANGUAGE" = "$PREVIOUS_LANGUAGE" ]; then + # The user picked the same language as before. We + # don't need to reset the default country and + # locale, and doing so may be confusing. + STATE=12 + continue + fi + # Determine defaults based on languagelist . languagemap db_set "$tpl_di_language" "$LANGUAGELIST" @@ -560,6 +595,10 @@ [ "$X_INSTALLATION_MEDIUM" = "floppy" ]; then db_input high localechooser/translation/none-yet || true fi + + # The language was changed, so a preseeded locale is no + # longer relevant. + locale_preseeded="" ;; 12) # Warn if translation is incomplete @@ -600,7 +639,7 @@ # As we may unregister the question for shortlists, the value for the # shortlist template is also saved with the language specific question use_lang="" - if [ "$DEFAULT_LOCALE" != C ]; then + if [ "$DEFAULT_LOCALE" != C ] && [ "$DEFAULT_LOCALE" != C.UTF-8 ]; then if grep -q "^$FIRST_LANG" $SHORTLISTS; then use_lang=$FIRST_LANG elif grep -q "^$LANGUAGE" $SHORTLISTS; then @@ -776,14 +815,14 @@ LOCALE=$RET log "Preseeded $tpl_di_locale = '$LOCALE'" else - if [ "$DEFAULT_LOCALE" = C ]; then + if [ "$DEFAULT_LOCALE" = C ] || [ "$DEFAULT_LOCALE" = C.UTF-8 ]; then LOCALE=$DEFAULT_LOCALE else LOCALE="$(get_default_locale)" # Fall back to a supported locale if [ -z "$LOCALE" ]; then - if grep -q "^$DEFAULT_LOCALE$" $SUPPORTEDLOCALES; then + if grep -q "^$DEFAULT_LOCALE " $SUPPORTEDLOCALES; then LOCALE="$DEFAULT_LOCALE" else LOCALE=$(echo $DEFAULT_LOCALE | \ @@ -828,7 +867,7 @@ CHOICES= # *.UTF-8@euro locales are deprecated; don't use them - for i in $(grep -v '\.UTF-8@euro$' $SUPPORTEDLOCALES | grep -v "^$LOCALE$"); do + for i in $(grep -v '^#' $SUPPORTEDLOCALES | grep -v '\.UTF-8@euro$' | cut -d' ' -f1 | grep -v "^$LOCALE$"); do CHOICES="${CHOICES:+$CHOICES, }$i" done @@ -869,7 +908,7 @@ else extra_lang=${LANGUAGE%%_*}_$COUNTRYCODE fi - if [ "$LOCALE" != C ] && \ + if [ "$LOCALE" != C ] && [ "$LOCALE" != C.UTF-8 ] && \ [ "$LANGUAGE" ] && [ "$COUNTRYCODE" ] && \ [ "$COUNTRYCODE" != "$DEFAULT_COUNTRY" ] && \ ! echo ":$LANGUAGELIST:" | grep -q ":$extra_lang:" && \ diff -Nru localechooser-2.89/Makefile localechooser-2.89ubuntu1/Makefile --- localechooser-2.89/Makefile 2018-08-10 20:22:36.000000000 +0100 +++ localechooser-2.89ubuntu1/Makefile 2020-10-31 15:17:00.000000000 +0000 @@ -1,4 +1,4 @@ -all: check-scripts debian/languagelist.data debian/SUPPORTED-short debian/short-tmp/shortlists debian/templates check-data check-utf8 +all: check-scripts debian/languagelist.data debian/short-tmp/shortlists debian/templates check-scripts check-data check-utf8 LIST = languagelist @@ -21,9 +21,6 @@ ./mktemplates.shortlist ./mktemplates.warnings $(LIST) debian/templates -debian/SUPPORTED-short: - ./get-SUPPORTED - debian/short-tmp/shortlists: debian/iso_3166.tab debian/iso-codes ./mkshort @@ -55,5 +52,5 @@ DEBIAN_FRONTEND=dialog DEBCONF_DEBUG=developer /usr/share/debconf/frontend ./localechooser clean: - $(RM) localechooser.templates debian/templates debian/templates.continents debian/templates.base-in debian/templates.base debian/templates.tmp debian/languagelist.data SUPPORTED-short debian/iso_3166.tab + $(RM) localechooser.templates debian/templates debian/templates.continents debian/templates.base-in debian/templates.base debian/templates.tmp debian/languagelist.data debian/iso_3166.tab $(RM) -rf debian/short-tmp debian/iso-codes diff -Nru localechooser-2.89/mklanguagelist.data localechooser-2.89ubuntu1/mklanguagelist.data --- localechooser-2.89/mklanguagelist.data 2018-08-10 20:22:36.000000000 +0100 +++ localechooser-2.89ubuntu1/mklanguagelist.data 2020-10-31 15:17:01.000000000 +0000 @@ -47,8 +47,8 @@ #Sorts languages, making sure that the C locale is listed first sub sort_C_first { my @full_list = @_; - my @C_locale = grep /^C$/, @full_list; - my @languages = grep !/^C$/, @full_list; + my @C_locale = grep /^C/, @full_list; + my @languages = grep !/^C/, @full_list; my @new_list = sort order_trans @languages; unshift @new_list, @C_locale; return @new_list; diff -Nru localechooser-2.89/post-base-installer.d/05localechooser localechooser-2.89ubuntu1/post-base-installer.d/05localechooser --- localechooser-2.89/post-base-installer.d/05localechooser 2018-08-10 20:22:36.000000000 +0100 +++ localechooser-2.89ubuntu1/post-base-installer.d/05localechooser 2020-10-31 15:17:01.000000000 +0000 @@ -8,37 +8,15 @@ # of the fact that locales is not yet installed). export IT_LANG_OVERRIDE=C -log() { - logger -t localechooser "$@" -} - -error() { - log "error: $@" -} - -# If locale is invalid, add it to locale.gen -add_if_invalid() { - local locale=$1 - - # Use LANG=C to avoid locale errors from perl - if LANG=C chroot /target /usr/sbin/validlocale "$locale" \ - >>/target/etc/locale.gen 2>/dev/null; then - # locale is valid and available - return 1 - else - log "Adding locale '$locale'" - fi -} - db_get debian-installer/locale LOCALE="$RET" # Set locale to C if it has not yet been set # This can happen during e.g. s390 installs where localechooser is not run -[ "$LOCALE" ] || LOCALE="C" +[ "$LOCALE" ] || LOCALE="C.UTF-8" -if [ "$LOCALE" != "C" ]; then +if [ "$LOCALE" != "C" ] && [ "$LOCALE" != "C.UTF-8" ]; then db_get debian-installer/language LANGLIST="$RET" fi @@ -50,31 +28,94 @@ LANGUAGE="${LOCALE%%_*}" +LOCALE_TRANSLATIONS="$LOCALE" + +case ${LOCALE%%_*} in + pt|zh) + # In the special cases of Portuguese and Chinese, selecting a + # different location may imply a different dialect of the language. + # In such cases, make LANG reflect the selected language (for + # messages, character types, and collation) and make the other + # locale categories reflect the selected language. + db_get localechooser/languagelist + ORIG_LANGUAGE="$RET" + db_get debian-installer/country + COUNTRY="$RET" + + if grep -q "^$ORIG_LANGUAGE;" /usr/share/localechooser/languagelist; then + SUPPORTEDLOCALES=/usr/share/localechooser/SUPPORTED + if [ ! -f "$SUPPORTEDLOCALES" ]; then + SUPPORTEDLOCALES=/usr/share/i18n/SUPPORTED + fi + + LOCALE_TRANSLATIONS="$(grep "^$ORIG_LANGUAGE;" /usr/share/localechooser/languagelist | cut -d';' -f4)" + newlocale="$(echo "$LOCALE" | sed "s/_[A-Z][A-Z]*/_$COUNTRY/")" + if grep -q "^${newlocale%%[.@]*}[.@ ]" $SUPPORTEDLOCALES && \ + [ "$newlocale" != "$LOCALE_TRANSLATIONS" ]; then + LOCALE="$newlocale" + LANGLIST="$(grep "^$ORIG_LANGUAGE;" /usr/share/localechooser/languagelist | cut -d';' -f5)" + fi + fi + ;; +esac + # Enable translations -if [ "$LOCALE" != "C" ] || [ "$EXTRAS" ]; then +if [ "$LOCALE" != "C" ] && [ "$LOCALE" != "C.UTF-8" ] || [ "$EXTRAS" ]; then apt-install locales || true fi +set_field () { + local file category value + file="$1" + category="$2" + value="$3" + + if grep -qs "^#* *$category=" "$file"; then + sed -i "s,^#* *$category=.*,$category=\"$value\"," "$file" + else + echo "$category=\"$value\"" >> "$file" + fi +} + # Set global locale and language, and make sure the glibc locale is # generated. DESTFILE="/target/etc/default/locale" if [ -e $DESTFILE ]; then - sed -i 's/^# LANG=$/LANG=\"'"$LOCALE"'\"/' $DESTFILE + if grep -q '^LANG=' $DESTFILE; then + sed -i 's/^LANG=.*/LANG=\"'"$LOCALE_TRANSLATIONS"'\"/' $DESTFILE + elif grep -q '^# LANG=' $DESTFILE; then + sed -i 's/^# LANG=.*/LANG=\"'"$LOCALE_TRANSLATIONS"'\"/' $DESTFILE + else + echo "LANG=\"$LOCALE_TRANSLATIONS\"" >> $DESTFILE + fi # We set LANGUAGE only if the languagelist is a list of # languages with alternatives. Otherwise, setting it is useless if echo "$LANGLIST" | grep -q ":"; then - sed -i 's/^# LANGUAGE=$/LANGUAGE=\"'"$LANGLIST"'\"/' $DESTFILE + if grep -q '^LANGUAGE=' $DESTFILE; then + sed -i 's/^LANGUAGE=.*/LANGUAGE=\"'"$LANGLIST"'\"/' $DESTFILE + elif grep -q '^# LANGUAGE=' $DESTFILE; then + sed -i 's/^# LANGUAGE=.*/LANGUAGE=\"'"$LANGLIST"'\"/' $DESTFILE + else + echo "LANGUAGE=\"$LANGLIST\"" >> $DESTFILE + fi fi fi # Fallback in case the file wasn't provided by locales, or the format # changed. if [ ! -e "$DESTFILE" ] || ! grep -q '^LANG=' $DESTFILE; then mkdir -p "${DESTFILE%/*}" - echo "LANG=\"$LOCALE\"" >> $DESTFILE + echo "LANG=\"$LOCALE_TRANSLATIONS\"" >> $DESTFILE if echo "$LANGLIST" | grep -q ":"; then echo "LANGUAGE=\"$LANGLIST\"" >> $DESTFILE fi fi +if [ "$LOCALE_TRANSLATIONS" != "$LOCALE" ]; then + for category in \ + LC_NUMERIC LC_TIME LC_MONETARY LC_PAPER LC_NAME LC_ADDRESS \ + LC_TELEPHONE LC_MEASUREMENT LC_IDENTIFICATION; do + set_field /target/etc/default/locale "$category" "$LOCALE" + done +fi # For languages that have no chance to be displayed at the Linux console # let's set root's environment with a non localized environment @@ -93,35 +134,26 @@ echo "# Installed by Debian Installer:" >>$ROOTPROFILE echo "# no localization for root because $LOCALE" >>$ROOTPROFILE echo "# cannot be properly displayed at the Linux console" >>$ROOTPROFILE - echo "LANG=C" >>$ROOTPROFILE - echo "LANGUAGE=C" >>$ROOTPROFILE + echo "LANG=C.UTF-8" >>$ROOTPROFILE + echo "LANGUAGE=C.UTF-8" >>$ROOTPROFILE fi -# Generate selected locales that are not already valid -if ([ "$LOCALE" != "C" ] || [ "$EXTRAS" ]) && \ - [ -x /target/usr/sbin/validlocale ]; then - gen="" - if add_if_invalid "$LOCALE"; then - gen=1 - fi - for loc in $EXTRAS; do - if [ "$loc" != "$LOCALE" ] && \ - add_if_invalid "$loc"; then - gen=1 - fi +locale_gen () { + local loc + for loc; do + # Create a skeleton locale-langpack subdirectory so that + # /usr/share/language-tools/language-options knows that this + # locale is supposed to have a meaningful existence. + mkdir -p "/target/usr/share/locale-langpack/${loc%_*}" done - if [ "$gen" ]; then - if [ -x /target/usr/sbin/locale-gen ]; then - log "Generating added locales..." - log-output -t localechooser --pass-stdout \ - chroot /target /usr/sbin/locale-gen \ - --keep-existing > /dev/null - else - error "the command 'locale-gen' is not available" - fi - fi -else - error "the command 'validlocale' is not available" + log-output -t localechooser chroot /target /usr/sbin/locale-gen "$@" +} + +if [ "$LOCALE" != C ] && [ "$LOCALE" != "C.UTF-8" ]; then + locale_gen "$LOCALE" || true +fi +if [ "$EXTRAS" ]; then + locale_gen $EXTRAS || true fi exit 0