Merge lp:~happyaron/ubiquity/lp-1465530 into lp:ubiquity

[Aron Xu]

[Mathieu Trudel-Lapierre (cyphermox)]

Looks fine, but it's also broken in localechooser, and this omits fixing the case for the LANGLIST= values.

Rejecting; but I'll fix this in localechooser and in the patch and credit you for the changes.

review: Needs Fixing

Unmerged revisions

6338. By Aron Xu on 2015-10-16

Fix wrong /etc/default/locale content for zh and pt locales (LP: #1465530)

=== modified file 'd-i/patches/localechooser-post-base-installer.patch'
--- d-i/patches/localechooser-post-base-installer.patch	2014-04-15 18:58:41 +0000
+++ d-i/patches/localechooser-post-base-installer.patch	2015-10-16 13:58:08 +0000
@@ -32,7 +32,7 @@
  		fi
  
 -		LOCALE_TRANSLATIONS="$(grep "^$ORIG_LANGUAGE;" /usr/share/localechooser/languagelist | cut -d';' -f5)"
-+		LOCALE_TRANSLATIONS="$(grep "^$ORIG_LANGUAGE;" /usr/lib/ubiquity/localechooser/languagelist | cut -d';' -f5)"
++		LOCALE_TRANSLATIONS="$(grep "^$ORIG_LANGUAGE;" /usr/lib/ubiquity/localechooser/languagelist | cut -d';' -f4)"
  		newlocale="$(echo "$LOCALE" | sed "s/_[A-Z][A-Z]*/_$COUNTRY/")"
  		if grep -q "^${newlocale%%[.@]*}[.@ ]" $SUPPORTEDLOCALES && \
  		   [ "$newlocale" != "$LOCALE_TRANSLATIONS" ]; then