From a7f01ca40d13b6ff5f673659f62e0f396fc2ec23 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Sun, 2 Feb 2014 10:59:11 +0100 Subject: [PATCH 01/10] Better and more compact message for opening ENUM/SET editor --- libraries/tbl_columns_definition_form.lib.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/libraries/tbl_columns_definition_form.lib.php b/libraries/tbl_columns_definition_form.lib.php index d045f1e2f5..bcfa6122d8 100644 --- a/libraries/tbl_columns_definition_form.lib.php +++ b/libraries/tbl_columns_definition_form.lib.php @@ -1039,9 +1039,8 @@ function PMA_getHtmlForColumnLength($columnNumber, $ci, $ci_offset, . '

'; - $html .= __('ENUM or SET data too long?') - . ' ' - . __('Get more editing space') . '' + $html .= ' ' + . __('Edit ENUM/SET values') . '' . '

'; return $html; From e3e880f1fc7788305cc5c28649254a89b9fd5be2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Sun, 2 Feb 2014 11:02:19 +0100 Subject: [PATCH 02/10] Punctuation at the end of validation error messages --- libraries/config/Validator.class.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libraries/config/Validator.class.php b/libraries/config/Validator.class.php index 93c3388c04..70f0c64fad 100644 --- a/libraries/config/Validator.class.php +++ b/libraries/config/Validator.class.php @@ -366,12 +366,12 @@ class PMA_Validator $result = array(); if ($values['Servers/1/controluser'] == '') { $result['Servers/1/controluser'] - = __('Empty phpMyAdmin control user while using pmadb'); + = __('Empty phpMyAdmin control user while using pmadb!'); $error = true; } if ($values['Servers/1/controlpass'] == '') { $result['Servers/1/controlpass'] - = __('Empty phpMyAdmin control user password while using pmadb'); + = __('Empty phpMyAdmin control user password while using pmadb!'); $error = true; } if (! $error) { From 45c11eae771990338b4851c52f15c792f1a760ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Sun, 2 Feb 2014 11:03:06 +0100 Subject: [PATCH 03/10] Add missing full stops at the end of a sentence --- libraries/import.lib.php | 6 +++--- libraries/insert_edit.lib.php | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libraries/import.lib.php b/libraries/import.lib.php index 704a4b955d..727bbbcb44 100644 --- a/libraries/import.lib.php +++ b/libraries/import.lib.php @@ -1225,9 +1225,9 @@ function PMA_buildSQL($db_name, &$tables, &$analyses = null, $message = '

'; $message .= '' . __('The following structures have either been created or altered. Here you can:') . '
'; - $message .= '
  • ' . __("View a structure's contents by clicking on its name") . '
    • '; - $message .= '
  • ' . __('Change any of its settings by clicking the corresponding "Options" link') . '
    • '; - $message .= '
  • ' . __('Edit structure by following the "Structure" link') . '
    • '; + $message .= '
    • ' . __("View a structure's contents by clicking on its name.") . '
      • '; + $message .= '
    • ' . __('Change any of its settings by clicking the corresponding "Options" link.') . '
      • '; + $message .= '
    • ' . __('Edit structure by following the "Structure" link.') . '
      • '; $message .= sprintf( '
    • %s (' . __('Options') . ')
      • ', diff --git a/libraries/insert_edit.lib.php b/libraries/insert_edit.lib.php index 0c41dbb798..22a84549cd 100644 --- a/libraries/insert_edit.lib.php +++ b/libraries/insert_edit.lib.php @@ -655,7 +655,7 @@ function PMA_getValueColumn($column, $backup_field, $column_name_appendix, if (strlen($special_chars) > 32000) { $html_output .= "\n"; $html_output .= '' . __( - 'Because of its length,
      this column might not be editable' + 'Because of its length,
      this column might not be editable.' ); } From 0b008c44fab251971c7fd7b04fda41e26ce6ebe2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Sun, 2 Feb 2014 11:04:39 +0100 Subject: [PATCH 04/10] Correct punctuation for error messages --- libraries/plugins/import/ImportShp.class.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libraries/plugins/import/ImportShp.class.php b/libraries/plugins/import/ImportShp.class.php index 44c653f1f5..b01b2e61d4 100644 --- a/libraries/plugins/import/ImportShp.class.php +++ b/libraries/plugins/import/ImportShp.class.php @@ -202,7 +202,7 @@ class ImportShp extends ImportPlugin $message = PMA_Message::error( __( 'You tried to import an invalid file or the imported file' - . ' contains invalid data' + . ' contains invalid data!' ) ); } else { @@ -255,7 +255,7 @@ class ImportShp extends ImportPlugin if (count($rows) == 0) { $error = true; $message = PMA_Message::error( - __('The imported file does not contain any data') + __('The imported file does not contain any data!') ); return; } From c5cc523b6d26fe317e28d5d6fa01a5e1765f415a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Sun, 2 Feb 2014 11:05:40 +0100 Subject: [PATCH 05/10] Correct punctuation for sentences MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Michal Čihař --- libraries/replication_gui.lib.php | 4 ++-- libraries/rte/rte_events.lib.php | 4 ++-- libraries/rte/rte_routines.lib.php | 4 ++-- libraries/rte/rte_triggers.lib.php | 10 +++++----- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/libraries/replication_gui.lib.php b/libraries/replication_gui.lib.php index 6fcd8b48e3..40525f85e5 100644 --- a/libraries/replication_gui.lib.php +++ b/libraries/replication_gui.lib.php @@ -994,11 +994,11 @@ function PMA_handleRequestForSlaveChangeMaster() ) { $_SESSION['replication']['sr_action_status'] = 'error'; $_SESSION['replication']['sr_action_info'] - = __('Unable to change master'); + = __('Unable to change master!'); } else { $_SESSION['replication']['sr_action_status'] = 'success'; $_SESSION['replication']['sr_action_info'] = sprintf( - __('Master server changed successfully to %s'), + __('Master server changed successfully to %s.'), htmlspecialchars($sr['hostname']) ); } diff --git a/libraries/rte/rte_events.lib.php b/libraries/rte/rte_events.lib.php index 75117b5ab1..0a17686639 100644 --- a/libraries/rte/rte_events.lib.php +++ b/libraries/rte/rte_events.lib.php @@ -570,14 +570,14 @@ function PMA_EVN_getQueryFromRequest() $query .= 'DEFINER=' . PMA_Util::backquote($arr[0]); $query .= '@' . PMA_Util::backquote($arr[1]) . ' '; } else { - $errors[] = __('The definer must be in the "username@hostname" format'); + $errors[] = __('The definer must be in the "username@hostname" format!'); } } $query .= 'EVENT '; if (! empty($_REQUEST['item_name'])) { $query .= PMA_Util::backquote($_REQUEST['item_name']) . ' '; } else { - $errors[] = __('You must provide an event name'); + $errors[] = __('You must provide an event name!'); } $query .= 'ON SCHEDULE '; if (! empty($_REQUEST['item_type']) diff --git a/libraries/rte/rte_routines.lib.php b/libraries/rte/rte_routines.lib.php index 5bceb1a8f6..39605eeecd 100644 --- a/libraries/rte/rte_routines.lib.php +++ b/libraries/rte/rte_routines.lib.php @@ -1120,7 +1120,7 @@ function PMA_RTN_getQueryFromRequest() $query .= 'DEFINER=' . PMA_Util::backquote($arr[0]); $query .= '@' . PMA_Util::backquote($arr[1]) . ' '; } else { - $errors[] = __('The definer must be in the "username@hostname" format'); + $errors[] = __('The definer must be in the "username@hostname" format!'); } } if ($_REQUEST['item_type'] == 'FUNCTION' @@ -1136,7 +1136,7 @@ function PMA_RTN_getQueryFromRequest() if (! empty($_REQUEST['item_name'])) { $query .= PMA_Util::backquote($_REQUEST['item_name']); } else { - $errors[] = __('You must provide a routine name'); + $errors[] = __('You must provide a routine name!'); } $params = ''; $warned_about_dir = false; diff --git a/libraries/rte/rte_triggers.lib.php b/libraries/rte/rte_triggers.lib.php index 92fb095a49..1650ae7a51 100644 --- a/libraries/rte/rte_triggers.lib.php +++ b/libraries/rte/rte_triggers.lib.php @@ -448,28 +448,28 @@ function PMA_TRI_getQueryFromRequest() $query .= 'DEFINER=' . PMA_Util::backquote($arr[0]); $query .= '@' . PMA_Util::backquote($arr[1]) . ' '; } else { - $errors[] = __('The definer must be in the "username@hostname" format'); + $errors[] = __('The definer must be in the "username@hostname" format!'); } } $query .= 'TRIGGER '; if (! empty($_REQUEST['item_name'])) { $query .= PMA_Util::backquote($_REQUEST['item_name']) . ' '; } else { - $errors[] = __('You must provide a trigger name'); + $errors[] = __('You must provide a trigger name!'); } if (! empty($_REQUEST['item_timing']) && in_array($_REQUEST['item_timing'], $action_timings) ) { $query .= $_REQUEST['item_timing'] . ' '; } else { - $errors[] = __('You must provide a valid timing for the trigger'); + $errors[] = __('You must provide a valid timing for the trigger!'); } if (! empty($_REQUEST['item_event']) && in_array($_REQUEST['item_event'], $event_manipulations) ) { $query .= $_REQUEST['item_event'] . ' '; } else { - $errors[] = __('You must provide a valid event for the trigger'); + $errors[] = __('You must provide a valid event for the trigger!'); } $query .= 'ON '; if (! empty($_REQUEST['item_table']) @@ -477,7 +477,7 @@ function PMA_TRI_getQueryFromRequest() ) { $query .= PMA_Util::backquote($_REQUEST['item_table']); } else { - $errors[] = __('You must provide a valid table name'); + $errors[] = __('You must provide a valid table name!'); } $query .= ' FOR EACH ROW '; if (! empty($_REQUEST['item_definition'])) { From 4a2286b23e5111352af4e3d899c9f709dd003649 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Sun, 2 Feb 2014 11:10:57 +0100 Subject: [PATCH 06/10] Correct punctuation for sentences MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Michal Čihař --- pmd_pdf.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pmd_pdf.php b/pmd_pdf.php index d8fb1c194a..6e0a6093a4 100644 --- a/pmd_pdf.php +++ b/pmd_pdf.php @@ -125,10 +125,10 @@ if ($GLOBALS['dbi']->numRows($table_info_result) > 0) { } echo ''; echo '

      '; - $choices['import'] = __('Import from selected page'); - $choices['export'] = __('Export to selected page'); + $choices['import'] = __('Import from selected page.'); + $choices['export'] = __('Export to selected page.'); } -$choices['create_export'] = __('Create a page and export to it'); +$choices['create_export'] = __('Create a page and export to it.'); if (1 == count($choices)) { echo $choices['create_export']; From 8be5a9d1013ff52b5b57b448d63d1d0540820b0d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Sun, 2 Feb 2014 11:11:26 +0100 Subject: [PATCH 07/10] Correct punctuation for sentences MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Michal Čihař --- prefs_forms.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/prefs_forms.php b/prefs_forms.php index c44e77519f..2cc37bfa8e 100644 --- a/prefs_forms.php +++ b/prefs_forms.php @@ -83,7 +83,7 @@ if ($form_display->hasErrors()) { // form has errors ?>
      - + displayErrors(); ?>
      Date: Sun, 2 Feb 2014 11:12:03 +0100 Subject: [PATCH 08/10] Correct punctuation for sentences MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Michal Čihař --- setup/frames/form.inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup/frames/form.inc.php b/setup/frames/form.inc.php index ac9d00b395..e1c53d25dd 100644 --- a/setup/frames/form.inc.php +++ b/setup/frames/form.inc.php @@ -22,7 +22,7 @@ require './libraries/config/setup.forms.php'; $formset_id = filter_input(INPUT_GET, 'formset'); $mode = filter_input(INPUT_GET, 'mode'); if (! isset($forms[$formset_id])) { - PMA_fatalError(__('Incorrect formset, check $formsets array in setup/frames/form.inc.php')); + PMA_fatalError(__('Incorrect formset, check $formsets array in setup/frames/form.inc.php!')); } if (isset($GLOBALS['strConfigFormset_' . $formset_id])) { From 8971706c1579653ca47da4ee5eac642d722117ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Sun, 2 Feb 2014 11:17:05 +0100 Subject: [PATCH 09/10] Correct punctuation for sentences MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Michal Čihař --- libraries/server_privileges.lib.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libraries/server_privileges.lib.php b/libraries/server_privileges.lib.php index 024b842fd5..e3cac9f2e8 100644 --- a/libraries/server_privileges.lib.php +++ b/libraries/server_privileges.lib.php @@ -826,7 +826,7 @@ function PMA_getHtmlForTableSpecificPrivileges( . '
      ' . "\n" . '' . __('Table-specific privileges') . PMA_Util::showHint( - __('Note: MySQL privilege names are expressed in English') + __('Note: MySQL privilege names are expressed in English.') ) . '' . "\n"; @@ -1011,7 +1011,7 @@ function PMA_getHtmlForGlobalOrDbSpecificPrivs($db, $table, $row) . ' ' . '' . '

      ' - . __('Note: MySQL privilege names are expressed in English') + . __('Note: MySQL privilege names are expressed in English.') . '

      '; // Output the Global privilege tables with checkboxes @@ -2935,7 +2935,7 @@ function PMA_getUsersOverview($result, $db_rights, $pmaThemeImage, $text_dir) . '' . __('Password') . '' . "\n" . '' . __('Global privileges') . ' ' . PMA_Util::showHint( - __('Note: MySQL privilege names are expressed in English') + __('Note: MySQL privilege names are expressed in English.') ) . '' . "\n"; if ($GLOBALS['cfgRelation']['menuswork']) { From 77caf6151bde411e7db351f72fc7313999950f77 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Sun, 2 Feb 2014 11:18:33 +0100 Subject: [PATCH 10/10] Correct punctuation for sentences MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Michal Čihař --- libraries/Message.class.php | 2 +- libraries/rte/rte_routines.lib.php | 2 +- libraries/sql_query_form.lib.php | 2 +- libraries/tbl_relation.lib.php | 2 +- tbl_find_replace.php | 2 +- tbl_operations.php | 2 +- tbl_row_action.php | 2 +- view_operations.php | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/libraries/Message.class.php b/libraries/Message.class.php index ddec29a299..4132faa555 100644 --- a/libraries/Message.class.php +++ b/libraries/Message.class.php @@ -177,7 +177,7 @@ class PMA_Message static public function success($string = '') { if (empty($string)) { - $string = __('Your SQL query has been executed successfully'); + $string = __('Your SQL query has been executed successfully.'); } return new PMA_Message($string, PMA_Message::SUCCESS); diff --git a/libraries/rte/rte_routines.lib.php b/libraries/rte/rte_routines.lib.php index 39605eeecd..07eda150b4 100644 --- a/libraries/rte/rte_routines.lib.php +++ b/libraries/rte/rte_routines.lib.php @@ -1464,7 +1464,7 @@ function PMA_RTN_handleExecute() $output .= "
      "; - $message = __('Your SQL query has been executed successfully'); + $message = __('Your SQL query has been executed successfully.'); if ($routine['item_type'] == 'PROCEDURE') { $message .= '
      '; diff --git a/libraries/sql_query_form.lib.php b/libraries/sql_query_form.lib.php index 60462754cf..ff5d285b44 100644 --- a/libraries/sql_query_form.lib.php +++ b/libraries/sql_query_form.lib.php @@ -108,7 +108,7 @@ function PMA_getHtmlForSqlQueryForm( . '' . "\n" . '' + . __('Your SQL query has been executed successfully.') . '" />' . "\n" . '' . "\n"; diff --git a/libraries/tbl_relation.lib.php b/libraries/tbl_relation.lib.php index 6082c57414..88f36c1c66 100644 --- a/libraries/tbl_relation.lib.php +++ b/libraries/tbl_relation.lib.php @@ -892,7 +892,7 @@ function PMA_handleUpdatesForForeignKeys($destination_foreign_db, if (! empty($display_query) && ! $seen_error) { $GLOBALS['display_query'] = $display_query; $html_output = PMA_Util::getMessage( - __('Your SQL query has been executed successfully'), + __('Your SQL query has been executed successfully.'), null, 'success' ); } diff --git a/tbl_find_replace.php b/tbl_find_replace.php index c450cf62b5..92f3e079fd 100644 --- a/tbl_find_replace.php +++ b/tbl_find_replace.php @@ -46,7 +46,7 @@ if (isset($_POST['replace'])) { $connectionCharSet ); $htmlOutput .= PMA_Util::getMessage( - __('Your SQL query has been executed successfully'), + __('Your SQL query has been executed successfully.'), null, 'success' ); } diff --git a/tbl_operations.php b/tbl_operations.php index bada9e3510..0923edeb15 100644 --- a/tbl_operations.php +++ b/tbl_operations.php @@ -182,7 +182,7 @@ if (isset($result) && empty($message_to_show)) { if (empty($_message)) { $_message = $result ? PMA_Message::success( - __('Your SQL query has been executed successfully') + __('Your SQL query has been executed successfully.') ) : PMA_Message::error(__('Error')); // $result should exist, regardless of $_message diff --git a/tbl_row_action.php b/tbl_row_action.php index 5801386df7..b09e70e01a 100644 --- a/tbl_row_action.php +++ b/tbl_row_action.php @@ -108,7 +108,7 @@ if (!empty($submit_mult)) { if ((! empty($submit_mult) || isset($_REQUEST['mult_btn'])) && ! empty($sql_query) ) { - $disp_message = __('Your SQL query has been executed successfully'); + $disp_message = __('Your SQL query has been executed successfully.'); $disp_query = $sql_query; } diff --git a/view_operations.php b/view_operations.php index c895d2ee1f..229bc5ba03 100644 --- a/view_operations.php +++ b/view_operations.php @@ -59,7 +59,7 @@ if (isset($result)) { $_type = 'success'; if (empty($_message)) { $_message = $result - ? __('Your SQL query has been executed successfully') + ? __('Your SQL query has been executed successfully.') : __('Error'); // $result should exist, regardless of $_message $_type = $result ? 'success' : 'error';