From 7662bf11ef594aadb635f015fc84ae117eddf146 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Mon, 1 Dec 2014 12:37:52 +0100 Subject: [PATCH 1/3] Translated using Weblate (Czech) Currently translated at 94.7% (2822 of 2978 strings) [CI skip] --- po/cs.po | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/po/cs.po b/po/cs.po index 92cac13e06..2eac315b37 100644 --- a/po/cs.po +++ b/po/cs.po @@ -6,16 +6,16 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.3.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2014-11-13 11:57-0500\n" -"PO-Revision-Date: 2014-11-13 13:51+0200\n" -"Last-Translator: Martin Vidner \n" -"Language-Team: Czech \n" +"PO-Revision-Date: 2014-12-01 12:37+0200\n" +"Last-Translator: Michal Čihař \n" +"Language-Team: Czech " +"\n" +"Language: cs\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: cs\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" -"X-Generator: Weblate 2.0\n" +"X-Generator: Weblate 2.1-dev\n" #: changelog.php:36 license.php:28 #, php-format @@ -35,10 +35,10 @@ msgid "Click to sort." msgstr "Klikněte pro řazení." #: db_central_columns.php:125 -#, fuzzy, php-format +#, php-format #| msgid "Showing row(s) %1$s - %2$s" msgid "Showing rows %1$s - %2$s." -msgstr "Zobrazeny záznamy %1$s - %2$s" +msgstr "Zobrazeny záznamy %1$s - %2$s." #: db_create.php:61 #, php-format From 5d0a2298e242d03dec663862207bb6959087584a Mon Sep 17 00:00:00 2001 From: Madhura Jayaratne Date: Tue, 2 Dec 2014 12:25:05 +0530 Subject: [PATCH 2/3] bug #4615 SQL highlighting in process list breaks on auto refresh Signed-off-by: Madhura Jayaratne --- ChangeLog | 1 + js/server_status_processes.js | 1 + 2 files changed, 2 insertions(+) diff --git a/ChangeLog b/ChangeLog index 7d764e0f23..ddf7040c7a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -6,6 +6,7 @@ phpMyAdmin - ChangeLog - bug #4610 JS error reporting: Hash fragment is reset - bug Undefined index menuswork - bug #4614 Separator between "Show All" and "Number of rows" disappears +- bug #4615 SQL highlighting in process list breaks on auto refresh 4.3.0.0 (not yet released) + rfe #1502 Smart sorting for int keys diff --git a/js/server_status_processes.js b/js/server_status_processes.js index 2777ad64e7..30be1af686 100644 --- a/js/server_status_processes.js +++ b/js/server_status_processes.js @@ -93,6 +93,7 @@ var processList = { if (data.hasOwnProperty('success') && data.success) { $newTable = $(data.message); $('#tableprocesslist').html($newTable.html()); + PMA_highlightSQL($('#tableprocesslist')); } processList.refreshTimeout = setTimeout( processList.refresh, From 7e01f79fee939033ffdb30825df3d639550da244 Mon Sep 17 00:00:00 2001 From: Madhura Jayaratne Date: Tue, 2 Dec 2014 12:49:27 +0530 Subject: [PATCH 3/3] ID is no longer used to facilitate multiple result sets Signed-off-by: Madhura Jayaratne --- js/sql.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/js/sql.js b/js/sql.js index d0060909f1..c442b3ab3c 100644 --- a/js/sql.js +++ b/js/sql.js @@ -103,7 +103,7 @@ AJAX.registerTeardown('sql.js', function () { $('body').off('click','a.browse_foreign'); $('body').off('click', '#simulate_dml'); $('body').off('keyup', '#sqlqueryform'); - $('body').off('click', '#resultsForm.ajax button[name="submit_mult"], #resultsForm.ajax input[name="submit_mult"]'); + $('body').off('click', 'form[name="resultsForm"].ajax button[name="submit_mult"], form[name="resultsForm"].ajax input[name="submit_mult"]'); }); /** @@ -528,7 +528,7 @@ AJAX.registerOnload('sql.js', function () { /** * Handles multi submits of results browsing page such as edit, delete and export */ - $('body').on('click', '#resultsForm.ajax button[name="submit_mult"], #resultsForm.ajax input[name="submit_mult"]', function (e) { + $('body').on('click', 'form[name="resultsForm"].ajax button[name="submit_mult"], form[name="resultsForm"].ajax input[name="submit_mult"]', function (e) { e.preventDefault(); var $button = $(this); var $form = $button.parent('form');