Re: tzsetup_0.126_source.changes ACCEPTED into unstable

[Holger Wansing <hwansing@mailbox.org>]

Hi,

Aurelien Jarno <aurel32@debian.org> wrote (Sun, 26 Jan 2025 18:30:04 +0100):
> > On Sun, 2025-01-26 at 15:00 +0100, Holger Wansing wrote:
> > > Hi,
> > > 
> > > Debian FTP Masters <ftpmaster@ftp-master.debian.org> wrote (Tue, 21 Jan 2025 21:37:53 +0000):
> > > >    [ Aurelien Jarno ]
> > > >    * Replace legacy timezones with their modern counterparts. Closes: #1055541.
> > > >    * Update cities/zones that have been renamed.
> > > >    * Add templates for Cyprus.
> > > 
> > > Tests have shown, that Cyprus as country is only visible, when looking under
> > > Europe as continent.
> > > Is this correct, since the timezone strings are named "Asia/... " ?
> > > 
> > > Asia/Nicosia (most of Cyprus)
> > > Asia/Famagusta (Northern Cyprus)
> > > 
> > > 
> > > Looks inconsistent to me.
[...]
> 
> It seems to be a discrepancy between upstream tzdata which, consider Cyprus
> in Asia, and localechooser, which considers Cyprus in Europe:
> 
> https://salsa.debian.org/installer-team/localechooser/-/blob/master/regionmap?ref_type=heads#L167

I see. But since we did not receive any complaints in the past about mapping 
Cyprus to Europe, that's likely ok.

The real issue seems to be, that the displayed choices include the continent
as
	Asia/Nicosia (most of Cyprus)
	Asia/Famagusta (Northern Cyprus)

This is not the case for any other timezone. It should be

	Nicosia (most of Cyprus)
	Famagusta (Northern Cyprus)

Then the discrepancy from above is no longer an issue (for the user in d-i).

Moreover, this message is lacking the declaration of the sublevel,
that's why the above strings are in sublevel1, while all others from
tzsetup are in sublevel3.

I have attached a patch to fix all the above.


Holger





-- 
Holger Wansing <hwansing@mailbox.org>
PGP-Fingerprint: 496A C6E8 1442 4B34 8508  3529 59F1 87CA 156E B076

diff --git a/debian/common.templates.in b/debian/common.templates.in
index 6217459..0ac5219 100644
--- a/debian/common.templates.in
+++ b/debian/common.templates.in
@@ -77,31 +77,32 @@ Choices-C: Africa/Kinshasa, Africa/Lubumbashi
 __Choices: Kinshasa, Lubumbashi
 Default: Africa/Kinshasa
 Description: city
 
 Template: tzsetup/country/CL
 Type: select
 Choices-C: America/Santiago, Pacific/Easter
 # :sl3:
 __Choices: Santiago, Easter Island
 Default: America/Santiago
 Description: zone
 
 Template: tzsetup/country/CY
 Type: select
 Choices-C: Asia/Nicosia, Asia/Famagusta
-__Choices: Asia/Nicosia (most of Cyprus), Asia/Famagusta (Northern Cyprus)
+# :sl3:
+__Choices: Nicosia (most of Cyprus), Famagusta (Northern Cyprus)
 Description: zone
 
 Template: tzsetup/country/EC
 Type: select
 Choices-C: America/Guayaquil, Pacific/Galapagos
 # :sl3:
 __Choices: Guayaquil, Galapagos
 Default: America/Guayaquil
 Description: location
 
 Template: tzsetup/country/ES
 Type: select
 Choices-C: Europe/Madrid, Africa/Ceuta, Atlantic/Canary
 # :sl3:
 __Choices: Madrid, Ceuta, Canary Islands