From: Maximiliano Sandoval <m.sandoval@proxmox.com>
To: Christoph Heiss <c.heiss@proxmox.com>
Cc: pve-devel@lists.proxmox.com
Subject: Re: [pve-devel] [PATCH installer] country.pl: load iso 3166 country codes file as UTF8
Date: Tue, 08 Apr 2025 10:48:31 +0200 [thread overview]
Message-ID: <s8omscr11do.fsf@proxmox.com> (raw)
In-Reply-To: <20250408084750.161399-1-c.heiss@proxmox.com>
I ran
```sh
make locale-info.json
<locale-info.json jq > locales.json
```
then did a diff of the locales.json file before and after this patch. The resulting diff is:
```diff
@@ -1001,7 +1001,7 @@
"ax": {
"kmap": "",
"mirror": "",
- "name": "Ã…land Islands",
+ "name": "Åland Islands",
"zone": "Europe/Mariehamn"
},
"az": {
@@ -1067,7 +1067,7 @@
"bl": {
"kmap": "",
"mirror": "",
- "name": "Saint Barthélemy",
+ "name": "Saint Barthélemy",
"zone": "America/St_Barthelemy"
},
"bm": {
@@ -1174,7 +1174,7 @@
"ci": {
"kmap": "",
"mirror": "",
- "name": "Côte d'Ivoire",
+ "name": "Côte d'Ivoire",
"zone": "Africa/Abidjan"
},
"ck": {
@@ -1228,7 +1228,7 @@
"cw": {
"kmap": "",
"mirror": "",
- "name": "Curaçao",
+ "name": "Curaçao",
"zone": "America/Curacao"
},
"cx": {
@@ -2037,7 +2037,7 @@
"re": {
"kmap": "",
"mirror": "",
- "name": "Réunion",
+ "name": "Réunion",
"zone": "Indian/Reunion"
},
"ro": {
@@ -2259,7 +2259,7 @@
"tr": {
"kmap": "",
"mirror": "ftp.tr.debian.org",
- "name": "Türkiye",
+ "name": "Türkiye",
"zone": "Europe/Istanbul"
},
"tt": {
@@ -2463,10 +2463,10 @@
"costa rica": "cr",
"croatia": "hr",
"cuba": "cu",
- "curaã§ao": "cw",
+ "curaçao": "cw",
"cyprus": "cy",
"czechia": "cz",
- "cã´te d'ivoire": "ci",
+ "côte d'ivoire": "ci",
"denmark": "dk",
"djibouti": "dj",
"dominica": "dm",
@@ -2590,8 +2590,8 @@
"romania": "ro",
"russian federation": "ru",
"rwanda": "rw",
- "rã©union": "re",
- "saint barthã©lemy": "bl",
+ "réunion": "re",
+ "saint barthélemy": "bl",
"saint helena, ascension and tristan da cunha": "sh",
"saint kitts and nevis": "kn",
"saint lucia": "lc",
@@ -2637,7 +2637,7 @@
"turkmenistan": "tm",
"turks and caicos islands": "tc",
"tuvalu": "tv",
- "tã¼rkiye": "tr",
+ "türkiye": "tr",
"uganda": "ug",
"ukraine": "ua",
"united arab emirates": "ae",
@@ -2656,7 +2656,7 @@
"yemen": "ye",
"zambia": "zm",
"zimbabwe": "zw",
- "ã…land islands": "ax"
+ "åland islands": "ax"
},
"kmap": {
"de": {
```
which seems correct to me.
Thanks for the patch!
Reviewed-by: Maximiliano Sandoval <m.sandoval@proxmox.com>
Tested-by: Maximiliano Sandoval <m.sandoval@proxmox.com>
Christoph Heiss <c.heiss@proxmox.com> writes:
> This file is UTF-8 encoded and contains Unicode characters for encoding
> country names, such as "Åland Islands" for example.
>
> Otherwise, the final locale-info.json that gets shipped with the ISO
> might contain wrongly-encoded country names, causing display errors in
> (at least) the GTK installer country dropdown.
>
> Reported-by: Maximiliano Sandoval <m.sandoval@proxmox.com>
> Signed-off-by: Christoph Heiss <c.heiss@proxmox.com>
> ---
> country.pl | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/country.pl b/country.pl
> index 9e4881a..7401f68 100755
> --- a/country.pl
> +++ b/country.pl
> @@ -88,7 +88,7 @@ my sub parse_zoneinfo {
> # country codes from:
> my $country_codes_file = "/usr/share/iso-codes/json/iso_3166-1.json";
>
> -my $iso_3166_codes = from_json(PVE::Tools::file_get_contents($country_codes_file, 64 * 1024));
> +my $iso_3166_codes = from_json(PVE::Tools::file_get_contents($country_codes_file, 64 * 1024), { utf8 => 1 });
>
> my $country_codes = { map { lc($_->{'alpha_2'}) => $_->{'common_name'} // $_->{'name'} } @{$iso_3166_codes->{'3166-1'}} };
_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
next prev parent reply other threads:[~2025-04-08 8:52 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-04-08 8:47 Christoph Heiss
2025-04-08 8:48 ` Maximiliano Sandoval [this message]
2025-04-08 9:13 ` [pve-devel] Applied: " Thomas Lamprecht
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=s8omscr11do.fsf@proxmox.com \
--to=m.sandoval@proxmox.com \
--cc=c.heiss@proxmox.com \
--cc=pve-devel@lists.proxmox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.
Service provided by Proxmox Server Solutions GmbH | Privacy | Legal