From 7baa79c28cde1ce72003e85e964c26920f483ca2 Mon Sep 17 00:00:00 2001 From: Umair Khan Date: Fri, 21 Feb 2014 00:11:33 +0530 Subject: [PATCH 1/4] BugFix #4294 Signed-off-by: Umair Khan --- js/export.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/js/export.js b/js/export.js index a16bd29221..f169004727 100644 --- a/js/export.js +++ b/js/export.js @@ -185,9 +185,10 @@ AJAX.registerOnload('export.js', function () { var active_plugin = $("#plugins option:selected").val(); var force_file = $("#force_file_" + active_plugin).val(); if (force_file == "true") { + $("#radio_dump_asfile").prop('checked', true); $("#radio_view_as_text").prop('disabled', true).parent().fadeTo('fast', 0.4); } else { - $("#radio_view_as_text").removeProp('disabled').parent().fadeTo('fast', 1); + $("#radio_view_as_text").prop('disabled', false).parent().fadeTo('fast', 1); } }); }); From 2ca57354430244fcc4903bbc4888a898e70fd759 Mon Sep 17 00:00:00 2001 From: Umair Khan Date: Mon, 24 Feb 2014 18:21:17 +0530 Subject: [PATCH 2/4] Fix empty filename during export Signed-off-by: Umair Khan --- js/export.js | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/js/export.js b/js/export.js index f169004727..03dd329249 100644 --- a/js/export.js +++ b/js/export.js @@ -132,8 +132,8 @@ function toggle_save_to_file() $("#ul_save_asfile > li> select").prop('disabled', true); } else { $("#ul_save_asfile > li").fadeTo('fast', 1); - $("#ul_save_asfile > li > input").removeProp('disabled'); - $("#ul_save_asfile > li> select").removeProp('disabled'); + $("#ul_save_asfile > li > input").prop('disabled', false); + $("#ul_save_asfile > li> select").prop('disabled', false); } } @@ -185,7 +185,10 @@ AJAX.registerOnload('export.js', function () { var active_plugin = $("#plugins option:selected").val(); var force_file = $("#force_file_" + active_plugin).val(); if (force_file == "true") { - $("#radio_dump_asfile").prop('checked', true); + if ($("#radio_dump_asfile").prop('checked') !== true) { + $("#radio_dump_asfile").prop('checked', true); + toggle_save_to_file(); + } $("#radio_view_as_text").prop('disabled', true).parent().fadeTo('fast', 0.4); } else { $("#radio_view_as_text").prop('disabled', false).parent().fadeTo('fast', 1); From 02ce9e3a98668862175b07b03fb484823f2ddd4f Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Mon, 24 Feb 2014 16:09:51 -0500 Subject: [PATCH 3/4] ChangeLog entry Signed-off-by: Marc Delisle --- ChangeLog | 1 + 1 file changed, 1 insertion(+) diff --git a/ChangeLog b/ChangeLog index e6ea0c8576..90a1fbd548 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,6 +3,7 @@ phpMyAdmin - ChangeLog 4.1.9.0 (not yet released) - bug #4279 CTRL + up or down moves two fields (part one) +- bug #4294 output as text radio clickable for "OpenDocument Text" export 4.1.8.0 (2014-02-22) - bug #4276 Login loop on session expiry From 42202fe883253a3d0ae54e59cf17902d3a19435c Mon Sep 17 00:00:00 2001 From: "cmdr.by" Date: Mon, 24 Feb 2014 17:20:45 +0100 Subject: [PATCH 4/4] Translated using Weblate (Belarusian) Currently translated at 31.4% (865 of 2749) --- po/be.po | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/po/be.po b/po/be.po index 38ee691980..ea199b9aa7 100644 --- a/po/be.po +++ b/po/be.po @@ -4,17 +4,17 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.1.6-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2014-01-19 08:19-0500\n" -"PO-Revision-Date: 2013-08-23 11:32+0200\n" -"Last-Translator: Michal Čihař \n" -"Language-Team: Belarusian \n" +"PO-Revision-Date: 2014-02-24 17:20+0200\n" +"Last-Translator: cmdr.by \n" +"Language-Team: Belarusian " +"\n" "Language: be\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" -"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" -"X-Generator: Weblate 1.7-dev\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%" +"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" +"X-Generator: Weblate 1.9-dev\n" #: changelog.php:36 license.php:28 #, php-format @@ -35,7 +35,6 @@ msgstr "Камэнтар да базы дадзеных: " #: db_datadict.php:159 libraries/schema/Pdf_Relation_Schema.class.php:1348 #: libraries/tbl_columns_definition_form.lib.php:70 #: libraries/tbl_printview.lib.php:579 -#, fuzzy #| msgid "Table comments" msgid "Table comments:" msgstr "Камэнтар да табліцы"