From caea1567cc978e03ec594faac92e8f48d6ae1326 Mon Sep 17 00:00:00 2001
From: "max.mehl" <max.mehl@fsfe.org>
Date: Thu, 14 Sep 2017 22:11:27 +0200
Subject: [PATCH 01/10] Use all sovereign countries for country selector in
 form

---
 site/data/countries/countries.json            | 982 ++++++++++++++++++
 .../layouts/partials/functions/sign-form.html |  33 +-
 2 files changed, 986 insertions(+), 29 deletions(-)
 create mode 100644 site/data/countries/countries.json

diff --git a/site/data/countries/countries.json b/site/data/countries/countries.json
new file mode 100644
index 0000000..a98d835
--- /dev/null
+++ b/site/data/countries/countries.json
@@ -0,0 +1,982 @@
+[
+  {
+    "name": "Afghanistan",
+    "genc2a": "AF",
+    "genc3a": "AFG"
+  },
+  {
+    "name": "Albania",
+    "genc2a": "AL",
+    "genc3a": "ALB"
+  },
+  {
+    "name": "Algeria",
+    "genc2a": "DZ",
+    "genc3a": "DZA"
+  },
+  {
+    "name": "Andorra",
+    "genc2a": "AD",
+    "genc3a": "AND"
+  },
+  {
+    "name": "Angola",
+    "genc2a": "AO",
+    "genc3a": "AGO"
+  },
+  {
+    "name": "Antigua and Barbuda",
+    "genc2a": "AG",
+    "genc3a": "ATG"
+  },
+  {
+    "name": "Argentina",
+    "genc2a": "AR",
+    "genc3a": "ARG"
+  },
+  {
+    "name": "Armenia",
+    "genc2a": "AM",
+    "genc3a": "ARM"
+  },
+  {
+    "name": "Australia",
+    "genc2a": "AU",
+    "genc3a": "AUS"
+  },
+  {
+    "name": "Austria",
+    "genc2a": "AT",
+    "genc3a": "AUT"
+  },
+  {
+    "name": "Azerbaijan",
+    "genc2a": "AZ",
+    "genc3a": "AZE"
+  },
+  {
+    "name": "Bahamas",
+    "genc2a": "BS",
+    "genc3a": "BHS"
+  },
+  {
+    "name": "Bahrain",
+    "genc2a": "BH",
+    "genc3a": "BHR"
+  },
+  {
+    "name": "Bangladesh",
+    "genc2a": "BD",
+    "genc3a": "BGD"
+  },
+  {
+    "name": "Barbados",
+    "genc2a": "BB",
+    "genc3a": "BRB"
+  },
+  {
+    "name": "Belarus",
+    "genc2a": "BY",
+    "genc3a": "BLR"
+  },
+  {
+    "name": "Belgium",
+    "genc2a": "BE",
+    "genc3a": "BEL"
+  },
+  {
+    "name": "Belize",
+    "genc2a": "BZ",
+    "genc3a": "BLZ"
+  },
+  {
+    "name": "Benin",
+    "genc2a": "BJ",
+    "genc3a": "BEN"
+  },
+  {
+    "name": "Bhutan",
+    "genc2a": "BT",
+    "genc3a": "BTN"
+  },
+  {
+    "name": "Bolivia",
+    "genc2a": "BO",
+    "genc3a": "BOL"
+  },
+  {
+    "name": "Bosnia and Herzegovina",
+    "genc2a": "BA",
+    "genc3a": "BIH"
+  },
+  {
+    "name": "Botswana",
+    "genc2a": "BW",
+    "genc3a": "BWA"
+  },
+  {
+    "name": "Brazil",
+    "genc2a": "BR",
+    "genc3a": "BRA"
+  },
+  {
+    "name": "Brunei",
+    "genc2a": "BN",
+    "genc3a": "BRN"
+  },
+  {
+    "name": "Bulgaria",
+    "genc2a": "BG",
+    "genc3a": "BGR"
+  },
+  {
+    "name": "Burkina Faso",
+    "genc2a": "BF",
+    "genc3a": "BFA"
+  },
+  {
+    "name": "Burma",
+    "genc2a": "MM",
+    "genc3a": "MMR"
+  },
+  {
+    "name": "Burundi",
+    "genc2a": "BI",
+    "genc3a": "BDI"
+  },
+  {
+    "name": "Cabo Verde",
+    "genc2a": "CV",
+    "genc3a": "CPV"
+  },
+  {
+    "name": "Cambodia",
+    "genc2a": "KH",
+    "genc3a": "KHM"
+  },
+  {
+    "name": "Cameroon",
+    "genc2a": "CM",
+    "genc3a": "CMR"
+  },
+  {
+    "name": "Canada",
+    "genc2a": "CA",
+    "genc3a": "CAN"
+  },
+  {
+    "name": "Central African Republic",
+    "genc2a": "CF",
+    "genc3a": "CAF"
+  },
+  {
+    "name": "Chad",
+    "genc2a": "TD",
+    "genc3a": "TCD"
+  },
+  {
+    "name": "Chile",
+    "genc2a": "CL",
+    "genc3a": "CHL"
+  },
+  {
+    "name": "China",
+    "genc2a": "CN",
+    "genc3a": "CHN"
+  },
+  {
+    "name": "Colombia",
+    "genc2a": "CO",
+    "genc3a": "COL"
+  },
+  {
+    "name": "Comoros",
+    "genc2a": "KM",
+    "genc3a": "COM"
+  },
+  {
+    "name": "Republic of the Congo",
+    "genc2a": "CG",
+    "genc3a": "COG"
+  },
+  {
+    "name": "Democratic Republic of the Congo",
+    "genc2a": "CD",
+    "genc3a": "COD"
+  },
+  {
+    "name": "Costa Rica",
+    "genc2a": "CR",
+    "genc3a": "CRI"
+  },
+  {
+    "name": "Côte d'Ivoire",
+    "genc2a": "CI",
+    "genc3a": "CIV"
+  },
+  {
+    "name": "Croatia",
+    "genc2a": "HR",
+    "genc3a": "HRV"
+  },
+  {
+    "name": "Cuba",
+    "genc2a": "CU",
+    "genc3a": "CUB"
+  },
+  {
+    "name": "Cyprus",
+    "genc2a": "CY",
+    "genc3a": "CYP"
+  },
+  {
+    "name": "Czech Republic",
+    "genc2a": "CZ",
+    "genc3a": "CZE"
+  },
+  {
+    "name": "Denmark",
+    "genc2a": "DK",
+    "genc3a": "DNK"
+  },
+  {
+    "name": "Djibouti",
+    "genc2a": "DJ",
+    "genc3a": "DJI"
+  },
+  {
+    "name": "Dominica",
+    "genc2a": "DM",
+    "genc3a": "DMA"
+  },
+  {
+    "name": "Dominican Republic",
+    "genc2a": "DO",
+    "genc3a": "DOM"
+  },
+  {
+    "name": "Ecuador",
+    "genc2a": "EC",
+    "genc3a": "ECU"
+  },
+  {
+    "name": "Egypt",
+    "genc2a": "EG",
+    "genc3a": "EGY"
+  },
+  {
+    "name": "El Salvador",
+    "genc2a": "SV",
+    "genc3a": "SLV"
+  },
+  {
+    "name": "Equatorial Guinea",
+    "genc2a": "GQ",
+    "genc3a": "GNQ"
+  },
+  {
+    "name": "Eritrea",
+    "genc2a": "ER",
+    "genc3a": "ERI"
+  },
+  {
+    "name": "Estonia",
+    "genc2a": "EE",
+    "genc3a": "EST"
+  },
+  {
+    "name": "Ethiopia",
+    "genc2a": "ET",
+    "genc3a": "ETH"
+  },
+  {
+    "name": "Fiji",
+    "genc2a": "FJ",
+    "genc3a": "FJI"
+  },
+  {
+    "name": "Finland",
+    "genc2a": "FI",
+    "genc3a": "FIN"
+  },
+  {
+    "name": "France",
+    "genc2a": "FR",
+    "genc3a": "FRA"
+  },
+  {
+    "name": "Gabon",
+    "genc2a": "GA",
+    "genc3a": "GAB"
+  },
+  {
+    "name": "Gambia",
+    "genc2a": "GM",
+    "genc3a": "GMB"
+  },
+  {
+    "name": "Georgia",
+    "genc2a": "GE",
+    "genc3a": "GEO"
+  },
+  {
+    "name": "Germany",
+    "genc2a": "DE",
+    "genc3a": "DEU"
+  },
+  {
+    "name": "Ghana",
+    "genc2a": "GH",
+    "genc3a": "GHA"
+  },
+  {
+    "name": "Greece",
+    "genc2a": "GR",
+    "genc3a": "GRC"
+  },
+  {
+    "name": "Grenada",
+    "genc2a": "GD",
+    "genc3a": "GRD"
+  },
+  {
+    "name": "Guatemala",
+    "genc2a": "GT",
+    "genc3a": "GTM"
+  },
+  {
+    "name": "Guinea",
+    "genc2a": "GN",
+    "genc3a": "GIN"
+  },
+  {
+    "name": "Guinea-Bissau",
+    "genc2a": "GW",
+    "genc3a": "GNB"
+  },
+  {
+    "name": "Guyana",
+    "genc2a": "GY",
+    "genc3a": "GUY"
+  },
+  {
+    "name": "Haiti",
+    "genc2a": "HT",
+    "genc3a": "HTI"
+  },
+  {
+    "name": "Vatican",
+    "genc2a": "VA",
+    "genc3a": "VAT"
+  },
+  {
+    "name": "Honduras",
+    "genc2a": "HN",
+    "genc3a": "HND"
+  },
+  {
+    "name": "Hungary",
+    "genc2a": "HU",
+    "genc3a": "HUN"
+  },
+  {
+    "name": "Iceland",
+    "genc2a": "IS",
+    "genc3a": "ISL"
+  },
+  {
+    "name": "India",
+    "genc2a": "IN",
+    "genc3a": "IND"
+  },
+  {
+    "name": "Indonesia",
+    "genc2a": "ID",
+    "genc3a": "IDN"
+  },
+  {
+    "name": "Iran",
+    "genc2a": "IR",
+    "genc3a": "IRN"
+  },
+  {
+    "name": "Iraq",
+    "genc2a": "IQ",
+    "genc3a": "IRQ"
+  },
+  {
+    "name": "Ireland",
+    "genc2a": "IE",
+    "genc3a": "IRL"
+  },
+  {
+    "name": "Israel",
+    "genc2a": "IL",
+    "genc3a": "ISR"
+  },
+  {
+    "name": "Italy",
+    "genc2a": "IT",
+    "genc3a": "ITA"
+  },
+  {
+    "name": "Jamaica",
+    "genc2a": "JM",
+    "genc3a": "JAM"
+  },
+  {
+    "name": "Japan",
+    "genc2a": "JP",
+    "genc3a": "JPN"
+  },
+  {
+    "name": "Jordan",
+    "genc2a": "JO",
+    "genc3a": "JOR"
+  },
+  {
+    "name": "Kazakhstan",
+    "genc2a": "KZ",
+    "genc3a": "KAZ"
+  },
+  {
+    "name": "Kenya",
+    "genc2a": "KE",
+    "genc3a": "KEN"
+  },
+  {
+    "name": "Kiribati",
+    "genc2a": "KI",
+    "genc3a": "KIR"
+  },
+  {
+    "name": "North Korea",
+    "genc2a": "KP",
+    "genc3a": "PRK"
+  },
+  {
+    "name": "South Korea",
+    "genc2a": "KR",
+    "genc3a": "KOR"
+  },
+  {
+    "name": "Kosovo",
+    "genc2a": "XK",
+    "genc3a": "XKS"
+  },
+  {
+    "name": "Kuwait",
+    "genc2a": "KW",
+    "genc3a": "KWT"
+  },
+  {
+    "name": "Kyrgyzstan",
+    "genc2a": "KG",
+    "genc3a": "KGZ"
+  },
+  {
+    "name": "Laos",
+    "genc2a": "LA",
+    "genc3a": "LAO"
+  },
+  {
+    "name": "Latvia",
+    "genc2a": "LV",
+    "genc3a": "LVA"
+  },
+  {
+    "name": "Lebanon",
+    "genc2a": "LB",
+    "genc3a": "LBN"
+  },
+  {
+    "name": "Lesotho",
+    "genc2a": "LS",
+    "genc3a": "LSO"
+  },
+  {
+    "name": "Liberia",
+    "genc2a": "LR",
+    "genc3a": "LBR"
+  },
+  {
+    "name": "Libya",
+    "genc2a": "LY",
+    "genc3a": "LBY"
+  },
+  {
+    "name": "Liechtenstein",
+    "genc2a": "LI",
+    "genc3a": "LIE"
+  },
+  {
+    "name": "Lithuania",
+    "genc2a": "LY",
+    "genc3a": "LTU"
+  },
+  {
+    "name": "Luxembourg",
+    "genc2a": "LU",
+    "genc3a": "LUX"
+  },
+  {
+    "name": "Macedonia",
+    "genc2a": "MK",
+    "genc3a": "MKD"
+  },
+  {
+    "name": "Madagascar",
+    "genc2a": "MG",
+    "genc3a": "MDG"
+  },
+  {
+    "name": "Malawi",
+    "genc2a": "MW",
+    "genc3a": "MWI"
+  },
+  {
+    "name": "Malaysia",
+    "genc2a": "MY",
+    "genc3a": "MYS"
+  },
+  {
+    "name": "Maldives",
+    "genc2a": "MV",
+    "genc3a": "MDV"
+  },
+  {
+    "name": "Mali",
+    "genc2a": "ML",
+    "genc3a": "MLI"
+  },
+  {
+    "name": "Malta",
+    "genc2a": "MT",
+    "genc3a": "MLT"
+  },
+  {
+    "name": "Marshall Islands",
+    "genc2a": "MH",
+    "genc3a": "MHL"
+  },
+  {
+    "name": "Mauritania",
+    "genc2a": "MR",
+    "genc3a": "MRT"
+  },
+  {
+    "name": "Mauritius",
+    "genc2a": "MU",
+    "genc3a": "MUS"
+  },
+  {
+    "name": "Mexico",
+    "genc2a": "MX",
+    "genc3a": "MEX"
+  },
+  {
+    "name": "Micronesia, Federated States of",
+    "genc2a": "FM",
+    "genc3a": "FSM"
+  },
+  {
+    "name": "Moldova",
+    "genc2a": "MD",
+    "genc3a": "MDA"
+  },
+  {
+    "name": "Monaco",
+    "genc2a": "MC",
+    "genc3a": "MCO"
+  },
+  {
+    "name": "Mongolia",
+    "genc2a": "MN",
+    "genc3a": "MNG"
+  },
+  {
+    "name": "Montenegro",
+    "genc2a": "ME",
+    "genc3a": "MNE"
+  },
+  {
+    "name": "Morocco",
+    "genc2a": "MA",
+    "genc3a": "MAR"
+  },
+  {
+    "name": "Mozambique",
+    "genc2a": "MZ",
+    "genc3a": "MOZ"
+  },
+  {
+    "name": "Namibia",
+    "genc2a": "NA",
+    "genc3a": "NAM"
+  },
+  {
+    "name": "Nauru",
+    "genc2a": "NR",
+    "genc3a": "NRU"
+  },
+  {
+    "name": "Nepal",
+    "genc2a": "NP",
+    "genc3a": "NPL"
+  },
+  {
+    "name": "Netherlands",
+    "genc2a": "NL",
+    "genc3a": "NLD"
+  },
+  {
+    "name": "New Zealand",
+    "genc2a": "NZ",
+    "genc3a": "NZL"
+  },
+  {
+    "name": "Nicaragua",
+    "genc2a": "NI",
+    "genc3a": "NIC"
+  },
+  {
+    "name": "Niger",
+    "genc2a": "NE",
+    "genc3a": "NER"
+  },
+  {
+    "name": "Nigeria",
+    "genc2a": "NG",
+    "genc3a": "NGA"
+  },
+  {
+    "name": "Norway",
+    "genc2a": "NO",
+    "genc3a": "NOR"
+  },
+  {
+    "name": "Oman",
+    "genc2a": "OM",
+    "genc3a": "OMN"
+  },
+  {
+    "name": "Pakistan",
+    "genc2a": "PK",
+    "genc3a": "PAK"
+  },
+  {
+    "name": "Palau",
+    "genc2a": "PW",
+    "genc3a": "PLW"
+  },
+  {
+    "name": "Panama",
+    "genc2a": "PA",
+    "genc3a": "PAN"
+  },
+  {
+    "name": "Papua New Guinea",
+    "genc2a": "PG",
+    "genc3a": "PNG"
+  },
+  {
+    "name": "Paraguay",
+    "genc2a": "PY",
+    "genc3a": "PRY"
+  },
+  {
+    "name": "Peru",
+    "genc2a": "PE",
+    "genc3a": "PER"
+  },
+  {
+    "name": "Philippines",
+    "genc2a": "PH",
+    "genc3a": "PHL"
+  },
+  {
+    "name": "Poland",
+    "genc2a": "PL",
+    "genc3a": "POL"
+  },
+  {
+    "name": "Portugal",
+    "genc2a": "PT",
+    "genc3a": "PRT"
+  },
+  {
+    "name": "Qatar",
+    "genc2a": "QA",
+    "genc3a": "QAT"
+  },
+  {
+    "name": "Romania",
+    "genc2a": "RO",
+    "genc3a": "ROU"
+  },
+  {
+    "name": "Russia",
+    "genc2a": "RU",
+    "genc3a": "RUS"
+  },
+  {
+    "name": "Rwanda",
+    "genc2a": "RW",
+    "genc3a": "RWA"
+  },
+  {
+    "name": "Saint Kitts and Nevis",
+    "genc2a": "KN",
+    "genc3a": "KNA"
+  },
+  {
+    "name": "Saint Lucia",
+    "genc2a": "LC",
+    "genc3a": "LCA"
+  },
+  {
+    "name": "Saint Vincent and the Grenadines",
+    "genc2a": "VC",
+    "genc3a": "VCT"
+  },
+  {
+    "name": "Samoa",
+    "genc2a": "WS",
+    "genc3a": "WSM"
+  },
+  {
+    "name": "San Marino",
+    "genc2a": "SM",
+    "genc3a": "SMR"
+  },
+  {
+    "name": "Sao Tome and Principe",
+    "genc2a": "ST",
+    "genc3a": "STP"
+  },
+  {
+    "name": "Saudi Arabia",
+    "genc2a": "SA",
+    "genc3a": "SAU"
+  },
+  {
+    "name": "Senegal",
+    "genc2a": "SN",
+    "genc3a": "SEN"
+  },
+  {
+    "name": "Serbia",
+    "genc2a": "RS",
+    "genc3a": "SRB"
+  },
+  {
+    "name": "Seychelles",
+    "genc2a": "SC",
+    "genc3a": "SYC"
+  },
+  {
+    "name": "Sierra Leone",
+    "genc2a": "SL",
+    "genc3a": "SLE"
+  },
+  {
+    "name": "Singapore",
+    "genc2a": "SG",
+    "genc3a": "SGP"
+  },
+  {
+    "name": "Slovakia",
+    "genc2a": "SK",
+    "genc3a": "SVK"
+  },
+  {
+    "name": "Slovenia",
+    "genc2a": "SI",
+    "genc3a": "SVN"
+  },
+  {
+    "name": "Solomon Islands",
+    "genc2a": "SB",
+    "genc3a": "SLB"
+  },
+  {
+    "name": "Somalia",
+    "genc2a": "SO",
+    "genc3a": "SOM"
+  },
+  {
+    "name": "South Africa",
+    "genc2a": "ZA",
+    "genc3a": "ZAF"
+  },
+  {
+    "name": "South Sudan",
+    "genc2a": "SS",
+    "genc3a": "SSD"
+  },
+  {
+    "name": "Spain",
+    "genc2a": "ES",
+    "genc3a": "ESP"
+  },
+  {
+    "name": "Sri Lanka",
+    "genc2a": "LK",
+    "genc3a": "LKA"
+  },
+  {
+    "name": "Sudan",
+    "genc2a": "SD",
+    "genc3a": "SDN"
+  },
+  {
+    "name": "Suriname",
+    "genc2a": "SR",
+    "genc3a": "SUR"
+  },
+  {
+    "name": "Swaziland",
+    "genc2a": "SZ",
+    "genc3a": "SWZ"
+  },
+  {
+    "name": "Sweden",
+    "genc2a": "SE",
+    "genc3a": "SWE"
+  },
+  {
+    "name": "Switzerland",
+    "genc2a": "CH",
+    "genc3a": "CHE"
+  },
+  {
+    "name": "Syria",
+    "genc2a": "SY",
+    "genc3a": "SYR"
+  },
+  {
+    "name": "Taiwan",
+    "genc2a": "TW",
+    "genc3a": "TWN"
+  },
+  {
+    "name": "Tajikistan",
+    "genc2a": "TJ",
+    "genc3a": "TJK"
+  },
+  {
+    "name": "Tanzania",
+    "genc2a": "TZ",
+    "genc3a": "TZA"
+  },
+  {
+    "name": "Thailand",
+    "genc2a": "TH",
+    "genc3a": "THA"
+  },
+  {
+    "name": "Timor-Leste",
+    "genc2a": "TL",
+    "genc3a": "TLS"
+  },
+  {
+    "name": "Togo",
+    "genc2a": "TG",
+    "genc3a": "TGO"
+  },
+  {
+    "name": "Tonga",
+    "genc2a": "TO",
+    "genc3a": "TON"
+  },
+  {
+    "name": "Trinidad and Tobago",
+    "genc2a": "TT",
+    "genc3a": "TTO"
+  },
+  {
+    "name": "Tunisia",
+    "genc2a": "TN",
+    "genc3a": "TUN"
+  },
+  {
+    "name": "Turkey",
+    "genc2a": "TR",
+    "genc3a": "TUR"
+  },
+  {
+    "name": "Turkmenistan",
+    "genc2a": "TM",
+    "genc3a": "TKM"
+  },
+  {
+    "name": "Tuvalu",
+    "genc2a": "TV",
+    "genc3a": "TUV"
+  },
+  {
+    "name": "Uganda",
+    "genc2a": "UG",
+    "genc3a": "UGA"
+  },
+  {
+    "name": "Ukraine",
+    "genc2a": "UA",
+    "genc3a": "UKR"
+  },
+  {
+    "name": "United Arab Emirates",
+    "genc2a": "AE",
+    "genc3a": "ARE"
+  },
+  {
+    "name": "United Kingdom",
+    "genc2a": "GB",
+    "genc3a": "GBR"
+  },
+  {
+    "name": "United States",
+    "genc2a": "US",
+    "genc3a": "USA"
+  },
+  {
+    "name": "Uruguay",
+    "genc2a": "UY",
+    "genc3a": "URY"
+  },
+  {
+    "name": "Uzbekistan",
+    "genc2a": "UZ",
+    "genc3a": "UZB"
+  },
+  {
+    "name": "Vanuatu",
+    "genc2a": "VU",
+    "genc3a": "VUT"
+  },
+  {
+    "name": "Venezuela",
+    "genc2a": "VE",
+    "genc3a": "VEN"
+  },
+  {
+    "name": "Vietnam",
+    "genc2a": "VN",
+    "genc3a": "VNM"
+  },
+  {
+    "name": "Yemen",
+    "genc2a": "YE",
+    "genc3a": "YEM"
+  },
+  {
+    "name": "Zambia",
+    "genc2a": "ZM",
+    "genc3a": "ZMB"
+  },
+  {
+    "name": "Zimbabwe",
+    "genc2a": "ZW",
+    "genc3a": "ZWE"
+  }
+]
diff --git a/site/layouts/partials/functions/sign-form.html b/site/layouts/partials/functions/sign-form.html
index 49696d4..02ab2f6 100644
--- a/site/layouts/partials/functions/sign-form.html
+++ b/site/layouts/partials/functions/sign-form.html
@@ -10,35 +10,10 @@
   <label class="sign-input form-cn">
     <select name="country">
       <option value="">{{ .Site.Params.action.form.country }}</option>
-      <option value="Austria">Austria</option>
-      <option value="Belgium">Belgium</option>
-      <option value="Bulgaria">Bulgaria</option>
-      <option value="Croatia">Croatia</option>
-      <option value="Cyprus">Cyprus</option>
-      <option value="Czech Republic">Czech Republic</option>
-      <option value="Denmark">Denmark</option>
-      <option value="Estonia">Estonia</option>
-      <option value="Finland">Finland</option>
-      <option value="France">France</option>
-      <option value="Germany">Germany</option>
-      <option value="Greece">Greece</option>
-      <option value="Hungary">Hungary</option>
-      <option value="Ireland">Ireland</option>
-      <option value="Italy">Italy</option>
-      <option value="Latvia">Latvia</option>
-      <option value="Lithuania">Lithuania</option>
-      <option value="Luxembourg">Luxembourg</option>
-      <option value="Malta">Malta</option>
-      <option value="Netherlands">Netherlands</option>
-      <option value="Poland">Poland</option>
-      <option value="Portugal">Portugal</option>
-      <option value="Romania">Romania</option>
-      <option value="Slovakia">Slovakia</option>
-      <option value="Slovenia">Slovenia</option>
-      <option value="Spain">Spain</option>
-      <option value="Sweden">Sweden</option>
-      <option value="United Kingdom">United Kingdom</option>
-      <option value="Outside the EU">Outside the EU</option>
+      {{ $json := getJSON "data/countries/countries.json" }}
+      {{ range sort $json "name" "asc" }}
+        <option value="{{ .name }}">{{ .name }}</option>
+      {{ end }}
     </select>
   </label>
   <label class="sign-input form-zp">

From abf936b4a50daa4f74eb8155e926cbbc6e8850b7 Mon Sep 17 00:00:00 2001
From: Carmen Bianca Bakker <carmenbianca@fsfe.org>
Date: Fri, 15 Sep 2017 08:24:52 +0200
Subject: [PATCH 02/10] Added Italian links

---
 site/content/openletter.it.md  | 2 +-
 site/languages/strings.it.toml | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/site/content/openletter.it.md b/site/content/openletter.it.md
index ca93517..fef7223 100644
--- a/site/content/openletter.it.md
+++ b/site/content/openletter.it.md
@@ -31,4 +31,4 @@ Su questo punto puoi dare una mano! Firma la lettera aperta per dare più peso a
 > 
 > **"Implementare leggi che richiedano che il software finanziato pubblicamente e sviluppato per il settore pubblico sia reso pubblicamente disponibile sotto una licenza Software Libero/Open Source."**
 
-[fs]: https://fsfe.org/freesoftware/basics/summary.html "Il Software Libero dà a chiunque il diritto di usare, studiare, condividere e migliorare il software. Questo diritto aiuta a supportare altri diritti fondamentali come la libertà di parola, di stampa e la tutela della privacy."
+[fs]: https://fsfe.org/freesoftware/basics/summary.it.html "Il Software Libero dà a chiunque il diritto di usare, studiare, condividere e migliorare il software. Questo diritto aiuta a supportare altri diritti fondamentali come la libertà di parola, di stampa e la tutela della privacy."
diff --git a/site/languages/strings.it.toml b/site/languages/strings.it.toml
index 1905ea0..e4ba67f 100644
--- a/site/languages/strings.it.toml
+++ b/site/languages/strings.it.toml
@@ -21,7 +21,7 @@
 # Start banner
 [Languages.it.start]
   subtitle1   = "Perché il software creato usando i soldi delle tasse riscosse dai cittadini non è rilasciato come Software Libero?"
-  subtitle2   = "Vogliamo che la legge richieda che il software finanziato pubblicamente e sviluppato per il settore pubblico sia reso pubblicamente disponibile sotto una licenza [Software Libero/Open Source](https://fsfe.org/about/mission.html 'Il Software Libero dà a chiunque il diritto di usare, studiare, condividere e migliorare il software. Questo diritto aiuta a supportare altri diritti fondamentali come la libertà di parola, di stampa e la tutela della privacy.') Se è denaro pubblico (public money), allora dovrebbe essere publico anche il codice sorgente (public code)."
+  subtitle2   = "Vogliamo che la legge richieda che il software finanziato pubblicamente e sviluppato per il settore pubblico sia reso pubblicamente disponibile sotto una licenza [Software Libero/Open Source](https://fsfe.org/about/mission.it.html 'Il Software Libero dà a chiunque il diritto di usare, studiare, condividere e migliorare il software. Questo diritto aiuta a supportare altri diritti fondamentali come la libertà di parola, di stampa e la tutela della privacy.') Se è denaro pubblico (public money), allora dovrebbe essere publico anche il codice sorgente (public code)."
   subtitle3   = "**Il codice pagato dalle persone dovrebbe essere disponibile alle persone!**" 
 
 
@@ -59,7 +59,7 @@
   headline      = "Informa i tuoi rappresentanti!"
   intro         = "Nella nostra [**lettera aperta**](openletter/) chiediamo:" 
   # In "demand", please use curly quotation marks for the demand. Otherwise the build might fail: https://en.wikipedia.org/wiki/Quotation_mark
-  demand        = "“Implementare leggi che richiedano che il software finanziato pubblicamente e sviluppato per il settore pubblico sia reso pubblicamente disponibile sotto una licenza [Software Libero/Open Source](https://fsfe.org/freesoftware/basics/summary.html 'Il Software Libero dà a chiunque il diritto di usare, studiare, condividere e migliorare il software. Questo diritto aiuta a supportare altri diritti fondamentali come la libertà di parola, di stampa e la tutela della privacy.').”"
+  demand        = "“Implementare leggi che richiedano che il software finanziato pubblicamente e sviluppato per il settore pubblico sia reso pubblicamente disponibile sotto una licenza [Software Libero/Open Source](https://fsfe.org/freesoftware/basics/summary.it.html 'Il Software Libero dà a chiunque il diritto di usare, studiare, condividere e migliorare il software. Questo diritto aiuta a supportare altri diritti fondamentali come la libertà di parola, di stampa e la tutela della privacy.').”"
   description   = "**$ORGS** organizzazioni e **$INDS** persone supportano già questa chiamata ad agire attraverso la firma della nostra [lettera aperta](openletter/). Puoi aiutarci ad avere un maggiore impatto firmandola anche tu! Consegneremo tutte le firme ai rappresentanti di tutta Europa che stanno dibattendo sulla libertà del software nelle amministrazioni pubbliche."
 
 [Languages.it.action.box]

From d0bb4975f158dfa3182d3220d9f701e27ff14d0b Mon Sep 17 00:00:00 2001
From: suhrj <suhrj@fsfe.org>
Date: Fri, 15 Sep 2017 10:27:33 +0200
Subject: [PATCH 03/10] upload soit logo

---
 site/static/img/organisations/soit.png | Bin 0 -> 3981 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 site/static/img/organisations/soit.png

diff --git a/site/static/img/organisations/soit.png b/site/static/img/organisations/soit.png
new file mode 100644
index 0000000000000000000000000000000000000000..d17c15737715b7802fe0443669182c6959f362f9
GIT binary patch
literal 3981
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

literal 0
HcmV?d00001


From 218094ac781a11c63d3e019a5b90d0e224c27a64 Mon Sep 17 00:00:00 2001
From: suhrj <suhrj@fsfe.org>
Date: Fri, 15 Sep 2017 10:30:52 +0200
Subject: [PATCH 04/10] Add SOIT organisation

---
 site/data/organisations/organisations.json | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/site/data/organisations/organisations.json b/site/data/organisations/organisations.json
index 37c8bad..42ae895 100644
--- a/site/data/organisations/organisations.json
+++ b/site/data/organisations/organisations.json
@@ -158,6 +158,11 @@
     "name": "Software Liberty Association Taiwan",
     "img": "slat.png",
     "url": "https://slat.org/"
+  },
+   {
+    "name": "Spoločnosť pre otvorené informačné technológie",
+    "img": "soit.png",
+    "url": "www.soit.sk/"
   },
   {
     "name": "The Document Foundation",

From 49d3402dfc574c85a86338169b43a383c8c360f6 Mon Sep 17 00:00:00 2001
From: Bjoern Schiessle <bjoern@schiessle.org>
Date: Fri, 15 Sep 2017 13:28:03 +0200
Subject: [PATCH 05/10] fix url for soit.sk

---
 site/data/organisations/organisations.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/site/data/organisations/organisations.json b/site/data/organisations/organisations.json
index 42ae895..e7d3a28 100644
--- a/site/data/organisations/organisations.json
+++ b/site/data/organisations/organisations.json
@@ -162,7 +162,7 @@
    {
     "name": "Spoločnosť pre otvorené informačné technológie",
     "img": "soit.png",
-    "url": "www.soit.sk/"
+    "url": "http://www.soit.sk/"
   },
   {
     "name": "The Document Foundation",

From 6bc8e38dcf55fd8529d4a1e26ce94f8c7b26391a Mon Sep 17 00:00:00 2001
From: suhrj <suhrj@fsfe.org>
Date: Fri, 15 Sep 2017 17:06:18 +0200
Subject: [PATCH 06/10] add free knowledge institute logo

---
 .../img/organisations/freeknowledgeinstitute.png | Bin 0 -> 2273 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 site/static/img/organisations/freeknowledgeinstitute.png

diff --git a/site/static/img/organisations/freeknowledgeinstitute.png b/site/static/img/organisations/freeknowledgeinstitute.png
new file mode 100644
index 0000000000000000000000000000000000000000..dc58fc432138115f08f15fa77bdabb45cd5896a1
GIT binary patch
literal 2273
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

literal 0
HcmV?d00001


From 52642d2d3a78c706fc98812e820c8fa7079abed3 Mon Sep 17 00:00:00 2001
From: suhrj <suhrj@fsfe.org>
Date: Fri, 15 Sep 2017 17:08:30 +0200
Subject: [PATCH 07/10] add free knowledge institute org

---
 site/data/organisations/organisations.json | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/site/data/organisations/organisations.json b/site/data/organisations/organisations.json
index 42ae895..8c16b36 100644
--- a/site/data/organisations/organisations.json
+++ b/site/data/organisations/organisations.json
@@ -84,6 +84,11 @@
     "img": "ffkp.png",
     "url": "http://ffkp.se/"
   },
+  {
+    "name": "Free Knowledge Institute",
+    "img": "freeknowledgeinstitute.png",
+    "url": "http://freeknowledge.eu/"
+  },
   {
     "name": "Free Software Foundation Europe",
     "img": "fsfe.png",

From f17068dd51b1bb48247b45a4ca29ddd8bb1145ea Mon Sep 17 00:00:00 2001
From: suhrj <suhrj@fsfe.org>
Date: Fri, 15 Sep 2017 20:35:40 +0200
Subject: [PATCH 08/10] Add ow2 logo

---
 site/static/img/organisations/ow2.png | Bin 0 -> 3356 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 site/static/img/organisations/ow2.png

diff --git a/site/static/img/organisations/ow2.png b/site/static/img/organisations/ow2.png
new file mode 100644
index 0000000000000000000000000000000000000000..cecb81b8f8f6ea29642c9b1f32fd3d78a4a5ea72
GIT binary patch
literal 3356
zcmV+%4de2OP)<h;3K|Lk000e1NJLTq004jh0015c1^@s6<Wd&+000c*Nkl<ZXx`15
zd2|)k9mj7JLsgb4rXneb^$<ivJua=DT0)A{rFAK|BTJ0tAyixfh=IVXECD4fg$h|7
z@394m5FwT&=7qeliXwt_LF>}G^(aK4P=#vWuity;&YPL{=H8hEivICAb7$V2J9qB)
zx7^<(jMWnpL?!hJdf<Encn0nD;1%!|co*z-5KTI_u7AKb(c5k64rT0rr~{*+xRTHQ
z4)$vJ6#bST7}=h&2FxQyMHs6bcP;>>Xj??Z^|@%L+ve>gs^mrxN*d2>SAdzyG4<RE
z7AB2njUS~-tjUGE@1f#ejGpYoXli#(Z!jJ#0S(|auot`|kAC6(-vw_{arbRtCECTH
zpL~u3=3)T90~-MeqVj0R?VA0!sPjB+SA1mYv;d<4EJQd!WIgvYIy$s<X7;l&#&%G|
zF=o_d9#P8C2<?tx$m%f-auoM6jlu0zu7$}a%2-qS7>ftnLxik62=Nx6699kCojL<3
z)h<Xh>BXWR24J>drp7*1F-C(}4=%2!0dOO^jg2Us9$;xZ<K2B2Ua>}KH@c_1kGp84
z$}!!am#JJAbL_2DcIE0f7!{qwXv%qEntDMCgv>ftLl|!vfVD^=SCRch0xv^or2n!l
zbov(~GZ+nFA9@-9X9%nN;^7Q44ZPtxw)NaS%?#5MG@{$b--q*)n~_>_m64IN5p1Sw
zch0+=(Zo|8rs5vW7q9rZ8OT+Z0YvGyS}|La4(#LAAr0(~4=tHpz|+7iUuhtZeTRtA
zp-&~!z)SQbAHzeiuD*rhdzq-O2*A0q8HQD<UAsnV%2@v;JipUPG`aKP6BPDURNEuK
zo?{ZY-Xk^e^Ii19sChFO^=DW3G5|9TVDFIjO8gQ}<E+PB{tVz^<y_t0f3eSfMJx2*
zr!~^;w778T0v0c7m3?esJnMKEz<xxNbUyL(eQoCa5Y-q-Bhi_)O=mX^Ka*DjpZZDz
zL*e^*jJ02TfFX4LO}i(lr&T_^bgI%w-J{?^oTvNPRQA@c1&?4msQ;*CAx4F4xX;|b
z2^4^VU;wxU{2m4%;cap4c5pWs3PytsKGR80CQ3aoPj@cNC!j{|8F;x9P9d6d9>M~w
zWv^4;DRaj$c=mj46bOhE@EYC3a_XPx%UU-c;roE;9_i@-j;(z}fcKR-Uv2yYe2hC;
zyMf+Fhg&!N=hWIi=P?SlEASyuxm($0kR`EQn|2|i;tTA*mH3Dxzv3^m+B1AxjMUcL
z^_m@c9oR!BJ-T2PPXoVE8o)4cC!0fq84La?$PhWW_w(_tQtnf%dH2&+08#pdZ}FYa
zc+S%R>giRj6UC^C_oHG6H7Rqnhd6PNnGpM_o{VN(Y@?S%o<EKDlx`r)ZU9&LFn~UM
z;@f?ufI*%$u+9K*p7v^-O`TiFAaE;)y+1|xT=o&&%5IE~?#ueFigJUw3pMkD!g!2v
z{^5~^p7JOGXL*Es)!yc79NTIPptEN>+)Q_0SG|QDoz#iZ<gQ)@@C`U!7yuV|LT5$=
zXE7RM(m{gu<EX4gA+6@4tbC#)qv<`(sBn#sD3k3p0Cj$S-PcDDl>u-8w}O|6@zM?@
z9wy8pj*x!`tAf{`5u6RL--5n7<<6gfIkU!^>tO(Y^_b7c8sXmn|I#?XK!kDTpg|s^
zbe~5ld<46hcI6f0dH&~7V4_l#X+1dqrRf)*L9;G{_+1!AXFMWePo#$TDTDz$brHrF
z2GB2cvzV2%fy}ywPkyUs3aF=fzDuEG1K{FsBO&S^XHH;zQ%Cm;1GrfTpNn#@Kg$zd
zUoE`;N`(C#iLx&$z1kSNZ^}HQDRVzRF&C#uy_KHN>+=S>0@R4Mac&V4)FgzrzbijB
z(h5W>QqqWfcMvPA6cqpu)#qXHuczW3*$D61RB~}PLV7kmeG#t?`hcrNNFSSFtQB9g
zfLJqk9*}FwBgJeO&CFhzRC37{L=SS(E2(|a<(2`|YZkVi#<ti1V#M0S4zYDbH!!+I
zPBb9s2(Mp@XwWk_CurpPoixs+-k)KM04JmUxrdO$h3Jh^{95p$IG>MakRVy082wZ9
zkJ0Fa0ocA_2wtRb*=ovQ&!ZpbSx_mCr{FD`*gEw2i=;-f22_J}kO&blV?z_Xvn#w4
zUi~yYbs9EpMVScUJd}gc2<5|0mZUK_hqYe$>@;u==mstWIp8L6HyDN|jHgH1EuhEG
zei5nRFj522*t5V-2&sXnuoKa^a}3635*2kJns9CxzNlM$)c+4_MQ^Z?93poSn_K)4
zBLo`=Zg3m86*gk#`rW9_W3(ypOs5CVkY5808c|W0!fj4?nBk=j;{N9o-oG4_f-tIs
zHT0DbXEj&_o&zf+OR1bKLchiIbG8KMi@_og0b$8P5W+fy(9cN@E5~nTpgakFZ2`s6
zr=u8u8L?%24-{-`<nRYu8Qwiagz-xucmRUWf|yG|jrg*WkJypV-T|M1!yvA#p6&yK
z#aC2bLaWIY$B*b<mSz}$cims0tbb$jSZ6!dNw2FDUd^tn-oS!$CbD2z&|rR$6_!mA
zdjb@D1wue~F}e2{5nw%d0j#C#g^1NQ5toByV2KcJAH-_KD$utKEEEh7Vw6hCY#2i2
zh`tqq_W>8%5Zz7~`=zijC_BZ%Q0$mSW1Ppt9KuG_STb&)A$YC~?GLcQ5bqUV-$jlu
zt9f*BMgaAfF?R#lBm^;DE@ESmtz9Ggaj~~cULyWizBGjAl|szt!AhH$OQjbYi#bD#
z&%Lc&kOr|nPZ5!03Kybm(La)y+sYJ?EIv-m)ev-&R?sk=m-N27Q~HG+_mAZ3k+wX}
zZZ28F{~%@vZ{+Xl??HHz>v?K1_5e|jzvk7`BPn5@i@Ht<Q;`%F7uwq8lCl)iaQ$Gy
zGwp&_*u-220|+HNnMrR7r3e&pEPSy|ptj&hN?(f-hw(<JhsK+Ed#ud>y1LH8Nf#J1
zPcJOa^ZJlPPJiZm6hCZkAT0xk+H!BB#M;G<k@?s9Ftbhy8%ha@c5g~Ok2pN@&BQ`2
zQY<2m0Fjh2Z&G@+asM7$-$4o^G0(3^iC__W%~gDZ-L`)DN&_(NeMyXsy-1(gF{4~F
zDxhxPlknexVtWO_J$Y*)|Hh=}Z;-p$)iN|MhX~8%rixP~7dIrseM<}=f;=6j&y<U2
zwM$&`?vL=>L8Sp0_ji`hTc`2PcU|Vi8RaUzb>2<hx5~r&ALsqjs^YA)2sQ6L3GWY_
zAi=+u|7BGL9tA&3E+Ki2-Y#<R3YmKs$<S*L&E>Qv5z5PD$WQj><{QAd4zCO=J$i;>
zoJwU1FphW1{@-Z~C72|<$xmJLx;6e|vfr1=$YL7G5|qKALu~)>4#vkCW8sUMAz~AF
zTW%CLf%Rae4C6eFOb1VZ2f-lFA6yGVyA;Qc%5MkxhB5M7ye+Yjsz~g1lV9ZDpq-1S
zw9EjE_CuP`X>S*~KFbhTmj)()Un`BvxZYi10GtM;cZcZ(aH)3gJXP>{!T{1kN7#{J
z>2?E{<U@Eac0bToE22hR*K2`f1BlRirT00#is!RV$Hf35bT!&vDLuz|ZG=J~zPbBG
zlY{v_;AQ1zE<(FB;&bj(MyRmx{6<Y>!7&VXDX|U}``MvkZR`dR^x^f*7ue4|E(S10
zYXHs#;G&g_(k6mpCW0!K6HX$Ma(+LKd7uF8YE6mdW)L@PL|UWWg@?88GRnh{e+-Vg
zmUdq2W%TJO##uqEaPm|ZACzVn!^;3xok#=d>G?9vA*|iddG|{-g0qz(MJU%b2Zw#l
zud~(wjBBg3#;ShaTZwV7VGd3TG8)L5V*u}gnKH*Oa3!F)t|Q>MuN>{M=8M0l36<U=
ztLt&q#}V~nI)9J4Q~-85BsO_ohUUB$^9cVY1C&OpUysS=7-=iwZ0eJRjP7lg0h}m4
zF&A>Mryvo}Q0*0R{YMb%*ju~TFg&%+$H$mt@_iaWI>tNT%g~*_Uv6#yT`GVdk^yY7
zFK*0J)RyGJmK#W^&kg4YU&2_|z6EFcGyqP>Go3m4AaO4?fbA*{vZI0YAF2UtwZCW^
z@rR3uN2vDG_OrX!dr?H;?dqC6>{(8lztuEDeE!@V->D_}yTxK-i~}Ru8-M(<3}E8_
zUEF}gcLcB)13o*Z5Z>I4nROrkG<>fz=c|R<rL6><*Y0YT0T_Jc8MUl;{$*mmmBg-_
zRm+a%wKhKio6PxvM1T)fR(~3f_kj6mZ^Q8u&;-8lMc8(<WBs;Ij`ty`7oU40bb~h6
z>kZ%z!0Yl_^s5y|lW^kNM&bQoI@M!i=?333Y<7$nPI(6Za8%{E4;8??iGQ$v0yfD7
mo52Q9d)x{5>es-ljQ;^bNNEg58bfse0000<MNUMnLSTZRuUP^B

literal 0
HcmV?d00001


From 8ba813b25cd244656188575296b16e16702736b3 Mon Sep 17 00:00:00 2001
From: suhrj <suhrj@fsfe.org>
Date: Fri, 15 Sep 2017 20:37:22 +0200
Subject: [PATCH 09/10] add ow2 org

---
 site/data/organisations/organisations.json | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/site/data/organisations/organisations.json b/site/data/organisations/organisations.json
index 6f1739a..b534cf3 100644
--- a/site/data/organisations/organisations.json
+++ b/site/data/organisations/organisations.json
@@ -148,6 +148,11 @@
     "name": "Open Source Initiative",
     "img": "OpenSourceInitiative.png",
     "url": "https://opensource.org/"
+  },
+   {
+    "name": "OW2 Consortium",
+    "img": "ow2.png",
+    "url": "https://www.ow2.org/"
   },
    {
     "name": "Public Software CIC",

From ea6bb2df76815e5377dc27e6885964f3e575d634 Mon Sep 17 00:00:00 2001
From: Jonas Oberg <jonas@ffkp.se>
Date: Fri, 15 Sep 2017 21:03:20 +0200
Subject: [PATCH 10/10] Re-added copy to aws for now.

---
 site/build/build.sh | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/site/build/build.sh b/site/build/build.sh
index 2b9bd92..aa3a88c 100755
--- a/site/build/build.sh
+++ b/site/build/build.sh
@@ -25,8 +25,9 @@ else
   ## After building the website, we set the AWS credentials and uplodad
   ## everything to our AWS s3 bucket.
   ##
-  #if [ -f /srv/cred/aws.sh ]; then
-    #. /srv/cred/aws.sh
-    #/usr/local/bin/aws s3 cp /usr/share/blog/public/ s3://aws-website-pmpc-soegm/ --recursive
-  #fi
+  if [ -f /srv/cred/aws.sh ]; then
+    . /srv/cred/aws.sh
+    /usr/local/bin/aws configure set default.s3.max_concurrent_requests 2
+    /usr/local/bin/aws s3 cp /usr/share/blog/public/ s3://aws-website-pmpc-soegm/ --recursive
+  fi
 fi