From f050aece2aedfa0439027b5c1b2dfdd0d9641d20 Mon Sep 17 00:00:00 2001 From: Navneet Singh Negi Date: Thu, 1 Oct 2020 20:07:42 +0530 Subject: [PATCH 1/9] Changes for Urdu Language --- .../templates/ur.email.auth.confirm.tpl | 15 ++ .../templates/ur.email.auth.invitation.tpl | 14 ++ .../templates/ur.email.auth.recovery.tpl | 15 ++ app/config/locale/ur.continents.php | 11 + app/config/locale/ur.countries.php | 198 ++++++++++++++++++ app/config/locale/ur.php | 21 ++ app/init.php | 1 + 7 files changed, 275 insertions(+) create mode 100644 app/config/locale/templates/ur.email.auth.confirm.tpl create mode 100644 app/config/locale/templates/ur.email.auth.invitation.tpl create mode 100644 app/config/locale/templates/ur.email.auth.recovery.tpl create mode 100644 app/config/locale/ur.continents.php create mode 100644 app/config/locale/ur.countries.php create mode 100644 app/config/locale/ur.php diff --git a/app/config/locale/templates/ur.email.auth.confirm.tpl b/app/config/locale/templates/ur.email.auth.confirm.tpl new file mode 100644 index 000000000..c468415d4 --- /dev/null +++ b/app/config/locale/templates/ur.email.auth.confirm.tpl @@ -0,0 +1,15 @@ +

+ ہیلو {{name}}, +

+

+ اپنے ای میل پتے کی تصدیق کے ل this اس لنک کی پیروی کریں۔ +

+{{cta}} +

+ اگر آپ نے اس پتے کی تصدیق کرنے کے لئے نہیں کہا تو آپ اس پیغام کو نظرانداز کرسکتے ہیں۔ +

+

+ شکریہ, +
+ {{project}} ٹیم +

\ No newline at end of file diff --git a/app/config/locale/templates/ur.email.auth.invitation.tpl b/app/config/locale/templates/ur.email.auth.invitation.tpl new file mode 100644 index 000000000..c1982cb97 --- /dev/null +++ b/app/config/locale/templates/ur.email.auth.invitation.tpl @@ -0,0 +1,14 @@ +

+ ہیلو, +

+

+ یہ میل آپ کو اس لئے بھیجا گیا تھا کیونکہ {{owner}} میں آپ کو ٹیم کے ممبر بننے کے لئے مدعو کرنا چاہتا تھا {{team}} میں ٹیم ختم {{project}}. +

+{{cta}} +

+ اگر آپ دلچسپی نہیں رکھتے ہیں تو ، آپ اس پیغام کو نظرانداز کرسکتے ہیں۔

+

+ شکریہ, +
+ {{project}} ٹیم +

\ No newline at end of file diff --git a/app/config/locale/templates/ur.email.auth.recovery.tpl b/app/config/locale/templates/ur.email.auth.recovery.tpl new file mode 100644 index 000000000..4c884ec9c --- /dev/null +++ b/app/config/locale/templates/ur.email.auth.recovery.tpl @@ -0,0 +1,15 @@ +

+ ہیلو {{name}}, +

+

+ اپنا دوبارہ ترتیب دینے کیلئے اس لنک پر عمل کریں {{project}} پاس ورڈ. +

+{{cta}} +

+ اگر آپ نے اس پتے کی تصدیق کرنے کے لئے نہیں کہا تو آپ اس پیغام کو نظرانداز کرسکتے ہیں۔ +

+

+ شکریہ, +
+ {{project}} ٹیم +

\ No newline at end of file diff --git a/app/config/locale/ur.continents.php b/app/config/locale/ur.continents.php new file mode 100644 index 000000000..db0c9cdf5 --- /dev/null +++ b/app/config/locale/ur.continents.php @@ -0,0 +1,11 @@ + 'افریقہ', + 'AN' => 'انٹارکٹیکا', + 'AS' => 'ایشیا', + 'EU' => 'یورپ', + 'NA' => 'شمالی امریکہ', + 'OC' => 'اوشینیا', + 'SA' => 'جنوبی امریکہ', +]; diff --git a/app/config/locale/ur.countries.php b/app/config/locale/ur.countries.php new file mode 100644 index 000000000..b6bdd76ee --- /dev/null +++ b/app/config/locale/ur.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' => 'DR کانگو', + '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' => 'زمبابوے', +]; diff --git a/app/config/locale/ur.php b/app/config/locale/ur.php new file mode 100644 index 000000000..770e25f4d --- /dev/null +++ b/app/config/locale/ur.php @@ -0,0 +1,21 @@ + '"عقلمند ہونے کا فن یہ جاننے کا فن ہے کہ کیا نظرانداز کیا جائے۔"', // This is the line printed in the homepage and console 'view-source' + 'settings.locale' => 'ur', + 'settings.direction' => 'rtl', + + // Service - Users + 'account.emails.team' => '%s ٹیم', + 'account.emails.verification.title' => 'اکاؤنٹ کی توثیق', + 'account.emails.verification.body' => 'ur.email.auth.confirm.tpl', + 'account.emails.recovery.title' => 'پاس ورڈ دوبارہ ترتیب دیں', + 'account.emails.recovery.body' => 'ur.email.auth.recovery.tpl', + 'account.emails.invitation.title' => 'کی دعوت %s میں ٹیم %s', + 'account.emails.invitation.body' => 'ur.email.auth.invitation.tpl', + + 'locale.country.unknown' => 'نامعلوم', + + 'countries' => include 'ur.countries.php', + 'continents' => include 'ur.continents.php', +]; diff --git a/app/init.php b/app/init.php index 4d56ac3f5..25832b36f 100644 --- a/app/init.php +++ b/app/init.php @@ -264,6 +264,7 @@ Locale::setLanguage('ta', include __DIR__ . '/config/locale/translations/ta.php' Locale::setLanguage('th', include __DIR__.'/config/locale/translations/th.php'); Locale::setLanguage('tr', include __DIR__.'/config/locale/translations/tr.php'); Locale::setLanguage('ua', include __DIR__.'/config/locale/translations/ua.php'); +Locale::setLanguage('ur', include __DIR__.'/config/locale/translations/ur.php'); Locale::setLanguage('vi', include __DIR__.'/config/locale/translations/vi.php'); Locale::setLanguage('zh-cn', include __DIR__.'/config/locale/translations/zh-cn.php'); Locale::setLanguage('zh-tw', include __DIR__.'/config/locale/translations/zh-tw.php'); From a307ab0183756132f0d7254536f4d23565b71ef3 Mon Sep 17 00:00:00 2001 From: Navneet Singh Negi Date: Thu, 1 Oct 2020 21:02:18 +0530 Subject: [PATCH 2/9] Fixed bug in init.php --- app/init.php | 1 - 1 file changed, 1 deletion(-) diff --git a/app/init.php b/app/init.php index 25832b36f..4d56ac3f5 100644 --- a/app/init.php +++ b/app/init.php @@ -264,7 +264,6 @@ Locale::setLanguage('ta', include __DIR__ . '/config/locale/translations/ta.php' Locale::setLanguage('th', include __DIR__.'/config/locale/translations/th.php'); Locale::setLanguage('tr', include __DIR__.'/config/locale/translations/tr.php'); Locale::setLanguage('ua', include __DIR__.'/config/locale/translations/ua.php'); -Locale::setLanguage('ur', include __DIR__.'/config/locale/translations/ur.php'); Locale::setLanguage('vi', include __DIR__.'/config/locale/translations/vi.php'); Locale::setLanguage('zh-cn', include __DIR__.'/config/locale/translations/zh-cn.php'); Locale::setLanguage('zh-tw', include __DIR__.'/config/locale/translations/zh-tw.php'); From 240e72241765fb4870fac557d49308e9c492036c Mon Sep 17 00:00:00 2001 From: Navneet Singh Negi Date: Tue, 13 Oct 2020 12:23:18 +0530 Subject: [PATCH 3/9] New Changes for Urdu Language --- app/config/locale/codes.php | 1 + app/config/locale/ur.countries.php | 2 +- app/init.php | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/app/config/locale/codes.php b/app/config/locale/codes.php index 84738367b..fd16cefa6 100644 --- a/app/config/locale/codes.php +++ b/app/config/locale/codes.php @@ -43,6 +43,7 @@ return [ 'th', // Thai 'tr', // Turkish 'ua', // Ukrainian + 'ur', //Urdu 'vi', // Vietnamese 'zh-cn', // Chinese - China 'zh-tw', // Chinese - Taiwan diff --git a/app/config/locale/ur.countries.php b/app/config/locale/ur.countries.php index b6bdd76ee..8a8f95185 100644 --- a/app/config/locale/ur.countries.php +++ b/app/config/locale/ur.countries.php @@ -36,7 +36,7 @@ return [ 'CN' => 'چین', 'CI' => 'آئیوری کوسٹ', 'CM' => 'کیمرون', - 'CD' => 'DR کانگو', + 'CD' => 'جمہوری جمہوریہ کانگو', 'CG' => 'جمہوریہ کانگو', 'CO' => 'کولمبیا', 'KM' => 'کوموروس', diff --git a/app/init.php b/app/init.php index 4d56ac3f5..25832b36f 100644 --- a/app/init.php +++ b/app/init.php @@ -264,6 +264,7 @@ Locale::setLanguage('ta', include __DIR__ . '/config/locale/translations/ta.php' Locale::setLanguage('th', include __DIR__.'/config/locale/translations/th.php'); Locale::setLanguage('tr', include __DIR__.'/config/locale/translations/tr.php'); Locale::setLanguage('ua', include __DIR__.'/config/locale/translations/ua.php'); +Locale::setLanguage('ur', include __DIR__.'/config/locale/translations/ur.php'); Locale::setLanguage('vi', include __DIR__.'/config/locale/translations/vi.php'); Locale::setLanguage('zh-cn', include __DIR__.'/config/locale/translations/zh-cn.php'); Locale::setLanguage('zh-tw', include __DIR__.'/config/locale/translations/zh-tw.php'); From 4238ccd881f3c1afcdcba15cfe493d9e62ec2e5f Mon Sep 17 00:00:00 2001 From: navneetsn18 Date: Tue, 13 Oct 2020 12:44:25 +0530 Subject: [PATCH 4/9] New Changes for Urdu Language --- .../locale/{ => translations}/templates/ur.email.auth.confirm.tpl | 0 .../{ => translations}/templates/ur.email.auth.invitation.tpl | 0 .../{ => translations}/templates/ur.email.auth.recovery.tpl | 0 app/config/locale/{ => translations}/ur.continents.php | 0 app/config/locale/{ => translations}/ur.countries.php | 0 app/config/locale/{ => translations}/ur.php | 0 6 files changed, 0 insertions(+), 0 deletions(-) rename app/config/locale/{ => translations}/templates/ur.email.auth.confirm.tpl (100%) rename app/config/locale/{ => translations}/templates/ur.email.auth.invitation.tpl (100%) rename app/config/locale/{ => translations}/templates/ur.email.auth.recovery.tpl (100%) rename app/config/locale/{ => translations}/ur.continents.php (100%) rename app/config/locale/{ => translations}/ur.countries.php (100%) rename app/config/locale/{ => translations}/ur.php (100%) diff --git a/app/config/locale/templates/ur.email.auth.confirm.tpl b/app/config/locale/translations/templates/ur.email.auth.confirm.tpl similarity index 100% rename from app/config/locale/templates/ur.email.auth.confirm.tpl rename to app/config/locale/translations/templates/ur.email.auth.confirm.tpl diff --git a/app/config/locale/templates/ur.email.auth.invitation.tpl b/app/config/locale/translations/templates/ur.email.auth.invitation.tpl similarity index 100% rename from app/config/locale/templates/ur.email.auth.invitation.tpl rename to app/config/locale/translations/templates/ur.email.auth.invitation.tpl diff --git a/app/config/locale/templates/ur.email.auth.recovery.tpl b/app/config/locale/translations/templates/ur.email.auth.recovery.tpl similarity index 100% rename from app/config/locale/templates/ur.email.auth.recovery.tpl rename to app/config/locale/translations/templates/ur.email.auth.recovery.tpl diff --git a/app/config/locale/ur.continents.php b/app/config/locale/translations/ur.continents.php similarity index 100% rename from app/config/locale/ur.continents.php rename to app/config/locale/translations/ur.continents.php diff --git a/app/config/locale/ur.countries.php b/app/config/locale/translations/ur.countries.php similarity index 100% rename from app/config/locale/ur.countries.php rename to app/config/locale/translations/ur.countries.php diff --git a/app/config/locale/ur.php b/app/config/locale/translations/ur.php similarity index 100% rename from app/config/locale/ur.php rename to app/config/locale/translations/ur.php From 074551169ce94fdf95a587bc6ff249b09d8c90a5 Mon Sep 17 00:00:00 2001 From: Eldad Fux Date: Thu, 15 Oct 2020 07:30:47 +0300 Subject: [PATCH 5/9] Updated Travis CI URL --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 198964dcb..fc7020757 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,7 @@ [![Hacktoberfest](https://badgen.net/badge/hacktoberfest/friendly/pink)](CONTRIBUTING.md) [![Discord](https://img.shields.io/discord/564160730845151244?label=discord)](https://discord.gg/GSeTUeA) [![Docker Pulls](https://badgen.net/docker/pulls/appwrite/appwrite)](https://travis-ci.org/appwrite/appwrite) -[![Travis CI](https://badgen.net/travis/appwrite/appwrite?label=build)](https://travis-ci.org/appwrite/appwrite) +[![Travis CI](https://badgen.net/travis/appwrite/appwrite?label=build)](https://travis-ci.com/appwrite/appwrite) [![Twitter Account](https://badgen.net/twitter/follow/appwrite_io?label=twitter)](https://twitter.com/appwrite_io) [![Follow Appwrite on StackShare](https://badgen.net/badge/follow%20on/stackshare/blue)](https://stackshare.io/appwrite) @@ -34,9 +34,9 @@ Table of Contents: - [SDKs](#sdks) - [Client](#client) - [Server](#server) +- [Contributing](#contributing) - [Security](#security) - [Follow Us](#follow-us) -- [Contributing](#contributing) - [License](#license) ## Installation From 7538da1be37c4eba73d3fba0279943f2e8bdcade Mon Sep 17 00:00:00 2001 From: Sascha Greuel Date: Thu, 15 Oct 2020 17:36:04 +0200 Subject: [PATCH 6/9] Update README.md --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index aa3707c04..0ef9f3c2d 100644 --- a/README.md +++ b/README.md @@ -53,7 +53,7 @@ docker run -it --rm \ --volume /var/run/docker.sock:/var/run/docker.sock \ --volume "$(pwd)"/appwrite:/usr/src/code/appwrite:rw \ --entrypoint="install" \ - appwrite/appwrite:0.7.0 --version=0.7.0 + appwrite/appwrite:0.7.0 --version 0.7.0 ``` ### Windows @@ -65,7 +65,7 @@ docker run -it --rm ^ --volume //var/run/docker.sock:/var/run/docker.sock ^ --volume "%cd%"/appwrite:/usr/src/code/appwrite:rw ^ --entrypoint="install" ^ - appwrite/appwrite:0.7.0 --version=0.7.0 + appwrite/appwrite:0.7.0 --version 0.7.0 ``` #### PowerShell @@ -75,7 +75,7 @@ docker run -it --rm , --volume /var/run/docker.sock:/var/run/docker.sock , --volume ${pwd}/appwrite:/usr/src/code/appwrite:rw , --entrypoint="install" , - appwrite/appwrite:0.7.0 --version=0.7.0 + appwrite/appwrite:0.7.0 --version 0.7.0 ``` Once the Docker installation completes, go to http://localhost to access the Appwrite console from your browser. Please note that on non-linux native hosts, the server might take a few minutes to start after installation completes. From 92a1332476e75099e5988205db7c911b37fcbd85 Mon Sep 17 00:00:00 2001 From: Eldad Fux Date: Fri, 16 Oct 2020 10:52:54 +0300 Subject: [PATCH 7/9] Updated preloader --- app/preload.php | 1 + 1 file changed, 1 insertion(+) diff --git a/app/preload.php b/app/preload.php index 63d08c3e1..aded885c1 100644 --- a/app/preload.php +++ b/app/preload.php @@ -27,6 +27,7 @@ include __DIR__.'/controllers/general.php'; ->ignore(realpath(__DIR__ . '/../vendor/twig/twig')) ->ignore(realpath(__DIR__ . '/../vendor/guzzlehttp/guzzle')) ->ignore(realpath(__DIR__ . '/../vendor/geoip2')) + ->ignore(realpath(__DIR__ . '/../vendor/domnikl')) ->ignore(realpath(__DIR__ . '/../vendor/maxmind')) ->ignore(realpath(__DIR__ . '/../vendor/maxmind-db')) ->ignore(realpath(__DIR__ . '/../vendor/psr/log')) From 76d8636126b67da646f78020de03270f39e416c6 Mon Sep 17 00:00:00 2001 From: mananapeejay <42414965+mananapeejay@users.noreply.github.com> Date: Fri, 16 Oct 2020 19:34:22 +0530 Subject: [PATCH 8/9] Probable Condescending language removed --- docs/references/account/create-session-oauth2.md | 2 +- docs/references/account/create-session.md | 2 +- docs/references/account/create.md | 2 +- docs/references/account/delete-session-current.md | 2 +- docs/references/account/delete-session.md | 2 +- docs/references/database/delete-document.md | 2 +- docs/references/teams/delete-team-membership.md | 2 +- docs/references/teams/update-team-membership-status.md | 2 +- docs/tutorials/add-oauth2-provider.md | 6 +++--- docs/tutorials/environment-variables.md | 4 ++-- docs/tutorials/running-in-production.md | 2 +- 11 files changed, 14 insertions(+), 14 deletions(-) diff --git a/docs/references/account/create-session-oauth2.md b/docs/references/account/create-session-oauth2.md index 459b62dc4..fb6fa41b2 100644 --- a/docs/references/account/create-session-oauth2.md +++ b/docs/references/account/create-session-oauth2.md @@ -1 +1 @@ -Allow the user to login to his account using the OAuth2 provider of his choice. Each OAuth2 provider should be enabled from the Appwrite console first. Use the success and failure arguments to provide a redirect URL's back to your app when login is completed. \ No newline at end of file +Allow the user to login to their account using the OAuth2 provider of their choice. Each OAuth2 provider should be enabled from the Appwrite console first. Use the success and failure arguments to provide a redirect URL's back to your app when login is completed. \ No newline at end of file diff --git a/docs/references/account/create-session.md b/docs/references/account/create-session.md index f166b0bc9..03218ac6a 100644 --- a/docs/references/account/create-session.md +++ b/docs/references/account/create-session.md @@ -1 +1 @@ -Allow the user to login into his account by providing a valid email and password combination. This route will create a new session for the user. \ No newline at end of file +Allow the user to login into their account by providing a valid email and password combination. This route will create a new session for the user. \ No newline at end of file diff --git a/docs/references/account/create.md b/docs/references/account/create.md index a1f54f467..3b1aab75c 100644 --- a/docs/references/account/create.md +++ b/docs/references/account/create.md @@ -1 +1 @@ -Use this endpoint to allow a new user to register a new account in your project. After the user registration completes successfully, you can use the [/account/verfication](/docs/client/account#createVerification) route to start verifying the user email address. To allow your new user to login to his new account, you need to create a new [account session](/docs/client/account#createSession). \ No newline at end of file +Use this endpoint to allow a new user to register a new account in your project. After the user registration completes successfully, you can use the [/account/verfication](/docs/client/account#createVerification) route to start verifying the user email address. To allow the new user to login to their new account, you need to create a new [account session](/docs/client/account#createSession). \ No newline at end of file diff --git a/docs/references/account/delete-session-current.md b/docs/references/account/delete-session-current.md index d1393d5f6..d38520f47 100644 --- a/docs/references/account/delete-session-current.md +++ b/docs/references/account/delete-session-current.md @@ -1 +1 @@ -Use this endpoint to log out the currently logged in user from his account. When successful this endpoint will delete the user session and remove the session secret cookie from the user client. \ No newline at end of file +Use this endpoint to log out the currently logged in user from their account. When successful this endpoint will delete the user session and remove the session secret cookie from the user client. \ No newline at end of file diff --git a/docs/references/account/delete-session.md b/docs/references/account/delete-session.md index 4184532fd..e0ca6d29a 100644 --- a/docs/references/account/delete-session.md +++ b/docs/references/account/delete-session.md @@ -1 +1 @@ -Use this endpoint to log out the currently logged in user from all his account sessions across all his different devices. When using the option id argument, only the session unique ID provider will be deleted. \ No newline at end of file +Use this endpoint to log out the currently logged in user from all their account sessions across all of their different devices. When using the option id argument, only the session unique ID provider will be deleted. \ No newline at end of file diff --git a/docs/references/database/delete-document.md b/docs/references/database/delete-document.md index 254582120..00067751f 100644 --- a/docs/references/database/delete-document.md +++ b/docs/references/database/delete-document.md @@ -1 +1 @@ -Delete document by its unique ID. This endpoint deletes only the parent documents, his attributes and relations to other documents. Child documents **will not** be deleted. \ No newline at end of file +Delete document by its unique ID. This endpoint deletes only the parent documents, its attributes and relations to other documents. Child documents **will not** be deleted. \ No newline at end of file diff --git a/docs/references/teams/delete-team-membership.md b/docs/references/teams/delete-team-membership.md index e2c884a3e..6302e3bf3 100644 --- a/docs/references/teams/delete-team-membership.md +++ b/docs/references/teams/delete-team-membership.md @@ -1 +1 @@ -This endpoint allows a user to leave a team or for a team owner to delete the membership of any other team member. You can also use this endpoint to delete a user membership even if he didn't accept it. \ No newline at end of file +This endpoint allows a user to leave a team or for a team owner to delete the membership of any other team member. You can also use this endpoint to delete a user membership even if it is not accepted. \ No newline at end of file diff --git a/docs/references/teams/update-team-membership-status.md b/docs/references/teams/update-team-membership-status.md index ad6e44f76..ae2da7677 100644 --- a/docs/references/teams/update-team-membership-status.md +++ b/docs/references/teams/update-team-membership-status.md @@ -1 +1 @@ -Use this endpoint to allow a user to accept an invitation to join a team after he is being redirected back to your app from the invitation email he was sent. \ No newline at end of file +Use this endpoint to allow a user to accept an invitation to join a team after being redirected back to your app from the invitation email recieved by the user. \ No newline at end of file diff --git a/docs/tutorials/add-oauth2-provider.md b/docs/tutorials/add-oauth2-provider.md index 5e1c07dab..5d46cac1f 100644 --- a/docs/tutorials/add-oauth2-provider.md +++ b/docs/tutorials/add-oauth2-provider.md @@ -6,7 +6,7 @@ This document is part of the Appwrite contributors' guide. Before you continue r ### Agenda -OAuth2 providers help users to log in easily to apps and websites without the need to provide passwords or any other type of credentials. Appwrite's goal is to have support from as many **major** OAuth2 providers as possible. +OAuth2 providers help users to log in to the apps and websites without the need to provide passwords or any other type of credentials. Appwrite's goal is to have support from as many **major** OAuth2 providers as possible. As of the writing of these lines, we do not accept any minor OAuth2 providers. For us to accept some smaller and potentially unlimited number of OAuth2 providers, some product design and software architecture changes must be applied first. @@ -47,10 +47,10 @@ Please mention in your documentation what resources or API docs you used to impl After you finished adding your new provider to Appwrite you should be able to see it in your Appwrite console. Navigate to 'Project > Users > Providers' and check your new provider's settings form. -Add credentials and check both a successful and a failed login (where the user rejects integration on provider page). +Add credentials and check both a successful and a failed login (where the user denies integration on provider page). You can test your OAuth2 provider by trying to login using the [OAuth2 method](https://appwrite.io/docs/client/account#createOAuth2Session) when integrating the Appwrite JS SDK in a demo app. Pass your new adapter name as the provider parameter. If login is successful, you will be redirected to your success URL parameter. Otherwise, you will be redirected to your failure URL. -If everything goes well, just submit a pull request and be ready to respond to any feedback which can arise during our code review. +If everything goes well, submit a pull request and be ready to respond to any feedback which can arise during our code review. diff --git a/docs/tutorials/environment-variables.md b/docs/tutorials/environment-variables.md index 198717132..d4799380e 100644 --- a/docs/tutorials/environment-variables.md +++ b/docs/tutorials/environment-variables.md @@ -1,6 +1,6 @@ # Environment Variables -Appwrite environment variables allow you to edit your server setup configuration and customize it. You can easily change the environment variables by changing them when running Appwrite using Docker CLI or Docker-Compose. +Appwrite environment variables allow you to edit your server setup configuration and customize it. You can change the environment variables by changing them when running Appwrite using Docker CLI or Docker-Compose. ## General Options @@ -10,7 +10,7 @@ Set your server running environment. By default, the var is set to 'development' ### _APP_OPTIONS_ABUSE -Allows you to disable abuse checks and API rate limiting. By default, set to 'enabled'. To cancel the abuse checking, set to 'disabled'. It is not recommended to disable this feature in a production environment. +Allows you to turn off abuse checks and API rate limiting. By default, set to 'enabled'. To cancel the abuse checking, set to 'disabled'. It is not recommended to turn off this feature in a production environment. ### _APP_OPTIONS_FORCE_HTTPS diff --git a/docs/tutorials/running-in-production.md b/docs/tutorials/running-in-production.md index 612498c39..2ed69d0ef 100644 --- a/docs/tutorials/running-in-production.md +++ b/docs/tutorials/running-in-production.md @@ -28,7 +28,7 @@ Appwrite uses a few containers to run, where each container has its job. Most of If you decide to set up a load balancer for a specific container, make sure that the containers that are trying to communicate with it are accessing it through a load balancer and not directly. All connections between Appwrite different containers are set using Docker environment variables. -There are three Appwrite containers that do keep their state are the MariaDB, Redis, and InfluxDB containers that are used for storing data, cache, and stats (in this order). To scale them out, all you need to do is set up a standard cluster (just like you would with any other app using these technologies) according to your needs and performance. +There are three Appwrite containers that do keep their state are the MariaDB, Redis, and InfluxDB containers that are used for storing data, cache, and stats (in this order). To scale them out, all you need to do is set up a standard cluster (same as you would with any other app using these technologies) according to your needs and performance. ## Sending Emails From fefef52dae5a4bf623a578f25f17c064a91aee4c Mon Sep 17 00:00:00 2001 From: Eldad Fux Date: Sat, 17 Oct 2020 09:58:40 +0300 Subject: [PATCH 9/9] Removde hard-coded IP --- app/controllers/api/locale.php | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/app/controllers/api/locale.php b/app/controllers/api/locale.php index 8431e00f6..8be46d8e4 100644 --- a/app/controllers/api/locale.php +++ b/app/controllers/api/locale.php @@ -24,11 +24,7 @@ App::get('/v1/locale') $time = (60 * 60 * 24 * 45); // 45 days cache $countries = $locale->getText('countries'); $continents = $locale->getText('continents'); - - if (!App::isProduction()) { - $ip = '79.177.241.94'; - } - + $output['ip'] = $ip; $currency = null;