From f3252fc3d3ba46c2c9338d8c05bcf9e290df0a22 Mon Sep 17 00:00:00 2001 From: Everly Precia Suresh Date: Wed, 20 Apr 2022 16:19:50 +0000 Subject: [PATCH 1/4] cleanup code for locale --- app/controllers/api/locale.php | 34 ++++++++++------------------------ 1 file changed, 10 insertions(+), 24 deletions(-) diff --git a/app/controllers/api/locale.php b/app/controllers/api/locale.php index 34018f6e90..d3a0916960 100644 --- a/app/controllers/api/locale.php +++ b/app/controllers/api/locale.php @@ -20,12 +20,8 @@ App::get('/v1/locale') ->inject('response') ->inject('locale') ->inject('geodb') - ->action(function ($request, $response, $locale, $geodb) { - /** @var Appwrite\Utopia\Request $request */ - /** @var Appwrite\Utopia\Response $response */ - /** @var Utopia\Locale\Locale $locale */ - /** @var MaxMind\Db\Reader $geodb */ - + ->action(function (Request $request, Response $response, Locale $locale, Reader $geodb) { + $eu = Config::getParam('locale-eu'); $currencies = Config::getParam('locale-currencies'); $output = []; @@ -82,10 +78,8 @@ App::get('/v1/locale/countries') ->label('sdk.response.model', Response::MODEL_COUNTRY_LIST) ->inject('response') ->inject('locale') - ->action(function ($response, $locale) { - /** @var Appwrite\Utopia\Response $response */ - /** @var Utopia\Locale\Locale $locale */ - + ->action(function (Response $response, Locale $locale) { + $list = Config::getParam('locale-countries'); /* @var $list array */ $output = []; @@ -116,9 +110,7 @@ App::get('/v1/locale/countries/eu') ->label('sdk.response.model', Response::MODEL_COUNTRY_LIST) ->inject('response') ->inject('locale') - ->action(function ($response, $locale) { - /** @var Appwrite\Utopia\Response $response */ - /** @var Utopia\Locale\Locale $locale */ + ->action(function (Response $response, Locale $locale) { $eu = Config::getParam('locale-eu'); $output = []; @@ -152,10 +144,8 @@ App::get('/v1/locale/countries/phones') ->label('sdk.response.model', Response::MODEL_PHONE_LIST) ->inject('response') ->inject('locale') - ->action(function ($response, $locale) { - /** @var Appwrite\Utopia\Response $response */ - /** @var Utopia\Locale\Locale $locale */ - + ->action(function (Response $response, Locale $locale) { + $list = Config::getParam('locale-phones'); /* @var $list array */ $output = []; @@ -187,9 +177,7 @@ App::get('/v1/locale/continents') ->label('sdk.response.model', Response::MODEL_CONTINENT_LIST) ->inject('response') ->inject('locale') - ->action(function ($response, $locale) { - /** @var Appwrite\Utopia\Response $response */ - /** @var Utopia\Locale\Locale $locale */ + ->action(function (Response $response,Locale $locale) { $list = Config::getParam('locale-continents'); /* @var $list array */ @@ -219,8 +207,7 @@ App::get('/v1/locale/currencies') ->label('sdk.response.type', Response::CONTENT_TYPE_JSON) ->label('sdk.response.model', Response::MODEL_CURRENCY_LIST) ->inject('response') - ->action(function ($response) { - /** @var Appwrite\Utopia\Response $response */ + ->action(function (Response $response) { $list = Config::getParam('locale-currencies'); @@ -242,8 +229,7 @@ App::get('/v1/locale/languages') ->label('sdk.response.type', Response::CONTENT_TYPE_JSON) ->label('sdk.response.model', Response::MODEL_LANGUAGE_LIST) ->inject('response') - ->action(function ($response) { - /** @var Appwrite\Utopia\Response $response */ + ->action(function (Response $response) { $list = Config::getParam('locale-languages'); From 277897eefca5c0989ee1f775348a8eff136acfba Mon Sep 17 00:00:00 2001 From: Everly Precia Suresh Date: Wed, 20 Apr 2022 16:44:34 +0000 Subject: [PATCH 2/4] push changes --- app/controllers/api/locale.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/app/controllers/api/locale.php b/app/controllers/api/locale.php index d3a0916960..e97c50b16d 100644 --- a/app/controllers/api/locale.php +++ b/app/controllers/api/locale.php @@ -2,8 +2,11 @@ use Utopia\Database\Document; use Appwrite\Utopia\Response; +use Appwrite\Utopia\Request; use Utopia\App; use Utopia\Config\Config; +use Utopia\Locale\Locale; +use MaxMind\Db\Reader; App::get('/v1/locale') ->desc('Get User Locale') From f5ca72b6122b26e8274d4ec8fdd83d61c6a1983a Mon Sep 17 00:00:00 2001 From: Everly Precia Suresh Date: Thu, 21 Apr 2022 02:47:51 +0000 Subject: [PATCH 3/4] add space --- app/controllers/api/locale.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/api/locale.php b/app/controllers/api/locale.php index e97c50b16d..6c8f7797a0 100644 --- a/app/controllers/api/locale.php +++ b/app/controllers/api/locale.php @@ -180,7 +180,7 @@ App::get('/v1/locale/continents') ->label('sdk.response.model', Response::MODEL_CONTINENT_LIST) ->inject('response') ->inject('locale') - ->action(function (Response $response,Locale $locale) { + ->action(function (Response $response, Locale $locale) { $list = Config::getParam('locale-continents'); /* @var $list array */ From ea4d3fb76b41f959e02b5f0a6d17ca52c0c3d171 Mon Sep 17 00:00:00 2001 From: Everly Precia Suresh Date: Sun, 24 Apr 2022 04:51:28 +0000 Subject: [PATCH 4/4] regroup namespaces --- app/controllers/api/locale.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/controllers/api/locale.php b/app/controllers/api/locale.php index 6c8f7797a0..bd3891a893 100644 --- a/app/controllers/api/locale.php +++ b/app/controllers/api/locale.php @@ -1,12 +1,12 @@ desc('Get User Locale')