From a9283ab8e2f30eda7652378d782a9540ee3f0653 Mon Sep 17 00:00:00 2001 From: Martin Lacina Date: Wed, 1 Apr 2015 14:54:59 +0200 Subject: [PATCH 1/2] Translated using Weblate (Slovak) Currently translated at 83.4% (2533 of 3035 strings) [CI skip] --- po/sk.po | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/po/sk.po b/po/sk.po index a4cae779f5..54e42bd955 100644 --- a/po/sk.po +++ b/po/sk.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.4.1-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2015-03-30 08:55-0400\n" -"PO-Revision-Date: 2015-04-01 08:42+0200\n" +"PO-Revision-Date: 2015-04-01 14:54+0200\n" "Last-Translator: Martin Lacina \n" "Language-Team: Slovak " "\n" @@ -826,7 +826,6 @@ msgid "List of changes" msgstr "Zoznam zmien" #: index.php:447 -#, fuzzy #| msgid "" #| "Your configuration file contains settings (root with no password) that " #| "correspond to the default MySQL privileged account. Your MySQL server is " @@ -838,10 +837,10 @@ msgid "" "default, is open to intrusion, and you really should fix this security hole " "by setting a password for user 'root'." msgstr "" -"Konfiguračný súbor obsahuje nastavenia (root bez hesla), ktoré zodpovedajú " -"predvolenému privilegovanému MySQL účtu. Ak MySQL server beží s týmto " -"nastavením, nie je zabezpečený proti napadnutiu, táto bezpečnostná chyba by " -"mala byť urýchlene odstránená nastavením hesla pre užívateľa 'root'." +"Ste pripojený ako 'root' bez hesla, čo zodpovedá predvolenému " +"privilegovanému MySQL účtu. Ak MySQL server beží s týmto nastavením, nie je " +"zabezpečený proti napadnutiu, táto bezpečnostná chyba by mala byť urýchlene " +"odstránená nastavením hesla pre užívateľa 'root'." #: index.php:464 msgid "" @@ -6418,7 +6417,7 @@ msgstr "Povoliť zvýrazňovanie" #: libraries/config/messages.inc.php:470 msgid "" "Whether to offer the possibility of tree expansion in the navigation panel." -msgstr "" +msgstr "Či sa má ponúknuť možnosť rozbaľovania stromu v navigačnom paneli." #: libraries/config/messages.inc.php:472 #| msgid "Table navigation bar" @@ -13784,10 +13783,9 @@ msgid "Display column was successfully updated." msgstr "Vlákno %s bol úspešne zabité." #: libraries/tbl_relation.lib.php:911 -#, fuzzy #| msgid "Internal relation added" msgid "Internal relations were successfully updated." -msgstr "Bol pridaný interný vzťah" +msgstr "Interné vzťahy boli úspešne zmenené." #: libraries/tbl_relation.lib.php:1176 #, php-format From 57e21caab1eb1fff11c4f79501a9b8dd94dd91d8 Mon Sep 17 00:00:00 2001 From: Madhura Jayaratne Date: Thu, 2 Apr 2015 11:01:23 +0530 Subject: [PATCH 2/2] bug #4828 JavaScript is loaded in wrong order Signed-off-by: Madhura Jayaratne --- ChangeLog | 1 + js/transformations/json.js | 10 +++---- js/transformations/xml.js | 8 +++--- libraries/Console.class.php | 27 +++++++------------ libraries/Header.class.php | 1 + .../input/Text_Plain_JsonEditor.class.php | 11 +++++--- .../input/Text_Plain_SqlEditor.class.php | 10 ++++--- .../input/Text_Plain_XmlEditor.class.php | 11 +++++--- .../output/Text_Plain_Json.class.php | 12 ++++++--- .../output/Text_Plain_Sql.class.php | 12 +++++++++ .../output/Text_Plain_Xml.class.php | 12 ++++++--- 11 files changed, 68 insertions(+), 47 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9990c2bf63..8f2d23f986 100644 --- a/ChangeLog +++ b/ChangeLog @@ -14,6 +14,7 @@ phpMyAdmin - ChangeLog - bug #4754 pMA DB not detected properly - bug #4825 Datepicker missing when changing number of rows on Insert page - bug #4824 INNODB STATUS page is empty +- bug #4828 JavaScript is loaded in wrong order 4.4.0.0 (2015-04-01) + rfe #1553 InnoDB presently supports one FULLTEXT index creation at a time diff --git a/js/transformations/json.js b/js/transformations/json.js index d2cd111ee3..98c4b33c40 100644 --- a/js/transformations/json.js +++ b/js/transformations/json.js @@ -3,18 +3,16 @@ * JSON syntax highlighting transformation plugin */ AJAX.registerOnload('transformations/json.js', function() { - var $elm = $('#page_content').find('code.json'); - $elm.each(function () { + var $elm = $('#page_content').find('code.json'); + $elm.each(function () { var $json = $(this); var $pre = $json.find('pre'); /* We only care about visible elements to avoid double processing */ if ($pre.is(":visible")) { var $highlight = $('
'); $json.append($highlight); - if (typeof CodeMirror != 'undefined') { - CodeMirror.runMode($json.text(), 'application/json', $highlight[0]); - $pre.hide(); - } + CodeMirror.runMode($json.text(), 'application/json', $highlight[0]); + $pre.hide(); } }); }); \ No newline at end of file diff --git a/js/transformations/xml.js b/js/transformations/xml.js index c6ed64b1f1..dd4eef6602 100644 --- a/js/transformations/xml.js +++ b/js/transformations/xml.js @@ -3,7 +3,7 @@ * XML syntax highlighting transformation plugin */ AJAX.registerOnload('transformations/xml.js', function() { - var $elm = $('#page_content').find('code.xml'); + var $elm = $('#page_content').find('code.xml'); $elm.each(function () { var $json = $(this); var $pre = $json.find('pre'); @@ -11,10 +11,8 @@ AJAX.registerOnload('transformations/xml.js', function() { if ($pre.is(":visible")) { var $highlight = $('
'); $json.append($highlight); - if (typeof CodeMirror != 'undefined') { - CodeMirror.runMode($json.text(), 'application/xml', $highlight[0]); - $pre.hide(); - } + CodeMirror.runMode($json.text(), 'application/xml', $highlight[0]); + $pre.hide(); } }); }); diff --git a/libraries/Console.class.php b/libraries/Console.class.php index 0b4fd50fdf..2c9baa5266 100644 --- a/libraries/Console.class.php +++ b/libraries/Console.class.php @@ -20,13 +20,6 @@ require_once 'libraries/bookmark.lib.php'; */ class PMA_Console { - /** - * PMA_Scripts instance - * - * @access private - * @var PMA_Scripts - */ - private $_scripts; /** * Whether to display anything * @@ -41,7 +34,6 @@ class PMA_Console public function __construct() { $this->_isEnabled = true; - $this->_scripts = new PMA_Scripts(); } /** @@ -147,6 +139,16 @@ class PMA_Console return $output; } + /** + * Returns the list of JS scripts required by console + * + * @return array list of scripts + */ + public function getScripts() + { + return array('console.js'); + } + /** * Renders the console * @@ -158,15 +160,6 @@ class PMA_Console $output = ''; if ((! $this->_isAjax) && $this->_isEnabled) { $cfgBookmark = PMA_Bookmark_getParams(); - if ($GLOBALS['cfg']['CodemirrorEnable']) { - $this->_scripts->addFile('codemirror/lib/codemirror.js'); - $this->_scripts->addFile('codemirror/mode/sql/sql.js'); - $this->_scripts->addFile('codemirror/addon/runmode/runmode.js'); - $this->_scripts->addFile('codemirror/addon/hint/show-hint.js'); - $this->_scripts->addFile('codemirror/addon/hint/sql-hint.js'); - } - $this->_scripts->addFile('console.js'); - $output .= $this->_scripts->getDisplay(); $output .= '
'; // The templates, use sprintf() to output them diff --git a/libraries/Header.class.php b/libraries/Header.class.php index b7b4c18747..e1c42d7766 100644 --- a/libraries/Header.class.php +++ b/libraries/Header.class.php @@ -404,6 +404,7 @@ class PMA_Header $this->_scripts->addFile('codemirror/addon/hint/show-hint.js'); $this->_scripts->addFile('codemirror/addon/hint/sql-hint.js'); } + $this->_scripts->addFiles($this->_console->getScripts()); if ($this->_userprefsOfferImport) { $this->_scripts->addFile('config.js'); } diff --git a/libraries/plugins/transformations/input/Text_Plain_JsonEditor.class.php b/libraries/plugins/transformations/input/Text_Plain_JsonEditor.class.php index 4db3142794..1af1330bea 100644 --- a/libraries/plugins/transformations/input/Text_Plain_JsonEditor.class.php +++ b/libraries/plugins/transformations/input/Text_Plain_JsonEditor.class.php @@ -42,10 +42,13 @@ class Text_Plain_JsonEditor extends CodeMirrorEditorTransformationsPlugin */ public function getScripts() { - return array( - 'codemirror/mode/javascript/javascript.js', - 'transformations/json_editor.js' - ); + $scripts = array(); + if ($GLOBALS['cfg']['CodemirrorEnable']) { + $scripts[] = 'codemirror/lib/codemirror.js'; + $scripts[] = 'codemirror/mode/javascript/javascript.js'; + $scripts[] = 'transformations/json_editor.js'; + } + return $scripts; } /* ~~~~~~~~~~~~~~~~~~~~ Getters and Setters ~~~~~~~~~~~~~~~~~~~~ */ diff --git a/libraries/plugins/transformations/input/Text_Plain_SqlEditor.class.php b/libraries/plugins/transformations/input/Text_Plain_SqlEditor.class.php index d7f805e453..61146b053d 100644 --- a/libraries/plugins/transformations/input/Text_Plain_SqlEditor.class.php +++ b/libraries/plugins/transformations/input/Text_Plain_SqlEditor.class.php @@ -42,9 +42,13 @@ class Text_Plain_SqlEditor extends CodeMirrorEditorTransformationsPlugin */ public function getScripts() { - return array( - 'transformations/sql_editor.js' - ); + $scripts = array(); + if ($GLOBALS['cfg']['CodemirrorEnable']) { + $scripts[] = 'codemirror/lib/codemirror.js'; + $scripts[] = 'codemirror/mode/sql/sql.js'; + $scripts[] = 'transformations/sql_editor.js'; + } + return $scripts; } /* ~~~~~~~~~~~~~~~~~~~~ Getters and Setters ~~~~~~~~~~~~~~~~~~~~ */ diff --git a/libraries/plugins/transformations/input/Text_Plain_XmlEditor.class.php b/libraries/plugins/transformations/input/Text_Plain_XmlEditor.class.php index 6790c57fef..e203ef5d13 100644 --- a/libraries/plugins/transformations/input/Text_Plain_XmlEditor.class.php +++ b/libraries/plugins/transformations/input/Text_Plain_XmlEditor.class.php @@ -42,10 +42,13 @@ class Text_Plain_XmlEditor extends CodeMirrorEditorTransformationsPlugin */ public function getScripts() { - return array( - 'codemirror/mode/xml/xml.js', - 'transformations/xml_editor.js' - ); + $scripts = array(); + if ($GLOBALS['cfg']['CodemirrorEnable']) { + $scripts[] = 'codemirror/lib/codemirror.js'; + $scripts[] = 'codemirror/mode/xml/xml.js'; + $scripts[] = 'transformations/xml_editor.js'; + } + return $scripts; } /* ~~~~~~~~~~~~~~~~~~~~ Getters and Setters ~~~~~~~~~~~~~~~~~~~~ */ diff --git a/libraries/plugins/transformations/output/Text_Plain_Json.class.php b/libraries/plugins/transformations/output/Text_Plain_Json.class.php index 52c0214a37..621cd1903e 100644 --- a/libraries/plugins/transformations/output/Text_Plain_Json.class.php +++ b/libraries/plugins/transformations/output/Text_Plain_Json.class.php @@ -23,10 +23,14 @@ class Text_Plain_Json extends TransformationsPlugin { public function __construct() { - $response = PMA_Response::getInstance(); - $scripts = $response->getHeader()->getScripts(); - $scripts->addFile('codemirror/mode/javascript/javascript.js'); - $scripts->addFile('transformations/json.js'); + if (! empty($GLOBALS['cfg']['CodemirrorEnable'])) { + $response = PMA_Response::getInstance(); + $scripts = $response->getHeader()->getScripts(); + $scripts->addFile('codemirror/lib/codemirror.js'); + $scripts->addFile('codemirror/mode/javascript/javascript.js'); + $scripts->addFile('codemirror/addon/runmode/runmode.js'); + $scripts->addFile('transformations/json.js'); + } } /** diff --git a/libraries/plugins/transformations/output/Text_Plain_Sql.class.php b/libraries/plugins/transformations/output/Text_Plain_Sql.class.php index 5c137236a8..472acf39f0 100644 --- a/libraries/plugins/transformations/output/Text_Plain_Sql.class.php +++ b/libraries/plugins/transformations/output/Text_Plain_Sql.class.php @@ -22,6 +22,18 @@ require_once 'libraries/plugins/transformations/abstract/' */ class Text_Plain_Sql extends SQLTransformationsPlugin { + public function __construct() + { + if (! empty($GLOBALS['cfg']['CodemirrorEnable'])) { + $response = PMA_Response::getInstance(); + $scripts = $response->getHeader()->getScripts(); + $scripts->addFile('codemirror/lib/codemirror.js'); + $scripts->addFile('codemirror/mode/sql/sql.js'); + $scripts->addFile('codemirror/addon/runmode/runmode.js'); + $scripts->addFile('function.js'); + } + } + /** * Gets the plugin`s MIME type * diff --git a/libraries/plugins/transformations/output/Text_Plain_Xml.class.php b/libraries/plugins/transformations/output/Text_Plain_Xml.class.php index d5777aa9d1..d41880d44b 100644 --- a/libraries/plugins/transformations/output/Text_Plain_Xml.class.php +++ b/libraries/plugins/transformations/output/Text_Plain_Xml.class.php @@ -23,10 +23,14 @@ class Text_Plain_Xml extends TransformationsPlugin { public function __construct() { - $response = PMA_Response::getInstance(); - $scripts = $response->getHeader()->getScripts(); - $scripts->addFile('codemirror/mode/xml/xml.js'); - $scripts->addFile('transformations/xml.js'); + if (! empty($GLOBALS['cfg']['CodemirrorEnable'])) { + $response = PMA_Response::getInstance(); + $scripts = $response->getHeader()->getScripts(); + $scripts->addFile('codemirror/lib/codemirror.js'); + $scripts->addFile('codemirror/mode/xml/xml.js'); + $scripts->addFile('codemirror/addon/runmode/runmode.js'); + $scripts->addFile('transformations/xml.js'); + } } /**