From 183bb0618c6a7c784cb5be91a73130371e2a1bdd Mon Sep 17 00:00:00 2001
From: eldadfux <eldad.fux@gmail.com>
Date: Tue, 15 Oct 2019 18:35:25 +0300
Subject: [PATCH] Fixed Albanian locale encoding and code

---
 CHANGES.md                                    |   1 +
 app/config/locale/alb.countries.php           | 197 -----------------
 app/config/locale/ms.php                      |   8 +-
 .../{alb.continents.php => sq.continents.php} |   0
 app/config/locale/sq.countries.php            | 198 ++++++++++++++++++
 app/config/locale/{alb.php => sq.php}         |  12 +-
 app/init.php                                  |   2 +
 7 files changed, 211 insertions(+), 207 deletions(-)
 delete mode 100644 app/config/locale/alb.countries.php
 rename app/config/locale/{alb.continents.php => sq.continents.php} (100%)
 create mode 100644 app/config/locale/sq.countries.php
 rename app/config/locale/{alb.php => sq.php} (61%)

diff --git a/CHANGES.md b/CHANGES.md
index 524f99dba..4be989c95 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -15,6 +15,7 @@
 ## Bugs
 * Fix for typos in PT-BR translations
 * Fix for UI crash when project user was missing a name
+* Fix for it locale including the en templates by mistake
 
 ## Breaking Changs
 
diff --git a/app/config/locale/alb.countries.php b/app/config/locale/alb.countries.php
deleted file mode 100644
index 8d1bb0f1b..000000000
--- a/app/config/locale/alb.countries.php
+++ /dev/null
@@ -1,197 +0,0 @@
-<?php
-return [
-    'AF' => 'Afganistani',
-    'AO' => 'Angola',
-    'AL' => 'Albania',
-    'AD' => 'Andorra',
-    'AE' => 'Emiratet e Bashkuara Arabe',
-    'AR' => 'Argjentina',
-    'AM' => 'Armenia',
-    'AG' => 'Antigua dhe Barbuda',
-    'AU' => 'Australia',
-    'AT' => 'Austri',
-    'AZ' => 'Azerbajxhani',
-    'BI' => 'Burundi',
-    'BE' => 'Belgjika',
-    'BJ' => 'Benin',
-    'BF' => 'Burkina Faso',
-    'BD' => 'Bangladeshi',
-    'BG' => 'Bullgaria',
-    'BH' => 'Bahreini',
-    'BS' => 'Bahamas',
-    'BA' => 'Bosnja dhe Hercegovina',
-    'BY' => 'Belarusia',
-    'BZ' => 'Belize',
-    'BO' => 'Bolivia',
-    'BR' => 'Brazili',
-    'BB' => 'Barbados',
-    'BN' => 'Brunei',
-    'BT' => 'Bhutan',
-    'BW' => 'Botsvana',
-    'CF' => 'Republika Qendrore e Afrikës',
-    'CA' => 'Kanada',
-    'CH' => 'Zvicra',
-    'CL' => 'Kili',
-    'CN' => 'Kinë',
-    'CI' => 'Cλεte de Ivoire',
-    'CM' => 'Kamerun',
-    'CD' => 'Republika Demokratike e Kongos',
-    'CG' => 'Republika e Kongos',
-    'CO' => 'Kolumbia',
-    'KM' => 'Komoret',
-    'CV' => 'Cape Verde',
-    'CR' => 'Kosta Rika',
-    'CU' => 'Kuba',
-    'CY' => 'Qipro',
-    'CZ' => 'Republika Czecheke',
-    'DE' => 'Gjermani',
-    'DJ' => 'Djibouti',
-    'DM' => 'Dominica',
-    'DK' => 'Danimarka',
-    'DO' => 'Republika Dominikane',
-    'DZ' => 'Algjeria',
-    'EC' => 'Ekuador',
-    'EG' => 'Egjipt',
-    'ER' => 'Eritrea',
-    'ES' => 'Spanjë',
-    'BE' => 'Estonia',
-    'ET' => 'Etiopi',
-    'FI' => 'Finlanda',
-    'FJ' => 'Fiji',
-    'FR' => 'France',
-    'FM' => 'Mikronezia',
-    'GA' => 'Gabon',
-    'GB' => 'Mbretëria e Bashkuar',
-    'GE' => 'Bujqësia',
-    'GH' => 'Gana',
-    'GN' => 'Guinea',
-    'GM' => 'Gambia',
-    'GW' => 'Guinea-Bissau',
-    'GQ' => 'Guinea Ekuatoriale',
-    'GR' => 'Greqi',
-    'GD' => 'Grenada',
-    'GT' => 'Guatemala',
-    'GY' => 'Guajana',
-    'HN' => 'Honduras',
-    'HR' => 'Kroacia',
-    'HT' => 'Haiti',
-    'HU' => 'Hungaria',
-    'ID' => 'Indonezi',
-    'IN' => 'India',
-    'IE' => 'Irlanda',
-    'IR' => 'Irani',
-    'IQ' => 'Irak',
-    'IS' => 'Islanda',
-    'IL' => 'Izraeli',
-    'IT' => 'Itali',
-    'JM' => 'Xhamajka',
-    'JO' => 'Jordan',
-    'JP' => 'Japoni',
-    'KZ' => 'Kazakistani',
-    'KE' => 'Kenia',
-    'KG' => 'Kirgistani',
-    'KH' => 'Kamboxhia',
-    'KI' => 'Kiribati',
-    'KN' => 'Shen Christopher and Nevis',
-    'KR' => 'Koreja e Jugut',
-    'KW' => 'Kuvajti',
-    'LA' => 'Laos',
-    'LB' => 'Libanez',
-    'LR' => 'Liberia',
-    'LY' => 'Libia',
-    'LC' => 'St. Louis',
-    'LI' => 'Lihtenshtajni',
-    'LK' => 'Sri Lanka',
-    'LS' => 'Lesoto',
-    'LT' => 'Lituania',
-    'LU' => 'Luksemburgu',
-    'LV' => 'Letonia',
-    'MA' => 'Marok',
-    'MC' => 'Monako',
-    'MD' => 'Moldavia',
-    'MG' => 'Madagascar',
-    'MV' => 'Maldive',
-    'MX' => 'Meksika',
-    'MH' => 'Ishujt Marshall',
-    'MK' => 'Maqedonia',
-    'ML' => 'Mali',
-    'MT' => 'Maltë',
-    'MM' => 'Myanmar',
-    'ME' => 'Mali i Zi',
-    'MN' => 'Mongolia',
-    'MZ' => 'Mozambik',
-    'MR' => 'Mauritania',
-    'MU' => 'Mauritius',
-    'MW' => 'Malawi',
-    'MY' => 'Malajzia',
-    'NA' => 'Namibia',
-    'NE' => 'Niger',
-    'NG' => 'Nigeria',
-    'NI' => 'Nikaragua',
-    'NL' => 'Hollanda',
-    'JO' => 'Norvegjia',
-    'NP' => 'Nepal',
-    'NR' => 'Nauru',
-    'NZ' => 'Zelanda e Re',
-    'OM' => 'Oman',
-    'PK' => 'Pakistan',
-    'PA' => 'Panama',
-    'PE' => 'Peru',
-    'PH' => 'Filipine',
-    'PW' => 'Palau',
-    'PG' => 'Papua Guinea e Re',
-    'PL' => 'Polonia',
-    'KP' => 'Koreja e Veriut',
-    'PT' => 'Portugalia',
-    'PY' => 'Paraguai',
-    'QA' => 'Katar',
-    'RO' => 'Rumania',
-    'RU' => 'Rusia',
-    'RW' => 'Ruanda',
-    'SA' => 'Arabia Saudite',
-    'SD' => 'Sudan',
-    'SN' => 'Senegal',
-    'SG' => 'Singapori',
-    'SB' => 'Ishujt Solomon',
-    'SL' => 'Sierra Leone',
-    'SV' => 'El Salvador',
-    'SM' => 'San Marino',
-    'SO' => 'Somalia',
-    'RS' => 'Serbia',
-    'SS' => 'Sudani i Jugut',
-    'ST' => 'Sao Tome dhe Principe',
-    'SR' => 'Suriname',
-    'SK' => 'Sllovakia',
-    'SI' => 'Sllovenia',
-    'SE' => 'Suedia',
-    'SZ' => 'Swaziland',
-    'SC' => 'Seychelles',
-    'SY' => 'Siria',
-    'TD' => 'Çad',
-    'TG' => 'Togo',
-    'TH' => 'Tajlandë',
-    'TJ' => 'Taxhikistan',
-    'TM' => 'Turkmenistani',
-    'TL' => 'Timori Lindor',
-    'TO' => 'Tonga',
-    'TT' => 'Trinidad dhe Tobago',
-    'TN' => 'Tunizia',
-    'TR' => 'Turqia',
-    'TV' => 'Tuvalu',
-    'TZ' => 'Tanzania',
-    'UG' => 'Uganda',
-    'UA' => 'Ukraina',
-    'UY' => 'Uruguaji',
-    'US' => 'Shtetet e Bashkuara',
-    'UZ' => 'Uzbekistan',
-    'VA' => 'Qyteti i Vatikanit',
-    'VC' => 'Saint Vincent dhe Grenadines',
-    'VE' => 'Venezuela',
-    'VN' => 'Vietnami',
-    'VU' => 'Vanuatu',
-    'WS' => 'Samoa',
-    'YE' => 'Jemen',
-    'ZA' => 'Afrika e Jugut',
-    'ZM' => 'Zambia',
-    'ZW' => 'Zimbabve',
-]?
diff --git a/app/config/locale/ms.php b/app/config/locale/ms.php
index a3ce928cf..7854ac30c 100644
--- a/app/config/locale/ms.php
+++ b/app/config/locale/ms.php
@@ -2,17 +2,17 @@
 
 return [
     'settings.inspire' => '"Seni menjadi pandai adalah seni mengetahui apa yang dilihatnya."', // This is the line printed in the homepage and console 'view-source'
-    'settings.locale' => 'my',
+    'settings.locale' => 'ms',
     'settings.direction' => 'ltr',
 
     // Service - Users
     'auth.emails.team' => '%s Team',
     'auth.emails.confirm.title' => 'Pengesahan akaun',
-    'auth.emails.confirm.body' => 'my.email.auth.confirm.tpl',
+    'auth.emails.confirm.body' => 'ms.email.auth.confirm.tpl',
     'auth.emails.recovery.title' => 'Tetapkan semula kata laluan',
-    'auth.emails.recovery.body' => 'my.email.auth.recovery.tpl',
+    'auth.emails.recovery.body' => 'ms.email.auth.recovery.tpl',
     'auth.emails.invitation.title' => 'Undangan ke dalam kumpulan %s di %s',
-    'auth.emails.invitation.body' => 'my.email.auth.invitation.tpl',
+    'auth.emails.invitation.body' => 'ms.email.auth.invitation.tpl',
 
     'locale.country.unknown' => 'Tidak Diketahui',
 
diff --git a/app/config/locale/alb.continents.php b/app/config/locale/sq.continents.php
similarity index 100%
rename from app/config/locale/alb.continents.php
rename to app/config/locale/sq.continents.php
diff --git a/app/config/locale/sq.countries.php b/app/config/locale/sq.countries.php
new file mode 100644
index 000000000..fecc93e44
--- /dev/null
+++ b/app/config/locale/sq.countries.php
@@ -0,0 +1,198 @@
+<?php
+
+return [
+    'AF' => 'Afganistani',
+    'AO' => 'Angola',
+    'AL' => 'Albania',
+    'AD' => 'Andorra',
+    'AE' => 'Emiratet e Bashkuara Arabe',
+    'AR' => 'Argjentina',
+    'AM' => 'Armenia',
+    'AG' => 'Antigua dhe Barbuda',
+    'AU' => 'Australia',
+    'AT' => 'Austri',
+    'AZ' => 'Azerbajxhani',
+    'BI' => 'Burundi',
+    'BE' => 'Belgjika',
+    'BJ' => 'Benin',
+    'BF' => 'Burkina Faso',
+    'BD' => 'Bangladeshi',
+    'BG' => 'Bullgaria',
+    'BH' => 'Bahreini',
+    'BS' => 'Bahamas',
+    'BA' => 'Bosnja dhe Hercegovina',
+    'BY' => 'Belarusia',
+    'BZ' => 'Belize',
+    'BO' => 'Bolivia',
+    'BR' => 'Brazili',
+    'BB' => 'Barbados',
+    'BN' => 'Brunei',
+    'BT' => 'Bhutan',
+    'BW' => 'Botsvana',
+    'CF' => 'Republika Qendrore e Afrikës',
+    'CA' => 'Kanada',
+    'CH' => 'Zvicra',
+    'CL' => 'Kili',
+    'CN' => 'Kinë',
+    'CI' => 'Cλεte de Ivoire',
+    'CM' => 'Kamerun',
+    'CD' => 'Republika Demokratike e Kongos',
+    'CG' => 'Republika e Kongos',
+    'CO' => 'Kolumbia',
+    'KM' => 'Komoret',
+    'CV' => 'Cape Verde',
+    'CR' => 'Kosta Rika',
+    'CU' => 'Kuba',
+    'CY' => 'Qipro',
+    'CZ' => 'Republika Czecheke',
+    'DE' => 'Gjermani',
+    'DJ' => 'Djibouti',
+    'DM' => 'Dominica',
+    'DK' => 'Danimarka',
+    'DO' => 'Republika Dominikane',
+    'DZ' => 'Algjeria',
+    'EC' => 'Ekuador',
+    'EG' => 'Egjipt',
+    'ER' => 'Eritrea',
+    'ES' => 'Spanjë',
+    'BE' => 'Estonia',
+    'ET' => 'Etiopi',
+    'FI' => 'Finlanda',
+    'FJ' => 'Fiji',
+    'FR' => 'France',
+    'FM' => 'Mikronezia',
+    'GA' => 'Gabon',
+    'GB' => 'Mbretëria e Bashkuar',
+    'GE' => 'Bujqësia',
+    'GH' => 'Gana',
+    'GN' => 'Guinea',
+    'GM' => 'Gambia',
+    'GW' => 'Guinea-Bissau',
+    'GQ' => 'Guinea Ekuatoriale',
+    'GR' => 'Greqi',
+    'GD' => 'Grenada',
+    'GT' => 'Guatemala',
+    'GY' => 'Guajana',
+    'HN' => 'Honduras',
+    'HR' => 'Kroacia',
+    'HT' => 'Haiti',
+    'HU' => 'Hungaria',
+    'ID' => 'Indonezi',
+    'IN' => 'India',
+    'IE' => 'Irlanda',
+    'IR' => 'Irani',
+    'IQ' => 'Irak',
+    'IS' => 'Islanda',
+    'IL' => 'Izraeli',
+    'IT' => 'Itali',
+    'JM' => 'Xhamajka',
+    'JO' => 'Jordan',
+    'JP' => 'Japoni',
+    'KZ' => 'Kazakistani',
+    'KE' => 'Kenia',
+    'KG' => 'Kirgistani',
+    'KH' => 'Kamboxhia',
+    'KI' => 'Kiribati',
+    'KN' => 'Shen Christopher and Nevis',
+    'KR' => 'Koreja e Jugut',
+    'KW' => 'Kuvajti',
+    'LA' => 'Laos',
+    'LB' => 'Libanez',
+    'LR' => 'Liberia',
+    'LY' => 'Libia',
+    'LC' => 'St. Louis',
+    'LI' => 'Lihtenshtajni',
+    'LK' => 'Sri Lanka',
+    'LS' => 'Lesoto',
+    'LT' => 'Lituania',
+    'LU' => 'Luksemburgu',
+    'LV' => 'Letonia',
+    'MA' => 'Marok',
+    'MC' => 'Monako',
+    'MD' => 'Moldavia',
+    'MG' => 'Madagascar',
+    'MV' => 'Maldive',
+    'MX' => 'Meksika',
+    'MH' => 'Ishujt Marshall',
+    'MK' => 'Maqedonia',
+    'ML' => 'Mali',
+    'MT' => 'Maltë',
+    'MM' => 'Myanmar',
+    'ME' => 'Mali i Zi',
+    'MN' => 'Mongolia',
+    'MZ' => 'Mozambik',
+    'MR' => 'Mauritania',
+    'MU' => 'Mauritius',
+    'MW' => 'Malawi',
+    'MY' => 'Malajzia',
+    'NA' => 'Namibia',
+    'NE' => 'Niger',
+    'NG' => 'Nigeria',
+    'NI' => 'Nikaragua',
+    'NL' => 'Hollanda',
+    'JO' => 'Norvegjia',
+    'NP' => 'Nepal',
+    'NR' => 'Nauru',
+    'NZ' => 'Zelanda e Re',
+    'OM' => 'Oman',
+    'PK' => 'Pakistan',
+    'PA' => 'Panama',
+    'PE' => 'Peru',
+    'PH' => 'Filipine',
+    'PW' => 'Palau',
+    'PG' => 'Papua Guinea e Re',
+    'PL' => 'Polonia',
+    'KP' => 'Koreja e Veriut',
+    'PT' => 'Portugalia',
+    'PY' => 'Paraguai',
+    'QA' => 'Katar',
+    'RO' => 'Rumania',
+    'RU' => 'Rusia',
+    'RW' => 'Ruanda',
+    'SA' => 'Arabia Saudite',
+    'SD' => 'Sudan',
+    'SN' => 'Senegal',
+    'SG' => 'Singapori',
+    'SB' => 'Ishujt Solomon',
+    'SL' => 'Sierra Leone',
+    'SV' => 'El Salvador',
+    'SM' => 'San Marino',
+    'SO' => 'Somalia',
+    'RS' => 'Serbia',
+    'SS' => 'Sudani i Jugut',
+    'ST' => 'Sao Tome dhe Principe',
+    'SR' => 'Suriname',
+    'SK' => 'Sllovakia',
+    'SI' => 'Sllovenia',
+    'SE' => 'Suedia',
+    'SZ' => 'Swaziland',
+    'SC' => 'Seychelles',
+    'SY' => 'Siria',
+    'TD' => 'Çad',
+    'TG' => 'Togo',
+    'TH' => 'Tajlandë',
+    'TJ' => 'Taxhikistan',
+    'TM' => 'Turkmenistani',
+    'TL' => 'Timori Lindor',
+    'TO' => 'Tonga',
+    'TT' => 'Trinidad dhe Tobago',
+    'TN' => 'Tunizia',
+    'TR' => 'Turqia',
+    'TV' => 'Tuvalu',
+    'TZ' => 'Tanzania',
+    'UG' => 'Uganda',
+    'UA' => 'Ukraina',
+    'UY' => 'Uruguaji',
+    'US' => 'Shtetet e Bashkuara',
+    'UZ' => 'Uzbekistan',
+    'VA' => 'Qyteti i Vatikanit',
+    'VC' => 'Saint Vincent dhe Grenadines',
+    'VE' => 'Venezuela',
+    'VN' => 'Vietnami',
+    'VU' => 'Vanuatu',
+    'WS' => 'Samoa',
+    'YE' => 'Jemen',
+    'ZA' => 'Afrika e Jugut',
+    'ZM' => 'Zambia',
+    'ZW' => 'Zimbabve',
+];
\ No newline at end of file
diff --git a/app/config/locale/alb.php b/app/config/locale/sq.php
similarity index 61%
rename from app/config/locale/alb.php
rename to app/config/locale/sq.php
index d48173240..235d2d6d9 100644
--- a/app/config/locale/alb.php
+++ b/app/config/locale/sq.php
@@ -2,20 +2,20 @@
 
 return [
     'settings.inspire' => '"The art of being wise is the art of knowing what to overlook."', // This is the line printed in the homepage and console 'view-source'
-    'settings.locale' => 'alb',
+    'settings.locale' => 'sq',
     'settings.direction' => 'ltr',
 
     // Service - Users
     'auth.emails.team' => 'Grup %s',
     'auth.emails.confirm.title' => 'Konfirmimi i llogarisë',
-    'auth.emails.confirm.body' => 'alb.email.auth.confirm.tpl',
+    'auth.emails.confirm.body' => 'sq.email.auth.confirm.tpl',
     'auth.emails.recovery.title' => 'Rivendosni fjalëkalimin',
-    'auth.emails.recovery.body' => 'alb.email.auth.recovery.tpl',
+    'auth.emails.recovery.body' => 'sq.email.auth.recovery.tpl',
     'auth.emails.invitation.title' => 'Ftesë në grup %s në %s',
-    'auth.emails.invitation.body' => 'alb.email.auth.invitation.tpl',
+    'auth.emails.invitation.body' => 'sq.email.auth.invitation.tpl',
 
     'locale.country.unknown' => 'I panjohur',
 
-    'countries' => include 'alb.countries.php',
-    'continents' => include 'alb.continents.php',
+    'countries' => include 'sq.countries.php',
+    'continents' => include 'sq.continents.php',
 ];
diff --git a/app/init.php b/app/init.php
index fb7cca0de..92a07ae8d 100644
--- a/app/init.php
+++ b/app/init.php
@@ -56,6 +56,7 @@ const APP_LOCALES = [
     'ru', // Russian
     'si', // Sinhala
     'sl', // Slovenian
+    'sq', // Albanian
     'sv', // Swedish
     'ta', // Tamil
     'tr', // Turkish
@@ -198,6 +199,7 @@ Locale::setLanguage('ro', include __DIR__.'/config/locale/ro.php');
 Locale::setLanguage('ru', include __DIR__ . '/config/locale/ru.php');
 Locale::setLanguage('si', include __DIR__ . '/config/locale/si.php');
 Locale::setLanguage('sl', include __DIR__ . '/config/locale/sl.php');
+Locale::setLanguage('sq', include __DIR__ . '/config/locale/sq.php');
 Locale::setLanguage('sv', include __DIR__ . '/config/locale/sv.php');
 Locale::setLanguage('ta', include __DIR__ . '/config/locale/ta.php');
 Locale::setLanguage('tr', include __DIR__.'/config/locale/tr.php');