From b6a8cd7e0873de6a29a1597eba56a08238c26f5a Mon Sep 17 00:00:00 2001 From: Daniel LaBarge Date: Mon, 27 Mar 2017 23:49:19 -0500 Subject: [PATCH 1/5] Updated views to support multi-lingual translations. Added multi-lingual translation lines for English. --- composer.json | 2 +- resources/lang/en/core.php | 55 ++++++++++++++++--- resources/views/core/admin/modal.blade.php | 4 +- .../core/admin/partials/account.blade.php | 11 +++- .../admin/partials/bulk-actions.blade.php | 8 +-- .../admin/partials/drawer-last-row.blade.php | 16 ++++-- .../core/admin/partials/drawer.blade.php | 4 +- .../core/admin/partials/errors.blade.php | 12 ++-- .../core/admin/partials/header.blade.php | 10 +++- .../core/admin/partials/logout.blade.php | 8 ++- 10 files changed, 101 insertions(+), 29 deletions(-) diff --git a/composer.json b/composer.json index 43d8e0f..ed4a8c4 100644 --- a/composer.json +++ b/composer.json @@ -14,7 +14,7 @@ ], "license": "MIT", "require": { - "php": ">=5.5.9", + "php": ">=5.6.4", "esensi/model": "0.6.x", "esensi/loaders": "0.6.x", "laravelcollective/html": "~5.1", diff --git a/resources/lang/en/core.php b/resources/lang/en/core.php index 60b68c5..f83c059 100644 --- a/resources/lang/en/core.php +++ b/resources/lang/en/core.php @@ -8,7 +8,7 @@ |-------------------------------------------------------------------------- | | The following language lines contain the default error messages used by - | the Esensi\Core components package. + | the Core components package. | */ @@ -36,7 +36,7 @@ |-------------------------------------------------------------------------- | | The following language lines contain message lines used by the - | Esensi\Core components package models. + | Core components package models. | */ @@ -59,24 +59,65 @@ ], ], + /* + |-------------------------------------------------------------------------- + | Button lines + |-------------------------------------------------------------------------- + | + | The following language lines contain message lines used by the + | Core components package buttons. + | + */ + + 'buttons' => [ + 'cancel' => 'Cancel', + 'close' => 'Close', + 'delete' => 'Delete', + 'edit' => 'Edit', + 'filter' => 'Filter', + 'new' => 'New', + 'public_site' => 'Public Site', + 'restore' => 'Restore', + 'search' => 'Search', + 'toggle_menu' => 'Toggle Menu', + 'trash' => 'Trash', + 'view' => 'View', + ], + /* |-------------------------------------------------------------------------- | Label lines |-------------------------------------------------------------------------- | | The following language lines contain label lines used by the - | Esensi\Core components package view. + | Core components package view. | */ 'labels' => [ - 'never_expires' => 'Never Expires', - 'never_updated' => 'Never Updated', + 'actions' => 'Actions', + 'administration' => 'Administration', + 'created' => 'Created', + 'dashboard' => 'Dashboard', + 'deleted' => 'Deleted', + 'display_name' => 'Display Name', + 'email' => 'Email Address', + 'keywords' => 'Keywords', + 'max_results' => 'Max Results', + 'name' => 'Name', + 'never_activated' => 'Never Activated', + 'never_authenticated' => 'Never Logged In', 'never_created' => 'Never Created', 'never_deleted' => 'Never Deleted', - 'never_authenticated' => 'Never Logged In', - 'never_activated' => 'Never Activated', + 'never_expires' => 'Never Expires', 'never_password_updated' => 'Never Set', + 'never_updated' => 'Never Updated', + 'of' => 'of', + 'order_by' => 'Order By', + 'showing' => 'Showing', + 'sort_results' => 'Sort Results', + 'to' => 'to', + 'updated' => 'Last Modified', ], ]; diff --git a/resources/views/core/admin/modal.blade.php b/resources/views/core/admin/modal.blade.php index 6a061b4..26320d6 100644 --- a/resources/views/core/admin/modal.blade.php +++ b/resources/views/core/admin/modal.blade.php @@ -2,7 +2,9 @@
diff --git a/resources/views/core/admin/partials/account.blade.php b/resources/views/core/admin/partials/account.blade.php index 05d6065..a217706 100644 --- a/resources/views/core/admin/partials/account.blade.php +++ b/resources/views/core/admin/partials/account.blade.php @@ -1,4 +1,11 @@ diff --git a/resources/views/core/admin/partials/bulk-actions.blade.php b/resources/views/core/admin/partials/bulk-actions.blade.php index 177bfc6..60deea0 100644 --- a/resources/views/core/admin/partials/bulk-actions.blade.php +++ b/resources/views/core/admin/partials/bulk-actions.blade.php @@ -1,19 +1,19 @@
@if( Route::currentRouteName() == 'admin.'. $package .'.dumpster' ) - Restore + @lang('esensi/core::core.buttons.restore') - Delete + @lang('esensi/core::core.buttons.delete') @else @if( Route::has('admin.'. $package . '.dumpster') ) - Trash + @lang('esensi/core::core.buttons.trash') @else - Delete + @lang('esensi/core::core.buttons.delete') @endif @endif diff --git a/resources/views/core/admin/partials/drawer-last-row.blade.php b/resources/views/core/admin/partials/drawer-last-row.blade.php index 8b434ea..9971cea 100644 --- a/resources/views/core/admin/partials/drawer-last-row.blade.php +++ b/resources/views/core/admin/partials/drawer-last-row.blade.php @@ -1,18 +1,26 @@
- + {!! Form::select('order', $orderOptions, $order, ['class' => 'form-control']) !!}
- + {!! Form::select('sort', $sortOptions, $sort, ['class' => 'form-control']) !!}
- + {!! Form::select('max', $maxOptions, $max, ['class' => 'form-control']) !!}
- +
diff --git a/resources/views/core/admin/partials/drawer.blade.php b/resources/views/core/admin/partials/drawer.blade.php index b582eec..4e8fec6 100644 --- a/resources/views/core/admin/partials/drawer.blade.php +++ b/resources/views/core/admin/partials/drawer.blade.php @@ -2,7 +2,9 @@ {!! Form::open([ 'route' => isset($route) ? $route : Route::currentRouteName() , 'method' => 'GET']) !!}
- + {!! Form::text('keywords', $keywords, ['class' => 'form-control esensi-tags']) !!}
diff --git a/resources/views/core/admin/partials/errors.blade.php b/resources/views/core/admin/partials/errors.blade.php index 4bbec1c..b7e895b 100644 --- a/resources/views/core/admin/partials/errors.blade.php +++ b/resources/views/core/admin/partials/errors.blade.php @@ -2,15 +2,19 @@