From 86811bf49a61042aff0adf875a1544174a788a07 Mon Sep 17 00:00:00 2001 From: SuuSoJeat Date: Wed, 25 Mar 2020 20:47:43 +0700 Subject: [PATCH 1/8] added Khmer locale support --- app/config/locales/km.continents.php | 11 + app/config/locales/km.countries.php | 198 ++++++++++++++++++ app/config/locales/km.php | 21 ++ .../templates/km.email.auth.confirm.tpl | 24 +++ .../templates/km.email.auth.invitation.tpl | 27 +++ .../templates/km.email.auth.recovery.tpl | 24 +++ 6 files changed, 305 insertions(+) create mode 100644 app/config/locales/km.continents.php create mode 100644 app/config/locales/km.countries.php create mode 100644 app/config/locales/km.php create mode 100644 app/config/locales/templates/km.email.auth.confirm.tpl create mode 100644 app/config/locales/templates/km.email.auth.invitation.tpl create mode 100644 app/config/locales/templates/km.email.auth.recovery.tpl diff --git a/app/config/locales/km.continents.php b/app/config/locales/km.continents.php new file mode 100644 index 000000000..c46817be1 --- /dev/null +++ b/app/config/locales/km.continents.php @@ -0,0 +1,11 @@ + 'អាហ្វ្រិក', + 'AN' => 'អង់តាក់ទិច', + 'AS' => 'អាស៊ី', + 'EU' => 'អឺរ៉ុប', + 'NA' => 'អាមេរិកខាងជើង', + 'OC' => 'អូសេអានី', + 'SA' => 'អាមេរិកខាងត្បូង', +]; diff --git a/app/config/locales/km.countries.php b/app/config/locales/km.countries.php new file mode 100644 index 000000000..0f06d62de --- /dev/null +++ b/app/config/locales/km.countries.php @@ -0,0 +1,198 @@ + 'អាហ្វហ្គានីស្ថាន', + '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' => 'Cape Verde', + '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' => 'Liechtenstein', + 'LK' => 'ស្រី​លង្កា', + 'LS' => 'Lesotho', + 'LT' => 'លីទុយអានី', + 'LU' => 'លុចសំបួ', + 'LV' => 'ឡាតវី', + 'MA' => 'ម៉ារ៉ុក', + 'MC' => 'ម៉ូណាកូ', + 'MD' => 'ម៉ុលដាវី', + 'MG' => 'ម៉ាដាហ្គាស្ការ', + 'MV' => 'ម៉ាល់ឌីវ', + 'MX' => 'ម៉ិកស៊ិក', + 'MH' => 'កោះ Marshall', + 'MK' => 'ម៉ាសេដូន', + 'ML' => 'ម៉ាលី', + 'MT' => 'ម៉ាល់តា', + 'MM' => 'មីយ៉ាន់ម៉ា', + 'ME' => 'ម៉ុងតេណេហ្គ្រោ', + 'MN' => 'ម៉ុងហ្គោលី', + 'MZ' => 'ម៉ូសំប៊ិក', + 'MR' => 'ម៉ូរីតានី', + 'MU' => 'ម៉ូរីស', + 'MW' => 'ម៉ាឡាវី', + 'MY' => 'ម៉ាឡេស៊ី', + 'NA' => 'ណាមមីបៀ', + 'NE' => 'Niger', + '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' => 'ហ្សីមបាវេ', +]; diff --git a/app/config/locales/km.php b/app/config/locales/km.php new file mode 100644 index 000000000..855bed2da --- /dev/null +++ b/app/config/locales/km.php @@ -0,0 +1,21 @@ + '"សិល្បៈនៃប្រាជ្ញាគឺជាសិល្បៈនៃការស្គាល់ពីអ្វីដែលត្រូវមើលរំលង។"', // This is the line printed in the homepage and console 'view-source' + 'settings.locale' => 'en', + 'settings.direction' => 'ltr', + + // Service - Users + 'account.emails.team' => 'ក្រុម %s', + 'account.emails.verification.title' => 'ការផ្ទៀងផ្ទាត់គណនី', + 'account.emails.verification.body' => 'en.email.auth.confirm.tpl', + 'account.emails.recovery.title' => 'កំណត់ពាក្យសម្ងាត់ឡើងវិញ', + 'account.emails.recovery.body' => 'en.email.auth.recovery.tpl', + 'account.emails.invitation.title' => 'ការអញ្ជើញចូលក្នុងក្រុម %s នៅ %s', + 'account.emails.invitation.body' => 'en.email.auth.invitation.tpl', + + 'locale.country.unknown' => 'មិនស្គាល់', + + 'countries' => include 'en.countries.php', + 'continents' => include 'en.continents.php', +]; diff --git a/app/config/locales/templates/km.email.auth.confirm.tpl b/app/config/locales/templates/km.email.auth.confirm.tpl new file mode 100644 index 000000000..c2c94d08c --- /dev/null +++ b/app/config/locales/templates/km.email.auth.confirm.tpl @@ -0,0 +1,24 @@ + + +
+ សួស្ដី {{name}}, +
+
+ តាមតំណនេះដើម្បីផ្ទៀងផ្ទាត់អាសយដ្ឋានសារអេឡិចត្រូនិចរបស់អ្នក។ +
+ {{redirect}} +
+
+ ប្រសិនបើអ្នកពុំបានស្នើសុំផ្ទៀងផ្ទាត់អាសយដ្ឋាននេះទេ អ្នកអាចមិនអើពើនឹងសារនេះបាន។ +
+
+ អរគុណ, +
+ ក្រុម {{project}} +
\ No newline at end of file diff --git a/app/config/locales/templates/km.email.auth.invitation.tpl b/app/config/locales/templates/km.email.auth.invitation.tpl new file mode 100644 index 000000000..910a14451 --- /dev/null +++ b/app/config/locales/templates/km.email.auth.invitation.tpl @@ -0,0 +1,27 @@ + + +
+ សួស្ដី, +
+
+ សារអេឡិចត្រូនិចនេះត្រូវបានផ្ញើទៅអ្នកដោយសារ {{owner}} ចង់អញ្ជើញអ្នកឲ្យក្លាយជាសមាជិកនៅក្រុម {{team}} លើ {{project}}។ +
+
+ តាមតំណនេះដើម្បីចូលរួមក្នុងក្រុម {{team}}៖ +
+ {{redirect}} +
+
+ ប្រសិនបើអ្នកមិនចាប់អារម្មណ៍ អ្នកអាចមិនអើពើនឹងសារនេះបាន។ +
+
+ អរគុណ, +
+ ក្រុម {{project}} +
diff --git a/app/config/locales/templates/km.email.auth.recovery.tpl b/app/config/locales/templates/km.email.auth.recovery.tpl new file mode 100644 index 000000000..138997623 --- /dev/null +++ b/app/config/locales/templates/km.email.auth.recovery.tpl @@ -0,0 +1,24 @@ + + +
+ សួស្ដី {{name}}, +
+
+ តាមតំណនេះដើម្បីកំណត់ពាក្យសម្ងាត់នៃ {{project}} របស់អ្នកឡើងវិញ។ +
+ {{redirect}} +
+
+ ប្រសិនបើអ្នកពុំបានស្នើសុំកំណត់ពាក្យសម្ងាត់របស់អ្នកឡើងវិញទេ អ្នកអាចមិនអើពើនឹងសារនេះបាន។ +
+
+ អរគុណ, +
+ ក្រុម {{project}} +
From cd6c213039dfa0a3dfbde6640cee0375e0d17c6a Mon Sep 17 00:00:00 2001 From: SuuSoJeat Date: Wed, 25 Mar 2020 21:03:09 +0700 Subject: [PATCH 2/8] patch: added new locale to locales.php --- app/config/locales.php | 1 + 1 file changed, 1 insertion(+) diff --git a/app/config/locales.php b/app/config/locales.php index 76c164fb6..58f676eef 100644 --- a/app/config/locales.php +++ b/app/config/locales.php @@ -22,6 +22,7 @@ return [ 'it', // Italian 'ja', // Japanese 'jv', // Javanese + 'km', 'ko', // Korean 'lt', // Lithuanian 'ml', // Malayalam From cf2c9daafa9ec29f9bd17c01da9ec6f54374490d Mon Sep 17 00:00:00 2001 From: SuuSoJeat Date: Sat, 28 Mar 2020 17:50:58 +0700 Subject: [PATCH 3/8] patch: careless mistakes --- app/config/locales/km.php | 12 +-- .../.dart_tool/package_config.json | 86 ++++++++++++++++++ app/sdks/flutter-dart/.packages | 14 +++ app/sdks/flutter-dart/pubspec.lock | 89 +++++++++++++++++++ 4 files changed, 195 insertions(+), 6 deletions(-) create mode 100644 app/sdks/flutter-dart/.dart_tool/package_config.json create mode 100644 app/sdks/flutter-dart/.packages create mode 100644 app/sdks/flutter-dart/pubspec.lock diff --git a/app/config/locales/km.php b/app/config/locales/km.php index 855bed2da..ee3ea53ec 100644 --- a/app/config/locales/km.php +++ b/app/config/locales/km.php @@ -2,20 +2,20 @@ return [ 'settings.inspire' => '"សិល្បៈនៃប្រាជ្ញាគឺជាសិល្បៈនៃការស្គាល់ពីអ្វីដែលត្រូវមើលរំលង។"', // This is the line printed in the homepage and console 'view-source' - 'settings.locale' => 'en', + 'settings.locale' => 'km', 'settings.direction' => 'ltr', // Service - Users 'account.emails.team' => 'ក្រុម %s', 'account.emails.verification.title' => 'ការផ្ទៀងផ្ទាត់គណនី', - 'account.emails.verification.body' => 'en.email.auth.confirm.tpl', + 'account.emails.verification.body' => 'km.email.auth.confirm.tpl', 'account.emails.recovery.title' => 'កំណត់ពាក្យសម្ងាត់ឡើងវិញ', - 'account.emails.recovery.body' => 'en.email.auth.recovery.tpl', + 'account.emails.recovery.body' => 'km.email.auth.recovery.tpl', 'account.emails.invitation.title' => 'ការអញ្ជើញចូលក្នុងក្រុម %s នៅ %s', - 'account.emails.invitation.body' => 'en.email.auth.invitation.tpl', + 'account.emails.invitation.body' => 'km.email.auth.invitation.tpl', 'locale.country.unknown' => 'មិនស្គាល់', - 'countries' => include 'en.countries.php', - 'continents' => include 'en.continents.php', + 'countries' => include 'km.countries.php', + 'continents' => include 'km.continents.php', ]; diff --git a/app/sdks/flutter-dart/.dart_tool/package_config.json b/app/sdks/flutter-dart/.dart_tool/package_config.json new file mode 100644 index 000000000..95436b6a8 --- /dev/null +++ b/app/sdks/flutter-dart/.dart_tool/package_config.json @@ -0,0 +1,86 @@ +{ + "configVersion": 2, + "packages": [ + { + "name": "charcode", + "rootUri": "file:///Users/eterna/.pub-cache/hosted/pub.dartlang.org/charcode-1.1.3", + "packageUri": "lib/", + "languageVersion": "2.0" + }, + { + "name": "collection", + "rootUri": "file:///Users/eterna/.pub-cache/hosted/pub.dartlang.org/collection-1.14.12", + "packageUri": "lib/", + "languageVersion": "2.0" + }, + { + "name": "cookie_jar", + "rootUri": "file:///Users/eterna/.pub-cache/hosted/pub.dartlang.org/cookie_jar-1.0.1", + "packageUri": "lib/", + "languageVersion": "1.20" + }, + { + "name": "dio", + "rootUri": "file:///Users/eterna/.pub-cache/hosted/pub.dartlang.org/dio-3.0.9", + "packageUri": "lib/", + "languageVersion": "2.4" + }, + { + "name": "dio_cookie_manager", + "rootUri": "file:///Users/eterna/.pub-cache/hosted/pub.dartlang.org/dio_cookie_manager-1.0.0", + "packageUri": "lib/", + "languageVersion": "2.4" + }, + { + "name": "http_parser", + "rootUri": "file:///Users/eterna/.pub-cache/hosted/pub.dartlang.org/http_parser-3.1.4", + "packageUri": "lib/", + "languageVersion": "2.3" + }, + { + "name": "meta", + "rootUri": "file:///Users/eterna/.pub-cache/hosted/pub.dartlang.org/meta-1.1.8", + "packageUri": "lib/", + "languageVersion": "1.12" + }, + { + "name": "path", + "rootUri": "file:///Users/eterna/.pub-cache/hosted/pub.dartlang.org/path-1.6.4", + "packageUri": "lib/", + "languageVersion": "2.0" + }, + { + "name": "source_span", + "rootUri": "file:///Users/eterna/.pub-cache/hosted/pub.dartlang.org/source_span-1.7.0", + "packageUri": "lib/", + "languageVersion": "2.6" + }, + { + "name": "string_scanner", + "rootUri": "file:///Users/eterna/.pub-cache/hosted/pub.dartlang.org/string_scanner-1.0.5", + "packageUri": "lib/", + "languageVersion": "2.0" + }, + { + "name": "term_glyph", + "rootUri": "file:///Users/eterna/.pub-cache/hosted/pub.dartlang.org/term_glyph-1.1.0", + "packageUri": "lib/", + "languageVersion": "1.8" + }, + { + "name": "typed_data", + "rootUri": "file:///Users/eterna/.pub-cache/hosted/pub.dartlang.org/typed_data-1.1.6", + "packageUri": "lib/", + "languageVersion": "2.0" + }, + { + "name": "appwrite", + "rootUri": "../", + "packageUri": "lib/", + "languageVersion": "2.6" + } + ], + "generated": "2020-03-28T02:43:48.665116Z", + "generator": "pub", + "generatorVersion": "2.8.0-dev.3.0.flutter-f1df196ddf" +} diff --git a/app/sdks/flutter-dart/.packages b/app/sdks/flutter-dart/.packages new file mode 100644 index 000000000..34b178fd7 --- /dev/null +++ b/app/sdks/flutter-dart/.packages @@ -0,0 +1,14 @@ +# Generated by pub on 2020-03-28 09:43:48.656004. +charcode:file:///Users/eterna/.pub-cache/hosted/pub.dartlang.org/charcode-1.1.3/lib/ +collection:file:///Users/eterna/.pub-cache/hosted/pub.dartlang.org/collection-1.14.12/lib/ +cookie_jar:file:///Users/eterna/.pub-cache/hosted/pub.dartlang.org/cookie_jar-1.0.1/lib/ +dio:file:///Users/eterna/.pub-cache/hosted/pub.dartlang.org/dio-3.0.9/lib/ +dio_cookie_manager:file:///Users/eterna/.pub-cache/hosted/pub.dartlang.org/dio_cookie_manager-1.0.0/lib/ +http_parser:file:///Users/eterna/.pub-cache/hosted/pub.dartlang.org/http_parser-3.1.4/lib/ +meta:file:///Users/eterna/.pub-cache/hosted/pub.dartlang.org/meta-1.1.8/lib/ +path:file:///Users/eterna/.pub-cache/hosted/pub.dartlang.org/path-1.6.4/lib/ +source_span:file:///Users/eterna/.pub-cache/hosted/pub.dartlang.org/source_span-1.7.0/lib/ +string_scanner:file:///Users/eterna/.pub-cache/hosted/pub.dartlang.org/string_scanner-1.0.5/lib/ +term_glyph:file:///Users/eterna/.pub-cache/hosted/pub.dartlang.org/term_glyph-1.1.0/lib/ +typed_data:file:///Users/eterna/.pub-cache/hosted/pub.dartlang.org/typed_data-1.1.6/lib/ +appwrite:lib/ diff --git a/app/sdks/flutter-dart/pubspec.lock b/app/sdks/flutter-dart/pubspec.lock new file mode 100644 index 000000000..ac5869526 --- /dev/null +++ b/app/sdks/flutter-dart/pubspec.lock @@ -0,0 +1,89 @@ +# Generated by pub +# See https://dart.dev/tools/pub/glossary#lockfile +packages: + charcode: + dependency: transitive + description: + name: charcode + url: "https://pub.dartlang.org" + source: hosted + version: "1.1.3" + collection: + dependency: transitive + description: + name: collection + url: "https://pub.dartlang.org" + source: hosted + version: "1.14.12" + cookie_jar: + dependency: "direct main" + description: + name: cookie_jar + url: "https://pub.dartlang.org" + source: hosted + version: "1.0.1" + dio: + dependency: "direct main" + description: + name: dio + url: "https://pub.dartlang.org" + source: hosted + version: "3.0.9" + dio_cookie_manager: + dependency: "direct main" + description: + name: dio_cookie_manager + url: "https://pub.dartlang.org" + source: hosted + version: "1.0.0" + http_parser: + dependency: transitive + description: + name: http_parser + url: "https://pub.dartlang.org" + source: hosted + version: "3.1.4" + meta: + dependency: transitive + description: + name: meta + url: "https://pub.dartlang.org" + source: hosted + version: "1.1.8" + path: + dependency: transitive + description: + name: path + url: "https://pub.dartlang.org" + source: hosted + version: "1.6.4" + source_span: + dependency: transitive + description: + name: source_span + url: "https://pub.dartlang.org" + source: hosted + version: "1.7.0" + string_scanner: + dependency: transitive + description: + name: string_scanner + url: "https://pub.dartlang.org" + source: hosted + version: "1.0.5" + term_glyph: + dependency: transitive + description: + name: term_glyph + url: "https://pub.dartlang.org" + source: hosted + version: "1.1.0" + typed_data: + dependency: transitive + description: + name: typed_data + url: "https://pub.dartlang.org" + source: hosted + version: "1.1.6" +sdks: + dart: ">=2.6.0 <3.0.0" From 5c3a71931dbba38cb1a1b088bc8ff9b764759d2b Mon Sep 17 00:00:00 2001 From: "Eldad A. Fux" Date: Sun, 29 Mar 2020 21:58:04 +0300 Subject: [PATCH 4/8] Generate by IDE? --- app/sdks/flutter-dart/.packages | 14 -------------- 1 file changed, 14 deletions(-) delete mode 100644 app/sdks/flutter-dart/.packages diff --git a/app/sdks/flutter-dart/.packages b/app/sdks/flutter-dart/.packages deleted file mode 100644 index 34b178fd7..000000000 --- a/app/sdks/flutter-dart/.packages +++ /dev/null @@ -1,14 +0,0 @@ -# Generated by pub on 2020-03-28 09:43:48.656004. -charcode:file:///Users/eterna/.pub-cache/hosted/pub.dartlang.org/charcode-1.1.3/lib/ -collection:file:///Users/eterna/.pub-cache/hosted/pub.dartlang.org/collection-1.14.12/lib/ -cookie_jar:file:///Users/eterna/.pub-cache/hosted/pub.dartlang.org/cookie_jar-1.0.1/lib/ -dio:file:///Users/eterna/.pub-cache/hosted/pub.dartlang.org/dio-3.0.9/lib/ -dio_cookie_manager:file:///Users/eterna/.pub-cache/hosted/pub.dartlang.org/dio_cookie_manager-1.0.0/lib/ -http_parser:file:///Users/eterna/.pub-cache/hosted/pub.dartlang.org/http_parser-3.1.4/lib/ -meta:file:///Users/eterna/.pub-cache/hosted/pub.dartlang.org/meta-1.1.8/lib/ -path:file:///Users/eterna/.pub-cache/hosted/pub.dartlang.org/path-1.6.4/lib/ -source_span:file:///Users/eterna/.pub-cache/hosted/pub.dartlang.org/source_span-1.7.0/lib/ -string_scanner:file:///Users/eterna/.pub-cache/hosted/pub.dartlang.org/string_scanner-1.0.5/lib/ -term_glyph:file:///Users/eterna/.pub-cache/hosted/pub.dartlang.org/term_glyph-1.1.0/lib/ -typed_data:file:///Users/eterna/.pub-cache/hosted/pub.dartlang.org/typed_data-1.1.6/lib/ -appwrite:lib/ From 261df762d1c57dbf3363c5200ce6b83782c96cf2 Mon Sep 17 00:00:00 2001 From: "Eldad A. Fux" Date: Sun, 29 Mar 2020 21:58:20 +0300 Subject: [PATCH 5/8] Generate by IDE? --- .../.dart_tool/package_config.json | 86 ------------------- 1 file changed, 86 deletions(-) delete mode 100644 app/sdks/flutter-dart/.dart_tool/package_config.json diff --git a/app/sdks/flutter-dart/.dart_tool/package_config.json b/app/sdks/flutter-dart/.dart_tool/package_config.json deleted file mode 100644 index 95436b6a8..000000000 --- a/app/sdks/flutter-dart/.dart_tool/package_config.json +++ /dev/null @@ -1,86 +0,0 @@ -{ - "configVersion": 2, - "packages": [ - { - "name": "charcode", - "rootUri": "file:///Users/eterna/.pub-cache/hosted/pub.dartlang.org/charcode-1.1.3", - "packageUri": "lib/", - "languageVersion": "2.0" - }, - { - "name": "collection", - "rootUri": "file:///Users/eterna/.pub-cache/hosted/pub.dartlang.org/collection-1.14.12", - "packageUri": "lib/", - "languageVersion": "2.0" - }, - { - "name": "cookie_jar", - "rootUri": "file:///Users/eterna/.pub-cache/hosted/pub.dartlang.org/cookie_jar-1.0.1", - "packageUri": "lib/", - "languageVersion": "1.20" - }, - { - "name": "dio", - "rootUri": "file:///Users/eterna/.pub-cache/hosted/pub.dartlang.org/dio-3.0.9", - "packageUri": "lib/", - "languageVersion": "2.4" - }, - { - "name": "dio_cookie_manager", - "rootUri": "file:///Users/eterna/.pub-cache/hosted/pub.dartlang.org/dio_cookie_manager-1.0.0", - "packageUri": "lib/", - "languageVersion": "2.4" - }, - { - "name": "http_parser", - "rootUri": "file:///Users/eterna/.pub-cache/hosted/pub.dartlang.org/http_parser-3.1.4", - "packageUri": "lib/", - "languageVersion": "2.3" - }, - { - "name": "meta", - "rootUri": "file:///Users/eterna/.pub-cache/hosted/pub.dartlang.org/meta-1.1.8", - "packageUri": "lib/", - "languageVersion": "1.12" - }, - { - "name": "path", - "rootUri": "file:///Users/eterna/.pub-cache/hosted/pub.dartlang.org/path-1.6.4", - "packageUri": "lib/", - "languageVersion": "2.0" - }, - { - "name": "source_span", - "rootUri": "file:///Users/eterna/.pub-cache/hosted/pub.dartlang.org/source_span-1.7.0", - "packageUri": "lib/", - "languageVersion": "2.6" - }, - { - "name": "string_scanner", - "rootUri": "file:///Users/eterna/.pub-cache/hosted/pub.dartlang.org/string_scanner-1.0.5", - "packageUri": "lib/", - "languageVersion": "2.0" - }, - { - "name": "term_glyph", - "rootUri": "file:///Users/eterna/.pub-cache/hosted/pub.dartlang.org/term_glyph-1.1.0", - "packageUri": "lib/", - "languageVersion": "1.8" - }, - { - "name": "typed_data", - "rootUri": "file:///Users/eterna/.pub-cache/hosted/pub.dartlang.org/typed_data-1.1.6", - "packageUri": "lib/", - "languageVersion": "2.0" - }, - { - "name": "appwrite", - "rootUri": "../", - "packageUri": "lib/", - "languageVersion": "2.6" - } - ], - "generated": "2020-03-28T02:43:48.665116Z", - "generator": "pub", - "generatorVersion": "2.8.0-dev.3.0.flutter-f1df196ddf" -} From f740a1ad60870e32f52fae12a9c04346152b5704 Mon Sep 17 00:00:00 2001 From: "Eldad A. Fux" Date: Sun, 29 Mar 2020 21:58:42 +0300 Subject: [PATCH 6/8] Generate by IDE? --- app/sdks/flutter-dart/pubspec.lock | 89 ------------------------------ 1 file changed, 89 deletions(-) delete mode 100644 app/sdks/flutter-dart/pubspec.lock diff --git a/app/sdks/flutter-dart/pubspec.lock b/app/sdks/flutter-dart/pubspec.lock deleted file mode 100644 index ac5869526..000000000 --- a/app/sdks/flutter-dart/pubspec.lock +++ /dev/null @@ -1,89 +0,0 @@ -# Generated by pub -# See https://dart.dev/tools/pub/glossary#lockfile -packages: - charcode: - dependency: transitive - description: - name: charcode - url: "https://pub.dartlang.org" - source: hosted - version: "1.1.3" - collection: - dependency: transitive - description: - name: collection - url: "https://pub.dartlang.org" - source: hosted - version: "1.14.12" - cookie_jar: - dependency: "direct main" - description: - name: cookie_jar - url: "https://pub.dartlang.org" - source: hosted - version: "1.0.1" - dio: - dependency: "direct main" - description: - name: dio - url: "https://pub.dartlang.org" - source: hosted - version: "3.0.9" - dio_cookie_manager: - dependency: "direct main" - description: - name: dio_cookie_manager - url: "https://pub.dartlang.org" - source: hosted - version: "1.0.0" - http_parser: - dependency: transitive - description: - name: http_parser - url: "https://pub.dartlang.org" - source: hosted - version: "3.1.4" - meta: - dependency: transitive - description: - name: meta - url: "https://pub.dartlang.org" - source: hosted - version: "1.1.8" - path: - dependency: transitive - description: - name: path - url: "https://pub.dartlang.org" - source: hosted - version: "1.6.4" - source_span: - dependency: transitive - description: - name: source_span - url: "https://pub.dartlang.org" - source: hosted - version: "1.7.0" - string_scanner: - dependency: transitive - description: - name: string_scanner - url: "https://pub.dartlang.org" - source: hosted - version: "1.0.5" - term_glyph: - dependency: transitive - description: - name: term_glyph - url: "https://pub.dartlang.org" - source: hosted - version: "1.1.0" - typed_data: - dependency: transitive - description: - name: typed_data - url: "https://pub.dartlang.org" - source: hosted - version: "1.1.6" -sdks: - dart: ">=2.6.0 <3.0.0" From 61c82ad5f3235020b21e96cf21c8c47c35742506 Mon Sep 17 00:00:00 2001 From: Eldad Fux Date: Sun, 29 Mar 2020 23:10:33 +0300 Subject: [PATCH 7/8] Fixed phones response --- app/controllers/api/locale.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/api/locale.php b/app/controllers/api/locale.php index 8b78dc66b..eab8f5531 100644 --- a/app/controllers/api/locale.php +++ b/app/controllers/api/locale.php @@ -123,7 +123,7 @@ $utopia->get('/v1/locale/countries/phones') foreach ($list as $code => $name) { if (array_key_exists($code, $countries)) { - $list[$code] = $countries[$code].' +'.$list[$code]; + $list[$code] = '+'.$list[$code]; } } From 7532a96bb3fb9a9eb77273998f6a4b987e2c1e5a Mon Sep 17 00:00:00 2001 From: Eldad Fux Date: Sun, 29 Mar 2020 23:10:47 +0300 Subject: [PATCH 8/8] Fixed locale tests --- app/config/locales.php | 2 +- app/init.php | 1 + tests/e2e/Services/Locale/LocaleBase.php | 4 ++-- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/app/config/locales.php b/app/config/locales.php index 58f676eef..45b48cee0 100644 --- a/app/config/locales.php +++ b/app/config/locales.php @@ -22,7 +22,7 @@ return [ 'it', // Italian 'ja', // Japanese 'jv', // Javanese - 'km', + 'km', // Khmer 'ko', // Korean 'lt', // Lithuanian 'ml', // Malayalam diff --git a/app/init.php b/app/init.php index 18c57d88e..9de17e019 100644 --- a/app/init.php +++ b/app/init.php @@ -185,6 +185,7 @@ Locale::setLanguage('is', include __DIR__.'/config/locales/is.php'); Locale::setLanguage('it', include __DIR__.'/config/locales/it.php'); Locale::setLanguage('ja', include __DIR__.'/config/locales/ja.php'); Locale::setLanguage('jv', include __DIR__.'/config/locales/jv.php'); +Locale::setLanguage('km', include __DIR__.'/config/locales/km.php'); Locale::setLanguage('ko', include __DIR__.'/config/locales/ko.php'); Locale::setLanguage('lt', include __DIR__.'/config/locales/lt.php'); Locale::setLanguage('ml', include __DIR__.'/config/locales/ml.php'); diff --git a/tests/e2e/Services/Locale/LocaleBase.php b/tests/e2e/Services/Locale/LocaleBase.php index 460628be9..5a3df45b2 100644 --- a/tests/e2e/Services/Locale/LocaleBase.php +++ b/tests/e2e/Services/Locale/LocaleBase.php @@ -115,8 +115,8 @@ trait LocaleBase $this->assertEquals($response['headers']['status-code'], 200); $this->assertIsArray($response['body']); $this->assertCount(194, $response['body']); - $this->assertEquals($response['body']['US'], 'United States +1'); - $this->assertEquals($response['body']['IL'], 'Israel +972'); + $this->assertEquals($response['body']['US'], '+1'); + $this->assertEquals($response['body']['IL'], '+972'); /** * Test for FAILURE