From 13587f155c212911bd4180d6ddeb16e1b3ad28fb Mon Sep 17 00:00:00 2001
From: Sam Georges <sam@daftspunk.com>
Date: Sat, 9 Aug 2014 12:21:17 +1000
Subject: [PATCH] Move trans from logic-less array to inside business logic.
 Convert tabs to spaces.

---
 modules/backend/assets/js/october.inspector.js  |  2 +-
 modules/backend/lang/en/lang.php                | 10 +++++-----
 modules/backend/widgets/ReportContainer.php     | 17 +++++++++--------
 .../widgets/lists/partials/_list_pagination.htm |  2 +-
 .../widgets/lists/partials/_setup_form.htm      |  2 +-
 modules/cms/lang/en/lang.php                    | 12 ++++++------
 modules/system/lang/en/lang.php                 | 10 +++++-----
 modules/system/reportwidgets/Status.php         |  7 +++----
 8 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/modules/backend/assets/js/october.inspector.js b/modules/backend/assets/js/october.inspector.js
index 18b3fabff..227c96505 100644
--- a/modules/backend/assets/js/october.inspector.js
+++ b/modules/backend/assets/js/october.inspector.js
@@ -85,7 +85,7 @@
                 'an hidden input element with the data-inspector-values property.')
     }
 
-    Inspector.prototype.getPopoverTemplate = function() {  
+    Inspector.prototype.getPopoverTemplate = function() {
         return '                                                                                                      \
                 <div class="popover-head">                                                                            \
                     <h3>{{title}}</h3>                                                                                \
diff --git a/modules/backend/lang/en/lang.php b/modules/backend/lang/en/lang.php
index 87a0ee60b..e281a3fc2 100644
--- a/modules/backend/lang/en/lang.php
+++ b/modules/backend/lang/en/lang.php
@@ -56,12 +56,12 @@ return [
         'columns' => '{1} column|[2,Inf] columns',
         'widget_new_row_label' => 'Force new row',
         'widget_new_row_description' => 'Put the widget in a new row.',
-		'widget_title_label' => 'Widget title',
-		'widget_title_error' => 'The Widget Title is required.',
+        'widget_title_label' => 'Widget title',
+        'widget_title_error' => 'The Widget Title is required.',
         'status' => [
-			'widget_title_default' => 'System status',
-        	'online' => 'online',
-			'update_available' => '{0} updates available!|{1} update available!|[2,Inf] updates available!',
+            'widget_title_default' => 'System status',
+            'online' => 'online',
+            'update_available' => '{0} updates available!|{1} update available!|[2,Inf] updates available!',
         ]
     ],
     'user' => [
diff --git a/modules/backend/widgets/ReportContainer.php b/modules/backend/widgets/ReportContainer.php
index 5dc8eb8b9..1e8c2cb8b 100644
--- a/modules/backend/widgets/ReportContainer.php
+++ b/modules/backend/widgets/ReportContainer.php
@@ -1,12 +1,12 @@
 <?php namespace Backend\Widgets;
 
-use Backend\Classes\WidgetBase;
-use System\Classes\ApplicationException;
-use Request;
-use Backend\Classes\WidgetManager;
-use Backend\Models\UserPreferences;
 use File;
 use Lang;
+use Request;
+use Backend\Classes\WidgetBase;
+use Backend\Classes\WidgetManager;
+use Backend\Models\UserPreferences;
+use System\Classes\ApplicationException;
 
 /**
  * Report Container Widget
@@ -315,13 +315,13 @@ class ReportContainer extends WidgetBase
 
             $property = [
                 'property'          => $name,
-                'title'             => isset($params['title']) ? $params['title'] : $name,
+                'title'             => isset($params['title']) ? Lang::get($params['title']) : $name,
                 'type'              => isset($params['type']) ? $params['type'] : 'string'
             ];
 
            foreach ($params as $name => $value) {
                 if (isset($property[$name])) continue;
-                $property[$name] = $value;
+                $property[$name] = Lang::get($value);
             }
 
             $result[] = $property;
@@ -335,8 +335,9 @@ class ReportContainer extends WidgetBase
         $result = [];
 
         $properties = $widget->defineProperties();
-        foreach ($properties as $name=>$params)
+        foreach ($properties as $name=>$params) {
             $result[$name] = $widget->property($name);
+        }
 
         $result['ocWidgetWidth'] = $widget->property('ocWidgetWidth');
         $result['ocWidgetNewRow'] = $widget->property('ocWidgetNewRow');
diff --git a/modules/backend/widgets/lists/partials/_list_pagination.htm b/modules/backend/widgets/lists/partials/_list_pagination.htm
index 4ff7f0f66..df96df17c 100644
--- a/modules/backend/widgets/lists/partials/_list_pagination.htm
+++ b/modules/backend/widgets/lists/partials/_list_pagination.htm
@@ -1,7 +1,7 @@
 <div class="loading-indicator-container size-small pull-right">
     <div class="control-pagination">
         <span class="page-iteration">
-        	<?= e(trans('backend::lang.list.pagination', ['from' => $pageFrom, 'to' => $pageTo, 'total' => $recordTotal])) ?>
+            <?= e(trans('backend::lang.list.pagination', ['from' => $pageFrom, 'to' => $pageTo, 'total' => $recordTotal])) ?>
         </span>
         <?php if ($pageCurrent > 1): ?>
             <a
diff --git a/modules/backend/widgets/lists/partials/_setup_form.htm b/modules/backend/widgets/lists/partials/_setup_form.htm
index b915a4c2b..0ae7b83eb 100644
--- a/modules/backend/widgets/lists/partials/_setup_form.htm
+++ b/modules/backend/widgets/lists/partials/_setup_form.htm
@@ -36,7 +36,7 @@
             <div class="form-group">
                 <label><?= e(trans('backend::lang.list.records_per_page')) ?></label>
                 <p class="help-block">
-                	<?= e(trans('backend::lang.list.records_per_page_help')) ?>
+                    <?= e(trans('backend::lang.list.records_per_page_help')) ?>
                 </p>
                 <select class="form-control custom-select" name="records_per_page">
                     <?php foreach ($perPageOptions as $optionValue): ?>
diff --git a/modules/cms/lang/en/lang.php b/modules/cms/lang/en/lang.php
index 6992c0f41..f1e809333 100644
--- a/modules/cms/lang/en/lang.php
+++ b/modules/cms/lang/en/lang.php
@@ -160,11 +160,11 @@ return [
         'saved'=> "The template has been successfully saved."
     ],
     'permissions' => [
-    	'manage_content' => 'Manage content',
-    	'manage_assets' => 'Manage assets',
-    	'manage_pages' => 'Manage pages',
-    	'manage_layouts' => 'Manage layouts',
-    	'manage_partials' => 'Manage partials',
-    	'manage_themes' => 'Manage themes'
+        'manage_content' => 'Manage content',
+        'manage_assets' => 'Manage assets',
+        'manage_pages' => 'Manage pages',
+        'manage_layouts' => 'Manage layouts',
+        'manage_partials' => 'Manage partials',
+        'manage_themes' => 'Manage themes'
     ]
 ];
\ No newline at end of file
diff --git a/modules/system/lang/en/lang.php b/modules/system/lang/en/lang.php
index 67ccde2cc..7cecd2e31 100644
--- a/modules/system/lang/en/lang.php
+++ b/modules/system/lang/en/lang.php
@@ -222,10 +222,10 @@ return [
         'status_code' => 'Status',
     ],
     'permissions' => [
-    	'manage_system_settings' => 'Manage system settings',
-    	'manage_software_updates' => 'Manage software updates',
-    	'manage_mail_templates' => 'Manage mail templates',
-    	'manage_other_administrators' => 'Manage other administrators',
-    	'view_the_dashboard' => 'View the dashboard'
+        'manage_system_settings' => 'Manage system settings',
+        'manage_software_updates' => 'Manage software updates',
+        'manage_mail_templates' => 'Manage mail templates',
+        'manage_other_administrators' => 'Manage other administrators',
+        'view_the_dashboard' => 'View the dashboard'
     ]
 ];
diff --git a/modules/system/reportwidgets/Status.php b/modules/system/reportwidgets/Status.php
index 126910c68..31f31f0eb 100644
--- a/modules/system/reportwidgets/Status.php
+++ b/modules/system/reportwidgets/Status.php
@@ -4,7 +4,6 @@ use System\Models\Parameters;
 use System\Classes\UpdateManager;
 use Backend\Classes\ReportWidgetBase;
 use Exception;
-use Lang;
 
 /**
  * System status report widget.
@@ -33,11 +32,11 @@ class Status extends ReportWidgetBase
     {
         return [
             'title' => [
-                'title'             => Lang::get('backend::lang.dashboard.widget_title_label'),
-                'default'           => Lang::get('backend::lang.dashboard.status.widget_title_default'),
+                'title'             => 'backend::lang.dashboard.widget_title_label',
+                'default'           => 'backend::lang.dashboard.status.widget_title_default',
                 'type'              => 'string',
                 'validationPattern' => '^.+$',
-                'validationMessage' => Lang::get('backend::lang.dashboard.widget_title_error')
+                'validationMessage' => 'backend::lang.dashboard.widget_title_error',
             ]
         ];
     }