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

Bug#272284: marked as done (Selection of en + NL results in non-existent locale 'en_US@euro')



Your message dated Sun, 19 Sep 2004 13:47:08 -0400
with message-id <E1C95mG-00038q-00@newraff.debian.org>
and subject line Bug#272284: fixed in countrychooser 1.04
has caused the attached Bug report to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what I am
talking about this indicates a serious mail system misconfiguration
somewhere.  Please contact me immediately.)

Debian bug tracking system administrator
(administrator, Debian Bugs database)

--------------------------------------
Received: (at submit) by bugs.debian.org; 19 Sep 2004 00:00:52 +0000
>From aragorn@tiscali.nl Sat Sep 18 17:00:52 2004
Return-path: <aragorn@tiscali.nl>
Received: from 195-240-184-66-mx.xdsl.tiscali.nl (elrond.fjphome.nl) [195.240.184.66] 
	by spohr.debian.org with esmtp (Exim 3.35 1 (Debian))
	id 1C8p8N-0007FE-00; Sat, 18 Sep 2004 17:00:52 -0700
Received: from strider.fjphome.nl ([10.19.66.86] ident=fjp)
	by elrond.fjphome.nl with esmtp (Exim 3.35 #1 (Debian))
	id 1C8p7s-0007Tr-00; Sun, 19 Sep 2004 02:00:20 +0200
From: Frans Pop <aragorn@tiscali.nl>
To: submit@bugs.debian.org
Subject: Selection of en + NL results in non-existent locale 'en_US@euro'
Date: Sun, 19 Sep 2004 02:00:20 +0200
User-Agent: KMail/1.6.2
Cc: Christian Perrier <bubulle@debian.org>
MIME-Version: 1.0
Content-Disposition: inline
Content-Type: Multipart/Mixed;
  boundary="Boundary-00=_UwMTBzhNlZgJTIV"
Message-Id: <[🔎] 200409190200.20328.aragorn@tiscali.nl>
Delivered-To: submit@bugs.debian.org
X-Spam-Checker-Version: SpamAssassin 2.60-bugs.debian.org_2004_03_25 
	(1.212-2003-09-23-exp) on spohr.debian.org
X-Spam-Status: No, hits=-6.4 required=4.0 tests=BAYES_00,HAS_PACKAGE,
	UPPERCASE_25_50 autolearn=no version=2.60-bugs.debian.org_2004_03_25
X-Spam-Level: 


--Boundary-00=_UwMTBzhNlZgJTIV
Content-Type: text/plain;
  charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

Package: countrychooser
Version: 1.03
Severity: important

Selection of English as language and Netherlands as country results in 
FALLBACKLOCALE being used. However, the fallback locale does not include a 
test to see if it exists.

I think the easiest solution would be to add a test for the existence of the 
fallbacklocale and, if it does not, remove any postfix (I guess we may 
assume that any fallback locale without a postfix will exist anyway).

Whilst I was testing this, I also noticed that the FALLBACKLOCALE appears 
not to be set inside countrychooser's postinst script, but to somehow 
inherit it's value from languagechooser.
There is a line 'fallbacklocalecode="debian-installer/fallbacklocale"', but 
a db_get is never performed.

The attached patch should fix both problems. Tested, but please check.


--Boundary-00=_UwMTBzhNlZgJTIV
Content-Type: text/x-diff;
  charset="us-ascii";
  name="postinst3.patch"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
	filename="postinst3.patch"

--- postinst	2004-09-19 01:46:41.000000000 +0200
+++ new/postinst	2004-09-19 01:55:01.000000000 +0200
@@ -148,10 +148,21 @@
 	# Just in case
 	DEFAULTLOCALE="C"
 fi
+
+# Finally grab the fallback locale we got from languagechooser
+db_get "$fallbacklocalecode"
+if [ -n "$RET" ]; then
+	FALLBACKLOCALE="$RET"
+else
+	# Just in case
+	FALLBACKLOCALE="C"
+fi
+
 # If present, keep track of charset or modifier we got from languagechooser
 # This charset or modifier is in the fallback locale
 EXTRA_LANGUAGECHOOSER=`echo $FALLBACKLOCALE | sed -e 's/^[^.@]*//'`
 
+
 FIRST_LANG=$(echo $LANGUAGELIST | sed -e 's/:.*$//')
 
 if grep -q "^$FIRST_LANG" $SHORTLISTS; then
@@ -241,6 +252,7 @@
 log "COUNTRYCODE = '$COUNTRYCODE'"
 log "COUNTRYCODE_LANGUAGECHOOSER = '$COUNTRYCODE_LANGUAGECHOOSER'"
 log "LOCALE_LANGUAGECHOOSER = '$LOCALE_LANGUAGECHOOSER'"
+log "FALLBACKLOCALE = '$FALLBACKLOCALE'"
 
 for entry in ${LANGUAGE}_${COUNTRYCODE}${EXTRA_LANGUAGECHOOSER} \
 	     ${LANGUAGE}_${COUNTRYCODE}; do
@@ -277,8 +289,12 @@
 
 # Fall back to a supported locale.
 if [ -z "${LOCALE}" ]; then
-	LOCALE="${FALLBACKLOCALE}"
-	log "falling back to locale '${FALLBACKLOCALE}'"
+        if grep -q "^${FALLBACKLOCALE}$" $SUPPORTEDLOCALES; then
+                LOCALE="${FALLBACKLOCALE}"
+        else
+                LOCALE=`echo $FALLBACKLOCALE | sed -e 's/[.@].*$//'`
+        fi
+        log "falling back to locale '${LOCALE}'"
 fi
 
 # Set the locale.

--Boundary-00=_UwMTBzhNlZgJTIV--

---------------------------------------
Received: (at 272284-close) by bugs.debian.org; 19 Sep 2004 17:53:19 +0000
>From katie@ftp-master.debian.org Sun Sep 19 10:53:19 2004
Return-path: <katie@ftp-master.debian.org>
Received: from newraff.debian.org [208.185.25.31] (mail)
	by spohr.debian.org with esmtp (Exim 3.35 1 (Debian))
	id 1C95sE-0007sj-00; Sun, 19 Sep 2004 10:53:19 -0700
Received: from katie by newraff.debian.org with local (Exim 3.35 1 (Debian))
	id 1C95mG-00038q-00; Sun, 19 Sep 2004 13:47:08 -0400
From: Christian Perrier <bubulle@debian.org>
To: 272284-close@bugs.debian.org
X-Katie: $Revision: 1.51 $
Subject: Bug#272284: fixed in countrychooser 1.04
Message-Id: <E1C95mG-00038q-00@newraff.debian.org>
Sender: Archive Administrator <katie@ftp-master.debian.org>
Date: Sun, 19 Sep 2004 13:47:08 -0400
Delivered-To: 272284-close@bugs.debian.org
X-Spam-Checker-Version: SpamAssassin 2.60-bugs.debian.org_2004_03_25 
	(1.212-2003-09-23-exp) on spohr.debian.org
X-Spam-Status: No, hits=-6.0 required=4.0 tests=BAYES_00,HAS_BUG_NUMBER 
	autolearn=no version=2.60-bugs.debian.org_2004_03_25
X-Spam-Level: 
X-CrossAssassin-Score: 3

Source: countrychooser
Source-Version: 1.04

We believe that the bug you reported is fixed in the latest version of
countrychooser, which is due to be installed in the Debian FTP archive:

countrychooser_1.04.dsc
  to pool/main/c/countrychooser/countrychooser_1.04.dsc
countrychooser_1.04.tar.gz
  to pool/main/c/countrychooser/countrychooser_1.04.tar.gz
countrychooser_1.04_all.udeb
  to pool/main/c/countrychooser/countrychooser_1.04_all.udeb



A summary of the changes between this version and the previous one is
attached.

Thank you for reporting the bug, which will now be closed.  If you
have further comments please address them to 272284@bugs.debian.org,
and the maintainer will reopen the bug report if appropriate.

Debian distribution maintenance software
pp.
Christian Perrier <bubulle@debian.org> (supplier of updated countrychooser package)

(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing ftpmaster@debian.org)


-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Format: 1.7
Date: Sun, 19 Sep 2004 18:43:52 +0200
Source: countrychooser
Binary: countrychooser
Architecture: source all
Version: 1.04
Distribution: unstable
Urgency: low
Maintainer: Debian Install System Team <debian-boot@lists.debian.org>
Changed-By: Christian Perrier <bubulle@debian.org>
Description: 
 countrychooser - Choose country (udeb)
Closes: 271260 272161 272284
Changes: 
 countrychooser (1.04) unstable; urgency=low
 .
   * Frans Pop
     - Speed up the build of the short country list enough for
       removing the need of a progress bar. Closes: #271260
     - Variable quoting fixes. Closes: #272161
     - Better test of the fallback locale : avoid inheriting
       and keeping a wrong modifier when the fallback locale
       is not supported. Closes: #272284
Files: 
 fe73c7c45708530cd40398766b0d3d89 721 debian-installer standard countrychooser_1.04.dsc
 5f57513a438d16293c8b22c754ae810c 44076 debian-installer standard countrychooser_1.04.tar.gz
 7ca477ae4e8d36f6624d358dd612ae4b 59780 debian-installer standard countrychooser_1.04_all.udeb
package-type: udeb

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.5 (GNU/Linux)

iD8DBQFBTcEw1OXtrMAUPS0RAr/5AJ95qnI3FpwLu6zi+a/tgqVntb30OQCeJK3X
y8gyBfxRgGb2LdHiSqpRIBg=
=cDs9
-----END PGP SIGNATURE-----



Reply to: