diff --git a/modules/backend/behaviors/relationcontroller/partials/_button_delete.htm b/modules/backend/behaviors/relationcontroller/partials/_button_delete.htm index 274a686b0..9a7d557f2 100644 --- a/modules/backend/behaviors/relationcontroller/partials/_button_delete.htm +++ b/modules/backend/behaviors/relationcontroller/partials/_button_delete.htm @@ -5,7 +5,7 @@ })" disabled="disabled" data-request="onRelationManageDelete" - data-request-confirm="Are you sure?" + data-request-confirm="" data-trigger-type="enable" data-trigger="#relationGetId('view') ?> .control-list input[type=checkbox]" data-trigger-condition="checked" diff --git a/modules/backend/behaviors/relationcontroller/partials/_manage_form.htm b/modules/backend/behaviors/relationcontroller/partials/_manage_form.htm index 5fe598275..f8e30e4b7 100644 --- a/modules/backend/behaviors/relationcontroller/partials/_manage_form.htm +++ b/modules/backend/behaviors/relationcontroller/partials/_manage_form.htm @@ -26,7 +26,7 @@ type="button" class="btn btn-default" data-dismiss="popup"> - Cancel + @@ -59,7 +59,7 @@ type="button" class="btn btn-default" data-dismiss="popup"> - Cancel + diff --git a/modules/backend/behaviors/relationcontroller/partials/_manage_list.htm b/modules/backend/behaviors/relationcontroller/partials/_manage_list.htm index ba14e5ac4..2faa1e019 100644 --- a/modules/backend/behaviors/relationcontroller/partials/_manage_list.htm +++ b/modules/backend/behaviors/relationcontroller/partials/_manage_list.htm @@ -2,7 +2,7 @@
render() ?> @@ -14,13 +14,13 @@ data-request="onRelationManageAdd" data-dismiss="popup" data-stripe-load-indicator> - Add selected +
diff --git a/modules/backend/behaviors/relationcontroller/partials/_manage_pivot.htm b/modules/backend/behaviors/relationcontroller/partials/_manage_pivot.htm index 1222b49ec..db8b55db8 100644 --- a/modules/backend/behaviors/relationcontroller/partials/_manage_pivot.htm +++ b/modules/backend/behaviors/relationcontroller/partials/_manage_pivot.htm @@ -2,10 +2,10 @@ render() ?> @@ -15,7 +15,7 @@ type="button" class="btn btn-default" data-dismiss="popup"> - Cancel + diff --git a/modules/backend/behaviors/relationcontroller/partials/_pivot_form.htm b/modules/backend/behaviors/relationcontroller/partials/_pivot_form.htm index 0dcfa363e..a236816fa 100644 --- a/modules/backend/behaviors/relationcontroller/partials/_pivot_form.htm +++ b/modules/backend/behaviors/relationcontroller/partials/_pivot_form.htm @@ -7,7 +7,7 @@ @@ -38,7 +38,7 @@ diff --git a/modules/backend/controllers/Users.php b/modules/backend/controllers/Users.php index 36a067a53..ed347d0d5 100644 --- a/modules/backend/controllers/Users.php +++ b/modules/backend/controllers/Users.php @@ -98,9 +98,9 @@ class Users extends Controller 'comment' => $permission->comment, 'type' => 'balloon-selector', 'options' => [ - 1 => 'Allow', - 0 => 'Inherit', - -1 => 'Deny', + 1 => Lang::get('backend::lang.user.allow'), + 0 => Lang::get('backend::lang.user.inherit'), + -1 => Lang::get('backend::lang.user.deny'), ], 'attributes' => [ 'data-trigger' => "input[name='User[permissions][superuser]']", diff --git a/modules/backend/formwidgets/fileupload/partials/_config_form.htm b/modules/backend/formwidgets/fileupload/partials/_config_form.htm index bd918c372..ff4bce620 100644 --- a/modules/backend/formwidgets/fileupload/partials/_config_form.htm +++ b/modules/backend/formwidgets/fileupload/partials/_config_form.htm @@ -3,15 +3,13 @@ \ No newline at end of file diff --git a/modules/backend/lang/en/lang.php b/modules/backend/lang/en/lang.php index e281a3fc2..e6483cc11 100644 --- a/modules/backend/lang/en/lang.php +++ b/modules/backend/lang/en/lang.php @@ -86,6 +86,9 @@ return [ 'send_invite_comment' => 'Use this checkbox to send an invitation to the user by email', 'delete_confirm' => 'Do you really want to delete this administrator?', 'return' => 'Return to the administrator list', + 'allow' => 'Allow', + 'inherit' => 'Inherit', + 'deny' => 'Deny', 'group' => [ 'name' => 'Group', 'name_field' => 'Name', @@ -110,6 +113,9 @@ return [ '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', + 'prev_page' => 'Previous page', + 'next_page' => 'Next page', + 'loading' => 'Loading...', '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', @@ -117,6 +123,12 @@ return [ 'apply_changes' => 'Apply changes', 'cancel' => 'Cancel' ], + 'fileupload' => [ + 'attachment' => 'Attachment', + 'help' => 'Add a title and description for this attachment.', + 'title_label' => 'Title', + 'description_label' => 'Description' + ], 'form' => [ 'create_title' => "New :name", 'update_title' => "Edit :name", @@ -151,13 +163,20 @@ return [ 'select' => 'Select', 'select_all' => 'all', 'select_none' => 'none', + 'insert_row' => 'Insert Row', + 'delete_row' => 'Delete Row' ], 'relation' => [ 'missing_definition' => "Relation behavior does not contain a definition for ':field'.", 'missing_model' => "Relation behavior used in :class does not have a model defined.", 'invalid_action_single' => "This action cannot be performed on a singular relationship.", 'invalid_action_multi' => "This action cannot be performed on a multiple relationship.", + 'help' => "Click on an item to add", + 'related_data' => "Related :name data", 'add' => "Add", + 'add_selected' => "Add selected", + 'add_a_new' => "Add a new :name", + 'cancel' => "Cancel", 'add_name' => "Add :name", 'create' => "Create", 'create_name' => "Create :name", @@ -167,6 +186,7 @@ return [ 'remove_name' => "Remove :name", 'delete' => "Delete", 'delete_name' => "Delete :name", + 'delete_confirm' => "Are you sure?", ], 'model' => [ 'name' => "Model", diff --git a/modules/backend/widgets/grid/partials/_button_delete.htm b/modules/backend/widgets/grid/partials/_button_delete.htm index 5ca95b948..68dc9214c 100644 --- a/modules/backend/widgets/grid/partials/_button_delete.htm +++ b/modules/backend/widgets/grid/partials/_button_delete.htm @@ -2,5 +2,5 @@ href="javascript:;" class="btn btn-sm btn-default oc-icon-minus-square" onclick="$(this).closest('.datagrid-widget').find('[data-control=datagrid]').dataGrid('removeRow')"> - Delete Row + \ No newline at end of file diff --git a/modules/backend/widgets/grid/partials/_button_insert.htm b/modules/backend/widgets/grid/partials/_button_insert.htm index a911c4828..97af9a04b 100644 --- a/modules/backend/widgets/grid/partials/_button_insert.htm +++ b/modules/backend/widgets/grid/partials/_button_insert.htm @@ -2,5 +2,5 @@ href="javascript:;" class="btn btn-sm btn-default oc-icon-plus-square" onclick="$(this).closest('.datagrid-widget').find('[data-control=datagrid]').dataGrid('insertRow')"> - Insert Row + \ No newline at end of file diff --git a/modules/backend/widgets/lists/partials/_list_pagination.htm b/modules/backend/widgets/lists/partials/_list_pagination.htm index df96df17c..9816fbd04 100644 --- a/modules/backend/widgets/lists/partials/_list_pagination.htm +++ b/modules/backend/widgets/lists/partials/_list_pagination.htm @@ -9,8 +9,8 @@ class="page-back" data-request="getEventHandler('onPaginate') ?>" data-request-data="page: " - data-load-indicator="Loading..." - title="Previous page"> + data-load-indicator="" + title=""> $pageCurrent): ?> + data-load-indicator="" + title=""> \ No newline at end of file diff --git a/modules/cms/lang/en/lang.php b/modules/cms/lang/en/lang.php index f1e809333..21e130ddb 100644 --- a/modules/cms/lang/en/lang.php +++ b/modules/cms/lang/en/lang.php @@ -111,9 +111,12 @@ return [ 'upload_files' => 'Upload file(s)', 'create_file' => 'Create file', 'create_directory' => 'Create directory', + 'directory_popup_title' => 'New directory', + 'directory_name' => 'Directory name', 'rename' => 'Rename', 'delete' => 'Delete', 'move' => 'Move', + 'select' => 'Select', 'new' => 'New file', 'rename_popup_title' => 'Rename', 'rename_new_name' => 'New name', diff --git a/modules/cms/widgets/assetlist/partials/_items.htm b/modules/cms/widgets/assetlist/partials/_items.htm index 09c6d9359..b2adf6e9a 100644 --- a/modules/cms/widgets/assetlist/partials/_items.htm +++ b/modules/cms/widgets/assetlist/partials/_items.htm @@ -32,7 +32,7 @@ data-control="popup" data-request-data="renamePath: 'path) ?>'" data-handler="getEventHandler('onLoadRenamePopup') ?>" - >Rename + > @@ -45,7 +45,7 @@ isFileSelected($item) ? 'checked' : null ?> data-request="getEventHandler('onSelect') ?>" value="1"> - + diff --git a/modules/cms/widgets/assetlist/partials/_new_dir_form.htm b/modules/cms/widgets/assetlist/partials/_new_dir_form.htm index 3b73cac53..b6a95f170 100644 --- a/modules/cms/widgets/assetlist/partials/_new_dir_form.htm +++ b/modules/cms/widgets/assetlist/partials/_new_dir_form.htm @@ -6,11 +6,11 @@ ]) ?>