From a61bc86d2be39ff04d354372eeb01df30f84761d Mon Sep 17 00:00:00 2001 From: Atul Pratap Singh Date: Wed, 2 Jul 2014 13:10:15 +0530 Subject: [PATCH 1/4] Remove window.location.replace Signed-off-by: Atul Pratap Singh --- js/multi_column_sort.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/js/multi_column_sort.js b/js/multi_column_sort.js index cb5bece3ca..c7380c80f3 100644 --- a/js/multi_column_sort.js +++ b/js/multi_column_sort.js @@ -57,15 +57,15 @@ function removeColumnFromMultiSort(target, parent) } AJAX.registerOnload('keyhandler.js', function () { - $("th.draggable.column_heading.pointer.marker a").live('click', function (event) { + $("th.draggable.column_heading.pointer.marker a").on('click', function (event) { var url = $(this).parent().find('input').val(); if (event.ctrlKey) { event.preventDefault(); url = removeColumnFromMultiSort(url, $(this).parent()); - window.location.replace(url); + $.get(url, {'ajax_request' : true, 'ajax_page_request' : true}, AJAX.responseHandler); } else if (event.shiftKey) { event.preventDefault(); - window.location.replace(url); + $.get(url, {'ajax_request' : true, 'ajax_page_request' : true}, AJAX.responseHandler); } }); }); From 06f7a7b8a4eba66a00bba512f48268a399392b3d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kristjan=20R=C3=A4ts?= Date: Wed, 2 Jul 2014 09:43:39 +0200 Subject: [PATCH 2/4] Translated using Weblate (Estonian) Currently translated at 100.0% (2770 of 2770) --- po/et.po | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/po/et.po b/po/et.po index 713b13635f..6a73508a0c 100644 --- a/po/et.po +++ b/po/et.po @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.2.4-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2014-06-10 12:45-0400\n" -"PO-Revision-Date: 2014-06-23 07:10+0200\n" +"PO-Revision-Date: 2014-07-02 09:43+0200\n" "Last-Translator: Kristjan Räts \n" "Language-Team: Estonian " "\n" @@ -925,7 +925,7 @@ msgstr "Kustuta jälgimise andmed" #: js/messages.php:42 msgid "Dropping Primary Key/Index" -msgstr "Primaarvõtme/Indeksi kustutamine" +msgstr "Primaarvõtme/indeksi kustutamine" #: js/messages.php:43 msgid "This operation could take a long time. Proceed anyway?" @@ -3628,12 +3628,12 @@ msgstr "BIGINT UNSIGNED NOT NULL AUTO_INCREMENT UNIQUE alias" #: libraries/Types.class.php:344 libraries/Types.class.php:790 #, php-format msgid "A date, supported range is %1$s to %2$s" -msgstr "Kuupäev, sobiv ulatus on %1$s kuni %2$s" +msgstr "Kuupäev, sobiv vahemik on %1$s kuni %2$s" #: libraries/Types.class.php:346 libraries/Types.class.php:792 #, php-format msgid "A date and time combination, supported range is %1$s to %2$s" -msgstr "Kuupäeva ja aja kombinatsioon, sobiv ulatus on %1$s kuni %2$s" +msgstr "Kuupäeva ja aja kombinatsioon, sobiv vahemik on %1$s kuni %2$s" #: libraries/Types.class.php:348 msgid "" @@ -3647,7 +3647,7 @@ msgstr "" #: libraries/Types.class.php:350 libraries/Types.class.php:796 #, php-format msgid "A time, range is %1$s to %2$s" -msgstr "Aeg, ulatus on %1$s kuni %2$s" +msgstr "Aeg, vahemik on %1$s kuni %2$s" #: libraries/Types.class.php:352 msgid "" From b0507aab93412f57f57a2eb17a462a03fdbe6d25 Mon Sep 17 00:00:00 2001 From: Lakshmanan M Date: Wed, 2 Jul 2014 07:56:42 +0200 Subject: [PATCH 3/4] Translated using Weblate (Tamil) Currently translated at 31.0% (860 of 2770) --- po/ta.po | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/po/ta.po b/po/ta.po index b7eb4a248c..03789e8844 100644 --- a/po/ta.po +++ b/po/ta.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.2.4-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2014-06-10 12:45-0400\n" -"PO-Revision-Date: 2014-06-09 20:38+0200\n" -"Last-Translator: கணேஷ் குமார் \n" +"PO-Revision-Date: 2014-07-02 07:56+0200\n" +"Last-Translator: Lakshmanan M \n" "Language-Team: Tamil \n" +"Language: ta\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: ta\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Generator: Weblate 1.10-dev\n" @@ -830,12 +830,18 @@ msgstr "" "பிரிக்கவியலாது அதனால் எதிர்பாரா முடிவுகள் கிடைக்கலாம்." #: index.php:471 +#, fuzzy msgid "" "Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini." "session.gc-maxlifetime@_blank]session.gc_maxlifetime[/a] is lower than " "cookie validity configured in phpMyAdmin, because of this, your login will " "expire sooner than configured in phpMyAdmin." msgstr "" +"உங்கள் PHP அளவுரு " +"[a@http://php.net/manual/en/session.configuration.php#ini.session.gc-" +"maxlifetime@_blank]session.gc_maxlifetime[/a] , கால் தேக்கரண்டி உப்பு " +"கட்டமைக்கப்பட்ட குக்கீ செல்லுபடியாகும் விட குறைவாக உள்ளது, ஏனெனில் இந்த, " +"உங்கள் உள்நுழைவு விரைவில் உதாரணமாக, கட்டமைக்கப்பட்ட விட காலாவதியாகிவிடும்." #: index.php:483 msgid "" From c2797570d171ccfe8bfdab5873c8306815441c01 Mon Sep 17 00:00:00 2001 From: Atul Pratap Singh Date: Wed, 2 Jul 2014 14:00:32 +0530 Subject: [PATCH 4/4] Fix js error on multisort Signed-off-by: Atul Pratap Singh --- js/multi_column_sort.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/js/multi_column_sort.js b/js/multi_column_sort.js index c7380c80f3..51ea76b34e 100644 --- a/js/multi_column_sort.js +++ b/js/multi_column_sort.js @@ -62,9 +62,11 @@ AJAX.registerOnload('keyhandler.js', function () { if (event.ctrlKey) { event.preventDefault(); url = removeColumnFromMultiSort(url, $(this).parent()); + AJAX.source = $(this); $.get(url, {'ajax_request' : true, 'ajax_page_request' : true}, AJAX.responseHandler); } else if (event.shiftKey) { event.preventDefault(); + AJAX.source = $(this); $.get(url, {'ajax_request' : true, 'ajax_page_request' : true}, AJAX.responseHandler); } });