Add new server regions

Psiphon-Inc · Dec 6, 2023 · 8820e86 · 8820e86
1 parent 8440894
commit 8820e86
Show file tree

Hide file tree

Showing 6 changed files with 288 additions and 144 deletions.
diff --git a/src/webui/_locales/en/messages.json b/src/webui/_locales/en/messages.json
@@ -319,6 +319,30 @@
     "message": "Latvia",
     "description": "One of the choices in the 'Psiphon Server Region' combo box. If selected, a Psiphon server in Latvia will be used."
   },
+  "settings#egress-region#select-id": {
+    "message": "Indonesia",
+    "description": "One of the choices in the 'Psiphon Server Region' combo box. If selected, a Psiphon server in Indonesia will be used."
+  },
+  "settings#egress-region#select-nz": {
+    "message": "New Zealand",
+    "description": "One of the choices in the 'Psiphon Server Region' combo box. If selected, a Psiphon server in New Zealand will be used."
+  },
+  "settings#egress-region#select-gr": {
+    "message": "Greece",
+    "description": "One of the choices in the 'Psiphon Server Region' combo box. If selected, a Psiphon server in Greece will be used."
+  },
+  "settings#egress-region#select-hr": {
+    "message": "Croatia",
+    "description": "One of the choices in the 'Psiphon Server Region' combo box. If selected, a Psiphon server in Croatia will be used."
+  },
+  "settings#egress-region#select-pt": {
+    "message": "Portugal",
+    "description": "One of the choices in the 'Psiphon Server Region' combo box. If selected, a Psiphon server in Portugal will be used."
+  },
+  "settings#egress-region#select-ua": {
+    "message": "Ukraine",
+    "description": "One of the choices in the 'Psiphon Server Region' combo box. If selected, a Psiphon server in Ukraine will be used."
+  },
   "settings#egress-region#description": {
     "message": "Psiphon has servers in many different countries and regions. Using a Psiphon server in a region close to your home country will generally provide a better network connection, but you may wish to access websites and services like you are virtually in a specific country or region.",
     "description": "Help text in the 'Psiphon Server Region' settings section explaining what the option is and why the user may want to override the default ('best') setting value. The word 'Psiphon' must not be translated or transliterated."

diff --git a/src/webui/_locales/haw-Arab/messages.json b/src/webui/_locales/haw-Arab/messages.json
@@ -715,14 +715,26 @@
     "message": "‮∩uıʇǝp‬ ‮Ӽıuƃpoɯ‬",
     "description": "One of the choices in the 'Psiphon Server Region' combo box. If selected, a Psiphon server in the UK will be used."
   },
+  "settings#egress-region#select-gr": {
+    "message": "‮פɹǝǝɔǝ‬",
+    "description": "One of the choices in the 'Psiphon Server Region' combo box. If selected, a Psiphon server in Greece will be used."
+  },
   "settings#egress-region#select-hk": {
     "message": "‮Houƃ‬ ‮Ӽouƃ‬",
     "description": "One of the choices in the 'Psiphon Server Region' combo box. If selected, a Psiphon server in Hong Kong will be used."
   },
+  "settings#egress-region#select-hr": {
+    "message": "‮Ↄɹoɐʇıɐ‬",
+    "description": "One of the choices in the 'Psiphon Server Region' combo box. If selected, a Psiphon server in Croatia will be used."
+  },
   "settings#egress-region#select-hu": {
     "message": "‮Hnuƃɐɹʎ‬",
     "description": "One of the choices in the 'Psiphon Server Region' combo box. If selected, a Psiphon server in Hungary will be used."
   },
+  "settings#egress-region#select-id": {
+    "message": "‮Iupouǝsıɐ‬",
+    "description": "One of the choices in the 'Psiphon Server Region' combo box. If selected, a Psiphon server in Indonesia will be used."
+  },
   "settings#egress-region#select-ie": {
     "message": "‮Iɹǝʅɐup‬",
     "description": "One of the choices in the 'Psiphon Server Region' combo box. If selected, a Psiphon server in Ireland will be used."
@@ -767,10 +779,18 @@
     "message": "‮Noɹʍɐʎ‬",
     "description": "One of the choices in the 'Psiphon Server Region' combo box. If selected, a Psiphon server in Norway will be used."
   },
+  "settings#egress-region#select-nz": {
+    "message": "‮Nǝʍ‬ ‮Zǝɐʅɐup‬",
+    "description": "One of the choices in the 'Psiphon Server Region' combo box. If selected, a Psiphon server in New Zealand will be used."
+  },
   "settings#egress-region#select-pl": {
     "message": "‮Ԁoʅɐup‬",
     "description": "One of the choices in the 'Psiphon Server Region' combo box. If selected, a Psiphon server in Sweden will be used."
   },
+  "settings#egress-region#select-pt": {
+    "message": "‮Ԁoɹʇnƃɐʅ‬",
+    "description": "One of the choices in the 'Psiphon Server Region' combo box. If selected, a Psiphon server in Portugal will be used."
+  },
   "settings#egress-region#select-ro": {
     "message": "‮ᴚoɯɐuıɐ‬",
     "description": "One of the choices in the 'Psiphon Server Region' combo box. If selected, a Psiphon server in Romania will be used."
@@ -795,6 +815,10 @@
     "message": "‮⊥ɐıʍɐu‬",
     "description": "One of the choices in the 'Psiphon Server Region' combo box. If selected, a Psiphon server in Taiwan will be used."
   },
+  "settings#egress-region#select-ua": {
+    "message": "‮∩ʞɹɐıuǝ‬",
+    "description": "One of the choices in the 'Psiphon Server Region' combo box. If selected, a Psiphon server in Ukraine will be used."
+  },
   "settings#egress-region#select-us": {
     "message": "‮∩uıʇǝp‬ ‮Sʇɐʇǝs‬",
     "description": "One of the choices in the 'Psiphon Server Region' combo box. If selected, a Psiphon server in the United States will be used."

diff --git a/src/webui/_locales/haw-Cyrl/messages.json b/src/webui/_locales/haw-Cyrl/messages.json
@@ -715,14 +715,26 @@
     "message": "[Ŭŭƞīīŧḗḗḓ Ķīīƞɠḓǿǿḿ]",
     "description": "One of the choices in the 'Psiphon Server Region' combo box. If selected, a Psiphon server in the UK will be used."
   },
+  "settings#egress-region#select-gr": {
+    "message": "[Ɠřḗḗḗḗƈḗḗ]",
+    "description": "One of the choices in the 'Psiphon Server Region' combo box. If selected, a Psiphon server in Greece will be used."
+  },
   "settings#egress-region#select-hk": {
     "message": "[Ħǿǿƞɠ Ķǿǿƞɠ]",
     "description": "One of the choices in the 'Psiphon Server Region' combo box. If selected, a Psiphon server in Hong Kong will be used."
   },
+  "settings#egress-region#select-hr": {
+    "message": "[Ƈřǿǿȧȧŧīīȧȧ]",
+    "description": "One of the choices in the 'Psiphon Server Region' combo box. If selected, a Psiphon server in Croatia will be used."
+  },
   "settings#egress-region#select-hu": {
     "message": "[Ħŭŭƞɠȧȧřẏ]",
     "description": "One of the choices in the 'Psiphon Server Region' combo box. If selected, a Psiphon server in Hungary will be used."
   },
+  "settings#egress-region#select-id": {
+    "message": "[Īīƞḓǿǿƞḗḗşīīȧȧ]",
+    "description": "One of the choices in the 'Psiphon Server Region' combo box. If selected, a Psiphon server in Indonesia will be used."
+  },
   "settings#egress-region#select-ie": {
     "message": "[Īīřḗḗŀȧȧƞḓ]",
     "description": "One of the choices in the 'Psiphon Server Region' combo box. If selected, a Psiphon server in Ireland will be used."
@@ -767,10 +779,18 @@
     "message": "[Ƞǿǿřẇȧȧẏ]",
     "description": "One of the choices in the 'Psiphon Server Region' combo box. If selected, a Psiphon server in Norway will be used."
   },
+  "settings#egress-region#select-nz": {
+    "message": "[Ƞḗḗẇ Ẑḗḗȧȧŀȧȧƞḓ]",
+    "description": "One of the choices in the 'Psiphon Server Region' combo box. If selected, a Psiphon server in New Zealand will be used."
+  },
   "settings#egress-region#select-pl": {
     "message": "[Ƥǿǿŀȧȧƞḓ]",
     "description": "One of the choices in the 'Psiphon Server Region' combo box. If selected, a Psiphon server in Sweden will be used."
   },
+  "settings#egress-region#select-pt": {
+    "message": "[Ƥǿǿřŧŭŭɠȧȧŀ]",
+    "description": "One of the choices in the 'Psiphon Server Region' combo box. If selected, a Psiphon server in Portugal will be used."
+  },
   "settings#egress-region#select-ro": {
     "message": "[Řǿǿḿȧȧƞīīȧȧ]",
     "description": "One of the choices in the 'Psiphon Server Region' combo box. If selected, a Psiphon server in Romania will be used."
@@ -795,6 +815,10 @@
     "message": "[Ŧȧȧīīẇȧȧƞ]",
     "description": "One of the choices in the 'Psiphon Server Region' combo box. If selected, a Psiphon server in Taiwan will be used."
   },
+  "settings#egress-region#select-ua": {
+    "message": "[Ŭŭķřȧȧīīƞḗḗ]",
+    "description": "One of the choices in the 'Psiphon Server Region' combo box. If selected, a Psiphon server in Ukraine will be used."
+  },
   "settings#egress-region#select-us": {
     "message": "[Ŭŭƞīīŧḗḗḓ Şŧȧȧŧḗḗş]",
     "description": "One of the choices in the 'Psiphon Server Region' combo box. If selected, a Psiphon server in the United States will be used."

diff --git a/src/webui/js/locales.js b/src/webui/js/locales.js
@@ -2154,6 +2154,12 @@
       "settings#egress-region#select-ae": "United Arab Emirates",
       "settings#egress-region#select-ee": "Estonia",
       "settings#egress-region#select-lv": "Latvia",
+      "settings#egress-region#select-id": "Indonesia",
+      "settings#egress-region#select-nz": "New Zealand",
+      "settings#egress-region#select-gr": "Greece",
+      "settings#egress-region#select-hr": "Croatia",
+      "settings#egress-region#select-pt": "Portugal",
+      "settings#egress-region#select-ua": "Ukraine",
       "settings#egress-region#description": "Psiphon has servers in many different countries and regions. Using a Psiphon server in a region close to your home country will generally provide a better network connection, but you may wish to access websites and services like you are virtually in a specific country or region.",
       "settings#egress-region#default": "Choosing the default <strong>“Best Performance”</strong> option allows Psiphon to automatically choose a server, which will generally result in the best network connection.",
       "settings#egress-region#invalid-error-msg": "Choose a valid Psiphon server region.",
@@ -3807,8 +3813,11 @@
       "settings#egress-region#select-fi": "‮ɟıuʅɐup‬",
       "settings#egress-region#select-fr": "‮ɟɹɐuɔǝ‬",
       "settings#egress-region#select-gb": "‮∩uıʇǝp‬ ‮Ӽıuƃpoɯ‬",
+      "settings#egress-region#select-gr": "‮פɹǝǝɔǝ‬",
       "settings#egress-region#select-hk": "‮Houƃ‬ ‮Ӽouƃ‬",
+      "settings#egress-region#select-hr": "‮Ↄɹoɐʇıɐ‬",
       "settings#egress-region#select-hu": "‮Hnuƃɐɹʎ‬",
+      "settings#egress-region#select-id": "‮Iupouǝsıɐ‬",
       "settings#egress-region#select-ie": "‮Iɹǝʅɐup‬",
       "settings#egress-region#select-in": "‮Iupıɐ‬",
       "settings#egress-region#select-is": "‮Iɔǝʅɐup‬",
@@ -3820,13 +3829,16 @@
       "settings#egress-region#select-mx": "‮Wǝxıɔo‬",
       "settings#egress-region#select-nl": "‮Nǝʇɥǝɹʅɐups‬",
       "settings#egress-region#select-no": "‮Noɹʍɐʎ‬",
+      "settings#egress-region#select-nz": "‮Nǝʍ‬ ‮Zǝɐʅɐup‬",
       "settings#egress-region#select-pl": "‮Ԁoʅɐup‬",
+      "settings#egress-region#select-pt": "‮Ԁoɹʇnƃɐʅ‬",
       "settings#egress-region#select-ro": "‮ᴚoɯɐuıɐ‬",
       "settings#egress-region#select-rs": "‮Sǝɹqıɐ‬",
       "settings#egress-region#select-se": "‮Sʍǝpǝu‬",
       "settings#egress-region#select-sg": "‮Sıuƃɐdoɹǝ‬",
       "settings#egress-region#select-sk": "‮Sʅoʌɐʞıɐ‬",
       "settings#egress-region#select-tw": "‮⊥ɐıʍɐu‬",
+      "settings#egress-region#select-ua": "‮∩ʞɹɐıuǝ‬",
       "settings#egress-region#select-us": "‮∩uıʇǝp‬ ‮Sʇɐʇǝs‬",
       "settings#egress-region#select-za": "‮Sonʇɥ‬ ‮∀ɟɹıɔɐ‬",
       "settings#error-alert": "<strong>‮Ǝɹɹoɹ‬!</strong> ‮Ԁʅǝɐsǝ‬ ‮ɟıx‬ ‮ıuɔoɹɹǝɔʇ‬ ‮ʌɐʅnǝs‬ ‮qǝɟoɹǝ‬ ‮dɹoɔǝǝpıuƃ‬.",
@@ -4066,8 +4078,11 @@
       "settings#egress-region#select-fi": "[Ƒīīƞŀȧȧƞḓ]",
       "settings#egress-region#select-fr": "[Ƒřȧȧƞƈḗḗ]",
       "settings#egress-region#select-gb": "[Ŭŭƞīīŧḗḗḓ Ķīīƞɠḓǿǿḿ]",
+      "settings#egress-region#select-gr": "[Ɠřḗḗḗḗƈḗḗ]",
       "settings#egress-region#select-hk": "[Ħǿǿƞɠ Ķǿǿƞɠ]",
+      "settings#egress-region#select-hr": "[Ƈřǿǿȧȧŧīīȧȧ]",
       "settings#egress-region#select-hu": "[Ħŭŭƞɠȧȧřẏ]",
+      "settings#egress-region#select-id": "[Īīƞḓǿǿƞḗḗşīīȧȧ]",
       "settings#egress-region#select-ie": "[Īīřḗḗŀȧȧƞḓ]",
       "settings#egress-region#select-in": "[Īīƞḓīīȧȧ]",
       "settings#egress-region#select-is": "[Īīƈḗḗŀȧȧƞḓ]",
@@ -4079,13 +4094,16 @@
       "settings#egress-region#select-mx": "[Ḿḗḗẋīīƈǿǿ]",
       "settings#egress-region#select-nl": "[Ƞḗḗŧħḗḗřŀȧȧƞḓş]",
       "settings#egress-region#select-no": "[Ƞǿǿřẇȧȧẏ]",
+      "settings#egress-region#select-nz": "[Ƞḗḗẇ Ẑḗḗȧȧŀȧȧƞḓ]",
       "settings#egress-region#select-pl": "[Ƥǿǿŀȧȧƞḓ]",
+      "settings#egress-region#select-pt": "[Ƥǿǿřŧŭŭɠȧȧŀ]",
       "settings#egress-region#select-ro": "[Řǿǿḿȧȧƞīīȧȧ]",
       "settings#egress-region#select-rs": "[Şḗḗřƀīīȧȧ]",
       "settings#egress-region#select-se": "[Şẇḗḗḓḗḗƞ]",
       "settings#egress-region#select-sg": "[Şīīƞɠȧȧƥǿǿřḗḗ]",
       "settings#egress-region#select-sk": "[Şŀǿǿṽȧȧķīīȧȧ]",
       "settings#egress-region#select-tw": "[Ŧȧȧīīẇȧȧƞ]",
+      "settings#egress-region#select-ua": "[Ŭŭķřȧȧīīƞḗḗ]",
       "settings#egress-region#select-us": "[Ŭŭƞīīŧḗḗḓ Şŧȧȧŧḗḗş]",
       "settings#egress-region#select-za": "[Şǿǿŭŭŧħ Ȧȧƒřīīƈȧȧ]",
       "settings#error-alert": "[<strong>Ḗḗřřǿǿř!</strong> Ƥŀḗḗȧȧşḗḗ ƒīīẋ īīƞƈǿǿřřḗḗƈŧ ṽȧȧŀŭŭḗḗş ƀḗḗƒǿǿřḗḗ ƥřǿǿƈḗḗḗḗḓīīƞɠ.]",

diff --git a/src/webui/main-inline.html b/src/webui/main-inline.html
diff --git a/src/webui/main.html b/src/webui/main.html
@@ -1270,12 +1270,30 @@ <h2 id="psicash-ui-overlay-buying-boost" data-i18n="[html]psicash#ui-buyingboost
                                 United Kingdom
                               </a>
                             </li>
+                            <li data-region="GR">
+                              <a href="#" tabindex="-1" class="flag gr"
+                                 data-i18n="settings#egress-region#select-gr">
+                                Greece
+                              </a>
+                            </li>
+                            <li data-region="HR">
+                              <a href="#" tabindex="-1" class="flag hr"
+                                 data-i18n="settings#egress-region#select-hr">
+                                Croatia
+                              </a>
+                            </li>
                             <li data-region="HU">
                               <a href="#" tabindex="-1" class="flag hu"
                                  data-i18n="settings#egress-region#select-hu">
                                 Hungary
                               </a>
                             </li>
+                            <li data-region="ID">
+                              <a href="#" tabindex="-1" class="flag id"
+                                 data-i18n="settings#egress-region#select-id">
+                                Indonesia
+                              </a>
+                            </li>
                             <li data-region="IE">
                               <a href="#" tabindex="-1" class="flag ie"
                                  data-i18n="settings#egress-region#select-ie">
@@ -1342,12 +1360,24 @@ <h2 id="psicash-ui-overlay-buying-boost" data-i18n="[html]psicash#ui-buyingboost
                                 Norway
                               </a>
                             </li>
+                            <li data-region="NZ">
+                              <a href="#" tabindex="-1" class="flag nz"
+                                 data-i18n="settings#egress-region#select-nz">
+                                New Zealand
+                              </a>
+                            </li>
                             <li data-region="PL">
                               <a href="#" tabindex="-1" class="flag pl"
                                  data-i18n="settings#egress-region#select-pl">
                                 Poland
                               </a>
                             </li>
+                            <li data-region="PT">
+                              <a href="#" tabindex="-1" class="flag pt"
+                                 data-i18n="settings#egress-region#select-pt">
+                                Portugal
+                              </a>
+                            </li>
                             <li data-region="RO">
                               <a href="#" tabindex="-1" class="flag ro"
                                  data-i18n="settings#egress-region#select-ro">
@@ -1384,6 +1414,12 @@ <h2 id="psicash-ui-overlay-buying-boost" data-i18n="[html]psicash#ui-buyingboost
                                 Taiwan
                               </a>
                             </li>
+                            <li data-region="UA">
+                              <a href="#" tabindex="-1" class="flag ua"
+                                 data-i18n="settings#egress-region#select-ua">
+                                Ukraine
+                              </a>
+                            </li>
                             <li data-region="US">
                               <a href="#" tabindex="-1" class="flag us"
                                  data-i18n="settings#egress-region#select-us">