localization on backend and frontend completed, added hindi language translations

Author: akhileshdarjee

app/Console/Commands/OriginBackup.php

@@ -76,17 +76,17 @@ public function handle()
                             $this->backupFiles(true); // backup user uploaded files
                         }
 
-                        $this->info('Backup has been created successfully.');
+                        $this->info(__('Backup created successfully'));
                     }
                 } else {
-                    $this->error('Backups are not enabled. Please enable it from Settings');
+                    $this->error(__('Backups are not enabled. Please enable it from Settings'));
                 }
             } else {
-                $this->error('Backups are not enabled. Please enable it from Settings');
+                $this->error(__('Backups are not enabled. Please enable it from Settings'));
             }
         } catch (ProcessFailedException $e) {
-            logger()->error('Backup process failed: ' . str_replace("'", "", $e->getMessage()));
-            $this->error('Backup process has been failed.');
+            logger()->error('Backup creation failed: ' . str_replace("'", "", $e->getMessage()));
+            $this->error(__('Backup creation failed'));
         }
     }
 

app/Http/Controllers/ActivityController.php

@@ -179,7 +179,7 @@ public function getLatestActivities($size)
         foreach ($activities as $act) {
             $icon = $act->icon;
             $description = '';
-            $user = (auth()->user()->id == $act->user_id) ? "You" : $act->user;
+            $user = (auth()->user()->id == $act->user_id) ? __('You') : $act->user;
             $time_diff = $act->created_at->diffForHumans();
 
             if ($act->module == "Auth") {
@@ -189,7 +189,7 @@ public function getLatestActivities($size)
                     $description = $user . " " . __('logged out');
                 }
             } else {
-                $activity_link = $act->module . ': ' . $act->form_title;
+                $activity_link = __($act->module) . ': ' . $act->form_title;
 
                 if ($act->action == "Create") {
                     $description = __('New') . " " . $activity_link . " " . __('created by') . " " . $user;

app/Http/Controllers/Auth/LoginController.php

@@ -114,7 +114,7 @@ public function afterSuccessLogin($request)
         if ($request->ajax()) {
             return response()->json([
                 'success' => true,
-                'msg' => 'User successfully logged in'
+                'msg' => __('Successfully logged in')
             ], 200);
         } else {
             if ($request->filled('redirect_to')) {

app/Http/Controllers/AutocompleteController.php

@@ -267,8 +267,8 @@ public function getUniverseResults($query)
                         if ($data && count($data)) {
                             foreach ($data as $idx => $record) {
                                 array_push($result, [
-                                    'label' => $table['module_label'] . ' <b>' . __(strval($record->{$table['fetch_fields'][1]})) . '</b>', 
-                                    'value' => $table['module_label'] . ' ' . __(strval($record->{$table['fetch_fields'][1]})), 
+                                    'label' => $table['module_label'] . ' <b>' . strval($record->{$table['fetch_fields'][1]}) . '</b>', 
+                                    'value' => $table['module_label'] . ' ' . strval($record->{$table['fetch_fields'][1]}), 
                                     'redirect_to' => route('show.doc', ['slug' => $table['module_slug'], 'id' => $record->id])
                                 ]);
                             }

app/Http/Controllers/BackupController.php

@@ -86,7 +86,7 @@ public function show(Request $request)
 
     public function download(Request $request, $name)
     {
-        $msg = __('You are not authorized to view this page');
+        $msg = __('You are not authorized to download backups');
 
         if (auth()->user()->role == "Administrator" && auth()->user()->username == "admin") {
             if ($name) {
@@ -122,7 +122,7 @@ public function download(Request $request, $name)
 
     public function delete(Request $request, $name)
     {
-        $msg = __('You are not authorized');
+        $msg = __('You are not authorized to delete backups');
         $success = false;
 
         if (auth()->user()->role == "Administrator" && auth()->user()->username == "admin") {
@@ -168,7 +168,7 @@ public function delete(Request $request, $name)
 
     public function create(Request $request)
     {
-        $msg = __('You are not authorized');
+        $msg = __('You are not authorized to create backups');
         $success = false;
 
         if (auth()->user()->role == "Administrator" && auth()->user()->username == "admin") {

app/Http/Controllers/CommonController.php

@@ -7,6 +7,7 @@
 use File;
 use App\Module;
 use App\Activity;
+use App\User;
 
 trait CommonController
 {
@@ -228,4 +229,26 @@ public function getTableSchema($table, $get_nullable = false)
 
         return $table_schema;
     }
+
+    // update locale for user and update the session translations
+    public function updateLocale($locale)
+    {
+        $user_updated = User::where('id', auth()->user()->id)
+            ->update(['locale' => $locale, 'updated_at' => date('Y-m-d H:i:s')]);
+
+        if ($user_updated) {
+            session()->put('locale', $locale);
+            app()->setLocale($locale);
+            session()->forget('translations');
+
+            $translations = [];
+
+            if ($locale != 'en' && File::exists(resource_path('lang/' . $locale . '.json'))) {
+                $translations = File::get(resource_path('lang/' . $locale . '.json'));
+                $translations = json_decode($translations, true);
+            }
+
+            session()->put('translations', $translations);
+        }
+    }
 }

app/Http/Controllers/FormController.php

@@ -276,7 +276,7 @@ public function saveForm($request, $module, $action, $record_exists = null)
             // if record already exists in database while creating
             session()->flash('success', false);
 
-            $message = __($module['display_name']) . ': "' . $request->get($module['link_field']) . '" ' . __('already exist');
+            $message = __($module['display_name']) . ': "' . $request->get($module['link_field']) . '" ' . __('already exists');
             return $this->sendResponse(400, $message);
         } elseif ($action == "update" && $request->get($module['link_field']) != $module['link_field_value']) {
             // if link field value is not matching the request link value

app/Http/Controllers/LanguageController.php

@@ -41,7 +41,7 @@ public function beforeDelete($id)
 
         if ($language) {
             if ($language->locale == 'en') {
-                throw new Exception(__('Cannot delete system default locale: en'));
+                throw new Exception(__('Cannot delete system default language: en'));
             }
         } else {
             throw new Exception(__('No such language found'));

app/Http/Controllers/ListViewController.php

@@ -87,15 +87,15 @@ public function prepareListViewData($request)
     {
         $user_role = auth()->user()->role;
         $table_schema = $this->getTableSchema($this->module['table_name']);
+        $rows = [];
+        $table_columns = [];
 
         if ($request->ajax() || $request->is('api/*')) {
             try {
                 $rows = $this->getRecords($request, $table_schema);
             } catch(Exception $e) {
                 throw new Exception(str_replace("'", "", $e->getMessage()));
             }
-        } else {
-            $rows = [];
         }
 
         if ($user_role == 'System Administrator') {
@@ -106,11 +106,31 @@ public function prepareListViewData($request)
             $can_delete = $this->roleWiseModules($user_role, "Delete", $this->module['name']);
         }
 
+        foreach ($table_schema as $column_name => $column_type) {
+            if (!in_array($column_name, ['avatar', 'password', 'remember_token'])) {
+                $column_label = str_replace("Id", "ID", awesome_case($column_name));
+                $column_label = explode(" ", $column_label);
+
+                foreach ($column_label as $c_idx => $col_part) {
+                    if ($col_part == 'Bg') {
+                        $column_label[$c_idx] = 'Background';
+                    }
+                }
+
+                $column_label = implode(" ", $column_label);
+
+                $table_columns[$column_name] = [
+                    'label' => __($column_label),
+                    'type' => $column_type
+                ];
+            }
+        }
+
         $list_view_data = [
             'module' => $this->module,
             'rows' => $rows,
             'columns' => array_map('trim', explode(",", $this->module['list_view_columns'])),
-            'table_columns' => $table_schema,
+            'table_columns' => $table_columns,
             'can_create' => $can_create,
             'can_delete' => $can_delete
         ];
@@ -279,7 +299,7 @@ public function updateSorting(Request $request)
 
                     $data = [
                         'success' => true,
-                        'msg' => __('List View sorting fields updated for current module')
+                        'msg' => __('Sorting fields has been updated')
                     ];
                 }
             } else {

app/Http/Controllers/ReportController.php

@@ -20,6 +20,13 @@ public function show()
     {
         if (in_array(auth()->user()->role, ["System Administrator", "Administrator"])) {
             $app_reports = config('reports');
+
+            foreach ($app_reports as $report_name => $report) {
+                if (isset($report['allowed_roles']) && $report['allowed_roles'] && !in_array(auth()->user()->role, $report['allowed_roles'])) {
+                    unset($app_reports[$report_name]);
+                }
+            }
+
             return view('admin.layouts.origin.reports')->with(['data' => $app_reports]);
         } else {
             return back()->withInput()->with(['msg' => __('You are not authorized to view "Reports"')]);
@@ -68,7 +75,7 @@ public function showReport(Request $request, $report_name)
                                 $report_data['module_new_record'] = route('new.doc', ['slug' => $report_data['module_slug']]);
                             }
                         } else {
-                            throw new Exception('"' . $report_module . '" Module does not exist. Please update the module in ' . Str::studly($report_name) . ' controller');
+                            throw new Exception('"' . $report_module . '" module does not exist. Please update the module in ' . Str::studly($report_name) . ' controller');
                         }
                     }
 

app/Http/Controllers/SettingsController.php

@@ -3,18 +3,27 @@
 namespace App\Http\Controllers;
 
 use DB;
+use App\Language;
 use App\Http\Controllers\CommonController;
 use Illuminate\Http\Request;
 
 class SettingsController extends Controller
 {
     use CommonController;
 
-    // Show app settings page
     public function show()
     {
         $data['oc_settings'] = $this->getAppSetting();
 
+        $language = Language::select('name', 'locale')
+            ->where('locale', app()->getLocale())
+            ->first();
+
+        if ($language) {
+            $data['oc_settings']['language'] = $language->name;
+            $data['oc_settings']['locale'] = $language->locale;
+        }
+
         $settings_data = [
             'form_data' => isset($data) ? $data : [],
             'form_title' => 'Settings',
@@ -31,12 +40,27 @@ public function show()
         return view('admin.templates.form_view', $settings_data);
     }
 
-    // Save app settings
     public function save(Request $request)
     {
         $settings_data = $request->all();
         unset($settings_data["_token"]);
 
+        if (isset($settings_data['language'])) {
+            unset($settings_data["language"]);
+        }
+
+        $locale = app()->getLocale();
+        $locale_updated = false;
+
+        if (isset($settings_data['locale']) && trim($settings_data['locale'])) {
+            if (trim($settings_data['locale']) != $locale) {
+                $locale = trim($settings_data['locale']);
+                $locale_updated = true;
+            }
+
+            unset($settings_data['locale']);
+        }
+
         foreach ($settings_data as $setting => $value) {
             $result = DB::table('oc_settings')
                 ->where('field_name', $setting)
@@ -54,6 +78,10 @@ public function save(Request $request)
 
         $this->putAppSettingsInSession();
 
+        if ($locale_updated) {
+            $this->updateLocale($locale);
+        }
+
         $data = [
             'success' => true,
             'msg' => __('App settings successfully saved')

app/Http/Controllers/TranslationController.php

@@ -4,6 +4,7 @@
 
 use File;
 use Exception;
+use DB;
 use App\Translation;
 use App\Http\Controllers\CommonController;
 use Illuminate\Http\Request;
@@ -35,32 +36,64 @@ public function beforeSave($request)
             $locale = trim($request->get('locale'));
             $from = trim($request->get('from'));
             $to = trim($request->get('to'));
+            $proceed = true;
+            $error_msg = null;
 
-            $transData = $this->openTranslationFile($locale);
+            $existing = Translation::select('id', 'from', 'locale')
+                ->where(DB::raw('BINARY `from`'), '=', $from)
+                ->where('locale', $locale);
 
             if ($request->filled('id')) {
-                $existing = Translation::select('id', 'from')
-                    ->where('id', trim($request->get('id')))
-                    ->first();
+                $existing = $existing->where('id', '!=', trim($request->get('id')));
+            }
+
+            $existing = $existing->first();
+
+            if ($existing) {
+                $proceed = false;
+                $error_msg = __('Record already exist. Please enter different value for') . ': ' . __('From');
+            }
 
-                if (isset($transData[$existing->from]) || isset($transData[$from])) {
-                    if ($from != $existing->from) {
-                        unset($transData[$existing->from]);
+            if ($proceed) {
+                $transData = $this->openTranslationFile($locale);
+
+                if ($request->filled('id')) {
+                    $existing = Translation::select('id', 'from')
+                        ->where('id', trim($request->get('id')))
+                        ->first();
+
+                    if (isset($transData[$existing->from]) || isset($transData[$from])) {
+                        if ($from != $existing->from) {
+                            unset($transData[$existing->from]);
+                        }
                     }
                 }
-            }
 
-            $transData[$from] = $to;
-            $saved = $this->saveTranslationFile($locale, $transData);
+                $transData[$from] = $to;
+                $saved = $this->saveTranslationFile($locale, $transData);
 
-            if (!$saved) {
-                throw new Exception(__('Cannot save translation file. Please try again'));
+                if (!$saved) {
+                    throw new Exception(__('Cannot save translation file. Please try again'));
+                }
+            } else {
+                throw new Exception($error_msg);
             }
         } else {
             throw new Exception(__('Please provide Language, From & To'));
         }
     }
 
+    // put all functions to be performed after save
+    public function afterSave($data)
+    {
+        $table_name = $data['table_name'];
+        $form_data = $data['form_data'][$table_name];
+
+        if ($form_data['locale'] == app()->getLocale()) {
+            session()->forget('translations');
+        }
+    }
+
     // put all functions to be performed after delete
     public function afterDelete($data)
     {
@@ -90,6 +123,10 @@ public function afterDelete($data)
                 }
             }
         }
+
+        if ($locale == app()->getLocale()) {
+            session()->forget('translations');
+        }
     }
 
     public function openTranslationFile($locale)

app/Http/Controllers/UserController.php

@@ -124,7 +124,7 @@ public function verifyUserEmail(Request $request, $token)
                 $msg = __('Invalid Token or Token Expired');
             }
         } else {
-            $msg = __('Please provide token to verify email address');
+            $msg = __('Please provide token to verify email');
         }
 
         if ($request->ajax()) {