From 902fbb588bd3bb2103a2fb7ea1f3c5ceba525bb8 Mon Sep 17 00:00:00 2001 From: chaaarles Date: Thu, 26 Sep 2019 15:04:36 +0200 Subject: [PATCH 01/18] #25 Translate Locale and templates to Norwegian --- app/config/locale/no.continents.php | 11 + app/config/locale/no.countries.php | 198 ++++++++++++++++++ .../templates/no.email.auth.confirm.tpl | 24 +++ .../templates/no.email.auth.invitation.tpl | 28 +++ .../templates/no.email.auth.recovery.tpl | 25 +++ 5 files changed, 286 insertions(+) create mode 100644 app/config/locale/no.continents.php create mode 100644 app/config/locale/no.countries.php create mode 100644 app/config/locale/templates/no.email.auth.confirm.tpl create mode 100644 app/config/locale/templates/no.email.auth.invitation.tpl create mode 100644 app/config/locale/templates/no.email.auth.recovery.tpl diff --git a/app/config/locale/no.continents.php b/app/config/locale/no.continents.php new file mode 100644 index 000000000..27664083b --- /dev/null +++ b/app/config/locale/no.continents.php @@ -0,0 +1,11 @@ + 'Afrika', + 'AN' => 'Antarktis', + 'AS' => 'Asia', + 'EU' => 'Europa', + 'NA' => 'Nord-Amerika', + 'OC' => 'Oseania', + 'SA' => 'Sør-Amerika', +]; diff --git a/app/config/locale/no.countries.php b/app/config/locale/no.countries.php new file mode 100644 index 000000000..7f96c0c55 --- /dev/null +++ b/app/config/locale/no.countries.php @@ -0,0 +1,198 @@ + 'Afghanistan', + 'AO' => 'Angola', + 'AL' => 'Albania', + 'AD' => 'Andorra', + 'AE' => 'De forente arabiske emirater', + 'AR' => 'Argentina', + 'AM' => 'Armenia', + 'AG' => 'Antigua og Barbuda', + 'AU' => 'Australia', + 'AT' => 'Østerrike', + 'AZ' => 'Aserbajdsjan', + 'BI' => 'Burundi', + 'BE' => 'Belgia', + 'BJ' => 'Benin', + 'BF' => 'Burkina Faso', + 'BD' => 'Bangladesh', + 'BG' => 'Bulgaria', + 'BH' => 'Bahrain', + 'BS' => 'Bahamas', + 'BA' => 'Bosnia-Hercegovina', + 'BY' => 'Hviterussland', + 'BZ' => 'Belize', + 'BO' => 'Bolivia', + 'BR' => 'Brasil', + 'BB' => 'Barbados', + 'BN' => 'Brunei Darussalam', + 'BT' => 'Bhutan', + 'BW' => 'Botswana', + 'CF' => 'Den sentralafrikanske republikk', + 'CA' => 'Canada', + 'CH' => 'Sveits', + 'CL' => 'Chile', + 'CN' => 'Kina', + 'CI' => 'Elfenbenskysten', + 'CM' => 'Kamerun', + 'CD' => 'Den demokratiske republikken Kongo', + 'CG' => 'Republikken Kongo', + 'CO' => 'Colombia', + 'KM' => 'Komorene', + 'CV' => 'Kapp Verde', + 'CR' => 'Costa Rica', + 'CU' => 'Cuba', + 'CY' => 'Kypros', + 'CZ' => 'Tjekkia', + 'DE' => 'Tyskland', + 'DJ' => 'Djibouti', + 'DM' => 'Dominica', + 'DK' => 'Danmark', + 'DO' => 'Den dominikanske republikk', + 'DZ' => 'Algerie', + 'EC' => 'Ecuador', + 'EG' => 'Egypt', + 'ER' => 'Eritrea', + 'ES' => 'Spania', + 'EE' => 'Estland', + 'ET' => 'Etiopia', + 'FI' => 'Finland', + 'FJ' => 'Fiji', + 'FR' => 'Frankrike', + 'FM' => 'Mikronesia', + 'GA' => 'Gabon', + 'GB' => 'Storbritannia', + 'GE' => 'Georgia', + 'GH' => 'Ghana', + 'GN' => 'Guinea', + 'GM' => 'Gambia', + 'GW' => 'Guinea-Bissau', + 'GQ' => 'Ekvatorial-Guinea', + 'GR' => 'Hellas', + 'GD' => 'Grenada', + 'GT' => 'Guatemala', + 'GY' => 'Guyana', + 'HN' => 'Honduras', + 'HR' => 'Kroatia', + 'HT' => 'Haiti', + 'HU' => 'Ungarn', + 'ID' => 'Indonesia', + 'IN' => 'India', + 'IE' => 'Irland', + 'IR' => 'Iran', + 'IQ' => 'Irak', + 'IS' => 'Island', + 'IL' => 'Israel', + 'IT' => 'Italia', + 'JM' => 'Jamaica', + 'JO' => 'Jordan', + 'JP' => 'Japan', + 'KZ' => 'Kasakhstan', + 'KE' => 'Kenya', + 'KG' => 'Kirgisistan', + 'KH' => 'Kambodsja', + 'KI' => 'Kiribati', + 'KN' => 'Saint Kitts og Nevis', + 'KR' => 'Sør-Korea', + 'KW' => 'Kuwait', + 'LA' => 'Laos', + 'LB' => 'Libanon', + 'LR' => 'Liberia', + 'LY' => 'Libya', + 'LC' => 'Saint Lucia', + 'LI' => 'Liechtenstein', + 'LK' => 'Sri Lanka', + 'LS' => 'Lesotho', + 'LT' => 'Litauen', + 'LU' => 'Luxembourg', + 'LV' => 'Latvia', + 'MA' => 'Marokko', + 'MC' => 'Monaco', + 'MD' => 'Moldova', + 'MG' => 'Madagaskar', + 'MV' => 'Maldivene', + 'MX' => 'Mexico', + 'MH' => 'Marshalløyene', + 'MK' => 'Nord-Makedonia', + 'ML' => 'Mali', + 'MT' => 'Malta', + 'MM' => 'Myanmar', + 'ME' => 'Montenegro', + 'MN' => 'Mongolia', + 'MZ' => 'Mozambik', + 'MR' => 'Mauritania', + 'MU' => 'Mauritius', + 'MW' => 'Malawi', + 'MY' => 'Malaysia', + 'NA' => 'Namibia', + 'NE' => 'Niger', + 'NG' => 'Nigeria', + 'NI' => 'Nicaragua', + 'NL' => 'Nederland', + 'NO' => 'Norge', + 'NP' => 'Nepal', + 'NR' => 'Nauru', + 'NZ' => 'New Zealand', + 'OM' => 'Oman', + 'PK' => 'Pakistan', + 'PA' => 'Panama', + 'PE' => 'Peru', + 'PH' => 'Filippinene', + 'PW' => 'Palau', + 'PG' => 'Papua Ny-Guinea', + 'PL' => 'Polen', + 'KP' => 'Nord-Korea', + 'PT' => 'Portugal', + 'PY' => 'Paraguay', + 'QA' => 'Qatar', + 'RO' => 'Romania', + 'RU' => 'Russland', + 'RW' => 'Rwanda', + 'SA' => 'Saudi-Arabia', + 'SD' => 'Sudan', + 'SN' => 'Senegal', + 'SG' => 'Singapore', + 'SB' => 'Solomonøyene', + 'SL' => 'Sierra Leone', + 'SV' => 'El Salvador', + 'SM' => 'San Marino', + 'SO' => 'Somalia', + 'RS' => 'Serbia', + 'SS' => 'Sør-Sudan', + 'ST' => 'São Tomé og Príncipe', + 'SR' => 'Surinam', + 'SK' => 'Slovakia', + 'SI' => 'Slovenia', + 'SE' => 'Sverige', + 'SZ' => 'Swaziland', + 'SC' => 'Seychellene', + 'SY' => 'Syria', + 'TD' => 'Tsjad', + 'TG' => 'Togo', + 'TH' => 'Thailand', + 'TJ' => 'Tajikistan', + 'TM' => 'Turkmenistan', + 'TL' => 'Øst-Timor', + 'TO' => 'Tonga', + 'TT' => 'Trinidad og Tobago', + 'TN' => 'Tunisia', + 'TR' => 'Tyrkia', + 'TV' => 'Tuvalu', + 'TZ' => 'Tanzania', + 'UG' => 'Uganda', + 'UA' => 'Ukraina', + 'UY' => 'Uruguay', + 'US' => 'Amerikas forente stater', + 'UZ' => 'Usbekistan', + 'VA' => 'Vatikanstaten', + 'VC' => 'Saint Vincent og Grenadinene', + 'VE' => 'Venezuela', + 'VN' => 'Vietnam', + 'VU' => 'Vanuatu', + 'WS' => 'Samoa', + 'YE' => 'Jemen', + 'ZA' => 'Sør-Africa', + 'ZM' => 'Zambia', + 'ZW' => 'Zimbabwe', +]; diff --git a/app/config/locale/templates/no.email.auth.confirm.tpl b/app/config/locale/templates/no.email.auth.confirm.tpl new file mode 100644 index 000000000..abe17ff65 --- /dev/null +++ b/app/config/locale/templates/no.email.auth.confirm.tpl @@ -0,0 +1,24 @@ + + +
+ Hei {{name}}, +
+
+ Følg denne lenken for å verifisere din e-postadresse. +
+ {{redirect}} +
+
+ Hvis du ikke har spurt om å verifisere din e-post, kan du ignorere denne meldingen. +
+
+ Hilsen, +
+ {{project}}-teamet +
\ No newline at end of file diff --git a/app/config/locale/templates/no.email.auth.invitation.tpl b/app/config/locale/templates/no.email.auth.invitation.tpl new file mode 100644 index 000000000..c56e913d3 --- /dev/null +++ b/app/config/locale/templates/no.email.auth.invitation.tpl @@ -0,0 +1,28 @@ + + +
+ Hei, +
+
+ Denne mailen ble sendt til deg fordi {{owner}} har invitert deg til å bli medlem av {{team}}-teamet på {{project}}. +
+
+ Follow this link to join the {{team}} team: + Følg denne lenken for å bli med på {{team}}-teamet: +
+ {{redirect}} +
+
+ Hvis du ikke er interresert kan du ignorere denne meldingen. +
+
+ Hilsen, +
+ {{project}}-teamet +
diff --git a/app/config/locale/templates/no.email.auth.recovery.tpl b/app/config/locale/templates/no.email.auth.recovery.tpl new file mode 100644 index 000000000..75b8be0e9 --- /dev/null +++ b/app/config/locale/templates/no.email.auth.recovery.tpl @@ -0,0 +1,25 @@ + + +
+ Hei {{name}}, +
+
+ Follow this link to reset your {{project}} password. + Følg denne lenken for å tilbakestille ditt {{project}}-passord. +
+ {{redirect}} +
+
+ Hvis du ikke har spurt om å tilbakestille passordet ditt, kan du ignorere denne meldingen. +
+
+ Hilsen, +
+ {{project}}-teamet +
From 19fdfc63c5dc2046fcff0a4d5c4635e68a09eedf Mon Sep 17 00:00:00 2001 From: zeet <34406802+Kiy4h@users.noreply.github.com> Date: Sun, 29 Sep 2019 07:29:56 +0700 Subject: [PATCH 02/18] Add ID locale --- app/config/locale/id.continents.php | 11 + app/config/locale/id.countries.php | 198 ++++++++++++++++++ app/config/locale/id.php | 21 ++ .../templates/id.email.auth.confirm.tpl | 24 +++ .../templates/id.email.auth.invitation.tpl | 27 +++ .../templates/id.email.auth.recovery.tpl | 24 +++ 6 files changed, 305 insertions(+) create mode 100644 app/config/locale/id.continents.php create mode 100644 app/config/locale/id.countries.php create mode 100644 app/config/locale/id.php create mode 100644 app/config/locale/templates/id.email.auth.confirm.tpl create mode 100644 app/config/locale/templates/id.email.auth.invitation.tpl create mode 100644 app/config/locale/templates/id.email.auth.recovery.tpl diff --git a/app/config/locale/id.continents.php b/app/config/locale/id.continents.php new file mode 100644 index 000000000..4faa5e93b --- /dev/null +++ b/app/config/locale/id.continents.php @@ -0,0 +1,11 @@ + 'Afrika', + 'AN' => 'Antartika', + 'AS' => 'Asia', + 'EU' => 'Eropa', + 'NA' => 'Amerika Utara', + 'OC' => 'Oseania', + 'SA' => 'Amerika Selatan', +]; diff --git a/app/config/locale/id.countries.php b/app/config/locale/id.countries.php new file mode 100644 index 000000000..3f625140e --- /dev/null +++ b/app/config/locale/id.countries.php @@ -0,0 +1,198 @@ + 'Afganistan', + 'AO' => 'Angola', + 'AL' => 'Albania', + 'AD' => 'Andorra', + 'AE' => 'Uni Emirat Arab', + 'AR' => 'Argentina', + 'AM' => 'Armenia', + 'AG' => 'Antigua dan Barbuda', + 'AU' => 'Australia', + 'AT' => 'Austria', + 'AZ' => 'Azerbaijan', + 'BI' => 'Burundi', + 'BE' => 'Belgium', + 'BJ' => 'Benin', + 'BF' => 'Burkina Faso', + 'BD' => 'Bangladesh', + 'BG' => 'Bulgaria', + 'BH' => 'Bahrain', + 'BS' => 'Bahama', + 'BA' => 'Bosnia dan Herzegovina', + 'BY' => 'Belarus', + 'BZ' => 'Belize', + 'BO' => 'Bolivia', + 'BR' => 'Brazil', + 'BB' => 'Barbados', + 'BN' => 'Brunei', + 'BT' => 'Bhutan', + 'BW' => 'Botswana', + 'CF' => 'Republik Afrika Tengah', + 'CA' => 'Kanada', + 'CH' => 'Swiss', + 'CL' => 'Chili', + 'CN' => 'Cina', + 'CI' => 'Pantai Gading', + 'CM' => 'Kamerun', + 'CD' => 'DR Kongo', + 'CG' => 'Republik Kongo', + 'CO' => 'Kolumbia', + 'KM' => 'Komoro', + 'CV' => 'Tanjung Verde', + 'CR' => 'Kosta Rika', + 'CU' => 'Kuba', + 'CY' => 'Siprus', + 'CZ' => 'Czechia', + 'DE' => 'Jerman', + 'DJ' => 'Djibouti', + 'DM' => 'Dominika', + 'DK' => 'Denmark', + 'DO' => 'Republik Dominika', + 'DZ' => 'Aljazair', + 'EC' => 'Ekuador', + 'EG' => 'Mesir', + 'ER' => 'Eritrea', + 'ES' => 'Spanyol', + 'EE' => 'Estonia', + 'ET' => 'Etiopia', + 'FI' => 'Finlandia', + 'FJ' => 'Fiji', + 'FR' => 'Perancis', + 'FM' => 'Mikronesia', + 'GA' => 'Gabon', + 'GB' => 'Britania Raya', + 'GE' => 'Georgia', + 'GH' => 'Ghana', + 'GN' => 'Guinea', + 'GM' => 'Gambia', + 'GW' => 'Guinea-Bissau', + 'GQ' => 'Guinea Khatulistiwa', + 'GR' => 'Yunani', + 'GD' => 'Grenada', + 'GT' => 'Guatemala', + 'GY' => 'Guyana', + 'HN' => 'Honduras', + 'HR' => 'Kroasia', + 'HT' => 'Haiti', + 'HU' => 'Hungaria', + 'ID' => 'Indonesia', + 'IN' => 'India', + 'IE' => 'Irlandia', + 'IR' => 'Iran', + 'IQ' => 'Irak', + 'IS' => 'Islandia', + 'IL' => 'Israel', + 'IT' => 'Italia', + 'JM' => 'Jamaika', + 'JO' => 'Jordan', + 'JP' => 'Jepang', + 'KZ' => 'Kazakhstan', + 'KE' => 'Kenya', + 'KG' => 'Kirgistan', + 'KH' => 'Kamboja', + 'KI' => 'Kiribati', + 'KN' => 'Saint Kitts dan Nevis', + 'KR' => 'Korea Selatan', + 'KW' => 'Kuwait', + 'LA' => 'Laos', + 'LB' => 'Lebanon', + 'LR' => 'Liberia', + 'LY' => 'Libya', + 'LC' => 'Saint Lucia', + 'LI' => 'Liechtenstein', + 'LK' => 'Srilanka', + 'LS' => 'Lesotho', + 'LT' => 'Lithuania', + 'LU' => 'Luksemburg', + 'LV' => 'Latvia', + 'MA' => 'Maroko', + 'MC' => 'Monako', + 'MD' => 'Moldova', + 'MG' => 'Madagaskar', + 'MV' => 'Maladewa', + 'MX' => 'Meksiko', + 'MH' => 'Pulau Marshall', + 'MK' => 'Makedonia', + 'ML' => 'Mali', + 'MT' => 'Malta', + 'MM' => 'Myanmar', + 'ME' => 'Montenegro', + 'MN' => 'Mongolia', + 'MZ' => 'Mozambik', + 'MR' => 'Mauritania', + 'MU' => 'Mauritius', + 'MW' => 'Malawi', + 'MY' => 'Malaysia', + 'NA' => 'Namibia', + 'NE' => 'Niger', + 'NG' => 'Nigeria', + 'NI' => 'Nikaragua', + 'NL' => 'Belanda', + 'NO' => 'Norway', + 'NP' => 'Nepal', + 'NR' => 'Nauru', + 'NZ' => 'Selandia Baru', + 'OM' => 'Oman', + 'PK' => 'Pakistan', + 'PA' => 'Panama', + 'PE' => 'Peru', + 'PH' => 'Filipina', + 'PW' => 'Palau', + 'PG' => 'Papua Nugini', + 'PL' => 'Polandia', + 'KP' => 'Korea Utara', + 'PT' => 'Portugal', + 'PY' => 'Paraguay', + 'QA' => 'Qatar', + 'RO' => 'Rumania', + 'RU' => 'Rusia', + 'RW' => 'Rwanda', + 'SA' => 'Arab Saudi', + 'SD' => 'Sudan', + 'SN' => 'Senegal', + 'SG' => 'Singapura', + 'SB' => 'Pulau Solomon', + 'SL' => 'Sierra Leone', + 'SV' => 'El Salvador', + 'SM' => 'San Marino', + 'SO' => 'Somalia', + 'RS' => 'Serbia', + 'SS' => 'Sudan Selatan', + 'ST' => 'São Tomé dan Príncipe', + 'SR' => 'Suriname', + 'SK' => 'Slovakia', + 'SI' => 'Slovenia', + 'SE' => 'Swedia', + 'SZ' => 'Swaziland', + 'SC' => 'Seychelles', + 'SY' => 'Suriah', + 'TD' => 'Chad', + 'TG' => 'Untuk pergi', + 'TH' => 'Thailand', + 'TJ' => 'Tajikistan', + 'TM' => 'Turkmenistan', + 'TL' => 'Timor-Leste', + 'TO' => 'Tonga', + 'TT' => 'Trinidad dan Tobago', + 'TN' => 'Tunisia', + 'TR' => 'Turki', + 'TV' => 'Tuvalu', + 'TZ' => 'Tanzania', + 'UG' => 'Uganda', + 'UA' => 'Ukraina', + 'UY' => 'Uruguay', + 'US' => 'Amerika Serikat', + 'UZ' => 'Uzbekistan', + 'VA' => 'Kota Vatikan', + 'VC' => 'Saint Vincent dan Grenadines', + 'VE' => 'Venezuela', + 'VN' => 'Vietnam', + 'VU' => 'Vanuatu', + 'WS' => 'Samoa', + 'YE' => 'Yaman', + 'ZA' => 'Afrika Selatan', + 'ZM' => 'Zambia', + 'ZW' => 'Zimbabwe', +]; diff --git a/app/config/locale/id.php b/app/config/locale/id.php new file mode 100644 index 000000000..09f377511 --- /dev/null +++ b/app/config/locale/id.php @@ -0,0 +1,21 @@ + '"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' => 'id', + 'settings.direction' => 'ltr', + + // Service - Users + 'auth.emails.team' => 'Tim %s', + 'auth.emails.confirm.title' => 'Konfirmasi Akun', + 'auth.emails.confirm.body' => 'id.email.auth.confirm.tpl', + 'auth.emails.recovery.title' => 'Reset Kata Sandi', + 'auth.emails.recovery.body' => 'id.email.auth.recovery.tpl', + 'auth.emails.invitation.title' => 'Undangan ke Tim %s di %s', + 'auth.emails.invitation.body' => 'id.email.auth.invitation.tpl', + + 'locale.country.unknown' => 'Tidak diketahui', + + 'countries' => include 'id.countries.php', + 'continents' => include 'id.continents.php', +]; diff --git a/app/config/locale/templates/id.email.auth.confirm.tpl b/app/config/locale/templates/id.email.auth.confirm.tpl new file mode 100644 index 000000000..a6049cb8f --- /dev/null +++ b/app/config/locale/templates/id.email.auth.confirm.tpl @@ -0,0 +1,24 @@ + + +
+ Halo {{name}}, +
+
+ Ikuti link ini untuk memverifikasi alamat email Anda. +
+ {{redirect}} +
+
+ Jika Anda tidak meminta untuk memverifikasi alamat ini, Anda dapat mengabaikan pesan ini. +
+
+ Terima kasih, +
+ Tim {{project}} +
\ No newline at end of file diff --git a/app/config/locale/templates/id.email.auth.invitation.tpl b/app/config/locale/templates/id.email.auth.invitation.tpl new file mode 100644 index 000000000..7ab49b200 --- /dev/null +++ b/app/config/locale/templates/id.email.auth.invitation.tpl @@ -0,0 +1,27 @@ + + +
+ Halo, +
+
+ Email ini dikirimkan kepada Anda karena {{owner}} ingin mengundang Anda untuk menjadi anggota tim {{team}} di {{project}}. +
+
+ Ikuti link ini untuk bergabung dengan tim {{team}}: +
+ {{redirect}} +
+
+ Jika Anda tidak tertarik, Anda dapat mengabaikan pesan ini. +
+
+ Terima kasih, +
+ Tim {{project}} +
diff --git a/app/config/locale/templates/id.email.auth.recovery.tpl b/app/config/locale/templates/id.email.auth.recovery.tpl new file mode 100644 index 000000000..e0b953f22 --- /dev/null +++ b/app/config/locale/templates/id.email.auth.recovery.tpl @@ -0,0 +1,24 @@ + + +
+ Halo {{name}}, +
+
+ Ikuti link ini untuk mereset kata sandi {{project}} Anda. +
+ {{redirect}} +
+
+ Jika Anda tidak meminta untuk mereset kata sandi Anda, Anda dapat mengabaikan pesan ini. +
+
+ Terima kasih, +
+ Tim {{project}} +
From 0ebe0ad25ab4078d6efd79ab725b776b6109f258 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pessi=20P=C3=A4iv=C3=A4rinne?= Date: Sun, 29 Sep 2019 17:18:36 +0300 Subject: [PATCH 03/18] Added Finnish locales --- app/config/locale/fi.continents.php | 11 + app/config/locale/fi.countries.php | 198 ++++++++++++++++++ app/config/locale/fi.php | 21 ++ .../templates/fi.email.auth.confirm.tpl | 24 +++ .../templates/fi.email.auth.invitation.tpl | 27 +++ .../templates/fi.email.auth.recovery.tpl | 24 +++ 6 files changed, 305 insertions(+) create mode 100644 app/config/locale/fi.continents.php create mode 100644 app/config/locale/fi.countries.php create mode 100644 app/config/locale/fi.php create mode 100644 app/config/locale/templates/fi.email.auth.confirm.tpl create mode 100644 app/config/locale/templates/fi.email.auth.invitation.tpl create mode 100644 app/config/locale/templates/fi.email.auth.recovery.tpl diff --git a/app/config/locale/fi.continents.php b/app/config/locale/fi.continents.php new file mode 100644 index 000000000..7b405d761 --- /dev/null +++ b/app/config/locale/fi.continents.php @@ -0,0 +1,11 @@ + 'Afrikka', + 'AN' => 'Antarktis', + 'AS' => 'Aasia', + 'EU' => 'Eurooppa', + 'NA' => 'Pohjois Amerikka', + 'OC' => 'Oceania', + 'SA' => 'Etelä Amerikka', +]; \ No newline at end of file diff --git a/app/config/locale/fi.countries.php b/app/config/locale/fi.countries.php new file mode 100644 index 000000000..65b984413 --- /dev/null +++ b/app/config/locale/fi.countries.php @@ -0,0 +1,198 @@ + 'Afganistan', + 'AO' => 'Angola', + 'AL' => 'Albania', + 'AD' => 'Andorra', + 'AE' => 'Arabiemiirikunnat', + 'AR' => 'Argentiina', + 'AM' => 'Armenia', + 'AG' => 'Antigua ja Barbuda', + 'AU' => 'Australia', + 'AT' => 'Itävalta', + 'AZ' => 'Azerbaidžan', + 'BI' => 'Burundi', + 'BE' => 'Belgia', + 'BJ' => 'Benin', + 'BF' => 'Burkina Faso', + 'BD' => 'Bangladesh', + 'BG' => 'Bulgaria', + 'BH' => 'Bahrain', + 'BS' => 'Bahama', + 'BA' => 'Bosnia ja Hertsegovina', + 'BY' => 'Valkovenäjä', + 'BZ' => 'Belize', + 'BO' => 'Bolivia', + 'BR' => 'Brasilia', + 'BB' => 'Barbados', + 'BN' => 'Brunei', + 'BT' => 'Bhutan', + 'BW' => 'Botswana', + 'CF' => 'Keski-Afrikan tasavalta', + 'CA' => 'Kanada', + 'CH' => 'Sveitsi', + 'CL' => 'Chile', + 'CN' => 'Kiina', + 'CI' => 'Norsunluurannikko', + 'CM' => 'Kamerun', + 'CD' => 'Kongon demokraattinen tasavalta', + 'CG' => 'Kongon tasavalta', + 'CO' => 'Kolumbia', + 'KM' => 'Komorit', + 'CV' => 'Kap Verde', + 'CR' => 'Costa Rica', + 'CU' => 'Kuuba', + 'CY' => 'Kypros', + 'CZ' => 'Tšekki', + 'DE' => 'Saksa', + 'DJ' => 'Djibouti', + 'DM' => 'Dominica', + 'DK' => 'Tanska', + 'DO' => 'Dominikaaninen tasavalta', + 'DZ' => 'Algeria', + 'EC' => 'Ecuador', + 'EG' => 'Egypti', + 'ER' => 'Eritrea', + 'ES' => 'Espanja', + 'EE' => 'Viro', + 'ET' => 'Etiopia', + 'FI' => 'Suomi', + 'FJ' => 'Fidži', + 'FR' => 'Ranska', + 'FM' => 'Mikronesia', + 'GA' => 'Gabon', + 'GB' => 'Yhdistynyt kuningaskunta', + 'GE' => 'Georgia', + 'GH' => 'Ghana', + 'GN' => 'Guinea', + 'GM' => 'Gambia', + 'GW' => 'Guinea-Bissau', + 'GQ' => 'Päiväntasaajan Guinea', + 'GR' => 'Kreikka', + 'GD' => 'Grenada', + 'GT' => 'Guatemala', + 'GY' => 'Guyana', + 'HN' => 'Honduras', + 'HR' => 'Kroatia', + 'HT' => 'Haiti', + 'HU' => 'Unkari', + 'ID' => 'Indonesia', + 'IN' => 'Intia', + 'IE' => 'Irlanti', + 'IR' => 'Iran', + 'IQ' => 'Irak', + 'IS' => 'Islanti', + 'IL' => 'Israel', + 'IT' => 'Italia', + 'JM' => 'Jamaika', + 'JO' => 'Jordan', + 'JP' => 'Japani', + 'KZ' => 'Kazakstan', + 'KE' => 'Kenia', + 'KG' => 'Kirgisia', + 'KH' => 'Kambodža', + 'KI' => 'Kiribati', + 'KN' => 'Saint Kitts ja Nevis', + 'KR' => 'Etelä-Korea', + 'KW' => 'Kuwait', + 'LA' => 'Laos', + 'LB' => 'Libanon', + 'LR' => 'Liberia', + 'LY' => 'Libya', + 'LC' => 'Saint Lucia', + 'LI' => 'Liechtenstein', + 'LK' => 'Sri Lanka', + 'LS' => 'Lesotho', + 'LT' => 'Liettua', + 'LU' => 'Luxemburg', + 'LV' => 'Latvia', + 'MA' => 'Marokko', + 'MC' => 'Monaco', + 'MD' => 'Moldova', + 'MG' => 'Madagaskar', + 'MV' => 'Malediivit', + 'MX' => 'Meksiko', + 'MH' => 'Marshallinsaaret', + 'MK' => 'Makedonia', + 'ML' => 'Mali', + 'MT' => 'Malta', + 'MM' => 'Myanmar', + 'ME' => 'Montenegro', + 'MN' => 'Mongolia', + 'MZ' => 'Mosambik', + 'MR' => 'Mauritania', + 'MU' => 'Mauritius', + 'MW' => 'Malawi', + 'MY' => 'Malesia', + 'NA' => 'Namibia', + 'NE' => 'Niger', + 'NG' => 'Nigeria', + 'NI' => 'Nicaragua', + 'NL' => 'Alankomaat', + 'EI' => 'Norja', + 'NP' => 'Nepal', + 'NR' => 'Nauru', + 'NZ' => 'Uusi-Seelanti', + 'OM' => 'Oman', + 'PK' => 'Pakistan', + 'PA' => 'Panama', + 'PE' => 'Peru', + 'PH' => 'Filippiinit', + 'PW' => 'Palau', + 'PG' => 'Papua-Uusi-Guinea', + 'PL' => 'Puola', + 'KP' => 'Pohjois-Korea', + 'PT' => 'Portugali', + 'PY' => 'Paraguay', + 'QA' => 'Qatar', + 'RO' => 'Romania', + 'RU' => 'Venäjä', + 'RW' => 'Ruanda', + 'SA' => 'Saudi-Arabia', + 'SD' => 'Sudan', + 'SN' => 'Senegal', + 'SG' => 'Singapore', + 'SB' => 'Salomonsaaret', + 'SL' => 'Sierra Leone', + 'SV' => 'Salvador', + 'SM' => 'San Marino', + 'SO' => 'Somalia', + 'RS' => 'Serbia', + 'SS' => 'Etelä-Sudan', + 'ST' => 'São Tomé ja Príncipe', + 'SR' => 'Suriname', + 'SK' => 'Slovakia', + 'SI' => 'Slovenia', + 'SE' => 'Ruotsi', + 'SZ' => 'Swazimaa', + 'SC' => 'Seychellit', + 'SY' => 'Syyria', + 'TD' => 'Tšad', + 'TG' => 'Togo', + 'TH' => 'Thaimaa', + 'TJ' => 'Tadžikistan', + 'TM' => 'Turkmenistan', + 'TL' => 'Timor-Leste', + 'TO' => 'Tonga', + 'TT' => 'Trinidad ja Tobago', + 'TN' => 'Tunisia', + 'TR' => 'Turkki', + 'TV' => 'Tuvalu', + 'TZ' => 'Tansania', + 'UG' => 'Uganda', + 'UA' => 'Ukraina', + 'UY' => 'Uruguay', + 'US' => 'Yhdysvallat', + 'UZ' => 'Uzbekistan', + 'VA' => 'Vatikaanikaupunki', + 'VC' => 'Saint Vincent ja Grenadiinit', + 'VE' => 'Venezuela', + 'VN' => 'Vietnam', + 'VU' => 'Vanuatu', + 'WS' => 'Samoa', + 'YE' => 'Jemen', + 'ZA' => 'Etelä-Afrikka', + 'ZM' => 'Sambia', + 'ZW' => 'Zimbabwe', +]; \ No newline at end of file diff --git a/app/config/locale/fi.php b/app/config/locale/fi.php new file mode 100644 index 000000000..fac6b5586 --- /dev/null +++ b/app/config/locale/fi.php @@ -0,0 +1,21 @@ + '"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' => 'fi', + 'settings.direction' => 'ltr', + + // Service - Users + 'auth.emails.team' => '%s Tiimi', + 'auth.emails.confirm.title' => 'Tilin Vahvistus', + 'auth.emails.confirm.body' => 'en.email.auth.confirm.tpl', + 'auth.emails.recovery.title' => 'Salasanan Nollaus', + 'auth.emails.recovery.body' => 'en.email.auth.recovery.tpl', + 'auth.emails.invitation.title' => 'Kutsu %s Tiimiin %s', + 'auth.emails.invitation.body' => 'en.email.auth.invitation.tpl', + + 'locale.country.unknown' => 'Unknown', + + 'countries' => include 'fi.countries.php', + 'continents' => include 'fi.continents.php', +]; \ No newline at end of file diff --git a/app/config/locale/templates/fi.email.auth.confirm.tpl b/app/config/locale/templates/fi.email.auth.confirm.tpl new file mode 100644 index 000000000..1354e7a5d --- /dev/null +++ b/app/config/locale/templates/fi.email.auth.confirm.tpl @@ -0,0 +1,24 @@ + + +
+ Hei {{name}}, +
+
+ Varmista sähköpostiosoite tästä linkistä. +
+ {{redirect}} +
+
+ Jos et kysynyt tämän sähköpostiosoitteen varmistamista, voit sivuuttaa tämän viestin. +
+
+ kiitos, +
+ {{project}} tiimi +
\ No newline at end of file diff --git a/app/config/locale/templates/fi.email.auth.invitation.tpl b/app/config/locale/templates/fi.email.auth.invitation.tpl new file mode 100644 index 000000000..7e955d021 --- /dev/null +++ b/app/config/locale/templates/fi.email.auth.invitation.tpl @@ -0,0 +1,27 @@ + + +
+ Hei, +
+
+ Sait tämän sähköpostin koska {{owner}} halusi kutsua sinut jäseneksi {{team}} tiimiin, täällä {{project}}. +
+
+ Käytä tätä linkkiä liittyäksesi {{team}} tiimiin: +
+ {{redirect}} +
+
+ Jos et ole kiinnostunut, voit sivuuttaa tämän viestin. +
+
+ kiitos, +
+ {{project}} tiimi +
diff --git a/app/config/locale/templates/fi.email.auth.recovery.tpl b/app/config/locale/templates/fi.email.auth.recovery.tpl new file mode 100644 index 000000000..b273c6561 --- /dev/null +++ b/app/config/locale/templates/fi.email.auth.recovery.tpl @@ -0,0 +1,24 @@ + + +
+ Hei {{name}}, +
+
+ Resetoi {{project}} salasana tästä linkistä. +
+ {{redirect}} +
+
+ Jos et pyytänyt salasanan nollaamista, voit sivuuttaa tämän viestin- +
+
+ Kiitos, +
+ {{project}} tiimi +
\ No newline at end of file From 5b3053c545a02dc8a1755c08857310b1eee0123a Mon Sep 17 00:00:00 2001 From: Sergi Vos Date: Sun, 29 Sep 2019 17:08:28 +0200 Subject: [PATCH 04/18] Add Catalan locales --- app/config/locale/cat.continents.php | 11 + app/config/locale/cat.countries.php | 197 ++++++++++++++++++ app/config/locale/cat.php | 21 ++ .../templates/cat.email.auth.confirm.tpl | 24 +++ .../templates/cat.email.auth.invitation.tpl | 28 +++ .../templates/cat.email.auth.recovery.tpl | 24 +++ 6 files changed, 305 insertions(+) create mode 100644 app/config/locale/cat.continents.php create mode 100644 app/config/locale/cat.countries.php create mode 100644 app/config/locale/cat.php create mode 100644 app/config/locale/templates/cat.email.auth.confirm.tpl create mode 100644 app/config/locale/templates/cat.email.auth.invitation.tpl create mode 100644 app/config/locale/templates/cat.email.auth.recovery.tpl diff --git a/app/config/locale/cat.continents.php b/app/config/locale/cat.continents.php new file mode 100644 index 000000000..c5e3debb3 --- /dev/null +++ b/app/config/locale/cat.continents.php @@ -0,0 +1,11 @@ + 'Àfrica', + 'AN' => 'Antàrtica', + 'AS' => 'Àsia', + 'EU' => 'Europa', + 'NA' => 'Amèrica del Nord', + 'OC' => 'Oceania', + 'SA' => 'Amèrica del Sud', +]; diff --git a/app/config/locale/cat.countries.php b/app/config/locale/cat.countries.php new file mode 100644 index 000000000..a6172a991 --- /dev/null +++ b/app/config/locale/cat.countries.php @@ -0,0 +1,197 @@ + 'Afganistan', + 'AO' => 'Angola', + 'AL' => 'Albània', + 'AD' => 'Andorra', + 'AE' => 'Unió dels Emirats Àrabs Units', + 'AR' => 'Argentina', + 'AM' => 'Armènia', + 'AG' => 'Antigua o Barbuda', + 'AU' => 'Austràlia', + 'AT' => 'Àustria', + 'AZ' => 'Azerbaidjan', + 'BI' => 'Burundi', + 'BE' => 'Bèlgica', + 'BJ' => 'Benín', + 'BF' => 'Burkina Faso', + 'BD' => 'Bangla Desh', + 'BG' => 'Bulgaria', + 'BH' => 'Bahrain', + 'BS' => 'Bahamas', + 'BA' => 'Bòsnia i Hercegovina', + 'BY' => 'Bielorússia', + 'BZ' => 'Belize', + 'BO' => 'Bolívia', + 'BR' => 'Brasil', + 'BB' => 'Barbados', + 'BN' => 'Brunei', + 'BT' => 'Bhutan', + 'BW' => 'Botswana', + 'CF' => 'República Centreafricana', + 'CA' => 'Canadà', + 'CH' => 'Suïssa', + 'CL' => 'Xile', + 'CN' => 'Xina', + 'CI' => 'Costa d\'Ivori', + 'CM' => 'Camerun', + 'CD' => 'República Democràtica del Congo', + 'CG' => 'República del congo', + 'CO' => 'Colòmbia', + 'KM' => 'Comores', + 'CV' => 'Cap Verd', + 'CR' => 'Costa Rica', + 'CU' => 'Cuba', + 'CY' => 'Xipre', + 'CZ' => 'Txèquia', + 'DE' => 'Alemanya', + 'DJ' => 'Djibouti', + 'DM' => 'Dominica', + 'DK' => 'Dinamarca', + 'DO' => 'República Dominicana', + 'DZ' => 'Argelia', + 'EC' => 'Equador', + 'EG' => 'Egipte', + 'ER' => 'Eritrea', + 'ES' => 'Espanya', + 'EE' => 'Estònia', + 'ET' => 'Etiòpia', + 'FI' => 'Finlàndia', + 'FJ' => 'Fiji', + 'FR' => 'França', + 'FM' => 'Micronèsia', + 'GA' => 'Gabon', + 'GB' => 'Regne Unit', + 'GE' => 'Geòrgia', + 'GH' => 'Ghana', + 'GN' => 'Guinea', + 'GM' => 'Gàmbia', + 'GW' => 'Guinea Bissau', + 'GQ' => 'Guinea Equatorial', + 'GR' => 'Grècia', + 'GD' => 'Granada', + 'GT' => 'Guatemala', + 'GY' => 'Guaiana', + 'HN' => 'Hondures', + 'HR' => 'Croàcia', + 'HT' => 'Haití', + 'HU' => 'Hungria', + 'ID' => 'Indonèsia', + 'IN' => 'Índia', + 'IE' => 'Irlanda', + 'IR' => 'Iran', + 'IQ' => 'Iraq', + 'IS' => 'Islàndia', + 'IL' => 'Israel', + 'IT' => 'Itàlia', + 'JM' => 'Jamaica', + 'JO' => 'Jordà', + 'JP' => 'Japó', + 'KZ' => 'Kazakhstan', + 'KE' => 'Kenya', + 'KG' => 'Kirguizistan', + 'KH' => 'Cambodja', + 'KI' => 'Kiribati', + 'KN' => 'Sant Cristòfol i Neus', + 'KR' => 'Corea del Sud', + 'KW' => 'Kuwait', + 'LA' => 'Laos', + 'LB' => 'Líban', + 'LR' => 'Libèria', + 'LY' => 'Líbia', + 'LC' => 'Santa Llúcia', + 'LI' => 'Liechtenstein', + 'LK' => 'Sri Lanka', + 'LS' => 'Lesoto', + 'LT' => 'Lituània', + 'LU' => 'Luxemburg', + 'LV' => 'Letònia', + 'MA' => 'Marroc', + 'MC' => 'Mònaco', + 'MD' => 'Moldàvia', + 'MG' => 'Madagascar', + 'MV' => 'Maldives', + 'MX' => 'Mèxic', + 'MH' => 'Illes Marshall', + 'MK' => 'Macedònia', + 'ML' => 'Mali', + 'MT' => 'Malta', + 'MM' => 'Myanmar', + 'ME' => 'Montenegro', + 'MN' => 'Mongòlia', + 'MZ' => 'Moçambic', + 'MR' => 'Mauritània', + 'MU' => 'Maurici', + 'MW' => 'Malawi', + 'MY' => 'Malàsia', + 'NA' => 'Namíbia', + 'NE' => 'Níger', + 'NG' => 'Nigèria', + 'NI' => 'Nicaragua', + 'NL' => 'Països Baixos', + 'NO' => 'Noruega', + 'NP' => 'Nepal', + 'NR' => 'Nauru', + 'NZ' => 'Nova Zelanda', + 'OM' => 'Oman', + 'PK' => 'Pakistan', + 'PA' => 'Panamà', + 'PE' => 'Perú', + 'PH' => 'Filipines', + 'PW' => 'Palaos', + 'PG' => 'Papua Nova Guinea', + 'PL' => 'Polònia', + 'KP' => 'Corea del Nord', + 'PT' => 'Portugal', + 'PY' => 'Paraguai', + 'QA' => 'Katar', + 'RO' => 'Romania', + 'RU' => 'Rússia', + 'RW' => 'Rwanda', + 'SA' => 'Aràbia Saudita', + 'SD' => 'Sudan', + 'SN' => 'Senegal', + 'SG' => 'Singapur', + 'SB' => 'Illes Salomó', + 'SL' => 'Sierra Leone', + 'SV' => 'El Salvador', + 'SM' => 'San Marí', + 'SO' => 'Somàlia', + 'RS' => 'Sèrbia', + 'SS' => 'Sudàn del Sud', + 'ST' => 'Santo Tomé y Príncipe', + 'SR' => 'Surinam', + 'SK' => 'Eslovàquia', + 'SI' => 'Eslovènia', + 'SE' => 'Suècia', + 'SZ' => 'Swazilàndia', + 'SC' => 'Seychelles', + 'SY' => 'Síria', + 'TD' => 'Txad', + 'TG' => 'Togo', + 'TH' => 'Tailàndia', + 'TJ' => 'Tadjikistan', + 'TM' => 'Turkmenistan', + 'TL' => 'Timor Oriental', + 'TO' => 'Tonga', + 'TT' => 'Trinitat i Tobago', + 'TN' => 'Tunísia', + 'TR' => 'Turquia', + 'TV' => 'Tuvalu', + 'TZ' => 'Tanzània', + 'UG' => 'Uganda', + 'UA' => 'Ucraïna', + 'UY' => 'Uruguai', + 'US' => 'Estats Units', + 'UZ' => 'Uzbekistan', + 'VA' => 'Ciudat del Vaticà', + 'VC' => 'Saint Vincent i les Grenadines', + 'VE' => 'Veneçuela', + 'VN' => 'Vietnam', + 'VU' => 'Vanuatu', + 'WS' => 'Samoa', + 'YE' => 'Iemen', + 'ZA' => 'Sud-àfrica', + 'ZM' => 'Zàmbia', + 'ZW' => 'Zimbabwe', +]; diff --git a/app/config/locale/cat.php b/app/config/locale/cat.php new file mode 100644 index 000000000..26b50a57c --- /dev/null +++ b/app/config/locale/cat.php @@ -0,0 +1,21 @@ + '"L\'art de ser sabi és l\'art de saber què passar per alt"', // This is the line printed in the homepage and console 'view-source' + 'settings.locale' => 'cat', + 'settings.direction' => 'ltr', + + // Service - Users + 'auth.emails.team' => '%s Equip', + 'auth.emails.confirm.title' => 'Confirmació del compte', + 'auth.emails.confirm.body' => 'cat.email.auth.confirm.tpl', + 'auth.emails.recovery.title' => 'Restablir contrasenya', + 'auth.emails.recovery.body' => 'cat.email.auth.recovery.tpl', + 'auth.emails.invitation.title' => 'Invitació a l\'Equipo %s a %s', + 'auth.emails.invitation.body' => 'cat.email.auth.invitation.tpl', + + 'locale.country.unknown' => 'Desconegut', + + 'countries' => include 'cat.countries.php', + 'continents' => include 'cat.continents.php', +]; diff --git a/app/config/locale/templates/cat.email.auth.confirm.tpl b/app/config/locale/templates/cat.email.auth.confirm.tpl new file mode 100644 index 000000000..1e5513512 --- /dev/null +++ b/app/config/locale/templates/cat.email.auth.confirm.tpl @@ -0,0 +1,24 @@ + + +
+ Hola {{name}}, +
+
+ Segueix aquest enllaç per verificar la teva direcció de correu: +
+ {{redirect}} +
+
+ Si no has solicitat verificar aquesta direcció, pots ignorar aquest missatge. +
+
+ Gràcies, +
+ Equip {{project}} +
diff --git a/app/config/locale/templates/cat.email.auth.invitation.tpl b/app/config/locale/templates/cat.email.auth.invitation.tpl new file mode 100644 index 000000000..f52129e1b --- /dev/null +++ b/app/config/locale/templates/cat.email.auth.invitation.tpl @@ -0,0 +1,28 @@ + + +
+ Hola, +
+
+ T'hem enviat aquest correu perquè {{owner}} et vol convidar a formar part + de l'equip {{team}} a {{project}}. +
+
+ Segueix aquest enllaç per unir-te a l'equip {{team}}: +
+ {{redirect}} +
+
+ Si no estàs interessat, pots ignorar aquest missatge. +
+
+ Gràcies, +
+ Equip {{project}} +
diff --git a/app/config/locale/templates/cat.email.auth.recovery.tpl b/app/config/locale/templates/cat.email.auth.recovery.tpl new file mode 100644 index 000000000..62cc4fae6 --- /dev/null +++ b/app/config/locale/templates/cat.email.auth.recovery.tpl @@ -0,0 +1,24 @@ + + +
+ Hola {{name}}, +
+
+ Segueix aquest enllaç per restablir la teva contrasenya de {{project}}. +
+ {{redirect}} +
+
+ Si no has demanat restablir la teva contrasenya, pots ignorar aquest missatge. +
+
+ Gràcies, +
+ Equip {{project}} +
From 31a0a482b40fd1f144183bea3795a01760c79353 Mon Sep 17 00:00:00 2001 From: Dmitry Danilov Date: Wed, 25 Sep 2019 23:20:04 +0300 Subject: [PATCH 05/18] add UA locale --- .../templates/ua.email.auth.confirm.tpl | 24 +++ .../templates/ua.email.auth.invitation.tpl | 27 +++ .../templates/ua.email.auth.recovery.tpl | 24 +++ app/config/locale/ua.continents.php | 10 + app/config/locale/ua.countries.php | 197 ++++++++++++++++++ app/config/locale/ua.php | 20 ++ app/init.php | 1 + 7 files changed, 303 insertions(+) create mode 100644 app/config/locale/templates/ua.email.auth.confirm.tpl create mode 100644 app/config/locale/templates/ua.email.auth.invitation.tpl create mode 100644 app/config/locale/templates/ua.email.auth.recovery.tpl create mode 100644 app/config/locale/ua.continents.php create mode 100644 app/config/locale/ua.countries.php create mode 100644 app/config/locale/ua.php diff --git a/app/config/locale/templates/ua.email.auth.confirm.tpl b/app/config/locale/templates/ua.email.auth.confirm.tpl new file mode 100644 index 000000000..8d135457f --- /dev/null +++ b/app/config/locale/templates/ua.email.auth.confirm.tpl @@ -0,0 +1,24 @@ + + +
+ Вітаємо {{name}}, +
+
+ Перейдіть за цим посиланням, та підтвердіть свою електронну адресу +
+ {{redirect}} +
+
+ Якщо ви не запитували підтвердження цієї адреси, проігноруйте це повідомлення. +
+
+ Дякуємо, +
+ команда {{project}} +
\ No newline at end of file diff --git a/app/config/locale/templates/ua.email.auth.invitation.tpl b/app/config/locale/templates/ua.email.auth.invitation.tpl new file mode 100644 index 000000000..8daaecbaa --- /dev/null +++ b/app/config/locale/templates/ua.email.auth.invitation.tpl @@ -0,0 +1,27 @@ + + +
+ Вітаємо, +
+
+ Цей лист був надісланий вам тому що {{owner}} хоче запросити вас стати членом команди {{team}} у {{project}}. +
+
+ Перейдіть за цим посиланням щоб приєднатись до команди {{team}} : +
+ {{redirect}} +
+
+ Якщо ви не зацікавлені, проігноруйте це повідомлення. +
+
+ Дякуємо, +
+ Команда {{project}} +
diff --git a/app/config/locale/templates/ua.email.auth.recovery.tpl b/app/config/locale/templates/ua.email.auth.recovery.tpl new file mode 100644 index 000000000..b833a6575 --- /dev/null +++ b/app/config/locale/templates/ua.email.auth.recovery.tpl @@ -0,0 +1,24 @@ + + +
+ Вітаємо, {{name}}, +
+
+ Перейдіть за цим посиланням для того щоб скинути свій пароль для {{project}} . +
+ {{redirect}} +
+
+ Якщо ви не запитували скидання паролю, проігноруйте це повідомлення. +
+
+ Дякуємо, +
+ команда {{project}} +
diff --git a/app/config/locale/ua.continents.php b/app/config/locale/ua.continents.php new file mode 100644 index 000000000..a9646ca14 --- /dev/null +++ b/app/config/locale/ua.continents.php @@ -0,0 +1,10 @@ + 'Африка', + 'AN' => 'Антарктика', + 'AS' => 'Азія', + 'EU' => 'Європа', + 'NA' => 'Північна Америка', + 'OC' => 'Океанія', + 'SA' => 'Південна Америка', +]; \ No newline at end of file diff --git a/app/config/locale/ua.countries.php b/app/config/locale/ua.countries.php new file mode 100644 index 000000000..eae8e8ebd --- /dev/null +++ b/app/config/locale/ua.countries.php @@ -0,0 +1,197 @@ + 'Афганістан', + 'AO' => 'Ангола', + 'AL' => 'Албанія', + 'AD' => 'Андора', + 'AE' => 'Об\'єднані Арабські Емірати', + 'AR' => 'Аргентина', + 'AM' => 'Арменія', + 'AG' => 'Антигуа і Барбуда', + 'AU' => 'Австралія', + 'AT' => 'Австрія', + 'AZ' => 'Азербайджан', + 'BI' => 'Бурунді', + 'BE' => 'Бельгія', + 'BJ' => 'Бенін', + 'BF' => 'Буркіна Фасо', + 'BD' => 'Бангладеш', + 'BG' => 'Болгарія', + 'BH' => 'Бахрейн', + 'BS' => 'Багамські острови', + 'BA' => 'Боснія і Герцеговина', + 'BY' => 'Беларусь', + 'BZ' => 'Бейліз', + 'BO' => 'Болівія', + 'BR' => 'Бразилія', + 'BB' => 'Барбадос', + 'BN' => 'Бруней', + 'BT' => 'Бутан', + 'BW' => 'Ботсвана', + 'CF' => 'Центральноафриканська Республіка', + 'CA' => 'Канада', + 'CH' => 'Швейцарія', + 'CL' => 'Чілі', + 'CN' => 'Китай', + 'CI' => 'Кот-д\'Ивуар', + 'CM' => 'Камерун', + 'CD' => 'ДР Конго', + 'CG' => 'Республіка Конго', + 'CO' => 'Колумбія', + 'KM' => 'Комори', + 'CV' => 'Кабо-Верде', + 'CR' => 'Коста-Ріка', + 'CU' => 'Куба', + 'CY' => 'Кіпр', + 'CZ' => 'Чехія', + 'DE' => 'Німеччина', + 'DJ' => 'Джибуті', + 'DM' => 'Домініка', + 'DK' => 'Данія', + 'DO' => 'Домініканська Республіка', + 'DZ' => 'Алжир', + 'EC' => 'Эквадор', + 'EG' => 'Єгипет', + 'ER' => 'Ерітрея', + 'ES' => 'Іспанія', + 'EE' => 'Естонія', + 'ET' => 'Ефіопія', + 'FI' => 'Фінляндія', + 'FJ' => 'Фіджи', + 'FR' => 'Франція', + 'FM' => 'Мікронезія', + 'GA' => 'Габон', + 'GB' => 'Велика Британія', + 'GE' => 'Грузія', + 'GH' => 'Гана', + 'GN' => 'Гвінея', + 'GM' => 'Гамбія', + 'GW' => 'Гвінея-Бісау', + 'GQ' => 'Экваторіальна Гвінея', + 'GR' => 'Греція', + 'GD' => 'Гренада', + 'GT' => 'Гватемала', + 'GY' => 'Гайана', + 'HN' => 'Гондурас', + 'HR' => 'Хорватія', + 'HT' => 'Гаїті', + 'HU' => 'Угорщина', + 'ID' => 'Індонезія', + 'IN' => 'Індія', + 'IE' => 'Ірландія', + 'IR' => 'Іран', + 'IQ' => 'Ірак', + 'IS' => 'Ісландія', + 'IL' => 'Ізраїль', + 'IT' => 'Італія', + 'JM' => 'Ямайка', + 'JO' => 'Іорданія', + 'JP' => 'Японія', + 'KZ' => 'Казахстан', + 'KE' => 'Кенія', + 'KG' => 'Кіргізія', + 'KH' => 'Камбоджа', + 'KI' => 'Кірібаті', + 'KN' => 'Сент-Кітс і Невіс', + 'KR' => 'Південна Корея', + 'KW' => 'Кувейт', + 'LA' => 'Лаос', + 'LB' => 'Ліван', + 'LR' => 'Ліберія', + 'LY' => 'Лівія', + 'LC' => 'Сент-Люсія', + 'LI' => 'Ліхтенштейн', + 'LK' => 'Шрі Ланка', + 'LS' => 'Лесото', + 'LT' => 'Литва', + 'LU' => 'Люксембург', + 'LV' => 'Латвія', + 'MA' => 'Марокко', + 'MC' => 'Монако', + 'MD' => 'Молдова', + 'MG' => 'Мадагаскар', + 'MV' => 'Мальдіви', + 'MX' => 'Мексика', + 'MH' => 'Маршаллові острови', + 'MK' => 'Македонія', + 'ML' => 'Малі', + 'MT' => 'Мальта', + 'MM' => 'М\'янма', + 'ME' => 'Чорногорія', + 'MN' => 'Монголія', + 'MZ' => 'Мозамбік', + 'MR' => 'Мавританія', + 'MU' => 'Маврікій', + 'MW' => 'Малаві', + 'MY' => 'Малайзія', + 'NA' => 'Намібія', + 'NE' => 'Нігер', + 'NG' => 'Нігерія', + 'NI' => 'Нікарагуа', + 'NL' => 'Нідерланди', + 'NO' => 'Норвегія', + 'NP' => 'Непал', + 'NR' => 'Науру', + 'NZ' => 'Нова Зеландія', + 'OM' => 'Оман', + 'PK' => 'Пакістан', + 'PA' => 'Панама', + 'PE' => 'Перу', + 'PH' => 'Філіппіни', + 'PW' => 'Палау', + 'PG' => 'Папуа Нова Гвінея', + 'PL' => 'Польша', + 'KP' => 'Північна Корея', + 'PT' => 'Португалія', + 'PY' => 'Парагвай', + 'QA' => 'Катар', + 'RO' => 'Румунія', + 'RU' => 'Росія', + 'RW' => 'Руанда', + 'SA' => 'Саудовська Аравія', + 'SD' => 'Судан', + 'SN' => 'Сенегал', + 'SG' => 'Сінгапур', + 'SB' => 'Соломонові Острови', + 'SL' => 'Сьєрра-Леоне', + 'SV' => 'Ель Сальвадор', + 'SM' => 'Сан Маріно', + 'SO' => 'Сомалі', + 'RS' => 'Сербія', + 'SS' => 'Південний Судан', + 'ST' => 'Сан-Томе і Принсіпі', + 'SR' => 'Суринам', + 'SK' => 'Словакія', + 'SI' => 'Словенія', + 'SE' => 'Швеція', + 'SZ' => 'Свазіленд', + 'SC' => 'Сейшели', + 'SY' => 'Сирія', + 'TD' => 'Чад', + 'TG' => 'Того', + 'TH' => 'Таіланд', + 'TJ' => 'Таджикістан', + 'TM' => 'Туркменістан', + 'TL' => 'Східний Тимор', + 'TO' => 'Тонга', + 'TT' => 'Тринідад і Тобаго', + 'TN' => 'Туніс', + 'TR' => 'Туреччина', + 'TV' => 'Тувалу', + 'TZ' => 'Танзанія', + 'UG' => 'Уганда', + 'UA' => 'Україна', + 'UY' => 'Уругвай', + 'US' => 'Сполучені Штати', + 'UZ' => 'Узбекистан', + 'VA' => 'Ватикан', + 'VC' => 'Сент-Вінсент і Гренадин', + 'VE' => 'Венесуела', + 'VN' => 'В\'єтнам', + 'VU' => 'Вануату', + 'WS' => 'Самоа', + 'YE' => 'Ємен', + 'ZA' => 'Південна Африка', + 'ZM' => 'Замбія', + 'ZW' => 'Зімбабве', +]; \ No newline at end of file diff --git a/app/config/locale/ua.php b/app/config/locale/ua.php new file mode 100644 index 000000000..6a2a0f455 --- /dev/null +++ b/app/config/locale/ua.php @@ -0,0 +1,20 @@ + '"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' => 'ua', + 'settings.direction' => 'rtl', + + 'auth.emails.team' => '%s Команда', + 'auth.emails.confirm.title' => 'Підтвердження Акаунту' , + 'auth.emails.confirm.body' => 'ua.email.auth.confirm.tpl', + 'auth.emails.recovery.title' => 'Скидання пароля', + 'auth.emails.recovery.body' => 'ua.email.auth.recovery.tpl', + 'auth.emails.invitation.title' => 'Запрошення до %s Команди у %s', + 'auth.emails.invitation.body' => 'ua.email.auth.invitation.tpl', + + 'locale.country.unknown' => 'Невідомо', + + 'countries' => include 'ua.countries.php', + 'continents' => include 'ua.continents.php', +]; diff --git a/app/init.php b/app/init.php index 4db74f3bc..014e131dc 100644 --- a/app/init.php +++ b/app/init.php @@ -128,6 +128,7 @@ Locale::$exceptions = false; Locale::setLanguage('en', include __DIR__ . '/config/locale/en.php'); Locale::setLanguage('he', include __DIR__ . '/config/locale/he.php'); +Locale::setLanguage('ua', include __DIR__ . '/config/locale/ua.php'); Locale::setLanguage('pt-br', include __DIR__ . '/config/locale/pt-br.php'); Locale::setLanguage('es', include __DIR__ . '/config/locale/es.php'); From 0c8b8f553d4b2258f96ab397a38955925db1cc9a Mon Sep 17 00:00:00 2001 From: DEBSUBHRA ROY <42496309+DEBSUBHRO@users.noreply.github.com> Date: Tue, 1 Oct 2019 03:43:12 +0530 Subject: [PATCH 06/18] Update README.md Added and changed some terms for a better view of the document. Removed the bulletins from the "currently supported platforms" section for a better view. --- README.md | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/README.md b/README.md index 965f46c5a..330644b6f 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,8 @@

- Appwrite Logo + Appwrite Logo

- Simple Backend Server for your [Vue / Angular / React / iOS / Android / Flutter / *ANY*] Frontend App + Simple Backend Server for your [Vue / Angular / React / iOS / Android / Flutter / *ANY OTHER*] Frontend App

@@ -37,9 +37,9 @@ curl -o docker-compose.yml https://appwrite.io/docker-compose.yml?port=80 && \ docker-compose up -d --remove-orphans ``` -Once the Docker installation completes, go to http://localhost to access the Appwrite console from your browser. Please notice that on non-linux native hosts the server might take a few minutes to start after installation completes. +Once the Docker installation is completed, go to http://localhost to access the Appwrite console from your browser. Please notice that on non-linux native hosts the server might take a few minutes to start after the completion of the installation. -For advanced, production and custom installation check out our Docker [environment variables](/docs/EnviornementVariables.md) docs. +For advanced, production and custom installation, check out our Docker [environment variables](/docs/EnviornementVariables.md) docs. ### Changing Port Number @@ -50,9 +50,9 @@ In case your port 80 is already taken, change the port number in the command abo Getting started with Appwrite is as easy as creating a new project, choosing your platform and integrating its SDK in your code. You can easily get started with your platform of choice by reading one of our getting started tutorials. * [Getting Started for Web](https://appwrite.io/docs/getting-started-for-web) +* [Getting Started for Server](https://appwrite.io/docs/getting-started-for-server) * Getting Started for Android (soon...) * Getting Started for iOS (soon...) -* [Getting Started for Server](https://appwrite.io/docs/getting-started-for-server) ### Services @@ -69,20 +69,20 @@ For the complete API documentation, visit [https://appwrite.io/docs](https://app ### SDKs -Currently we are supporting a few SDK libraries and we are constantly working on adding new ones. +Currently, we are supporting only a few SDK libraries and are constantly working on including new ones. Below is a list of currently supported platforms and languages. If you wish to help us add support to your platform of choice you can go over to our [SDK Generator](https://github.com/appwrite/sdk-generator) project and view our contribution guide. -* ✅ [JS](https://github.com/appwrite/sdk-for-js) (Maintained by the Appwrite Team) -* ✅ [PHP](https://github.com/appwrite/sdk-for-php) (Maintained by the Appwrite Team) -* ✅ [NodeJS](https://github.com/appwrite/sdk-for-node) (Maintained by the Appwrite Team) -* ✅ [Ruby](https://github.com/appwrite/sdk-for-ruby) - **Work in progress** (Maintained by the Appwrite Team) -* ✅ [Python](https://github.com/appwrite/sdk-for-python) - **Work in progress** (Maintained by the Appwrite Team) -* ✳️ Looking for more SDKs? - Help us by contributing a pull request to our [SDK Generator](https://github.com/appwrite/sdk-generator)! +✅ [JS](https://github.com/appwrite/sdk-for-js) (Maintained by the Appwrite Team) +✅ [PHP](https://github.com/appwrite/sdk-for-php) (Maintained by the Appwrite Team) +✅ [NodeJS](https://github.com/appwrite/sdk-for-node) (Maintained by the Appwrite Team) +✅ [Ruby](https://github.com/appwrite/sdk-for-ruby) - **Work in progress** (Maintained by the Appwrite Team) +✅ [Python](https://github.com/appwrite/sdk-for-python) - **Work in progress** (Maintained by the Appwrite Team) +✳️ Looking for more SDKs? - Help us by contributing a pull request to our [SDK Generator](https://github.com/appwrite/sdk-generator)! ## Security -For security issues, please email [security@appwrite.io](mailto:security@appwrite.io) instead of posting a public issue in GitHub. +For security issues, kindly email us [security@appwrite.io](mailto:security@appwrite.io) instead of posting a public issue in GitHub. ## Follow Us @@ -109,4 +109,4 @@ Created by [Eldad Fux](https://twitter.com/eldadfux) with the amazing help of ou * 🇫🇮 Pessi Päivärinne ([Github](https://github.com/pessip)) * 🇺🇳 Sergi Vos ([Github](https://github.com/sergivb01), [Twitter](https://twitter.com/sergivb01), [Linkedin](https://www.linkedin.com/in/sergivb01/)) * 🇮🇱 Tomer Cohen ([Github](https://github.com/tomer), [Twitter](https://twitter.com/tomer)) -* 🇬🇷 Panagiotis Skarlas ([Github](https://github.com/1qk1), [Twitter](https://twitter.com/qktweets)) \ No newline at end of file +* 🇬🇷 Panagiotis Skarlas ([Github](https://github.com/1qk1), [Twitter](https://twitter.com/qktweets)) From d402fb8c08de39c02a331adb392924ee5e4f42d9 Mon Sep 17 00:00:00 2001 From: Robin C Date: Tue, 1 Oct 2019 00:49:28 +0200 Subject: [PATCH 07/18] feat(issue 25): Translated locale files to German Added and translated the locale files for the German language. --- app/config/locale/de.continents.php | 11 ++ app/config/locale/de.countries.php | 198 ++++++++++++++++++++++++++++ app/config/locale/de.php | 21 +++ 3 files changed, 230 insertions(+) create mode 100644 app/config/locale/de.continents.php create mode 100644 app/config/locale/de.countries.php create mode 100644 app/config/locale/de.php diff --git a/app/config/locale/de.continents.php b/app/config/locale/de.continents.php new file mode 100644 index 000000000..56e9b934a --- /dev/null +++ b/app/config/locale/de.continents.php @@ -0,0 +1,11 @@ + 'Afrika', + 'AN' => 'Antarktis', + 'AS' => 'Asien', + 'EU' => 'Europa', + 'NA' => 'Nordamerika', + 'OC' => 'Ozeanien', + 'SA' => 'Südamerika', +]; diff --git a/app/config/locale/de.countries.php b/app/config/locale/de.countries.php new file mode 100644 index 000000000..055f8aa4d --- /dev/null +++ b/app/config/locale/de.countries.php @@ -0,0 +1,198 @@ + 'Afghanistan', + 'AO' => 'Angola', + 'AL' => 'Albanien', + 'AD' => 'Andorra', + 'AE' => 'Vereinigte Arabische Emirate', + 'AR' => 'Argentinien', + 'AM' => 'Armenien', + 'AG' => 'Antigua und Barbuda', + 'AU' => 'Australien', + 'AT' => 'Österreich', + 'AZ' => 'Aserbaidschan', + 'BI' => 'Burundi', + 'BE' => 'Belgien', + 'BJ' => 'Benin', + 'BF' => 'Burkina Faso', + 'BD' => 'Bangladesch', + 'BG' => 'Bulgarien', + 'BH' => 'Bahrain', + 'BS' => 'Bahamas', + 'BA' => 'Bosnien und Herzegowina', + 'BY' => 'Weißrussland', + 'BZ' => 'Belize', + 'BO' => 'Bolivien', + 'BR' => 'Brazilen', + 'BB' => 'Barbados', + 'BN' => 'Brunei', + 'BT' => 'Bhutan', + 'BW' => 'Botswana', + 'CF' => 'Zentralafrikanische Republik', + 'CA' => 'Kanada', + 'CH' => 'Schweiz', + 'CL' => 'Chile', + 'CN' => 'China', + 'CI' => 'Elfenbeinküste', + 'CM' => 'Kamerun', + 'CD' => 'Demokratische Republik Kongo', + 'CG' => 'Republik Kongo', + 'CO' => 'Kolumbien', + 'KM' => 'Komoren', + 'CV' => 'Kap Verde', + 'CR' => 'Costa Rica', + 'CU' => 'Kuba', + 'CY' => 'Zypern', + 'CZ' => 'Tschechien', + 'DE' => 'Deutschland', + 'DJ' => 'Dschibuti', + 'DM' => 'Dominica', + 'DK' => 'Dänemark', + 'DO' => 'Dominikanische Republik', + 'DZ' => 'Algerien', + 'EC' => 'Ecuador', + 'EG' => 'Ägypten', + 'ER' => 'Eritrea', + 'ES' => 'Spanien', + 'EE' => 'Estland', + 'ET' => 'Äthiopien', + 'FI' => 'Finnland', + 'FJ' => 'Fidschi', + 'FR' => 'Frankreich', + 'FM' => 'Mikronesien', + 'GA' => 'Gabun', + 'GB' => 'Großbritannien', + 'GE' => 'Georgien', + 'GH' => 'Ghana', + 'GN' => 'Guinea', + 'GM' => 'Gambia', + 'GW' => 'Guinea-Bissau', + 'GQ' => 'Äquatorialguinea', + 'GR' => 'Griechenland', + 'GD' => 'Grenada', + 'GT' => 'Guatemala', + 'GY' => 'Guyana', + 'HN' => 'Honduras', + 'HR' => 'Kroatien', + 'HT' => 'Haiti', + 'HU' => 'Ungarn', + 'ID' => 'Indonesien', + 'IN' => 'Indien', + 'IE' => 'Irland', + 'IR' => 'Iran', + 'IQ' => 'Irak', + 'IS' => 'Island', + 'IL' => 'Israel', + 'IT' => 'Italien', + 'JM' => 'Jamaika', + 'JO' => 'Jordan', + 'JP' => 'Japan', + 'KZ' => 'Kasachstan', + 'KE' => 'Kenia', + 'KG' => 'Kirgisistan', + 'KH' => 'Kambodscha', + 'KI' => 'Kiribati', + 'KN' => 'St. Kitts und Nevis', + 'KR' => 'Südkorea', + 'KW' => 'Kuwait', + 'LA' => 'Laos', + 'LB' => 'Libanon', + 'LR' => 'Liberia', + 'LY' => 'Libyen', + 'LC' => 'St. Lucia', + 'LI' => 'Liechtenstein', + 'LK' => 'Sri Lanka', + 'LS' => 'Lesotho', + 'LT' => 'Litauen', + 'LU' => 'Luxemburg', + 'LV' => 'Lettland', + 'MA' => 'Marokko', + 'MC' => 'Monaco', + 'MD' => 'Moldawien', + 'MG' => 'Madagaskar', + 'MV' => 'Malediven', + 'MX' => 'Mexiko', + 'MH' => 'Marshallinseln', + 'MK' => 'Mazedonien', + 'ML' => 'Mali', + 'MT' => 'Malta', + 'MM' => 'Myanmar', + 'ME' => 'Montenegro', + 'MN' => 'Mongolei', + 'MZ' => 'Mosambik', + 'MR' => 'Mauretanien', + 'MU' => 'Mauritius', + 'MW' => 'Malawi', + 'MY' => 'Malaysia', + 'NA' => 'Namibia', + 'NE' => 'Niger', + 'NG' => 'Nigeria', + 'NI' => 'Nicaragua', + 'NL' => 'Niederlande', + 'NO' => 'Norwegen', + 'NP' => 'Nepal', + 'NR' => 'Nauru', + 'NZ' => 'Neuseeland', + 'OM' => 'Oman', + 'PK' => 'Pakistan', + 'PA' => 'Panama', + 'PE' => 'Peru', + 'PH' => 'Philippinen', + 'PW' => 'Palau', + 'PG' => 'Papua Neu-Guinea', + 'PL' => 'Polen', + 'KP' => 'Nord Korea', + 'PT' => 'Portugal', + 'PY' => 'Paraguay', + 'QA' => 'Katar', + 'RO' => 'Rumänien', + 'RU' => 'Russland', + 'RW' => 'Ruanda', + 'SA' => 'Saudi Arabien', + 'SD' => 'Sudan', + 'SN' => 'Senegal', + 'SG' => 'Singapur', + 'SB' => 'Salomon-Inseln', + 'SL' => 'Sierra Leone', + 'SV' => 'El Salvador', + 'SM' => 'San Marino', + 'SO' => 'Somalia', + 'RS' => 'Serbien', + 'SS' => 'Südsudan', + 'ST' => 'São Tomé und Príncipe', + 'SR' => 'Suriname', + 'SK' => 'Slowakei', + 'SI' => 'Slowenien', + 'SE' => 'Schweden', + 'SZ' => 'Swasiland', + 'SC' => 'Seychellen', + 'SY' => 'Syrien', + 'TD' => 'Tschad', + 'TG' => 'Togo', + 'TH' => 'Thailand', + 'TJ' => 'Tadschikistan', + 'TM' => 'Turkmenistan', + 'TL' => 'Timor-Leste', + 'TO' => 'Tonga', + 'TT' => 'Trinidad und Tobago', + 'TN' => 'Tunesien', + 'TR' => 'Türkei', + 'TV' => 'Tuvalu', + 'TZ' => 'Tansania', + 'UG' => 'Uganda', + 'UA' => 'Ukraine', + 'UY' => 'Uruguay', + 'US' => 'Vereinigte Staaten', + 'UZ' => 'Usbekistan', + 'VA' => 'Vatikanstadt', + 'VC' => 'St. Vincent und die Grenadinen', + 'VE' => 'Venezuela', + 'VN' => 'Vietnam', + 'VU' => 'Vanuatu', + 'WS' => 'Samoa', + 'YE' => 'Jemen', + 'ZA' => 'Südafrika', + 'ZM' => 'Sambia', + 'ZW' => 'Zimbabwe', +]; diff --git a/app/config/locale/de.php b/app/config/locale/de.php new file mode 100644 index 000000000..b3b347be0 --- /dev/null +++ b/app/config/locale/de.php @@ -0,0 +1,21 @@ + '"Die Kunst, weise zu sein, ist die Kunst, zu wissen, was zu übersehen ist."', // This is the line printed in the homepage and console 'view-source' + 'settings.locale' => 'de', + 'settings.direction' => 'ltr', + + // Service - Users + 'auth.emails.team' => '%s Team', + 'auth.emails.confirm.title' => 'Accountbestätigung', + 'auth.emails.confirm.body' => 'de.email.auth.confirm.tpl', + 'auth.emails.recovery.title' => 'Passwort zurücksetzen', + 'auth.emails.recovery.body' => 'de.email.auth.recovery.tpl', + 'auth.emails.invitation.title' => 'Einladung zum %s Team bei %s', + 'auth.emails.invitation.body' => 'de.email.auth.invitation.tpl', + + 'locale.country.unknown' => 'Unbekannt', + + 'countries' => include 'de.countries.php', + 'continents' => include 'de.continents.php', +]; From 15f0b1761275ee26eead4725725e1ec758e2da9b Mon Sep 17 00:00:00 2001 From: Robin C Date: Tue, 1 Oct 2019 00:56:20 +0200 Subject: [PATCH 08/18] feat(issue 25): Translated email template files to German Added and translated the email template files for the German language. --- .../templates/de.email.auth.confirm.tpl | 24 +++++++++++++++++ .../templates/de.email.auth.invitation.tpl | 27 +++++++++++++++++++ .../templates/de.email.auth.recovery.tpl | 24 +++++++++++++++++ 3 files changed, 75 insertions(+) create mode 100644 app/config/locale/templates/de.email.auth.confirm.tpl create mode 100644 app/config/locale/templates/de.email.auth.invitation.tpl create mode 100644 app/config/locale/templates/de.email.auth.recovery.tpl diff --git a/app/config/locale/templates/de.email.auth.confirm.tpl b/app/config/locale/templates/de.email.auth.confirm.tpl new file mode 100644 index 000000000..ae4ff2729 --- /dev/null +++ b/app/config/locale/templates/de.email.auth.confirm.tpl @@ -0,0 +1,24 @@ + + +
+ Hallo {{name}}, +
+
+ bitte folge diesem Link um deine E-Mail Adresse zu verifizieren. +
+ {{redirect}} +
+
+ Bitte ignoriere diese Nachricht, wenn du das Verifizieren deiner E-Mail Adresse nicht beantragt hast. +
+
+ Vielen dank, +
+ {{project}} Team +
\ No newline at end of file diff --git a/app/config/locale/templates/de.email.auth.invitation.tpl b/app/config/locale/templates/de.email.auth.invitation.tpl new file mode 100644 index 000000000..dc218116a --- /dev/null +++ b/app/config/locale/templates/de.email.auth.invitation.tpl @@ -0,0 +1,27 @@ + + +
+ Hallo, +
+
+ diese E-Mail wurde dir geschickt, weil {{owner}} dich eingeladen hat Teammitglied im Team {{team}} bei {{project}} zu werden. +
+
+ Folge diesem Link um dem {{team}} Team beizutreten: +
+ {{redirect}} +
+
+ Wenn du daran nicht interessiert bist, kannst du diese Nachricht ignorieren. +
+
+ Vielen dank, +
+ {{project}} Team +
diff --git a/app/config/locale/templates/de.email.auth.recovery.tpl b/app/config/locale/templates/de.email.auth.recovery.tpl new file mode 100644 index 000000000..c9484a011 --- /dev/null +++ b/app/config/locale/templates/de.email.auth.recovery.tpl @@ -0,0 +1,24 @@ + + +
+ Hallo {{name}}, +
+
+ Folge diesem Link um dein Passwort für {{project}} zurückzusetzen. +
+ {{redirect}} +
+
+ Bitte ignoriere diese Nachricht, wenn du das Zurücksetzen deines Passworts nicht beantragt hast. +
+
+ Vielen dank, +
+ {{project}} Team +
From 9544160276acc6229ab619b1d5526b8c5c3ee26f Mon Sep 17 00:00:00 2001 From: Alexey Pyltsyn Date: Tue, 1 Oct 2019 02:15:44 +0300 Subject: [PATCH 09/18] Fix code style in views --- app/views/console/database/collection.phtml | 8 ++++---- app/views/console/users/index.phtml | 2 +- app/views/general/error.phtml | 2 +- app/views/layouts/default.phtml | 4 ++-- app/views/proxy.phtml | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/app/views/console/database/collection.phtml b/app/views/console/database/collection.phtml index df0584562..46f1d2fc3 100644 --- a/app/views/console/database/collection.phtml +++ b/app/views/console/database/collection.phtml @@ -86,11 +86,11 @@ $collection = $this->getParam('collection', []); - + @@ -101,9 +101,9 @@ $collection = $this->getParam('collection', []); - +
- +
- diff --git a/app/views/console/users/index.phtml b/app/views/console/users/index.phtml index 0ee7c32be..cf84d0f5e 100644 --- a/app/views/console/users/index.phtml +++ b/app/views/console/users/index.phtml @@ -315,7 +315,7 @@ $providers = $this->getParam('providers', []); data-param-project-id="{{router.params.project}}" data-scope="console">
    - $data): if(isset($data['enabled']) && !$data['enabled']) { continue; } ?> + $data): if (isset($data['enabled']) && !$data['enabled']) { continue; } ?>
  • diff --git a/app/views/general/error.phtml b/app/views/general/error.phtml index 25937f5b7..f0295b437 100644 --- a/app/views/general/error.phtml +++ b/app/views/general/error.phtml @@ -13,7 +13,7 @@ $projectURL = $this->getParam('projectURL', ''); Error ID: - +

    Back to

    diff --git a/app/views/layouts/default.phtml b/app/views/layouts/default.phtml index 2d0b97eea..b46f53d46 100644 --- a/app/views/layouts/default.phtml +++ b/app/views/layouts/default.phtml @@ -27,7 +27,7 @@ $canonical = $this->getParam('canonical', ''); - + getParam('prefetch', []) as $prefetch): ?> @@ -63,7 +63,7 @@ $canonical = $this->getParam('canonical', ''); PAGING_LIMIT: }; - + document.addEventListener("DOMContentLoaded", function() { var head = document.getElementsByTagName('head')[0]; var script = document.createElement('script'); diff --git a/app/views/proxy.phtml b/app/views/proxy.phtml index fea038840..0021f5558 100644 --- a/app/views/proxy.phtml +++ b/app/views/proxy.phtml @@ -9,7 +9,7 @@ $list = []; foreach ($clients as $client) { - if(empty($client)) { + if (empty($client)) { continue; } From 03e3c08f95db5e0665dbeeee22ea0a8f7f08ec9d Mon Sep 17 00:00:00 2001 From: eldadfux Date: Tue, 1 Oct 2019 07:17:05 +0300 Subject: [PATCH 10/18] Removed px from readme --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 330644b6f..d3642d260 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@

    - Appwrite Logo + Appwrite Logo

    Simple Backend Server for your [Vue / Angular / React / iOS / Android / Flutter / *ANY OTHER*] Frontend App From 38b472aa834e220fe963bd5ef1bd0b0c72a81055 Mon Sep 17 00:00:00 2001 From: eldadfux Date: Tue, 1 Oct 2019 07:18:03 +0300 Subject: [PATCH 11/18] Added bullet list back again --- README.md | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index d3642d260..ae03a8754 100644 --- a/README.md +++ b/README.md @@ -73,12 +73,12 @@ Currently, we are supporting only a few SDK libraries and are constantly working Below is a list of currently supported platforms and languages. If you wish to help us add support to your platform of choice you can go over to our [SDK Generator](https://github.com/appwrite/sdk-generator) project and view our contribution guide. -✅ [JS](https://github.com/appwrite/sdk-for-js) (Maintained by the Appwrite Team) -✅ [PHP](https://github.com/appwrite/sdk-for-php) (Maintained by the Appwrite Team) -✅ [NodeJS](https://github.com/appwrite/sdk-for-node) (Maintained by the Appwrite Team) -✅ [Ruby](https://github.com/appwrite/sdk-for-ruby) - **Work in progress** (Maintained by the Appwrite Team) -✅ [Python](https://github.com/appwrite/sdk-for-python) - **Work in progress** (Maintained by the Appwrite Team) -✳️ Looking for more SDKs? - Help us by contributing a pull request to our [SDK Generator](https://github.com/appwrite/sdk-generator)! +* ✅ [JS](https://github.com/appwrite/sdk-for-js) (Maintained by the Appwrite Team) +* ✅ [PHP](https://github.com/appwrite/sdk-for-php) (Maintained by the Appwrite Team) +* ✅ [NodeJS](https://github.com/appwrite/sdk-for-node) (Maintained by the Appwrite Team) +* ✅ [Ruby](https://github.com/appwrite/sdk-for-ruby) - **Work in progress** (Maintained by the Appwrite Team) +* ✅ [Python](https://github.com/appwrite/sdk-for-python) - **Work in progress** (Maintained by the Appwrite Team) +* ✳️ Looking for more SDKs? - Help us by contributing a pull request to our [SDK Generator](https://github.com/appwrite/sdk-generator)! ## Security From e411590cf678c7b2c3c2487bc864f0d153b5b6a6 Mon Sep 17 00:00:00 2001 From: eldadfux Date: Tue, 1 Oct 2019 07:34:01 +0300 Subject: [PATCH 12/18] PHP CS fixer --- src/Auth/OAuth.php | 2 +- src/Auth/OAuth/Gitlab.php | 22 +++++++++++----------- src/Auth/OAuth/Google.php | 25 +++++++++++++------------ src/Database/Validator/Collection.php | 2 +- src/Database/Validator/Structure.php | 10 +++++++--- 5 files changed, 33 insertions(+), 28 deletions(-) diff --git a/src/Auth/OAuth.php b/src/Auth/OAuth.php index ec1ae9eff..70d7f448c 100644 --- a/src/Auth/OAuth.php +++ b/src/Auth/OAuth.php @@ -99,7 +99,7 @@ abstract class OAuth curl_setopt($ch, CURLOPT_POSTFIELDS, $payload); } - $headers[] = "Content-length: ".strlen($payload); + $headers[] = 'Content-length: '.strlen($payload); curl_setopt($ch, CURLOPT_HTTPHEADER, $headers); // Send the request & save response to $response diff --git a/src/Auth/OAuth/Gitlab.php b/src/Auth/OAuth/Gitlab.php index 923add88f..fbf21a4bd 100644 --- a/src/Auth/OAuth/Gitlab.php +++ b/src/Auth/OAuth/Gitlab.php @@ -24,11 +24,11 @@ class Gitlab extends OAuth */ public function getLoginURL(): string { - return 'https://gitlab.com/oauth/authorize?' . - 'client_id=' . urlencode($this->appID) . - '&redirect_uri=' . urlencode($this->callback) . - '&scope=read_user' . - '&state=' . urlencode(json_encode($this->state)) . + return 'https://gitlab.com/oauth/authorize?'. + 'client_id='.urlencode($this->appID). + '&redirect_uri='.urlencode($this->callback). + '&scope=read_user'. + '&state='.urlencode(json_encode($this->state)). '&response_type=code'; } @@ -42,10 +42,10 @@ class Gitlab extends OAuth $accessToken = $this->request( 'POST', 'https://gitlab.com/oauth/token?'. - 'code=' . urlencode($code) . - '&client_id=' . urlencode($this->appID) . - '&client_secret=' . urlencode($this->appSecret) . - '&redirect_uri=' . urlencode($this->callback) . + 'code='.urlencode($code). + '&client_id='.urlencode($this->appID). + '&client_secret='.urlencode($this->appSecret). + '&redirect_uri='.urlencode($this->callback). '&grant_type=authorization_code' ); @@ -55,7 +55,6 @@ class Gitlab extends OAuth return $accessToken['access_token']; } - return ''; } @@ -115,9 +114,10 @@ class Gitlab extends OAuth protected function getUser(string $accessToken): array { if (empty($this->user)) { - $user = $this->request('GET', 'https://gitlab.com/api/v4/user?access_token=' . urlencode($accessToken)); + $user = $this->request('GET', 'https://gitlab.com/api/v4/user?access_token='.urlencode($accessToken)); $this->user = json_decode($user, true); } + return $this->user; } } diff --git a/src/Auth/OAuth/Google.php b/src/Auth/OAuth/Google.php index 252d629ab..c07758d6b 100644 --- a/src/Auth/OAuth/Google.php +++ b/src/Auth/OAuth/Google.php @@ -28,11 +28,11 @@ class Google extends OAuth */ public function getLoginURL(): string { - return 'https://accounts.google.com/o/oauth2/v2/auth?' . - 'client_id=' . urlencode($this->appID) . - '&redirect_uri=' . urlencode($this->callback) . - '&scope=https://www.googleapis.com/auth/userinfo.email+https://www.googleapis.com/auth/userinfo.profile' . - '&state=' . urlencode(json_encode($this->state)) . + return 'https://accounts.google.com/o/oauth2/v2/auth?'. + 'client_id='.urlencode($this->appID). + '&redirect_uri='.urlencode($this->callback). + '&scope=https://www.googleapis.com/auth/userinfo.email+https://www.googleapis.com/auth/userinfo.profile'. + '&state='.urlencode(json_encode($this->state)). '&response_type=code'; } @@ -45,12 +45,12 @@ class Google extends OAuth { $accessToken = $this->request( 'POST', - 'https://www.googleapis.com/oauth2/' . $this->version . '/token?' . - 'code=' . urlencode($code) . - '&client_id=' . urlencode($this->appID) . - '&client_secret=' . urlencode($this->appSecret) . - '&redirect_uri=' . urlencode($this->callback) . - '&scope=' . + 'https://www.googleapis.com/oauth2/'.$this->version.'/token?'. + 'code='.urlencode($code). + '&client_id='.urlencode($this->appID). + '&client_secret='.urlencode($this->appSecret). + '&redirect_uri='.urlencode($this->callback). + '&scope='. '&grant_type=authorization_code' ); @@ -119,9 +119,10 @@ class Google extends OAuth protected function getUser(string $accessToken): array { if (empty($this->user)) { - $user = $this->request('GET', 'https://www.googleapis.com/oauth2/v2/userinfo?access_token=' . urlencode($accessToken)); + $user = $this->request('GET', 'https://www.googleapis.com/oauth2/v2/userinfo?access_token='.urlencode($accessToken)); $this->user = json_decode($user, true); } + return $this->user; } } diff --git a/src/Database/Validator/Collection.php b/src/Database/Validator/Collection.php index 2d58da7bb..dd08a62eb 100644 --- a/src/Database/Validator/Collection.php +++ b/src/Database/Validator/Collection.php @@ -40,7 +40,7 @@ class Collection extends Structure $document = new Document( array_merge($this->merge, ($document instanceof Document) ? $document->getArrayCopy() : $document) ); - + if (is_null($document->getCollection())) { $this->message = 'Missing collection attribute $collection'; diff --git a/src/Database/Validator/Structure.php b/src/Database/Validator/Structure.php index c2753d276..f8d00f1e3 100644 --- a/src/Database/Validator/Structure.php +++ b/src/Database/Validator/Structure.php @@ -186,18 +186,19 @@ class Structure extends Validator } if (empty($validator)) { // Error creating validator for property - $this->message = 'Unknown rule type "' . $ruleType . '" for property "' . htmlspecialchars($key, ENT_QUOTES, 'UTF-8') . '"'; - + $this->message = 'Unknown rule type "'.$ruleType.'" for property "'.htmlspecialchars($key, ENT_QUOTES, 'UTF-8').'"'; + if (empty($ruleType)) { $this->message = 'Unknown property "'.$key.'" type'. '. Make sure to follow '.strtolower($collection->getAttribute('name', 'unknown')).' collection structure'; } - + return false; } if ($ruleRequired && ('' === $value || null === $value)) { $this->message = 'Required property "'.$key.'" has no value'; + return false; } @@ -211,6 +212,7 @@ class Structure extends Validator if ($ruleArray) { // Array of values validation if (!is_array($value)) { $this->message = 'Property "'.$key.'" must be an array'; + return false; } @@ -219,12 +221,14 @@ class Structure extends Validator foreach ($value as $node) { if (!$validator->isValid($node)) { // Check if property is valid, if not required can also be empty $this->message = 'Property "'.$key.'" has invalid input. '.$validator->getDescription(); + return false; } } } else { // Single value validation if ((!$validator->isValid($value)) && !('' === $value && !$ruleRequired)) { // Error when value is not valid, and is not optional and empty $this->message = 'Property "'.$key.'" has invalid input. '.$validator->getDescription(); + return false; } } From c706349c106558c6d90bbd173976708b965cb7ff Mon Sep 17 00:00:00 2001 From: eldadfux Date: Tue, 1 Oct 2019 07:57:41 +0300 Subject: [PATCH 13/18] Updated PHP coding standards --- app/app.php | 203 +++++++------- app/config/collections.php | 6 +- app/config/locale/es.countries.php | 1 + app/config/locale/it.continents.php | 21 +- app/config/locale/it.countries.php | 396 ++++++++++++++-------------- app/config/locale/it.php | 36 +-- app/config/version.php | 1 + app/controllers/auth.php | 17 +- app/controllers/console.php | 3 +- app/controllers/database.php | 12 +- app/controllers/health.php | 4 +- app/controllers/home.php | 1 - app/controllers/shared/api.php | 1 + app/init.php | 113 ++++---- build.sh | 2 +- 15 files changed, 407 insertions(+), 410 deletions(-) diff --git a/app/app.php b/app/app.php index 24895732a..4e4af3987 100644 --- a/app/app.php +++ b/app/app.php @@ -1,7 +1,7 @@ init(function () use ($utopia, $request, $response, $register, &$user, $project, $roles, $webhook, $audit, $usage, $domain, $clients) { $route = $utopia->match($request); - $referrer = $request->getServer('HTTP_REFERER', ''); - $origin = $request->getServer('HTTP_ORIGIN', parse_url($referrer, PHP_URL_SCHEME) . '://' . parse_url($referrer, PHP_URL_HOST)); + $referrer = $request->getServer('HTTP_REFERER', ''); + $origin = $request->getServer('HTTP_ORIGIN', parse_url($referrer, PHP_URL_SCHEME).'://'.parse_url($referrer, PHP_URL_HOST)); $refDomain = (in_array($origin, $clients)) ? $origin : 'http://localhost'; - /** + /* * Security Headers * * As recommended at: @@ -66,7 +68,7 @@ $utopia->init(function () use ($utopia, $request, $response, $register, &$user, */ $response ->addHeader('Server', 'Appwrite') - ->addHeader('X-XSS-Protection', '1; mode=block; report=/v1/xss?url=' . urlencode($request->getServer('REQUEST_URI'))) + ->addHeader('X-XSS-Protection', '1; mode=block; report=/v1/xss?url='.urlencode($request->getServer('REQUEST_URI'))) //->addHeader('X-Frame-Options', ($refDomain == 'http://localhost') ? 'SAMEORIGIN' : 'ALLOW-FROM ' . $refDomain) ->addHeader('X-Content-Type-Options', 'nosniff') ->addHeader('Access-Control-Allow-Methods', 'GET, POST, PUT, PATCH, DELETE') @@ -75,7 +77,7 @@ $utopia->init(function () use ($utopia, $request, $response, $register, &$user, ->addHeader('Access-Control-Allow-Credentials', 'true') ; - /** + /* * Validate Client Domain - Check to avoid CSRF attack * Adding appwrite api domains to allow XDOMAIN communication */ @@ -84,10 +86,10 @@ $utopia->init(function () use ($utopia, $request, $response, $register, &$user, if (!$hostValidator->isValid($request->getServer('HTTP_ORIGIN', $request->getServer('HTTP_REFERER', ''))) && in_array($request->getMethod(), [Request::METHOD_POST, Request::METHOD_PUT, Request::METHOD_PATCH, Request::METHOD_DELETE]) && empty($request->getHeader('X-Appwrite-Key', ''))) { - throw new Exception('Access from this client host is forbidden. ' . $hostValidator->getDescription(), 403); + throw new Exception('Access from this client host is forbidden. '.$hostValidator->getDescription(), 403); } - /** + /* * ACL Check */ $role = ($user->isEmpty()) ? Auth::USER_ROLE_GUEST : Auth::USER_ROLE_MEMBER; @@ -111,46 +113,46 @@ $utopia->init(function () use ($utopia, $request, $response, $register, &$user, } } - $scope = $route->getLabel('scope', 'none'); // Allowed scope for chosen route - $scopes = $roles[$role]['scopes']; // Allowed scopes for user role + $scope = $route->getLabel('scope', 'none'); // Allowed scope for chosen route + $scopes = $roles[$role]['scopes']; // Allowed scopes for user role // Check if given key match project API keys $key = $project->search('secret', $request->getHeader('X-Appwrite-Key', ''), $project->getAttribute('keys', [])); - /** + /* * Try app auth when we have project key and no user * Mock user to app and grant API key scopes in addition to default app scopes */ if (null !== $key && $user->isEmpty()) { $user = new Document([ - '$uid' => 0, - 'status' => Auth::USER_STATUS_ACTIVATED, - 'email' => 'app.' . $project->getUid() . '@service.' . $domain, - 'password' => '', - 'name' => $project->getAttribute('name', 'Untitled'), + '$uid' => 0, + 'status' => Auth::USER_STATUS_ACTIVATED, + 'email' => 'app.'.$project->getUid().'@service.'.$domain, + 'password' => '', + 'name' => $project->getAttribute('name', 'Untitled'), ]); - $role = Auth::USER_ROLE_APP; + $role = Auth::USER_ROLE_APP; $scopes = array_merge($roles[$role]['scopes'], $key->getAttribute('scopes', [])); Authorization::disable(); // Cancel security segmentation for API keys. } - Authorization::setRole('user:' . $user->getUid()); - Authorization::setRole('role:' . $role); + Authorization::setRole('user:'.$user->getUid()); + Authorization::setRole('role:'.$role); array_map(function ($node) { if (isset($node['teamId']) && isset($node['roles'])) { - Authorization::setRole('team:' . $node['teamId']); + Authorization::setRole('team:'.$node['teamId']); foreach ($node['roles'] as $nodeRole) { // Set all team roles - Authorization::setRole('team:' . $node['teamId'] . '/' . $nodeRole); + Authorization::setRole('team:'.$node['teamId'].'/'.$nodeRole); } } }, $user->getAttribute('memberships', [])); if (!in_array($scope, $scopes)) { - throw new Exception($user->getAttribute('email', 'Guest') . ' (role: ' . strtolower($roles[$role]['label']) . ') missing scope (' . $scope . ')', 401); + throw new Exception($user->getAttribute('email', 'Guest').' (role: '.strtolower($roles[$role]['label']).') missing scope ('.$scope.')', 401); } if (Auth::USER_STATUS_BLOCKED == $user->getAttribute('status')) { // Account has not been activated @@ -161,7 +163,7 @@ $utopia->init(function () use ($utopia, $request, $response, $register, &$user, throw new Exception('Password reset is required', 412); } - /** + /* * Background Jobs */ $webhook @@ -182,31 +184,31 @@ $utopia->init(function () use ($utopia, $request, $response, $register, &$user, $usage ->setParam('projectId', $project->getUid()) - ->setParam('url', $request->getServer('HTTP_HOST', '') . $request->getServer('REQUEST_URI', '')) + ->setParam('url', $request->getServer('HTTP_HOST', '').$request->getServer('REQUEST_URI', '')) ->setParam('method', $request->getServer('REQUEST_METHOD', 'UNKNOWN')) ->setParam('request', 0) ->setParam('response', 0) ->setParam('storage', 0) ; - /** + /* * Abuse Check */ $timeLimit = new TimeLimit($route->getLabel('abuse-key', 'url:{url},ip:{ip}'), $route->getLabel('abuse-limit', 0), $route->getLabel('abuse-time', 3600), function () use ($register) { return $register->get('db'); }); - $timeLimit->setNamespace('app_' . $project->getUid()); + $timeLimit->setNamespace('app_'.$project->getUid()); $timeLimit ->setParam('{userId}', $user->getUid()) ->setParam('{userAgent}', $request->getServer('HTTP_USER_AGENT', '')) ->setParam('{ip}', $request->getIP()) - ->setParam('{url}', $request->getServer('HTTP_HOST', '') . $route->getURL()) + ->setParam('{url}', $request->getServer('HTTP_HOST', '').$route->getURL()) ; //TODO make sure we get array here foreach ($request->getParams() as $key => $value) { // Set request params as potential abuse keys - $timeLimit->setParam('{param-' . $key . '}', (is_array($value)) ? json_encode($value) : $value); + $timeLimit->setParam('{param-'.$key.'}', (is_array($value)) ? json_encode($value) : $value); } $abuse = new Abuse($timeLimit); @@ -218,7 +220,7 @@ $utopia->init(function () use ($utopia, $request, $response, $register, &$user, ->addHeader('X-RateLimit-Reset', $timeLimit->time() + $route->getLabel('abuse-time', 3600)) ; } - + if ($abuse->check() && $request->getServer('_APP_OPTIONS_ABUSE', 'enabled') !== 'disabled') { throw new Exception('Too many requests', 429); } @@ -226,7 +228,7 @@ $utopia->init(function () use ($utopia, $request, $response, $register, &$user, $utopia->shutdown(function () use ($response, $request, $webhook, $audit, $usage) { - /** + /* * Trigger Events for background jobs */ if (!empty($webhook->getParam('event'))) { @@ -253,7 +255,6 @@ $utopia->options(function () use ($request, $response, $domain, $project) { ->addHeader('Access-Control-Allow-Origin', $origin) ->addHeader('Access-Control-Allow-Credentials', 'true') ->send(); - ; }); $utopia->error(function ($error /* @var $error Exception */) use ($request, $response, $utopia, $project, $env, $version, $sentry, $user) { @@ -265,27 +266,27 @@ $utopia->error(function ($error /* @var $error Exception */) use ($request, $res case 404: // Error allowed publicly case 412: // Error allowed publicly case 429: // Error allowed publicly - $code = $error->getCode(); - $message = $error->getMessage(); + $code = $error->getCode(); + $message = $error->getMessage(); break; default: - $code = 500; // All other errors get the generic 500 server error status code - $message = 'Server Error'; + $code = 500; // All other errors get the generic 500 server error status code + $message = 'Server Error'; } $_SERVER = []; // Reset before reporting to error log to avoid keys being compromised $output = ((App::ENV_TYPE_DEVELOPMENT == $env)) ? [ - 'message' => $error->getMessage(), - 'code' => $error->getCode(), - 'file' => $error->getFile(), - 'line' => $error->getLine(), - 'trace' => $error->getTrace(), - 'version' => $version, + 'message' => $error->getMessage(), + 'code' => $error->getCode(), + 'file' => $error->getFile(), + 'line' => $error->getLine(), + 'trace' => $error->getTrace(), + 'version' => $version, ] : [ 'message' => $message, - 'code' => $code, - 'version' => $version, + 'code' => $code, + 'version' => $version, ]; $response @@ -295,12 +296,12 @@ $utopia->error(function ($error /* @var $error Exception */) use ($request, $res ->setStatusCode($code) ; - $route = $utopia->match($request); - $template = ($route) ? $route->getLabel('error', null): null; + $route = $utopia->match($request); + $template = ($route) ? $route->getLabel('error', null) : null; if ($template) { - $layout = new View(__DIR__ . '/views/layouts/default.phtml'); - $comp = new View($template); + $layout = new View(__DIR__.'/views/layouts/default.phtml'); + $comp = new View($template); $comp ->setParam('projectName', $project->getAttribute('name')) @@ -310,7 +311,7 @@ $utopia->error(function ($error /* @var $error Exception */) use ($request, $res ; $layout - ->setParam('title', $project->getAttribute('name') . ' - Error') + ->setParam('title', $project->getAttribute('name').' - Error') ->setParam('description', 'No Description') ->setParam('body', $comp) ->setParam('version', $version) @@ -344,9 +345,9 @@ $utopia->get('/manifest.json') [ 'src' => 'images/favicon.png', 'sizes' => '256x256', - 'type' => 'image/png' - ] - ] + 'type' => 'image/png', + ], + ], ]); } ); @@ -357,10 +358,10 @@ $utopia->get('/robots.txt') ->label('docs', false) ->action( function () use ($response) { - $response->text("# robotstxt.org/ + $response->text('# robotstxt.org/ User-agent: * -"); +'); } ); @@ -370,14 +371,14 @@ $utopia->get('/humans.txt') ->label('docs', false) ->action( function () use ($response) { - $response->text("# humanstxt.org/ + $response->text('# humanstxt.org/ # The humans responsible & technology colophon # TEAM -- -- # THANKS - "); + '); } ); @@ -387,15 +388,15 @@ $utopia->get('/v1/info') // This is only visible to gods ->action( function () use ($response, $user, $project, $version, $env) { //TODO CONSIDER BLOCKING THIS ACTION TO ROLE GOD $response->json([ - 'name' => 'API', - 'version' => $version, - 'environment' => $env, - 'time' => date('Y-m-d H:i:s', time()), - 'user' => [ + 'name' => 'API', + 'version' => $version, + 'environment' => $env, + 'time' => date('Y-m-d H:i:s', time()), + 'user' => [ 'id' => $user->getUid(), 'name' => $user->getAttribute('name', ''), ], - 'project' => [ + 'project' => [ 'id' => $project->getUid(), 'name' => $project->getAttribute('name', ''), ], @@ -418,7 +419,7 @@ $utopia->get('/v1/proxy') ->label('docs', false) ->action( function () use ($response, $console, $clients) { - $view = new View(__DIR__ . '/views/proxy.phtml'); + $view = new View(__DIR__.'/views/proxy.phtml'); $view ->setParam('routes', '') ->setParam('clients', array_merge($clients, $console->getAttribute('clients', []))) @@ -449,6 +450,7 @@ $utopia->get('/v1/open-api-2.json') foreach ($ret as &$match) { $match = $match == strtoupper($match) ? strtolower($match) : lcfirst($match); } + return implode('_', $ret); } @@ -457,7 +459,7 @@ $utopia->get('/v1/open-api-2.json') return str_replace([' ', '_'], '-', strtolower(preg_replace('/([a-zA-Z])(?=[A-Z])/', '$1-', $input))); } - foreach ($services as $service) { /** @noinspection PhpIncludeInspection */ + foreach ($services as $service) { /* @noinspection PhpIncludeInspection */ if (!$service['sdk']) { continue; } @@ -471,7 +473,7 @@ $utopia->get('/v1/open-api-2.json') 'server' => ['Project' => [], 'Key' => []], ]; - /** + /* * Specifications (v3.0.0): * https://github.com/OAI/OpenAPI-Specification/blob/master/versions/3.0.0.md */ @@ -540,30 +542,23 @@ $utopia->get('/v1/open-api-2.json') ], ], ], - 'Pets' => - array( + 'Pets' => array( 'type' => 'array', - 'items' => - array( + 'items' => array( '$ref' => '#/definitions/Pet', ), ), - 'Error' => - array( - 'required' => - array( + 'Error' => array( + 'required' => array( 0 => 'code', 1 => 'message', ), - 'properties' => - array( - 'code' => - array( + 'properties' => array( + 'code' => array( 'type' => 'integer', 'format' => 'int32', ), - 'message' => - array( + 'message' => array( 'type' => 'string', ), ), @@ -571,8 +566,8 @@ $utopia->get('/v1/open-api-2.json') ], 'externalDocs' => [ 'description' => 'Full API docs, specs and tutorials', - 'url' => $request->getServer('REQUEST_SCHEME', 'https') . '://' . $domain . '/docs' - ] + 'url' => $request->getServer('REQUEST_SCHEME', 'https').'://'.$domain.'/docs', + ], ]; foreach ($utopia->getRoutes() as $key => $method) { @@ -585,10 +580,10 @@ $utopia->get('/v1/open-api-2.json') continue; } - $url = str_replace('/v1', '', $route->getURL()); - $scope = $route->getLabel('scope', ''); - $hide = $route->getLabel('sdk.hide', false); - $consumes = []; + $url = str_replace('/v1', '', $route->getURL()); + $scope = $route->getLabel('scope', ''); + $hide = $route->getLabel('sdk.hide', false); + $consumes = []; if ($hide) { continue; @@ -604,7 +599,7 @@ $utopia->get('/v1/open-api-2.json') 200 => [ 'description' => 'An paged array of pets', 'schema' => [ - '$ref' => '#/definitions/Pet' + '$ref' => '#/definitions/Pet', ], ], ], @@ -615,7 +610,7 @@ $utopia->get('/v1/open-api-2.json') 'weight' => $route->getOrder(), 'cookies' => $route->getLabel('sdk.cookies', false), 'location' => $route->getLabel('sdk.location', false), - 'demo' => 'docs/examples/' . fromCamelCaseToDash($route->getLabel('sdk.namespace', 'default')) . '/' . fromCamelCaseToDash($temp['operationId']) . '.md', + 'demo' => 'docs/examples/'.fromCamelCaseToDash($route->getLabel('sdk.namespace', 'default')).'/'.fromCamelCaseToDash($temp['operationId']).'.md', ]; } @@ -631,8 +626,8 @@ $utopia->get('/v1/open-api-2.json') 'properties' => [], ], 'required' => [], - ] - ] + ], + ], ]; foreach ($route->getParams() as $name => $param) { @@ -647,11 +642,11 @@ $utopia->get('/v1/open-api-2.json') switch ((!empty($validator)) ? get_class($validator) : '') { case 'Utopia\Validator\Text': $node['type'] = 'string'; - $node['x-example'] = '[' . strtoupper(fromCamelCase($node['name'])) . ']'; + $node['x-example'] = '['.strtoupper(fromCamelCase($node['name'])).']'; break; case 'Database\Validator\UID': $node['type'] = 'string'; - $node['x-example'] = '[' . strtoupper(fromCamelCase($node['name'])) . ']'; + $node['x-example'] = '['.strtoupper(fromCamelCase($node['name'])).']'; break; case 'Utopia\Validator\Email': $node['type'] = 'string'; @@ -678,7 +673,7 @@ $utopia->get('/v1/open-api-2.json') $node['type'] = 'array'; $node['collectionFormat'] = 'multi'; $node['items'] = [ - 'type' => 'string' + 'type' => 'string', ]; break; case 'Auth\Validator\Password': @@ -716,7 +711,7 @@ $utopia->get('/v1/open-api-2.json') $node['default'] = $param['default']; } - if (false !== strpos($url, ':' . $name)) { // Param is in URL path + if (false !== strpos($url, ':'.$name)) { // Param is in URL path $node['in'] = 'path'; $temp['parameters'][] = $node; } elseif ($key == 'GET') { // Param is in query @@ -732,7 +727,7 @@ $utopia->get('/v1/open-api-2.json') } } - $url = str_replace(':' . $name, '{' . $name . '}', $url); + $url = str_replace(':'.$name, '{'.$name.'}', $url); } $temp['consumes'] = $consumes; @@ -755,18 +750,18 @@ $name = APP_NAME; if (array_key_exists($service, $services)) { /** @noinspection PhpIncludeInspection */ include_once $services[$service]['controller']; - $name = APP_NAME . ' ' . ucfirst($services[$service]['name']); + $name = APP_NAME.' '.ucfirst($services[$service]['name']); } else { /** @noinspection PhpIncludeInspection */ include_once $services['/']['controller']; } if (extension_loaded('newrelic')) { - $route = $utopia->match($request); - $url = (!empty($route)) ? $route->getURL() : '/error'; + $route = $utopia->match($request); + $url = (!empty($route)) ? $route->getURL() : '/error'; newrelic_set_appname($name); - newrelic_name_transaction($request->getServer('REQUEST_METHOD', 'UNKNOWN') . ': ' . $url); + newrelic_name_transaction($request->getServer('REQUEST_METHOD', 'UNKNOWN').': '.$url); } $utopia->run($request, $response); diff --git a/app/config/collections.php b/app/config/collections.php index ac62c1882..524eaaa80 100644 --- a/app/config/collections.php +++ b/app/config/collections.php @@ -38,13 +38,13 @@ $collections = [ '$collection' => Database::SYSTEM_COLLECTION_PLATFORMS, 'name' => 'Localhost (SSL)', 'type' => 'web', - 'url' => 'https://' . $request->getServer('HTTP_HOST'), + 'url' => 'https://'.$request->getServer('HTTP_HOST'), ], [ '$collection' => Database::SYSTEM_COLLECTION_PLATFORMS, 'name' => 'Localhost (Non-SSL)', 'type' => 'web', - 'url' => 'http://' . $request->getServer('HTTP_HOST'), + 'url' => 'http://'.$request->getServer('HTTP_HOST'), ], ], 'legalName' => '', @@ -1076,7 +1076,7 @@ foreach ($providers as $key => $provider) { $collections[Database::SYSTEM_COLLECTION_PROJECTS]['rules'][] = [ '$collection' => Database::SYSTEM_COLLECTION_RULES, 'label' => 'OAuth '.ucfirst($key).' ID', - 'key' => 'usersOauth'.ucfirst($key) . 'Appid', + 'key' => 'usersOauth'.ucfirst($key).'Appid', 'type' => 'text', 'default' => '', 'required' => false, diff --git a/app/config/locale/es.countries.php b/app/config/locale/es.countries.php index f975e007d..a0c11ae5c 100644 --- a/app/config/locale/es.countries.php +++ b/app/config/locale/es.countries.php @@ -1,4 +1,5 @@ 'Afganistán', 'AO' => 'Angola', diff --git a/app/config/locale/it.continents.php b/app/config/locale/it.continents.php index 22672575b..6bd12d370 100644 --- a/app/config/locale/it.continents.php +++ b/app/config/locale/it.continents.php @@ -1,10 +1,11 @@ - 'Africa', - 'AN' => 'Antartide', - 'AS' => 'Asia', - 'EU' => 'Europa', - 'NA' => 'Nord America', - 'OC' => 'Oceania', - 'SA' => 'Sud America', -]; \ No newline at end of file + 'Africa', + 'AN' => 'Antartide', + 'AS' => 'Asia', + 'EU' => 'Europa', + 'NA' => 'Nord America', + 'OC' => 'Oceania', + 'SA' => 'Sud America', +]; diff --git a/app/config/locale/it.countries.php b/app/config/locale/it.countries.php index 6d539332a..cf8a339b1 100644 --- a/app/config/locale/it.countries.php +++ b/app/config/locale/it.countries.php @@ -1,198 +1,198 @@ - 'Afghanistan', - 'AO' => 'Angola', - 'AL' => 'Albania', - 'AD' => 'Andorra', - 'AE' => 'Emirati Arabi Uniti', - 'AR' => 'Argentina', - 'AM' => 'Armenia', - 'AG' => 'Antigua e Barbuda', - 'AU' => 'Australia', - 'AT' => 'Austria', - 'AZ' => 'Azerbaigian', - 'BI' => 'Burundi', - 'BE' => 'Belgio', - 'BJ' => 'Benin', - 'BF' => 'Burkina Faso', - 'BD' => 'Bangladesh', - 'BG' => 'Bulgaria', - 'BH' => 'Bahrein', - 'BS' => 'Bahamas', - "BA" => "Bosnia ed Erzegovina", - 'BY' => 'Bielorussia', - 'BZ' => 'Belize', - 'BO' => 'Bolivia', - 'BR' => 'Brasile', - 'BB' => 'Barbados', - 'BN' => 'Brunei', - 'BT' => 'Bhutan', - 'BW' => 'Botswana', - "CF" => "Repubblica centrafricana", - 'CA' => 'Canada', - 'CH' => 'Svizzera', - 'CL' => 'Cile', - 'CN' => 'Cina', - 'CI' => 'Costa d\'Avorio', - 'CM' => 'Camerun', - 'CD' => 'DR Congo', - 'CG' => 'Repubblica del Congo', - 'CO' => 'Colombia', - 'KM' => 'Comore', - 'CV' => 'Capo Verde', - 'CR' => 'Costa Rica', - 'CU' => 'Cuba', - 'CY' => 'Cipro', - 'CZ' => 'Czechia', - 'DE' => 'Germania', - 'DJ' => 'Gibuti', - 'DM' => 'Dominica', - 'DK' => 'Danimarca', - 'DO' => 'Repubblica Dominicana', - 'DZ' => 'Algeria', - 'EC' => 'Ecuador', - 'EG' => 'Egitto', - 'ER' => 'Eritrea', - 'ES' => 'Spagna', - 'EE' => 'Estonia', - 'ET' => 'Etiopia', - 'FI' => 'Finlandia', - 'FJ' => 'Figi', - 'FR' => 'France', - 'FM' => 'Micronesia', - 'GA' => 'Gabon', - 'GB' => 'Regno Unito', - 'GE' => 'Georgia', - 'GH' => 'Ghana', - 'GN' => 'Guinea', - 'GM' => 'Gambia', - 'GW' => 'Guinea-Bissau', - 'GQ' => 'Guinea equatoriale', - 'GR' => 'Grecia', - 'GD' => 'Grenada', - 'GT' => 'Guatemala', - 'GY' => 'Guyana', - 'HN' => 'Honduras', - 'HR' => 'Croazia', - 'HT' => 'Haiti', - 'HU' => 'Ungheria', - 'ID' => 'Indonesia', - 'IN' => 'India', - 'IE' => 'Irlanda', - 'IR' => 'Iran', - 'IQ' => 'Iraq', - 'IS' => 'Islanda', - 'IL' => 'Israele', - 'IT' => 'Italia', - 'JM' => 'Giamaica', - 'JO' => 'Jordan', - 'JP' => 'Giappone', - 'KZ' => 'Kazakistan', - 'KE' => 'Kenya', - 'KG' => 'Kirghizistan', - 'KH' => 'Cambogia', - 'KI' => 'Kiribati', - 'KN' => 'Saint Kitts e Nevis', - "KR" => "Corea del Sud", - 'KW' => 'Kuwait', - 'LA' => 'Laos', - 'LB' => 'Libano', - 'LR' => 'Liberia', - 'LY' => 'Libia', - 'LC' => 'Santa Lucia', - 'LI' => 'Liechtenstein', - 'LK' => 'Sri Lanka', - 'LS' => 'Lesotho', - 'LT' => 'Lituania', - 'LU' => 'Lussemburgo', - 'LV' => 'Lettonia', - 'MA' => 'Marocco', - 'MC' => 'Monaco', - 'MD' => 'Moldavia', - 'MG' => 'Madagascar', - 'MV' => 'Maldive', - 'MX' => 'Messico', - 'MH' => 'Isole Marshall', - 'MK' => 'Macedonia', - 'ML' => 'Mali', - 'MT' => 'Malta', - 'MM' => 'Myanmar', - 'ME' => 'Montenegro', - 'MN' => 'Mongolia', - 'MZ' => 'Mozambico', - 'MR' => 'Mauritania', - 'MU' => 'Mauritius', - 'MW' => 'Malawi', - 'MY' => 'Malaysia', - 'NA' => 'Namibia', - 'NE' => 'Niger', - 'NG' => 'Nigeria', - 'NI' => 'Nicaragua', - 'NL' => 'Paesi Bassi', - 'NO' => 'Norvegia', - 'NP' => 'Nepal', - 'NR' => 'Nauru', - 'NZ' => 'Nuova Zelanda', - 'OM' => 'Oman', - 'PK' => 'Pakistan', - 'PA' => 'Panama', - 'PE' => 'Perù', - 'PH' => 'Filippine', - 'PW' => 'Palau', - 'PG' => 'Papua New Guinea', - 'PL' => 'Polonia', - 'KP' => 'Corea del Nord', - 'PT' => 'Portogallo', - 'PY' => 'Paraguay', - 'QA' => 'Qatar', - 'RO' => 'Romania', - 'RU' => 'Russia', - 'RW' => 'Ruanda', - 'SA' => 'Arabia Saudita', - 'SD' => 'Sudan', - 'SN' => 'Senegal', - 'SG' => 'Singapore', - 'SB' => 'Isole Salomone', - 'SL' => 'Sierra Leone', - 'SV' => 'El Salvador', - 'SM' => 'San Marino', - 'SO' => 'Somalia', - 'RS' => 'Serbia', - 'SS' => 'Sudan del Sud', - 'ST' => 'São Tomé and Príncipe', - 'SR' => 'Suriname', - 'SK' => 'Slovacchia', - 'SI' => 'Slovenia', - 'SE' => 'Svezia', - 'SZ' => 'Swaziland', - 'SC' => 'Seychelles', - 'SY' => 'Siria', - 'TD' => 'Chad', - 'TG' => 'Togo', - 'TH' => 'Thailand', - 'TJ' => 'Tagikistan', - 'TM' => 'Turkmenistan', - 'TL' => 'Timor Est', - 'TO' => 'Tonga', - 'TT' => 'Trinidad e Tobago', - 'TN' => 'Tunisia', - 'TR' => 'Turchia', - 'TV' => 'Tuvalu', - 'TZ' => 'Tanzania', - 'UG' => 'Uganda', - 'UA' => 'Ucraina', - 'UY' => 'Uruguay', - 'US' => 'Stati Uniti', - 'UZ' => 'Uzbekistan', - 'VA' => 'Città del Vaticano', - 'VC' => 'Saint Vincent e Grenadine', - 'VE' => 'Venezuela', - 'VN' => 'Vietnam', - 'VU' => 'Vanuatu', - 'WS' => 'Samoa', - 'YE' => 'Yemen', - 'ZA' => 'Sudafrica', - 'ZM' => 'Zambia', - 'ZW' => 'Zimbabwe', -]; \ No newline at end of file + 'Afghanistan', + 'AO' => 'Angola', + 'AL' => 'Albania', + 'AD' => 'Andorra', + 'AE' => 'Emirati Arabi Uniti', + 'AR' => 'Argentina', + 'AM' => 'Armenia', + 'AG' => 'Antigua e Barbuda', + 'AU' => 'Australia', + 'AT' => 'Austria', + 'AZ' => 'Azerbaigian', + 'BI' => 'Burundi', + 'BE' => 'Belgio', + 'BJ' => 'Benin', + 'BF' => 'Burkina Faso', + 'BD' => 'Bangladesh', + 'BG' => 'Bulgaria', + 'BH' => 'Bahrein', + 'BS' => 'Bahamas', + 'BA' => 'Bosnia ed Erzegovina', + 'BY' => 'Bielorussia', + 'BZ' => 'Belize', + 'BO' => 'Bolivia', + 'BR' => 'Brasile', + 'BB' => 'Barbados', + 'BN' => 'Brunei', + 'BT' => 'Bhutan', + 'BW' => 'Botswana', + 'CF' => 'Repubblica centrafricana', + 'CA' => 'Canada', + 'CH' => 'Svizzera', + 'CL' => 'Cile', + 'CN' => 'Cina', + 'CI' => 'Costa d\'Avorio', + 'CM' => 'Camerun', + 'CD' => 'DR Congo', + 'CG' => 'Repubblica del Congo', + 'CO' => 'Colombia', + 'KM' => 'Comore', + 'CV' => 'Capo Verde', + 'CR' => 'Costa Rica', + 'CU' => 'Cuba', + 'CY' => 'Cipro', + 'CZ' => 'Czechia', + 'DE' => 'Germania', + 'DJ' => 'Gibuti', + 'DM' => 'Dominica', + 'DK' => 'Danimarca', + 'DO' => 'Repubblica Dominicana', + 'DZ' => 'Algeria', + 'EC' => 'Ecuador', + 'EG' => 'Egitto', + 'ER' => 'Eritrea', + 'ES' => 'Spagna', + 'EE' => 'Estonia', + 'ET' => 'Etiopia', + 'FI' => 'Finlandia', + 'FJ' => 'Figi', + 'FR' => 'France', + 'FM' => 'Micronesia', + 'GA' => 'Gabon', + 'GB' => 'Regno Unito', + 'GE' => 'Georgia', + 'GH' => 'Ghana', + 'GN' => 'Guinea', + 'GM' => 'Gambia', + 'GW' => 'Guinea-Bissau', + 'GQ' => 'Guinea equatoriale', + 'GR' => 'Grecia', + 'GD' => 'Grenada', + 'GT' => 'Guatemala', + 'GY' => 'Guyana', + 'HN' => 'Honduras', + 'HR' => 'Croazia', + 'HT' => 'Haiti', + 'HU' => 'Ungheria', + 'ID' => 'Indonesia', + 'IN' => 'India', + 'IE' => 'Irlanda', + 'IR' => 'Iran', + 'IQ' => 'Iraq', + 'IS' => 'Islanda', + 'IL' => 'Israele', + 'IT' => 'Italia', + 'JM' => 'Giamaica', + 'JO' => 'Jordan', + 'JP' => 'Giappone', + 'KZ' => 'Kazakistan', + 'KE' => 'Kenya', + 'KG' => 'Kirghizistan', + 'KH' => 'Cambogia', + 'KI' => 'Kiribati', + 'KN' => 'Saint Kitts e Nevis', + 'KR' => 'Corea del Sud', + 'KW' => 'Kuwait', + 'LA' => 'Laos', + 'LB' => 'Libano', + 'LR' => 'Liberia', + 'LY' => 'Libia', + 'LC' => 'Santa Lucia', + 'LI' => 'Liechtenstein', + 'LK' => 'Sri Lanka', + 'LS' => 'Lesotho', + 'LT' => 'Lituania', + 'LU' => 'Lussemburgo', + 'LV' => 'Lettonia', + 'MA' => 'Marocco', + 'MC' => 'Monaco', + 'MD' => 'Moldavia', + 'MG' => 'Madagascar', + 'MV' => 'Maldive', + 'MX' => 'Messico', + 'MH' => 'Isole Marshall', + 'MK' => 'Macedonia', + 'ML' => 'Mali', + 'MT' => 'Malta', + 'MM' => 'Myanmar', + 'ME' => 'Montenegro', + 'MN' => 'Mongolia', + 'MZ' => 'Mozambico', + 'MR' => 'Mauritania', + 'MU' => 'Mauritius', + 'MW' => 'Malawi', + 'MY' => 'Malaysia', + 'NA' => 'Namibia', + 'NE' => 'Niger', + 'NG' => 'Nigeria', + 'NI' => 'Nicaragua', + 'NL' => 'Paesi Bassi', + 'NO' => 'Norvegia', + 'NP' => 'Nepal', + 'NR' => 'Nauru', + 'NZ' => 'Nuova Zelanda', + 'OM' => 'Oman', + 'PK' => 'Pakistan', + 'PA' => 'Panama', + 'PE' => 'Perù', + 'PH' => 'Filippine', + 'PW' => 'Palau', + 'PG' => 'Papua New Guinea', + 'PL' => 'Polonia', + 'KP' => 'Corea del Nord', + 'PT' => 'Portogallo', + 'PY' => 'Paraguay', + 'QA' => 'Qatar', + 'RO' => 'Romania', + 'RU' => 'Russia', + 'RW' => 'Ruanda', + 'SA' => 'Arabia Saudita', + 'SD' => 'Sudan', + 'SN' => 'Senegal', + 'SG' => 'Singapore', + 'SB' => 'Isole Salomone', + 'SL' => 'Sierra Leone', + 'SV' => 'El Salvador', + 'SM' => 'San Marino', + 'SO' => 'Somalia', + 'RS' => 'Serbia', + 'SS' => 'Sudan del Sud', + 'ST' => 'São Tomé and Príncipe', + 'SR' => 'Suriname', + 'SK' => 'Slovacchia', + 'SI' => 'Slovenia', + 'SE' => 'Svezia', + 'SZ' => 'Swaziland', + 'SC' => 'Seychelles', + 'SY' => 'Siria', + 'TD' => 'Chad', + 'TG' => 'Togo', + 'TH' => 'Thailand', + 'TJ' => 'Tagikistan', + 'TM' => 'Turkmenistan', + 'TL' => 'Timor Est', + 'TO' => 'Tonga', + 'TT' => 'Trinidad e Tobago', + 'TN' => 'Tunisia', + 'TR' => 'Turchia', + 'TV' => 'Tuvalu', + 'TZ' => 'Tanzania', + 'UG' => 'Uganda', + 'UA' => 'Ucraina', + 'UY' => 'Uruguay', + 'US' => 'Stati Uniti', + 'UZ' => 'Uzbekistan', + 'VA' => 'Città del Vaticano', + 'VC' => 'Saint Vincent e Grenadine', + 'VE' => 'Venezuela', + 'VN' => 'Vietnam', + 'VU' => 'Vanuatu', + 'WS' => 'Samoa', + 'YE' => 'Yemen', + 'ZA' => 'Sudafrica', + 'ZM' => 'Zambia', + 'ZW' => 'Zimbabwe', +]; diff --git a/app/config/locale/it.php b/app/config/locale/it.php index 071a17b8f..dfc8d1197 100644 --- a/app/config/locale/it.php +++ b/app/config/locale/it.php @@ -1,18 +1,18 @@ - '"L\'arte di essere saggi è l\'arte di sapere cosa trascurare."', // Questa è la riga stampata nella homepage e nella console 'view-source' - 'settings.locale' => 'it', - 'settings.direction' => 'ltr', - // Servizio - Utenti - 'auth.emails.team' => '%s Squadra', - 'auth.emails.confirm.title' => 'Conferma dell\'account', - 'auth.emails.confirm.body' => 'en.email.auth.confirm.tpl', - 'auth.emails.recovery.title' => 'Reimpostazione della password', - 'auth.emails.recovery.body' => 'en.email.auth.recovery.tpl', - 'auth.emails.invitation.title' => 'Invito a %s squadra %s', - 'auth.emails.invitation.body' => 'en.email.auth.invitation.tpl', - 'locale.country.unknown' => 'Sconosciuto', - 'countries' => include 'it.countries.php', - 'continents' => include 'it.continents.php', -]; \ No newline at end of file + '"L\'arte di essere saggi è l\'arte di sapere cosa trascurare."', // Questa è la riga stampata nella homepage e nella console 'view-source' + 'settings.locale' => 'it', + 'settings.direction' => 'ltr', + // Servizio - Utenti + 'auth.emails.team' => '%s Squadra', + 'auth.emails.confirm.title' => 'Conferma dell\'account', + 'auth.emails.confirm.body' => 'en.email.auth.confirm.tpl', + 'auth.emails.recovery.title' => 'Reimpostazione della password', + 'auth.emails.recovery.body' => 'en.email.auth.recovery.tpl', + 'auth.emails.invitation.title' => 'Invito a %s squadra %s', + 'auth.emails.invitation.body' => 'en.email.auth.invitation.tpl', + 'locale.country.unknown' => 'Sconosciuto', + 'countries' => include 'it.countries.php', + 'continents' => include 'it.continents.php', +]; diff --git a/app/config/version.php b/app/config/version.php index 0d2a19c09..4f8cb07ea 100644 --- a/app/config/version.php +++ b/app/config/version.php @@ -1,4 +1,5 @@ post('/v1/auth/register') ->action( function ($email, $password, $confirm, $success, $failure, $name) use ($request, $response, $register, $audit, $projectDB, $project, $webhook) { if ('console' === $project->getUid()) { - $whitlistEmails = $project->getAttribute('authWhitelistEmails'); - $whitlistIPs = $project->getAttribute('authWhitelistIPs'); - $whitlistDomains = $project->getAttribute('authWhitelistDomains'); + $whitlistEmails = $project->getAttribute('authWhitelistEmails'); + $whitlistIPs = $project->getAttribute('authWhitelistIPs'); + $whitlistDomains = $project->getAttribute('authWhitelistDomains'); if (!empty($whitlistEmails) && !in_array($email, $whitlistEmails)) { throw new Exception('Console registration is restricted to specific emails. Contact your administrator for more information.', 401); @@ -61,11 +61,11 @@ $utopia->post('/v1/auth/register') throw new Exception('Console registration is restricted to specific IPs. Contact your administrator for more information.', 401); } - if (!empty($whitlistDomains) && !in_array(substr(strrchr($email, "@"), 1), $whitlistDomains)) { + if (!empty($whitlistDomains) && !in_array(substr(strrchr($email, '@'), 1), $whitlistDomains)) { throw new Exception('Console registration is restricted to specific domains. Contact your administrator for more information.', 401); } } - + $profile = $projectDB->getCollection([ // Get user by email address 'limit' => 1, 'first' => true, @@ -77,7 +77,7 @@ $utopia->post('/v1/auth/register') if (!empty($profile)) { if ($failure) { - $response->redirect($failure . '?message=User already registered'); + $response->redirect($failure.'?message=User already registered'); return; } @@ -778,7 +778,7 @@ $utopia->get('/v1/auth/oauth/:provider/redirect') } $oauthID = $oauth->getUserID($accessToken); - + if (empty($oauthID)) { if (!empty($state['failure'])) { $response->redirect($state['failure'], 301, 0); @@ -788,7 +788,7 @@ $utopia->get('/v1/auth/oauth/:provider/redirect') } $current = Auth::tokenVerify($user->getAttribute('tokens', []), Auth::TOKEN_TYPE_LOGIN, Auth::$secret); - + if ($current) { $projectDB->deleteDocument($current); //throw new Exception('User already logged in', 401); } @@ -802,7 +802,6 @@ $utopia->get('/v1/auth/oauth/:provider/redirect') ], ]) : $user; - if (empty($user)) { // No user logged in or with oauth provider ID, create new one or connect with account with same email $name = $oauth->getUserName($accessToken); $email = $oauth->getUserEmail($accessToken); diff --git a/app/controllers/console.php b/app/controllers/console.php index 2a8caa44c..ef36ba9e0 100644 --- a/app/controllers/console.php +++ b/app/controllers/console.php @@ -5,7 +5,6 @@ include_once 'shared/web.php'; global $utopia, $response, $request, $layout, $version, $providers; use Utopia\View; -use Utopia\Locale\Locale; use Database\Database; use Database\Validator\UID; @@ -83,7 +82,7 @@ $utopia->get('/console/account') ; $layout - ->setParam('title', 'Account - ' . APP_NAME) + ->setParam('title', 'Account - '.APP_NAME) ->setParam('body', $page); }); diff --git a/app/controllers/database.php b/app/controllers/database.php index 7e80ecb95..e27d1feff 100644 --- a/app/controllers/database.php +++ b/app/controllers/database.php @@ -119,17 +119,17 @@ $utopia->post('/v1/database') ->action( function ($name, $read, $write, $rules) use ($response, $projectDB, $webhook, $audit) { $parsedRules = []; - + foreach ($rules as &$rule) { $parsedRules[] = array_merge([ '$collection' => Database::SYSTEM_COLLECTION_RULES, '$permissions' => [ 'read' => $read, 'write' => $write, - ] + ], ], $rule); } - + try { $data = $projectDB->createDocument([ '$collection' => Database::SYSTEM_COLLECTION_COLLECTIONS, @@ -201,16 +201,16 @@ $utopia->put('/v1/database/:collectionId') if (empty($collection->getUid()) || Database::SYSTEM_COLLECTION_COLLECTIONS != $collection->getCollection()) { throw new Exception('Collection not found', 404); } - + $parsedRules = []; - + foreach ($rules as &$rule) { $parsedRules[] = array_merge([ '$collection' => Database::SYSTEM_COLLECTION_RULES, '$permissions' => [ 'read' => $read, 'write' => $write, - ] + ], ], $rule); } diff --git a/app/controllers/health.php b/app/controllers/health.php index 99b496f10..72a630006 100644 --- a/app/controllers/health.php +++ b/app/controllers/health.php @@ -115,11 +115,11 @@ $utopia->get('/v1/health/storage/local') function () use ($response) { $device = new Local(); - if (!is_readable($device->getRoot(). '/..')) { + if (!is_readable($device->getRoot().'/..')) { throw new Exception('Device is not readable'); } - if (!is_writable($device->getRoot(). '/..')) { + if (!is_writable($device->getRoot().'/..')) { throw new Exception('Device is not writable'); } diff --git a/app/controllers/home.php b/app/controllers/home.php index 58f5b7e1d..b2a17de98 100644 --- a/app/controllers/home.php +++ b/app/controllers/home.php @@ -5,7 +5,6 @@ include_once 'shared/web.php'; global $utopia, $response, $request, $layout, $version, $providers, $sdks; use Utopia\View; -use Utopia\Locale\Locale; $layout ->setParam('title', APP_NAME) diff --git a/app/controllers/shared/api.php b/app/controllers/shared/api.php index 87ec3e57d..4da090a84 100644 --- a/app/controllers/shared/api.php +++ b/app/controllers/shared/api.php @@ -1,4 +1,5 @@ getServer('_APP_ENV', App::ENV_TYPE_PRODUCTION); -$domain = $request->getServer('HTTP_HOST', ''); -$version = include __DIR__ . '/../app/config/version.php'; -$providers = include __DIR__ . '/../app/config/providers.php'; // OAuth providers list -$collections = include __DIR__ . '/../app/config/collections.php'; // OAuth providers list -$redisHost = $request->getServer('_APP_REDIS_HOST', ''); -$redisPort = $request->getServer('_APP_REDIS_PORT', ''); -$utopia = new App('Asia/Tel_Aviv', $env); -$port = (string)(isset($_SERVER['HTTP_HOST'])) ? parse_url($_SERVER['HTTP_HOST'], PHP_URL_PORT) : ''; +$env = $request->getServer('_APP_ENV', App::ENV_TYPE_PRODUCTION); +$domain = $request->getServer('HTTP_HOST', ''); +$version = include __DIR__.'/../app/config/version.php'; +$providers = include __DIR__.'/../app/config/providers.php'; // OAuth providers list +$collections = include __DIR__.'/../app/config/collections.php'; // OAuth providers list +$redisHost = $request->getServer('_APP_REDIS_HOST', ''); +$redisPort = $request->getServer('_APP_REDIS_PORT', ''); +$utopia = new App('Asia/Tel_Aviv', $env); +$port = (string) (isset($_SERVER['HTTP_HOST'])) ? parse_url($_SERVER['HTTP_HOST'], PHP_URL_PORT) : ''; -Resque::setBackend($redisHost . ':' . $redisPort); +Resque::setBackend($redisHost.':'.$redisPort); -define('COOKIE_DOMAIN', ($request->getServer('HTTP_HOST', null) === 'localhost' || $request->getServer('HTTP_HOST', null) === 'localhost:' . $port) ? false : '.' . $request->getServer('HTTP_HOST', false)); +define('COOKIE_DOMAIN', ($request->getServer('HTTP_HOST', null) === 'localhost' || $request->getServer('HTTP_HOST', null) === 'localhost:'.$port) ? false : '.'.$request->getServer('HTTP_HOST', false)); -/** +/* * Registry */ $register->set('db', function () use ($request) { // Register DB connection - $dbHost = $request->getServer('_APP_DB_HOST', ''); - $dbUser = $request->getServer('_APP_DB_USER', ''); - $dbPass = $request->getServer('_APP_DB_PASS', ''); - $dbScheme = $request->getServer('_APP_DB_SCHEMA', ''); + $dbHost = $request->getServer('_APP_DB_HOST', ''); + $dbUser = $request->getServer('_APP_DB_USER', ''); + $dbPass = $request->getServer('_APP_DB_PASS', ''); + $dbScheme = $request->getServer('_APP_DB_SCHEMA', ''); $pdo = new PDO("mysql:host={$dbHost};dbname={$dbScheme};charset=utf8mb4", $dbUser, $dbPass, array( PDO::MYSQL_ATTR_INIT_COMMAND => 'SET NAMES utf8mb4', - PDO::ATTR_TIMEOUT => 5 // Seconds + PDO::ATTR_TIMEOUT => 5, // Seconds )); // Connection settings @@ -73,7 +73,7 @@ $register->set('influxdb', function () use ($request) { // Register DB connectio $port = $request->getServer('_APP_INFLUXDB_PORT', ''); if (empty($host) || empty($port)) { - return null; + return; } $client = new InfluxDB\Client($host, $port, '', '', false, false, 5); @@ -93,6 +93,7 @@ $register->set('cache', function () use ($redisHost, $redisPort) { // Register c $redis = new Redis(); $redis->connect($redisHost, $redisPort); + return $redis; }); $register->set('smtp', function () use ($request) { @@ -103,33 +104,33 @@ $register->set('smtp', function () use ($request) { $username = $request->getServer('_APP_SMTP_USERNAME', ''); $password = $request->getServer('_APP_SMTP_PASSWORD', ''); - $mail->XMailer = 'Appwrite Mailer'; - $mail->Host = $request->getServer('_APP_SMTP_HOST', 'smtp'); - $mail->Port = $request->getServer('_APP_SMTP_PORT', 25); - $mail->SMTPAuth = (!empty($username) && !empty($password)); - $mail->Username = $username; - $mail->Password = $password; + $mail->XMailer = 'Appwrite Mailer'; + $mail->Host = $request->getServer('_APP_SMTP_HOST', 'smtp'); + $mail->Port = $request->getServer('_APP_SMTP_PORT', 25); + $mail->SMTPAuth = (!empty($username) && !empty($password)); + $mail->Username = $username; + $mail->Password = $password; $mail->SMTPSecure = $request->getServer('_APP_SMTP_SECURE', ''); - $mail->setFrom('team@appwrite.io', APP_NAME . ' Team'); - $mail->addReplyTo('team@appwrite.io', APP_NAME . ' Team'); + $mail->setFrom('team@appwrite.io', APP_NAME.' Team'); + $mail->addReplyTo('team@appwrite.io', APP_NAME.' Team'); $mail->isHTML(true); - + return $mail; }); -/** +/* * Localization */ $locale = $request->getParam('locale', $request->getHeader('X-Appwrite-Locale', null)); Locale::$exceptions = false; -Locale::setLanguage('en', include __DIR__ . '/config/locale/en.php'); -Locale::setLanguage('he', include __DIR__ . '/config/locale/he.php'); -Locale::setLanguage('pt-br', include __DIR__ . '/config/locale/pt-br.php'); -Locale::setLanguage('es', include __DIR__ . '/config/locale/es.php'); +Locale::setLanguage('en', include __DIR__.'/config/locale/en.php'); +Locale::setLanguage('he', include __DIR__.'/config/locale/he.php'); +Locale::setLanguage('pt-br', include __DIR__.'/config/locale/pt-br.php'); +Locale::setLanguage('es', include __DIR__.'/config/locale/es.php'); if (in_array($locale, APP_LOCALES)) { Locale::setDefault($locale); @@ -139,11 +140,11 @@ stream_context_set_default([ // Set global user agent and http settings 'http' => [ 'method' => 'GET', 'user_agent' => sprintf(APP_USERAGENT, $version), - 'timeout' => 2 - ] + 'timeout' => 2, + ], ]); -/** +/* * Auth & Project Scope */ $consoleDB = new Database(); @@ -165,19 +166,19 @@ if (is_null($project->getUid()) || Database::SYSTEM_COLLECTION_PROJECTS !== $pro $mode = $request->getParam('mode', $request->getHeader('X-Appwrite-Mode', 'default')); -Auth::setCookieName('a-session-' . $project->getUid()); +Auth::setCookieName('a-session-'.$project->getUid()); if (APP_MODE_ADMIN === $mode) { - Auth::setCookieName('a-session-' . $console->getUid()); + Auth::setCookieName('a-session-'.$console->getUid()); } -$session = Auth::decodeSession($request->getCookie(Auth::$cookieName, $request->getHeader('X-Appwrite-Key', ''))); -Auth::$unique = $session['id']; -Auth::$secret = $session['secret']; +$session = Auth::decodeSession($request->getCookie(Auth::$cookieName, $request->getHeader('X-Appwrite-Key', ''))); +Auth::$unique = $session['id']; +Auth::$secret = $session['secret']; $projectDB = new Database(); $projectDB->setAdapter(new RedisAdapter(new MySQLAdapter($register), $register)); -$projectDB->setNamespace('app_' . $project->getUid()); +$projectDB->setNamespace('app_'.$project->getUid()); $projectDB->setMocks($collections); $user = $projectDB->getDocument(Auth::$unique); @@ -186,7 +187,7 @@ if (APP_MODE_ADMIN === $mode) { $user = $consoleDB->getDocument(Auth::$unique); $user - ->setAttribute('$uid', 'admin-' . $user->getAttribute('$uid')) + ->setAttribute('$uid', 'admin-'.$user->getAttribute('$uid')) ; } diff --git a/build.sh b/build.sh index 7f5ed112a..e4364c45d 100644 --- a/build.sh +++ b/build.sh @@ -15,7 +15,7 @@ fi echo "Setting Version #" -echo -e " app/config/version.php +echo -e " app/config/version.php echo 'Updating PHP dependencies and auto-loading...' From be7d9c5b940faf04bc92c7e43b8c5fb878fe20a6 Mon Sep 17 00:00:00 2001 From: eldadfux Date: Tue, 1 Oct 2019 08:00:11 +0300 Subject: [PATCH 14/18] Updated credits --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index ae03a8754..b26d78f2d 100644 --- a/README.md +++ b/README.md @@ -110,3 +110,4 @@ Created by [Eldad Fux](https://twitter.com/eldadfux) with the amazing help of ou * 🇺🇳 Sergi Vos ([Github](https://github.com/sergivb01), [Twitter](https://twitter.com/sergivb01), [Linkedin](https://www.linkedin.com/in/sergivb01/)) * 🇮🇱 Tomer Cohen ([Github](https://github.com/tomer), [Twitter](https://twitter.com/tomer)) * 🇬🇷 Panagiotis Skarlas ([Github](https://github.com/1qk1), [Twitter](https://twitter.com/qktweets)) +* 🇷🇺 Alexey Pyltsyn ([Github](https://github.com/lex111)) From eebf23b0953bd0320218b12f048bd71166198c23 Mon Sep 17 00:00:00 2001 From: eldadfux Date: Tue, 1 Oct 2019 08:00:27 +0300 Subject: [PATCH 15/18] Fixed spacings --- app/tasks/sdks.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/tasks/sdks.php b/app/tasks/sdks.php index 1c3ab7b41..ce7e6fe96 100644 --- a/app/tasks/sdks.php +++ b/app/tasks/sdks.php @@ -97,9 +97,9 @@ $cli ]; foreach ($clients as $name => $client) { - Console::info('Fetching API Spec for ' . $name . ' (' . $client['platform'] . ')'); - $spec = getSSLPage('https://appwrite.io/v1/open-api-2.json?extensions=1&platform=' . $client['platform']); - $spec = getSSLPage('https://appwrite.test/v1/open-api-2.json?extensions=1&platform=' . $client['platform']); + Console::info('Fetching API Spec for '.$name.' ('.$client['platform'].')'); + $spec = getSSLPage('https://appwrite.io/v1/open-api-2.json?extensions=1&platform='.$client['platform']); + $spec = getSSLPage('https://appwrite.test/v1/open-api-2.json?extensions=1&platform='.$client['platform']); switch ($name) { case 'php': From c8ba9b594b0a47b70a8878b8c7a8d7a914ab2e20 Mon Sep 17 00:00:00 2001 From: GwanYeong Kim Date: Tue, 1 Oct 2019 05:00:39 +0000 Subject: [PATCH 16/18] Use COPY instead of ADD in Dockerfile --- Dockerfile | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/Dockerfile b/Dockerfile index f44988d20..dedf67908 100755 --- a/Dockerfile +++ b/Dockerfile @@ -63,24 +63,24 @@ RUN \ RUN echo "upload_max_filesize = 4M" > /etc/php/7.3/fpm/conf.d/appwrite.ini # nginx conf (with ssl certificates) -ADD ./docker/nginx.conf /etc/nginx/nginx.conf -ADD ./docker/ssl/nginx.crt /etc/nginx/ssl/nginx.crt -ADD ./docker/ssl/nginx.key /etc/nginx/ssl/nginx.key +COPY ./docker/nginx.conf /etc/nginx/nginx.conf +COPY ./docker/ssl/nginx.crt /etc/nginx/ssl/nginx.crt +COPY ./docker/ssl/nginx.key /etc/nginx/ssl/nginx.key # php conf RUN mkdir -p /var/run/php -ADD ./docker/www.conf /etc/php/7.3/fpm/pool.d/www.conf +COPY ./docker/www.conf /etc/php/7.3/fpm/pool.d/www.conf # supervisord conf -ADD ./docker/supervisord.conf /etc/supervisord.conf -ADD ./docker/entrypoint.sh /entrypoint.sh +COPY ./docker/supervisord.conf /etc/supervisord.conf +COPY ./docker/entrypoint.sh /entrypoint.sh RUN chmod 775 /entrypoint.sh # add PHP files -ADD ./app /usr/share/nginx/html/app -ADD ./public /usr/share/nginx/html/public -ADD ./src /usr/share/nginx/html/src -ADD ./vendor /usr/share/nginx/html/vendor +COPY ./app /usr/share/nginx/html/app +COPY ./public /usr/share/nginx/html/public +COPY ./src /usr/share/nginx/html/src +COPY ./vendor /usr/share/nginx/html/vendor WORKDIR /storage/uploads RUN chown -Rf www-data.www-data /storage/uploads && chmod -Rf 0755 /storage/uploads @@ -90,4 +90,4 @@ RUN chown -Rf www-data.www-data /storage/cache && chmod -Rf 0755 /storage/cache EXPOSE 80 -CMD ["/bin/bash", "/entrypoint.sh"] \ No newline at end of file +CMD ["/bin/bash", "/entrypoint.sh"] From ea44bd622f1245c3913ad476b9c780c4536ad47f Mon Sep 17 00:00:00 2001 From: eldadfux Date: Tue, 1 Oct 2019 08:17:05 +0300 Subject: [PATCH 17/18] Fixed direction in UA locale --- app/config/locale/ua.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/config/locale/ua.php b/app/config/locale/ua.php index 6a2a0f455..e50f4dae3 100644 --- a/app/config/locale/ua.php +++ b/app/config/locale/ua.php @@ -3,7 +3,7 @@ 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' => 'ua', - 'settings.direction' => 'rtl', + 'settings.direction' => 'ltr', 'auth.emails.team' => '%s Команда', 'auth.emails.confirm.title' => 'Підтвердження Акаунту' , From f590b6b00ab86da2280b11c79e517727b6f04acb Mon Sep 17 00:00:00 2001 From: eldadfux Date: Tue, 1 Oct 2019 09:00:45 +0300 Subject: [PATCH 18/18] Updated credit list --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index b26d78f2d..7d49a401b 100644 --- a/README.md +++ b/README.md @@ -111,3 +111,4 @@ Created by [Eldad Fux](https://twitter.com/eldadfux) with the amazing help of ou * 🇮🇱 Tomer Cohen ([Github](https://github.com/tomer), [Twitter](https://twitter.com/tomer)) * 🇬🇷 Panagiotis Skarlas ([Github](https://github.com/1qk1), [Twitter](https://twitter.com/qktweets)) * 🇷🇺 Alexey Pyltsyn ([Github](https://github.com/lex111)) +* 🇩🇪 Robin C ([Github](https://github.com/Taminoful))