Bug 14608: Move country list to an include file

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>

Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>
(cherry picked from commit 6b626b64944dff0ba0adff99da26e3bbe8eb7544)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/country-list.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/country-list.inc
new file mode 100644 (file)
index 0000000..30d44e5
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/country-list.inc
@@ -0,0 +1,196 @@
+[% SET countries = [
+"Afghanistan",
+"Albania",
+"Algeria",
+"Andorra",
+"Angola",
+"Antigua & Deps",
+"Argentina",
+"Armenia",
+"Australia",
+"Austria",
+"Azerbaijan",
+"Bahamas",
+"Bahrain",
+"Bangladesh",
+"Barbados",
+"Belarus",
+"Belgium",
+"Belize",
+"Benin",
+"Bhutan",
+"Bolivia",
+"Bosnia Herz.",
+"Botswana",
+"Brazil",
+"Brunei",
+"Bulgaria",
+"Burkina",
+"Burundi",
+"Cambodia",
+"Cameroon",
+"Canada",
+"Cape Verde",
+"Centr. Afr. Rep",
+"Chad",
+"Chile",
+"China",
+"Colombia",
+"Comoros",
+"Congo",
+"Costa Rica",
+"Croatia",
+"Cuba",
+"Cyprus",
+"Czech Republic",
+"Denmark",
+"Djibouti",
+"Dominica",
+"Dominican Rep.",
+"East Timor",
+"Ecuador",
+"Egypt",
+"El Salvador",
+"Equator. Guinea",
+"Eritrea",
+"Estonia",
+"Ethiopia",
+"Fiji",
+"Finland",
+"France",
+"Gabon",
+"Gambia",
+"Georgia",
+"Germany",
+"Ghana",
+"Greece",
+"Grenada",
+"Guatemala",
+"Guinea",
+"Guinea-Bissau",
+"Guyana",
+"Haiti",
+"Honduras",
+"Hungary",
+"Iceland",
+"India",
+"Indonesia",
+"Iran",
+"Iraq",
+"Ireland",
+"Israel",
+"Italy",
+"Ivory Coast",
+"Jamaica",
+"Japan",
+"Jordan",
+"Kazakhstan",
+"Kenya",
+"Kiribati",
+"Korea North",
+"Korea South",
+"Kosovo",
+"Kuwait",
+"Kyrgyzstan",
+"Laos",
+"Latvia",
+"Lebanon",
+"Lesotho",
+"Liberia",
+"Libya",
+"Liechtenstein",
+"Lithuania",
+"Luxembourg",
+"Macedonia",
+"Madagascar",
+"Malawi",
+"Malaysia",
+"Maldives",
+"Mali",
+"Malta",
+"Marshall Isl.",
+"Mauritania",
+"Mauritius",
+"Mexico",
+"Micronesia",
+"Moldova",
+"Monaco",
+"Mongolia",
+"Montenegro",
+"Morocco",
+"Mozambique",
+"Myanmar",
+"Namibia",
+"Nauru",
+"Nepal",
+"Netherlands",
+"New Zealand",
+"Nicaragua",
+"Niger",
+"Nigeria",
+"Norway",
+"Oman",
+"Pakistan",
+"Palau",
+"Panama",
+"Papua N. Guinea",
+"Paraguay",
+"Peru",
+"Philippines",
+"Poland",
+"Portugal",
+"Qatar",
+"Romania",
+"Russian Fed.",
+"Rwanda",
+"St Kitts & Nev.",
+"St Lucia",
+"Saint Vincent",
+"Samoa",
+"San Marino",
+"Sao Tome",
+"Saudi Arabia",
+"Senegal",
+"Serbia",
+"Seychelles",
+"Sierra Leone",
+"Singapore",
+"Slovakia",
+"Slovenia",
+"Solomon Islands",
+"Somalia",
+"South Africa",
+"Spain",
+"Sri Lanka",
+"Sudan",
+"Suriname",
+"Swaziland",
+"Sweden",
+"Switzerland",
+"Syria",
+"Taiwan",
+"Tajikistan",
+"Tanzania",
+"Thailand",
+"Togo",
+"Tonga",
+"Trinidad & Tob.",
+"Tunisia",
+"Turkey",
+"Turkmenistan",
+"Tuvalu",
+"Uganda",
+"Ukraine",
+"UAE",
+"United Kingdom",
+"USA",
+"Uruguay",
+"Uzbekistan",
+"Vanuatu",
+"Vatican City",
+"Venezuela",
+"Vietnam",
+"Yemen",
+"Zambia",
+"Zimbabwe",
+] %]

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 5da2693..2850dfd 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/usage_statistics.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/usage_statistics.tt
@@ -68,204 +68,10 @@
                     [% IF NOT UsageStatsCountry %]
                         [% SET IsUsageStatsCountryValid = 1 %]
                     [% END %]
+                    [% PROCESS 'country-list.inc' %]
                     <select name="UsageStatsCountry" id="UsageStatsCountry">
                         <option value="">&nbsp;</option>
-                        [% FOR country IN [
-"Afghanistan",
-"Albania",
-"Algeria",
-"Andorra",
-"Angola",
-"Antigua & Deps",
-"Argentina",
-"Armenia",
-"Australia",
-"Austria",
-"Azerbaijan",
-"Bahamas",
-"Bahrain",
-"Bangladesh",
-"Barbados",
-"Belarus",
-"Belgium",
-"Belize",
-"Benin",
-"Bhutan",
-"Bolivia",
-"Bosnia Herz.",
-"Botswana",
-"Brazil",
-"Brunei",
-"Bulgaria",
-"Burkina",
-"Burundi",
-"Cambodia",
-"Cameroon",
-"Canada",
-"Cape Verde",
-"Centr. Afr. Rep",
-"Chad",
-"Chile",
-"China",
-"Colombia",
-"Comoros",
-"Congo",
-"Costa Rica",
-"Croatia",
-"Cuba",
-"Cyprus",
-"Czech Republic",
-"Denmark",
-"Djibouti",
-"Dominica",
-"Dominican Rep.",
-"East Timor",
-"Ecuador",
-"Egypt",
-"El Salvador",
-"Equator. Guinea",
-"Eritrea",
-"Estonia",
-"Ethiopia",
-"Fiji",
-"Finland",
-"France",
-"Gabon",
-"Gambia",
-"Georgia",
-"Germany",
-"Ghana",
-"Greece",
-"Grenada",
-"Guatemala",
-"Guinea",
-"Guinea-Bissau",
-"Guyana",
-"Haiti",
-"Honduras",
-"Hungary",
-"Iceland",
-"India",
-"Indonesia",
-"Iran",
-"Iraq",
-"Ireland",
-"Israel",
-"Italy",
-"Ivory Coast",
-"Jamaica",
-"Japan",
-"Jordan",
-"Kazakhstan",
-"Kenya",
-"Kiribati",
-"Korea North",
-"Korea South",
-"Kosovo",
-"Kuwait",
-"Kyrgyzstan",
-"Laos",
-"Latvia",
-"Lebanon",
-"Lesotho",
-"Liberia",
-"Libya",
-"Liechtenstein",
-"Lithuania",
-"Luxembourg",
-"Macedonia",
-"Madagascar",
-"Malawi",
-"Malaysia",
-"Maldives",
-"Mali",
-"Malta",
-"Marshall Isl.",
-"Mauritania",
-"Mauritius",
-"Mexico",
-"Micronesia",
-"Moldova",
-"Monaco",
-"Mongolia",
-"Montenegro",
-"Morocco",
-"Mozambique",
-"Myanmar",
-"Namibia",
-"Nauru",
-"Nepal",
-"Netherlands",
-"New Zealand",
-"Nicaragua",
-"Niger",
-"Nigeria",
-"Norway",
-"Oman",
-"Pakistan",
-"Palau",
-"Panama",
-"Papua N. Guinea",
-"Paraguay",
-"Peru",
-"Philippines",
-"Poland",
-"Portugal",
-"Qatar",
-"Romania",
-"Russian Fed.",
-"Rwanda",
-"St Kitts & Nev.",
-"St Lucia",
-"Saint Vincent",
-"Samoa",
-"San Marino",
-"Sao Tome",
-"Saudi Arabia",
-"Senegal",
-"Serbia",
-"Seychelles",
-"Sierra Leone",
-"Singapore",
-"Slovakia",
-"Slovenia",
-"Solomon Islands",
-"Somalia",
-"South Africa",
-"Spain",
-"Sri Lanka",
-"Sudan",
-"Suriname",
-"Swaziland",
-"Sweden",
-"Switzerland",
-"Syria",
-"Taiwan",
-"Tajikistan",
-"Tanzania",
-"Thailand",
-"Togo",
-"Tonga",
-"Trinidad & Tob.",
-"Tunisia",
-"Turkey",
-"Turkmenistan",
-"Tuvalu",
-"Uganda",
-"Ukraine",
-"UAE",
-"United Kingdom",
-"USA",
-"Uruguay",
-"Uzbekistan",
-"Vanuatu",
-"Vatican City",
-"Venezuela",
-"Vietnam",
-"Yemen",
-"Zambia",
-"Zimbabwe",
-] %]
+                        [% FOR country IN countries %]
                             [% IF country == UsageStatsCountry %]
                                 <option value="[% country %]" selected="selected">[% country %]</option>
                                 [% SET IsUsageStatsCountryValid = 1 %]