From d6a7fdc74c8726149358545aff4e360a01bdf4fb Mon Sep 17 00:00:00 2001 From: Samuel Georges Date: Fri, 29 Apr 2016 17:36:52 +1000 Subject: [PATCH] Reduce the wording on a bunch of messages --- .../controllers/preferences/config_form.yaml | 1 + modules/backend/lang/en/lang.php | 43 +++++++++++-------- modules/backend/lang/es/lang.php | 10 ++--- modules/cms/lang/en/lang.php | 32 +++++++------- modules/cms/lang/sk/lang.php | 6 +-- .../mediamanager/assets/js/mediamanager.js | 2 +- modules/system/assets/ui/docs/flashmessage.md | 2 +- modules/system/assets/ui/docs/tab.md | 2 +- modules/system/lang/en/lang.php | 16 +++---- 9 files changed, 60 insertions(+), 54 deletions(-) diff --git a/modules/backend/controllers/preferences/config_form.yaml b/modules/backend/controllers/preferences/config_form.yaml index e7f3b457d..493d90893 100644 --- a/modules/backend/controllers/preferences/config_form.yaml +++ b/modules/backend/controllers/preferences/config_form.yaml @@ -2,6 +2,7 @@ # Form Behavior Config # =================================== +name: backend::lang.backend_preferences.menu_label form: ~/modules/backend/models/preferences/fields.yaml modelClass: Backend\Models\Preferences defaultRedirect: system/settings diff --git a/modules/backend/lang/en/lang.php b/modules/backend/lang/en/lang.php index ea44841bb..c1215f83f 100644 --- a/modules/backend/lang/en/lang.php +++ b/modules/backend/lang/en/lang.php @@ -39,9 +39,9 @@ return [ 'email_placeholder' => 'email', 'enter_new_password' => 'Enter a new password', 'password_reset' => 'Password Reset', - 'restore_success' => 'An email has been sent to your email address with password restore instructions.', + 'restore_success' => 'Message sent to your email address with instructions.', 'restore_error' => "A user could not be found with a login value of ':login'", - 'reset_success' => 'Your password has been successfully reset. You may now sign in.', + 'reset_success' => 'Password has been reset. You may now sign in.', 'reset_error' => 'Invalid password reset data supplied. Please try again!', 'reset_fail' => 'Unable to reset your password!', 'apply' => 'Apply', @@ -94,7 +94,7 @@ return [ 'superuser_comment' => 'Grants this account unlimited access to all areas of the system. Super users can add and manage other users. ', 'send_invite' => 'Send invitation by email', 'send_invite_comment' => 'Sends a welcome message containing login and password information.', - 'delete_confirm' => 'Do you really want to delete this administrator?', + 'delete_confirm' => 'Delete this administrator?', 'return' => 'Return to admin list', 'allow' => 'Allow', 'inherit' => 'Inherit', @@ -111,7 +111,7 @@ return [ 'menu_label' => 'Manage Groups', 'list_title' => 'Manage Groups', 'new' => 'New Group', - 'delete_confirm' => 'Do you really want to delete this administrator group?', + 'delete_confirm' => 'Delete this administrator group?', 'return' => 'Return to group list', 'users_count' => 'Users' ], @@ -143,7 +143,7 @@ return [ 'delete_selected' => 'Delete selected', 'delete_selected_empty' => 'There are no selected records to delete.', 'delete_selected_confirm' => 'Delete the selected records?', - 'delete_selected_success' => 'Successfully deleted the selected records.', + 'delete_selected_success' => 'Deleted selected records.', 'column_switch_true' => 'Yes', 'column_switch_false' => 'No' ], @@ -163,9 +163,10 @@ return [ 'create_title' => 'New :name', 'update_title' => 'Edit :name', 'preview_title' => 'Preview :name', - 'create_success' => 'The :name has been created successfully', - 'update_success' => 'The :name has been updated successfully', - 'delete_success' => 'The :name has been deleted successfully', + 'create_success' => ':name created', + 'update_success' => ':name updated', + 'delete_success' => ':name deleted', + 'reset_success' => 'Reset complete', 'missing_id' => 'Form record ID has not been specified.', 'missing_model' => 'Form behavior used in :class does not have a model defined.', 'missing_definition' => "Form behavior does not contain a field for ':field'.", @@ -181,8 +182,8 @@ return [ 'saving_name' => 'Saving :name...', 'delete' => 'Delete', 'deleting' => 'Deleting...', - 'confirm_delete' => 'Do you really want to delete this record?', - 'confirm_delete_multiple' => 'Do you really want to delete the selected records?', + 'confirm_delete' => 'Delete record?', + 'confirm_delete_multiple' => 'Delete selected records?', 'deleting_name' => 'Deleting :name...', 'reset_default' => 'Reset to default', 'resetting' => 'Resetting', @@ -199,7 +200,7 @@ return [ 'complete' => 'Complete', 'ok' => 'OK', 'or' => 'or', - 'confirm_tab_close' => 'Do you really want to close the tab? Unsaved changes will be lost.', + 'confirm_tab_close' => 'Close the tab? Unsaved changes will be lost.', 'behavior_not_ready' => 'Form behavior has not been initialized, check that you have called initForm() in your controller.', 'preview_no_files_message' => 'There are no files uploaded.', 'preview_no_record_message' => 'There is no record selected.', @@ -276,16 +277,20 @@ return [ 'tab_size' => 'Tab size', 'use_hard_tabs' => 'Indent using tabs', 'code_folding' => 'Code folding', + 'code_folding_begin' => 'Mark begin', + 'code_folding_begin_end' => 'Mark begin and end', + 'autocompletion' => 'Autocompletion', 'word_wrap' => 'Word wrap', 'highlight_active_line' => 'Highlight active line', - 'auto_closing' => 'Auto close tags and special characters', + 'auto_closing' => 'Automatically close tags', 'show_invisibles' => 'Show invisible characters', 'show_gutter' => 'Show gutter', - 'enable_basic_autocompletion'=> 'Enable Basic Autocompletion (Ctrl+Space)', - 'enable_snippets'=> 'Enable use of Snippets', - 'enable_live_autocompletion'=> 'Enable Live Autocompletion', - 'display_indent_guides'=> 'Show Display Indent Guides', - 'show_print_margin'=> 'Show Print Margin', + 'basic_autocompletion'=> 'Basic Autocompletion (Ctrl + Space)', + 'live_autocompletion'=> 'Live Autocompletion', + 'enable_snippets'=> 'Enable code snippets (Tab)', + 'display_indent_guides'=> 'Show indent guides', + 'show_print_margin'=> 'Show print margin', + 'mode_off' => 'Off', 'theme' => 'Color scheme' ], 'tooltips' => [ @@ -380,8 +385,8 @@ return [ 'upload_valid_csv' => 'Please upload a valid CSV file.', 'drop_column_here' => 'Drop column here...', 'ignore_this_column' => 'Ignore this column', - 'processing_successful_line1' => 'File export process has completed successfully!', - 'processing_successful_line2' => 'The browser should now redirect automatically to the file download.', + 'processing_successful_line1' => 'File export process completed!', + 'processing_successful_line2' => 'The browser will now redirect to the file download.', 'export_progress' => 'Export progress', 'export_error' => 'Export error', 'column_preview' => 'Column preview', diff --git a/modules/backend/lang/es/lang.php b/modules/backend/lang/es/lang.php index 28100078f..81a81201b 100644 --- a/modules/backend/lang/es/lang.php +++ b/modules/backend/lang/es/lang.php @@ -270,11 +270,11 @@ return [ 'auto_closing' => 'Auto cerrado de etiquetas y caracteres especiales', 'show_invisibles' => 'Mostrar caracteres invisibles', 'show_gutter' => 'Mostrar numeros de línea', - 'enable_basic_autocompletion'=> 'Activar Autocompletado Basico(Ctrl+Espacio)', - 'enable_snippets'=> 'Activar uso de Snippets', - 'enable_live_autocompletion'=> 'Activar Autocompletado en Vivo', - 'display_indent_guides'=> 'Mostrar Guias de Identado', - 'show_print_margin'=> 'Mostrar Margen de impresión', + 'basic_autocompletion'=> 'Autocompletado Basico (Ctrl + Espacio)', + 'live_autocompletion'=> 'Autocompletado en Vivo', + 'enable_snippets'=> 'Activar uso de Snippets', + 'display_indent_guides'=> 'Mostrar Guias de Identado', + 'show_print_margin'=> 'Mostrar Margen de impresión', 'theme' => 'Color del esquema' ], 'tooltips' => [ diff --git a/modules/cms/lang/en/lang.php b/modules/cms/lang/en/lang.php index ecbd78979..addf06873 100644 --- a/modules/cms/lang/en/lang.php +++ b/modules/cms/lang/en/lang.php @@ -9,7 +9,7 @@ return [ 'error_creating_directory' => 'Error creating directory :name. Please check write permissions.', 'invalid_file_extension'=>'Invalid file extension: :invalid. Allowed extensions are: :allowed.', 'error_deleting' => "Error deleting the template file ':name'. Please check write permissions.", - 'delete_success' => 'Templates were successfully deleted: :count.', + 'delete_success' => 'Templates deleted: :count.', 'file_name_required' => 'The File Name field is required.', 'safe_mode_enabled' => 'Safe mode is currently enabled.', ], @@ -47,7 +47,7 @@ return [ 'customize_button' => 'Customize', 'duplicate_button' => 'Duplicate', 'duplicate_title' => 'Duplicate theme', - 'duplicate_theme_success' => 'Duplicated theme successfully!', + 'duplicate_theme_success' => 'Theme duplicated!', 'manage_button' => 'Manage', 'manage_title' => 'Manage theme', 'edit_properties_title' => 'Theme', @@ -55,7 +55,7 @@ return [ 'save_properties' => 'Save properties', 'import_button' => 'Import', 'import_title' => 'Import theme', - 'import_theme_success' => 'Imported theme successfully!', + 'import_theme_success' => 'Theme imported!', 'import_uploaded_file' => 'Theme archive file', 'import_overwrite_label' => 'Overwrite existing files', 'import_overwrite_comment' => 'Untick this box to only import new files', @@ -68,11 +68,11 @@ return [ 'delete_button' => 'Delete', 'delete_confirm' => 'Are you sure you want to delete this theme? It cannot be undone!', 'delete_active_theme_failed' => 'Cannot delete the active theme, try making another theme active first.', - 'delete_theme_success' => 'Deleted theme successfully!', + 'delete_theme_success' => 'Theme deleted!', 'create_title' => 'Create theme', 'create_button' => 'Create', 'create_new_blank_theme' => 'Create a new blank theme', - 'create_theme_success' => 'Created theme successfully!', + 'create_theme_success' => 'Theme created!', 'create_theme_required_name' => 'Please specify a name for the theme.', 'new_directory_name_label' => 'Theme directory', 'new_directory_name_comment' => 'Provide a new directory name for the duplicated theme.', @@ -103,8 +103,8 @@ return [ 'no_list_records' => 'No pages found', 'new' => 'New page', 'invalid_url' => 'Invalid URL format. The URL should start with the forward slash symbol and can contain digits, Latin letters and the following symbols: ._-[]:?|/+*^$', - 'delete_confirm_multiple' => 'Do you really want to delete selected pages?', - 'delete_confirm_single' => 'Do you really want delete this page?', + 'delete_confirm_multiple' => 'Delete selected pages?', + 'delete_confirm_single' => 'Delete this page?', 'no_layout' => '-- no layout --' ], 'layout' => [ @@ -113,8 +113,8 @@ return [ 'unsaved_label' => 'Unsaved layout(s)', 'no_list_records' => 'No layouts found', 'new' => 'New layout', - 'delete_confirm_multiple' => 'Do you really want to delete selected layouts?', - 'delete_confirm_single' => 'Do you really want delete this layout?' + 'delete_confirm_multiple' => 'Delete selected layouts?', + 'delete_confirm_single' => 'Delete this layout?' ], 'partial' => [ 'not_found_name' => "The partial ':name' is not found.", @@ -122,8 +122,8 @@ return [ 'menu_label' => 'Partials', 'unsaved_label' => 'Unsaved partial(s)', 'no_list_records' => 'No partials found', - 'delete_confirm_multiple' => 'Do you really want to delete selected partials?', - 'delete_confirm_single' => 'Do you really want delete this partial?', + 'delete_confirm_multiple' => 'Delete selected partials?', + 'delete_confirm_single' => 'Delete this partial?', 'new' => 'New partial' ], 'content' => [ @@ -131,8 +131,8 @@ return [ 'menu_label' => 'Content', 'unsaved_label' => 'Unsaved content', 'no_list_records' => 'No content files found', - 'delete_confirm_multiple' => 'Do you really want to delete selected content files or directories?', - 'delete_confirm_single' => 'Do you really want delete this content file?', + 'delete_confirm_multiple' => 'Delete selected content files or directories?', + 'delete_confirm_single' => 'Delete this content file?', 'new' => 'New content file' ], 'ajax_handler' => [ @@ -226,8 +226,8 @@ return [ ], 'template' => [ 'invalid_type' => 'Unknown template type.', - 'not_found' => 'The requested template was not found.', - 'saved'=> 'The template has been successfully saved.' + 'not_found' => 'Template not found.', + 'saved'=> 'Template saved.' ], 'permissions' => [ 'name' => 'CMS', @@ -276,7 +276,7 @@ return [ 'folder' => 'Folder', 'no_files_found' => 'No files found by your request.', 'delete_empty' => 'Please select items to delete.', - 'delete_confirm' => 'Do you really want to delete the selected item(s)?', + 'delete_confirm' => 'Delete the selected item(s)?', 'error_renaming_file' => 'Error renaming the item.', 'new_folder_title' => 'New folder', 'folder_name' => 'Folder name', diff --git a/modules/cms/lang/sk/lang.php b/modules/cms/lang/sk/lang.php index ae93e15ee..11eba852d 100644 --- a/modules/cms/lang/sk/lang.php +++ b/modules/cms/lang/sk/lang.php @@ -9,7 +9,7 @@ return [ 'error_creating_directory' => 'Error creating directory :name. Please check write permissions.', 'invalid_file_extension'=>'Invalid file extension: :invalid. Allowed extensions are: :allowed.', 'error_deleting' => "Error deleting the template file ':name'. Please check write permissions.", - 'delete_success' => 'Templates were successfully deleted: :count.', + 'delete_success' => 'Templates deleted: :count.', 'file_name_required' => 'The File Name field is required.' ], 'theme' => [ @@ -168,8 +168,8 @@ return [ ], 'template' => [ 'invalid_type' => 'Unknown template type.', - 'not_found' => 'The requested template was not found.', - 'saved'=> 'The template has been successfully saved.' + 'not_found' => 'Requested template not found.', + 'saved'=> 'Template saved.' ], 'permissions' => [ 'name' => 'Cms', diff --git a/modules/cms/widgets/mediamanager/assets/js/mediamanager.js b/modules/cms/widgets/mediamanager/assets/js/mediamanager.js index 03e707ae3..3389b7900 100644 --- a/modules/cms/widgets/mediamanager/assets/js/mediamanager.js +++ b/modules/cms/widgets/mediamanager/assets/js/mediamanager.js @@ -1279,7 +1279,7 @@ alias: '', uniqueId: null, deleteEmpty: 'Please select files to delete.', - deleteConfirm: 'Do you really want to delete the selected file(s)?', + deleteConfirm: 'Delete the selected file(s)?', moveEmpty: 'Please select files to move.', selectSingleImage: 'Please select a single image.', selectionNotImage: 'The selected item is not an image.', diff --git a/modules/system/assets/ui/docs/flashmessage.md b/modules/system/assets/ui/docs/flashmessage.md index 07544ec7d..514cd8f4e 100644 --- a/modules/system/assets/ui/docs/flashmessage.md +++ b/modules/system/assets/ui/docs/flashmessage.md @@ -37,7 +37,7 @@ Displays a floating flash message on the screen. ```js $.oc.flashMsg({ - 'text': 'The record has been successfully saved.', + 'text': 'Record saved.', 'class': 'success', 'interval': 3 }) diff --git a/modules/system/assets/ui/docs/tab.md b/modules/system/assets/ui/docs/tab.md index 679437c38..2575136ab 100644 --- a/modules/system/assets/ui/docs/tab.md +++ b/modules/system/assets/ui/docs/tab.md @@ -122,7 +122,7 @@ Example with data attributes (data-control="tab"): ### JavaScript API: -- $('#mytabs').ocTab({closable: true, closeConfirmation: 'Do you really want to close this tab? Unsaved data will be lost.'}) +- $('#mytabs').ocTab({closable: true, closeConfirmation: 'Close this tab? Unsaved data will be lost.'}) - $('#mytabs').ocTab('addTab', 'Tab title', 'Tab content', identifier) - adds tab. The optional identifier parameter allows to associate a identifier with a tab. The identifier can be used with the goTo() method to find and open a tab by it's identifier. - $('#mytabs').ocTab('closeTab', '.nav-tabs > li.active', true) - closes a tab. The second argument can point to a tab or tab pane. The thrid argument determines whether the tab should be closed without the user confirmation. The default value is false. - $('.nav-tabs > li.active').trigger('close.oc.tab') - another way to close a tab. The event can be triggered on a tab, tab pane or any element inside a tab or tab pane. diff --git a/modules/system/lang/en/lang.php b/modules/system/lang/en/lang.php index 71bdec75b..b399d36fe 100644 --- a/modules/system/lang/en/lang.php +++ b/modules/system/lang/en/lang.php @@ -124,13 +124,13 @@ return [ 'missing' => 'Please specify a Project ID to use.' ], 'detach_confirm' => 'Are you sure you want to detach this project?', - 'unbind_success' => 'Project has been detached successfully.' + 'unbind_success' => 'Project has been detached.' ], 'settings' => [ 'menu_label' => 'Settings', 'not_found' => 'Unable to find the specified settings.', 'missing_model' => 'The settings page is missing a Model definition.', - 'update_success' => 'Settings for :name have been updated successfully.', + 'update_success' => ':name settings updated', 'return' => 'Return to system settings', 'search' => 'Search' ], @@ -198,14 +198,14 @@ return [ 'content_css' => 'CSS', 'content_text' => 'Plaintext', 'test_send' => 'Send test message', - 'test_success' => 'The test message has been successfully sent.', - 'test_confirm' => 'A test message will be sent to :email. Continue?', + 'test_success' => 'Test message sent.', + 'test_confirm' => 'Send test message to :email. Continue?', 'creating' => 'Creating Template...', 'creating_layout' => 'Creating Layout...', 'saving' => 'Saving Template...', 'saving_layout' => 'Saving Layout...', - 'delete_confirm' => 'Do you really want to delete this template?', - 'delete_layout_confirm' => 'Do you really want to delete this layout?', + 'delete_confirm' => 'Delete this template?', + 'delete_layout_confirm' => 'Delete this layout?', 'deleting' => 'Deleting Template...', 'deleting_layout' => 'Deleting Layout...', 'sending' => 'Sending test message...', @@ -218,7 +218,7 @@ return [ 'missing_plugin_name' => 'Please specify a Plugin name to install.', 'missing_theme_name' => 'Please specify a Theme name to install.', 'install_completing' => 'Finishing installation process', - 'install_success' => 'The plugin has been installed successfully.' + 'install_success' => 'Plugin installed successfully' ], 'updates' => [ 'title' => 'Manage Updates', @@ -251,7 +251,7 @@ return [ 'update_label' => 'Update software', 'update_completing' => 'Finishing update process', 'update_loading' => 'Loading available updates...', - 'update_success' => 'The update process was performed successfully.', + 'update_success' => 'Update process complete', 'update_failed_label' => 'Update failed', 'force_label' => 'Force update', 'found' => [