From 1cff70da909b86878f2acab56b9fd708989dc6cf Mon Sep 17 00:00:00 2001 From: Thomas Voss Date: Sat, 2 Aug 2025 15:44:51 +0200 Subject: Use the ‘Place Name’ context for all places MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/countries.go | 50 +++++++++--------- src/templates/banknotes-codes.html.tmpl | 88 ++++++++++++++++---------------- src/templates/coins-designs-de.html.tmpl | 10 ++-- 3 files changed, 74 insertions(+), 74 deletions(-) (limited to 'src') diff --git a/src/countries.go b/src/countries.go index 8e69f50..657cac8 100644 --- a/src/countries.go +++ b/src/countries.go @@ -15,32 +15,32 @@ type country struct { func sortedCountries(p i18n.Printer) []country { xs := []country{ - {Code: "ad", Name: p.GetC("Andorra", "Country Name")}, - {Code: "at", Name: p.GetC("Austria", "Country Name")}, - {Code: "be", Name: p.GetC("Belgium", "Country Name")}, + {Code: "ad", Name: p.GetC("Andorra", "Place Name")}, + {Code: "at", Name: p.GetC("Austria", "Place Name")}, + {Code: "be", Name: p.GetC("Belgium", "Place Name")}, /* TODO(2026): Add Bulgaria */ - /* {Code: "bg", Name: p.GetC("Bulgaria", "Country Name")}, */ - {Code: "cy", Name: p.GetC("Cyprus", "Country Name")}, - {Code: "de", Name: p.GetC("Germany", "Country Name")}, - {Code: "ee", Name: p.GetC("Estonia", "Country Name")}, - {Code: "es", Name: p.GetC("Spain", "Country Name")}, - {Code: "fi", Name: p.GetC("Finland", "Country Name")}, - {Code: "fr", Name: p.GetC("France", "Country Name")}, - {Code: "gr", Name: p.GetC("Greece", "Country Name")}, - {Code: "hr", Name: p.GetC("Croatia", "Country Name")}, - {Code: "ie", Name: p.GetC("Ireland", "Country Name")}, - {Code: "it", Name: p.GetC("Italy", "Country Name")}, - {Code: "lt", Name: p.GetC("Lithuania", "Country Name")}, - {Code: "lu", Name: p.GetC("Luxembourg", "Country Name")}, - {Code: "lv", Name: p.GetC("Latvia", "Country Name")}, - {Code: "mc", Name: p.GetC("Monaco", "Country Name")}, - {Code: "mt", Name: p.GetC("Malta", "Country Name")}, - {Code: "nl", Name: p.GetC("Netherlands", "Country Name")}, - {Code: "pt", Name: p.GetC("Portugal", "Country Name")}, - {Code: "si", Name: p.GetC("Slovenia", "Country Name")}, - {Code: "sk", Name: p.GetC("Slovakia", "Country Name")}, - {Code: "sm", Name: p.GetC("San Marino", "Country Name")}, - {Code: "va", Name: p.GetC("Vatican City", "Country Name")}, + /* {Code: "bg", Name: p.GetC("Bulgaria", "Place Name")}, */ + {Code: "cy", Name: p.GetC("Cyprus", "Place Name")}, + {Code: "de", Name: p.GetC("Germany", "Place Name")}, + {Code: "ee", Name: p.GetC("Estonia", "Place Name")}, + {Code: "es", Name: p.GetC("Spain", "Place Name")}, + {Code: "fi", Name: p.GetC("Finland", "Place Name")}, + {Code: "fr", Name: p.GetC("France", "Place Name")}, + {Code: "gr", Name: p.GetC("Greece", "Place Name")}, + {Code: "hr", Name: p.GetC("Croatia", "Place Name")}, + {Code: "ie", Name: p.GetC("Ireland", "Place Name")}, + {Code: "it", Name: p.GetC("Italy", "Place Name")}, + {Code: "lt", Name: p.GetC("Lithuania", "Place Name")}, + {Code: "lu", Name: p.GetC("Luxembourg", "Place Name")}, + {Code: "lv", Name: p.GetC("Latvia", "Place Name")}, + {Code: "mc", Name: p.GetC("Monaco", "Place Name")}, + {Code: "mt", Name: p.GetC("Malta", "Place Name")}, + {Code: "nl", Name: p.GetC("Netherlands", "Place Name")}, + {Code: "pt", Name: p.GetC("Portugal", "Place Name")}, + {Code: "si", Name: p.GetC("Slovenia", "Place Name")}, + {Code: "sk", Name: p.GetC("Slovakia", "Place Name")}, + {Code: "sm", Name: p.GetC("San Marino", "Place Name")}, + {Code: "va", Name: p.GetC("Vatican City", "Place Name")}, } c := collate.New(language.MustParse(p.Bcp)) slices.SortFunc(xs, func(x, y country) int { diff --git a/src/templates/banknotes-codes.html.tmpl b/src/templates/banknotes-codes.html.tmpl index fcbad40..b86ca4e 100644 --- a/src/templates/banknotes-codes.html.tmpl +++ b/src/templates/banknotes-codes.html.tmpl @@ -62,67 +62,67 @@ D - {{ .GetC "Estonia" "Country Name" }} + {{ .GetC "Estonia" "Place Name" }} E - {{ .GetC "Slovakia" "Country Name" }} + {{ .GetC "Slovakia" "Place Name" }} F - {{ .GetC "Malta" "Country Name" }} + {{ .GetC "Malta" "Place Name" }} G - {{ .GetC "Cyprus" "Country Name" }} + {{ .GetC "Cyprus" "Place Name" }} H - {{ .GetC "Slovenia" "Country Name" }} + {{ .GetC "Slovenia" "Place Name" }} L - {{ .GetC "Finland" "Country Name" }} + {{ .GetC "Finland" "Place Name" }} M - {{ .GetC "Portugal" "Country Name" }} + {{ .GetC "Portugal" "Place Name" }} N - {{ .GetC "Austria" "Country Name" }} + {{ .GetC "Austria" "Place Name" }} P - {{ .GetC "Netherlands" "Country Name" }} + {{ .GetC "Netherlands" "Place Name" }} S - {{ .GetC "Italy" "Country Name" }} + {{ .GetC "Italy" "Place Name" }} T - {{ .GetC "Ireland" "Country Name" }} + {{ .GetC "Ireland" "Place Name" }} U - {{ .GetC "France" "Country Name" }} + {{ .GetC "France" "Place Name" }} V - {{ .GetC "Spain" "Country Name" }} + {{ .GetC "Spain" "Place Name" }} X - {{ .GetC "Germany" "Country Name" }} + {{ .GetC "Germany" "Place Name" }} Y - {{ .GetC "Greece" "Country Name" }} + {{ .GetC "Greece" "Place Name" }} Z - {{ .GetC "Belgium" "Country Name" }} + {{ .GetC "Belgium" "Place Name" }} @@ -142,17 +142,17 @@ D - {{ .GetC "Finland" "Country Name" }} + {{ .GetC "Finland" "Place Name" }} SETEC E - {{ .GetC "France" "Country Name" }} + {{ .GetC "France" "Place Name" }} Oberthur F - {{ .GetC "Austria" "Country Name" }} + {{ .GetC "Austria" "Place Name" }} Österreichische Banknoten- und Sicherheitsdruck GmbH @@ -161,57 +161,57 @@ G - {{ .GetC "Netherlands" "Country Name" }} + {{ .GetC "Netherlands" "Place Name" }} Koninklijke Joh. Enschedé H - {{ .GetC "United Kingdom" "Country Name" }} + {{ .GetC "United Kingdom" "Place Name" }} De La Rue J - {{ .GetC "Italy" "Country Name" }} + {{ .GetC "Italy" "Place Name" }} {{ .Get "Bank of Italy" }} K - {{ .GetC "Ireland" "Country Name" }} + {{ .GetC "Ireland" "Place Name" }} {{ .Get "Central Bank of Ireland" }} L - {{ .GetC "France" "Country Name" }} + {{ .GetC "France" "Place Name" }} {{ .Get "Bank of France" }} M - {{ .GetC "Spain" "Country Name" }} + {{ .GetC "Spain" "Place Name" }} {{ .Get "Royal Mint of Spain" }} N - {{ .GetC "Greece" "Country Name" }} + {{ .GetC "Greece" "Place Name" }} {{ .Get "Bank of Greece" }} P - {{ .GetC "Germany" "Country Name" }} + {{ .GetC "Germany" "Place Name" }} Giesecke+Devrient GmbH R - {{ .GetC "Germany" "Country Name" }} + {{ .GetC "Germany" "Place Name" }} Bundesdruckerei GmbH T - {{ .GetC "Belgium" "Country Name" }} + {{ .GetC "Belgium" "Place Name" }} {{ .Get "National Bank of Belgium" }} U - {{ .GetC "Portugal" "Country Name" }} + {{ .GetC "Portugal" "Place Name" }} Valora S.A. @@ -231,22 +231,22 @@ E - {{ .GetC "France" "Country Name" }} + {{ .GetC "France" "Place Name" }} Oberthur F - {{ .GetC "Bulgaria" "Country Name" }} + {{ .GetC "Bulgaria" "Place Name" }} Oberthur Fiduciaire AD M - {{ .GetC "Portugal" "Country Name" }} + {{ .GetC "Portugal" "Place Name" }} Valora S.A. N - {{ .GetC "Austria" "Country Name" }} + {{ .GetC "Austria" "Place Name" }} Österreichische Banknoten- und Sicherheitsdruck GmbH @@ -255,52 +255,52 @@ P - {{ .GetC "Netherlands" "Country Name" }} + {{ .GetC "Netherlands" "Place Name" }} Koninklijke Joh. Enschedé R - {{ .GetC "Germany" "Country Name" }} + {{ .GetC "Germany" "Place Name" }} Bundesdruckerei GmbH S - {{ .GetC "Italy" "Country Name" }} + {{ .GetC "Italy" "Place Name" }} {{ .Get "Bank of Italy" }} T - {{ .GetC "Ireland" "Country Name" }} + {{ .GetC "Ireland" "Place Name" }} {{ .Get "Central Bank of Ireland" }} U - {{ .GetC "France" "Country Name" }} + {{ .GetC "France" "Place Name" }} {{ .Get "Bank of France" }} V - {{ .GetC "Spain" "Country Name" }} + {{ .GetC "Spain" "Place Name" }} {{ .Get "Royal Mint of Spain" }} W - {{ .GetC "Germany" "Country Name" }} + {{ .GetC "Germany" "Place Name" }} Giesecke+Devrient GmbH {{ .Get "Leipzig" }} X - {{ .GetC "Germany" "Country Name" }} + {{ .GetC "Germany" "Place Name" }} Giesecke+Devrient GmbH {{ .Get "Munich" }} Y - {{ .GetC "Greece" "Country Name" }} + {{ .GetC "Greece" "Place Name" }} {{ .Get "Bank of Greece" }} Z - {{ .GetC "Belgium" "Country Name" }} + {{ .GetC "Belgium" "Place Name" }} {{ .Get "National Bank of Belgium" }} diff --git a/src/templates/coins-designs-de.html.tmpl b/src/templates/coins-designs-de.html.tmpl index ef4cd62..0a7b677 100644 --- a/src/templates/coins-designs-de.html.tmpl +++ b/src/templates/coins-designs-de.html.tmpl @@ -28,23 +28,23 @@ - {{ .Get "Berlin" }} + {{ .GetC "Berlin" "Place Name" }} A - {{ .Get "Munich" }} + {{ .GetC "Munich" "Place Name" }} D - {{ .Get "Stuttgart" }} + {{ .GetC "Stuttgart" "Place Name" }} F - {{ .Get "Karlsruhe" }} + {{ .GetC "Karlsruhe" "Place Name" }} G - {{ .Get "Hamburg" }} + {{ .GetC "Hamburg" "Place Name" }} J -- cgit v1.2.3