From c9f75cd3d7251477d8b90053a5ac498aba31bee4 Mon Sep 17 00:00:00 2001 From: cuneytsenturk Date: Wed, 19 Dec 2018 15:36:40 +0300 Subject: [PATCH] Apps get multi languages --- app/Http/Middleware/ApiCompany.php | 3 +-- app/Http/ViewComposers/Modules.php | 2 +- app/Traits/Modules.php | 1 + app/Traits/SiteApi.php | 3 ++- modules/PaypalStandard/Listeners/PaypalStandardGateway.php | 2 +- 5 files changed, 6 insertions(+), 5 deletions(-) diff --git a/app/Http/Middleware/ApiCompany.php b/app/Http/Middleware/ApiCompany.php index b054ddd0d..f081ac07b 100644 --- a/app/Http/Middleware/ApiCompany.php +++ b/app/Http/Middleware/ApiCompany.php @@ -36,5 +36,4 @@ class ApiCompany return $next($request); } - -} \ No newline at end of file +} diff --git a/app/Http/ViewComposers/Modules.php b/app/Http/ViewComposers/Modules.php index 1b02c939f..0f1ad2d9f 100644 --- a/app/Http/ViewComposers/Modules.php +++ b/app/Http/ViewComposers/Modules.php @@ -20,7 +20,7 @@ class Modules public function compose(View $view) { if (setting('general.api_token')) { - $categories = Cache::remember('modules.categories', Date::now()->addHour(6), function () { + $categories = Cache::remember('modules.categories.' . language()->getShortCode(), Date::now()->addHour(6), function () { return collect($this->getCategories())->pluck('name', 'slug') ->prepend(trans('general.all_type', ['type' => trans_choice('general.categories', 2)]), ''); }); diff --git a/app/Traits/Modules.php b/app/Traits/Modules.php index 7f1c1d33a..56681268c 100644 --- a/app/Traits/Modules.php +++ b/app/Traits/Modules.php @@ -528,6 +528,7 @@ trait Modules 'Accept' => 'application/json', 'Referer' => env('APP_URL'), 'Akaunting' => version('short'), + 'Language' => language()->getShortCode() ]; $data['http_errors'] = false; diff --git a/app/Traits/SiteApi.php b/app/Traits/SiteApi.php index 3a07eb060..173475683 100644 --- a/app/Traits/SiteApi.php +++ b/app/Traits/SiteApi.php @@ -18,7 +18,8 @@ trait SiteApi 'Authorization' => 'Bearer ' . setting('general.api_token'), 'Accept' => 'application/json', 'Referer' => env('APP_URL'), - 'Akaunting' => version('short') + 'Akaunting' => version('short'), + 'Language' => language()->getShortCode() ); $data['http_errors'] = false; diff --git a/modules/PaypalStandard/Listeners/PaypalStandardGateway.php b/modules/PaypalStandard/Listeners/PaypalStandardGateway.php index e6001a9ea..a531803e2 100644 --- a/modules/PaypalStandard/Listeners/PaypalStandardGateway.php +++ b/modules/PaypalStandard/Listeners/PaypalStandardGateway.php @@ -1,6 +1,6 @@