Merge remote-tracking branch 'origin/pr-8202' into development

ladybirdweb · Oct 26, 2023 · 8e8e1e5 · 8e8e1e5
2 parents 13b88b5 + 75cfc52
commit 8e8e1e5
Show file tree

Hide file tree

Showing 69 changed files with 2,207 additions and 204 deletions.
diff --git a/app/FaveoLog/lang/ar/lang.php b/app/FaveoLog/lang/ar/lang.php
@@ -0,0 +1,7 @@
+<?php
+
+return[
+    'logs'        => 'مؤلف',
+    'system_logs' => 'سجلات النظام',
+
+];
diff --git a/app/FaveoLog/lang/en/lang.php b/app/FaveoLog/lang/en/lang.php
@@ -1,5 +1,6 @@
 <?php
 
 return [
-    'logs' => 'Logs',
+    'logs'        => 'Logs',
+    'system_logs' => 'System logs',
 ];
diff --git a/app/FaveoLog/views/log.blade.php b/app/FaveoLog/views/log.blade.php
@@ -41,10 +41,10 @@ class="nav-link active"
 <div class="container-fluid">
     <div class="card card-light">
         <div class="card-header">
-            <h3 class="card-title">System Logs</h3>
+            <h3 class="card-title">{{Lang::get('log::lang.system_logs')}}</h3>
             <div class="card-tools">
-                <a href="?dl={{ base64_encode($current_file) }}" class="btn btn-primary btn-sm text-white"><span class="fas fa-download"></span> Download file</a>
-                <a id="delete-log" href="?del={{ base64_encode($current_file) }}" class="btn btn-danger btn-sm text-white"><span class="fas fa-trash"></span> Delete file</a>
+                <a href="?dl={{ base64_encode($current_file) }}" class="btn btn-primary btn-sm text-white"><span class="fas fa-download"></span>{{trans('lang.download_file')}}</a>
+                <a id="delete-log" href="?del={{ base64_encode($current_file) }}" class="btn btn-danger btn-sm text-white"><span class="fas fa-trash"></span>{{trans('lang.delete_file')}}</a>
             </div>
         </div>
         <div class="card-body">
@@ -61,7 +61,7 @@ class="nav-link active"
                 <div class="col-md-10 table-container">
                     @if ($logs === null)
                     <div>
-                        Log file >50M, please download it.
+                        {{trans('lang.log_file_50M_please_download_it.')}}
                     </div>
                     @else
                     <table id="table-log" class="table table-striped">

diff --git a/app/FaveoStorage/lang/ar/lang.php b/app/FaveoStorage/lang/ar/lang.php
@@ -0,0 +1,9 @@
+<?php
+
+return[
+    'storage'                       => 'تخزين',
+    'root'                          => 'جذر',
+    'system_logs'                   => 'سجلات النظام',
+    'default'                       => 'الافتراضي',
+    'save'                          => 'حفظ',
+];
diff --git a/app/FaveoStorage/lang/en/lang.php b/app/FaveoStorage/lang/en/lang.php
@@ -13,4 +13,5 @@
     'container' => 'Container',
     'endpoint'  => 'End Point',
     'url_type'  => 'Url Type',
+    'save'      => 'Save',
 ];
diff --git a/app/FaveoStorage/views/settings.blade.php b/app/FaveoStorage/views/settings.blade.php
@@ -114,7 +114,7 @@ class="nav-link active"
         <!-- /.box-body -->
     </div>
     <div class="card-footer">
-        {!! Form::submit('Save',['class'=>'btn btn-success']) !!}
+        {!! Form::submit(Lang::get('storage::lang.save'),['class'=>'btn btn-success']) !!}
         {!! Form::close() !!}
     </div>
     <!-- /.box -->

diff --git a/app/Http/Controllers/Admin/helpdesk/SettingsController.php b/app/Http/Controllers/Admin/helpdesk/SettingsController.php
@@ -763,7 +763,7 @@ public function deleteNotificationLog()
     {
         $days = Input::get('no_of_days');
         if ($days == null) {
-            return redirect()->back()->with('fails', 'Please enter valid no of days');
+            return redirect()->back()->with('fails', \Illuminate\Support\Facades\Lang::get('lang.please_enter_valid_no_days'));
         }
         $date = new DateTime();
         $date->modify($days.' day');

diff --git a/app/Http/Controllers/Admin/helpdesk/UrlSettingController.php b/app/Http/Controllers/Admin/helpdesk/UrlSettingController.php
@@ -36,7 +36,7 @@ public function postSettings(Request $request)
             $string = $string_www.$sting_ssl;
             $this->writeHtaccess($string);
 
-            return redirect()->back()->with('success', 'updated');
+            return redirect()->back()->with('success', trans('lang.updated'));
         } catch (Exception $ex) {
             dd($ex);
 

diff --git a/app/Http/Controllers/Agent/helpdesk/OrganizationController.php b/app/Http/Controllers/Agent/helpdesk/OrganizationController.php
@@ -108,15 +108,15 @@ public function org_list()
 			        <div class="modal-dialog">
 			            <div class="modal-content">
                 			<div class="modal-header">
-                                <h4 class="modal-title">Are You Sure ?</h4>
+                                 <h4 class="modal-title">'.\Lang::get('lang.are_you_sure').'</h4>
                     			<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
                 			</div>
                 			<div class="modal-body">
                 				'.$model->user_name.'
                 			</div>
                 			<div class="modal-footer justify-content-between">
-                    			<button type="button" class="btn btn-default" data-dismiss="modal" id="dismis2">Close</button>
-                    			<a href="'.route('org.delete', $model->id).'"><button class="btn btn-danger">delete</button></a>
+                    			<button type="button" class="btn btn-default" data-dismiss="modal" id="dismis2">'.\Lang::get('lang.close').'</button>
+                    			<a href="'.route('org.delete', $model->id).'"><button class="btn btn-danger">'.\Lang::get('lang.delete').'</button></a>
                 			</div>
             			</div><!-- /.modal-content -->
         			</div><!-- /.modal-dialog -->

diff --git a/app/Http/Controllers/Agent/kb/ArticleController.php b/app/Http/Controllers/Agent/kb/ArticleController.php
@@ -91,15 +91,15 @@ public function getData()
         			<div class="modal-dialog">
             			<div class="modal-content">
                 			<div class="modal-header">
-                                <h4 class="modal-title">Delete</h4>
+                                <h4 class="modal-title">'.Lang::get('lang.delete').'</h4>
                     			<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
                 			</div>
                 			<div class="modal-body">
-                				Are you sure you want to delete <b> '.$model->name.' </b> ?
+                				<span>'.Lang::get('lang.are_you_sure_you_want_to_delete').'</span>&nbsp; <b> '.$model->name.' </b> ?
                 			</div>
                 			<div class="modal-footer justify-content-between">
-                    			<button type="button" class="btn btn-default" data-dismiss="modal" id="dismis2">Close</button>
-                    			<a href='.url("article/delete/$model->slug").'><button class="btn btn-danger">delete</button></a>
+                    			<button type="button" class="btn btn-default" data-dismiss="modal" id="dismis2">'.Lang::get('lang.close').'</button>
+                    			<a href='.url("article/delete/$model->slug").'><button class="btn btn-danger">'.Lang::get('lang.delete').'</button></a>
                 			</div>
             			</div>
         			</div>

diff --git a/app/Http/Controllers/Agent/kb/PageController.php b/app/Http/Controllers/Agent/kb/PageController.php
@@ -6,7 +6,6 @@
 use App\Http\Controllers\Controller;
 use App\Http\Requests\kb\PageRequest;
 // request
-use App\Http\Requests\kb\PageUpdate;
 use App\Model\kb\Page;
 use Datatable;
 // Model
@@ -91,15 +90,15 @@ public function getData()
         			<div class="modal-dialog">
             			<div class="modal-content">
                 			<div class="modal-header">
-                                <h4 class="modal-title">Delete</h4>
+                                <h4 class="modal-title">'.Lang::get('lang.delete').'</h4>
                     			<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
                 			</div>
                 			<div class="modal-body">
-                				Are you sure you want to delete <b>'.$model->name.'</b> ?
+                			<span>'.Lang::get('lang.are_you_sure_you_want_to_delete').'</span>&nbsp;<b>'.$model->name.'</b> ?
                 			</div>
                 			<div class="modal-footer justify-content-between">
-	                    		<button type="button" class="btn btn-default" data-dismiss="modal" id="dismis2">Close</button>
-    			                <a href="page/delete/'.$model->id.'"><button class="btn btn-danger">Delete</button></a>
+	                    		<button type="button" class="btn btn-default" data-dismiss="modal" id="dismis2">'.Lang::get('lang.close').'</button>
+    			                <a href="page/delete/'.$model->id.'"><button class="btn btn-danger">'.Lang::get('lang.delete').'</button></a>
 			                </div>
 		            	</div>
 			        </div>

diff --git a/app/Http/Controllers/Common/SettingsController.php b/app/Http/Controllers/Common/SettingsController.php
@@ -214,7 +214,7 @@ public function edit_social_buttons($id, Widgets $widgets, Request $request)
         try {
             $widget->save();
 
-            return redirect()->back()->with('success', $widget->name.' Saved Successfully');
+            return redirect()->back()->with('success', $widget->name.trans('lang.save-successful'));
         } catch (Exception $e) {
             return redirect()->back()->with('fails', $e->errorInfo[2]);
         }

diff --git a/app/Http/Controllers/Job/QueueController.php b/app/Http/Controllers/Job/QueueController.php
@@ -70,7 +70,7 @@ public function update($id, QueueRequest $request)
                 }
             }
 
-            return redirect()->back()->with('success', 'Updated');
+            return redirect()->back()->with('success', trans('lang.updated'));
         } catch (Exception $ex) {
             return redirect()->back()->with('fails', $ex->getMessage());
         }
@@ -95,7 +95,7 @@ public function activate($id)
             $queue->status = 1;
             $queue->save();
 
-            return redirect()->back()->with('success', 'Activated');
+            return redirect()->back()->with('success', trans('lang.activated'));
         } catch (Exception $ex) {
             return redirect()->back()->with('fails', $ex->getMessage());
         }

diff --git a/app/Http/Requests/helpdesk/Job/TaskRequest.php b/app/Http/Requests/helpdesk/Job/TaskRequest.php
@@ -36,9 +36,9 @@ public function rules()
     public function messages()
     {
         return [
-            'fetching-commands.required_if'     => 'Please choose your Email Fetching timing',
-            'notification-commands.required_if' => 'Please choose your Email Notification timing',
-            'work-commands.required_if'         => 'Please choose your Auto-close Workflow timing',
+            'fetching-commands.required_if'     => trans('lang.Please_choose_your_Email_Fetching_timing'),
+            'notification-commands.required_if' => trans('lang.Please_choose_your_ Email_ Notification_timing'),
+            'work-commands.required_if'         => trans('lang.Please_choose_your_Auto-close_Workflow_timing'),
             'workflow-dailyAt.required_if'      => 'Please enter the time for Auto-close Workflow timing',
             'notification-dailyAt.required_if'  => 'Please enter the time for Email Notification timing',
             'fetching-dailyAt.required_if'      => 'Please enter the time for Email Fetching timing',

diff --git a/lang/ar/datatables.php b/lang/ar/datatables.php
@@ -0,0 +1,25 @@
+<?php
+
+return [
+    'sEmptyTable'     => 'لا تتوفر بيانات في الجدول',
+    'sInfo'           => 'عرض _START_ إلى _END_ من إجمالي _TOTAL_ إدخال',
+    'sInfoEmpty'      => 'عرض 0 إلى 0 من إجمالي 0 إدخال',
+    'sInfoFiltered'   => '(منتقاة من إجمالي _MAX_ إدخال)',
+    'sInfoPostFix'    => '',
+    'sInfoThousands'  => ',',
+    'sLengthMenu'     => '_MENU_ سجل لكل صفحة',
+    'sLoadingRecords' => 'جارٍ التحميل...',
+    'sProcessing'     => 'جارٍ المعالجة...',
+    'sSearch'         => 'بحث:',
+    'sZeroRecords'    => 'لم يتم العثور على سجلات مطابقة',
+    'oPaginate'       => [
+        'sFirst'    => 'الأول',
+        'sLast'     => 'الأخير',
+        'sNext'     => 'التالي',
+        'sPrevious' => 'السابق',
+    ],
+    'oAria' => [
+        'sSortAscending'  => ': تفعيل لفرز العمود تصاعديًا',
+        'sSortDescending' => ': تفعيل لفرز العمود تنازليًا',
+    ],
+];