From fb523a0c610c35c1399f328ae276d4dd2e212349 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kristjan=20R=C3=A4ts?= Date: Fri, 19 Dec 2014 16:08:24 +0100 Subject: [PATCH 1/2] Translated using Weblate (Estonian) Currently translated at 100.0% (2978 of 2978 strings) [CI skip] --- po/et.po | 64 +++++++++++++++++++++++++++++--------------------------- 1 file changed, 33 insertions(+), 31 deletions(-) diff --git a/po/et.po b/po/et.po index 6e52bdeb2f..a655b2ea5d 100644 --- a/po/et.po +++ b/po/et.po @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.3.3-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2014-12-15 15:54-0500\n" -"PO-Revision-Date: 2014-12-19 12:51+0200\n" +"PO-Revision-Date: 2014-12-19 16:08+0200\n" "Last-Translator: Kristjan Räts \n" "Language-Team: Estonian " "\n" @@ -889,7 +889,7 @@ msgid "" "extended features have been deactivated. %sFind out why%s. " msgstr "" "phpMyAdmini häälestuse salvestuskoht ei ole lõplikult häälestatud; mõned " -"laiendatud võimalused ei ole aktiveeritud. %sVaata põhjust%s. " +"laiendatud funktsioonid ei ole aktiveeritud. %sVaata põhjust%s. " #: index.php:540 msgid "" @@ -2198,8 +2198,8 @@ msgid "" "edit, checkbox, Edit, Copy and Delete links may not work after saving." msgstr "" "See tabel ei sisalda unikaalset veergu. Ruudustiku muutmisega, " -"märkeruutudega, muutmisega, kopeerimisega ja kustutamisega seotud võimalused " -"ei pruugi pärast salvestamist toimida." +"märkeruutudega, muutmisega, kopeerimisega ja kustutamisega seotud " +"funktsionaalsus ei pruugi pärast salvestamist toimida." #: js/messages.php:432 msgid "Please enter a valid hexadecimal string. Valid characters are 0-9, A-F." @@ -4595,7 +4595,8 @@ msgid "" "The configuration storage is not ready for the central list of columns " "feature." msgstr "" -"Seadistuse salvestuskoht ei ole valmis kasutamaks keskset veergude nimekirja." +"Häälestuse salvestuskoht ei ole valmis keskse veergude nimekirja " +"funktsionaalsuse kasutamiseks." #: libraries/central_columns.lib.php:264 #, php-format @@ -5282,8 +5283,8 @@ msgid "" "Compress gzip exports on the fly without the need for much memory; if you " "encounter problems with created gzip files disable this feature." msgstr "" -"Tihenda lennult gzip eksportimised ilma suurt mäluhulka tarbimata. Kui sul " -"esineb probleeme loodud gzip failidega, siis keela see võimalus." +"Tihenda gzip eksportimised lennult vajamata suuri mälumahtusid. Kui sul " +"esineb loodud gzip failidega probleeme, siis keela see funktsionaalsus." #: libraries/config/messages.inc.php:73 msgid "Compress on the fly" @@ -5674,7 +5675,7 @@ msgstr "Muuda vaikimisi ekspordi valikuid." #: libraries/config/messages.inc.php:218 libraries/config/messages.inc.php:279 #: setup/frames/menu.inc.php:22 msgid "Features" -msgstr "Häälestamine" +msgstr "Funktsionaalsused" #: libraries/config/messages.inc.php:219 msgid "General" @@ -5775,8 +5776,8 @@ msgid "" "Please note that phpMyAdmin is just a user interface and its features do not " "limit MySQL." msgstr "" -"Palun pane tähele, et phpMyAdmin on lihtsalt kasutajaliides ja selle " -"võimalused ei piira MySQL'i." +"Palun pane tähele, et phpMyAdmin on lihtsalt kasutajaliides ja tema " +"funktsionaalsus ei piira MySQL'i." #: libraries/config/messages.inc.php:258 msgid "Basic settings" @@ -5816,9 +5817,9 @@ msgid "" "features, see [doc@linked-tables]phpMyAdmin configuration storage[/doc] in " "documentation." msgstr "" -"Seadista phpMyAdmini seadistuse salvestust, et saada ligipääs " -"lisavõimalustele. Vaata dokumentatsioonist [doc@linked-tables]phpMyAdmin " -"configuration storage[/doc]." +"Häälesta phpMyAdmini seadistuse salvestust, et saada ligipääs " +"lisafunktsionaalsusele. Vaata dokumentatsioonist [doc@linked-tables]" +"phpMyAdmin configuration storage[/doc]." #: libraries/config/messages.inc.php:273 msgid "Changes tracking" @@ -6467,7 +6468,8 @@ msgstr "Primaarvõtme vaimisi sortimisrežiim" #: libraries/config/messages.inc.php:528 msgid "" "Repeat the headers every X cells, [kbd]0[/kbd] deactivates this feature." -msgstr "Korda päiseid iga X rea tagant, [kbd]0[/kbd] keelab selle võimaluse." +msgstr "" +"Korda päiseid iga X rea tagant, [kbd]0[/kbd] keelab selle funktsionaalsuse." #: libraries/config/messages.inc.php:529 msgid "Repeat headers" @@ -6740,10 +6742,9 @@ msgid "" "phpmyadmin.net/pma/pmadb]pmadb[/a] for complete information. Leave blank for " "no support. Suggested: [kbd]phpmyadmin[/kbd]." msgstr "" -"Andmebaas, mida kasutada seoste, järjehoidjate ja PDF võimaluste " -"säilitamiseks. Lisateavet leiad aadressilt [a@http://wiki.phpmyadmin.net/pma/" -"pmadb]pmadb[/a]. Kui tugi puudub, siis jäta tühjaks, soovitatav: [kbd]" -"phpmyadmin[/kbd]." +"Andmebaas, mida kasutada seoste, järjehoidjate ja PDF funktsionaalsusega. " +"Lisateavet leiad aadressilt [a@http://wiki.phpmyadmin.net/pma/pmadb]pmadb[/a]" +". Kui tugi puudub, siis jäta tühjaks, soovitatav: [kbd]phpmyadmin[/kbd]." #: libraries/config/messages.inc.php:628 #: libraries/display_create_database.lib.php:31 @@ -6938,9 +6939,9 @@ msgid "" "configurable menus feature; leaving either one of them blank will disable " "this feature, suggested: [kbd]pma__users[/kbd]." msgstr "" -"Kohandatavate menüüde võimaluse kasutamiseks on vajalikud nii see tabel kui " -"ka kasutajate gruppide tabel. Jättes ühe neist tühjaks, keelad menüüde " -"kohandamise; soovitatav: [kbd]pma__users[/kbd]." +"Kohandatavate menüüde funktsionaalsuse kasutamiseks on vajalikud nii see " +"tabel kui ka kasutajate gruppide tabel. Jättes ühe neist tühjaks, keelad " +"menüüde kohandamise; soovitatav: [kbd]pma__users[/kbd]." #: libraries/config/messages.inc.php:700 msgid "Users table" @@ -6952,9 +6953,9 @@ msgid "" "menus feature; leaving either one of them blank will disable this feature, " "suggested: [kbd]pma__usergroups[/kbd]." msgstr "" -"Kohandatavate menüüde võimaluse kasutamiseks on vajalikud nii see tabel kui " -"ka kasutajate tabel. Jättes ühe neist tühjaks, keelad menüüde kohandamise; " -"soovitatav: [kbd]pma__usergroups[/kbd]." +"Kohandatavate menüüde funktsionaalsuse kasutamiseks on vajalikud nii see " +"tabel kui ka kasutajate tabel. Jättes ühe neist tühjaks, keelad menüüde " +"kohandamise; soovitatav: [kbd]pma__usergroups[/kbd]." #: libraries/config/messages.inc.php:702 msgid "User groups table" @@ -10311,7 +10312,7 @@ msgstr "Viga: veeru(de)l puuduv(ad) indeks(id)." #: libraries/pmd_common.php:552 msgid "Error: Relational features are disabled!" -msgstr "Viga: Seoste omadused on keelatud!" +msgstr "Viga: Seoste funksionaalsusega seonduv on keelatud!" #: libraries/pmd_common.php:572 msgid "Internal relation has been added." @@ -10356,11 +10357,11 @@ msgstr "pmadb seadistus... " #: libraries/relation.lib.php:105 libraries/relation.lib.php:126 msgid "General relation features" -msgstr "Peamised seoste võimalused" +msgstr "Peamised seoste funksionaalsused" #: libraries/relation.lib.php:137 msgid "Display Features" -msgstr "Näita võimalusi" +msgstr "Kuvamise funktsionaalsus" #: libraries/relation.lib.php:154 msgid "Designer and creation of PDFs" @@ -10417,7 +10418,7 @@ msgstr "Veergude keskse nimekirja haldamine" #: libraries/relation.lib.php:304 msgid "Quick steps to setup advanced features:" -msgstr "Täpsemate võimaluste seadistamise kiirsammud:" +msgstr "Täpsema funktsionaalsuse seadistamise kiirsammud:" #: libraries/relation.lib.php:310 #, php-format @@ -10435,7 +10436,7 @@ msgid "" "Enable advanced features in configuration file (config.inc.php), for example by starting from config.sample.inc.php." msgstr "" -"Luba täpsemad võimalused seadistuse failis (config.inc.php). " +"Luba täpsem funktsionaalsus häälestusfailis (config.inc.php). " "Näiteks alustades config.sample.inc.php failist." #: libraries/relation.lib.php:331 @@ -12972,7 +12973,8 @@ msgid "" "Edit, Copy and Delete features are not available." msgstr "" "Valik ei sisalda unikaalset veergu. Ruudustiku muutmisega, märkeruutudega, " -"muutmisega, kopeerimisega ja kustutamisega seotud võimalused ei ole saadaval." +"muutmisega, kopeerimisega ja kustutamisega seotud funksionaalsus ei ole " +"saadaval." #: libraries/sql.lib.php:2047 #, php-format @@ -13904,7 +13906,7 @@ msgstr "Sul pole salvestatud sätteid!" #: prefs_manage.php:266 prefs_manage.php:326 msgid "This feature is not supported by your web browser" -msgstr "Sinu veebilehitseja ei toeta seda võimalust" +msgstr "Sinu veebilehitseja ei toeta seda funktsionaalsust" #: prefs_manage.php:272 msgid "Merge with current configuration" From 5429d91ce198b80b4ddf80d194aba9e77e93c1f1 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Sat, 20 Dec 2014 13:32:34 -0500 Subject: [PATCH 2/2] bug ['Error_Handler']['display'] no longer necessary Signed-off-by: Marc Delisle --- ChangeLog | 3 ++- doc/config.rst | 7 ------- libraries/Error_Handler.class.php | 11 +++-------- libraries/common.inc.php | 1 - libraries/config.default.php | 20 -------------------- libraries/config/messages.inc.php | 1 - libraries/config/setup.forms.php | 1 - libraries/config/user_preferences.forms.php | 1 - libraries/user_preferences.lib.php | 2 -- test/classes/PMA_Error_Handler_test.php | 8 -------- test/classes/PMA_Footer_test.php | 2 -- 11 files changed, 5 insertions(+), 52 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6b2501e6e2..71413ac636 100644 --- a/ChangeLog +++ b/ChangeLog @@ -12,7 +12,8 @@ phpMyAdmin - ChangeLog - bug Undefined index central_columnswork - bug #4657 Don't have default blowfish_secret - bug #4656 Some error popups fade away too quickly -- bug #4648 Consistency in borders +- bug #4648 Consistency in borders +- bug $cfg['Error_Handler']['display'] no longer necessary 4.3.2.0 (2014-12-12) - bug #4628 PHP error while exporting schema as PDF diff --git a/doc/config.rst b/doc/config.rst index 4c4c068b41..d513521813 100644 --- a/doc/config.rst +++ b/doc/config.rst @@ -2744,13 +2744,6 @@ Developer Enable to let server present itself as demo server. This is used for . -.. config:option:: $cfg['Error_Handler']['display'] - - :type: boolean - :default: false - - Whether to display errors from PHP or not. - .. config:option:: $cfg['RowActionType'] :type: string diff --git a/libraries/Error_Handler.class.php b/libraries/Error_Handler.class.php index ad954e1c9a..5cffd9880f 100644 --- a/libraries/Error_Handler.class.php +++ b/libraries/Error_Handler.class.php @@ -298,9 +298,7 @@ class PMA_Error_Handler { $retval = ''; // display errors if SendErrorReports is set to 'ask'. - if ($GLOBALS['cfg']['SendErrorReports'] != 'never' - || $GLOBALS['cfg']['Error_Handler']['display'] - ) { + if ($GLOBALS['cfg']['SendErrorReports'] != 'never') { foreach ($this->getErrors() as $error) { if ($error instanceof PMA_Error) { if (! $error->isDisplayed()) { @@ -448,9 +446,7 @@ class PMA_Error_Handler */ public function countDisplayErrors() { - if ($GLOBALS['cfg']['SendErrorReports'] != 'never' - || $GLOBALS['cfg']['Error_Handler']['display'] - ) { + if ($GLOBALS['cfg']['SendErrorReports'] != 'never') { return $this->countErrors(); } else { return $this->countUserErrors(); @@ -492,8 +488,7 @@ class PMA_Error_Handler public function hasErrorsForPrompt() { return ( - ($GLOBALS['cfg']['SendErrorReports'] != 'never' - || $GLOBALS['cfg']['Error_Handler']['display']) + $GLOBALS['cfg']['SendErrorReports'] != 'never' && $this->countErrors() != $this->countUserErrors() ); } diff --git a/libraries/common.inc.php b/libraries/common.inc.php index 9763ee07fc..fcdc313c5b 100644 --- a/libraries/common.inc.php +++ b/libraries/common.inc.php @@ -67,7 +67,6 @@ require './libraries/Error_Handler.class.php'; * initialize the error handler */ $GLOBALS['error_handler'] = new PMA_Error_Handler(); -$cfg['Error_Handler']['display'] = true; /** * This setting was removed in PHP 5.4. But at this point PMA_PHP_INT_VERSION diff --git a/libraries/config.default.php b/libraries/config.default.php index a6657f9cc5..e4f38be69a 100644 --- a/libraries/config.default.php +++ b/libraries/config.default.php @@ -813,26 +813,6 @@ $cfg['CaptchaLoginPublicKey'] = ''; */ $cfg['CaptchaLoginPrivateKey'] = ''; -/******************************************************************************* - * Error handler configuration - * - * this configures phpMyAdmin's own error handler, it is used to avoid information - * disclosure, gather errors for logging, reporting and displaying - * - * @global array $cfg['Error_Handler'] - */ -$cfg['Error_Handler'] = array(); - -/** - * whether to display errors or not - * - * this does not affect errors of type E_USER_* - * - * @global boolean $cfg['Error_Handler']['display'] - */ -$cfg['Error_Handler']['display'] = false; - - /******************************************************************************* * Navigation panel setup */ diff --git a/libraries/config/messages.inc.php b/libraries/config/messages.inc.php index 598a341cd4..9277060873 100644 --- a/libraries/config/messages.inc.php +++ b/libraries/config/messages.inc.php @@ -97,7 +97,6 @@ $strConfigDisableMultiTableMaintenance_desc = __( . 'the selected tables of a database.' ); $strConfigDisableMultiTableMaintenance_name = __('Disable multi table maintenance'); -$strConfigError_Handler_display_name = __('Display errors'); $strConfigExecTimeLimit_desc = __( 'Set the number of seconds a script is allowed to run ([kbd]0[/kbd] for no ' . 'limit).' diff --git a/libraries/config/setup.forms.php b/libraries/config/setup.forms.php index f95325421d..28f146740d 100644 --- a/libraries/config/setup.forms.php +++ b/libraries/config/setup.forms.php @@ -123,7 +123,6 @@ $forms['Features']['Warnings'] = array( 'SuhosinDisableWarning'); $forms['Features']['Developer'] = array( 'UserprefsDeveloperTab', - 'Error_Handler/display', 'DBG/sql'); $forms['Features']['Other_core_settings'] = array( 'NaturalOrder', diff --git a/libraries/config/user_preferences.forms.php b/libraries/config/user_preferences.forms.php index 1fdaf0d32c..02241c8c89 100644 --- a/libraries/config/user_preferences.forms.php +++ b/libraries/config/user_preferences.forms.php @@ -58,7 +58,6 @@ $forms['Features']['Warnings'] = array( // settings from this form are treated specially, // see prefs_forms.php and user_preferences.lib.php $forms['Features']['Developer'] = array( - 'Error_Handler/display', 'DBG/sql'); $forms['Sql_queries']['Sql_queries'] = array( 'ShowSQL', diff --git a/libraries/user_preferences.lib.php b/libraries/user_preferences.lib.php index 61b7cca884..94b91e8204 100644 --- a/libraries/user_preferences.lib.php +++ b/libraries/user_preferences.lib.php @@ -152,8 +152,6 @@ function PMA_applyUserprefs(array $config_data) $blacklist = array_flip($GLOBALS['cfg']['UserprefsDisallow']); if (!$GLOBALS['cfg']['UserprefsDeveloperTab']) { // disallow everything in the Developers tab - $blacklist['Error_Handler/display'] = true; - $blacklist['Error_Handler/gather'] = true; $blacklist['DBG/sql'] = true; } $whitelist = array_flip(PMA_readUserprefsFieldNames()); diff --git a/test/classes/PMA_Error_Handler_test.php b/test/classes/PMA_Error_Handler_test.php index 1dac61d4c1..64ecf458ec 100644 --- a/test/classes/PMA_Error_Handler_test.php +++ b/test/classes/PMA_Error_Handler_test.php @@ -118,8 +118,6 @@ class PMA_Error_Handler_Test extends PHPUnit_Framework_TestCase ) { // TODO: Add other test cases for all combination of 'sendErrorReports' $GLOBALS['cfg']['SendErrorReports'] = 'never'; - $GLOBALS['cfg']['Error_Handler']['gather'] = true; - $GLOBALS['cfg']['Error_Handler']['display'] = false; $this->object->handleError($errno, $errstr, $errfile, $errline); @@ -151,9 +149,6 @@ class PMA_Error_Handler_Test extends PHPUnit_Framework_TestCase public function testGetDispErrorsForDisplayTrue( $errno, $errstr, $errfile, $errline, $output_show, $output_hide ) { - $GLOBALS['cfg']['Error_Handler']['gather'] = true; - $GLOBALS['cfg']['Error_Handler']['display'] = true; - $this->object->handleError($errno, $errstr, $errfile, $errline); $this->assertContains( @@ -251,7 +246,6 @@ class PMA_Error_Handler_Test extends PHPUnit_Framework_TestCase */ public function testCountDisplayErrorsForDisplayTrue() { - $GLOBALS['cfg']['Error_Handler']['display'] = true; $this->assertEquals( 0, $this->object->countDisplayErrors() @@ -265,7 +259,6 @@ class PMA_Error_Handler_Test extends PHPUnit_Framework_TestCase */ public function testCountDisplayErrorsForDisplayFalse() { - $GLOBALS['cfg']['Error_Handler']['display'] = false; $this->assertEquals( 0, $this->object->countDisplayErrors() @@ -279,7 +272,6 @@ class PMA_Error_Handler_Test extends PHPUnit_Framework_TestCase */ public function testHasDisplayErrors() { - $GLOBALS['cfg']['Error_Handler']['display'] = false; $this->assertFalse($this->object->hasDisplayErrors()); } } diff --git a/test/classes/PMA_Footer_test.php b/test/classes/PMA_Footer_test.php index 8f2716fe1b..0f64889e73 100644 --- a/test/classes/PMA_Footer_test.php +++ b/test/classes/PMA_Footer_test.php @@ -59,8 +59,6 @@ class PMA_Footer_Test extends PHPUnit_Framework_TestCase $GLOBALS['PMA_Config'] = new PMA_Config(); $GLOBALS['PMA_Config']->enableBc(); $GLOBALS['collation_connection'] = 'utf8_general_ci'; - $GLOBALS['cfg']['Error_Handler']['gather'] = false; - $GLOBALS['cfg']['Error_Handler']['display'] = false; $GLOBALS['cfg']['Server']['verbose'] = 'verbose host'; $GLOBALS['cfg']['DefaultTabDatabase'] = 'db_structure.php'; $GLOBALS['server'] = '1';