Merge pull request #8290 from appwrite/1.5.x

Sync 1.5.x into refactor-usage-sn

app/config/locale/translations/af.json

@@ -100,6 +100,7 @@
     "countries.gd": "Grenada",
     "countries.gt": "Guatemala",
     "countries.gy": "Guyana",
+    "countries.hk": "Hong Kong",
     "countries.hn": "Honduras",
     "countries.hr": "Kroasië",
     "countries.ht": "Haiti",

app/config/locale/translations/ar.json

@@ -100,6 +100,7 @@
     "countries.gd": "غرينادا",
     "countries.gt": "غواتيمالا",
     "countries.gy": "غيانا",
+    "countries.hk": "هونغ كونغ",
     "countries.hn": "هندوراس",
     "countries.hr": "كرواتيا",
     "countries.ht": "هايتي",

app/config/locale/translations/as.json

@@ -100,6 +100,7 @@
     "countries.gd": "গ্ৰেনাডা",
     "countries.gt": "গুয়াতেমালা",
     "countries.gy": "গায়ানা",
+    "countries.hk": "হং কং",
     "countries.hn": "হণ্ডুৰাছ",
     "countries.hr": "ক্ৰোৱেছিয়া",
     "countries.ht": "হাইতি",

app/config/locale/translations/az.json

@@ -100,6 +100,7 @@
     "countries.gd": "Qrenada",
     "countries.gt": "Qvatemala",
     "countries.gy": "Guyana",
+    "countries.hk": "Honq Konq",
     "countries.hn": "Honduras",
     "countries.hr": "Xorvatiya",
     "countries.ht": "Haiti",

app/config/locale/translations/be.json

@@ -100,6 +100,7 @@
     "countries.gd": "Грэнада",
     "countries.gt": "Гватэмала",
     "countries.gy": "Гаяна",
+    "countries.hk": "Гонконг",
     "countries.hn": "Гандурас",
     "countries.hr": "Харватыя",
     "countries.ht": "Гаіці",

app/config/locale/translations/bg.json

@@ -100,6 +100,7 @@
     "countries.gd": "Гренада",
     "countries.gt": "Гватемала",
     "countries.gy": "Гвиана",
+    "countries.hk": "Хонг Конг",
     "countries.hn": "Хондурас",
     "countries.hr": "Хърватия",
     "countries.ht": "Хаити",

app/config/locale/translations/bh.json

@@ -100,6 +100,7 @@
     "countries.gd": "ग्रेनाडा",
     "countries.gt": "ग्वाटेमाला",
     "countries.gy": "गयाना",
+    "countries.hk": "हांगकांग",
     "countries.hn": "होंडुरस",
     "countries.hr": "क्रोएशिया",
     "countries.ht": "हैती",

app/config/locale/translations/bn.json

@@ -100,6 +100,7 @@
     "countries.gd": "গ্রেনাডা",
     "countries.gt": "গুয়াতেমালা",
     "countries.gy": "গায়ানা",
+    "countries.hk": "হংকং",
     "countries.hn": "হন্ডুরাস",
     "countries.hr": "ক্রোয়েশিয়া",
     "countries.ht": "হাইতি",

app/config/locale/translations/bs.json

@@ -100,6 +100,7 @@
     "countries.gd": "Grenada",
     "countries.gt": "Guatemala",
     "countries.gy": "Gvajana",
+    "countries.hk": "Hong Kong",
     "countries.hn": "Honduras",
     "countries.hr": "Hrvatska",
     "countries.ht": "Haiti",

app/config/locale/translations/ca.json

@@ -100,6 +100,7 @@
     "countries.gd": "Granada",
     "countries.gt": "Guatemala",
     "countries.gy": "Guaiana",
+    "countries.hk": "Hong Kong",
     "countries.hn": "Hondures",
     "countries.hr": "Croàcia",
     "countries.ht": "Haití",

app/config/locale/translations/cs.json

@@ -100,6 +100,7 @@
     "countries.gd": "Grenada",
     "countries.gt": "Guatemala",
     "countries.gy": "Guyana",
+    "countries.hk": "Hong Kong",
     "countries.hn": "Honduras",
     "countries.hr": "Chorvatsko",
     "countries.ht": "Haiti",

app/config/locale/translations/da.json

@@ -100,6 +100,7 @@
     "countries.gd": "Grenada",
     "countries.gt": "Guatemala",
     "countries.gy": "Guyana",
+    "countries.hk": "Hong Kong",
     "countries.hn": "Honduras",
     "countries.hr": "Kroatien",
     "countries.ht": "Haiti",

app/config/locale/translations/de.json

@@ -100,6 +100,7 @@
     "countries.gd": "Grenada",
     "countries.gt": "Guatemala",
     "countries.gy": "Guyana",
+    "countries.hk": "Hong Kong",
     "countries.hn": "Honduras",
     "countries.hr": "Kroatien",
     "countries.ht": "Haiti",

app/config/locale/translations/el.json

@@ -100,6 +100,7 @@
     "countries.gd": "Γρενάδα",
     "countries.gt": "Γουατεμάλα",
     "countries.gy": "Γουιάνα",
+    "countries.hk": "Χονγκ Κονγκ",
     "countries.hn": "Ονδούρα",
     "countries.hr": "Κροατία",
     "countries.ht": "Αϊτή",

app/config/locale/translations/en.json

@@ -117,6 +117,7 @@
     "countries.gd": "Grenada",
     "countries.gt": "Guatemala",
     "countries.gy": "Guyana",
+    "countries.hk": "Hong Kong",
     "countries.hn": "Honduras",
     "countries.hr": "Croatia",
     "countries.ht": "Haiti",

app/config/locale/translations/eo.json

@@ -99,6 +99,7 @@
     "countries.gd": "Grenada",
     "countries.gt": "Guatemala",
     "countries.gy": "Guyana",
+    "countries.hk": "Hong Kong",
     "countries.hn": "Honduras",
     "countries.hr": "Croatia",
     "countries.ht": "Haiti",

app/config/locale/translations/es.json

@@ -100,6 +100,7 @@
     "countries.gd": "Granada",
     "countries.gt": "Guatemala",
     "countries.gy": "Guayana",
+    "countries.hk": "Hong Kong",
     "countries.hn": "Honduras",
     "countries.hr": "Croacia",
     "countries.ht": "Haití",

app/config/locale/translations/fa.json

@@ -100,6 +100,7 @@
     "countries.gd": "گرنادا",
     "countries.gt": "گواتمالا",
     "countries.gy": "گویان",
+    "countries.hk": "هنگ کنگ",
     "countries.hn": "هندوراس",
     "countries.hr": "کرواسی",
     "countries.ht": "هائیتی",

app/config/locale/translations/fi.json

@@ -100,6 +100,7 @@
     "countries.gd": "Grenada",
     "countries.gt": "Guatemala",
     "countries.gy": "Guyana",
+    "countries.hk": "Hong Kong",
     "countries.hn": "Honduras",
     "countries.hr": "Kroatia",
     "countries.ht": "Haiti",

app/config/locale/translations/fo.json

@@ -100,6 +100,7 @@
     "countries.gd": "Grenada",
     "countries.gt": "Guatemala",
     "countries.gy": "Gujana",
+    "countries.hk": "Hong Kong",
     "countries.hn": "Honduras",
     "countries.hr": "Kroatia",
     "countries.ht": "Haiti",

app/config/locale/translations/fr.json

@@ -100,6 +100,7 @@
     "countries.gd": "Grenade",
     "countries.gt": "Guatemala",
     "countries.gy": "Guyane",
+    "countries.hk": "Hong Kong",
     "countries.hn": "Honduras",
     "countries.hr": "Croatie",
     "countries.ht": "Haïti",

app/config/locale/translations/ga.json

@@ -100,6 +100,7 @@
     "countries.gd": "Greanáda",
     "countries.gt": "Guatamala",
     "countries.gy": "An Ghuáin",
+    "countries.hk": "Hong Kong",
     "countries.hn": "Hondúras",
     "countries.hr": "An Chróit",
     "countries.ht": "Háítí",

app/config/locale/translations/gu.json

@@ -100,6 +100,7 @@
     "countries.gd": "ગ્રેનાડા",
     "countries.gt": "ગ્વાટેમાલા",
     "countries.gy": "ગુયાના",
+    "countries.hk": "હોંગ કોંગ",
     "countries.hn": "હોન્ડુરાસ",
     "countries.hr": "ક્રોએશિયા",
     "countries.ht": "હૈતી",

app/config/locale/translations/he.json

@@ -100,6 +100,7 @@
     "countries.gd": "גרנדה",
     "countries.gt": "גואטמלה",
     "countries.gy": "גיאנה",
+    "countries.hk": "הונג קונג",
     "countries.hn": "הונדורס",
     "countries.hr": "קרואטיה",
     "countries.ht": "האיטי",

app/config/locale/translations/hi.json

@@ -100,6 +100,7 @@
     "countries.gd": "ग्रेनाडा",
     "countries.gt": "ग्वाटेमाला",
     "countries.gy": "गयाना",
+    "countries.hk": "हांग कांग",
     "countries.hn": "होंडुरस",
     "countries.hr": "क्रोएशिया",
     "countries.ht": "हैती",

app/config/locale/translations/hr.json

@@ -100,6 +100,7 @@
     "countries.gd": "Grenada",
     "countries.gt": "Gvatemala",
     "countries.gy": "Gvajana",
+    "countries.hk": "Hong Kong",
     "countries.hn": "Honduras",
     "countries.hr": "Hrvatska",
     "countries.ht": "Haiti",

app/config/locale/translations/hu.json

@@ -100,6 +100,7 @@
     "countries.gd": "Grenada",
     "countries.gt": "Guatemala",
     "countries.gy": "Guyana",
+    "countries.hk": "Hong Kong",
     "countries.hn": "Honduras",
     "countries.hr": "Horvátország",
     "countries.ht": "Haiti",

app/config/locale/translations/hy.json

@@ -100,6 +100,7 @@
     "countries.gd": "Գրենադա",
     "countries.gt": "Գվատեմալա",
     "countries.gy": "Գայանա",
+    "countries.hk": "Հոնգ Կոնգ",
     "countries.hn": "Գոնդուրաս",
     "countries.hr": "Խորվաթիա",
     "countries.ht": "Հաիթի",

app/config/locale/translations/id.json

@@ -100,6 +100,7 @@
     "countries.gd": "Grenada",
     "countries.gt": "Guatemala",
     "countries.gy": "Guyana",
+    "countries.hk": "Hong Kong",
     "countries.hn": "Honduras",
     "countries.hr": "Kroasia",
     "countries.ht": "Haiti",

app/config/locale/translations/is.json

@@ -100,6 +100,7 @@
     "countries.gd": "Grenada",
     "countries.gt": "Gvatemala",
     "countries.gy": "Guyana",
+    "countries.hk": "Hong Kong",
     "countries.hn": "Hondúras",
     "countries.hr": "Króatía",
     "countries.ht": "Haítí",

app/config/locale/translations/it.json

@@ -100,6 +100,7 @@
     "countries.gd": "Grenada",
     "countries.gt": "Guatemala",
     "countries.gy": "Guyana",
+    "countries.hk": "Hong Kong",
     "countries.hn": "Honduras",
     "countries.hr": "Croazia",
     "countries.ht": "Haiti",

app/config/locale/translations/ja.json

@@ -100,6 +100,7 @@
     "countries.gd": "グレナダ",
     "countries.gt": "グアテマラ",
     "countries.gy": "ガイアナ",
+    "countries.hk": "香港",
     "countries.hn": "ホンジュラス",
     "countries.hr": "クロアチア",
     "countries.ht": "ハイチ",

app/config/locale/translations/jv.json

@@ -100,6 +100,7 @@
     "countries.gd": "Grenada",
     "countries.gt": "Guatemala",
     "countries.gy": "Guyana",
+    "countries.hk": "Hong Kong",
     "countries.hn": "Honduras",
     "countries.hr": "Croatia",
     "countries.ht": "Haiti",

app/config/locale/translations/km.json

@@ -100,6 +100,7 @@
     "countries.gd": "ហ្គ្រេណាដា",
     "countries.gt": "ហ្គាតេម៉ាឡា",
     "countries.gy": "ហ្គីយ៉ាណា",
+    "countries.hk": "ហុងកុង",
     "countries.hn": "ហុងឌូរ៉ាស",
     "countries.hr": "ក្រូអាត",
     "countries.ht": "ហៃទី",

app/config/locale/translations/kn.json

@@ -100,6 +100,7 @@
     "countries.gd": "ಗ್ರೆನಡಾ",
     "countries.gt": "ಗ್ವಾಟೆಮಾಲಾ",
     "countries.gy": "ಗಯಾನಾ",
+    "countries.hk": "ಹಾಂಗ್ ಕಾಂಗ್",
     "countries.hn": "ಹೊಂಡುರಾಸ್",
     "countries.hr": "ಕ್ರೊಯೇಷಿಯಾ",
     "countries.ht": "ಹೈಟಿ",

app/config/locale/translations/ko.json

@@ -100,6 +100,7 @@
     "countries.gd": "그레나다",
     "countries.gt": "과테말라",
     "countries.gy": "기아나",
+    "countries.hk": "홍콩",
     "countries.hn": "온두라스",
     "countries.hr": "크로아티아",
     "countries.ht": "아이티",

app/config/locale/translations/la.json

@@ -100,6 +100,7 @@
     "countries.gd": "Grenada",
     "countries.gt": "Guatemala",
     "countries.gy": "Guyana",
+    "countries.hk": "Hong Kong",
     "countries.hn": "Honduras",
     "countries.hr": "Croatia",
     "countries.ht": "Haiti",
@@ -250,4 +251,4 @@
     "emails.certificate.thanks": "Gratias",
     "emails.certificate.signature": "team {{project}}",
     "sms.verification.body": "{{secret}}"
-}
+}

app/config/locale/translations/lt.json

@@ -100,6 +100,7 @@
     "countries.gd": "Grenada",
     "countries.gt": "Gvatemala",
     "countries.gy": "Gajana",
+    "countries.hk": "Honkongas",
     "countries.hn": "Hondūras",
     "countries.hr": "Kroatija",
     "countries.ht": "Haitis",

app/config/locale/translations/lv.json

@@ -100,6 +100,7 @@
     "countries.gd": "Grenada",
     "countries.gt": "Gvatemala",
     "countries.gy": "Gajāna",
+    "countries.hk": "Honkonga",
     "countries.hn": "Hondurasa",
     "countries.hr": "Horvātija",
     "countries.ht": "Haiti",

app/config/locale/translations/ml.json

@@ -100,6 +100,7 @@
     "countries.gd": "ഗ്രെനാഡ",
     "countries.gt": "ഗ്വാട്ടിമാല",
     "countries.gy": "ഗയാന",
+    "countries.hk": "ഹോങ്കോങ്",
     "countries.hn": "ഹോണ്ടുറാസ്",
     "countries.hr": "ക്രോയേഷ്യ",
     "countries.ht": "ഹെയ്തി",

app/config/locale/translations/mr.json

@@ -100,6 +100,7 @@
     "countries.gd": "ग्रेनाडा",
     "countries.gt": "ग्वाटेमाला",
     "countries.gy": "गुयाना",
+    "countries.hk": "हाँगकांग",
     "countries.hn": "होंडुरास",
     "countries.hr": "क्रोएशिया",
     "countries.ht": "हैती",

app/config/locale/translations/ms.json

@@ -100,6 +100,7 @@
     "countries.gd": "Granada",
     "countries.gt": "Guatemala",
     "countries.gy": "Guyana",
+    "countries.hk": "Hong Kong",
     "countries.hn": "Honduras",
     "countries.hr": "Kroatia",
     "countries.ht": "Haiti",

app/config/locale/translations/nb.json

@@ -100,6 +100,7 @@
     "countries.gd": "Grenada",
     "countries.gt": "Guatemala",
     "countries.gy": "Guyana",
+    "countries.hk": "Hong Kong",
     "countries.hn": "Honduras",
     "countries.hr": "Kroatia",
     "countries.ht": "Haiti",

app/config/locale/translations/ne.json

@@ -100,6 +100,7 @@
     "countries.gd": "ग्रेनेडा",
     "countries.gt": "ग्वाटेमाला",
     "countries.gy": "गुयाना",
+    "countries.hk": "हाँगकाँग",
     "countries.hn": "होन्डुरस",
     "countries.hr": "क्रोएशिया",
     "countries.ht": "हैती",

app/config/locale/translations/nl.json

@@ -100,6 +100,7 @@
     "countries.gd": "Grenada",
     "countries.gt": "Guatemala",
     "countries.gy": "Guyana",
+    "countries.hk": "Hongkong",
     "countries.hn": "Honduras",
     "countries.hr": "Croatië",
     "countries.ht": "Haiti",

app/config/locale/translations/nn.json

@@ -100,6 +100,7 @@
     "countries.gd": "Grenada",
     "countries.gt": "Guatemala",
     "countries.gy": "Guyana",
+    "countries.hk": "Hong Kong",
     "countries.hn": "Honduras",
     "countries.hr": "Kroatia",
     "countries.ht": "Haiti",

app/config/locale/translations/or.json

@@ -100,6 +100,7 @@
     "countries.gd": "ଗ୍ରେନାଡା",
     "countries.gt": "ଗୁଆଟେମାଲା",
     "countries.gy": "ଗୁଇନ୍ଦା",
+    "countries.hk": "ହଂ କଙ୍ଗ",
     "countries.hn": "ହୋଣ୍ଡୁରାସ୍",
     "countries.hr": "କ୍ରୋଏସିଆ",
     "countries.ht": "ହାଇତି",

app/config/locale/translations/pa.json

@@ -100,6 +100,7 @@
     "countries.gd": "ਗ੍ਰੇਨਾਡਾ",
     "countries.gt": "ਗੁਆਟੇਮਾਲਾ",
     "countries.gy": "ਗੇਆਨਾ",
+    "countries.hk": "ਹਾਂਗ ਕਾਂਗ",
     "countries.hn": "ਹੌਂਡੂਰਸ",
     "countries.hr": "ਕਰੋਸ਼ੀਆ",
     "countries.ht": "ਹੈਤੀ",

app/config/locale/translations/pl.json

@@ -100,6 +100,7 @@
     "countries.gd": "Grenada",
     "countries.gt": "Gwatemala",
     "countries.gy": "Gujana",
+    "countries.hk": "Hongkong",
     "countries.hn": "Honduras",
     "countries.hr": "Chorwacja",
     "countries.ht": "Haiti",

app/config/locale/translations/pt-br.json

@@ -100,6 +100,7 @@
     "countries.gd": "Granada",
     "countries.gt": "Guatemala",
     "countries.gy": "Guiana",
+    "countries.hk": "Hong Kong",
     "countries.hn": "Honduras",
     "countries.hr": "Croácia",
     "countries.ht": "Haiti",

app/config/locale/translations/pt-pt.json

@@ -100,6 +100,7 @@
     "countries.gd": "Granada",
     "countries.gt": "Guatemala",
     "countries.gy": "Guiana",
+    "countries.hk": "Hong Kong",
     "countries.hn": "Honduras",
     "countries.hr": "Croácia",
     "countries.ht": "Haiti",

app/config/locale/translations/ro.json

@@ -100,6 +100,7 @@
     "countries.gd": "Grenada",
     "countries.gt": "Guatemala",
     "countries.gy": "Guyana",
+    "countries.hk": "Hong Kong",
     "countries.hn": "Honduras",
     "countries.hr": "Croația",
     "countries.ht": "Haiti",

app/config/locale/translations/ru.json

@@ -100,6 +100,7 @@
     "countries.gd": "Гренада",
     "countries.gt": "Гватемала",
     "countries.gy": "Гайана",
+    "countries.hk": "Гонконг",
     "countries.hn": "Гондурас",
     "countries.hr": "Хорватия",
     "countries.ht": "Гаити",

app/config/locale/translations/sa.json

@@ -100,6 +100,7 @@
     "countries.gd": "ग्रेनेडा",
     "countries.gt": "ग्वाटेमाला",
     "countries.gy": "गुयाना",
+    "countries.hk": "हांगकांग",
     "countries.hn": "होंडुरस्‌",
     "countries.hr": "क्रोएशिया",
     "countries.ht": "हैती",

app/config/locale/translations/sd.json

@@ -100,6 +100,7 @@
     "countries.gd": "گرينڊا",
     "countries.gt": "گٽيمالا",
     "countries.gy": "گيانا",
+    "countries.hk": "هانگ کانگ",
     "countries.hn": "هونڊرس",
     "countries.hr": "ڪوريٽيا",
     "countries.ht": "هيٽي",

app/config/locale/translations/si.json

@@ -100,6 +100,7 @@
     "countries.gd": "ග්‍රෙනාඩා",
     "countries.gt": "ග්වාතමාලාව",
     "countries.gy": "ගයනා",
+    "countries.hk": "හොංකොං",
     "countries.hn": "හොන්ඩුරාස්",
     "countries.hr": "ක්‍රොඒෂියාව",
     "countries.ht": "හයිටි",

app/config/locale/translations/sk.json

@@ -100,6 +100,7 @@
     "countries.gd": "Grenada",
     "countries.gt": "Guatemala",
     "countries.gy": "Guyana",
+    "countries.hk": "Hongkong",
     "countries.hn": "Honduras",
     "countries.hr": "Chorvátsko",
     "countries.ht": "Haiti",

app/config/locale/translations/sl.json

@@ -100,6 +100,7 @@
     "countries.gd": "Grenada",
     "countries.gt": "Gvatemala",
     "countries.gy": "Gvajana",
+    "countries.hk": "Hong Kong",
     "countries.hn": "Honduras",
     "countries.hr": "Hrvaška",
     "countries.ht": "Haiti",

app/config/locale/translations/sn.json

@@ -100,6 +100,7 @@
     "countries.gd": "Grenada",
     "countries.gt": "Guatemala",
     "countries.gy": "Guyana",
+    "countries.hk": "Hong Kong",
     "countries.hn": "Honduras",
     "countries.hr": "Croatia",
     "countries.ht": "Haiti",

app/config/locale/translations/sq.json

@@ -100,6 +100,7 @@
     "countries.gd": "Grenada",
     "countries.gt": "Guatemala",
     "countries.gy": "Guajana",
+    "countries.hk": "Hong Kong",
     "countries.hn": "Honduras",
     "countries.hr": "Kroacia",
     "countries.ht": "Haiti",

app/config/locale/translations/sv.json

@@ -100,6 +100,7 @@
     "countries.gd": "Grenada",
     "countries.gt": "Guatemala",
     "countries.gy": "Guyana",
+    "countries.hk": "Hong Kong",
     "countries.hn": "Honduras",
     "countries.hr": "Kroatien",
     "countries.ht": "Haiti",

app/config/locale/translations/ta.json

@@ -100,6 +100,7 @@
     "countries.gd": "கிரெனடா",
     "countries.gt": "குவாத்தமாலா",
     "countries.gy": "கயானா",
+    "countries.hk": "ஹாங்காங்",
     "countries.hn": "ஹொண்டூராஸ்",
     "countries.hr": "குரோவாசியா",
     "countries.ht": "ஹைத்தி",

app/config/locale/translations/te.json

@@ -100,6 +100,7 @@
     "countries.gd": "గ్రెనడా",
     "countries.gt": "గ్వాటెమాల",
     "countries.gy": "గయానా",
+    "countries.hk": "హాంగ్ కొంగ",
     "countries.hn": "హోండురాస్",
     "countries.hr": "క్రొయేషియా",
     "countries.ht": "హైతీ",

app/config/locale/translations/th.json

@@ -100,6 +100,7 @@
     "countries.gd": "เกรเนดา",
     "countries.gt": "กัวเตมาลา",
     "countries.gy": "กายอานา",
+    "countries.hk": "ฮ่องกง",
     "countries.hn": "ฮอนดูรัส",
     "countries.hr": "โครเอเชีย",
     "countries.ht": "ไฮติ",

app/config/locale/translations/tl.json

@@ -100,6 +100,7 @@
     "countries.gd": "Grenada",
     "countries.gt": "Guwatemala",
     "countries.gy": "Guyana",
+    "countries.hk": "Hong Kong",
     "countries.hn": "Honduras",
     "countries.hr": "Kroasya",
     "countries.ht": "Haiti",

app/config/locale/translations/tr.json

@@ -100,6 +100,7 @@
     "countries.gd": "Grenada",
     "countries.gt": "Guatemala",
     "countries.gy": "Guyana",
+    "countries.hk": "Hong Kong",
     "countries.hn": "Honduras",
     "countries.hr": "Hırvatistan",
     "countries.ht": "Haiti",

app/config/locale/translations/uk.json

@@ -100,6 +100,7 @@
     "countries.gd": "Гренада",
     "countries.gt": "Гватемала",
     "countries.gy": "Гайана",
+    "countries.hk": "Гонконг",
     "countries.hn": "Гондурас",
     "countries.hr": "Хорватія",
     "countries.ht": "Гаїті",

app/config/locale/translations/ur.json

@@ -100,6 +100,7 @@
     "countries.gd": "گریناڈا",
     "countries.gt": "گوئٹے مالا",
     "countries.gy": "گیانا",
+    "countries.hk": "ہانگ کانگ",
     "countries.hn": "ہونڈوراس",
     "countries.hr": "کروشیا",
     "countries.ht": "ہیٹی",

app/config/locale/translations/vi.json

@@ -100,6 +100,7 @@
     "countries.gd": "Grenada",
     "countries.gt": "Guatemala",
     "countries.gy": "Guyana",
+    "countries.hk": "Hong Kong",
     "countries.hn": "Honduras",
     "countries.hr": "Croatia",
     "countries.ht": "Haiti",

app/config/locale/translations/zh-cn.json

@@ -100,6 +100,7 @@
     "countries.gd": "格林纳达",
     "countries.gt": "危地马拉",
     "countries.gy": "圭亚那",
+    "countries.hk": "香港",
     "countries.hn": "洪都拉斯",
     "countries.hr": "克罗地亚",
     "countries.ht": "海地",

app/config/locale/translations/zh-tw.json

@@ -100,6 +100,7 @@
     "countries.gd": "格瑞那達",
     "countries.gt": "瓜地馬拉",
     "countries.gy": "蓋亞那",
+    "countries.hk": "香港",
     "countries.hn": "宏都拉斯",
     "countries.hr": "克羅埃西亞",
     "countries.ht": "海地",

app/controllers/api/account.php

@@ -290,7 +290,9 @@ App::post('/v1/account')
                 $existingTarget = $dbForProject->findOne('targets', [
                     Query::equal('identifier', [$email]),
                 ]);
-                $user->setAttribute('targets', [...$user->getAttribute('targets', []), $existingTarget]);
+                if($existingTarget) {
+                    $user->setAttribute('targets', $existingTarget, Document::SET_TYPE_APPEND);
+                }
             }
 
             $dbForProject->purgeCachedDocument('users', $user->getId());

app/controllers/api/storage.php

@@ -351,7 +351,7 @@ App::post('/v1/storage/buckets/:bucketId/files')
     ->label('sdk.response.model', Response::MODEL_FILE)
     ->param('bucketId', '', new UID(), 'Storage bucket unique ID. You can create a new storage bucket using the Storage service [server integration](https://appwrite.io/docs/server/storage#createBucket).')
     ->param('fileId', '', new CustomId(), 'File ID. Choose a custom ID or generate a random ID with `ID.unique()`. Valid chars are a-z, A-Z, 0-9, period, hyphen, and underscore. Can\'t start with a special char. Max length is 36 chars.')
-    ->param('file', [], new File(), 'Binary file. Appwrite SDKs provide helpers to handle file input. [Learn about file input](https://appwrite.io/docs/storage#file-input).', skipValidation: true)
+    ->param('file', [], new File(), 'Binary file. Appwrite SDKs provide helpers to handle file input. [Learn about file input](https://appwrite.io/docs/products/storage/upload-download#input-file).', skipValidation: true)
     ->param('permissions', null, new Permissions(APP_LIMIT_ARRAY_PARAMS_SIZE, [Database::PERMISSION_READ, Database::PERMISSION_UPDATE, Database::PERMISSION_DELETE, Database::PERMISSION_WRITE]), 'An array of permission strings. By default, only the current user is granted all permissions. [Learn more about permissions](https://appwrite.io/docs/permissions).', true)
     ->inject('request')
     ->inject('response')

app/controllers/api/users.php

@@ -138,7 +138,9 @@ function createUser(string $hash, mixed $hashOptions, string $userId, ?string $e
                 $existingTarget = $dbForProject->findOne('targets', [
                     Query::equal('identifier', [$email]),
                 ]);
-                $user->setAttribute('targets', [...$user->getAttribute('targets', []), $existingTarget]);
+                if($existingTarget) {
+                    $user->setAttribute('targets', $existingTarget, Document::SET_TYPE_APPEND);
+                }
             }
         }
 
@@ -160,7 +162,9 @@ function createUser(string $hash, mixed $hashOptions, string $userId, ?string $e
                 $existingTarget = $dbForProject->findOne('targets', [
                     Query::equal('identifier', [$phone]),
                 ]);
-                $user->setAttribute('targets', [...$user->getAttribute('targets', []), $existingTarget]);
+                if($existingTarget) {
+                    $user->setAttribute('targets', $existingTarget, Document::SET_TYPE_APPEND);
+                }
             }
         }
 

src/Appwrite/Platform/Tasks/Maintenance.php

@@ -49,6 +49,7 @@ class Maintenance extends Action
             $this->foreachProject($dbForConsole, function (Document $project) use ($queueForDeletes, $usageStatsRetentionHourly) {
                 $queueForDeletes->setProject($project);
 
+                $this->notifyDeleteTargets($queueForDeletes);
                 $this->notifyDeleteExecutionLogs($queueForDeletes);
                 $this->notifyDeleteAbuseLogs($queueForDeletes);
                 $this->notifyDeleteAuditLogs($queueForDeletes);
@@ -60,7 +61,6 @@ class Maintenance extends Action
             $this->renewCertificates($dbForConsole, $queueForCertificates);
             $this->notifyDeleteCache($cacheRetention, $queueForDeletes);
             $this->notifyDeleteSchedules($schedulesDeletionRetention, $queueForDeletes);
-            $this->notifyDeleteTargets($queueForDeletes);
         }, $interval, $delay);
     }
 

tests/e2e/Services/Account/AccountCustomClientTest.php

@@ -150,7 +150,7 @@ class AccountCustomClientTest extends Scope
         $this->assertEquals(200, $response['headers']['status-code']);
         $this->assertNotEmpty($response['body']);
         $this->assertNotEmpty($response['body']['$id']);
-        $this->assertEquals(true, (new DatetimeValidator())->isValid($response['body']['registration']));
+        $this->assertTrue((new DatetimeValidator())->isValid($response['body']['registration']));
         $this->assertEquals($response['body']['email'], $email);
         $this->assertEquals($response['body']['name'], $name);
         $this->assertArrayHasKey('accessedAt', $response['body']);
@@ -294,7 +294,7 @@ class AccountCustomClientTest extends Scope
         $this->assertIsNumeric($response['body']['total']);
         $this->assertEquals("user.create", $response['body']['logs'][2]['event']);
         $this->assertEquals(filter_var($response['body']['logs'][2]['ip'], FILTER_VALIDATE_IP), $response['body']['logs'][2]['ip']);
-        $this->assertEquals(true, (new DatetimeValidator())->isValid($response['body']['logs'][2]['time']));
+        $this->assertTrue((new DatetimeValidator())->isValid($response['body']['logs'][2]['time']));
 
         $this->assertEquals('Windows', $response['body']['logs'][1]['osName']);
         $this->assertEquals('WIN', $response['body']['logs'][1]['osCode']);
@@ -327,7 +327,6 @@ class AccountCustomClientTest extends Scope
         $this->assertEquals('desktop', $response['body']['logs'][2]['deviceName']);
         $this->assertEquals('', $response['body']['logs'][2]['deviceBrand']);
         $this->assertEquals('', $response['body']['logs'][2]['deviceModel']);
-        $this->assertEquals($response['body']['logs'][2]['ip'], filter_var($response['body']['logs'][2]['ip'], FILTER_VALIDATE_IP));
 
         $this->assertEquals('--', $response['body']['logs'][2]['countryCode']);
         $this->assertEquals('Unknown', $response['body']['logs'][2]['countryName']);
@@ -343,7 +342,7 @@ class AccountCustomClientTest extends Scope
             ]
         ]);
 
-        $this->assertEquals($responseLimit['headers']['status-code'], 200);
+        $this->assertEquals(200, $responseLimit['headers']['status-code']);
         $this->assertIsArray($responseLimit['body']['logs']);
         $this->assertNotEmpty($responseLimit['body']['logs']);
         $this->assertCount(1, $responseLimit['body']['logs']);
@@ -382,7 +381,7 @@ class AccountCustomClientTest extends Scope
             ]
         ]);
 
-        $this->assertEquals($responseLimitOffset['headers']['status-code'], 200);
+        $this->assertEquals(200, $responseLimitOffset['headers']['status-code']);
         $this->assertIsArray($responseLimitOffset['body']['logs']);
         $this->assertNotEmpty($responseLimitOffset['body']['logs']);
         $this->assertCount(1, $responseLimitOffset['body']['logs']);
@@ -430,7 +429,7 @@ class AccountCustomClientTest extends Scope
         $this->assertIsArray($response['body']);
         $this->assertNotEmpty($response['body']);
         $this->assertNotEmpty($response['body']['$id']);
-        $this->assertEquals(true, (new DatetimeValidator())->isValid($response['body']['registration']));
+        $this->assertTrue((new DatetimeValidator())->isValid($response['body']['registration']));
         $this->assertEquals($response['body']['email'], $email);
         $this->assertEquals($response['body']['name'], $newName);
 
@@ -497,7 +496,7 @@ class AccountCustomClientTest extends Scope
         $this->assertIsArray($response['body']);
         $this->assertNotEmpty($response['body']);
         $this->assertNotEmpty($response['body']['$id']);
-        $this->assertEquals(true, (new DatetimeValidator())->isValid($response['body']['registration']));
+        $this->assertTrue((new DatetimeValidator())->isValid($response['body']['registration']));
         $this->assertEquals($response['body']['email'], $email);
 
         $response = $this->client->call(Client::METHOD_POST, '/account/sessions/email', array_merge([
@@ -587,7 +586,7 @@ class AccountCustomClientTest extends Scope
         $this->assertIsArray($response['body']);
         $this->assertNotEmpty($response['body']);
         $this->assertNotEmpty($response['body']['$id']);
-        $this->assertEquals(true, (new DatetimeValidator())->isValid($response['body']['registration']));
+        $this->assertTrue((new DatetimeValidator())->isValid($response['body']['registration']));
         $this->assertEquals($response['body']['email'], $newEmail);
 
         /**
@@ -629,7 +628,7 @@ class AccountCustomClientTest extends Scope
         $this->assertEquals(201, $response['headers']['status-code']);
         $this->assertNotEmpty($response['body']);
         $this->assertNotEmpty($response['body']['$id']);
-        $this->assertEquals(true, (new DatetimeValidator())->isValid($response['body']['registration']));
+        $this->assertTrue((new DatetimeValidator())->isValid($response['body']['registration']));
         $this->assertEquals($response['body']['email'], $data['email']);
         $this->assertEquals($response['body']['name'], $data['name']);
 
@@ -771,7 +770,7 @@ class AccountCustomClientTest extends Scope
         $this->assertEquals(201, $response['headers']['status-code']);
         $this->assertNotEmpty($response['body']['$id']);
         $this->assertEmpty($response['body']['secret']);
-        $this->assertEquals(true, (new DatetimeValidator())->isValid($response['body']['expire']));
+        $this->assertTrue((new DatetimeValidator())->isValid($response['body']['expire']));
 
         $lastEmail = $this->getLastEmail();
 
@@ -1073,7 +1072,7 @@ class AccountCustomClientTest extends Scope
         $this->assertEquals(201, $response['headers']['status-code']);
         $this->assertNotEmpty($response['body']['$id']);
         $this->assertEmpty($response['body']['secret']);
-        $this->assertEquals(true, (new DatetimeValidator())->isValid($response['body']['expire']));
+        $this->assertTrue((new DatetimeValidator())->isValid($response['body']['expire']));
 
         $lastEmail = $this->getLastEmail();
 
@@ -1668,7 +1667,7 @@ class AccountCustomClientTest extends Scope
         $this->assertIsArray($response['body']);
         $this->assertNotEmpty($response['body']);
         $this->assertNotEmpty($response['body']['$id']);
-        $this->assertEquals(true, (new DatetimeValidator())->isValid($response['body']['registration']));
+        $this->assertTrue((new DatetimeValidator())->isValid($response['body']['registration']));
         $this->assertEquals($response['body']['email'], $email);
 
         $response = $this->client->call(Client::METHOD_POST, '/account/sessions/email', array_merge([
@@ -1756,13 +1755,11 @@ class AccountCustomClientTest extends Scope
 
         $this->assertEquals(200, $response['headers']['status-code']);
         $this->assertEquals($response['body']['$id'], $userId);
-        $this->assertEquals($response['body']['name'], 'User Name');
-        $this->assertEquals($response['body']['email'], 'useroauth@localhost.test');
+        $this->assertEquals('User Name', $response['body']['name']);
+        $this->assertEquals('useroauth@localhost.test', $response['body']['email']);
 
         // Since we only support one oauth user, let's also check updateSession here
 
-        $this->assertEquals(200, $response['headers']['status-code']);
-
         $response = $this->client->call(Client::METHOD_GET, '/account/sessions/current', array_merge([
             'origin' => 'http://localhost',
             'content-type' => 'application/json',
@@ -1808,7 +1805,7 @@ class AccountCustomClientTest extends Scope
 
         $this->assertEquals(200, $response['headers']['status-code']);
         $this->assertEmpty($response['body']['secret']);
-        $this->assertEquals($response['body']['provider'], 'anonymous');
+        $this->assertEquals('anonymous', $response['body']['provider']);
 
         $sessionID = $response['body']['$id'];
 
@@ -1821,7 +1818,7 @@ class AccountCustomClientTest extends Scope
 
         $this->assertEquals(200, $response['headers']['status-code']);
         $this->assertEmpty($response['body']['secret']);
-        $this->assertEquals($response['body']['provider'], 'anonymous');
+        $this->assertEquals('anonymous', $response['body']['provider']);
 
         $response = $this->client->call(Client::METHOD_GET, '/account/sessions/97823askjdkasd80921371980', array_merge([
             'origin' => 'http://localhost',
@@ -1934,7 +1931,7 @@ class AccountCustomClientTest extends Scope
         $this->assertEquals(201, $response['headers']['status-code']);
         $this->assertNotEmpty($response['body']['$id']);
         $this->assertEmpty($response['body']['secret']);
-        $this->assertEquals(true, (new DatetimeValidator())->isValid($response['body']['expire']));
+        $this->assertTrue((new DatetimeValidator())->isValid($response['body']['expire']));
 
         $userId = $response['body']['userId'];
 
@@ -2085,7 +2082,7 @@ class AccountCustomClientTest extends Scope
         $this->assertIsArray($response['body']);
         $this->assertNotEmpty($response['body']);
         $this->assertNotEmpty($response['body']['$id']);
-        $this->assertEquals(true, (new DatetimeValidator())->isValid($response['body']['registration']));
+        $this->assertTrue((new DatetimeValidator())->isValid($response['body']['registration']));
         $this->assertEquals($response['body']['email'], $email);
 
         $response = $this->client->call(Client::METHOD_POST, '/account/sessions/email', array_merge([
@@ -2127,7 +2124,7 @@ class AccountCustomClientTest extends Scope
         $this->assertIsArray($response['body']);
         $this->assertNotEmpty($response['body']);
         $this->assertNotEmpty($response['body']['$id']);
-        $this->assertEquals(true, (new DatetimeValidator())->isValid($response['body']['registration']));
+        $this->assertTrue((new DatetimeValidator())->isValid($response['body']['registration']));
         $this->assertEquals($response['body']['phone'], $newPhone);
 
         /**
@@ -2240,7 +2237,7 @@ class AccountCustomClientTest extends Scope
         $this->assertEquals(201, $response['headers']['status-code']);
         $this->assertNotEmpty($response['body']['$id']);
         $this->assertEmpty($response['body']['secret']);
-        $this->assertEquals(true, (new DatetimeValidator())->isValid($response['body']['expire']));
+        $this->assertTrue((new DatetimeValidator())->isValid($response['body']['expire']));
 
         $smsRequest = $this->getLastRequest();
 
@@ -2327,7 +2324,7 @@ class AccountCustomClientTest extends Scope
         $this->assertNotEmpty($response['body']['$id']);
         $this->assertEmpty($response['body']['secret']);
         $this->assertEmpty($response['body']['phrase']);
-        $this->assertEquals(true, (new DatetimeValidator())->isValid($response['body']['expire']));
+        $this->assertTrue((new DatetimeValidator())->isValid($response['body']['expire']));
 
         $userId = $response['body']['userId'];
 
@@ -2452,7 +2449,7 @@ class AccountCustomClientTest extends Scope
         $this->assertEquals(200, $response['headers']['status-code']);
         $this->assertNotEmpty($response['body']);
         $this->assertNotEmpty($response['body']['$id']);
-        $this->assertEquals(true, (new DatetimeValidator())->isValid($response['body']['registration']));
+        $this->assertTrue((new DatetimeValidator())->isValid($response['body']['registration']));
         $this->assertEquals($response['body']['email'], $email);
         $this->assertTrue($response['body']['emailVerification']);
 
@@ -2512,7 +2509,7 @@ class AccountCustomClientTest extends Scope
         $this->assertIsArray($response['body']);
         $this->assertNotEmpty($response['body']);
         $this->assertNotEmpty($response['body']['$id']);
-        $this->assertEquals(true, (new DatetimeValidator())->isValid($response['body']['registration']));
+        $this->assertTrue((new DatetimeValidator())->isValid($response['body']['registration']));
         $this->assertEquals($response['body']['email'], $email);
 
         $response = $this->client->call(Client::METHOD_POST, '/account/sessions/email', array_merge([

tests/e2e/Services/Functions/FunctionsCustomClientTest.php

@@ -718,4 +718,94 @@ class FunctionsCustomClientTest extends Scope
 
         return [];
     }
+
+    public function testNonOverrideOfHeaders(): array
+    {
+        /**
+         * Test for SUCCESS
+         */
+        $projectId = $this->getProject()['$id'];
+        $apikey = $this->getProject()['apiKey'];
+
+        $function = $this->client->call(Client::METHOD_POST, '/functions', [
+            'content-type' => 'application/json',
+            'x-appwrite-project' => $projectId,
+            'x-appwrite-key' => $apikey,
+        ], [
+            'functionId' => ID::unique(),
+            'name' => 'Test',
+            'execute' => [Role::any()->toString()],
+            'runtime' => 'node-18.0',
+            'entrypoint' => 'index.js'
+        ]);
+
+        $functionId = $function['body']['$id'] ?? '';
+
+        $this->assertEquals(201, $function['headers']['status-code']);
+
+        $folder = 'node';
+        $code = realpath(__DIR__ . '/../../../resources/functions') . "/$folder/code.tar.gz";
+        $this->packageCode($folder);
+
+        $deployment = $this->client->call(Client::METHOD_POST, '/functions/' . $functionId . '/deployments', [
+            'content-type' => 'multipart/form-data',
+            'x-appwrite-project' => $projectId,
+            'x-appwrite-key' => $apikey,
+        ], [
+            'entrypoint' => 'index.js',
+            'code' => new CURLFile($code, 'application/x-gzip', \basename($code)), //different tarball names intentional
+            'activate' => true
+        ]);
+
+        $deploymentId = $deployment['body']['$id'] ?? '';
+
+        $this->assertEquals(202, $deployment['headers']['status-code']);
+
+        // Poll until deployment is built
+        while (true) {
+            $deployment = $this->client->call(Client::METHOD_GET, '/functions/' . $function['body']['$id'] . '/deployments/' . $deploymentId, [
+                'content-type' => 'application/json',
+                'x-appwrite-project' => $this->getProject()['$id'],
+                'x-appwrite-key' => $this->getProject()['apiKey'],
+            ]);
+
+            if (
+                $deployment['headers']['status-code'] >= 400
+                || \in_array($deployment['body']['status'], ['ready', 'failed'])
+            ) {
+                break;
+            }
+
+            \sleep(1);
+        }
+
+        $this->assertEquals('ready', $deployment['body']['status']);
+
+        $execution = $this->client->call(Client::METHOD_POST, '/functions/' . $functionId . '/executions', array_merge([
+            'content-type' => 'application/json',
+            'x-appwrite-project' => $this->getProject()['$id'],
+        ], $this->getHeaders()), [
+            'x-appwrite-event' => "OVERRIDDEN",
+            'x-appwrite-trigger' => "OVERRIDDEN",
+            'x-appwrite-user-id' => "OVERRIDDEN",
+            'x-appwrite-user-jwt' => "OVERRIDDEN",
+        ]);
+
+        $output = json_decode($execution['body']['responseBody'], true);
+        $this->assertNotEquals('OVERRIDDEN', $output['APPWRITE_FUNCTION_JWT']);
+        $this->assertNotEquals('OVERRIDDEN', $output['APPWRITE_FUNCTION_EVENT']);
+        $this->assertNotEquals('OVERRIDDEN', $output['APPWRITE_FUNCTION_TRIGGER']);
+        $this->assertNotEquals('OVERRIDDEN', $output['APPWRITE_FUNCTION_USER_ID']);
+
+        // Cleanup : Delete function
+        $response = $this->client->call(Client::METHOD_DELETE, '/functions/' . $functionId, [
+            'content-type' => 'application/json',
+            'x-appwrite-project' => $this->getProject()['$id'],
+            'x-appwrite-key' => $this->getProject()['apiKey'],
+        ], []);
+
+        $this->assertEquals(204, $response['headers']['status-code']);
+
+        return [];
+    }
 }