From ad1587872b6ec977ab55c4e03394d4e444c31722 Mon Sep 17 00:00:00 2001 From: Alex Patterson Date: Tue, 22 Nov 2022 18:49:31 -0500 Subject: [PATCH 1/4] remove dup line --- app/controllers/api/locale.php | 1 - 1 file changed, 1 deletion(-) diff --git a/app/controllers/api/locale.php b/app/controllers/api/locale.php index 3aee339dfe..6d824da055 100644 --- a/app/controllers/api/locale.php +++ b/app/controllers/api/locale.php @@ -40,7 +40,6 @@ App::get('/v1/locale') $output['countryCode'] = $record['country']['iso_code']; $output['country'] = $locale->getText('countries.' . strtolower($record['country']['iso_code']), $locale->getText('locale.country.unknown')); $output['continent'] = $locale->getText('continents.' . strtolower($record['continent']['code']), $locale->getText('locale.country.unknown')); - $output['continent'] = (isset($continents[$record['continent']['code']])) ? $continents[$record['continent']['code']] : $locale->getText('locale.country.unknown'); $output['continentCode'] = $record['continent']['code']; $output['eu'] = (\in_array($record['country']['iso_code'], $eu)) ? true : false; From 56d8c176dda083ce9c35805cc39a4d9d5a06a56a Mon Sep 17 00:00:00 2001 From: Alex Patterson Date: Tue, 22 Nov 2022 18:54:50 -0500 Subject: [PATCH 2/4] add update to changelog --- CHANGES.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGES.md b/CHANGES.md index 6b7af775de..c1a9cfb75e 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -6,6 +6,7 @@ - Fix Migration stopping scheduled functions [#4704](https://github.com/appwrite/appwrite/pull/4704) - Fix Migration enabling OAuth providers with data by default [#4704](https://github.com/appwrite/appwrite/pull/4704) - Fix Error pages when OAuth providers are disabled [#4704](https://github.com/appwrite/appwrite/pull/4704) +- Fix Locale API returning Unknown Content [#4761](https://github.com/appwrite/appwrite/pull/4761) # Version 1.1.0 ## Features From 5f80f87ba99f0f7c1243121a0577313fea488b9a Mon Sep 17 00:00:00 2001 From: Alex Patterson Date: Tue, 22 Nov 2022 19:00:07 -0500 Subject: [PATCH 3/4] fixed continent spelling --- CHANGES.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGES.md b/CHANGES.md index c1a9cfb75e..571582f836 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -6,7 +6,7 @@ - Fix Migration stopping scheduled functions [#4704](https://github.com/appwrite/appwrite/pull/4704) - Fix Migration enabling OAuth providers with data by default [#4704](https://github.com/appwrite/appwrite/pull/4704) - Fix Error pages when OAuth providers are disabled [#4704](https://github.com/appwrite/appwrite/pull/4704) -- Fix Locale API returning Unknown Content [#4761](https://github.com/appwrite/appwrite/pull/4761) +- Fix Locale API returning Unknown continent [#4761](https://github.com/appwrite/appwrite/pull/4761) # Version 1.1.0 ## Features From 20c538ec836fe852aed8427af84112fae311bd95 Mon Sep 17 00:00:00 2001 From: Torsten Dittmann Date: Wed, 23 Nov 2022 18:52:09 +0100 Subject: [PATCH 4/4] chore: update changelog --- CHANGES.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGES.md b/CHANGES.md index 571582f836..3d8b658eea 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,3 +1,7 @@ +# Version 1.1.2 +## Bugs +- Fix Locale API returning Unknown continent [#4761](https://github.com/appwrite/appwrite/pull/4761) + # Version 1.1.1 ## Bugs @@ -6,7 +10,6 @@ - Fix Migration stopping scheduled functions [#4704](https://github.com/appwrite/appwrite/pull/4704) - Fix Migration enabling OAuth providers with data by default [#4704](https://github.com/appwrite/appwrite/pull/4704) - Fix Error pages when OAuth providers are disabled [#4704](https://github.com/appwrite/appwrite/pull/4704) -- Fix Locale API returning Unknown continent [#4761](https://github.com/appwrite/appwrite/pull/4761) # Version 1.1.0 ## Features