From 906370c6bdfbcc923013a7ca848ed71e12455d26 Mon Sep 17 00:00:00 2001 From: Paul Wilde Date: Sat, 9 Aug 2014 03:02:15 +0100 Subject: [PATCH] Added translation strings for permission labels, mail template/layout column labels, editor fullscreen, list pagination and list setup modal. --- modules/backend/ServiceProvider.php | 4 ++-- .../codeeditor/partials/_codeeditor.htm | 4 ++-- modules/backend/lang/en/lang.php | 7 +++++++ .../widgets/lists/partials/_list_pagination.htm | 4 +++- .../widgets/lists/partials/_setup_form.htm | 16 ++++++---------- modules/cms/ServiceProvider.php | 12 ++++++------ modules/cms/lang/en/lang.php | 12 +++++++++++- modules/system/ServiceProvider.php | 6 +++--- modules/system/lang/en/lang.php | 7 +++++++ modules/system/models/maillayout/columns.yaml | 4 ++-- modules/system/models/mailtemplate/columns.yaml | 7 ++++--- 11 files changed, 53 insertions(+), 30 deletions(-) diff --git a/modules/backend/ServiceProvider.php b/modules/backend/ServiceProvider.php index 5bed5d86b..0ee23b327 100644 --- a/modules/backend/ServiceProvider.php +++ b/modules/backend/ServiceProvider.php @@ -121,8 +121,8 @@ class ServiceProvider extends ModuleServiceProvider */ BackendAuth::registerCallback(function($manager) { $manager->registerPermissions('October.Backend', [ - 'backend.access_dashboard' => ['label' => 'View the dashboard', 'tab' => 'System'], - 'backend.manage_users' => ['label' => 'Manage other administrators', 'tab' => 'System'], + 'backend.access_dashboard' => ['label' => 'system::lang.permissions.view_the_dashboard', 'tab' => 'System'], + 'backend.manage_users' => ['label' => 'system::lang.permissions.manage_other_administrators', 'tab' => 'System'], ]); }); diff --git a/modules/backend/formwidgets/codeeditor/partials/_codeeditor.htm b/modules/backend/formwidgets/codeeditor/partials/_codeeditor.htm index 82001334a..fbfe2bf5d 100644 --- a/modules/backend/formwidgets/codeeditor/partials/_codeeditor.htm +++ b/modules/backend/formwidgets/codeeditor/partials/_codeeditor.htm @@ -22,13 +22,13 @@
  • - Enter fullscreen mode +
  • - Exit fullscreen mode +
    • diff --git a/modules/backend/lang/en/lang.php b/modules/backend/lang/en/lang.php index 8dfde181e..87a0ee60b 100644 --- a/modules/backend/lang/en/lang.php +++ b/modules/backend/lang/en/lang.php @@ -109,6 +109,13 @@ return [ 'missing_definition' => "List behavior does not contain a column for ':field'.", 'behavior_not_ready' => 'List behavior has not been initialized, check that you have called makeLists() in your controller.', 'invalid_column_datetime' => "Column value ':column' is not a DateTime object, are you missing a \$dates reference in the Model?", + 'pagination' => 'Displayed records: :from-:to of :total', + 'setup_title' => 'List Setup', + 'setup_help' => 'Use checkboxes to select columns you want to see in the list. You can change position of columns by dragging them up or down.', + 'records_per_page' => 'Records per page', + 'records_per_page_help' => 'Select the number of records per page to display. Please note that high number of records on a single page can reduce performance.', + 'apply_changes' => 'Apply changes', + 'cancel' => 'Cancel' ], 'form' => [ 'create_title' => "New :name", diff --git a/modules/backend/widgets/lists/partials/_list_pagination.htm b/modules/backend/widgets/lists/partials/_list_pagination.htm index fa7c2a22d..4ff7f0f66 100644 --- a/modules/backend/widgets/lists/partials/_list_pagination.htm +++ b/modules/backend/widgets/lists/partials/_list_pagination.htm @@ -1,6 +1,8 @@
    - Displayed records: - of + + $pageFrom, 'to' => $pageTo, 'total' => $recordTotal])) ?> + 1): ?>
    -

    List Setup

    +

    -

    - Use checkboxes to select columns you want to see in the list. - You can change position of columns by dragging them up or down. -

    +

      @@ -37,10 +34,9 @@ showPagination): ?>
      - +

      - Select the number of records per page to display. - Please note that high number of records on a single page can reduce performance. +