Attachment 61031 Details for Bug 14608 – Bug 14608: Move country list to an include file

[patch] Bug 14608: Move country list to an include file

Bug-14608-Move-country-list-to-an-include-file.patch (text/plain), 6.67 KB, created by Jonathan Druart on 2017-03-13 12:21:21 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jonathan Druart

Created: 2017-03-13 12:21:21 UTC

Size: 6.67 KB

patch

obsolete

>From 552a90f8888e77b719303ee2c2d519890d05457c Mon Sep 17 00:00:00 2001
>From: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
>Date: Sun, 12 Mar 2017 19:54:58 -0300
>Subject: [PATCH] Bug 14608: Move country list to an include file
>
>---
> .../prog/en/includes/country-list.inc              | 196 ++++++++++++++++++++
> .../prog/en/modules/admin/usage_statistics.tt      | 198 +--------------------
> 2 files changed, 198 insertions(+), 196 deletions(-)
> create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/country-list.inc
>
>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
>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
>--- 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 %]
>-- 
>2.1.4

Actions: View | Diff | Splinter Review

Attachments on bug 14608: 41212 | 41213 | 41712 | 41713 | 55773 | 58340 | 58341 | 58342 | 58968 | 58969 | 58970 | 58971 | 59949 | 59950 | 59951 | 59952 | 61031 | 61201 | 61202 | 61203 | 61204 | 61205