From 2a83a5d4d339e1ca2daac20557f5b45fa4c9abf5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Wed, 29 Jan 2014 13:15:44 +0100 Subject: [PATCH 1/2] Make error message a sentence --- import.php | 4 ++-- libraries/File.class.php | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/import.php b/import.php index ec6e69c514..6295ec0814 100644 --- a/import.php +++ b/import.php @@ -391,7 +391,7 @@ if ($import_file != 'none' && ! $error) { */ $compression = PMA_detectCompression($import_file); if ($compression === false) { - $message = PMA_Message::error(__('File could not be read')); + $message = PMA_Message::error(__('File could not be read!')); $error = true; } else { switch ($compression) { @@ -452,7 +452,7 @@ if ($import_file != 'none' && ! $error) { } // use isset() because zip compression type does not use a handle if (! $error && isset($import_handle) && $import_handle === false) { - $message = PMA_Message::error(__('File could not be read')); + $message = PMA_Message::error(__('File could not be read!')); $error = true; } } elseif (! $error) { diff --git a/libraries/File.class.php b/libraries/File.class.php index 6a6f1ae162..12c86bbf98 100644 --- a/libraries/File.class.php +++ b/libraries/File.class.php @@ -430,7 +430,7 @@ class PMA_File PMA_Util::userDir($GLOBALS['cfg']['UploadDir']) . PMA_securePath($name) ); if (! $this->isReadable()) { - $this->_error_message = __('File could not be read'); + $this->_error_message = __('File could not be read!'); $this->setName(null); return false; } @@ -523,7 +523,7 @@ class PMA_File ob_end_clean(); if (! $file) { - $this->_error_message = __('File could not be read'); + $this->_error_message = __('File could not be read!'); return false; } @@ -539,7 +539,7 @@ class PMA_File } */ - $this->_compression = PMA_Util::getCompressionMimeType($file); + $this->_compression = PMA_Util::getCompressionMimeType($file); return $this->_compression; } From c3bcdf2b5de9c84e1f669de1c4629fea206909c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Wed, 29 Jan 2014 13:23:03 +0100 Subject: [PATCH 2/2] Remove no longer used javascript messages --- js/messages.php | 23 ----------------------- 1 file changed, 23 deletions(-) diff --git a/js/messages.php b/js/messages.php index 218bb30c93..777dd44351 100644 --- a/js/messages.php +++ b/js/messages.php @@ -60,8 +60,6 @@ $js_messages['strHostEmpty'] = __('The host name is empty!'); $js_messages['strUserEmpty'] = __('The user name is empty!'); $js_messages['strPasswordEmpty'] = __('The password is empty!'); $js_messages['strPasswordNotSame'] = __('The passwords aren\'t the same!'); -$js_messages['strAddUser'] = __('Add user'); -$js_messages['strReloadingPrivileges'] = __('Reloading Privileges'); $js_messages['strRemovingSelectedUsers'] = __('Removing Selected Users'); $js_messages['strClose'] = __('Close'); @@ -117,8 +115,6 @@ $js_messages['strTables'] = __('%d table(s)'); $js_messages['strQuestions'] = __('Questions'); $js_messages['strTraffic'] = __('Traffic'); $js_messages['strSettings'] = __('Settings'); -$js_messages['strRemoveChart'] = __('Remove chart'); -$js_messages['strEditChart'] = __('Edit title and labels'); $js_messages['strAddChart'] = __('Add chart to grid'); $js_messages['strClose'] = __('Close'); $js_messages['strAddOneSeriesWarning'] = __('Please add at least one variable to the series!'); @@ -180,8 +176,6 @@ $js_messages['strTotalTime'] = __('Total time:'); $js_messages['strProfilingResults'] = __('Profiling results'); $js_messages['strTable'] = _pgettext('Display format', 'Table'); $js_messages['strChart'] = __('Chart'); -$js_messages['strChartEdit'] = __('Edit chart'); -$js_messages['strSeries'] = __('Series'); /* l10n: A collection of available filters */ $js_messages['strFiltersForLogTable'] = __('Log table filter options'); @@ -240,19 +234,11 @@ $js_messages['strDismiss'] = __('Click to dismiss this notification'); /* For db_operations.js */ $js_messages['strRenamingDatabases'] = __('Renaming Databases'); -$js_messages['strReloadDatabase'] = __('Reload Database'); $js_messages['strCopyingDatabase'] = __('Copying Database'); $js_messages['strChangingCharset'] = __('Changing Charset'); -$js_messages['strTableMustHaveAtleastOneColumn'] = __( - 'Table must have at least one column' -); -$js_messages['strYes'] = __('Yes'); $js_messages['strNo'] = __('No'); /* For db_stucture.js */ -$js_messages['strInsertTable'] = __('Insert Table'); -$js_messages['strHideIndexes'] = __('Hide indexes'); -$js_messages['strShowIndexes'] = __('Show indexes'); $js_messages['strForeignKeyCheck'] = __('Foreign key check:'); $js_messages['strForeignKeyCheckEnabled'] = __('(Enabled)'); $js_messages['strForeignKeyCheckDisabled'] = __('(Disabled)'); @@ -281,9 +267,6 @@ $js_messages['strImportCSV'] = __('Note: If the file contains multiple tables, t $js_messages['strHideQueryBox'] = __('Hide query box'); $js_messages['strShowQueryBox'] = __('Show query box'); $js_messages['strEdit'] = __('Edit'); -$js_messages['strNoRowSelected'] = __('No rows selected'); -$js_messages['strChangeTbl'] = __('Change'); -$js_messages['strQueryExecutionTime'] = __('Query execution time'); $js_messages['strNotValidRowNumber'] = __('%d is not valid row number.'); /* For server_variables.js */ @@ -298,7 +281,6 @@ $js_messages['strHideFindNReplaceCriteria'] = __('Hide find and replace criteria $js_messages['strShowFindNReplaceCriteria'] = __('Show find and replace criteria'); /* For tbl_zoom_plot_jqplot.js */ -$js_messages['strZoomSearch'] = __('Zoom Search'); $js_messages['strDisplayHelp'] = '