From 717aa603b60155a5ea3e54f60e454e2118f9a2a3 Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Thu, 23 Jan 2025 14:29:38 +0100 Subject: [PATCH] Bug 36163: Chomp country list I found the same code in preferences.tt, actually we don't need to trim if the list is properly generated (ie. without extra spaces) --- .../prog/en/includes/country-list.inc | 392 +++++++++--------- .../prog/en/modules/admin/preferences.tt | 6 +- .../prog/en/modules/admin/usage_statistics.tt | 1 - 3 files changed, 199 insertions(+), 200 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/country-list.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/country-list.inc index 7f9d6480a79..a653affeb17 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/country-list.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/country-list.inc @@ -1,196 +1,196 @@ -[% country_strings = BLOCK %] - [% t("Afghanistan") | html %], - [% t("Albania") | html %], - [% t("Algeria") | html %], - [% t("Andorra") | html %], - [% t("Angola") | html %], - [% t("Antigua & Deps") | html %], - [% t("Argentina") | html %], - [% t("Armenia") | html %], - [% t("Australia") | html %], - [% t("Austria") | html %], - [% t("Azerbaijan") | html %], - [% t("Bahamas") | html %], - [% t("Bahrain") | html %], - [% t("Bangladesh") | html %], - [% t("Barbados") | html %], - [% t("Belarus") | html %], - [% t("Belgium") | html %], - [% t("Belize") | html %], - [% t("Benin") | html %], - [% t("Bhutan") | html %], - [% t("Bolivia") | html %], - [% t("Bosnia Herz.") | html %], - [% t("Botswana") | html %], - [% t("Brazil") | html %], - [% t("Brunei") | html %], - [% t("Bulgaria") | html %], - [% t("Burkina") | html %], - [% t("Burundi") | html %], - [% t("Cambodia") | html %], - [% t("Cameroon") | html %], - [% t("Canada") | html %], - [% t("Cape Verde") | html %], - [% t("Centr. Afr. Rep") | html %], - [% t("Chad") | html %], - [% t("Chile") | html %], - [% t("China") | html %], - [% t("Colombia") | html %], - [% t("Comoros") | html %], - [% t("Congo") | html %], - [% t("Costa Rica") | html %], - [% t("Croatia") | html %], - [% t("Cuba") | html %], - [% t("Cyprus") | html %], - [% t("Czech Republic") | html %], - [% t("Denmark") | html %], - [% t("Djibouti") | html %], - [% t("Dominica") | html %], - [% t("Dominican Rep.") | html %], - [% t("East Timor") | html %], - [% t("Ecuador") | html %], - [% t("Egypt") | html %], - [% t("El Salvador") | html %], - [% t("Equator. Guinea") | html %], - [% t("Eritrea") | html %], - [% t("Estonia") | html %], - [% t("Ethiopia") | html %], - [% t("Fiji") | html %], - [% t("Finland") | html %], - [% t("France") | html %], - [% t("Gabon") | html %], - [% t("Gambia") | html %], - [% t("Georgia") | html %], - [% t("Germany") | html %], - [% t("Ghana") | html %], - [% t("Greece") | html %], - [% t("Grenada") | html %], - [% t("Guatemala") | html %], - [% t("Guinea") | html %], - [% t("Guinea-Bissau") | html %], - [% t("Guyana") | html %], - [% t("Haiti") | html %], - [% t("Honduras") | html %], - [% t("Hungary") | html %], - [% t("Iceland") | html %], - [% t("India") | html %], - [% t("Indonesia") | html %], - [% t("Iran") | html %], - [% t("Iraq") | html %], - [% t("Ireland") | html %], - [% t("Israel") | html %], - [% t("Italy") | html %], - [% t("Ivory Coast") | html %], - [% t("Jamaica") | html %], - [% t("Japan") | html %], - [% t("Jordan") | html %], - [% t("Kazakhstan") | html %], - [% t("Kenya") | html %], - [% t("Kiribati") | html %], - [% t("Korea North") | html %], - [% t("Korea South") | html %], - [% t("Kosovo") | html %], - [% t("Kuwait") | html %], - [% t("Kyrgyzstan") | html %], - [% t("Laos") | html %], - [% t("Latvia") | html %], - [% t("Lebanon") | html %], - [% t("Lesotho") | html %], - [% t("Liberia") | html %], - [% t("Libya") | html %], - [% t("Liechtenstein") | html %], - [% t("Lithuania") | html %], - [% t("Luxembourg") | html %], - [% t("Macedonia") | html %], - [% t("Madagascar") | html %], - [% t("Malawi") | html %], - [% t("Malaysia") | html %], - [% t("Maldives") | html %], - [% t("Mali") | html %], - [% t("Malta") | html %], - [% t("Marshall Isl.") | html %], - [% t("Mauritania") | html %], - [% t("Mauritius") | html %], - [% t("Mexico") | html %], - [% t("Micronesia") | html %], - [% t("Moldova") | html %], - [% t("Monaco") | html %], - [% t("Mongolia") | html %], - [% t("Montenegro") | html %], - [% t("Morocco") | html %], - [% t("Mozambique") | html %], - [% t("Myanmar") | html %], - [% t("Namibia") | html %], - [% t("Nauru") | html %], - [% t("Nepal") | html %], - [% t("Netherlands") | html %], - [% t("New Zealand") | html %], - [% t("Nicaragua") | html %], - [% t("Niger") | html %], - [% t("Nigeria") | html %], - [% t("Norway") | html %], - [% t("Oman") | html %], - [% t("Pakistan") | html %], - [% t("Palau") | html %], - [% t("Panama") | html %], - [% t("Papua N. Guinea") | html %], - [% t("Paraguay") | html %], - [% t("Peru") | html %], - [% t("Philippines") | html %], - [% t("Poland") | html %], - [% t("Portugal") | html %], - [% t("Qatar") | html %], - [% t("Romania") | html %], - [% t("Russian Fed.") | html %], - [% t("Rwanda") | html %], - [% t("St Kitts & Nev.") | html %], - [% t("St Lucia") | html %], - [% t("Saint Vincent") | html %], - [% t("Samoa") | html %], - [% t("San Marino") | html %], - [% t("Sao Tome") | html %], - [% t("Saudi Arabia") | html %], - [% t("Senegal") | html %], - [% t("Serbia") | html %], - [% t("Seychelles") | html %], - [% t("Sierra Leone") | html %], - [% t("Singapore") | html %], - [% t("Slovakia") | html %], - [% t("Slovenia") | html %], - [% t("Solomon Islands") | html %], - [% t("Somalia") | html %], - [% t("South Africa") | html %], - [% t("Spain") | html %], - [% t("Sri Lanka") | html %], - [% t("Sudan") | html %], - [% t("Suriname") | html %], - [% t("Swaziland") | html %], - [% t("Sweden") | html %], - [% t("Switzerland") | html %], - [% t("Syria") | html %], - [% t("Taiwan") | html %], - [% t("Tajikistan") | html %], - [% t("Tanzania") | html %], - [% t("Thailand") | html %], - [% t("Togo") | html %], - [% t("Tonga") | html %], - [% t("Trinidad & Tob.") | html %], - [% t("Tunisia") | html %], - [% t("Turkey") | html %], - [% t("Turkmenistan") | html %], - [% t("Tuvalu") | html %], - [% t("Uganda") | html %], - [% t("Ukraine") | html %], - [% t("UAE") | html %], - [% t("United Kingdom") | html %], - [% t("USA") | html %], - [% t("Uruguay") | html %], - [% t("Uzbekistan") | html %], - [% t("Vanuatu") | html %], - [% t("Vatican City") | html %], - [% t("Venezuela") | html %], - [% t("Vietnam") | html %], - [% t("Yemen") | html %], - [% t("Zambia") | html %], - [% t("Zimbabwe") | html %] -[% END %] +[%~ country_strings = BLOCK ~%] + [%~ t("Afghanistan") | html ~%], + [%~ t("Albania") | html ~%], + [%~ t("Algeria") | html ~%], + [%~ t("Andorra") | html ~%], + [%~ t("Angola") | html ~%], + [%~ t("Antigua & Deps") | html ~%], + [%~ t("Argentina") | html ~%], + [%~ t("Armenia") | html ~%], + [%~ t("Australia") | html ~%], + [%~ t("Austria") | html ~%], + [%~ t("Azerbaijan") | html ~%], + [%~ t("Bahamas") | html ~%], + [%~ t("Bahrain") | html ~%], + [%~ t("Bangladesh") | html ~%], + [%~ t("Barbados") | html ~%], + [%~ t("Belarus") | html ~%], + [%~ t("Belgium") | html ~%], + [%~ t("Belize") | html ~%], + [%~ t("Benin") | html ~%], + [%~ t("Bhutan") | html ~%], + [%~ t("Bolivia") | html ~%], + [%~ t("Bosnia Herz.") | html ~%], + [%~ t("Botswana") | html ~%], + [%~ t("Brazil") | html ~%], + [%~ t("Brunei") | html ~%], + [%~ t("Bulgaria") | html ~%], + [%~ t("Burkina") | html ~%], + [%~ t("Burundi") | html ~%], + [%~ t("Cambodia") | html ~%], + [%~ t("Cameroon") | html ~%], + [%~ t("Canada") | html ~%], + [%~ t("Cape Verde") | html ~%], + [%~ t("Centr. Afr. Rep") | html ~%], + [%~ t("Chad") | html ~%], + [%~ t("Chile") | html ~%], + [%~ t("China") | html ~%], + [%~ t("Colombia") | html ~%], + [%~ t("Comoros") | html ~%], + [%~ t("Congo") | html ~%], + [%~ t("Costa Rica") | html ~%], + [%~ t("Croatia") | html ~%], + [%~ t("Cuba") | html ~%], + [%~ t("Cyprus") | html ~%], + [%~ t("Czech Republic") | html ~%], + [%~ t("Denmark") | html ~%], + [%~ t("Djibouti") | html ~%], + [%~ t("Dominica") | html ~%], + [%~ t("Dominican Rep.") | html ~%], + [%~ t("East Timor") | html ~%], + [%~ t("Ecuador") | html ~%], + [%~ t("Egypt") | html ~%], + [%~ t("El Salvador") | html ~%], + [%~ t("Equator. Guinea") | html ~%], + [%~ t("Eritrea") | html ~%], + [%~ t("Estonia") | html ~%], + [%~ t("Ethiopia") | html ~%], + [%~ t("Fiji") | html ~%], + [%~ t("Finland") | html ~%], + [%~ t("France") | html ~%], + [%~ t("Gabon") | html ~%], + [%~ t("Gambia") | html ~%], + [%~ t("Georgia") | html ~%], + [%~ t("Germany") | html ~%], + [%~ t("Ghana") | html ~%], + [%~ t("Greece") | html ~%], + [%~ t("Grenada") | html ~%], + [%~ t("Guatemala") | html ~%], + [%~ t("Guinea") | html ~%], + [%~ t("Guinea-Bissau") | html ~%], + [%~ t("Guyana") | html ~%], + [%~ t("Haiti") | html ~%], + [%~ t("Honduras") | html ~%], + [%~ t("Hungary") | html ~%], + [%~ t("Iceland") | html ~%], + [%~ t("India") | html ~%], + [%~ t("Indonesia") | html ~%], + [%~ t("Iran") | html ~%], + [%~ t("Iraq") | html ~%], + [%~ t("Ireland") | html ~%], + [%~ t("Israel") | html ~%], + [%~ t("Italy") | html ~%], + [%~ t("Ivory Coast") | html ~%], + [%~ t("Jamaica") | html ~%], + [%~ t("Japan") | html ~%], + [%~ t("Jordan") | html ~%], + [%~ t("Kazakhstan") | html ~%], + [%~ t("Kenya") | html ~%], + [%~ t("Kiribati") | html ~%], + [%~ t("Korea North") | html ~%], + [%~ t("Korea South") | html ~%], + [%~ t("Kosovo") | html ~%], + [%~ t("Kuwait") | html ~%], + [%~ t("Kyrgyzstan") | html ~%], + [%~ t("Laos") | html ~%], + [%~ t("Latvia") | html ~%], + [%~ t("Lebanon") | html ~%], + [%~ t("Lesotho") | html ~%], + [%~ t("Liberia") | html ~%], + [%~ t("Libya") | html ~%], + [%~ t("Liechtenstein") | html ~%], + [%~ t("Lithuania") | html ~%], + [%~ t("Luxembourg") | html ~%], + [%~ t("Macedonia") | html ~%], + [%~ t("Madagascar") | html ~%], + [%~ t("Malawi") | html ~%], + [%~ t("Malaysia") | html ~%], + [%~ t("Maldives") | html ~%], + [%~ t("Mali") | html ~%], + [%~ t("Malta") | html ~%], + [%~ t("Marshall Isl.") | html ~%], + [%~ t("Mauritania") | html ~%], + [%~ t("Mauritius") | html ~%], + [%~ t("Mexico") | html ~%], + [%~ t("Micronesia") | html ~%], + [%~ t("Moldova") | html ~%], + [%~ t("Monaco") | html ~%], + [%~ t("Mongolia") | html ~%], + [%~ t("Montenegro") | html ~%], + [%~ t("Morocco") | html ~%], + [%~ t("Mozambique") | html ~%], + [%~ t("Myanmar") | html ~%], + [%~ t("Namibia") | html ~%], + [%~ t("Nauru") | html ~%], + [%~ t("Nepal") | html ~%], + [%~ t("Netherlands") | html ~%], + [%~ t("New Zealand") | html ~%], + [%~ t("Nicaragua") | html ~%], + [%~ t("Niger") | html ~%], + [%~ t("Nigeria") | html ~%], + [%~ t("Norway") | html ~%], + [%~ t("Oman") | html ~%], + [%~ t("Pakistan") | html ~%], + [%~ t("Palau") | html ~%], + [%~ t("Panama") | html ~%], + [%~ t("Papua N. Guinea") | html ~%], + [%~ t("Paraguay") | html ~%], + [%~ t("Peru") | html ~%], + [%~ t("Philippines") | html ~%], + [%~ t("Poland") | html ~%], + [%~ t("Portugal") | html ~%], + [%~ t("Qatar") | html ~%], + [%~ t("Romania") | html ~%], + [%~ t("Russian Fed.") | html ~%], + [%~ t("Rwanda") | html ~%], + [%~ t("St Kitts & Nev.") | html ~%], + [%~ t("St Lucia") | html ~%], + [%~ t("Saint Vincent") | html ~%], + [%~ t("Samoa") | html ~%], + [%~ t("San Marino") | html ~%], + [%~ t("Sao Tome") | html ~%], + [%~ t("Saudi Arabia") | html ~%], + [%~ t("Senegal") | html ~%], + [%~ t("Serbia") | html ~%], + [%~ t("Seychelles") | html ~%], + [%~ t("Sierra Leone") | html ~%], + [%~ t("Singapore") | html ~%], + [%~ t("Slovakia") | html ~%], + [%~ t("Slovenia") | html ~%], + [%~ t("Solomon Islands") | html ~%], + [%~ t("Somalia") | html ~%], + [%~ t("South Africa") | html ~%], + [%~ t("Spain") | html ~%], + [%~ t("Sri Lanka") | html ~%], + [%~ t("Sudan") | html ~%], + [%~ t("Suriname") | html ~%], + [%~ t("Swaziland") | html ~%], + [%~ t("Sweden") | html ~%], + [%~ t("Switzerland") | html ~%], + [%~ t("Syria") | html ~%], + [%~ t("Taiwan") | html ~%], + [%~ t("Tajikistan") | html ~%], + [%~ t("Tanzania") | html ~%], + [%~ t("Thailand") | html ~%], + [%~ t("Togo") | html ~%], + [%~ t("Tonga") | html ~%], + [%~ t("Trinidad & Tob.") | html ~%], + [%~ t("Tunisia") | html ~%], + [%~ t("Turkey") | html ~%], + [%~ t("Turkmenistan") | html ~%], + [%~ t("Tuvalu") | html ~%], + [%~ t("Uganda") | html ~%], + [%~ t("Ukraine") | html ~%], + [%~ t("UAE") | html ~%], + [%~ t("United Kingdom") | html ~%], + [%~ t("USA") | html ~%], + [%~ t("Uruguay") | html ~%], + [%~ t("Uzbekistan") | html ~%], + [%~ t("Vanuatu") | html ~%], + [%~ t("Vatican City") | html ~%], + [%~ t("Venezuela") | html ~%], + [%~ t("Vietnam") | html ~%], + [%~ t("Yemen") | html ~%], + [%~ t("Zambia") | html ~%], + [%~ t("Zimbabwe") | html ~%] +[%~ END ~%] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences.tt index f682965e820..c972d88bbd7 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences.tt @@ -212,10 +212,10 @@ diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/usage_statistics.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/usage_statistics.tt index a6a0a8578f2..ad7c400b16b 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/usage_statistics.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/usage_statistics.tt @@ -100,7 +100,6 @@