From edc36b79461d490048a5083fb54e5d77236e8531 Mon Sep 17 00:00:00 2001 From: Eric Brian Anil <38664231+EricBrianAnil@users.noreply.github.com> Date: Thu, 1 Oct 2020 02:51:43 +0530 Subject: [PATCH 001/133] Updated README.md Added the 'Upgrade from an Older Version' section to the Installation from the official Appwrite website docs as it would prove helpful to new comers --- README.md | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/README.md b/README.md index 05a81489a2..eaf9570256 100644 --- a/README.md +++ b/README.md @@ -29,6 +29,7 @@ Table of Contents: - [Windows](#windows) - [CMD](#cmd) - [PowerShell](#powershell) + - [Upgrade from an Older Version](#upgrade-from-an-older-version) - [Getting Started](#getting-started) - [Services](#services) - [SDKs](#sdks) @@ -82,6 +83,16 @@ Once the Docker installation completes, go to http://localhost to access the App For advanced production and custom installation, check out our Docker [environment variables](docs/tutorials/environment-variables.md) docs. You can also use our public [docker-compose.yml](https://appwrite.io/docker-compose.yml) file to manually set up and environment. +### Upgrade from an Older Version + +If you are upgrading your Appwrite server from an older version, you should use the Appwrite migration tool once your setup is completed. Make sure to run this tool after you already finished setting up the new version, as mentioned above. +To start the migration, run the following command from your terminal once your backup is ready and that your new Appwrite setup has completed successfully. + +``` docker exec [APPWRITE_CONTAINER_ID] migrate ``` + +Replace "[APPWRITE_CONTAINER_ID]" with your container ID. You can find your container ID by running `docker ps` command. + + ## Getting Started 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. From a6e8019ad79b40e0f53bda49784a7f0cd9050392 Mon Sep 17 00:00:00 2001 From: rjn01 Date: Thu, 1 Oct 2020 04:07:52 +0530 Subject: [PATCH 002/133] Updated running-in-production.md --- docs/tutorials/running-in-production.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/tutorials/running-in-production.md b/docs/tutorials/running-in-production.md index 2cbe4feecf..612498c397 100644 --- a/docs/tutorials/running-in-production.md +++ b/docs/tutorials/running-in-production.md @@ -26,7 +26,7 @@ Appwrite was built with scalability in mind. Appwrite can potentially scale hori Appwrite uses a few containers to run, where each container has its job. Most of the Appwrite containers are stateless, and in order to scale them, all you need is run multiple instances of them and setup a load balancer in front of them. -If you decide to set up a load balancer for a specific container, make sure that the containers that are trying to communicate with him are accessing him trough a load balancer and not directly. All connections between Appwrite different containers are set using Docker environment variables. +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. @@ -34,7 +34,7 @@ There are three Appwrite containers that do keep their state are the MariaDB, Re Sending emails is hard. There are a lot of SPAM rules and configurations to master in order to set a functional SMTP server. The SMTP server that comes packaged with Appwrite is great for development but needs some work done to function well against SPAM filters. You can find some guidelines in this [tutorial]([https://www.digitalocean.com/community/tutorials/how-to-use-an-spf-record-to-prevent-spoofing-improve-e-mail-reliability](https://www.digitalocean.com/community/tutorials/how-to-use-an-spf-record-to-prevent-spoofing-improve-e-mail-reliability)). -Another **easier option** is to use an ‘SMTP as a service’ product like [Sendgrid]([https://sendgrid.com/](https://sendgrid.com/)) or [Mailgun]([https://www.mailgun.com/](https://www.mailgun.com/)). You can change Appwrite SMTP settings and credentials to any 3rrd party provider you like who support SMTP integration using our [Docker environment variables]([https://github.com/appwrite/appwrite/blob/master/docs/tutorials/environment-variables.md#smtp](https://github.com/appwrite/appwrite/blob/master/docs/tutorials/environment-variables.md#smtp)). Most services offer a decent free tier to get started with. +Another **easier option** is to use an ‘SMTP as a service’ product like [Sendgrid]([https://sendgrid.com/](https://sendgrid.com/)) or [Mailgun]([https://www.mailgun.com/](https://www.mailgun.com/)). You can change Appwrite SMTP settings and credentials to any 3rd party provider you like who support SMTP integration using our [Docker environment variables]([https://github.com/appwrite/appwrite/blob/master/docs/tutorials/environment-variables.md#smtp](https://github.com/appwrite/appwrite/blob/master/docs/tutorials/environment-variables.md#smtp)). Most services offer a decent free tier to get started with. ## Backups @@ -42,4 +42,4 @@ Backups are highly recommended for any production environment. Currently, there 1. Create a script to backups and restore your MariaDB Appwrite schema. Note that trying to backup MariaDB using a docker volume backup can result in a corrupted copy of your data. It is recommended to use MariaDB or MySQL built-in tools for this. 2. Create a script to backups and restore your InfluxDB stats. If you don’t care much about your server stats, you can skip this. -3. Create a script to backup Appwrite storage volume. There are many [online resources]([https://blog.ssdnodes.com/blog/docker-backup-volumes/](https://blog.ssdnodes.com/blog/docker-backup-volumes/)) explaining different ways to backup a docker volume. When running on multiple servers, it is very recommended to use an attachable storage point. Some cloud providers offer integrated backups to such attachable mount, some of them are GCP, AWS, DigitalOcean, and the list continues. +3. Create a script to backup Appwrite storage volume. There are many [online resources]([https://blog.ssdnodes.com/blog/docker-backup-volumes/](https://blog.ssdnodes.com/blog/docker-backup-volumes/)) explaining different ways to backup a docker volume. When running on multiple servers, it is very recommended to use an attachable storage point. Some cloud providers offer integrated backups to such attachable mount like GCP, AWS, DigitalOcean, and the list continues. From 5505cd27c51d94250f6c2616ec207fcf2c40aeab Mon Sep 17 00:00:00 2001 From: Rajiv Ranjan Singh Date: Thu, 1 Oct 2020 11:40:48 +0530 Subject: [PATCH 003/133] added templates --- .github/ISSUE_TEMPLATE/bug.md | 44 +++++++++++++++++++++++++ .github/ISSUE_TEMPLATE/documentation.md | 13 ++++++++ .github/ISSUE_TEMPLATE/feature.md | 21 ++++++++++++ .github/ISSUE_TEMPLATE/proposal.md | 13 ++++++++ .github/PULL_REQUEST_TEMPLATE.md | 26 +++++++++++++++ 5 files changed, 117 insertions(+) create mode 100644 .github/ISSUE_TEMPLATE/bug.md create mode 100644 .github/ISSUE_TEMPLATE/documentation.md create mode 100644 .github/ISSUE_TEMPLATE/feature.md create mode 100644 .github/ISSUE_TEMPLATE/proposal.md create mode 100644 .github/PULL_REQUEST_TEMPLATE.md diff --git a/.github/ISSUE_TEMPLATE/bug.md b/.github/ISSUE_TEMPLATE/bug.md new file mode 100644 index 0000000000..3dcc35bc67 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/bug.md @@ -0,0 +1,44 @@ +--- +name: 🐛 Bug Report +about: Submit a bug report to help us improve +labels: "bug" +--- + +## 🐛 Bug Report + +(A clear and concise description of what the bug is) + +### Have you read the [Contributing Guidelines on issues](https://github.com/appwrite/appwrite/blob/master/CONTRIBUTING.md)? + +(Write your answer here.) + +## To Reproduce + +(Write your steps here:) + +## Expected behavior + + + +(Write what you thought would happen.) + +## Actual Behavior + + + +(Write what happened. Add screenshots, if applicable.) + +## Your Environment + + + +(Write Environment, Operating system and version etc.) diff --git a/.github/ISSUE_TEMPLATE/documentation.md b/.github/ISSUE_TEMPLATE/documentation.md new file mode 100644 index 0000000000..ff1e3bc7e7 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/documentation.md @@ -0,0 +1,13 @@ +--- +name: 📚 Documentation +about: Report an issue related to documentation +labels: "documentation" +--- + +## 📚 Documentation + +(A clear and concise description of what the issue is.) + +### Have you read the [Contributing Guidelines on issues](https://github.com/appwrite/appwrite/blob/master/CONTRIBUTING.md)? + +(Write your answer here.) diff --git a/.github/ISSUE_TEMPLATE/feature.md b/.github/ISSUE_TEMPLATE/feature.md new file mode 100644 index 0000000000..7d7c7047b9 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/feature.md @@ -0,0 +1,21 @@ +--- +name: 🚀 Feature +about: Submit a proposal for a new feature +labels: "feature" +--- + +## 🚀 Feature + +(A clear and concise description of what the feature is.) + +### Have you read the [Contributing Guidelines on issues](https://github.com/appwrite/appwrite/blob/master/CONTRIBUTING.md)? + +(Write your answer here.) + +## Motivation + +(Please outline the motivation for the proposal.) + +## Pitch + +(Please explain why this feature should be implemented and how it would be used.) diff --git a/.github/ISSUE_TEMPLATE/proposal.md b/.github/ISSUE_TEMPLATE/proposal.md new file mode 100644 index 0000000000..daccb67ccb --- /dev/null +++ b/.github/ISSUE_TEMPLATE/proposal.md @@ -0,0 +1,13 @@ +--- +name: 💥 Proposal +about: Propose a non-trivial change to Livestream +labels: "proposal" +--- + +## 💥 Proposal + +(A clear and concise description of what the proposal is.) + +### Have you read the [Contributing Guidelines on issues](https://github.com/appwrite/appwrite/blob/master/CONTRIBUTING.md)? + +(Write your answer here.) diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md new file mode 100644 index 0000000000..c03b1c5516 --- /dev/null +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -0,0 +1,26 @@ + + +## Motivation + +(Write your motivation here.) + +### Have you read the [Contributing Guidelines on issues](https://github.com/appwrite/appwrite/blob/master/CONTRIBUTING.md)? + +(Write your answer here.) + +## Test Plan + +(Write your test plan here. If you changed any code, please provide us with clear instructions on how you verified your changes work.) + +## Related PRs and Issues + +(If this PR is related to any other PR or resolves any issue or related to any issue link all related PR and issues here.) From db531085205e883e0afef81ad8e3ea10908dfa60 Mon Sep 17 00:00:00 2001 From: Rajiv Ranjan Singh Date: Thu, 1 Oct 2020 11:42:10 +0530 Subject: [PATCH 004/133] added templates --- .github/ISSUE_TEMPLATE/proposal.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/ISSUE_TEMPLATE/proposal.md b/.github/ISSUE_TEMPLATE/proposal.md index daccb67ccb..93a226a4ac 100644 --- a/.github/ISSUE_TEMPLATE/proposal.md +++ b/.github/ISSUE_TEMPLATE/proposal.md @@ -1,6 +1,6 @@ --- name: 💥 Proposal -about: Propose a non-trivial change to Livestream +about: Propose a non-trivial change to appwrite labels: "proposal" --- From f050aece2aedfa0439027b5c1b2dfdd0d9641d20 Mon Sep 17 00:00:00 2001 From: Navneet Singh Negi Date: Thu, 1 Oct 2020 20:07:42 +0530 Subject: [PATCH 005/133] 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 0000000000..c468415d42 --- /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 0000000000..c1982cb97f --- /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 0000000000..4c884ec9ce --- /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 0000000000..db0c9cdf56 --- /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 0000000000..b6bdd76ee3 --- /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 0000000000..770e25f4df --- /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 4d56ac3f58..25832b36f6 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 006/133] 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 25832b36f6..4d56ac3f58 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 b7373bc0b1224e2ba457818d20b7fd715c411813 Mon Sep 17 00:00:00 2001 From: Rajiv Ranjan Singh Date: Fri, 2 Oct 2020 10:18:47 +0530 Subject: [PATCH 007/133] removed proposal template --- .github/ISSUE_TEMPLATE/proposal.md | 13 ------------- 1 file changed, 13 deletions(-) delete mode 100644 .github/ISSUE_TEMPLATE/proposal.md diff --git a/.github/ISSUE_TEMPLATE/proposal.md b/.github/ISSUE_TEMPLATE/proposal.md deleted file mode 100644 index 93a226a4ac..0000000000 --- a/.github/ISSUE_TEMPLATE/proposal.md +++ /dev/null @@ -1,13 +0,0 @@ ---- -name: 💥 Proposal -about: Propose a non-trivial change to appwrite -labels: "proposal" ---- - -## 💥 Proposal - -(A clear and concise description of what the proposal is.) - -### Have you read the [Contributing Guidelines on issues](https://github.com/appwrite/appwrite/blob/master/CONTRIBUTING.md)? - -(Write your answer here.) From e30ec3b0fb7d822aa63c4a85ffafc439ab002010 Mon Sep 17 00:00:00 2001 From: Naman Shankhydhar Date: Fri, 2 Oct 2020 12:11:55 +0530 Subject: [PATCH 008/133] translate local and templates to Punjabi(pu) --- .../templates/pu.email.auth.confirm.tpl | 16 ++ .../templates/pu.email.auth.invitation.tpl | 18 ++ .../templates/pu.email.auth.recovery.tpl | 15 ++ .../locale/translations/pu.continents.php | 11 + .../locale/translations/pu.countries.php | 203 ++++++++++++++++++ app/config/locale/translations/pu.php | 21 ++ 6 files changed, 284 insertions(+) create mode 100644 app/config/locale/templates/pu.email.auth.confirm.tpl create mode 100644 app/config/locale/templates/pu.email.auth.invitation.tpl create mode 100644 app/config/locale/templates/pu.email.auth.recovery.tpl create mode 100644 app/config/locale/translations/pu.continents.php create mode 100644 app/config/locale/translations/pu.countries.php create mode 100644 app/config/locale/translations/pu.php diff --git a/app/config/locale/templates/pu.email.auth.confirm.tpl b/app/config/locale/templates/pu.email.auth.confirm.tpl new file mode 100644 index 0000000000..b8dc31c467 --- /dev/null +++ b/app/config/locale/templates/pu.email.auth.confirm.tpl @@ -0,0 +1,16 @@ +

+ +ਸਤ ਸ੍ਰੀ ਅਕਾਲ {{name}}, +

+

+ ਆਪਣੇ ਈਮੇਲ ਪਤੇ ਦੀ ਤਸਦੀਕ ਕਰਨ ਲਈ ਇਸ ਲਿੰਕ ਤੇ ਕਲਿਕ ਕਰੋ. +

+{{cta}} +

+ਜੇ ਤੁਸੀਂ ਇਸ ਈਮੇਲ ਦੀ ਪੁਸ਼ਟੀ ਕਰਨ ਲਈ ਨਹੀਂ ਪੁੱਛਿਆ ਜਾਂਦਾ ਤਾਂ ਤੁਸੀਂ ਇਸ ਸੁਨੇਹੇ ਨੂੰ ਨਜ਼ਰਅੰਦਾਜ਼ ਕਰ ਸਕਦੇ ਹੋ. +

+

+ ਤੁਹਾਡਾ ਧੰਨਵਾਦ, +
+ {{project}} ਟੀਮ +

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

+ ਸਤ ਸ੍ਰੀ ਅਕਾਲ, +

+

+ ਕਿਉਂਕਿ ਇਹ ਮੇਲ ਤੁਹਾਨੂੰ ਭੇਜਿਆ ਗਿਆ ਸੀ {{owner}} ਤੁਸੀਂ {{project}} ਇਸ ਕਰਕੇ {{team}} ਇੱਥੇ ਇੱਕ ਮੈਂਬਰ ਬਣਨ ਲਈ ਸੱਦਾ ਦੇਣ ਦੀ ਇੱਛਾ ਹੈ. +

+

+ ਟੀਮ {{team}} ਸ਼ਾਮਲ ਹੋਣ ਲਈ ਇਸ ਲਿੰਕ 'ਤੇ ਕਲਿੱਕ ਕਰੋ : +

+{{cta}} +

+ਜੇ ਤੁਸੀਂ ਦਿਲਚਸਪੀ ਨਹੀਂ ਰੱਖਦੇ ਹੋ ਤਾਂ ਤੁਸੀਂ ਇਸ ਸੰਦੇਸ਼ ਨੂੰ ਅਣਡਿੱਠ ਕਰ ਸਕਦੇ ਹੋ. +

+

+ ਤੁਹਾਡਾ ਧੰਨਵਾਦ, +
+ {{project}} ਟੀਮ +

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

+ ਸਤ ਸ੍ਰੀ ਅਕਾਲ {{name}}, +

+

+ {{project}} ਆਪਣਾ ਪਾਸਵਰਡ ਰੀਸੈਟ ਕਰਨ ਲਈ ਇਸ ਲਿੰਕ ਤੇ ਕਲਿਕ ਕਰੋ. +

+{{cta}} +

+ਜੇ ਤੁਹਾਨੂੰ ਆਪਣਾ ਪਾਸਵਰਡ ਰੀਸੈਟ ਕਰਨ ਲਈ ਨਹੀਂ ਕਿਹਾ ਜਾਂਦਾ, ਤਾਂ ਤੁਸੀਂ ਇਸ ਸੁਨੇਹੇ ਨੂੰ ਨਜ਼ਰਅੰਦਾਜ਼ ਕਰ ਸਕਦੇ ਹੋ. +

+

+ ਤੁਹਾਡਾ ਧੰਨਵਾਦ, +
+ {{project}} ਟੀਮ +

\ No newline at end of file diff --git a/app/config/locale/translations/pu.continents.php b/app/config/locale/translations/pu.continents.php new file mode 100644 index 0000000000..07b6548b38 --- /dev/null +++ b/app/config/locale/translations/pu.continents.php @@ -0,0 +1,11 @@ + 'ਅਫਰੀਕਾ', + 'AN' => 'ਅੰਟਾਰਕਟਿਕਾ', + 'AS' => 'ਏਸ਼ੀਆ', + 'EU' => 'ਯੂਰਪ', + 'NA' => 'ਉੱਤਰ ਅਮਰੀਕਾ', + 'OC' => 'ਓਸੀਆਨੀਆ', + 'SA' => 'ਸਾਉਥ ਅਮਰੀਕਾ', +]; diff --git a/app/config/locale/translations/pu.countries.php b/app/config/locale/translations/pu.countries.php new file mode 100644 index 0000000000..f650e1be29 --- /dev/null +++ b/app/config/locale/translations/pu.countries.php @@ -0,0 +1,203 @@ + 'ਅਫਗਾਨਿਸਤਾਨ', + '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' => 'ਕਿ cਬਾ', + 'CY' => 'ਸਾਈਪ੍ਰਸ', + 'CZ' => 'ਚੇਕ ਗਣਤੰਤਰ', + 'DE' => 'ਜਰਮਨ', + 'DJ' => 'ਜਾਇਬੂਟੀ', + 'DM' => 'ਹਾਵੀਕਾ', + 'DK' => 'ਡੈਨਮਾਰਕ', + 'DO' => 'ਡੋਮਿਨਿੱਕ ਰਿਪਬਲਿਕ', + 'DZ' => 'ਅਲਜੀਰੀਆ', + 'ER' => 'ਇਰੀਟਰੀਆ', + 'EC' => 'ਇਕੂਏਟਰ', + 'EG' => 'ਮਿਸਰ', + 'IR' => 'ਇਰੀਟਰੀਆ', + '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/translations/pu.php b/app/config/locale/translations/pu.php new file mode 100644 index 0000000000..640b20fce3 --- /dev/null +++ b/app/config/locale/translations/pu.php @@ -0,0 +1,21 @@ + '"ਬੁੱਧੀਮਾਨ ਬਣਨ ਦੀ ਕਲਾ ਇਹ ਜਾਣਨ ਦੀ ਕਲਾ ਹੈ ਕਿ ਕਿਸ ਨੂੰ ਨਜ਼ਰਅੰਦਾਜ਼ ਕਰਨਾ ਹੈ."', // This is the line printed in the homepage and console 'view-source' + 'settings.locale' => 'pu', + 'settings.direction' => 'ltr', + + // Service - Users + 'account.emails.team' => '%s ਟੀਮ', + 'account.emails.verification.title' => 'ਖਾਤਾ ਪੁਸ਼ਟੀਕਰਣ', + 'account.emails.verification.body' => 'pu.email.auth.confirm.tpl', + 'account.emails.recovery.title' => 'ਪਾਸਵਰਡ ਰੀਸੈੱਟ', + 'account.emails.recovery.body' => 'pu.email.auth.recovery.tpl', + 'account.emails.invitation.title' => 'ਸੱਦਾ %s ਟੀਮ %s', + 'account.emails.invitation.body' => 'pu.email.auth.invitation.tpl', + + 'locale.country.unknown' => 'ਅਣਜਾਣ', + + 'countries' => include 'pu.countries.php', + 'continents' => include 'pu.continents.php', +]; From c108a147d3b23b73d53bdf75351a35d6e4f96f18 Mon Sep 17 00:00:00 2001 From: Naman Shankhydhar Date: Fri, 2 Oct 2020 21:49:39 +0530 Subject: [PATCH 009/133] loaded and configured punjabi lang --- app/config/locale/codes.php | 1 + app/init.php | 1 + 2 files changed, 2 insertions(+) diff --git a/app/config/locale/codes.php b/app/config/locale/codes.php index 84738367be..71bedb0515 100644 --- a/app/config/locale/codes.php +++ b/app/config/locale/codes.php @@ -33,6 +33,7 @@ return [ 'pl', // Polish 'pt-br', // Portuguese - Brazil 'pt-pt', // Portuguese - Portugal + 'pu', //Punjabi 'ro', // Romanian 'ru', // Russian 'si', // Sinhala diff --git a/app/init.php b/app/init.php index 4d56ac3f58..376e080c67 100644 --- a/app/init.php +++ b/app/init.php @@ -254,6 +254,7 @@ Locale::setLanguage('ph', include __DIR__.'/config/locale/translations/ph.php'); Locale::setLanguage('pl', include __DIR__.'/config/locale/translations/pl.php'); Locale::setLanguage('pt-br', include __DIR__.'/config/locale/translations/pt-br.php'); Locale::setLanguage('pt-pt', include __DIR__.'/config/locale/translations/pt-pt.php'); +Locale::setLanguage('pt-pt', include __DIR__.'/config/locale/translations/pu.php'); Locale::setLanguage('ro', include __DIR__.'/config/locale/translations/ro.php'); Locale::setLanguage('ru', include __DIR__ . '/config/locale/translations/ru.php'); Locale::setLanguage('si', include __DIR__ . '/config/locale/translations/si.php'); From 4488f49af913fce039452ebf6f2f9164f0bcea4f Mon Sep 17 00:00:00 2001 From: Naman Shankhydhar Date: Fri, 2 Oct 2020 22:08:25 +0530 Subject: [PATCH 010/133] changed symbol --- app/init.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/init.php b/app/init.php index 376e080c67..919618cfe6 100644 --- a/app/init.php +++ b/app/init.php @@ -254,7 +254,7 @@ Locale::setLanguage('ph', include __DIR__.'/config/locale/translations/ph.php'); Locale::setLanguage('pl', include __DIR__.'/config/locale/translations/pl.php'); Locale::setLanguage('pt-br', include __DIR__.'/config/locale/translations/pt-br.php'); Locale::setLanguage('pt-pt', include __DIR__.'/config/locale/translations/pt-pt.php'); -Locale::setLanguage('pt-pt', include __DIR__.'/config/locale/translations/pu.php'); +Locale::setLanguage('pu', include __DIR__.'/config/locale/translations/pu.php'); Locale::setLanguage('ro', include __DIR__.'/config/locale/translations/ro.php'); Locale::setLanguage('ru', include __DIR__ . '/config/locale/translations/ru.php'); Locale::setLanguage('si', include __DIR__ . '/config/locale/translations/si.php'); From baa6a56e61d70e8590e4a0930dc3dbc2f252050d Mon Sep 17 00:00:00 2001 From: Rajiv Ranjan Singh Date: Sat, 3 Oct 2020 11:17:43 +0530 Subject: [PATCH 011/133] updated bug template --- .github/ISSUE_TEMPLATE/bug.md | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/bug.md b/.github/ISSUE_TEMPLATE/bug.md index 3dcc35bc67..cfc41b8d1a 100644 --- a/.github/ISSUE_TEMPLATE/bug.md +++ b/.github/ISSUE_TEMPLATE/bug.md @@ -8,10 +8,6 @@ labels: "bug" (A clear and concise description of what the bug is) -### Have you read the [Contributing Guidelines on issues](https://github.com/appwrite/appwrite/blob/master/CONTRIBUTING.md)? - -(Write your answer here.) - ## To Reproduce (Write your steps here:) From 3031957f436e0bb2d5c25081d130c751f98ab485 Mon Sep 17 00:00:00 2001 From: Rajiv Ranjan Singh Date: Sat, 3 Oct 2020 11:46:13 +0530 Subject: [PATCH 012/133] updated templates --- .github/ISSUE_TEMPLATE/bug.md | 4 ++++ .github/ISSUE_TEMPLATE/documentation.md | 6 +++++- .github/ISSUE_TEMPLATE/feature.md | 12 ++++++------ .github/PULL_REQUEST_TEMPLATE.md | 12 ++++++------ 4 files changed, 21 insertions(+), 13 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/bug.md b/.github/ISSUE_TEMPLATE/bug.md index cfc41b8d1a..63e0e64f94 100644 --- a/.github/ISSUE_TEMPLATE/bug.md +++ b/.github/ISSUE_TEMPLATE/bug.md @@ -8,6 +8,10 @@ labels: "bug" (A clear and concise description of what the bug is) +## Have you spent some time to check if this issue has been raised before? + +(Have you googled for a similar issue or checked our older issues for a similar bug) + ## To Reproduce (Write your steps here:) diff --git a/.github/ISSUE_TEMPLATE/documentation.md b/.github/ISSUE_TEMPLATE/documentation.md index ff1e3bc7e7..9aa7e59e19 100644 --- a/.github/ISSUE_TEMPLATE/documentation.md +++ b/.github/ISSUE_TEMPLATE/documentation.md @@ -8,6 +8,10 @@ labels: "documentation" (A clear and concise description of what the issue is.) -### Have you read the [Contributing Guidelines on issues](https://github.com/appwrite/appwrite/blob/master/CONTRIBUTING.md)? +## Have you spent some time to check if this issue has been raised before? + +(Have you googled for a similar issue or checked our older issues for a similar bug) + +### Have you read the [Code of Conduct](https://github.com/appwrite/appwrite/blob/master/CODE_OF_CONDUCT.md)? (Write your answer here.) diff --git a/.github/ISSUE_TEMPLATE/feature.md b/.github/ISSUE_TEMPLATE/feature.md index 7d7c7047b9..35ad1b9d8f 100644 --- a/.github/ISSUE_TEMPLATE/feature.md +++ b/.github/ISSUE_TEMPLATE/feature.md @@ -8,14 +8,14 @@ labels: "feature" (A clear and concise description of what the feature is.) -### Have you read the [Contributing Guidelines on issues](https://github.com/appwrite/appwrite/blob/master/CONTRIBUTING.md)? +## Have you spent some time to check if this issue has been raised before? + +(Have you googled for a similar issue or checked our older issues for a similar bug) + +### Have you read the [Code of Conduct](https://github.com/appwrite/appwrite/blob/master/CODE_OF_CONDUCT.md)? (Write your answer here.) -## Motivation - -(Please outline the motivation for the proposal.) - ## Pitch -(Please explain why this feature should be implemented and how it would be used.) +(Please explain why this feature should be implemented and how it would be used. Add examples, if applicable.) diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index c03b1c5516..faa18b5ab9 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -9,13 +9,9 @@ Happy contributing! --> -## Motivation +## What does this PR do? -(Write your motivation here.) - -### Have you read the [Contributing Guidelines on issues](https://github.com/appwrite/appwrite/blob/master/CONTRIBUTING.md)? - -(Write your answer here.) +(Provide a description of what this PR does.) ## Test Plan @@ -24,3 +20,7 @@ Happy contributing! ## Related PRs and Issues (If this PR is related to any other PR or resolves any issue or related to any issue link all related PR and issues here.) + +### Have you read the [Contributing Guidelines on issues](https://github.com/appwrite/appwrite/blob/master/CONTRIBUTING.md)? + +(Write your answer here.) From a184f3319571c94cb8f901de0774ff6943af4495 Mon Sep 17 00:00:00 2001 From: Eric Brian Anil <38664231+EricBrianAnil@users.noreply.github.com> Date: Sun, 4 Oct 2020 01:03:22 +0530 Subject: [PATCH 013/133] Update README.md --- README.md | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/README.md b/README.md index eaf9570256..cf24d1112c 100644 --- a/README.md +++ b/README.md @@ -85,13 +85,7 @@ For advanced production and custom installation, check out our Docker [environme ### Upgrade from an Older Version -If you are upgrading your Appwrite server from an older version, you should use the Appwrite migration tool once your setup is completed. Make sure to run this tool after you already finished setting up the new version, as mentioned above. -To start the migration, run the following command from your terminal once your backup is ready and that your new Appwrite setup has completed successfully. - -``` docker exec [APPWRITE_CONTAINER_ID] migrate ``` - -Replace "[APPWRITE_CONTAINER_ID]" with your container ID. You can find your container ID by running `docker ps` command. - +If you are upgrading your Appwrite server from an older version, you should use the Appwrite migration tool once your setup is completed. For more information regarding this, check out the [Installation Docs](https://appwrite.io/docs/installation). ## Getting Started From 18729edf7491569f60bb1f596cee99f1be9f029c Mon Sep 17 00:00:00 2001 From: Naman Shankhydhar Date: Sun, 4 Oct 2020 11:33:20 +0530 Subject: [PATCH 014/133] changed denotion of Punjabi from pu to pa --- app/config/locale/codes.php | 2 +- .../{pu.continents.php => pa.continents.php} | 0 .../{pu.countries.php => pa.countries.php} | 0 app/config/locale/translations/{pu.php => pa.php} | 12 ++++++------ app/init.php | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) rename app/config/locale/translations/{pu.continents.php => pa.continents.php} (100%) rename app/config/locale/translations/{pu.countries.php => pa.countries.php} (100%) rename app/config/locale/translations/{pu.php => pa.php} (69%) diff --git a/app/config/locale/codes.php b/app/config/locale/codes.php index 71bedb0515..9d39eb3046 100644 --- a/app/config/locale/codes.php +++ b/app/config/locale/codes.php @@ -33,7 +33,7 @@ return [ 'pl', // Polish 'pt-br', // Portuguese - Brazil 'pt-pt', // Portuguese - Portugal - 'pu', //Punjabi + 'pa', //Punjabi 'ro', // Romanian 'ru', // Russian 'si', // Sinhala diff --git a/app/config/locale/translations/pu.continents.php b/app/config/locale/translations/pa.continents.php similarity index 100% rename from app/config/locale/translations/pu.continents.php rename to app/config/locale/translations/pa.continents.php diff --git a/app/config/locale/translations/pu.countries.php b/app/config/locale/translations/pa.countries.php similarity index 100% rename from app/config/locale/translations/pu.countries.php rename to app/config/locale/translations/pa.countries.php diff --git a/app/config/locale/translations/pu.php b/app/config/locale/translations/pa.php similarity index 69% rename from app/config/locale/translations/pu.php rename to app/config/locale/translations/pa.php index 640b20fce3..6f1ffeeee4 100644 --- a/app/config/locale/translations/pu.php +++ b/app/config/locale/translations/pa.php @@ -2,20 +2,20 @@ return [ 'settings.inspire' => '"ਬੁੱਧੀਮਾਨ ਬਣਨ ਦੀ ਕਲਾ ਇਹ ਜਾਣਨ ਦੀ ਕਲਾ ਹੈ ਕਿ ਕਿਸ ਨੂੰ ਨਜ਼ਰਅੰਦਾਜ਼ ਕਰਨਾ ਹੈ."', // This is the line printed in the homepage and console 'view-source' - 'settings.locale' => 'pu', + 'settings.locale' => 'pa', 'settings.direction' => 'ltr', // Service - Users 'account.emails.team' => '%s ਟੀਮ', 'account.emails.verification.title' => 'ਖਾਤਾ ਪੁਸ਼ਟੀਕਰਣ', - 'account.emails.verification.body' => 'pu.email.auth.confirm.tpl', + 'account.emails.verification.body' => 'pa.email.auth.confirm.tpl', 'account.emails.recovery.title' => 'ਪਾਸਵਰਡ ਰੀਸੈੱਟ', - 'account.emails.recovery.body' => 'pu.email.auth.recovery.tpl', + 'account.emails.recovery.body' => 'pa.email.auth.recovery.tpl', 'account.emails.invitation.title' => 'ਸੱਦਾ %s ਟੀਮ %s', - 'account.emails.invitation.body' => 'pu.email.auth.invitation.tpl', + 'account.emails.invitation.body' => 'pa.email.auth.invitation.tpl', 'locale.country.unknown' => 'ਅਣਜਾਣ', - 'countries' => include 'pu.countries.php', - 'continents' => include 'pu.continents.php', + 'countries' => include 'pa.countries.php', + 'continents' => include 'pa.continents.php', ]; diff --git a/app/init.php b/app/init.php index 919618cfe6..4234e0cee0 100644 --- a/app/init.php +++ b/app/init.php @@ -254,7 +254,7 @@ Locale::setLanguage('ph', include __DIR__.'/config/locale/translations/ph.php'); Locale::setLanguage('pl', include __DIR__.'/config/locale/translations/pl.php'); Locale::setLanguage('pt-br', include __DIR__.'/config/locale/translations/pt-br.php'); Locale::setLanguage('pt-pt', include __DIR__.'/config/locale/translations/pt-pt.php'); -Locale::setLanguage('pu', include __DIR__.'/config/locale/translations/pu.php'); +Locale::setLanguage('pa', include __DIR__.'/config/locale/translations/pa.php'); Locale::setLanguage('ro', include __DIR__.'/config/locale/translations/ro.php'); Locale::setLanguage('ru', include __DIR__ . '/config/locale/translations/ru.php'); Locale::setLanguage('si', include __DIR__ . '/config/locale/translations/si.php'); From 58cfd1080ecb1f83b0417728d6fd2e0129920f33 Mon Sep 17 00:00:00 2001 From: Naman Shankhydhar Date: Sun, 4 Oct 2020 11:34:45 +0530 Subject: [PATCH 015/133] changed pu to pa in templates --- .../{pu.email.auth.confirm.tpl => pa.email.auth.confirm.tpl} | 0 ...{pu.email.auth.invitation.tpl => pa.email.auth.invitation.tpl} | 0 .../{pu.email.auth.recovery.tpl => pa.email.auth.recovery.tpl} | 0 3 files changed, 0 insertions(+), 0 deletions(-) rename app/config/locale/templates/{pu.email.auth.confirm.tpl => pa.email.auth.confirm.tpl} (100%) rename app/config/locale/templates/{pu.email.auth.invitation.tpl => pa.email.auth.invitation.tpl} (100%) rename app/config/locale/templates/{pu.email.auth.recovery.tpl => pa.email.auth.recovery.tpl} (100%) diff --git a/app/config/locale/templates/pu.email.auth.confirm.tpl b/app/config/locale/templates/pa.email.auth.confirm.tpl similarity index 100% rename from app/config/locale/templates/pu.email.auth.confirm.tpl rename to app/config/locale/templates/pa.email.auth.confirm.tpl diff --git a/app/config/locale/templates/pu.email.auth.invitation.tpl b/app/config/locale/templates/pa.email.auth.invitation.tpl similarity index 100% rename from app/config/locale/templates/pu.email.auth.invitation.tpl rename to app/config/locale/templates/pa.email.auth.invitation.tpl diff --git a/app/config/locale/templates/pu.email.auth.recovery.tpl b/app/config/locale/templates/pa.email.auth.recovery.tpl similarity index 100% rename from app/config/locale/templates/pu.email.auth.recovery.tpl rename to app/config/locale/templates/pa.email.auth.recovery.tpl From a54a96368db9e873f86e108e11c47949bd2bcf2b Mon Sep 17 00:00:00 2001 From: Naman Shankhydhar Date: Mon, 5 Oct 2020 09:29:30 +0530 Subject: [PATCH 016/133] removed extra spaces --- app/config/locale/translations/pa.countries.php | 3 --- 1 file changed, 3 deletions(-) diff --git a/app/config/locale/translations/pa.countries.php b/app/config/locale/translations/pa.countries.php index f650e1be29..1096d0a368 100644 --- a/app/config/locale/translations/pa.countries.php +++ b/app/config/locale/translations/pa.countries.php @@ -13,7 +13,6 @@ return [ 'AU' => 'ਆਸਟਰੇਲੀਆ', 'AT' => 'ਆਸਟਰੀਆ', 'AZ' => 'ਅਜ਼ਰਬਾਈਜਾਨ', - 'BI' => 'ਬੁਰੂੰਡੀ', 'BE' => 'ਬੈਲਜੀਅਮ', 'BJ' => 'ਬੇਨਿਨ', @@ -99,7 +98,6 @@ return [ 'KN' => 'ਸੈਂਟ ਕਿੱਟਸ ਅਤੇ ਨੇਵਿਸ', 'KR' => 'ਦੱਖਣੀ ਕੋਰੀਆ', 'KW' => 'ਕੁਵੈਤ', - 'LA' => 'ਲਾਓਸ', 'LB' => 'ਲੇਬਨਾਨ', 'LR' => 'ਲਾਇਬੇਰੀਆ', @@ -149,7 +147,6 @@ return [ 'KP' => 'ਉੱਤਰੀ ਕੋਰਿਆ', 'PT' => 'ਪੋਰਟੁਗਲ', 'PY' => 'ਪੈਰਾਗੁਏ', - 'QA' => 'ਕਤਰ', 'RO' => 'ਰੋਮਾਨੀਆ', 'RU' => 'ਰੂਸ', From 3bc80d9b47be72fdafca207628d6928b94240d13 Mon Sep 17 00:00:00 2001 From: syshcndr <48546075+syshcndr@users.noreply.github.com> Date: Mon, 5 Oct 2020 16:24:44 +0530 Subject: [PATCH 017/133] kannada(ka) patch added kannada --- .../locale/translations/ka.continents.php | 11 + .../locale/translations/ka.countries.php | 198 ++++++++++++++++++ app/config/locale/translations/ka.php | 21 ++ .../templates/ka.email.auth.confirm.tpl | 15 ++ .../templates/ka.email.auth.invitation.tpl | 14 ++ .../templates/ka.email.auth.recovery.tpl | 15 ++ 6 files changed, 274 insertions(+) create mode 100644 app/config/locale/translations/ka.continents.php create mode 100644 app/config/locale/translations/ka.countries.php create mode 100644 app/config/locale/translations/ka.php create mode 100644 app/config/locale/translations/templates/ka.email.auth.confirm.tpl create mode 100644 app/config/locale/translations/templates/ka.email.auth.invitation.tpl create mode 100644 app/config/locale/translations/templates/ka.email.auth.recovery.tpl diff --git a/app/config/locale/translations/ka.continents.php b/app/config/locale/translations/ka.continents.php new file mode 100644 index 0000000000..a93d841957 --- /dev/null +++ b/app/config/locale/translations/ka.continents.php @@ -0,0 +1,11 @@ + 'ಆಫ್ರಿಕಾ', + 'AN' => 'ಅಂಟಾರ್ಕ್ಟಿಕಾ', + 'AS' => 'ಏಷ್ಯಾ', + 'EU' => 'ಯುರೋಪ್', + 'NA' => 'ಉತ್ತರ ಅಮೆರಿಕ', + 'OC' => 'ಓಷಿಯಾನಿಯಾ', + 'SA' => 'ದಕ್ಷಿಣ ಅಮೆರಿಕಾ', +]; \ No newline at end of file diff --git a/app/config/locale/translations/ka.countries.php b/app/config/locale/translations/ka.countries.php new file mode 100644 index 0000000000..047f5b1f3c --- /dev/null +++ b/app/config/locale/translations/ka.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' => 'ಕೇಪ್ ವರ್ಡೆ', + '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' => 'ಕ Kazakh ಾಕಿಸ್ತಾನ್', + '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/translations/ka.php b/app/config/locale/translations/ka.php new file mode 100644 index 0000000000..5a06b1a75d --- /dev/null +++ b/app/config/locale/translations/ka.php @@ -0,0 +1,21 @@ + '"ಬುದ್ಧಿವಂತಿಕೆಯ ಕಲೆ ಏನು ಕಡೆಗಣಿಸಬೇಕೆಂದು ತಿಳಿಯುವ ಕಲೆ."', // This is the line printed in the homepage and console 'view-source' + 'settings.locale' => 'ka', + 'settings.direction' => 'ltr', + + // Service - Users + 'account.emails.team' => '%s ತಂಡ', + 'account.emails.verification.title' => 'ಖಾತೆ ಪರಿಶೀಲನೆ', + 'account.emails.verification.body' => 'ka.email.auth.confirm.tpl', + 'account.emails.recovery.title' => 'ಪಾಸ್‌ವರ್ಡ್ ಮರುಹೊಂದಿಸು', + 'account.emails.recovery.body' => 'ka.email.auth.recovery.tpl', + 'account.emails.invitation.title' => '%s ತಂಡಕ್ಕೆ% %s ನಲ್ಲಿ ಆಹ್ವಾನ', + 'account.emails.invitation.body' => 'ka.email.auth.invitation.tpl', + + 'locale.country.unknown' => 'Unknown', + + 'countries' => include 'ka.countries.php', + 'continents' => include 'ka.continents.php', +]; diff --git a/app/config/locale/translations/templates/ka.email.auth.confirm.tpl b/app/config/locale/translations/templates/ka.email.auth.confirm.tpl new file mode 100644 index 0000000000..62ac8d924a --- /dev/null +++ b/app/config/locale/translations/templates/ka.email.auth.confirm.tpl @@ -0,0 +1,15 @@ +

+ ಹಲೋ {{name}}, +

+

+ ನಿಮ್ಮ ಇಮೇಲ್ ವಿಳಾಸವನ್ನು ಪರಿಶೀಲಿಸಲು ಈ ಲಿಂಕ್ ಅನ್ನು ಅನುಸರಿಸಿ. +

+{{cta}} +

+ ಈ ವಿಳಾಸವನ್ನು ಪರಿಶೀಲಿಸಲು ನೀವು ಕೇಳದಿದ್ದರೆ, ನೀವು ಈ ಸಂದೇಶವನ್ನು ನಿರ್ಲಕ್ಷಿಸಬಹುದು. +

+

+ ಧನ್ಯವಾದಗಳು, +
+ {{project}} ತಂಡ +

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

+ ಹಲೋ, +

+

+ {{project}} ಕ್ಕೆ {{team}} ತಂಡದ ಓವರ್‌ನಲ್ಲಿ ತಂಡದ ಸದಸ್ಯರಾಗಲು {{owner}} ನಿಮ್ಮನ್ನು ಆಹ್ವಾನಿಸಲು ಬಯಸಿದ್ದರಿಂದ ಈ ಮೇಲ್ ಅನ್ನು ನಿಮಗೆ ಕಳುಹಿಸಲಾಗಿದೆ. +

+{{cta}} +

+ ನಿಮಗೆ ಆಸಕ್ತಿ ಇಲ್ಲದಿದ್ದರೆ, ನೀವು ಈ ಸಂದೇಶವನ್ನು ನಿರ್ಲಕ್ಷಿಸಬಹುದು. +

+ ಧನ್ಯವಾದಗಳು, +
+ {{project}} ತಂಡ +

\ No newline at end of file diff --git a/app/config/locale/translations/templates/ka.email.auth.recovery.tpl b/app/config/locale/translations/templates/ka.email.auth.recovery.tpl new file mode 100644 index 0000000000..9d90ffc10b --- /dev/null +++ b/app/config/locale/translations/templates/ka.email.auth.recovery.tpl @@ -0,0 +1,15 @@ +

+ ಹಲೋ {{name}}, +

+

+ ನಿಮ್ಮ {{project}} ಪಾಸ್‌ವರ್ಡ್ ಅನ್ನು ಮರುಹೊಂದಿಸಲು ಈ ಲಿಂಕ್ ಅನ್ನು ಅನುಸರಿಸಿ. +

+{{cta}} +

+ ಈ ವಿಳಾಸವನ್ನು ಪರಿಶೀಲಿಸಲು ನೀವು ಕೇಳದಿದ್ದರೆ, ನೀವು ಈ ಸಂದೇಶವನ್ನು ನಿರ್ಲಕ್ಷಿಸಬಹುದು. +

+

+ ಧನ್ಯವಾದಗಳು, +
+ {{project}} ತಂಡ +

\ No newline at end of file From 57869d87f706be44cebf84d2df25c08ffe2bbdd1 Mon Sep 17 00:00:00 2001 From: syshcndr <48546075+syshcndr@users.noreply.github.com> Date: Mon, 5 Oct 2020 16:32:08 +0530 Subject: [PATCH 018/133] fixed --- app/config/locale/codes.php | 1 + app/init.php | 1 + 2 files changed, 2 insertions(+) diff --git a/app/config/locale/codes.php b/app/config/locale/codes.php index c68ab2c04a..488d35aacc 100644 --- a/app/config/locale/codes.php +++ b/app/config/locale/codes.php @@ -23,6 +23,7 @@ return [ 'it', // Italian 'ja', // Japanese 'jv', // Javanese + 'ka', // Kannada 'km', // Khmer 'ko', // Korean 'lt', // Lithuanian diff --git a/app/init.php b/app/init.php index b859876d95..66d933880d 100644 --- a/app/init.php +++ b/app/init.php @@ -244,6 +244,7 @@ Locale::setLanguage('is', include __DIR__.'/config/locale/translations/is.php'); Locale::setLanguage('it', include __DIR__.'/config/locale/translations/it.php'); Locale::setLanguage('ja', include __DIR__.'/config/locale/translations/ja.php'); Locale::setLanguage('jv', include __DIR__.'/config/locale/translations/jv.php'); +Locale::setLanguage('ka', include __DIR__.'/config/locale/translations/ka.php'); Locale::setLanguage('km', include __DIR__.'/config/locale/translations/km.php'); Locale::setLanguage('ko', include __DIR__.'/config/locale/translations/ko.php'); Locale::setLanguage('lt', include __DIR__.'/config/locale/translations/lt.php'); From a6d7885f59973c104af92a54f99f807243f91a73 Mon Sep 17 00:00:00 2001 From: syshcndr <48546075+syshcndr@users.noreply.github.com> Date: Mon, 5 Oct 2020 19:26:17 +0530 Subject: [PATCH 019/133] suggetion_fix --- app/config/locale/translations/ka.countries.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/config/locale/translations/ka.countries.php b/app/config/locale/translations/ka.countries.php index 047f5b1f3c..048f49c1bf 100644 --- a/app/config/locale/translations/ka.countries.php +++ b/app/config/locale/translations/ka.countries.php @@ -88,7 +88,7 @@ return [ 'JM' => 'ಜಮೈಕಾ', 'JO' => 'ಜೋರ್ಡಾನ್', 'JP' => 'ಜಪಾನ್', - 'KZ' => 'ಕ Kazakh ಾಕಿಸ್ತಾನ್', + 'KZ' => 'ಕಝಾಕಿಸ್ತಾನ್', 'KE' => 'ಕೀನ್ಯಾ', 'KG' => 'ಕಿರ್ಗಿಸ್ತಾನ್', 'KH' => 'ಕಾಂಬೋಡಿಯಾ', From 6e7fa35a5c161fa8cbd78e104a028e3ac239d097 Mon Sep 17 00:00:00 2001 From: Ravi Jyoti <44156359+ravijyoti3@users.noreply.github.com> Date: Tue, 6 Oct 2020 14:00:09 +0530 Subject: [PATCH 020/133] Updated link on Create Email Verification Section Create Email Verification has a link updated to https://appwrite.io/docs/client/account#updateVerification from https://appwrite.io/docs/client/account#updateAccountVerification --- docs/references/account/create-verification.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/references/account/create-verification.md b/docs/references/account/create-verification.md index 54e0bf77be..3eb262e9b8 100644 --- a/docs/references/account/create-verification.md +++ b/docs/references/account/create-verification.md @@ -1,3 +1,3 @@ -Use this endpoint to send a verification message to your user email address to confirm they are the valid owners of that address. Both the **userId** and **secret** arguments will be passed as query parameters to the URL you have provided to be attached to the verification email. The provided URL should redirect the user back to your app and allow you to complete the verification process by verifying both the **userId** and **secret** parameters. Learn more about how to [complete the verification process](/docs/client/account#updateAccountVerification). +Use this endpoint to send a verification message to your user email address to confirm they are the valid owners of that address. Both the **userId** and **secret** arguments will be passed as query parameters to the URL you have provided to be attached to the verification email. The provided URL should redirect the user back to your app and allow you to complete the verification process by verifying both the **userId** and **secret** parameters. Learn more about how to [complete the verification process](docs/client/account#updateVerification). Please note that in order to avoid a [Redirect Attack](https://github.com/OWASP/CheatSheetSeries/blob/master/cheatsheets/Unvalidated_Redirects_and_Forwards_Cheat_Sheet.md), the only valid redirect URLs are the ones from domains you have set when adding your platforms in the console interface. From c4e69dadb732497a5d4381eb218e04b4ae7f844c Mon Sep 17 00:00:00 2001 From: Ravi Jyoti <44156359+ravijyoti3@users.noreply.github.com> Date: Tue, 6 Oct 2020 14:02:20 +0530 Subject: [PATCH 021/133] Updated Link on create email verification Create Email Verification has a link updated to https://appwrite.io/docs/client/account#updateVerification from https://appwrite.io/docs/client/account#updateAccountVerification --- docs/references/account/create-verification.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/references/account/create-verification.md b/docs/references/account/create-verification.md index 3eb262e9b8..3e6abf6a77 100644 --- a/docs/references/account/create-verification.md +++ b/docs/references/account/create-verification.md @@ -1,3 +1,3 @@ -Use this endpoint to send a verification message to your user email address to confirm they are the valid owners of that address. Both the **userId** and **secret** arguments will be passed as query parameters to the URL you have provided to be attached to the verification email. The provided URL should redirect the user back to your app and allow you to complete the verification process by verifying both the **userId** and **secret** parameters. Learn more about how to [complete the verification process](docs/client/account#updateVerification). +Use this endpoint to send a verification message to your user email address to confirm they are the valid owners of that address. Both the **userId** and **secret** arguments will be passed as query parameters to the URL you have provided to be attached to the verification email. The provided URL should redirect the user back to your app and allow you to complete the verification process by verifying both the **userId** and **secret** parameters. Learn more about how to [complete the verification process](/docs/client/account#updateVerification). Please note that in order to avoid a [Redirect Attack](https://github.com/OWASP/CheatSheetSeries/blob/master/cheatsheets/Unvalidated_Redirects_and_Forwards_Cheat_Sheet.md), the only valid redirect URLs are the ones from domains you have set when adding your platforms in the console interface. From 6847c1015c991684fd061b5ba7956938ac1e6385 Mon Sep 17 00:00:00 2001 From: TANISHQ CHAMOLA <36632821+tanishqchamola@users.noreply.github.com> Date: Tue, 6 Oct 2020 20:38:16 +0530 Subject: [PATCH 022/133] Fixed hindi spellings of country names --- .../locale/translations/hi.countries.php | 90 +++++++++---------- 1 file changed, 43 insertions(+), 47 deletions(-) diff --git a/app/config/locale/translations/hi.countries.php b/app/config/locale/translations/hi.countries.php index f9f40230a0..18c53be18b 100644 --- a/app/config/locale/translations/hi.countries.php +++ b/app/config/locale/translations/hi.countries.php @@ -2,29 +2,28 @@ return [ - 'AF' => 'अफगानिस्तान', + 'AF' => 'अफ़्गानिस्तान', 'AO' => 'अंगोला', 'AL' => 'अल्बानिया', 'AD' => 'अंडोरा', 'AE' => 'संयुक्त अरब अमीरात', - 'AR' => 'अर्जेंटीना', - 'AM' => 'आर्मेनिया', - 'AG' => 'एंटीगुआ और बारबुडा', + 'AR' => 'अर्जेण्टीना', + 'AM' => 'आर्मीनिया', + 'AG' => 'अंटीगुआ और बारबूडा', 'AU' => 'ऑस्ट्रेलिया', 'AT' => 'ऑस्ट्रिया', - 'AZ' => 'अजरबैजान', - + 'AZ' => 'अज़रबैजान', 'BI' => 'बुरुंडी', 'BE' => 'बेल्जियम', 'BJ' => 'बेनिन', - 'BF' => 'बुर्किना फ़ासो', + 'BF' => 'बुर्किना फासो', 'BD' => 'बांग्लादेश', 'BG' => 'बुल्गारिया', 'BH' => 'बहरीन', 'BS' => 'बहामास', 'BA' => 'बोस्निया और हर्ज़ेगोविना', 'BY' => 'बेलारूस', - 'BZ' => 'बेलीज', + 'BZ' => 'बेलीज़', 'BO' => 'बोलीविया', 'BR' => 'ब्राज़ील', 'BB' => 'बारबाडोस', @@ -33,50 +32,49 @@ return [ 'BW' => 'बोत्सवाना', 'CF' => 'मध्य अफ्रीकी गणराज्य', 'CA' => 'कनाडा', - 'CH' => 'स्विटज़रलैंड', + 'CH' => 'स्विट्ज़रलैंड', 'CL' => 'चिली', 'CN' => 'चीन', 'CI' => 'आइवरी कोस्ट', 'CM' => 'कैमरून', - 'CD' => 'डीआर कांगो', + 'CD' => 'कांगो लोकतान्त्रिक गणराज्य', 'CG' => 'कांगो गणराज्य', 'CO' => 'कोलंबिया', 'KM' => 'कोमोरोस', - 'CV' => 'केप वर्डे', - 'CR' => 'कोस्टा रिका', + 'CV' => 'केप वर्दे', + 'CR' => 'कोस्टा रीका', 'CU' => 'क्यूबा', 'CY' => 'साइप्रस', - 'CZ' => 'चेकिया', + 'CZ' => 'चेक गणराज्या', 'DE' => 'जर्मनी', 'DJ' => 'जिबूती', 'DM' => 'डोमिनिका', 'DK' => 'डेनमार्क', 'DO' => 'डोमिनिकन रिपब्लिक', 'DZ' => 'अल्जीरिया', - 'ER' => 'इरिट्रिया', - 'EC' => 'इक्वाडोर', + 'ER' => 'इरित्रिया', + 'EC' => 'ईक्वाडोर', 'EG' => 'मिस्र', - 'IR' => 'इरिट्रिया', 'ES' => 'स्पेन', 'EE' => 'एस्टोनिया', 'ET' => 'इथियोपिया', - 'FI' => 'फिनलैंड', - 'FJ' => 'फिजी', + 'FI' => 'फ़िनलैंड', + 'FJ' => 'फ़िजी', 'FR' => 'फ्रांस', 'FM' => 'माइक्रोनेशिया', - 'GA' => 'गैबॉन', + 'GA' => 'गबॉन', 'GB' => 'यूनाइटेड किंगडम', 'GE' => 'जॉर्जिया', 'GH' => 'घाना', 'GN' => 'गिनी', - 'GM' => 'गाम्बिया', + 'GM' => 'ज़ाम्बिया', 'GW' => 'गिनी-बिसाऊ', 'GQ' => 'इक्वेटोरियल गिनी', - 'GR' => 'ग्रीस', + 'GR' => 'यूनान', 'GD' => 'ग्रेनाडा', 'GT' => 'ग्वाटेमाला', - 'GY' => 'गुयाना', - 'HN' => 'होंडुरास', + 'GY' => 'गयाना', + 'HN' => 'होंडुरस', 'HR' => 'क्रोएशिया', 'HT' => 'हैती', 'HU' => 'हंगरी', @@ -91,20 +89,19 @@ return [ 'JM' => 'जमैका', 'JO' => 'जॉर्डन', 'JP' => 'जापान', - 'KZ' => 'कजाकिस्तान', - 'KE' => 'केन्या', - 'KG' => 'किर्गिस्तान', + 'KZ' => 'कज़ाख़िस्तान', + 'KE' => 'कीनियाा', + 'KG' => 'किर्गिज़स्तान', 'KH' => 'कंबोडिया', - 'KI' => 'किरीबाती', - 'KN' => 'सेंट किट्स एंड नेविस', + 'KI' => 'किरिबाती', + 'KN' => 'सन्त किट्स और नेविस', 'KR' => 'दक्षिण कोरिया', 'KW' => 'कुवैत', - 'LA' => 'लाओस', 'LB' => 'लेबनान', 'LR' => 'लाइबेरिया', 'LY' => 'लीबिया', - 'LC' => 'सेंट लूसिया', + 'LC' => 'सन्त लूसिया', 'LI' => 'लिकटेंस्टीन', 'LK' => 'श्रीलंका', 'LS' => 'लेसोथो', @@ -112,31 +109,31 @@ return [ 'LU' => 'लक्ज़मबर्ग', 'LV' => 'लातविया', 'MA' => 'मोरक्को', - 'MC' => 'मोनाको', - 'MD' => 'मोल्दोवा', + 'MC' => 'मोनैको', + 'MD' => 'मॉल्डोवा', 'MG' => 'मेडागास्कर', 'MV' => 'मालदीव', 'MX' => 'मेक्सिको', - 'MH' => 'मार्शल आइलैंड्स', + 'MH' => 'मार्शल द्वीपसमूह', 'MK' => 'मैसिडोनिया', - 'ML' => 'रक्त', + 'ML' => 'माली', 'MT' => 'माल्टा', 'MM' => 'म्यांमार', 'ME' => 'मोंटेनेग्रो', 'MN' => 'मंगोलिया', 'MZ' => 'मोज़ाम्बिक', 'MR' => 'मॉरिटानिया', - 'MU' => 'मॉरीशस', + 'MU' => 'मॉरिशस', 'MW' => 'मलावी', 'MY' => 'मलेशिया', 'NA' => 'नामीबिया', 'NE' => 'नाइजर', - 'NG' => 'नाइजीरिया', + 'NG' => 'नाईजीरिया', 'NI' => 'निकारागुआ', 'NL' => 'नीदरलैंड', 'NO' => 'नॉर्वे', 'NP' => 'नेपाल', - 'NR' => 'नारू', + 'NR' => 'नाउरु', 'NZ' => 'न्यूजीलैंड', 'OM' => 'ओमान', 'PK' => 'पाकिस्तान', @@ -148,9 +145,8 @@ return [ 'PL' => 'पोलैंड', 'KP' => 'उत्तर कोरिया', 'PT' => 'पुर्तगाल', - 'PY' => 'पराग्वे', - - 'QA' => 'कतर', + 'PY' => 'पैराग्वे', + 'QA' => 'क़तर', 'RO' => 'रोमानिया', 'RU' => 'रूस', 'RW' => 'रवांडा', @@ -165,7 +161,7 @@ return [ 'SO' => 'सोमालिया', 'RS' => 'सर्बिया', 'SS' => 'दक्षिण सूडान', - 'ST' => 'साओ तोमे और प्रिंसिपे', + 'ST' => 'साओ तोमे और प्रिंसिपी', 'SR' => 'सूरीनाम', 'SK' => 'स्लोवाकिया', 'SI' => 'स्लोवेनिया', @@ -183,21 +179,21 @@ return [ 'TT' => 'त्रिनिदाद और टोबैगो', 'TN' => 'ट्यूनीशिया', 'TR' => 'तुर्की', - 'TV' => 'तुवालु', + 'TV' => 'तुवालू', 'TZ' => 'तंजानिया', 'UG' => 'युगांडा', 'UA' => 'यूक्रेन', 'UY' => 'उरुग्वे', 'US' => 'संयुक्त राज्य अमेरिका', - 'UZ' => 'उज्बेकिस्तान', + 'UZ' => 'उज़्बेकिस्तान', 'VA' => 'वेटिकन सिटी', - 'VC' => 'सेंट विंसेंट और ग्रेनेडाइंस', - 'VE' => 'वेनेजुएला', + 'VC' => 'सन्त विंसेंट और ग्रेनेडाइंस', + 'VE' => 'वेनेज़ुएला', 'VN' => 'वियतनाम', - 'VU' => 'वानुअतु', + 'VU' => 'वानूआतू', 'WS' => 'समोआ', 'YE' => 'यमन', 'ZA' => 'दक्षिण अफ्रीका', 'ZM' => 'ज़ाम्बिया', - 'ZW' => 'जिम्बाब्वे', + 'ZW' => 'ज़िम्बाब्वे', ]; From ab2f9227e5aed4c1125f298447dbf678c65ae9b6 Mon Sep 17 00:00:00 2001 From: Pedro Cisneros Santana <37348419+PedroCisnerosSantana@users.noreply.github.com> Date: Tue, 6 Oct 2020 17:58:06 +0200 Subject: [PATCH 023/133] Added QRCode dependency --- composer.json | 5 ++- composer.lock | 121 +++++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 123 insertions(+), 3 deletions(-) diff --git a/composer.json b/composer.json index f0ce2624cb..7f186fd59e 100644 --- a/composer.json +++ b/composer.json @@ -50,7 +50,8 @@ "domnikl/statsd": "3.0.*", "influxdb/influxdb-php": "1.15.*", "bacon/bacon-qr-code": "2.0.2", - "phpmailer/phpmailer": "6.1.7" + "phpmailer/phpmailer": "6.1.7", + "chillerlan/php-qrcode": "^4.1" }, "require-dev": { "swoole/ide-helper": "4.5.4", @@ -72,4 +73,4 @@ "php": "7.4" } } -} \ No newline at end of file +} diff --git a/composer.lock b/composer.lock index 1392b6fdd0..810eb51efe 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "07a5b2d2e742e8651d58889c3253c3b5", + "content-hash": "6b4324f0371e508d691337551c00c74e", "packages": [ { "name": "appwrite/php-clamav", @@ -100,6 +100,125 @@ "homepage": "https://github.com/Bacon/BaconQrCode", "time": "2020-07-30T16:40:58+00:00" }, + { + "name": "chillerlan/php-qrcode", + "version": "4.1.0", + "source": { + "type": "git", + "url": "https://github.com/chillerlan/php-qrcode.git", + "reference": "2cecb32cf618319dd01d9bc1fa64dc6bb683df85" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/chillerlan/php-qrcode/zipball/2cecb32cf618319dd01d9bc1fa64dc6bb683df85", + "reference": "2cecb32cf618319dd01d9bc1fa64dc6bb683df85", + "shasum": "" + }, + "require": { + "chillerlan/php-settings-container": "^2.0", + "ext-mbstring": "*", + "php": "^7.4" + }, + "require-dev": { + "phan/phan": "^2.7", + "phpunit/phpunit": "^9.1", + "setasign/fpdf": "^1.8.2" + }, + "suggest": { + "chillerlan/php-authenticator": "Yet another Google authenticator! Also creates URIs for mobile apps.", + "setasign/fpdf": "Required to use the QR FPDF output." + }, + "type": "library", + "autoload": { + "psr-4": { + "chillerlan\\QRCode\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Kazuhiko Arase", + "homepage": "https://github.com/kazuhikoarase" + }, + { + "name": "Smiley", + "email": "smiley@chillerlan.net", + "homepage": "https://github.com/codemasher" + }, + { + "name": "Contributors", + "homepage": "https://github.com/chillerlan/php-qrcode/graphs/contributors" + } + ], + "description": "A QR code generator. PHP 7.4+", + "homepage": "https://github.com/chillerlan/php-qrcode", + "keywords": [ + "phpqrcode", + "qr", + "qr code", + "qrcode", + "qrcode-generator" + ], + "funding": [ + { + "url": "https://ko-fi.com/codemasher", + "type": "ko_fi" + } + ], + "time": "2020-06-04T17:07:12+00:00" + }, + { + "name": "chillerlan/php-settings-container", + "version": "2.0.0", + "source": { + "type": "git", + "url": "https://github.com/chillerlan/php-settings-container.git", + "reference": "75888345532373074fba482a6642c0f8cda996f0" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/chillerlan/php-settings-container/zipball/75888345532373074fba482a6642c0f8cda996f0", + "reference": "75888345532373074fba482a6642c0f8cda996f0", + "shasum": "" + }, + "require": { + "ext-json": "*", + "php": "^7.4" + }, + "require-dev": { + "phan/phan": "^2.6", + "phpunit/phpunit": "^9.1" + }, + "type": "library", + "autoload": { + "psr-4": { + "chillerlan\\Settings\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Smiley", + "email": "smiley@chillerlan.net", + "homepage": "https://github.com/codemasher" + } + ], + "description": "A container class for immutable settings objects. Not a DI container. PHP 7.4+", + "homepage": "https://github.com/chillerlan/php-settings-container", + "keywords": [ + "PHP7", + "Settings", + "container", + "helper" + ], + "time": "2020-04-16T16:56:44+00:00" + }, { "name": "colinmollenhour/credis", "version": "1.11.2", From fb29a6dd162dfaad2c8d4426c7fd9850c1952d62 Mon Sep 17 00:00:00 2001 From: TANISHQ CHAMOLA <36632821+tanishqchamola@users.noreply.github.com> Date: Tue, 6 Oct 2020 22:23:10 +0530 Subject: [PATCH 024/133] Updated hindi spellings of countries --- .../locale/translations/hi.countries.php | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/app/config/locale/translations/hi.countries.php b/app/config/locale/translations/hi.countries.php index 18c53be18b..19b4d86bcf 100644 --- a/app/config/locale/translations/hi.countries.php +++ b/app/config/locale/translations/hi.countries.php @@ -2,12 +2,12 @@ return [ - 'AF' => 'अफ़्गानिस्तान', + 'AF' => 'अफ़ग़ानिस्तान', 'AO' => 'अंगोला', 'AL' => 'अल्बानिया', 'AD' => 'अंडोरा', 'AE' => 'संयुक्त अरब अमीरात', - 'AR' => 'अर्जेण्टीना', + 'AR' => 'अर्जेंटीना', 'AM' => 'आर्मीनिया', 'AG' => 'अंटीगुआ और बारबूडा', 'AU' => 'ऑस्ट्रेलिया', @@ -21,7 +21,7 @@ return [ 'BG' => 'बुल्गारिया', 'BH' => 'बहरीन', 'BS' => 'बहामास', - 'BA' => 'बोस्निया और हर्ज़ेगोविना', + 'BA' => 'बॉस्निया और हर्ज़ेगोविना', 'BY' => 'बेलारूस', 'BZ' => 'बेलीज़', 'BO' => 'बोलीविया', @@ -45,7 +45,7 @@ return [ 'CR' => 'कोस्टा रीका', 'CU' => 'क्यूबा', 'CY' => 'साइप्रस', - 'CZ' => 'चेक गणराज्या', + 'CZ' => 'चेक गणराज्य', 'DE' => 'जर्मनी', 'DJ' => 'जिबूती', 'DM' => 'डोमिनिका', @@ -62,7 +62,7 @@ return [ 'FJ' => 'फ़िजी', 'FR' => 'फ्रांस', 'FM' => 'माइक्रोनेशिया', - 'GA' => 'गबॉन', + 'GA' => 'गबोन', 'GB' => 'यूनाइटेड किंगडम', 'GE' => 'जॉर्जिया', 'GH' => 'घाना', @@ -94,14 +94,14 @@ return [ 'KG' => 'किर्गिज़स्तान', 'KH' => 'कंबोडिया', 'KI' => 'किरिबाती', - 'KN' => 'सन्त किट्स और नेविस', + 'KN' => 'सेंट किट्स एंड नेविस', 'KR' => 'दक्षिण कोरिया', 'KW' => 'कुवैत', 'LA' => 'लाओस', 'LB' => 'लेबनान', 'LR' => 'लाइबेरिया', 'LY' => 'लीबिया', - 'LC' => 'सन्त लूसिया', + 'LC' => 'सेंट लूसिया', 'LI' => 'लिकटेंस्टीन', 'LK' => 'श्रीलंका', 'LS' => 'लेसोथो', @@ -186,8 +186,8 @@ return [ 'UY' => 'उरुग्वे', 'US' => 'संयुक्त राज्य अमेरिका', 'UZ' => 'उज़्बेकिस्तान', - 'VA' => 'वेटिकन सिटी', - 'VC' => 'सन्त विंसेंट और ग्रेनेडाइंस', + 'VA' => 'वैटिकन नगर', + 'VC' => 'सेंट विंसेंट एंड ग्रेनेडाइंस', 'VE' => 'वेनेज़ुएला', 'VN' => 'वियतनाम', 'VU' => 'वानूआतू', From 898a72e212795289a2e3413bf8cf09029ad6f57a Mon Sep 17 00:00:00 2001 From: TANISHQ CHAMOLA <36632821+tanishqchamola@users.noreply.github.com> Date: Tue, 6 Oct 2020 22:48:27 +0530 Subject: [PATCH 025/133] Fixed Vatican City in hindi --- app/config/locale/translations/hi.countries.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/config/locale/translations/hi.countries.php b/app/config/locale/translations/hi.countries.php index 19b4d86bcf..c3e748492a 100644 --- a/app/config/locale/translations/hi.countries.php +++ b/app/config/locale/translations/hi.countries.php @@ -186,7 +186,7 @@ return [ 'UY' => 'उरुग्वे', 'US' => 'संयुक्त राज्य अमेरिका', 'UZ' => 'उज़्बेकिस्तान', - 'VA' => 'वैटिकन नगर', + 'VA' => 'वैटिकन सिटी', 'VC' => 'सेंट विंसेंट एंड ग्रेनेडाइंस', 'VE' => 'वेनेज़ुएला', 'VN' => 'वियतनाम', From fe996632f6af66a81e763c0b1ce42e3b7f87d6ab Mon Sep 17 00:00:00 2001 From: GriffinMLN Date: Wed, 7 Oct 2020 02:58:14 +0300 Subject: [PATCH 026/133] Added Bulgarian translation. --- app/config/locale/codes.php | 1 + .../locale/translations/bg.continents.php | 11 + .../locale/translations/bg.countries.php | 198 ++++++++++++++++++ app/config/locale/translations/bg.php | 21 ++ .../templates/bg.email.auth.confirm.tpl | 15 ++ .../templates/bg.email.auth.invitation.tpl | 14 ++ .../templates/bg.email.auth.recovery.tpl | 15 ++ app/init.php | 1 + 8 files changed, 276 insertions(+) create mode 100644 app/config/locale/translations/bg.continents.php create mode 100644 app/config/locale/translations/bg.countries.php create mode 100644 app/config/locale/translations/bg.php create mode 100644 app/config/locale/translations/templates/bg.email.auth.confirm.tpl create mode 100644 app/config/locale/translations/templates/bg.email.auth.invitation.tpl create mode 100644 app/config/locale/translations/templates/bg.email.auth.recovery.tpl diff --git a/app/config/locale/codes.php b/app/config/locale/codes.php index 96c089bd3f..5bb7e9ba86 100644 --- a/app/config/locale/codes.php +++ b/app/config/locale/codes.php @@ -4,6 +4,7 @@ return [ 'af', // Afrikaans 'ar', // Arabic 'be', // Belarusian + 'bg', // Bulgarian 'bn', // Bengali 'cat', // Catalan 'cz', // Czech diff --git a/app/config/locale/translations/bg.continents.php b/app/config/locale/translations/bg.continents.php new file mode 100644 index 0000000000..ade83e0b98 --- /dev/null +++ b/app/config/locale/translations/bg.continents.php @@ -0,0 +1,11 @@ + 'Африка', + 'AN' => 'Антарктида', + 'AS' => 'Азия', + 'EU' => 'Европа', + 'NA' => 'Северна Америка', + 'OC' => 'Океания', + 'SA' => 'Южна Америка', +]; diff --git a/app/config/locale/translations/bg.countries.php b/app/config/locale/translations/bg.countries.php new file mode 100644 index 0000000000..5ba9b7a139 --- /dev/null +++ b/app/config/locale/translations/bg.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' => 'Кабо Верде', + '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/translations/bg.php b/app/config/locale/translations/bg.php new file mode 100644 index 0000000000..1e9cc51df7 --- /dev/null +++ b/app/config/locale/translations/bg.php @@ -0,0 +1,21 @@ + '"Изкуството да бъдеш мъдър е изкуството да знаеш какво да пренебрегнеш."', // This is the line printed in the homepage and console 'view-source' + 'settings.locale' => 'bg', + 'settings.direction' => 'ltr', + + // Service - Users + 'account.emails.team' => '%s Екип', + 'account.emails.verification.title' => 'Потвърждаване на профила', + 'account.emails.verification.body' => 'bg.email.auth.confirm.tpl', + 'account.emails.recovery.title' => 'Възстановяване на парола', + 'account.emails.recovery.body' => 'bg.email.auth.recovery.tpl', + 'account.emails.invitation.title' => 'Покана към %s екипа при %s', + 'account.emails.invitation.body' => 'bg.email.auth.invitation.tpl', + + 'locale.country.unknown' => 'Неизвестно', + + 'countries' => include 'bg.countries.php', + 'continents' => include 'bg.continents.php', +]; diff --git a/app/config/locale/translations/templates/bg.email.auth.confirm.tpl b/app/config/locale/translations/templates/bg.email.auth.confirm.tpl new file mode 100644 index 0000000000..dc0c1df182 --- /dev/null +++ b/app/config/locale/translations/templates/bg.email.auth.confirm.tpl @@ -0,0 +1,15 @@ +

+ Здравейте {{name}}, +

+

+ Следвайте този линк, за да потвърдите имейл адреса си. +

+{{cta}} +

+ Ако не сте поискали да потвърдите този адрес, можете да игнорирате това съобщение. +

+

+ Поздрави, +
+ {{project}} екип +

\ No newline at end of file diff --git a/app/config/locale/translations/templates/bg.email.auth.invitation.tpl b/app/config/locale/translations/templates/bg.email.auth.invitation.tpl new file mode 100644 index 0000000000..d5157f01c6 --- /dev/null +++ b/app/config/locale/translations/templates/bg.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/translations/templates/bg.email.auth.recovery.tpl b/app/config/locale/translations/templates/bg.email.auth.recovery.tpl new file mode 100644 index 0000000000..007f7f05c3 --- /dev/null +++ b/app/config/locale/translations/templates/bg.email.auth.recovery.tpl @@ -0,0 +1,15 @@ +

+ Здравейте {{name}}, +

+

+ Последвайте този линк за да промените своята {{project}} парола. +

+{{cta}} +

+ Ако не сте поискали да потвърдите този адрес, можете да игнорирате това съобщение. +

+

+ Поздрави, +
+ {{project}} екип +

\ No newline at end of file diff --git a/app/init.php b/app/init.php index c9dc9efba7..6639314675 100644 --- a/app/init.php +++ b/app/init.php @@ -225,6 +225,7 @@ Locale::$exceptions = false; Locale::setLanguage('af', include __DIR__.'/config/locale/translations/af.php'); Locale::setLanguage('ar', include __DIR__.'/config/locale/translations/ar.php'); Locale::setLanguage('be', include __DIR__.'/config/locale/translations/be.php'); +Locale::setLanguage('bg', include __DIR__.'/config/locale/translations/bg.php'); Locale::setLanguage('bn', include __DIR__.'/config/locale/translations/bn.php'); Locale::setLanguage('cat', include __DIR__.'/config/locale/translations/cat.php'); Locale::setLanguage('cz', include __DIR__.'/config/locale/translations/cz.php'); From 9830d6400aa0c4857d1ccb74dc723ce594e63d61 Mon Sep 17 00:00:00 2001 From: rsneh Date: Wed, 7 Oct 2020 19:03:18 +0300 Subject: [PATCH 027/133] Added Wordpress OAuth2 provider --- app/config/providers.php | 9 ++ public/images/oauth2/wordpress.png | Bin 0 -> 4826 bytes src/Appwrite/Auth/OAuth2/Wordpress.php | 133 +++++++++++++++++++++++++ 3 files changed, 142 insertions(+) create mode 100644 public/images/oauth2/wordpress.png create mode 100644 src/Appwrite/Auth/OAuth2/Wordpress.php diff --git a/app/config/providers.php b/app/config/providers.php index 65e2127b3e..b4ee253490 100644 --- a/app/config/providers.php +++ b/app/config/providers.php @@ -224,5 +224,14 @@ return [ // Ordered by ABC. 'form' => false, 'beta' => false, 'mock' => true, + ], + 'wordpress' => [ + 'name' => 'Wordpress', + 'developers' => 'https://developer.wordpress.com/docs/oauth2/', + 'icon' => 'icon-wordpress', + 'enabled' => true, + 'form' => false, + 'beta' => false, + 'mock' => false ] ]; diff --git a/public/images/oauth2/wordpress.png b/public/images/oauth2/wordpress.png new file mode 100644 index 0000000000000000000000000000000000000000..f1d664ada1e3e577cbc3aaec0d12f4d1dfcf7183 GIT binary patch literal 4826 zcmV<05+&`4P)U&jRlW~!Z;9&ieE@Yis@7&IYOeQrf6aY znTn+0M?(91doKU|@7=w-=id8&|M$o{^P73^zjycSJ-d7M>^Wz5x7+TM=aWbJQ1h&= z)HJJyLSKdB6h zfx;FcKH$8o6&5L6t#Fh=mwJC^hkg`;dMR9_ut4Ee4|6vwtW#K}u#6czPhk#Y9{={R z!b*O3v!|@J3JaO$f%X3W4)G{P?5S|7!hH^gZB%$#VZOqZ3WF7P%|T-q7G0CLER2+Q z9Q5wzy6jntZ|%^J`slqBE>n2T>cQ_RELIq;&|9Hf4QO}cvd>p|K;d0$1fovk74|Nh zc87a-f^AjUU@+kw7B|Bcy4Rsj-FalpvFf#f>v~9g*Qw@@`ltgGu41{3kNsF-jly(= z0ks$jIqHa!(_dkl!b@DoEj(hN2pmxFIu?GQ$tavgT1!fL9wuz4s0Rtl+EL*!g`o;# zc}}=q;TDA%jGrppz;n)6e)n*NPYG!qq;L&YD;Jo1PN&YQo$;u6(3m6M=AO1wL|!yx zPiDYv%#8m!CgNBi@6#-nQ09Iyj742}WWR09F~3ykRSuWh;o+eVRq}8A5t|fdDI6Kd zw*%?5$7IrK>%R&#KnN%sYBSb3Sd;7!s9Qh&hE1Fw-!?9kukH^-gThTzS-`!naBf3J zZ)|94-Cn(OGU+wMziZeCK0wR*g~HIr39a6G@~9oD@OP>#IDZ^7;_LFLiXBLm^#nx3 zQiUEF??W8Gys@$ljo`zd70%3JGHEl+uc;zJv3?QFhc$mxg^p2phAa3HX+1vcqcG90 zApa`5oGZHa{ia7Oh z_4^6rx7>C{fY~Q`zO|RpDBw-|%qgU`sbm6w!8I~SuSL#Q_-6-TV%fl)@ilUodq|Iz zM0{bQudVh)dYy5fQ8C|~fko5C4#2!J@s`4D(u>|93%8a$H(eiCZaG`I2qi^uX;^xQMBI>iKsb;kBqIvQ-;Hr5!x_ocm@CbX%< zsLr7~= z+u8*Fp~5!`@~#K-4CTQ}T-^IS+mdRV;4cchmB7D|%scS#^rD49 zR3*-(S=3Z*4JAD+@96-{s|D^V#JsIMYVD$V*H$L{I{7`1q@6P;2o9Q*KSTZYb<*<& zdcc232Pwcu{wC?g5f)N#he9WZG4UaVJ4rjPeDe(^LHH^Vq64eya?;MF7fFxAbzDB^ zyvuYqG3||9SBOuT$zLYDSbLJogv9`1M*oOtkXeOVqMA=fQpL%2b>2eyQpE>;mFFGE zNK$BIG>~?G?ys;9X>o=i0()dZ3;C9Z5pcjl%QZ z@`efJ`OisrsD$QhX=cPtAq)nQ7gI~DR9EiheH3o@FamK|hqv|c=JKLZI6QS19$i=? zd>CjDh&`vlG>%?t$^}6>xZ`8y?OuYy+Je|nDTL}2vd5_WUsSk}M;v50=7iTHnDIDi zGfgY!clsp)v?0C_g@TBbyA&Q#c%I@MV|b^zz;`#=l7+N5U&G~(k1c3VmUGB7EpLU4 z@{WvTKnM#OE$cu8ZG;XL36_9Dk}GOn7H!;-i>*SvhNQS(#xpGsg8o~P`EBf<>2Zq!_M`nYqAW` zhDNofAYHNOCLLu7Lo33YcCgZh8)f@DIBAP6Ucw@)yOlP8nF{BWG&B>9`B(`Jf?=K+ zaOa_aT|v5-hmI4{?8o&*tl2;-tvmA=WnYw4$U=T;u_J8~r$JpjMp8K|e^FeMgZ2?6 z(0xQm^B5!VWJmg9PFv_J0D5||G9P87VP*Z0LEyV0j_5LurLgWFgB3Yw?NEg11 zGX*q<7MXgpG}g<<+!ZqgfqOp({qO7BgTc{Tk#RI#^ro8!n=fSiKfeK@&g~-CalC27Y`QKq0#zmkLY4@#olJ3t4$ ze}k28wd1`+VqoFi)l7i7IthFmY-NJ^!54LSMGmGERY4Oh%Rze(l`}#w3D7y(kq127 z(Ry#N(Ybq=3GjWqPmqxltG6DLUf}pD_6W)COJAUJ_JKfS6YZ2GZD}sU-8{Qt!c6aX zla9V|vW?mIb{a#f(rSYV&IEM`hu9E#F~h-vVY56|T~ zPrk8^_g8V+2=m7={9{TkQ+S2FM#2y-6Or>}EE3^QKUzY&v8e@%+}8@y#XRIR;i%ug znUQaj{T9_B#lh9`RWmun`<|EQhIA5L{9PcMl zJ6D)LPUat7Ymi$aDt9f(C-?CsHHbJEfwWbk=pr#SGD*9K*JtFp#gQjji%c!G}g z1@?W|i@XL3FFK<|R?$fvK%}5_O>zi@1J<%|j)a~?8-a9>=cJqRnyTL}iO6@oBcF3p zFQWFENI7CMnbO?mr}$k?rl5Ck4TdJ|sucycQGV<5aH|{`E`Jk|FIw$AgMZAkFf_4T z!VoS$uh{ynRSrh7Xg(pg%_#(!I(k^;z&jYDwM8!s6Vu6hM}{oZi4Dk5>9I?2e!ZWA zG3Od(z*>y}>P(}b{WR*$|4$3)rd+vHQHnx{Hl0+Ai%lZqq6<@OqM?W4hP#RNW-lde z#l`Q4mKO!KQ6)+<7MEE0u@N?QF0ze_yOGDZnAiO70#w4Cg-n?sWXcjN|4jZJJ7q-y z7^EXBV~?N3yfwhe|0Rl3Ob`+jZGI0qs3ehx5L+h+nbL=3;ie;vy!%r1cDf%5X~X&) zdm>RP1d8H)_3;iWPRw%Q-X`q9Hwu{oSsrVWM}WmHM&47b#)Q>Cs%^zC5@%ZZpe4Q- znfEpaUAGID6Q^*ZE6CwAVS|7vQlIyQk!3Hi^0`bqqL^gTBQ(a7c%qeWU}T*ETU8DQ zIfTN1BvIs;bIubo1pyE-viLkB&pw_WdaHysm-WX0-B%rXZjR(fo-m-<7=DR+bF`Hi zX%7oW$vr}bpvU|nP$o3NeT_V$$bC=&RA5nnH0c96qeTwsZ5wL?c@ltkb`<<*PFrhl zrZr#63MG{;;L!R`H)jS@u8}mdQC}BM_0jRrJ~pE)jCebm6C06Y6%lzTDZiA+aaXW4 zM4B`>p-IRTY!=Nj_?>0E3;o{?wK0*NC^Mcu`Z$cgddk8{3{_F;R5|x0ghIjAy^L13 zCn2bZKIgp;E2ybO8ces$Q&!c69SU0z(5nv?()O)~?zG;+?&4dxf%X!EBW^8-HfK<^ClPeU8EJ5pN)Abb)j(?OG^6B? zHh#zGeK3M1>X+KCL3s}j;LMpvYmh9i3SujI_bzFTZaGzkc7u_2v4Ads$#-xDIT!tF zIq#c|hGIi$L#7W)9A%nEYqU!0lN4YcK9jPwkUpha61aS!kbV*Yc!%}-QUT2bqBRL= z4@|PQn5?{`p~uxHvVtU z(HIFtCo-t_&og^6^CHyw5J6Hsk?TN?MEn;!z>F(m9`SdsBVBUD-(^DDM4Igj< zo%qlJrVUB3IHPP#^d~s-m465(7aVg;EEa1q$7dXovkuorlpR8@#o)pD&?79;F<|Es;N<4&Mq$x$^!}vufUWgy6zODie9p7~om{WWceT#q|w78IK zR{|`|qO~omoB)>q6ZqM#GDw^66DL>gud6T!n-{u3w)-x0f%fH6i4m9(wZVtcuRMC*HB$IJ*Of;QTbD-CiFK7q0AGB}@fiL2 zebgO`K4)kX)%(gLqax;|U>K^tIR!ps`%(9Ch^hKs zo0mK!zgQCf6gY4)^>dZ}vl=x9aM!`Y^BawN?Zn?`UM$(Zb4KVP_tmTWX1tG&`iw8V zabnv^)U~{mB-hE+q|G5qsUu&#nmnY}DL*3Xa$+3woujPdYuFeGqE8#;qsm88#Wsa+ zgu+qVbw<&LD%W?v!WD<56Xs`;VUNl=B*q7$X&**&Dcbg9txZs}iLo}Si zjKD3(hf>mcF1R-z(sm&DQ_K_Tpc+n-%3abiQwV-Q zupS~mU^Bx;Pwb<|mIUmgLNEpPdcYWn&8oOl5T*~&#a^VNLlBT)E^5)BP)16-!lG^u z>6qOqRPoUx@&e&7h*3h|SZUW%6sTi2t_wQLOH|n}@*0oqVxGQ^_>guoK?IpW(r_Hj zWl`e1k-5fo!lD(?nscmr;cv`+`2rF;(?dEs@-iMVW)vi>s_@KVW!$?KBZo%<${t19 zXKz|^H}i-<^r9?oYFl_nA8&z)`(8?ir^3Vyv&np(6JVyD%gFU(=g literal 0 HcmV?d00001 diff --git a/src/Appwrite/Auth/OAuth2/Wordpress.php b/src/Appwrite/Auth/OAuth2/Wordpress.php new file mode 100644 index 0000000000..44fd99d4b8 --- /dev/null +++ b/src/Appwrite/Auth/OAuth2/Wordpress.php @@ -0,0 +1,133 @@ + $this->appID, + 'redirect_uri' => $this->callback, + 'response_type' => 'code', + 'scope' => $this->getScopes(), + 'state' => \json_encode($this->state) + ]); + } + + /** + * @param string $code + * + * @return string + */ + public function getAccessToken(string $code):string + { + $accessToken = $this->request( + 'POST', + 'https://public-api.wordpress.com/oauth2/token', + [], + \http_build_query([ + 'client_id' => $this->appID, + 'redirect_uri' => $this->callback, + 'client_secret' => $this->appSecret, + 'grant_type' => 'authorization_code', + 'code' => $code + ]) + ); + + $accessToken = \json_decode($accessToken, true); + + if (isset($accessToken['access_token'])) { + return $accessToken['access_token']; + } + + return ''; + } + + /** + * @param $accessToken + * + * @return string + */ + public function getUserID(string $accessToken):string + { + $user = $this->getUser($accessToken); + + if (isset($user['ID'])) { + return $user['ID']; + } + + return ''; + } + + /** + * @param $accessToken + * + * @return string + */ + public function getUserEmail(string $accessToken):string + { + $user = $this->getUser($accessToken); + + if (isset($user['email']) && $user['verified']) { + return $user['email']; + } + + return ''; + } + + /** + * @param $accessToken + * + * @return string + */ + public function getUserName(string $accessToken):string + { + $user = $this->getUser($accessToken); + + if (isset($user['username'])) { + return $user['username']; + } + + return ''; + } + + /** + * @param string $accessToken + * + * @return array + */ + protected function getUser(string $accessToken) + { + if (empty($this->user)) { + $this->user = \json_decode($this->request('GET', 'https://public-api.wordpress.com/rest/v1/me', ['Authorization: Bearer '.$accessToken]), true); + } + + return $this->user; + } +} From 9220eb6f5360f745442a53a46e8da5dd44a48e74 Mon Sep 17 00:00:00 2001 From: rsneh Date: Wed, 7 Oct 2020 19:07:05 +0300 Subject: [PATCH 028/133] Update Reference Material --- src/Appwrite/Auth/OAuth2/Wordpress.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/Appwrite/Auth/OAuth2/Wordpress.php b/src/Appwrite/Auth/OAuth2/Wordpress.php index 44fd99d4b8..32a79ec4d7 100644 --- a/src/Appwrite/Auth/OAuth2/Wordpress.php +++ b/src/Appwrite/Auth/OAuth2/Wordpress.php @@ -4,6 +4,9 @@ namespace Appwrite\Auth\OAuth2; use Appwrite\Auth\OAuth2; +// Reference Material +// https://developer.wordpress.com/docs/wpcc/ + class Wordpress extends OAuth2 { /** From 8b57c15fa45bbbdd787664eb5107f017f5eea9ef Mon Sep 17 00:00:00 2001 From: rsneh Date: Wed, 7 Oct 2020 19:16:27 +0300 Subject: [PATCH 029/133] Change Wordpress to WordPress --- app/config/providers.php | 2 +- src/Appwrite/Auth/OAuth2/{Wordpress.php => WordPress.php} | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) rename src/Appwrite/Auth/OAuth2/{Wordpress.php => WordPress.php} (98%) diff --git a/app/config/providers.php b/app/config/providers.php index b4ee253490..a377cae6f0 100644 --- a/app/config/providers.php +++ b/app/config/providers.php @@ -226,7 +226,7 @@ return [ // Ordered by ABC. 'mock' => true, ], 'wordpress' => [ - 'name' => 'Wordpress', + 'name' => 'WordPress', 'developers' => 'https://developer.wordpress.com/docs/oauth2/', 'icon' => 'icon-wordpress', 'enabled' => true, diff --git a/src/Appwrite/Auth/OAuth2/Wordpress.php b/src/Appwrite/Auth/OAuth2/WordPress.php similarity index 98% rename from src/Appwrite/Auth/OAuth2/Wordpress.php rename to src/Appwrite/Auth/OAuth2/WordPress.php index 32a79ec4d7..a83953405e 100644 --- a/src/Appwrite/Auth/OAuth2/Wordpress.php +++ b/src/Appwrite/Auth/OAuth2/WordPress.php @@ -7,7 +7,7 @@ use Appwrite\Auth\OAuth2; // Reference Material // https://developer.wordpress.com/docs/wpcc/ -class Wordpress extends OAuth2 +class WordPress extends OAuth2 { /** * @var array From 05c06be8c813c5dd210be6a4e9a62113efec0996 Mon Sep 17 00:00:00 2001 From: Karan Singh Bisht <69008866+KaranSinghBisht@users.noreply.github.com> Date: Thu, 8 Oct 2020 01:33:50 +0530 Subject: [PATCH 030/133] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index a3443e5d14..043fdddcd6 100644 --- a/README.md +++ b/README.md @@ -131,7 +131,7 @@ We truly ❤️ pull requests! If you wish to help, you can learn more about how ## Security -For security issues, kindly email us [security@appwrite.io](mailto:security@appwrite.io) instead of posting a public issue in GitHub. +For security issues, kindly email us at [security@appwrite.io](mailto:security@appwrite.io) instead of posting a public issue in GitHub. ## Follow Us From 857796fcb761432c7701b099e4ed04ef59afcf53 Mon Sep 17 00:00:00 2001 From: Karan Singh Bisht <69008866+KaranSinghBisht@users.noreply.github.com> Date: Thu, 8 Oct 2020 01:34:32 +0530 Subject: [PATCH 031/133] Update SECURITY.md --- SECURITY.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SECURITY.md b/SECURITY.md index a09be23628..e8bdef2da9 100644 --- a/SECURITY.md +++ b/SECURITY.md @@ -11,4 +11,4 @@ ## Reporting a Vulnerability -For security issues, kindly email us security@appwrite.io instead of posting a public issue in GitHub. +For security issues, kindly email us at security@appwrite.io instead of posting a public issue in GitHub. From 0aa6cefcb03e320b1a8884565bf5de0a2009e749 Mon Sep 17 00:00:00 2001 From: Karan Singh Bisht <69008866+KaranSinghBisht@users.noreply.github.com> Date: Thu, 8 Oct 2020 01:38:03 +0530 Subject: [PATCH 032/133] Fixed Grammatical error --- CHANGES.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGES.md b/CHANGES.md index 13e166c81f..2dc3db25a3 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -32,7 +32,7 @@ - Fixed update form labels and tooltips for Flutter Android apps - Fixed missing custom scopes param for OAuth2 session create API route - Fixed wrong JSON validation when creating and updating database documents -- Fixed bug where max file size was limited to max of 10MB +- Fixed bug where max file size was limited to a max of 10MB - Fixed bug preventing the deletion of the project logo - Fixed Bug when trying to overwrite OAuth cookie in the Flutter SDK - Fixed OAuth redirect when using the self-hosted instance default success URL ([#454](https://github.com/appwrite/appwrite/issues/454)) From ed9ceff7bfac9a3cc37e3ee1685eabfe96683dd1 Mon Sep 17 00:00:00 2001 From: Tatiana Ovchinnikova Date: Mon, 12 Oct 2020 00:35:47 +0200 Subject: [PATCH 033/133] Refactor templates for CZ locale Improve the translation to make it more readable and less confusing. --- .../locale/translations/templates/cz.email.auth.confirm.tpl | 4 ++-- .../translations/templates/cz.email.auth.invitation.tpl | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/config/locale/translations/templates/cz.email.auth.confirm.tpl b/app/config/locale/translations/templates/cz.email.auth.confirm.tpl index e72b357a48..9e5fab32cc 100644 --- a/app/config/locale/translations/templates/cz.email.auth.confirm.tpl +++ b/app/config/locale/translations/templates/cz.email.auth.confirm.tpl @@ -2,14 +2,14 @@ Ahoj {{name}},

- Kliknutím na tento odkaz ověřte svou e-mailovou adresu. + Klepnutím na tento odkaz ověřte svou e-mailovou adresu.

{{cta}}

Pokud jste nepožádali o ověření této adresy, můžete tuto zprávu ignorovat.

- dík, + Dík,
{{project}} tým

diff --git a/app/config/locale/translations/templates/cz.email.auth.invitation.tpl b/app/config/locale/translations/templates/cz.email.auth.invitation.tpl index d5353e71cf..0dbfa6570b 100644 --- a/app/config/locale/translations/templates/cz.email.auth.invitation.tpl +++ b/app/config/locale/translations/templates/cz.email.auth.invitation.tpl @@ -2,7 +2,7 @@ Ahoj,

- Tento e-mail vám byl zaslán, protože vás {{owner}} chtěl pozvat, abyste se stali členem týmu v týmu {{team}} v {{project}}. + Tento e-mail vám byl zaslán, protože vás {{owner}} chtěl pozvat, abyste se stali členem týmu {{team}} v {{project}}.

Klepnutím na tento odkaz se připojíte k týmu {{team}}: From 49f66f0bf5cdbe066be7e9f3d9ab718d5ae2147a Mon Sep 17 00:00:00 2001 From: Tatiana Ovchinnikova Date: Mon, 12 Oct 2020 00:55:21 +0200 Subject: [PATCH 034/133] Refactor templates for EN locale Improve the invitation template to make it more readable and less confusing. Fix the recovery template. --- .../translations/templates/en.email.auth.invitation.tpl | 4 ++-- .../locale/translations/templates/en.email.auth.recovery.tpl | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/config/locale/translations/templates/en.email.auth.invitation.tpl b/app/config/locale/translations/templates/en.email.auth.invitation.tpl index 70ea922c0c..f801a5d3c0 100644 --- a/app/config/locale/translations/templates/en.email.auth.invitation.tpl +++ b/app/config/locale/translations/templates/en.email.auth.invitation.tpl @@ -2,7 +2,7 @@ Hello,

- This mail was sent to you because {{owner}} wanted to invite you to become a team member at the {{team}} team over at {{project}}. + This mail was sent to you because {{owner}} wanted to invite you to become a member of the {{team}} team at {{project}}.

{{cta}}

@@ -11,4 +11,4 @@ Thanks,
{{project}} team -

\ No newline at end of file +

diff --git a/app/config/locale/translations/templates/en.email.auth.recovery.tpl b/app/config/locale/translations/templates/en.email.auth.recovery.tpl index a4a982f46f..57bdeb18a5 100644 --- a/app/config/locale/translations/templates/en.email.auth.recovery.tpl +++ b/app/config/locale/translations/templates/en.email.auth.recovery.tpl @@ -6,10 +6,10 @@

{{cta}}

- If you didn’t ask to verify this address, you can ignore this message. + If you didn’t ask to reset your password, you can ignore this message.

Thanks,
{{project}} team -

\ No newline at end of file +

From 9b9f9e6e55af930022d6b5660c884568288ab295 Mon Sep 17 00:00:00 2001 From: Burak Ozdemir Date: Mon, 12 Oct 2020 04:39:30 +0300 Subject: [PATCH 035/133] fix Czechia translations --- app/config/locales/af.countries.php | 4 ++-- app/config/locales/es.countries.php | 2 +- app/config/locales/fo.countries.php | 2 +- app/config/locales/fr.countries.php | 2 +- app/config/locales/hi.countries.php | 1 - app/config/locales/it.countries.php | 2 +- app/config/locales/sq.countries.php | 4 ++-- app/config/locales/tr.countries.php | 2 +- 8 files changed, 9 insertions(+), 10 deletions(-) diff --git a/app/config/locales/af.countries.php b/app/config/locales/af.countries.php index b3c4838f36..f5f7f47ac5 100644 --- a/app/config/locales/af.countries.php +++ b/app/config/locales/af.countries.php @@ -44,7 +44,7 @@ return [ 'CR' => 'Costa Rica', 'CU' => 'Kuba', 'CY' => 'Ciprus', - 'CZ' => 'Tsjeggiese Republiek', + 'CZ' => 'Tsjeggië', 'DE' => 'Duitsland', 'DJ' => 'Djiboeti', 'DM' => 'Dominica', @@ -195,4 +195,4 @@ return [ 'ZA' => 'Suid-Afrika', 'ZM' => 'Zambia', 'ZW' => 'Zimbabwe', -]; \ No newline at end of file +]; diff --git a/app/config/locales/es.countries.php b/app/config/locales/es.countries.php index 4479c27806..57f9c3c313 100644 --- a/app/config/locales/es.countries.php +++ b/app/config/locales/es.countries.php @@ -44,7 +44,7 @@ return [ 'CR' => 'Costa Rica', 'CU' => 'Cuba', 'CY' => 'Chipre', - 'CZ' => 'República Checa', + 'CZ' => 'Chequia', 'DE' => 'Alemania', 'DJ' => 'Yibuti', 'DM' => 'Dominica', diff --git a/app/config/locales/fo.countries.php b/app/config/locales/fo.countries.php index bc6aa77e8a..337d06b667 100644 --- a/app/config/locales/fo.countries.php +++ b/app/config/locales/fo.countries.php @@ -44,7 +44,7 @@ return [ 'CR' => 'Kosta Rika', 'CU' => 'Kuba', 'CY' => 'Kýpros', - 'CZ' => 'Kekkoslovakia', + 'CZ' => 'Kekkia', 'DE' => 'Týskland', 'DJ' => 'Djibouti', 'DM' => 'Dominika', diff --git a/app/config/locales/fr.countries.php b/app/config/locales/fr.countries.php index 28bff2bdde..02324e0634 100644 --- a/app/config/locales/fr.countries.php +++ b/app/config/locales/fr.countries.php @@ -44,7 +44,7 @@ return [ 'CR' => 'Costa Rica', 'CU' => 'Cuba', 'CY' => 'Chypre', - 'CZ' => 'République Tchèque', + 'CZ' => 'Tchéquie', 'DE' => 'Allemagne', 'DJ' => 'Djibouti', 'DM' => 'Dominique', diff --git a/app/config/locales/hi.countries.php b/app/config/locales/hi.countries.php index f9f40230a0..cb6cec9229 100644 --- a/app/config/locales/hi.countries.php +++ b/app/config/locales/hi.countries.php @@ -13,7 +13,6 @@ return [ 'AU' => 'ऑस्ट्रेलिया', 'AT' => 'ऑस्ट्रिया', 'AZ' => 'अजरबैजान', - 'BI' => 'बुरुंडी', 'BE' => 'बेल्जियम', 'BJ' => 'बेनिन', diff --git a/app/config/locales/it.countries.php b/app/config/locales/it.countries.php index ce4e56349d..45851f6fcc 100644 --- a/app/config/locales/it.countries.php +++ b/app/config/locales/it.countries.php @@ -44,7 +44,7 @@ return [ 'CR' => 'Costa Rica', 'CU' => 'Cuba', 'CY' => 'Cipro', - 'CZ' => 'Repubblica Ceca', + 'CZ' => 'Cechia', 'DE' => 'Germania', 'DJ' => 'Gibuti', 'DM' => 'Dominica', diff --git a/app/config/locales/sq.countries.php b/app/config/locales/sq.countries.php index e1744bf889..a8ef59ec06 100644 --- a/app/config/locales/sq.countries.php +++ b/app/config/locales/sq.countries.php @@ -44,7 +44,7 @@ return [ 'CR' => 'Kosta Rika', 'CU' => 'Kuba', 'CY' => 'Qipro', - 'CZ' => 'Republika Czecheke', + 'CZ' => 'Çekia', 'DE' => 'Gjermani', 'DJ' => 'Djibouti', 'DM' => 'Dominica', @@ -195,4 +195,4 @@ return [ 'ZA' => 'Afrika e Jugut', 'ZM' => 'Zambia', 'ZW' => 'Zimbabve', -]; \ No newline at end of file +]; diff --git a/app/config/locales/tr.countries.php b/app/config/locales/tr.countries.php index 5fd899e911..bb87d8e480 100644 --- a/app/config/locales/tr.countries.php +++ b/app/config/locales/tr.countries.php @@ -44,7 +44,7 @@ return [ 'CR' => 'Kosta Rika', 'CU' => 'Küba', 'CY' => 'Güney Kıbrıs Rum Kesimi', - 'CZ' => 'Çek Cumhuriyeti', + 'CZ' => 'Çekya', 'DE' => 'Almanya', 'DJ' => 'Cibuti', 'DM' => 'Dominika', From 52d74917a994ae85dc2e4c1015b84079a26d2a3f Mon Sep 17 00:00:00 2001 From: jakaya123 <34449936+jakaya123@users.noreply.github.com> Date: Mon, 12 Oct 2020 09:21:45 +0530 Subject: [PATCH 036/133] Updated README.md Done a simple alignment change and I have included the link for appwrite's official blog. --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 79e683d17a..3eb96ad9f3 100644 --- a/README.md +++ b/README.md @@ -14,7 +14,7 @@ [![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) -Appwrite is an end-to-end backend server for Web, Mobile, Native, or Backend apps packaged as a set of Docker microservices. Appwrite abstracts the complexity and repetitiveness required to build a modern backend API from scratch and allows you to build secure apps faster. +Appwrite is an end-to-end backend server for Web, Mobile, Native, or Backend apps packaged as a set of Docker microservices. Appwrite abstracts the complexity and repetitiveness required to build a modern backend API from scratch and allows you to build secure apps faster. Using Appwrite, you can easily integrate your app with user authentication & multiple sign-in methods, a database for storing and querying users and team data, storage and file management, image manipulation, schedule CRON tasks, and [more services](https://appwrite.io/docs). @@ -140,7 +140,7 @@ For security issues, kindly email us at [security@appwrite.io](mailto:security@a ## Follow Us -Join our growing community around the world! Follow us on [Twitter](https://twitter.com/appwrite_io), [Facebook Page](https://www.facebook.com/appwrite.io), [Facebook Group](https://www.facebook.com/groups/appwrite.developers/) or join our live [Discord server](https://discord.gg/GSeTUeA) for more help, ideas, and discussions. +Join our growing community around the world! See our official [Blog](https://medium.com/appwrite-io). Follow us on [Twitter](https://twitter.com/appwrite_io), [Facebook Page](https://www.facebook.com/appwrite.io), [Facebook Group](https://www.facebook.com/groups/appwrite.developers/) or join our live [Discord server](https://discord.gg/GSeTUeA) for more help, ideas, and discussions. ## License From 41a555fef82e4437d540c227d11c51ac0bc7aff1 Mon Sep 17 00:00:00 2001 From: "Andhika H. Santoso" Date: Mon, 12 Oct 2020 16:34:17 +0700 Subject: [PATCH 037/133] Fix Indonesian translation for several countries. --- app/config/locale/translations/id.countries.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/app/config/locale/translations/id.countries.php b/app/config/locale/translations/id.countries.php index 3f625140e3..2bbee1ecb9 100644 --- a/app/config/locale/translations/id.countries.php +++ b/app/config/locale/translations/id.countries.php @@ -1,7 +1,7 @@ 'Afganistan', + 'AF' => 'Afghanistan', 'AO' => 'Angola', 'AL' => 'Albania', 'AD' => 'Andorra', @@ -13,7 +13,7 @@ return [ 'AT' => 'Austria', 'AZ' => 'Azerbaijan', 'BI' => 'Burundi', - 'BE' => 'Belgium', + 'BE' => 'Belgia', 'BJ' => 'Benin', 'BF' => 'Burkina Faso', 'BD' => 'Bangladesh', @@ -38,13 +38,13 @@ return [ 'CM' => 'Kamerun', 'CD' => 'DR Kongo', 'CG' => 'Republik Kongo', - 'CO' => 'Kolumbia', + 'CO' => 'Kolombia', 'KM' => 'Komoro', 'CV' => 'Tanjung Verde', 'CR' => 'Kosta Rika', 'CU' => 'Kuba', 'CY' => 'Siprus', - 'CZ' => 'Czechia', + 'CZ' => 'Ceko', 'DE' => 'Jerman', 'DJ' => 'Djibouti', 'DM' => 'Dominika', @@ -165,11 +165,11 @@ return [ 'SK' => 'Slovakia', 'SI' => 'Slovenia', 'SE' => 'Swedia', - 'SZ' => 'Swaziland', + 'SZ' => 'Eswatini', 'SC' => 'Seychelles', 'SY' => 'Suriah', 'TD' => 'Chad', - 'TG' => 'Untuk pergi', + 'TG' => 'Togo', 'TH' => 'Thailand', 'TJ' => 'Tajikistan', 'TM' => 'Turkmenistan', From b8098c7d1ea0b7d55bff5cecf5b2ed383be11d27 Mon Sep 17 00:00:00 2001 From: Prasannjit Mohapatra Date: Mon, 12 Oct 2020 22:26:04 +0530 Subject: [PATCH 038/133] Added od for odia --- app/config/locale/codes.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/app/config/locale/codes.php b/app/config/locale/codes.php index d477f34bb4..02057440ed 100644 --- a/app/config/locale/codes.php +++ b/app/config/locale/codes.php @@ -31,11 +31,12 @@ return [ 'ko', // Korean 'lt', // Lithuanian 'ml', // Malayalam - 'mr', //Marathi + 'mr', // Marathi 'ms', // Malay 'nl', // Dutch 'no', // Norwegian - 'np', //Nepali + 'np', // Nepali + 'od', // Odia 'ph', // Filipino 'pl', // Polish 'pt-br', // Portuguese - Brazil From 148026f57a049efd46aceff6585288146c2ebcc1 Mon Sep 17 00:00:00 2001 From: Prasannjit Mohapatra Date: Mon, 12 Oct 2020 22:33:47 +0530 Subject: [PATCH 039/133] updated od --- app/init.php | 1 + 1 file changed, 1 insertion(+) diff --git a/app/init.php b/app/init.php index 5188abc995..6e924fdec6 100644 --- a/app/init.php +++ b/app/init.php @@ -257,6 +257,7 @@ Locale::setLanguage('ms', include __DIR__.'/config/locale/translations/ms.php'); Locale::setLanguage('nl', include __DIR__.'/config/locale/translations/nl.php'); Locale::setLanguage('no', include __DIR__.'/config/locale/translations/no.php'); Locale::setLanguage('np', include __DIR__.'/config/locale/translations/np.php'); +Locale::setLanguage('od', include __DIR__.'/config/locale/translations/od.php'); Locale::setLanguage('ph', include __DIR__.'/config/locale/translations/ph.php'); Locale::setLanguage('pl', include __DIR__.'/config/locale/translations/pl.php'); Locale::setLanguage('pt-br', include __DIR__.'/config/locale/translations/pt-br.php'); From 6bdd4385d8c446d90e385994d23728fe6de4f6bd Mon Sep 17 00:00:00 2001 From: "Andhika H. Santoso" Date: Tue, 13 Oct 2020 10:57:35 +0700 Subject: [PATCH 040/133] Revert back Afghanistan to Afganistan, also fix translation for Brazil. --- app/config/locale/translations/id.countries.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/config/locale/translations/id.countries.php b/app/config/locale/translations/id.countries.php index 2bbee1ecb9..908082c219 100644 --- a/app/config/locale/translations/id.countries.php +++ b/app/config/locale/translations/id.countries.php @@ -1,7 +1,7 @@ 'Afghanistan', + 'AF' => 'Afganistan', 'AO' => 'Angola', 'AL' => 'Albania', 'AD' => 'Andorra', @@ -24,7 +24,7 @@ return [ 'BY' => 'Belarus', 'BZ' => 'Belize', 'BO' => 'Bolivia', - 'BR' => 'Brazil', + 'BR' => 'Brasil', 'BB' => 'Barbados', 'BN' => 'Brunei', 'BT' => 'Bhutan', From 79d5eb40f74264b985ddf068ab4fc8cb5e416e3c Mon Sep 17 00:00:00 2001 From: "Andhika H. Santoso" Date: Tue, 13 Oct 2020 11:06:32 +0700 Subject: [PATCH 041/133] Fix translation for Jordan, Kirgizstan, Marshall Island and Solomon Island. --- app/config/locale/translations/id.countries.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/config/locale/translations/id.countries.php b/app/config/locale/translations/id.countries.php index 908082c219..f877be39a1 100644 --- a/app/config/locale/translations/id.countries.php +++ b/app/config/locale/translations/id.countries.php @@ -86,11 +86,11 @@ return [ 'IL' => 'Israel', 'IT' => 'Italia', 'JM' => 'Jamaika', - 'JO' => 'Jordan', + 'JO' => 'Yordania', 'JP' => 'Jepang', 'KZ' => 'Kazakhstan', 'KE' => 'Kenya', - 'KG' => 'Kirgistan', + 'KG' => 'Kirgizstan', 'KH' => 'Kamboja', 'KI' => 'Kiribati', 'KN' => 'Saint Kitts dan Nevis', @@ -113,7 +113,7 @@ return [ 'MG' => 'Madagaskar', 'MV' => 'Maladewa', 'MX' => 'Meksiko', - 'MH' => 'Pulau Marshall', + 'MH' => 'Kepulauan Marshall', 'MK' => 'Makedonia', 'ML' => 'Mali', 'MT' => 'Malta', @@ -153,7 +153,7 @@ return [ 'SD' => 'Sudan', 'SN' => 'Senegal', 'SG' => 'Singapura', - 'SB' => 'Pulau Solomon', + 'SB' => 'Kepulauan Solomon', 'SL' => 'Sierra Leone', 'SV' => 'El Salvador', 'SM' => 'San Marino', From 240e72241765fb4870fac557d49308e9c492036c Mon Sep 17 00:00:00 2001 From: Navneet Singh Negi Date: Tue, 13 Oct 2020 12:23:18 +0530 Subject: [PATCH 042/133] 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 84738367be..fd16cefa64 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 b6bdd76ee3..8a8f95185b 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 4d56ac3f58..25832b36f6 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 55544dd950a20d28b834e224b769caaa7ab821b4 Mon Sep 17 00:00:00 2001 From: Prasannjit Mohapatra Date: Tue, 13 Oct 2020 12:36:43 +0530 Subject: [PATCH 043/133] Create od.continents.php --- app/config/locale/translations/od.continents.php | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 app/config/locale/translations/od.continents.php diff --git a/app/config/locale/translations/od.continents.php b/app/config/locale/translations/od.continents.php new file mode 100644 index 0000000000..d89addeefe --- /dev/null +++ b/app/config/locale/translations/od.continents.php @@ -0,0 +1,11 @@ + 'ଆଫ୍ରିକା', + 'AN' => 'ଆଣ୍ଟାର୍କଟିକା', + 'AS' => 'ଏସିଆ', + 'EU' => 'ଇଉରୋପ', + 'NA' => 'ନର୍ଥ ଆମେରିକା', + 'OC' => 'ଓସାନିଆ', + 'SA' => 'ସାଉଥ ଆମେରିକା', +]; From 363206077df8674d858f1868a6cdf815beb8305d Mon Sep 17 00:00:00 2001 From: Prasannjit Mohapatra Date: Tue, 13 Oct 2020 12:37:34 +0530 Subject: [PATCH 044/133] Create od.countries.php --- .../locale/translations/od.countries.php | 198 ++++++++++++++++++ 1 file changed, 198 insertions(+) create mode 100644 app/config/locale/translations/od.countries.php diff --git a/app/config/locale/translations/od.countries.php b/app/config/locale/translations/od.countries.php new file mode 100644 index 0000000000..ca24130b4d --- /dev/null +++ b/app/config/locale/translations/od.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' => 'କେପ୍ ଭର୍ଡେ', + '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' => 'ଜିମ୍ବାୱେ', +]; From 0e9ff0754765f8b4e107c0cd90a3654002c1c454 Mon Sep 17 00:00:00 2001 From: Prasannjit Mohapatra Date: Tue, 13 Oct 2020 12:38:52 +0530 Subject: [PATCH 045/133] Create od.php --- app/config/locale/translations/od.php | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 app/config/locale/translations/od.php diff --git a/app/config/locale/translations/od.php b/app/config/locale/translations/od.php new file mode 100644 index 0000000000..b775bd90c8 --- /dev/null +++ b/app/config/locale/translations/od.php @@ -0,0 +1,21 @@ + '"ବୁଦ୍ଧିମାନ ହବାର କଲା ଏମିତି ଏକ କଲା ଯାହା ଜଣାଇଥାଏ କୋଉ ଜିନ୍ସ କୁ ଅଣଦେଖା କରିବା ଉଚିତ |"', // This is the line printed in the homepage and console 'view-source' + 'settings.locale' => 'od', + '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 ଟିମ at %s', + 'account.emails.invitation.body' => 'en.email.auth.invitation.tpl', + + 'locale.country.unknown' => 'ଅଜ୍ଞାତ', + + 'countries' => include 'od.countries.php', + 'continents' => include 'od.continents.php', +]; From 12f5ca32c20b7f32f16288ccb3417ea8a87ea838 Mon Sep 17 00:00:00 2001 From: Prasannjit Mohapatra Date: Tue, 13 Oct 2020 12:39:56 +0530 Subject: [PATCH 046/133] Create od.email.auth.confirm.tpl --- .../templates/od.email.auth.confirm.tpl | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 app/config/locale/translations/templates/od.email.auth.confirm.tpl diff --git a/app/config/locale/translations/templates/od.email.auth.confirm.tpl b/app/config/locale/translations/templates/od.email.auth.confirm.tpl new file mode 100644 index 0000000000..9453a2a35c --- /dev/null +++ b/app/config/locale/translations/templates/od.email.auth.confirm.tpl @@ -0,0 +1,16 @@ +

+ + ନମସ୍କାର {{name}}, +

+

+ ଆପଣଙ୍କର ଇମେଲ୍ ଠିକଣା ଯାଞ୍ଚ କରିବାକୁ ଏହି ଲିଙ୍କ୍ ଅନୁସରଣ କରନ୍ତୁ| +

+{{cta}} +

+ ଯଦି ଆପଣ ଏହି ଠିକଣା ଯାଞ୍ଚ କରିବାକୁ କହି ନାହାଁନ୍ତି, ଆପଣ ଏହି ସନ୍ଦେଶକୁ ଉପେକ୍ଷା କରିପାରିବେ| +

+

+ ଧନ୍ୟବାଦ, +
+ {{project}} ଟିମ +

From 63b9bac0353a4ea34241a24a63e1a958531480df Mon Sep 17 00:00:00 2001 From: Prasannjit Mohapatra Date: Tue, 13 Oct 2020 12:41:00 +0530 Subject: [PATCH 047/133] Create od.email.auth.invitation.tpl --- .../templates/od.email.auth.invitation.tpl | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 app/config/locale/translations/templates/od.email.auth.invitation.tpl diff --git a/app/config/locale/translations/templates/od.email.auth.invitation.tpl b/app/config/locale/translations/templates/od.email.auth.invitation.tpl new file mode 100644 index 0000000000..ea1bf636c4 --- /dev/null +++ b/app/config/locale/translations/templates/od.email.auth.invitation.tpl @@ -0,0 +1,14 @@ +

+ ନମସ୍କାର, +

+

+ ଏହି ମେଲ୍ ଆପଣଙ୍କୁ ପଠାଯାଇଥିଲା କାରଣ {{owner}} ଆପଣଙ୍କୁ {{project}} ପାଇଁ {{team}} ଦଳରେ ଦଳର ସଦସ୍ୟ ହେବାକୁ ଆମନ୍ତ୍ରିତ ହେବାକୁ ଚାହୁଁଥିଲେ| +

+{{cta}} +

+ ଯଦି ଆପଣ ଆଗ୍ରହୀ ନୁହଁନ୍ତି, ଆପଣ ଏହି ସନ୍ଦେଶକୁ ଅଣଦେଖା କରିପାରିବେ |

+

+ ଧନ୍ୟବାଦ, +
+ {{project}} ଟିମ +

From f9f18aa1646741499a07ef56d8e3234917de6664 Mon Sep 17 00:00:00 2001 From: Prasannjit Mohapatra Date: Tue, 13 Oct 2020 12:41:52 +0530 Subject: [PATCH 048/133] Create od.email.auth.recovery.tpl --- .../templates/od.email.auth.recovery.tpl | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 app/config/locale/translations/templates/od.email.auth.recovery.tpl diff --git a/app/config/locale/translations/templates/od.email.auth.recovery.tpl b/app/config/locale/translations/templates/od.email.auth.recovery.tpl new file mode 100644 index 0000000000..9a20751205 --- /dev/null +++ b/app/config/locale/translations/templates/od.email.auth.recovery.tpl @@ -0,0 +1,15 @@ +

+ ନମସ୍କାର {{name}}, +

+

+ {{project}} ପାସୱାର୍ଡ ରିସେଟ କରିବାକୁ ଏହି ଲିଙ୍କ୍ ଉପରେ କ୍ଲିକ୍ କରନ୍ତୁ | +

+{{cta}} +

+ ଯଦି ଆପଣ ଏହି ଠିକଣା ଯାଞ୍ଚ କରିବାକୁ କହି ନାହାଁନ୍ତି, ଆପଣ ଏହି ସନ୍ଦେଶକୁ ଉପେକ୍ଷା କରିପାରିବେ| +

+

+ ଧନ୍ୟବାଦ, +
+ {{project}} ଟିମ +

From 4238ccd881f3c1afcdcba15cfe493d9e62ec2e5f Mon Sep 17 00:00:00 2001 From: navneetsn18 Date: Tue, 13 Oct 2020 12:44:25 +0530 Subject: [PATCH 049/133] 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 9055993f59f0e467a8a9f519a110a5a6df3987d4 Mon Sep 17 00:00:00 2001 From: Prasannjit Mohapatra Date: Tue, 13 Oct 2020 12:45:27 +0530 Subject: [PATCH 050/133] Update od.php --- app/config/locale/translations/od.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/config/locale/translations/od.php b/app/config/locale/translations/od.php index b775bd90c8..6b6973da25 100644 --- a/app/config/locale/translations/od.php +++ b/app/config/locale/translations/od.php @@ -1,18 +1,18 @@ '"ବୁଦ୍ଧିମାନ ହବାର କଲା ଏମିତି ଏକ କଲା ଯାହା ଜଣାଇଥାଏ କୋଉ ଜିନ୍ସ କୁ ଅଣଦେଖା କରିବା ଉଚିତ |"', // This is the line printed in the homepage and console 'view-source' + 'settings.inspire' => '"ଜ୍ଞାନୀ ହେବାର କଳା ହେଉଛି କ’ଣ ଅଣଦେଖା କରାଯିବ ଜାଣିବାର କଳା |"', // This is the line printed in the homepage and console 'view-source' 'settings.locale' => 'od', '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' => 'od.email.auth.confirm.tpl', 'account.emails.recovery.title' => 'ପାସୱାର୍ଡ ରିସେଟ', - 'account.emails.recovery.body' => 'en.email.auth.recovery.tpl', + 'account.emails.recovery.body' => 'od.email.auth.recovery.tpl', 'account.emails.invitation.title' => 'ଈଂଭିଟେସନ %s ଟିମ at %s', - 'account.emails.invitation.body' => 'en.email.auth.invitation.tpl', + 'account.emails.invitation.body' => 'od.email.auth.invitation.tpl', 'locale.country.unknown' => 'ଅଜ୍ଞାତ', From f8dc58bb6f06e8a72d32837d2ebd4b0e9daa7444 Mon Sep 17 00:00:00 2001 From: Eldad Fux Date: Tue, 13 Oct 2020 11:51:41 +0300 Subject: [PATCH 051/133] Optimize build --- .travis.yml | 2 ++ Dockerfile | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index c909ec4332..47c09fbb5b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,6 +3,8 @@ arch: os: linux +language: minimal + notifications: email: - team@appwrite.io diff --git a/Dockerfile b/Dockerfile index 1a2798c450..63862cfbb4 100755 --- a/Dockerfile +++ b/Dockerfile @@ -112,7 +112,8 @@ RUN \ && pecl install imagick yaml \ && docker-php-ext-enable imagick yaml \ && docker-php-ext-install sockets opcache pdo_mysql \ - && apk del .deps + && apk del .deps \ + && rm -rf /var/cache/apk/* WORKDIR /usr/src/code From 4547a1e3c6c2f813ddebc0cd7851db57c3150c4e Mon Sep 17 00:00:00 2001 From: Alessio Marinelli Date: Wed, 14 Oct 2020 14:12:50 +0200 Subject: [PATCH 052/133] Update it.countries.php Added missing translation for `Jordan` -> `Giordania` --- app/config/locale/translations/it.countries.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/config/locale/translations/it.countries.php b/app/config/locale/translations/it.countries.php index ce4e56349d..dc19dfbff3 100644 --- a/app/config/locale/translations/it.countries.php +++ b/app/config/locale/translations/it.countries.php @@ -86,7 +86,7 @@ return [ 'IL' => 'Israele', 'IT' => 'Italia', 'JM' => 'Giamaica', - 'JO' => 'Jordan', + 'JO' => 'Giordania', 'JP' => 'Giappone', 'KZ' => 'Kazakistan', 'KE' => 'Kenya', From b7fe52ad54fe55d14442ff57e67c1f4bb1045a44 Mon Sep 17 00:00:00 2001 From: Eldad Fux Date: Thu, 15 Oct 2020 00:11:12 +0300 Subject: [PATCH 053/133] Updated tests --- tests/e2e/Client.php | 2 +- tests/e2e/Services/Account/AccountBase.php | 68 ++++++------ .../e2e/Services/Functions/FunctionsBase.php | 2 +- .../Functions/FunctionsCustomServerTest.php | 6 +- .../Projects/ProjectsConsoleClientTest.php | 102 +++++++++--------- tests/e2e/Services/Teams/TeamsBase.php | 2 +- tests/e2e/Services/Teams/TeamsBaseClient.php | 18 ++-- tests/e2e/Services/Teams/TeamsBaseServer.php | 6 +- 8 files changed, 103 insertions(+), 103 deletions(-) diff --git a/tests/e2e/Client.php b/tests/e2e/Client.php index 5a84716b52..e9a47c7350 100644 --- a/tests/e2e/Client.php +++ b/tests/e2e/Client.php @@ -211,7 +211,7 @@ class Client } $responseBody = curl_exec($ch); - $responseType = (isset($responseHeaders['content-type'])) ? $responseHeaders['content-type'] : ''; + $responseType = $responseHeaders['content-type'] ?? ''; $responseStatus = curl_getinfo($ch, CURLINFO_HTTP_CODE); switch (substr($responseType, 0, strpos($responseType, ';'))) { diff --git a/tests/e2e/Services/Account/AccountBase.php b/tests/e2e/Services/Account/AccountBase.php index 4e95148a65..d070ed3e7f 100644 --- a/tests/e2e/Services/Account/AccountBase.php +++ b/tests/e2e/Services/Account/AccountBase.php @@ -65,8 +65,8 @@ trait AccountBase public function testCreateAccountSession($data):array { sleep(10); - $email = (isset($data['email'])) ? $data['email'] : ''; - $password = (isset($data['password'])) ? $data['password'] : ''; + $email = $data['email'] ?? ''; + $password = $data['password'] ?? ''; /** * Test for SUCCESS @@ -132,9 +132,9 @@ trait AccountBase */ public function testGetAccount($data):array { - $email = (isset($data['email'])) ? $data['email'] : ''; - $name = (isset($data['name'])) ? $data['name'] : ''; - $session = (isset($data['session'])) ? $data['session'] : ''; + $email = $data['email'] ?? ''; + $name = $data['name'] ?? ''; + $session = $data['session'] ?? ''; /** * Test for SUCCESS @@ -183,7 +183,7 @@ trait AccountBase */ public function testGetAccountPrefs($data):array { - $session = (isset($data['session'])) ? $data['session'] : ''; + $session = $data['session'] ?? ''; /** * Test for SUCCESS @@ -219,8 +219,8 @@ trait AccountBase */ public function testGetAccountSessions($data):array { - $session = (isset($data['session'])) ? $data['session'] : ''; - $sessionId = (isset($data['sessionId'])) ? $data['sessionId'] : ''; + $session = $data['session'] ?? ''; + $sessionId = $data['sessionId'] ?? ''; /** * Test for SUCCESS @@ -281,7 +281,7 @@ trait AccountBase public function testGetAccountLogs($data):array { sleep(10); - $session = (isset($data['session'])) ? $data['session'] : ''; + $session = $data['session'] ?? ''; /** * Test for SUCCESS @@ -369,8 +369,8 @@ trait AccountBase */ public function testUpdateAccountName($data):array { - $email = (isset($data['email'])) ? $data['email'] : ''; - $session = (isset($data['session'])) ? $data['session'] : ''; + $email = $data['email'] ?? ''; + $session = $data['session'] ?? ''; $newName = 'New Name'; /** @@ -436,9 +436,9 @@ trait AccountBase */ public function testUpdateAccountPassword($data):array { - $email = (isset($data['email'])) ? $data['email'] : ''; - $password = (isset($data['password'])) ? $data['password'] : ''; - $session = (isset($data['session'])) ? $data['session'] : ''; + $email = $data['email'] ?? ''; + $password = $data['password'] ?? ''; + $session = $data['session'] ?? ''; /** * Test for SUCCESS @@ -505,7 +505,7 @@ trait AccountBase public function testUpdateAccountEmail($data):array { $newEmail = uniqid().'new@localhost.test'; - $session = (isset($data['session'])) ? $data['session'] : ''; + $session = $data['session'] ?? ''; /** * Test for SUCCESS @@ -561,7 +561,7 @@ trait AccountBase public function testUpdateAccountPrefs($data):array { $newEmail = uniqid().'new@localhost.test'; - $session = (isset($data['session'])) ? $data['session'] : ''; + $session = $data['session'] ?? ''; /** * Test for SUCCESS @@ -638,9 +638,9 @@ trait AccountBase */ public function testCreateAccountVerification($data):array { - $email = (isset($data['email'])) ? $data['email'] : ''; - $name = (isset($data['name'])) ? $data['name'] : ''; - $session = (isset($data['session'])) ? $data['session'] : ''; + $email = $data['email'] ?? ''; + $name = $data['name'] ?? ''; + $session = $data['session'] ?? ''; /** * Test for SUCCESS @@ -703,9 +703,9 @@ trait AccountBase */ public function testUpdateAccountVerification($data):array { - $id = (isset($data['id'])) ? $data['id'] : ''; - $session = (isset($data['session'])) ? $data['session'] : ''; - $verification = (isset($data['verification'])) ? $data['verification'] : ''; + $id = $data['id'] ?? ''; + $session = $data['session'] ?? ''; + $verification = $data['verification'] ?? ''; /** * Test for SUCCESS @@ -757,9 +757,9 @@ trait AccountBase */ public function testDeleteAccountSession($data):array { - $email = (isset($data['email'])) ? $data['email'] : ''; - $password = (isset($data['password'])) ? $data['password'] : ''; - $session = (isset($data['session'])) ? $data['session'] : ''; + $email = $data['email'] ?? ''; + $password = $data['password'] ?? ''; + $session = $data['session'] ?? ''; /** * Test for SUCCESS @@ -825,8 +825,8 @@ trait AccountBase */ public function testDeleteAccountSessionCurrent($data):array { - $email = (isset($data['email'])) ? $data['email'] : ''; - $password = (isset($data['password'])) ? $data['password'] : ''; + $email = $data['email'] ?? ''; + $password = $data['password'] ?? ''; /** * Test for SUCCESS @@ -882,7 +882,7 @@ trait AccountBase */ public function testDeleteAccountSessions($data):array { - $session = (isset($data['session'])) ? $data['session'] : ''; + $session = $data['session'] ?? ''; /** * Test for SUCCESS @@ -910,8 +910,8 @@ trait AccountBase /** * Create new fallback session */ - $email = (isset($data['email'])) ? $data['email'] : ''; - $password = (isset($data['password'])) ? $data['password'] : ''; + $email = $data['email'] ?? ''; + $password = $data['password'] ?? ''; $response = $this->client->call(Client::METHOD_POST, '/account/sessions', array_merge([ 'origin' => 'http://localhost', @@ -932,8 +932,8 @@ trait AccountBase */ public function testCreateAccountRecovery($data):array { - $email = (isset($data['email'])) ? $data['email'] : ''; - $name = (isset($data['name'])) ? $data['name'] : ''; + $email = $data['email'] ?? ''; + $name = $data['name'] ?? ''; /** * Test for SUCCESS @@ -1006,8 +1006,8 @@ trait AccountBase */ public function testUpdateAccountRecovery($data):array { - $id = (isset($data['id'])) ? $data['id'] : ''; - $recovery = (isset($data['recovery'])) ? $data['recovery'] : ''; + $id = $data['id'] ?? ''; + $recovery = $data['recovery'] ?? ''; $newPassowrd = 'test-recovery'; /** diff --git a/tests/e2e/Services/Functions/FunctionsBase.php b/tests/e2e/Services/Functions/FunctionsBase.php index 80ee47c72a..a167b3763a 100644 --- a/tests/e2e/Services/Functions/FunctionsBase.php +++ b/tests/e2e/Services/Functions/FunctionsBase.php @@ -13,7 +13,7 @@ trait FunctionsBase // */ // public function testGetTeam($data):array // { - // $id = (isset($data['teamUid'])) ? $data['teamUid'] : ''; + // $id = $data['teamUid'] ?? ''; // /** // * Test for SUCCESS diff --git a/tests/e2e/Services/Functions/FunctionsCustomServerTest.php b/tests/e2e/Services/Functions/FunctionsCustomServerTest.php index 7f0441a88d..9aac863039 100644 --- a/tests/e2e/Services/Functions/FunctionsCustomServerTest.php +++ b/tests/e2e/Services/Functions/FunctionsCustomServerTest.php @@ -38,7 +38,7 @@ class FunctionsConsoleServerTest extends Scope 'timeout' => 10, ]); - $functionId = (isset($response1['body']['$id'])) ? $response1['body']['$id'] : ''; + $functionId = $response1['body']['$id'] ?? ''; $this->assertEquals(201, $response1['headers']['status-code']); $this->assertNotEmpty($response1['body']['$id']); @@ -186,7 +186,7 @@ class FunctionsConsoleServerTest extends Scope 'code' => new CURLFile(realpath(__DIR__ . '/../../../resources/functions/php-fx.tar.gz'), 'application/x-gzip', 'php-fx.tar.gz'), ]); - $tagId = (isset($tag['body']['$id'])) ? $tag['body']['$id'] : ''; + $tagId = $tag['body']['$id'] ?? ''; $this->assertEquals(201, $tag['headers']['status-code']); $this->assertNotEmpty($tag['body']['$id']); @@ -296,7 +296,7 @@ class FunctionsConsoleServerTest extends Scope 'async' => 1, ]); - $executionId = (isset($execution['body']['$id'])) ? $execution['body']['$id'] : ''; + $executionId = $execution['body']['$id'] ?? ''; $this->assertEquals(201, $execution['headers']['status-code']); $this->assertNotEmpty($execution['body']['$id']); diff --git a/tests/e2e/Services/Projects/ProjectsConsoleClientTest.php b/tests/e2e/Services/Projects/ProjectsConsoleClientTest.php index 7e4e6c1e41..ac3ff87240 100644 --- a/tests/e2e/Services/Projects/ProjectsConsoleClientTest.php +++ b/tests/e2e/Services/Projects/ProjectsConsoleClientTest.php @@ -79,7 +79,7 @@ class ProjectsConsoleClientTest extends Scope */ public function testListProject($data):array { - $id = (isset($data['projectId'])) ? $data['projectId'] : ''; + $id = $data['projectId'] ?? ''; /** * Test for SUCCESS @@ -106,7 +106,7 @@ class ProjectsConsoleClientTest extends Scope */ public function testGetProject($data):array { - $id = (isset($data['projectId'])) ? $data['projectId'] : ''; + $id = $data['projectId'] ?? ''; /** * Test for SUCCESS @@ -147,7 +147,7 @@ class ProjectsConsoleClientTest extends Scope */ public function testGetProjectUsage($data):array { - $id = (isset($data['projectId'])) ? $data['projectId'] : ''; + $id = $data['projectId'] ?? ''; /** * Test for SUCCESS @@ -206,7 +206,7 @@ class ProjectsConsoleClientTest extends Scope */ public function testUpdateProject($data):array { - $id = (isset($data['projectId'])) ? $data['projectId'] : ''; + $id = $data['projectId'] ?? ''; /** * Test for SUCCESS @@ -249,7 +249,7 @@ class ProjectsConsoleClientTest extends Scope */ public function testUpdateProjectOAuth($data):array { - $id = (isset($data['projectId'])) ? $data['projectId'] : ''; + $id = $data['projectId'] ?? ''; $providers = require('app/config/providers.php'); /** @@ -307,7 +307,7 @@ class ProjectsConsoleClientTest extends Scope */ public function testCreateProjectWebhook($data): array { - $id = (isset($data['projectId'])) ? $data['projectId'] : ''; + $id = $data['projectId'] ?? ''; $response = $this->client->call(Client::METHOD_POST, '/projects/'.$id.'/webhooks', array_merge([ 'content-type' => 'application/json', @@ -358,7 +358,7 @@ class ProjectsConsoleClientTest extends Scope */ public function testListProjectWebhook($data): array { - $id = (isset($data['projectId'])) ? $data['projectId'] : ''; + $id = $data['projectId'] ?? ''; $response = $this->client->call(Client::METHOD_GET, '/projects/'.$id.'/webhooks', array_merge([ 'content-type' => 'application/json', @@ -380,8 +380,8 @@ class ProjectsConsoleClientTest extends Scope */ public function testGetProjectWebhook($data): array { - $id = (isset($data['projectId'])) ? $data['projectId'] : ''; - $webhookId = (isset($data['webhookId'])) ? $data['webhookId'] : ''; + $id = $data['projectId'] ?? ''; + $webhookId = $data['webhookId'] ?? ''; $response = $this->client->call(Client::METHOD_GET, '/projects/'.$id.'/webhooks/'.$webhookId, array_merge([ 'content-type' => 'application/json', @@ -416,8 +416,8 @@ class ProjectsConsoleClientTest extends Scope */ public function testUpdateProjectWebhook($data): array { - $id = (isset($data['projectId'])) ? $data['projectId'] : ''; - $webhookId = (isset($data['webhookId'])) ? $data['webhookId'] : ''; + $id = $data['projectId'] ?? ''; + $webhookId = $data['webhookId'] ?? ''; $response = $this->client->call(Client::METHOD_PUT, '/projects/'.$id.'/webhooks/'.$webhookId, array_merge([ 'content-type' => 'application/json', @@ -503,8 +503,8 @@ class ProjectsConsoleClientTest extends Scope */ public function testDeleteProjectWebhook($data): array { - $id = (isset($data['projectId'])) ? $data['projectId'] : ''; - $webhookId = (isset($data['webhookId'])) ? $data['webhookId'] : ''; + $id = $data['projectId'] ?? ''; + $webhookId = $data['webhookId'] ?? ''; $response = $this->client->call(Client::METHOD_DELETE, '/projects/'.$id.'/webhooks/'.$webhookId, array_merge([ 'content-type' => 'application/json', @@ -541,7 +541,7 @@ class ProjectsConsoleClientTest extends Scope */ public function testCreateProjectKey($data): array { - $id = (isset($data['projectId'])) ? $data['projectId'] : ''; + $id = $data['projectId'] ?? ''; $response = $this->client->call(Client::METHOD_POST, '/projects/'.$id.'/keys', array_merge([ 'content-type' => 'application/json', @@ -581,7 +581,7 @@ class ProjectsConsoleClientTest extends Scope */ public function testListProjectKey($data): array { - $id = (isset($data['projectId'])) ? $data['projectId'] : ''; + $id = $data['projectId'] ?? ''; $response = $this->client->call(Client::METHOD_GET, '/projects/'.$id.'/keys', array_merge([ 'content-type' => 'application/json', @@ -603,8 +603,8 @@ class ProjectsConsoleClientTest extends Scope */ public function testGetProjectKey($data): array { - $id = (isset($data['projectId'])) ? $data['projectId'] : ''; - $keyId = (isset($data['keyId'])) ? $data['keyId'] : ''; + $id = $data['projectId'] ?? ''; + $keyId = $data['keyId'] ?? ''; $response = $this->client->call(Client::METHOD_GET, '/projects/'.$id.'/keys/'.$keyId, array_merge([ 'content-type' => 'application/json', @@ -638,8 +638,8 @@ class ProjectsConsoleClientTest extends Scope */ public function testUpdateProjectKey($data): array { - $id = (isset($data['projectId'])) ? $data['projectId'] : ''; - $keyId = (isset($data['keyId'])) ? $data['keyId'] : ''; + $id = $data['projectId'] ?? ''; + $keyId = $data['keyId'] ?? ''; $response = $this->client->call(Client::METHOD_PUT, '/projects/'.$id.'/keys/'.$keyId, array_merge([ 'content-type' => 'application/json', @@ -693,8 +693,8 @@ class ProjectsConsoleClientTest extends Scope */ public function testDeleteProjectKey($data): array { - $id = (isset($data['projectId'])) ? $data['projectId'] : ''; - $keyId = (isset($data['keyId'])) ? $data['keyId'] : ''; + $id = $data['projectId'] ?? ''; + $keyId = $data['keyId'] ?? ''; $response = $this->client->call(Client::METHOD_DELETE, '/projects/'.$id.'/keys/'.$keyId, array_merge([ 'content-type' => 'application/json', @@ -731,7 +731,7 @@ class ProjectsConsoleClientTest extends Scope */ public function testCreateProjectTask($data): array { - $id = (isset($data['projectId'])) ? $data['projectId'] : ''; + $id = $data['projectId'] ?? ''; $response = $this->client->call(Client::METHOD_POST, '/projects/'.$id.'/tasks', array_merge([ 'content-type' => 'application/json', @@ -859,7 +859,7 @@ class ProjectsConsoleClientTest extends Scope */ public function testListProjectTask($data): array { - $id = (isset($data['projectId'])) ? $data['projectId'] : ''; + $id = $data['projectId'] ?? ''; $response = $this->client->call(Client::METHOD_GET, '/projects/'.$id.'/tasks', array_merge([ 'content-type' => 'application/json', @@ -881,8 +881,8 @@ class ProjectsConsoleClientTest extends Scope */ public function testGetProjectTask($data): array { - $id = (isset($data['projectId'])) ? $data['projectId'] : ''; - $taskId = (isset($data['taskId'])) ? $data['taskId'] : ''; + $id = $data['projectId'] ?? ''; + $taskId = $data['taskId'] ?? ''; $response = $this->client->call(Client::METHOD_GET, '/projects/'.$id.'/tasks/'.$taskId, array_merge([ 'content-type' => 'application/json', @@ -921,8 +921,8 @@ class ProjectsConsoleClientTest extends Scope */ public function testUpdateProjectTask($data): array { - $id = (isset($data['projectId'])) ? $data['projectId'] : ''; - $taskId = (isset($data['taskId'])) ? $data['taskId'] : ''; + $id = $data['projectId'] ?? ''; + $taskId = $data['taskId'] ?? ''; $response = $this->client->call(Client::METHOD_PUT, '/projects/'.$id.'/tasks/'.$taskId, array_merge([ 'content-type' => 'application/json', @@ -1087,8 +1087,8 @@ class ProjectsConsoleClientTest extends Scope */ public function testDeleteProjectTask($data): array { - $id = (isset($data['projectId'])) ? $data['projectId'] : ''; - $taskId = (isset($data['taskId'])) ? $data['taskId'] : ''; + $id = $data['projectId'] ?? ''; + $taskId = $data['taskId'] ?? ''; $response = $this->client->call(Client::METHOD_DELETE, '/projects/'.$id.'/tasks/'.$taskId, array_merge([ 'content-type' => 'application/json', @@ -1125,7 +1125,7 @@ class ProjectsConsoleClientTest extends Scope */ public function testCreateProjectPlatform($data): array { - $id = (isset($data['projectId'])) ? $data['projectId'] : ''; + $id = $data['projectId'] ?? ''; $response = $this->client->call(Client::METHOD_POST, '/projects/'.$id.'/platforms', array_merge([ 'content-type' => 'application/json', @@ -1227,7 +1227,7 @@ class ProjectsConsoleClientTest extends Scope */ public function testListProjectPlatform($data): array { - $id = (isset($data['projectId'])) ? $data['projectId'] : ''; + $id = $data['projectId'] ?? ''; $response = $this->client->call(Client::METHOD_GET, '/projects/'.$id.'/platforms', array_merge([ 'content-type' => 'application/json', @@ -1249,9 +1249,9 @@ class ProjectsConsoleClientTest extends Scope */ public function testGetProjectPlatform($data): array { - $id = (isset($data['projectId'])) ? $data['projectId'] : ''; + $id = $data['projectId'] ?? ''; - $platformWebId = (isset($data['platformWebId'])) ? $data['platformWebId'] : ''; + $platformWebId = $data['platformWebId'] ?? ''; $response = $this->client->call(Client::METHOD_GET, '/projects/'.$id.'/platforms/'.$platformWebId, array_merge([ 'content-type' => 'application/json', @@ -1267,7 +1267,7 @@ class ProjectsConsoleClientTest extends Scope $this->assertEquals('', $response['body']['store']); $this->assertEquals('localhost', $response['body']['hostname']); - $platformFultteriOSId = (isset($data['platformFultteriOSId'])) ? $data['platformFultteriOSId'] : ''; + $platformFultteriOSId = $data['platformFultteriOSId'] ?? ''; $response = $this->client->call(Client::METHOD_GET, '/projects/'.$id.'/platforms/'.$platformFultteriOSId, array_merge([ 'content-type' => 'application/json', @@ -1283,7 +1283,7 @@ class ProjectsConsoleClientTest extends Scope $this->assertEquals('', $response['body']['store']); $this->assertEquals('', $response['body']['hostname']); - $platformFultterAndroidId = (isset($data['platformFultterAndroidId'])) ? $data['platformFultterAndroidId'] : ''; + $platformFultterAndroidId = $data['platformFultterAndroidId'] ?? ''; $response = $this->client->call(Client::METHOD_GET, '/projects/'.$id.'/platforms/'.$platformFultterAndroidId, array_merge([ 'content-type' => 'application/json', @@ -1317,9 +1317,9 @@ class ProjectsConsoleClientTest extends Scope */ public function testUpdateProjectPlatform($data): array { - $id = (isset($data['projectId'])) ? $data['projectId'] : ''; + $id = $data['projectId'] ?? ''; - $platformWebId = (isset($data['platformWebId'])) ? $data['platformWebId'] : ''; + $platformWebId = $data['platformWebId'] ?? ''; $response = $this->client->call(Client::METHOD_PUT, '/projects/'.$id.'/platforms/'.$platformWebId, array_merge([ 'content-type' => 'application/json', @@ -1340,7 +1340,7 @@ class ProjectsConsoleClientTest extends Scope $this->assertEquals('', $response['body']['store']); $this->assertEquals('localhost-new', $response['body']['hostname']); - $platformFultteriOSId = (isset($data['platformFultteriOSId'])) ? $data['platformFultteriOSId'] : ''; + $platformFultteriOSId = $data['platformFultteriOSId'] ?? ''; $response = $this->client->call(Client::METHOD_PUT, '/projects/'.$id.'/platforms/'.$platformFultteriOSId, array_merge([ 'content-type' => 'application/json', @@ -1361,7 +1361,7 @@ class ProjectsConsoleClientTest extends Scope $this->assertEquals('', $response['body']['store']); $this->assertEquals('', $response['body']['hostname']); - $platformFultterAndroidId = (isset($data['platformFultterAndroidId'])) ? $data['platformFultterAndroidId'] : ''; + $platformFultterAndroidId = $data['platformFultterAndroidId'] ?? ''; $response = $this->client->call(Client::METHOD_PUT, '/projects/'.$id.'/platforms/'.$platformFultterAndroidId, array_merge([ 'content-type' => 'application/json', @@ -1394,9 +1394,9 @@ class ProjectsConsoleClientTest extends Scope */ public function testDeleteProjectPlatform($data): array { - $id = (isset($data['projectId'])) ? $data['projectId'] : ''; + $id = $data['projectId'] ?? ''; - $platformWebId = (isset($data['platformWebId'])) ? $data['platformWebId'] : ''; + $platformWebId = $data['platformWebId'] ?? ''; $response = $this->client->call(Client::METHOD_DELETE, '/projects/'.$id.'/platforms/'.$platformWebId, array_merge([ 'content-type' => 'application/json', @@ -1413,7 +1413,7 @@ class ProjectsConsoleClientTest extends Scope $this->assertEquals(404, $response['headers']['status-code']); - $platformFultteriOSId = (isset($data['platformFultteriOSId'])) ? $data['platformFultteriOSId'] : ''; + $platformFultteriOSId = $data['platformFultteriOSId'] ?? ''; $response = $this->client->call(Client::METHOD_DELETE, '/projects/'.$id.'/platforms/'.$platformFultteriOSId, array_merge([ 'content-type' => 'application/json', @@ -1430,7 +1430,7 @@ class ProjectsConsoleClientTest extends Scope $this->assertEquals(404, $response['headers']['status-code']); - $platformFultterAndroidId = (isset($data['platformFultterAndroidId'])) ? $data['platformFultterAndroidId'] : ''; + $platformFultterAndroidId = $data['platformFultterAndroidId'] ?? ''; $response = $this->client->call(Client::METHOD_DELETE, '/projects/'.$id.'/platforms/'.$platformFultterAndroidId, array_merge([ 'content-type' => 'application/json', @@ -1467,7 +1467,7 @@ class ProjectsConsoleClientTest extends Scope */ public function testCreateProjectDomain($data): array { - $id = (isset($data['projectId'])) ? $data['projectId'] : ''; + $id = $data['projectId'] ?? ''; $response = $this->client->call(Client::METHOD_POST, '/projects/'.$id.'/domains', array_merge([ 'content-type' => 'application/json', @@ -1506,7 +1506,7 @@ class ProjectsConsoleClientTest extends Scope */ public function testListProjectDomain($data): array { - $id = (isset($data['projectId'])) ? $data['projectId'] : ''; + $id = $data['projectId'] ?? ''; $response = $this->client->call(Client::METHOD_GET, '/projects/'.$id.'/domains', array_merge([ 'content-type' => 'application/json', @@ -1528,8 +1528,8 @@ class ProjectsConsoleClientTest extends Scope */ public function testGetProjectDomain($data): array { - $id = (isset($data['projectId'])) ? $data['projectId'] : ''; - $domainId = (isset($data['domainId'])) ? $data['domainId'] : ''; + $id = $data['projectId'] ?? ''; + $domainId = $data['domainId'] ?? ''; $response = $this->client->call(Client::METHOD_GET, '/projects/'.$id.'/domains/'.$domainId, array_merge([ 'content-type' => 'application/json', @@ -1563,8 +1563,8 @@ class ProjectsConsoleClientTest extends Scope */ public function testUpdateProjectDomain($data): array { - $id = (isset($data['projectId'])) ? $data['projectId'] : ''; - $domainId = (isset($data['domainId'])) ? $data['domainId'] : ''; + $id = $data['projectId'] ?? ''; + $domainId = $data['domainId'] ?? ''; $response = $this->client->call(Client::METHOD_PATCH, '/projects/'.$id.'/domains/'.$domainId.'/verification', array_merge([ 'content-type' => 'application/json', @@ -1585,8 +1585,8 @@ class ProjectsConsoleClientTest extends Scope */ public function testDeleteProjectDomain($data): array { - $id = (isset($data['projectId'])) ? $data['projectId'] : ''; - $domainId = (isset($data['domainId'])) ? $data['domainId'] : ''; + $id = $data['projectId'] ?? ''; + $domainId = $data['domainId'] ?? ''; $response = $this->client->call(Client::METHOD_DELETE, '/projects/'.$id.'/domains/'.$domainId, array_merge([ 'content-type' => 'application/json', diff --git a/tests/e2e/Services/Teams/TeamsBase.php b/tests/e2e/Services/Teams/TeamsBase.php index 73bdfe7199..a8ac2ac433 100644 --- a/tests/e2e/Services/Teams/TeamsBase.php +++ b/tests/e2e/Services/Teams/TeamsBase.php @@ -75,7 +75,7 @@ trait TeamsBase */ public function testGetTeam($data):array { - $id = (isset($data['teamUid'])) ? $data['teamUid'] : ''; + $id = $data['teamUid'] ?? ''; /** * Test for SUCCESS diff --git a/tests/e2e/Services/Teams/TeamsBaseClient.php b/tests/e2e/Services/Teams/TeamsBaseClient.php index ceb0d86e5c..25bbcbdd58 100644 --- a/tests/e2e/Services/Teams/TeamsBaseClient.php +++ b/tests/e2e/Services/Teams/TeamsBaseClient.php @@ -11,7 +11,7 @@ trait TeamsBaseClient */ public function testGetTeamMemberships($data):array { - $teamUid = (isset($data['teamUid'])) ? $data['teamUid'] : ''; + $teamUid = $data['teamUid'] ?? ''; /** * Test for SUCCESS @@ -40,8 +40,8 @@ trait TeamsBaseClient */ public function testCreateTeamMembership($data):array { - $teamUid = (isset($data['teamUid'])) ? $data['teamUid'] : ''; - $teamName = (isset($data['teamName'])) ? $data['teamName'] : ''; + $teamUid = $data['teamUid'] ?? ''; + $teamName = $data['teamName'] ?? ''; $email = uniqid().'friend@localhost.test'; /** @@ -127,10 +127,10 @@ trait TeamsBaseClient */ public function testUpdateTeamMembership($data):array { - $teamUid = (isset($data['teamUid'])) ? $data['teamUid'] : ''; - $secret = (isset($data['secret'])) ? $data['secret'] : ''; - $inviteUid = (isset($data['inviteUid'])) ? $data['inviteUid'] : ''; - $userUid = (isset($data['userUid'])) ? $data['userUid'] : ''; + $teamUid = $data['teamUid'] ?? ''; + $secret = $data['secret'] ?? ''; + $inviteUid = $data['inviteUid'] ?? ''; + $userUid = $data['userUid'] ?? ''; /** * Test for SUCCESS @@ -207,8 +207,8 @@ trait TeamsBaseClient */ public function testDeleteTeamMembership($data):array { - $teamUid = (isset($data['teamUid'])) ? $data['teamUid'] : ''; - $inviteUid = (isset($data['inviteUid'])) ? $data['inviteUid'] : ''; + $teamUid = $data['teamUid'] ?? ''; + $inviteUid = $data['inviteUid'] ?? ''; /** * Test for SUCCESS diff --git a/tests/e2e/Services/Teams/TeamsBaseServer.php b/tests/e2e/Services/Teams/TeamsBaseServer.php index 1547a4e289..9869ce5906 100644 --- a/tests/e2e/Services/Teams/TeamsBaseServer.php +++ b/tests/e2e/Services/Teams/TeamsBaseServer.php @@ -11,7 +11,7 @@ trait TeamsBaseServer */ public function testGetTeamMemberships($data):array { - $id = (isset($data['teamUid'])) ? $data['teamUid'] : ''; + $id = $data['teamUid'] ?? ''; /** * Test for SUCCESS @@ -37,8 +37,8 @@ trait TeamsBaseServer */ public function testCreateTeamMembership($data):array { - $teamUid = (isset($data['teamUid'])) ? $data['teamUid'] : ''; - $teamName = (isset($data['teamName'])) ? $data['teamName'] : ''; + $teamUid = $data['teamUid'] ?? ''; + $teamName = $data['teamName'] ?? ''; $email = uniqid().'friend@localhost.test'; /** From 95cafb9f1b2791a9ebe5f72160a172f69eb247be Mon Sep 17 00:00:00 2001 From: Eldad Fux Date: Thu, 15 Oct 2020 00:34:57 +0300 Subject: [PATCH 054/133] Updated controllers and workers --- app/controllers/api/avatars.php | 6 +- app/controllers/api/database.php | 4 +- app/controllers/api/health.php | 16 +- app/tasks/migrate.php | 2 +- app/views/console/database/collection.phtml | 8 +- app/views/console/database/document.phtml | 36 ++-- app/views/console/database/form.phtml | 12 +- .../console/database/rules/documentId.phtml | 6 +- .../console/database/search/documents.phtml | 10 +- app/views/console/users/index.phtml | 6 +- app/workers/certificates.php | 4 +- app/workers/tasks.php | 6 +- app/workers/webhooks.php | 12 +- composer.lock | 162 +++++++++--------- 14 files changed, 145 insertions(+), 145 deletions(-) diff --git a/app/controllers/api/avatars.php b/app/controllers/api/avatars.php index 0930806983..8349cce246 100644 --- a/app/controllers/api/avatars.php +++ b/app/controllers/api/avatars.php @@ -283,8 +283,8 @@ App::get('/v1/avatars/favicon') case 'jpeg': $size = \explode('x', \strtolower($sizes)); - $sizeWidth = (isset($size[0])) ? (int) $size[0] : 0; - $sizeHeight = (isset($size[1])) ? (int) $size[1] : 0; + $sizeWidth = (int) $size[0] ?? 0; + $sizeHeight = (int) $size[1] ?? 0; if (($sizeWidth * $sizeHeight) >= $space) { $space = $sizeWidth * $sizeHeight; @@ -423,7 +423,7 @@ App::get('/v1/avatars/initials') $code = 0; foreach ($words as $key => $w) { - $initials .= (isset($w[0])) ? $w[0] : ''; + $initials .= $w[0] ?? ''; $code += (isset($w[0])) ? \ord($w[0]) : 0; if ($key == 1) { diff --git a/app/controllers/api/database.php b/app/controllers/api/database.php index 70fdfac4f8..bd19935754 100644 --- a/app/controllers/api/database.php +++ b/app/controllers/api/database.php @@ -418,8 +418,8 @@ App::post('/v1/database/collections/:collectionId/documents') * Set default collection values */ foreach ($collection->getAttribute('rules') as $key => $rule) { - $key = (isset($rule['key'])) ? $rule['key'] : ''; - $default = (isset($rule['default'])) ? $rule['default'] : null; + $key = $rule['key'] ?? ''; + $default = $rule['default'] ?? null; if (!isset($data[$key])) { $data[$key] = $default; diff --git a/app/controllers/api/health.php b/app/controllers/api/health.php index b8955a1989..5ef4f2b9c8 100644 --- a/app/controllers/api/health.php +++ b/app/controllers/api/health.php @@ -278,14 +278,14 @@ App::get('/v1/health/stats') // Currently only used internally 'partitionFree' => Storage::human($device->getPartitionFreeSpace()), ], 'cache' => [ - 'uptime' => (isset($cacheStats['uptime_in_seconds'])) ? $cacheStats['uptime_in_seconds'] : 0, - 'clients' => (isset($cacheStats['connected_clients'])) ? $cacheStats['connected_clients'] : 0, - 'hits' => (isset($cacheStats['keyspace_hits'])) ? $cacheStats['keyspace_hits'] : 0, - 'misses' => (isset($cacheStats['keyspace_misses'])) ? $cacheStats['keyspace_misses'] : 0, - 'memory_used' => (isset($cacheStats['used_memory'])) ? $cacheStats['used_memory'] : 0, - 'memory_used_human' => (isset($cacheStats['used_memory_human'])) ? $cacheStats['used_memory_human'] : 0, - 'memory_used_peak' => (isset($cacheStats['used_memory_peak'])) ? $cacheStats['used_memory_peak'] : 0, - 'memory_used_peak_human' => (isset($cacheStats['used_memory_peak_human'])) ? $cacheStats['used_memory_peak_human'] : 0, + 'uptime' => $cacheStats['uptime_in_seconds'] ?? 0, + 'clients' => $cacheStats['connected_clients'] ?? 0, + 'hits' => $cacheStats['keyspace_hits'] ?? 0, + 'misses' => $cacheStats['keyspace_misses'] ?? 0, + 'memory_used' => $cacheStats['used_memory'] ?? 0, + 'memory_used_human' => $cacheStats['used_memory_human'] ?? 0, + 'memory_used_peak' => $cacheStats['used_memory_peak'] ?? 0, + 'memory_used_peak_human' => $cacheStats['used_memory_peak_human'] ?? 0, ], ]); }, ['response', 'register']); diff --git a/app/tasks/migrate.php b/app/tasks/migrate.php index efa06e1fed..8f7fc9c7e1 100644 --- a/app/tasks/migrate.php +++ b/app/tasks/migrate.php @@ -59,7 +59,7 @@ $callbacks = [ $offset = $offset + $limit; } - $schema = (isset($_SERVER['_APP_DB_SCHEMA'])) ? $_SERVER['_APP_DB_SCHEMA'] : ''; + $schema = $_SERVER['_APP_DB_SCHEMA'] ?? ''; try { $statement = $db->prepare(" diff --git a/app/views/console/database/collection.phtml b/app/views/console/database/collection.phtml index ea864120e2..fc9f99351c 100644 --- a/app/views/console/database/collection.phtml +++ b/app/views/console/database/collection.phtml @@ -104,10 +104,10 @@ $maxCells = 10; if($i > $maxCells) { break; } - $label = (isset($rule['label'])) ? $rule['label'] : ''; - $key = (isset($rule['key'])) ? $rule['key'] : ''; - $type = (isset($rule['type'])) ? $rule['type'] : ''; - $array = (isset($rule['array'])) ? $rule['array'] : ''; + $label = $rule['label'] ?? ''; + $key = $rule['key'] ?? ''; + $type = $rule['type'] ?? ''; + $array = $rule['array'] ?? ''; ?> diff --git a/app/views/console/database/document.phtml b/app/views/console/database/document.phtml index e8f760f686..5ac9e841ea 100644 --- a/app/views/console/database/document.phtml +++ b/app/views/console/database/document.phtml @@ -17,10 +17,10 @@ $collections = []; render(); ?> getId()) { @@ -48,11 +48,11 @@ $collections = []; @@ -126,11 +126,11 @@ $collections = [];