From d256638904eb9a0382fc2a81d3b68a6369074f8e Mon Sep 17 00:00:00 2001 From: Shift Date: Sat, 7 Jan 2023 20:56:21 +0000 Subject: [PATCH] Move `resources/lang` folder --- .../Controllers/Admin/helpdesk/LanguageController.php | 8 ++++---- app/Http/Controllers/Client/helpdesk/UnAuthController.php | 4 ++-- .../Controllers/Installer/helpdesk/InstallController.php | 2 +- {resources/lang => lang}/de/lang.php | 0 {resources/lang => lang}/de/pagination.php | 0 {resources/lang => lang}/de/passwords.php | 0 {resources/lang => lang}/de/validation.php | 0 {resources/lang => lang}/en/auth.php | 0 {resources/lang => lang}/en/datatables.php | 0 {resources/lang => lang}/en/lang.php | 0 {resources/lang => lang}/en/pagination.php | 0 {resources/lang => lang}/en/passwords.php | 0 {resources/lang => lang}/en/validation.php | 0 {resources/lang => lang}/es/lang.php | 0 {resources/lang => lang}/es/pagination.php | 0 {resources/lang => lang}/es/passwords.php | 0 {resources/lang => lang}/es/validation.php | 0 {resources/lang => lang}/fr/lang.php | 0 {resources/lang => lang}/fr/pagination.php | 0 {resources/lang => lang}/fr/passwords.php | 0 {resources/lang => lang}/fr/validation.php | 0 {resources/lang => lang}/it/lang.php | 0 {resources/lang => lang}/it/pagination.php | 0 {resources/lang => lang}/it/passwords.php | 0 {resources/lang => lang}/it/validation.php | 0 {resources/lang => lang}/nl/lang.php | 0 {resources/lang => lang}/nl/pagination.php | 0 {resources/lang => lang}/nl/passwords.php | 0 {resources/lang => lang}/nl/validation.php | 0 {resources/lang => lang}/pt-br/lang.php | 0 {resources/lang => lang}/pt-br/pagination.php | 0 {resources/lang => lang}/pt-br/passwords.php | 0 {resources/lang => lang}/pt-br/validation.php | 0 {resources/lang => lang}/pt/lang.php | 0 {resources/lang => lang}/pt/pagination.php | 0 {resources/lang => lang}/pt/passwords.php | 0 {resources/lang => lang}/pt/validation.php | 0 {resources/lang => lang}/ru/datatables.php | 0 {resources/lang => lang}/ru/lang.php | 0 {resources/lang => lang}/ru/message.php | 0 {resources/lang => lang}/ru/pagination.php | 0 {resources/lang => lang}/ru/passwords.php | 0 {resources/lang => lang}/ru/table.php | 0 {resources/lang => lang}/ru/validation.php | 0 {resources/lang => lang}/zh-hans/lang.php | 0 {resources/lang => lang}/zh-hans/pagination.php | 0 {resources/lang => lang}/zh-hans/password.php | 0 {resources/lang => lang}/zh-hans/validation.php | 0 48 files changed, 7 insertions(+), 7 deletions(-) rename {resources/lang => lang}/de/lang.php (100%) rename {resources/lang => lang}/de/pagination.php (100%) rename {resources/lang => lang}/de/passwords.php (100%) rename {resources/lang => lang}/de/validation.php (100%) rename {resources/lang => lang}/en/auth.php (100%) rename {resources/lang => lang}/en/datatables.php (100%) rename {resources/lang => lang}/en/lang.php (100%) rename {resources/lang => lang}/en/pagination.php (100%) rename {resources/lang => lang}/en/passwords.php (100%) rename {resources/lang => lang}/en/validation.php (100%) rename {resources/lang => lang}/es/lang.php (100%) rename {resources/lang => lang}/es/pagination.php (100%) rename {resources/lang => lang}/es/passwords.php (100%) rename {resources/lang => lang}/es/validation.php (100%) rename {resources/lang => lang}/fr/lang.php (100%) rename {resources/lang => lang}/fr/pagination.php (100%) rename {resources/lang => lang}/fr/passwords.php (100%) rename {resources/lang => lang}/fr/validation.php (100%) rename {resources/lang => lang}/it/lang.php (100%) rename {resources/lang => lang}/it/pagination.php (100%) rename {resources/lang => lang}/it/passwords.php (100%) rename {resources/lang => lang}/it/validation.php (100%) rename {resources/lang => lang}/nl/lang.php (100%) rename {resources/lang => lang}/nl/pagination.php (100%) rename {resources/lang => lang}/nl/passwords.php (100%) rename {resources/lang => lang}/nl/validation.php (100%) rename {resources/lang => lang}/pt-br/lang.php (100%) rename {resources/lang => lang}/pt-br/pagination.php (100%) rename {resources/lang => lang}/pt-br/passwords.php (100%) rename {resources/lang => lang}/pt-br/validation.php (100%) rename {resources/lang => lang}/pt/lang.php (100%) rename {resources/lang => lang}/pt/pagination.php (100%) rename {resources/lang => lang}/pt/passwords.php (100%) rename {resources/lang => lang}/pt/validation.php (100%) rename {resources/lang => lang}/ru/datatables.php (100%) rename {resources/lang => lang}/ru/lang.php (100%) rename {resources/lang => lang}/ru/message.php (100%) rename {resources/lang => lang}/ru/pagination.php (100%) rename {resources/lang => lang}/ru/passwords.php (100%) rename {resources/lang => lang}/ru/table.php (100%) rename {resources/lang => lang}/ru/validation.php (100%) rename {resources/lang => lang}/zh-hans/lang.php (100%) rename {resources/lang => lang}/zh-hans/pagination.php (100%) rename {resources/lang => lang}/zh-hans/password.php (100%) rename {resources/lang => lang}/zh-hans/validation.php (100%) diff --git a/app/Http/Controllers/Admin/helpdesk/LanguageController.php b/app/Http/Controllers/Admin/helpdesk/LanguageController.php index 37ce26b62..e38d354e1 100644 --- a/app/Http/Controllers/Admin/helpdesk/LanguageController.php +++ b/app/Http/Controllers/Admin/helpdesk/LanguageController.php @@ -80,7 +80,7 @@ class LanguageController extends Controller */ public function getLanguages() { - $path = base_path('resources/lang'); + $path = base_path('lang'); $values = scandir($path); //Extracts names of directories present in lang directory $values = array_slice($values, 2); // skips array element $value[0] = '.' & $value[1] = '..' $sysLanguage = \Cache::get('language'); @@ -154,7 +154,7 @@ class LanguageController extends Controller } else { //Checking if package already exists or not in lang folder - $path = base_path('resources/lang'); + $path = base_path('lang'); if (in_array(strtolower(Request::get('iso-code')), scandir($path))) { //sending back with error message @@ -173,7 +173,7 @@ class LanguageController extends Controller if (Request::file('File')->isValid()) { $name = Request::file('File')->getClientOriginalName(); //uploaded file's original name $destinationPath = base_path('public/uploads/'); // defining uploading path - $extractpath = base_path('resources/lang').'/'.strtolower(Request::get('iso-code')); //defining extracting path + $extractpath = base_path('lang').'/'.strtolower(Request::get('iso-code')); //defining extracting path mkdir($extractpath); //creating directroy for extracting uploadd file //mkdir($destinationPath); Request::file('File')->move($destinationPath, $name); // uploading file to given path @@ -235,7 +235,7 @@ class LanguageController extends Controller { if ($lang !== App::getLocale()) { if ($lang !== Config::get('app.fallback_locale')) { - $deletePath = base_path('resources/lang').'/'.$lang; //define file path to delete + $deletePath = base_path('lang').'/'.$lang; //define file path to delete $success = File::deleteDirectory($deletePath); //remove extracted folder and it's subfolder from lang if ($success) { //sending back with success message diff --git a/app/Http/Controllers/Client/helpdesk/UnAuthController.php b/app/Http/Controllers/Client/helpdesk/UnAuthController.php index cfdaca320..c918f2b55 100755 --- a/app/Http/Controllers/Client/helpdesk/UnAuthController.php +++ b/app/Http/Controllers/Client/helpdesk/UnAuthController.php @@ -332,7 +332,7 @@ class UnAuthController extends Controller // return Cache::get('language'); //} else return 'false'; // Cache::put('language',$) - $path = base_path('resources/lang'); // Path to check available language packages + $path = base_path('lang'); // Path to check available language packages if (array_key_exists($lang, \Config::get('languages')) && in_array($lang, scandir($path))) { // dd(array_key_exists($lang, Config::get('languages'))); // app()->setLocale($lang); @@ -426,7 +426,7 @@ class UnAuthController extends Controller */ public static function changeUserLanguage($lang) { - $path = base_path('resources/lang'); // Path to check available language packages + $path = base_path('lang'); // Path to check available language packages if (array_key_exists($lang, \Config::get('languages')) && in_array($lang, scandir($path))) { if (\Auth::check()) { $id = \Auth::user()->id; diff --git a/app/Http/Controllers/Installer/helpdesk/InstallController.php b/app/Http/Controllers/Installer/helpdesk/InstallController.php index e308f6075..8021d35dd 100644 --- a/app/Http/Controllers/Installer/helpdesk/InstallController.php +++ b/app/Http/Controllers/Installer/helpdesk/InstallController.php @@ -256,7 +256,7 @@ class InstallController extends Controller return redirect()->back()->with('fails', 'invalid date-time format'); } - $lang_path = base_path('resources/lang'); + $lang_path = base_path('lang'); //check user input language package is available or not in the system if (array_key_exists($language, \Config::get('languages')) && in_array($language, scandir($lang_path))) { diff --git a/resources/lang/de/lang.php b/lang/de/lang.php similarity index 100% rename from resources/lang/de/lang.php rename to lang/de/lang.php diff --git a/resources/lang/de/pagination.php b/lang/de/pagination.php similarity index 100% rename from resources/lang/de/pagination.php rename to lang/de/pagination.php diff --git a/resources/lang/de/passwords.php b/lang/de/passwords.php similarity index 100% rename from resources/lang/de/passwords.php rename to lang/de/passwords.php diff --git a/resources/lang/de/validation.php b/lang/de/validation.php similarity index 100% rename from resources/lang/de/validation.php rename to lang/de/validation.php diff --git a/resources/lang/en/auth.php b/lang/en/auth.php similarity index 100% rename from resources/lang/en/auth.php rename to lang/en/auth.php diff --git a/resources/lang/en/datatables.php b/lang/en/datatables.php similarity index 100% rename from resources/lang/en/datatables.php rename to lang/en/datatables.php diff --git a/resources/lang/en/lang.php b/lang/en/lang.php similarity index 100% rename from resources/lang/en/lang.php rename to lang/en/lang.php diff --git a/resources/lang/en/pagination.php b/lang/en/pagination.php similarity index 100% rename from resources/lang/en/pagination.php rename to lang/en/pagination.php diff --git a/resources/lang/en/passwords.php b/lang/en/passwords.php similarity index 100% rename from resources/lang/en/passwords.php rename to lang/en/passwords.php diff --git a/resources/lang/en/validation.php b/lang/en/validation.php similarity index 100% rename from resources/lang/en/validation.php rename to lang/en/validation.php diff --git a/resources/lang/es/lang.php b/lang/es/lang.php similarity index 100% rename from resources/lang/es/lang.php rename to lang/es/lang.php diff --git a/resources/lang/es/pagination.php b/lang/es/pagination.php similarity index 100% rename from resources/lang/es/pagination.php rename to lang/es/pagination.php diff --git a/resources/lang/es/passwords.php b/lang/es/passwords.php similarity index 100% rename from resources/lang/es/passwords.php rename to lang/es/passwords.php diff --git a/resources/lang/es/validation.php b/lang/es/validation.php similarity index 100% rename from resources/lang/es/validation.php rename to lang/es/validation.php diff --git a/resources/lang/fr/lang.php b/lang/fr/lang.php similarity index 100% rename from resources/lang/fr/lang.php rename to lang/fr/lang.php diff --git a/resources/lang/fr/pagination.php b/lang/fr/pagination.php similarity index 100% rename from resources/lang/fr/pagination.php rename to lang/fr/pagination.php diff --git a/resources/lang/fr/passwords.php b/lang/fr/passwords.php similarity index 100% rename from resources/lang/fr/passwords.php rename to lang/fr/passwords.php diff --git a/resources/lang/fr/validation.php b/lang/fr/validation.php similarity index 100% rename from resources/lang/fr/validation.php rename to lang/fr/validation.php diff --git a/resources/lang/it/lang.php b/lang/it/lang.php similarity index 100% rename from resources/lang/it/lang.php rename to lang/it/lang.php diff --git a/resources/lang/it/pagination.php b/lang/it/pagination.php similarity index 100% rename from resources/lang/it/pagination.php rename to lang/it/pagination.php diff --git a/resources/lang/it/passwords.php b/lang/it/passwords.php similarity index 100% rename from resources/lang/it/passwords.php rename to lang/it/passwords.php diff --git a/resources/lang/it/validation.php b/lang/it/validation.php similarity index 100% rename from resources/lang/it/validation.php rename to lang/it/validation.php diff --git a/resources/lang/nl/lang.php b/lang/nl/lang.php similarity index 100% rename from resources/lang/nl/lang.php rename to lang/nl/lang.php diff --git a/resources/lang/nl/pagination.php b/lang/nl/pagination.php similarity index 100% rename from resources/lang/nl/pagination.php rename to lang/nl/pagination.php diff --git a/resources/lang/nl/passwords.php b/lang/nl/passwords.php similarity index 100% rename from resources/lang/nl/passwords.php rename to lang/nl/passwords.php diff --git a/resources/lang/nl/validation.php b/lang/nl/validation.php similarity index 100% rename from resources/lang/nl/validation.php rename to lang/nl/validation.php diff --git a/resources/lang/pt-br/lang.php b/lang/pt-br/lang.php similarity index 100% rename from resources/lang/pt-br/lang.php rename to lang/pt-br/lang.php diff --git a/resources/lang/pt-br/pagination.php b/lang/pt-br/pagination.php similarity index 100% rename from resources/lang/pt-br/pagination.php rename to lang/pt-br/pagination.php diff --git a/resources/lang/pt-br/passwords.php b/lang/pt-br/passwords.php similarity index 100% rename from resources/lang/pt-br/passwords.php rename to lang/pt-br/passwords.php diff --git a/resources/lang/pt-br/validation.php b/lang/pt-br/validation.php similarity index 100% rename from resources/lang/pt-br/validation.php rename to lang/pt-br/validation.php diff --git a/resources/lang/pt/lang.php b/lang/pt/lang.php similarity index 100% rename from resources/lang/pt/lang.php rename to lang/pt/lang.php diff --git a/resources/lang/pt/pagination.php b/lang/pt/pagination.php similarity index 100% rename from resources/lang/pt/pagination.php rename to lang/pt/pagination.php diff --git a/resources/lang/pt/passwords.php b/lang/pt/passwords.php similarity index 100% rename from resources/lang/pt/passwords.php rename to lang/pt/passwords.php diff --git a/resources/lang/pt/validation.php b/lang/pt/validation.php similarity index 100% rename from resources/lang/pt/validation.php rename to lang/pt/validation.php diff --git a/resources/lang/ru/datatables.php b/lang/ru/datatables.php similarity index 100% rename from resources/lang/ru/datatables.php rename to lang/ru/datatables.php diff --git a/resources/lang/ru/lang.php b/lang/ru/lang.php similarity index 100% rename from resources/lang/ru/lang.php rename to lang/ru/lang.php diff --git a/resources/lang/ru/message.php b/lang/ru/message.php similarity index 100% rename from resources/lang/ru/message.php rename to lang/ru/message.php diff --git a/resources/lang/ru/pagination.php b/lang/ru/pagination.php similarity index 100% rename from resources/lang/ru/pagination.php rename to lang/ru/pagination.php diff --git a/resources/lang/ru/passwords.php b/lang/ru/passwords.php similarity index 100% rename from resources/lang/ru/passwords.php rename to lang/ru/passwords.php diff --git a/resources/lang/ru/table.php b/lang/ru/table.php similarity index 100% rename from resources/lang/ru/table.php rename to lang/ru/table.php diff --git a/resources/lang/ru/validation.php b/lang/ru/validation.php similarity index 100% rename from resources/lang/ru/validation.php rename to lang/ru/validation.php diff --git a/resources/lang/zh-hans/lang.php b/lang/zh-hans/lang.php similarity index 100% rename from resources/lang/zh-hans/lang.php rename to lang/zh-hans/lang.php diff --git a/resources/lang/zh-hans/pagination.php b/lang/zh-hans/pagination.php similarity index 100% rename from resources/lang/zh-hans/pagination.php rename to lang/zh-hans/pagination.php diff --git a/resources/lang/zh-hans/password.php b/lang/zh-hans/password.php similarity index 100% rename from resources/lang/zh-hans/password.php rename to lang/zh-hans/password.php diff --git a/resources/lang/zh-hans/validation.php b/lang/zh-hans/validation.php similarity index 100% rename from resources/lang/zh-hans/validation.php rename to lang/zh-hans/validation.php