From 3d7cfa7b979178dafb3b7e87928d9b94ec87331a Mon Sep 17 00:00:00 2001 From: Thilanka Kaushalya Date: Mon, 11 Jul 2011 11:03:35 +0530 Subject: [PATCH 01/85] Fixed bug in check index type in initiation --- js/tbl_structure.js | 1 + 1 file changed, 1 insertion(+) diff --git a/js/tbl_structure.js b/js/tbl_structure.js index c58bd5443a..5a56d40aef 100644 --- a/js/tbl_structure.js +++ b/js/tbl_structure.js @@ -280,6 +280,7 @@ $(document).ready(function() { //Remove the top menu container from the dialog .find("#topmenucontainer").hide() ; // end dialog options + checkIndexType(); checkIndexName("index_frm"); } PMA_ajaxRemoveMessage($msgbox); From 290cf579b29017d79cf955a4fa3e816e91ba2070 Mon Sep 17 00:00:00 2001 From: Thilanka Kaushalya Date: Mon, 11 Jul 2011 12:00:40 +0530 Subject: [PATCH 02/85] Added tableCheckEditForm option to the table change --- js/tbl_structure.js | 76 +++++++++++++++++++++++++-------------------- 1 file changed, 43 insertions(+), 33 deletions(-) diff --git a/js/tbl_structure.js b/js/tbl_structure.js index 5a56d40aef..df5de38142 100644 --- a/js/tbl_structure.js +++ b/js/tbl_structure.js @@ -192,41 +192,51 @@ $(document).ready(function() { var $form = $("#append_fields_form"); PMA_prepareForAjaxRequest($form); - //User wants to submit the form - $.post($form.attr('action'), $form.serialize()+"&do_save_data=Save", function(data) { - if ($("#sqlqueryresults").length != 0) { - $("#sqlqueryresults").remove(); - } else if ($(".error").length != 0) { - $(".error").remove(); - } - if (data.success == true) { - PMA_ajaxShowMessage(data.message); - $("
").insertAfter("#topmenucontainer"); - $("#sqlqueryresults").html(data.sql_query); - $("#result_query .notice").remove(); - $("#result_query").prepend((data.message)); - if ($("#change_column_dialog").length > 0) { - $("#change_column_dialog").dialog("close").remove(); + + /* + * First validate the form; if there is a problem, avoid submitting it + * + * checkTableEditForm() needs a pure element and not a jQuery object, + * this is why we pass $form[0] as a parameter (the jQuery object + * is actually an array of DOM elements) + */ + if (checkTableEditForm($form[0], $form.find('input[name=orig_num_fields]').val())) { + //User wants to submit the form + $.post($form.attr('action'), $form.serialize()+"&do_save_data=Save", function(data) { + if ($("#sqlqueryresults").length != 0) { + $("#sqlqueryresults").remove(); + } else if ($(".error").length != 0) { + $(".error").remove(); } - /*Reload the field form*/ - $.post($("#fieldsForm").attr('action'), $("#fieldsForm").serialize()+"&ajax_request=true", function(form_data) { - $("#fieldsForm").remove(); - var $temp_div = $("
").append(form_data); - if ($("#sqlqueryresults").length != 0) { - $temp_div.find("#fieldsForm").insertAfter("#sqlqueryresults"); - } else { - $temp_div.find("#fieldsForm").insertAfter(".error"); + if (data.success == true) { + PMA_ajaxShowMessage(data.message); + $("
").insertAfter("#topmenucontainer"); + $("#sqlqueryresults").html(data.sql_query); + $("#result_query .notice").remove(); + $("#result_query").prepend((data.message)); + if ($("#change_column_dialog").length > 0) { + $("#change_column_dialog").dialog("close").remove(); } - /*Call the function to display the more options in table*/ - displayMoreTableOpts(); - }); - } else { - var $temp_div = $("
").append(data); - var $error = $temp_div.find(".error code").addClass("error"); - PMA_ajaxShowMessage($error); - } - }) // end $.post() - }) // end insert table button "do_save_data" + /*Reload the field form*/ + $.post($("#fieldsForm").attr('action'), $("#fieldsForm").serialize()+"&ajax_request=true", function(form_data) { + $("#fieldsForm").remove(); + var $temp_div = $("
").append(form_data); + if ($("#sqlqueryresults").length != 0) { + $temp_div.find("#fieldsForm").insertAfter("#sqlqueryresults"); + } else { + $temp_div.find("#fieldsForm").insertAfter(".error"); + } + /*Call the function to display the more options in table*/ + displayMoreTableOpts(); + }); + } else { + var $temp_div = $("
").append(data); + var $error = $temp_div.find(".error code").addClass("error"); + PMA_ajaxShowMessage($error); + } + }) // end $.post() + } +}) // end insert table button "do_save_data" /** *Ajax event handler for index edit From 2e925c70cc5359007f306d73b8d15d52cd521273 Mon Sep 17 00:00:00 2001 From: jacobkamphansen Date: Mon, 11 Jul 2011 15:32:26 +0200 Subject: [PATCH 03/85] Translation update done using Pootle. --- po/da.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/da.po b/po/da.po index 6ee49126ff..7e5cbe3a21 100644 --- a/po/da.po +++ b/po/da.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-07-07 15:16+0200\n" -"PO-Revision-Date: 2011-07-11 14:02+0200\n" +"PO-Revision-Date: 2011-07-11 15:32+0200\n" "Last-Translator: \n" "Language-Team: danish \n" "Language: da\n" @@ -2373,7 +2373,7 @@ msgstr "Der er ikke nogen filer at uploade" #: libraries/common.lib.php:2849 libraries/common.lib.php:2850 msgid "Execute" -msgstr "" +msgstr "Udfør" #: libraries/config.values.php:45 libraries/config.values.php:47 #: libraries/config.values.php:51 From f692b6b444c5b2a60644b70c79a7892e10c5155e Mon Sep 17 00:00:00 2001 From: jacobkamphansen Date: Mon, 11 Jul 2011 15:32:31 +0200 Subject: [PATCH 04/85] Translation update done using Pootle. --- po/da.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/da.po b/po/da.po index 7e5cbe3a21..65485eb739 100644 --- a/po/da.po +++ b/po/da.po @@ -2411,7 +2411,7 @@ msgstr "struktur" #: libraries/export/latex.php:42 libraries/export/odt.php:34 #: libraries/export/sql.php:123 libraries/export/texytext.php:24 msgid "data" -msgstr "" +msgstr "data" #: libraries/config.values.php:98 libraries/export/htmlword.php:25 #: libraries/export/latex.php:42 libraries/export/odt.php:34 From 40339e5dd243458378a9cc8134f816465aa0c4a3 Mon Sep 17 00:00:00 2001 From: jacobkamphansen Date: Mon, 11 Jul 2011 15:32:35 +0200 Subject: [PATCH 05/85] Translation update done using Pootle. --- po/da.po | 1 - 1 file changed, 1 deletion(-) diff --git a/po/da.po b/po/da.po index 65485eb739..5e4ed33ee9 100644 --- a/po/da.po +++ b/po/da.po @@ -2416,7 +2416,6 @@ msgstr "data" #: libraries/config.values.php:98 libraries/export/htmlword.php:25 #: libraries/export/latex.php:42 libraries/export/odt.php:34 #: libraries/export/sql.php:124 libraries/export/texytext.php:24 -#, fuzzy #| msgid "Structure and data" msgid "structure and data" msgstr "Struktur og data" From a2d973fd1f6758fda82900a8409b4e239e6780e0 Mon Sep 17 00:00:00 2001 From: jacobkamphansen Date: Mon, 11 Jul 2011 15:32:47 +0200 Subject: [PATCH 06/85] Translation update done using Pootle. --- po/da.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/da.po b/po/da.po index 5e4ed33ee9..9824b3f0c1 100644 --- a/po/da.po +++ b/po/da.po @@ -2621,7 +2621,7 @@ msgstr "" #: libraries/config/messages.inc.php:31 msgid "Bzip2" -msgstr "" +msgstr "Bzip2" #: libraries/config/messages.inc.php:32 msgid "" From 1cb74c9527064d09976b2420035da7f578789835 Mon Sep 17 00:00:00 2001 From: jacobkamphansen Date: Mon, 11 Jul 2011 15:33:02 +0200 Subject: [PATCH 07/85] Translation update done using Pootle. --- po/da.po | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/po/da.po b/po/da.po index 9824b3f0c1..75639a48d9 100644 --- a/po/da.po +++ b/po/da.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-07-07 15:16+0200\n" -"PO-Revision-Date: 2011-07-11 15:32+0200\n" +"PO-Revision-Date: 2011-07-11 15:33+0200\n" "Last-Translator: \n" "Language-Team: danish \n" "Language: da\n" @@ -2829,7 +2829,6 @@ msgstr "Komprimering" #: libraries/export/latex.php:72 libraries/export/ods.php:25 #: libraries/export/odt.php:58 libraries/export/texytext.php:28 #: libraries/export/xls.php:25 libraries/export/xlsx.php:25 -#, fuzzy #| msgid "Put fields names in the first row" msgid "Put columns names in the first row" msgstr "Indsæt feltnavne i første række" From 6479eaa1d2f4b6a1938dbcd9cf5bdb6e4fdad361 Mon Sep 17 00:00:00 2001 From: jacobkamphansen Date: Mon, 11 Jul 2011 15:33:21 +0200 Subject: [PATCH 08/85] Translation update done using Pootle. --- po/da.po | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/po/da.po b/po/da.po index 75639a48d9..d2443ff1df 100644 --- a/po/da.po +++ b/po/da.po @@ -2842,10 +2842,9 @@ msgstr "Felter skal adskilles med" #: libraries/config/messages.inc.php:76 libraries/config/messages.inc.php:242 #: libraries/config/messages.inc.php:249 libraries/import/csv.php:81 #: libraries/import/ldi.php:43 -#, fuzzy #| msgid "Fields escaped by" msgid "Columns escaped by" -msgstr "Felter escaped med" +msgstr "Kolonner escapes med" #: libraries/config/messages.inc.php:77 libraries/config/messages.inc.php:83 #: libraries/config/messages.inc.php:90 libraries/config/messages.inc.php:99 From 0db3b0f988d6f1617a12ea11674b4a89af4fdb56 Mon Sep 17 00:00:00 2001 From: jacobkamphansen Date: Mon, 11 Jul 2011 15:34:16 +0200 Subject: [PATCH 09/85] Translation update done using Pootle. --- po/da.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/da.po b/po/da.po index d2443ff1df..90855322a5 100644 --- a/po/da.po +++ b/po/da.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-07-07 15:16+0200\n" -"PO-Revision-Date: 2011-07-11 15:33+0200\n" +"PO-Revision-Date: 2011-07-11 15:34+0200\n" "Last-Translator: \n" "Language-Team: danish \n" "Language: da\n" @@ -2856,7 +2856,7 @@ msgstr "Erstat NULL med" #: libraries/config/messages.inc.php:78 libraries/config/messages.inc.php:84 msgid "Remove CRLF characters within columns" -msgstr "Fjern karakterer for linjeskift i felterne" +msgstr "Fjern CRLF-karakterer i kolonnerne" #: libraries/config/messages.inc.php:79 libraries/config/messages.inc.php:245 #: libraries/config/messages.inc.php:253 libraries/import/csv.php:63 From d5646bf31f99c526ea702243dbb8d673eabb1f47 Mon Sep 17 00:00:00 2001 From: jacobkamphansen Date: Mon, 11 Jul 2011 15:34:35 +0200 Subject: [PATCH 10/85] Translation update done using Pootle. --- po/da.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/da.po b/po/da.po index 90855322a5..797bd18e83 100644 --- a/po/da.po +++ b/po/da.po @@ -2862,7 +2862,7 @@ msgstr "Fjern CRLF-karakterer i kolonnerne" #: libraries/config/messages.inc.php:253 libraries/import/csv.php:63 #: libraries/import/ldi.php:41 msgid "Columns terminated by" -msgstr "Felter afsluttes med" +msgstr "Kolonner afsluttes med" #: libraries/config/messages.inc.php:80 libraries/config/messages.inc.php:240 #: libraries/import/csv.php:86 libraries/import/ldi.php:44 From 47324f6765a2b0361178736cd4b5be6021cdfdd7 Mon Sep 17 00:00:00 2001 From: jacobkamphansen Date: Mon, 11 Jul 2011 15:34:42 +0200 Subject: [PATCH 11/85] Translation update done using Pootle. --- po/da.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/da.po b/po/da.po index 797bd18e83..bc8683ef9e 100644 --- a/po/da.po +++ b/po/da.po @@ -2867,7 +2867,7 @@ msgstr "Kolonner afsluttes med" #: libraries/config/messages.inc.php:80 libraries/config/messages.inc.php:240 #: libraries/import/csv.php:86 libraries/import/ldi.php:44 msgid "Lines terminated by" -msgstr "Linjer afsluttet med" +msgstr "Linjer afsluttes med" #: libraries/config/messages.inc.php:82 #, fuzzy From 3fa6ca3e98964d17ae4217ce5e0652d23f5657d3 Mon Sep 17 00:00:00 2001 From: jacobkamphansen Date: Mon, 11 Jul 2011 15:34:47 +0200 Subject: [PATCH 12/85] Translation update done using Pootle. --- po/da.po | 1 - 1 file changed, 1 deletion(-) diff --git a/po/da.po b/po/da.po index bc8683ef9e..4faf1c7617 100644 --- a/po/da.po +++ b/po/da.po @@ -2870,7 +2870,6 @@ msgid "Lines terminated by" msgstr "Linjer afsluttes med" #: libraries/config/messages.inc.php:82 -#, fuzzy #| msgid "Excel edition" msgid "Excel edition" msgstr "Excel-udgave" From a441d1af8bbee9b8ac200fc554bfe4893ab49583 Mon Sep 17 00:00:00 2001 From: jacobkamphansen Date: Mon, 11 Jul 2011 15:35:07 +0200 Subject: [PATCH 13/85] Translation update done using Pootle. --- po/da.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/da.po b/po/da.po index 4faf1c7617..5d82371de6 100644 --- a/po/da.po +++ b/po/da.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-07-07 15:16+0200\n" -"PO-Revision-Date: 2011-07-11 15:34+0200\n" +"PO-Revision-Date: 2011-07-11 15:35+0200\n" "Last-Translator: \n" "Language-Team: danish \n" "Language: da\n" @@ -2880,7 +2880,7 @@ msgstr "Skabelon for databasenavn" #: libraries/config/messages.inc.php:86 msgid "Server name template" -msgstr "Maske for servernavn" +msgstr "Skabelon for servernavn" #: libraries/config/messages.inc.php:87 msgid "Table name template" From b58771dd2df8df9e685e39700f7b54a960a57168 Mon Sep 17 00:00:00 2001 From: jacobkamphansen Date: Mon, 11 Jul 2011 15:35:18 +0200 Subject: [PATCH 14/85] Translation update done using Pootle. --- po/da.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/da.po b/po/da.po index 5d82371de6..83d838d063 100644 --- a/po/da.po +++ b/po/da.po @@ -2884,7 +2884,7 @@ msgstr "Skabelon for servernavn" #: libraries/config/messages.inc.php:87 msgid "Table name template" -msgstr "Maske for tabelnavn" +msgstr "Skabelon for tabelnavn" #: libraries/config/messages.inc.php:91 libraries/config/messages.inc.php:104 #: libraries/config/messages.inc.php:113 libraries/config/messages.inc.php:137 From 54373d1597aaa7d21c5fd42fa2d1163df8c4d1d2 Mon Sep 17 00:00:00 2001 From: jacobkamphansen Date: Mon, 11 Jul 2011 15:35:32 +0200 Subject: [PATCH 15/85] Translation update done using Pootle. --- po/da.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/da.po b/po/da.po index 83d838d063..0fa1f0a75f 100644 --- a/po/da.po +++ b/po/da.po @@ -2896,7 +2896,7 @@ msgstr "Dump tabel" #: libraries/config/messages.inc.php:92 libraries/export/latex.php:32 msgid "Include table caption" -msgstr "Inkluder tabeloverskrift" +msgstr "Inkludér tabeloverskrift" #: libraries/config/messages.inc.php:95 libraries/config/messages.inc.php:101 #: libraries/export/latex.php:50 libraries/export/latex.php:74 From 2453240f52fd1224cec301fc5d596137ce0e5ef9 Mon Sep 17 00:00:00 2001 From: jacobkamphansen Date: Mon, 11 Jul 2011 15:35:53 +0200 Subject: [PATCH 16/85] Translation update done using Pootle. --- po/da.po | 1 + 1 file changed, 1 insertion(+) diff --git a/po/da.po b/po/da.po index 0fa1f0a75f..3188748a8d 100644 --- a/po/da.po +++ b/po/da.po @@ -2909,6 +2909,7 @@ msgstr "Fortsat tabeloverskrift" #: libraries/config/messages.inc.php:97 libraries/config/messages.inc.php:103 #: libraries/export/latex.php:54 libraries/export/latex.php:78 +#, fuzzy msgid "Label key" msgstr "Mærke nøgle" From 445c3cce446f08a8b2c2e1f75cb58d007b51e73a Mon Sep 17 00:00:00 2001 From: jacobkamphansen Date: Mon, 11 Jul 2011 15:36:10 +0200 Subject: [PATCH 17/85] Translation update done using Pootle. --- po/da.po | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/po/da.po b/po/da.po index 3188748a8d..e85352554f 100644 --- a/po/da.po +++ b/po/da.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-07-07 15:16+0200\n" -"PO-Revision-Date: 2011-07-11 15:35+0200\n" +"PO-Revision-Date: 2011-07-11 15:36+0200\n" "Last-Translator: \n" "Language-Team: danish \n" "Language: da\n" @@ -2925,10 +2925,9 @@ msgid "Relations" msgstr "Relationer" #: libraries/config/messages.inc.php:105 -#, fuzzy #| msgid "Export type" msgid "Export method" -msgstr "Eksporttype" +msgstr "Eksport-type" #: libraries/config/messages.inc.php:114 libraries/config/messages.inc.php:116 msgid "Save on server" From 23747fabf3f0e20ebb5aed7884cfb9e17f0c1588 Mon Sep 17 00:00:00 2001 From: jacobkamphansen Date: Mon, 11 Jul 2011 15:36:26 +0200 Subject: [PATCH 18/85] Translation update done using Pootle. --- po/da.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/da.po b/po/da.po index e85352554f..2adc163271 100644 --- a/po/da.po +++ b/po/da.po @@ -2940,7 +2940,7 @@ msgstr "Overskriv eksisterende fil(er)" #: libraries/config/messages.inc.php:118 msgid "Remember file name template" -msgstr "Husk maske for filnavn" +msgstr "Husk skabelon for filnavn" #: libraries/config/messages.inc.php:120 msgid "Enclose table and column names with backquotes" From 5c0613a9b5e96aa7ae53db82e48c8b81ef52f8ed Mon Sep 17 00:00:00 2001 From: jacobkamphansen Date: Mon, 11 Jul 2011 15:36:52 +0200 Subject: [PATCH 19/85] Translation update done using Pootle. --- po/da.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/da.po b/po/da.po index 2adc163271..fd731355ab 100644 --- a/po/da.po +++ b/po/da.po @@ -2949,7 +2949,7 @@ msgstr "Brug \"backquotes\" omkring tabel -og feltnavne" #: libraries/config/messages.inc.php:121 libraries/config/messages.inc.php:260 #: libraries/display_export.lib.php:346 msgid "SQL compatibility mode" -msgstr "SQL-kompatibilitetsmodus" +msgstr "SQL-kompatibilitets-tilstand" #: libraries/config/messages.inc.php:122 libraries/export/sql.php:176 msgid "CREATE TABLE options:" From cab34872b10f8d8cdbf20fd277c4e3cc1319b844 Mon Sep 17 00:00:00 2001 From: jacobkamphansen Date: Mon, 11 Jul 2011 15:37:11 +0200 Subject: [PATCH 20/85] Translation update done using Pootle. --- po/da.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/da.po b/po/da.po index fd731355ab..7f68eff2c8 100644 --- a/po/da.po +++ b/po/da.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-07-07 15:16+0200\n" -"PO-Revision-Date: 2011-07-11 15:36+0200\n" +"PO-Revision-Date: 2011-07-11 15:37+0200\n" "Last-Translator: \n" "Language-Team: danish \n" "Language: da\n" @@ -2953,7 +2953,7 @@ msgstr "SQL-kompatibilitets-tilstand" #: libraries/config/messages.inc.php:122 libraries/export/sql.php:176 msgid "CREATE TABLE options:" -msgstr "Muligheder for CREATE TABLE:" +msgstr "Indstillinger til CREATE TABLE:" #: libraries/config/messages.inc.php:123 msgid "Creation/Update/Check dates" From a586f1b71aaa84d0f7b64b6530ab3034d63e0b63 Mon Sep 17 00:00:00 2001 From: jacobkamphansen Date: Mon, 11 Jul 2011 15:38:09 +0200 Subject: [PATCH 21/85] Translation update done using Pootle. --- po/da.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/da.po b/po/da.po index 7f68eff2c8..ac5a899391 100644 --- a/po/da.po +++ b/po/da.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-07-07 15:16+0200\n" -"PO-Revision-Date: 2011-07-11 15:37+0200\n" +"PO-Revision-Date: 2011-07-11 15:38+0200\n" "Last-Translator: \n" "Language-Team: danish \n" "Language: da\n" @@ -2977,7 +2977,7 @@ msgstr "Brug ignorér inserts" #: libraries/config/messages.inc.php:132 msgid "Syntax to use when inserting data" -msgstr "Syntaks som skal bruges, når der indsættes data" +msgstr "Syntaks der bruges, når der indsættes data" #: libraries/config/messages.inc.php:133 libraries/export/sql.php:268 msgid "Maximal length of created query" From f9b14ca90a4f5868442a07e35fc87be4c08ad747 Mon Sep 17 00:00:00 2001 From: jacobkamphansen Date: Mon, 11 Jul 2011 15:38:50 +0200 Subject: [PATCH 22/85] Translation update done using Pootle. --- po/da.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/da.po b/po/da.po index ac5a899391..5b95049692 100644 --- a/po/da.po +++ b/po/da.po @@ -3008,8 +3008,8 @@ msgid "" "Sort order for items in a foreign-key dropdown box; [kbd]content[/kbd] is " "the referenced data, [kbd]id[/kbd] is the key value" msgstr "" -"Sorteringsrækkefølge for elementer i valgboks med fremmede nøgler; [kbd]" -"content[/kbd] er de refererede data, [kbd]id[/kbd] er nøglens værdi" +"Sorteringsrækkefølge for elementer i valgboks med fremmede nøgler; " +"[kbd]content[/kbd] er de refererede data, [kbd]id[/kbd] er nøglens værdi" #: libraries/config/messages.inc.php:151 msgid "Foreign key dropdown order" From 10c5c38cf6338d3b2eefd8dee20bca9fdf077643 Mon Sep 17 00:00:00 2001 From: jacobkamphansen Date: Mon, 11 Jul 2011 15:39:14 +0200 Subject: [PATCH 23/85] Translation update done using Pootle. --- po/da.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/da.po b/po/da.po index 5b95049692..131ae6a6fa 100644 --- a/po/da.po +++ b/po/da.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-07-07 15:16+0200\n" -"PO-Revision-Date: 2011-07-11 15:38+0200\n" +"PO-Revision-Date: 2011-07-11 15:39+0200\n" "Last-Translator: \n" "Language-Team: danish \n" "Language: da\n" @@ -3013,7 +3013,7 @@ msgstr "" #: libraries/config/messages.inc.php:151 msgid "Foreign key dropdown order" -msgstr "Sortër fremmede nøgler i valgboks på:" +msgstr "Sortér fremmede nøgler i valgboks" #: libraries/config/messages.inc.php:152 msgid "A dropdown will be used if fewer items are present" From c0801c2bf807bb25568f2b8f3b6708f511bf2f04 Mon Sep 17 00:00:00 2001 From: jacobkamphansen Date: Mon, 11 Jul 2011 15:39:33 +0200 Subject: [PATCH 24/85] Translation update done using Pootle. --- po/da.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/da.po b/po/da.po index 131ae6a6fa..12a01587b8 100644 --- a/po/da.po +++ b/po/da.po @@ -3017,7 +3017,7 @@ msgstr "Sortér fremmede nøgler i valgboks" #: libraries/config/messages.inc.php:152 msgid "A dropdown will be used if fewer items are present" -msgstr "Der vil blive brugt en valgboks, hvis der er færre elementer til stede" +msgstr "Der vil blive brugt en valgboks, hvis der er få elementer til stede" #: libraries/config/messages.inc.php:153 msgid "Foreign key limit" From f9a6d0a165924f8a05400d5ca4cb2c449f0b9fc6 Mon Sep 17 00:00:00 2001 From: jacobkamphansen Date: Mon, 11 Jul 2011 15:40:01 +0200 Subject: [PATCH 25/85] Translation update done using Pootle. --- po/da.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/da.po b/po/da.po index 12a01587b8..317e01024b 100644 --- a/po/da.po +++ b/po/da.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-07-07 15:16+0200\n" -"PO-Revision-Date: 2011-07-11 15:39+0200\n" +"PO-Revision-Date: 2011-07-11 15:40+0200\n" "Last-Translator: \n" "Language-Team: danish \n" "Language: da\n" From 3305a736f3dd2a6f1e40506feabbca30cd5d05c6 Mon Sep 17 00:00:00 2001 From: jacobkamphansen Date: Mon, 11 Jul 2011 15:40:33 +0200 Subject: [PATCH 26/85] Translation update done using Pootle. --- po/da.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/da.po b/po/da.po index 317e01024b..b6576460e0 100644 --- a/po/da.po +++ b/po/da.po @@ -3060,7 +3060,7 @@ msgstr "Redigeringstilstand" #: libraries/config/messages.inc.php:163 msgid "Customize edit mode" -msgstr "Tilpas redigerinstilstand" +msgstr "Tilpas redigeringstilstand" #: libraries/config/messages.inc.php:165 msgid "Export defaults" From e518845a786f2f37c6515641ecd5969bad88ffcd Mon Sep 17 00:00:00 2001 From: jacobkamphansen Date: Mon, 11 Jul 2011 15:41:01 +0200 Subject: [PATCH 27/85] Translation update done using Pootle. --- po/da.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/da.po b/po/da.po index b6576460e0..f8aaa48245 100644 --- a/po/da.po +++ b/po/da.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-07-07 15:16+0200\n" -"PO-Revision-Date: 2011-07-11 15:40+0200\n" +"PO-Revision-Date: 2011-07-11 15:41+0200\n" "Last-Translator: \n" "Language-Team: danish \n" "Language: da\n" From 3b53b975ade9ffe918324dd700992e7bda6df3f0 Mon Sep 17 00:00:00 2001 From: jacobkamphansen Date: Mon, 11 Jul 2011 15:41:16 +0200 Subject: [PATCH 28/85] Translation update done using Pootle. --- po/da.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/da.po b/po/da.po index f8aaa48245..e471e28afc 100644 --- a/po/da.po +++ b/po/da.po @@ -3087,7 +3087,7 @@ msgstr "Bestem indstillinger for nogle af de mest anvendte valgmuligheder" #: libraries/server_links.inc.php:69 libraries/tbl_links.inc.php:89 #: prefs_manage.php:231 setup/frames/menu.inc.php:20 msgid "Import" -msgstr "Import" +msgstr "Importér" #: libraries/config/messages.inc.php:171 msgid "Import defaults" From bceefa590117fab42ed973cb930e0cef148d8874 Mon Sep 17 00:00:00 2001 From: jacobkamphansen Date: Mon, 11 Jul 2011 15:42:01 +0200 Subject: [PATCH 29/85] Translation update done using Pootle. --- po/da.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/da.po b/po/da.po index e471e28afc..dd0bc8d17f 100644 --- a/po/da.po +++ b/po/da.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-07-07 15:16+0200\n" -"PO-Revision-Date: 2011-07-11 15:41+0200\n" +"PO-Revision-Date: 2011-07-11 15:42+0200\n" "Last-Translator: \n" "Language-Team: danish \n" "Language: da\n" From cdf426088471d7648e90e49639a2e41eb4a7f1bf Mon Sep 17 00:00:00 2001 From: jacobkamphansen Date: Mon, 11 Jul 2011 15:42:12 +0200 Subject: [PATCH 30/85] Translation update done using Pootle. --- po/da.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/da.po b/po/da.po index dd0bc8d17f..3a454b6e5b 100644 --- a/po/da.po +++ b/po/da.po @@ -3142,7 +3142,7 @@ msgstr "Hovedramme" #: libraries/config/messages.inc.php:186 msgid "Microsoft Office" -msgstr "" +msgstr "Microsoft Office" #: libraries/config/messages.inc.php:188 #, fuzzy From fdde40385461f4e128c50095ca46c186c633ea01 Mon Sep 17 00:00:00 2001 From: jacobkamphansen Date: Mon, 11 Jul 2011 15:42:17 +0200 Subject: [PATCH 31/85] Translation update done using Pootle. --- po/da.po | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/po/da.po b/po/da.po index 3a454b6e5b..bec7fb1e77 100644 --- a/po/da.po +++ b/po/da.po @@ -3145,10 +3145,9 @@ msgid "Microsoft Office" msgstr "Microsoft Office" #: libraries/config/messages.inc.php:188 -#, fuzzy #| msgid "Open Document Text" msgid "Open Document" -msgstr "Open Document tekst" +msgstr "Open Document" #: libraries/config/messages.inc.php:190 msgid "Other core settings" From 756d0bc808b4ba28e8e9b04bb9c5b3199b44d3e0 Mon Sep 17 00:00:00 2001 From: jacobkamphansen Date: Mon, 11 Jul 2011 15:44:00 +0200 Subject: [PATCH 32/85] Translation update done using Pootle. --- po/da.po | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/po/da.po b/po/da.po index bec7fb1e77..898aadbe38 100644 --- a/po/da.po +++ b/po/da.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-07-07 15:16+0200\n" -"PO-Revision-Date: 2011-07-11 15:42+0200\n" +"PO-Revision-Date: 2011-07-11 15:44+0200\n" "Last-Translator: \n" "Language-Team: danish \n" "Language: da\n" @@ -3166,7 +3166,10 @@ msgid "" "Specify browser's title bar text. Refer to [a@Documentation." "html#cfg_TitleTable]documentation[/a] for magic strings that can be used to " "get special values." -msgstr "Angiv browserens titeltekst. " +msgstr "" +"Angiv browserens tekst i titelbaren. Se " +"[a@Documentation.html#cfg_TitleTable]dokumentationen[/a] for tekststrenge " +"der indeholder særlige værdier." #: libraries/config/messages.inc.php:194 #: libraries/navigation_header.inc.php:83 From 23bd156de75d22277efe2e1cd46817938ce8bd60 Mon Sep 17 00:00:00 2001 From: jacobkamphansen Date: Mon, 11 Jul 2011 15:44:13 +0200 Subject: [PATCH 33/85] Translation update done using Pootle. --- po/da.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/da.po b/po/da.po index 898aadbe38..f778861bf4 100644 --- a/po/da.po +++ b/po/da.po @@ -3176,7 +3176,7 @@ msgstr "" #: libraries/navigation_header.inc.php:86 #: libraries/navigation_header.inc.php:89 msgid "Query window" -msgstr "Foresp. vindue" +msgstr "Forespørgsels-vindue" #: libraries/config/messages.inc.php:195 msgid "Customize query window options" From fcc1bd8afae9f0c663ca95a4f45f5ed7c20a0ce2 Mon Sep 17 00:00:00 2001 From: jacobkamphansen Date: Mon, 11 Jul 2011 15:44:25 +0200 Subject: [PATCH 34/85] Translation update done using Pootle. --- po/da.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/da.po b/po/da.po index f778861bf4..065be046b4 100644 --- a/po/da.po +++ b/po/da.po @@ -3176,7 +3176,7 @@ msgstr "" #: libraries/navigation_header.inc.php:86 #: libraries/navigation_header.inc.php:89 msgid "Query window" -msgstr "Forespørgsels-vindue" +msgstr "Forespørgselsvindue" #: libraries/config/messages.inc.php:195 msgid "Customize query window options" From d5f3f0857c8c3bf50d937355f66a8d533a225077 Mon Sep 17 00:00:00 2001 From: jacobkamphansen Date: Mon, 11 Jul 2011 15:45:28 +0200 Subject: [PATCH 35/85] Translation update done using Pootle. --- po/da.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/po/da.po b/po/da.po index 065be046b4..c561e091d6 100644 --- a/po/da.po +++ b/po/da.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-07-07 15:16+0200\n" -"PO-Revision-Date: 2011-07-11 15:44+0200\n" +"PO-Revision-Date: 2011-07-11 15:45+0200\n" "Last-Translator: \n" "Language-Team: danish \n" "Language: da\n" @@ -3191,8 +3191,8 @@ msgid "" "Please note that phpMyAdmin is just a user interface and its features do not " "limit MySQL" msgstr "" -"Bemærk venligst at phpMyAdmin blot er en brugerflade, hvis egenskaber ikke " -"begrænser MySQL" +"Bemærk venligst at phpMyAdmin blot er en brugerflade og at den ikke " +"begrænser mulighederne i MySQL" #: libraries/config/messages.inc.php:198 msgid "Basic settings" From 9b4e8c307c6412ed18afc3144478ec834075feee Mon Sep 17 00:00:00 2001 From: jacobkamphansen Date: Mon, 11 Jul 2011 15:45:54 +0200 Subject: [PATCH 36/85] Translation update done using Pootle. --- po/da.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/da.po b/po/da.po index c561e091d6..54986f2d6b 100644 --- a/po/da.po +++ b/po/da.po @@ -3216,7 +3216,7 @@ msgid "" "what they are for" msgstr "" "Avanceret serverkonfiguration. Lad være med at ændre disse indstillinger med " -"mindre, du ved, hvad de betyder" +"mindre du ved hvad de betyder" #: libraries/config/messages.inc.php:203 msgid "Enter server connection parameters" From 8a3ba465cf9061ad44a384cac2bd04d2990a7adb Mon Sep 17 00:00:00 2001 From: jacobkamphansen Date: Mon, 11 Jul 2011 15:47:22 +0200 Subject: [PATCH 37/85] Translation update done using Pootle. --- po/da.po | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/po/da.po b/po/da.po index 54986f2d6b..f96ab2f996 100644 --- a/po/da.po +++ b/po/da.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-07-07 15:16+0200\n" -"PO-Revision-Date: 2011-07-11 15:45+0200\n" +"PO-Revision-Date: 2011-07-11 15:47+0200\n" "Last-Translator: \n" "Language-Team: danish \n" "Language: da\n" @@ -3232,6 +3232,9 @@ msgid "" "features, see [a@Documentation.html#linked-tables]phpMyAdmin configuration " "storage[/a] in documentation" msgstr "" +"Konfigurér phpMyAdmin configuration storage for at få adgang til flere " +"funktioner. Se dokumentationen for [a@Documentation.html#linked-" +"tables]phpMyAdmin configuration storage[/a]." #: libraries/config/messages.inc.php:206 msgid "Changes tracking" From 17d003659fe7186b5960c7d74f4a5be087961be7 Mon Sep 17 00:00:00 2001 From: jacobkamphansen Date: Mon, 11 Jul 2011 15:47:33 +0200 Subject: [PATCH 38/85] Translation update done using Pootle. --- po/da.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/da.po b/po/da.po index f96ab2f996..fb66e3e901 100644 --- a/po/da.po +++ b/po/da.po @@ -3238,7 +3238,7 @@ msgstr "" #: libraries/config/messages.inc.php:206 msgid "Changes tracking" -msgstr "" +msgstr "Ændrer sporing" #: libraries/config/messages.inc.php:207 msgid "" From 02c533e97c3ca83bacdf346749d3176c7b1d6a77 Mon Sep 17 00:00:00 2001 From: jacobkamphansen Date: Mon, 11 Jul 2011 15:48:16 +0200 Subject: [PATCH 39/85] Translation update done using Pootle. --- po/da.po | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/po/da.po b/po/da.po index fb66e3e901..7885be8434 100644 --- a/po/da.po +++ b/po/da.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-07-07 15:16+0200\n" -"PO-Revision-Date: 2011-07-11 15:47+0200\n" +"PO-Revision-Date: 2011-07-11 15:48+0200\n" "Last-Translator: \n" "Language-Team: danish \n" "Language: da\n" @@ -3245,6 +3245,8 @@ msgid "" "Tracking of changes made in database. Requires the phpMyAdmin configuration " "storage." msgstr "" +"Sporing af ændringer i databasen er udført. phpMyAdmin configuration storage " +"er krævet." #: libraries/config/messages.inc.php:208 msgid "Customize export options" From 069f93ba55e50357fb3293465c921b0c7be8926e Mon Sep 17 00:00:00 2001 From: jacobkamphansen Date: Mon, 11 Jul 2011 15:48:33 +0200 Subject: [PATCH 40/85] Translation update done using Pootle. --- po/da.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/da.po b/po/da.po index 7885be8434..98d1a27d03 100644 --- a/po/da.po +++ b/po/da.po @@ -3267,7 +3267,7 @@ msgstr "" #: libraries/config/messages.inc.php:213 libraries/config/messages.inc.php:218 #: setup/frames/menu.inc.php:17 msgid "SQL queries" -msgstr "" +msgstr "SQL-forespørgsler" #: libraries/config/messages.inc.php:215 msgid "SQL Query box" From 2c36ab261690733639d8c928ce5148dae7c758f8 Mon Sep 17 00:00:00 2001 From: jacobkamphansen Date: Mon, 11 Jul 2011 15:48:42 +0200 Subject: [PATCH 41/85] Translation update done using Pootle. --- po/da.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/da.po b/po/da.po index 98d1a27d03..72f7328cd1 100644 --- a/po/da.po +++ b/po/da.po @@ -3271,7 +3271,7 @@ msgstr "SQL-forespørgsler" #: libraries/config/messages.inc.php:215 msgid "SQL Query box" -msgstr "" +msgstr "SQL Query-boks" #: libraries/config/messages.inc.php:216 msgid "Customize links shown in SQL Query boxes" From 753ab00a7906f7f2387191b8d22fb4a83d39468e Mon Sep 17 00:00:00 2001 From: jacobkamphansen Date: Mon, 11 Jul 2011 15:48:52 +0200 Subject: [PATCH 42/85] Translation update done using Pootle. --- po/da.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/da.po b/po/da.po index 72f7328cd1..f38ad60486 100644 --- a/po/da.po +++ b/po/da.po @@ -3307,7 +3307,7 @@ msgstr "" #: libraries/config/messages.inc.php:224 msgid "Tabs" -msgstr "" +msgstr "Faner" #: libraries/config/messages.inc.php:225 msgid "Choose how you want tabs to work" From 6394f28f5d57572e5c767b8644be3973ad279f00 Mon Sep 17 00:00:00 2001 From: jacobkamphansen Date: Mon, 11 Jul 2011 15:48:59 +0200 Subject: [PATCH 43/85] Translation update done using Pootle. --- po/da.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/da.po b/po/da.po index f38ad60486..d28217fe8e 100644 --- a/po/da.po +++ b/po/da.po @@ -3299,7 +3299,7 @@ msgstr "" #: libraries/config/messages.inc.php:222 msgid "Startup" -msgstr "" +msgstr "Opstart" #: libraries/config/messages.inc.php:223 msgid "Customize startup page" From 0b6d0288846a908be49b3f0da1b2576305f42cb4 Mon Sep 17 00:00:00 2001 From: jacobkamphansen Date: Mon, 11 Jul 2011 15:49:11 +0200 Subject: [PATCH 44/85] Translation update done using Pootle. --- po/da.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/da.po b/po/da.po index d28217fe8e..65f4e7f5a4 100644 --- a/po/da.po +++ b/po/da.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-07-07 15:16+0200\n" -"PO-Revision-Date: 2011-07-11 15:48+0200\n" +"PO-Revision-Date: 2011-07-11 15:49+0200\n" "Last-Translator: \n" "Language-Team: danish \n" "Language: da\n" @@ -3331,7 +3331,7 @@ msgstr "" #: libraries/config/messages.inc.php:230 msgid "Warnings" -msgstr "" +msgstr "Advarsler" #: libraries/config/messages.inc.php:231 msgid "Disable some of the warnings shown by phpMyAdmin" From 215eb80df9b5456d4b2131bb98d8448797ef2c74 Mon Sep 17 00:00:00 2001 From: Thilanka Kaushalya Date: Mon, 11 Jul 2011 22:58:05 +0530 Subject: [PATCH 45/85] Fixed bugs in table change and table index --- js/functions.js | 70 ++++++++++++++++++++++++++++++++++ js/tbl_structure.js | 93 ++++++++++----------------------------------- 2 files changed, 90 insertions(+), 73 deletions(-) diff --git a/js/functions.js b/js/functions.js index ae5cdbad8f..936779797d 100644 --- a/js/functions.js +++ b/js/functions.js @@ -1816,6 +1816,76 @@ $(document).ready(function() { }, 'top.frame_content'); //end $(document).ready for 'Create Table' +/** + * jQuery coding for 'Change Table'. Used on tbl_structure.php * + * Attach Ajax Event handlers for Change Table + */ +$(document).ready(function() { + /** + *Ajax action for submitting the column change form + **/ + $("#append_fields_form input[name=do_save_data]").live('click', function(event) { + event.preventDefault(); + /** + * @var the_form object referring to the export form + */ + var $form = $("#append_fields_form"); + + /* + * First validate the form; if there is a problem, avoid submitting it + * + * checkTableEditForm() needs a pure element and not a jQuery object, + * this is why we pass $form[0] as a parameter (the jQuery object + * is actually an array of DOM elements) + */ + if (checkTableEditForm($form[0], $form.find('input[name=orig_num_fields]').val())) { + // OK, form passed validation step + if ($form.hasClass('ajax')) { + PMA_prepareForAjaxRequest($form); + //User wants to submit the form + $.post($form.attr('action'), $form.serialize()+"&do_save_data=Save", function(data) { + if ($("#sqlqueryresults").length != 0) { + $("#sqlqueryresults").remove(); + } else if ($(".error").length != 0) { + $(".error").remove(); + } + if (data.success == true) { + PMA_ajaxShowMessage(data.message); + $("
").insertAfter("#topmenucontainer"); + $("#sqlqueryresults").html(data.sql_query); + $("#result_query .notice").remove(); + $("#result_query").prepend((data.message)); + if ($("#change_column_dialog").length > 0) { + $("#change_column_dialog").dialog("close").remove(); + } + /*Reload the field form*/ + $.post($("#fieldsForm").attr('action'), $("#fieldsForm").serialize()+"&ajax_request=true", function(form_data) { + $("#fieldsForm").remove(); + var $temp_div = $("
").append(form_data); + if ($("#sqlqueryresults").length != 0) { + $temp_div.find("#fieldsForm").insertAfter("#sqlqueryresults"); + } else { + $temp_div.find("#fieldsForm").insertAfter(".error"); + } + /*Call the function to display the more options in table*/ + displayMoreTableOpts(); + }); + } else { + var $temp_div = $("
").append(data); + var $error = $temp_div.find(".error code").addClass("error"); + PMA_ajaxShowMessage($error); + } + }) // end $.post() + } else { + // non-Ajax submit + $form.append(''); + $form.submit(); + } + } + }) // end change table button "do_save_data" + +}, 'top.frame_content'); //end $(document).ready for 'Change Table' + /** * Attach Ajax event handlers for Drop Database. Moved here from db_structure.js * as it was also required on db_create.php diff --git a/js/tbl_structure.js b/js/tbl_structure.js index df5de38142..493aa2bb02 100644 --- a/js/tbl_structure.js +++ b/js/tbl_structure.js @@ -18,7 +18,7 @@ * */ $(document).ready(function() { - + /** * Attach Event Handler for 'Drop Column' * @@ -181,63 +181,6 @@ $(document).ready(function() { changeColumns(action,url); }); - /** - *Ajax action for submitting the column change form - **/ - $("#append_fields_form input[name=do_save_data].ajax").live('click', function(event) { - event.preventDefault(); - /** - * @var the_form object referring to the export form - */ - var $form = $("#append_fields_form"); - - PMA_prepareForAjaxRequest($form); - - /* - * First validate the form; if there is a problem, avoid submitting it - * - * checkTableEditForm() needs a pure element and not a jQuery object, - * this is why we pass $form[0] as a parameter (the jQuery object - * is actually an array of DOM elements) - */ - if (checkTableEditForm($form[0], $form.find('input[name=orig_num_fields]').val())) { - //User wants to submit the form - $.post($form.attr('action'), $form.serialize()+"&do_save_data=Save", function(data) { - if ($("#sqlqueryresults").length != 0) { - $("#sqlqueryresults").remove(); - } else if ($(".error").length != 0) { - $(".error").remove(); - } - if (data.success == true) { - PMA_ajaxShowMessage(data.message); - $("
").insertAfter("#topmenucontainer"); - $("#sqlqueryresults").html(data.sql_query); - $("#result_query .notice").remove(); - $("#result_query").prepend((data.message)); - if ($("#change_column_dialog").length > 0) { - $("#change_column_dialog").dialog("close").remove(); - } - /*Reload the field form*/ - $.post($("#fieldsForm").attr('action'), $("#fieldsForm").serialize()+"&ajax_request=true", function(form_data) { - $("#fieldsForm").remove(); - var $temp_div = $("
").append(form_data); - if ($("#sqlqueryresults").length != 0) { - $temp_div.find("#fieldsForm").insertAfter("#sqlqueryresults"); - } else { - $temp_div.find("#fieldsForm").insertAfter(".error"); - } - /*Call the function to display the more options in table*/ - displayMoreTableOpts(); - }); - } else { - var $temp_div = $("
").append(data); - var $error = $temp_div.find(".error code").addClass("error"); - PMA_ajaxShowMessage($error); - } - }) // end $.post() - } -}) // end insert table button "do_save_data" - /** *Ajax event handler for index edit **/ @@ -249,7 +192,11 @@ $(document).ready(function() { } url = url + "&ajax_request=true"; - var div = $('
'); + /*Remove the hidden dialogs if there are*/ + if ($('#edit_index_dialog').length != 0) { + $('#edit_index_dialog').remove(); + } + var $div = $('
'); /** * @var button_options Object that stores the options passed to jQueryUI @@ -266,7 +213,7 @@ $(document).ready(function() { $.get( "tbl_indexes.php" , url , function(data) { //in the case of an error, show the error message returned. if (data.success != undefined && data.success == false) { - div + $div .append(data.error) .dialog({ title: PMA_messages['strEdit'], @@ -277,7 +224,7 @@ $(document).ready(function() { buttons : button_options_error })// end dialog options } else { - div + $div .append(data) .dialog({ title: PMA_messages['strEdit'], @@ -322,22 +269,22 @@ $(document).ready(function() { /*Reload the field form*/ $("#table_index").remove(); - var temp_div = $("
").append(data.index_table); - $(temp_div).find("#table_index").insertAfter("#index_header"); + var $temp_div = $("
").append(data.index_table); + $($temp_div).find("#table_index").insertAfter("#index_header"); if ($("#edit_index_dialog").length > 0) { $("#edit_index_dialog").dialog("close").remove(); } } else { if(data.error != undefined) { - var temp_div = $("
").append(data.error); - if($(temp_div).find(".error code").length != 0) { - var error = $(temp_div).find(".error code").addClass("error"); + var $temp_div = $("
").append(data.error); + if($($temp_div).find(".error code").length != 0) { + var $error = $($temp_div).find(".error code").addClass("error"); } else { - var error = temp_div; + var $error = $temp_div; } } - PMA_ajaxShowMessage(error); + PMA_ajaxShowMessage($error); } }) // end $.post() @@ -357,8 +304,8 @@ $(document).ready(function() { //User wants to submit the form $.post($form.attr('action'), $form.serialize()+"&add_fields=Go", function(data) { $("#index_columns").remove(); - var temp_div = $("
").append(data); - $(temp_div).find("#index_columns").appendTo("#index_edit_fields"); + var $temp_div = $("
").append(data); + $($temp_div).find("#index_columns").appendTo("#index_edit_fields"); }) // end $.post() }) // end insert table button "Go" @@ -405,7 +352,7 @@ function changeColumns(action,url) { if ($('#change_column_dialog').length != 0) { $('#change_column_dialog').remove(); } - var div = $('
'); + var $div = $('
'); /** * @var button_options Object that stores the options passed to jQueryUI @@ -422,7 +369,7 @@ function changeColumns(action,url) { $.get( action , url , function(data) { //in the case of an error, show the error message returned. if (data.success != undefined && data.success == false) { - div + $div .append(data.error) .dialog({ title: PMA_messages['strChangeTbl'], @@ -433,7 +380,7 @@ function changeColumns(action,url) { buttons : button_options_error })// end dialog options } else { - div + $div .append(data) .dialog({ title: PMA_messages['strChangeTbl'], From b87d4bb8adb4299ecc9cf8a986b47366f5034fa3 Mon Sep 17 00:00:00 2001 From: "fulup.jakez" Date: Mon, 11 Jul 2011 20:33:02 +0200 Subject: [PATCH 46/85] Translation update done using Pootle. --- po/br.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/br.po b/po/br.po index 6d92660791..680cdf7ea4 100644 --- a/po/br.po +++ b/po/br.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-07-07 15:16+0200\n" -"PO-Revision-Date: 2011-07-10 19:45+0200\n" +"PO-Revision-Date: 2011-07-11 20:33+0200\n" "Last-Translator: \n" "Language-Team: LANGUAGE \n" "Language: br\n" @@ -2825,7 +2825,7 @@ msgstr "Bannoù gronnet gant" #: libraries/config/messages.inc.php:249 libraries/import/csv.php:81 #: libraries/import/ldi.php:43 msgid "Columns escaped by" -msgstr "" +msgstr "Arouezenn dec'hout" #: libraries/config/messages.inc.php:77 libraries/config/messages.inc.php:83 #: libraries/config/messages.inc.php:90 libraries/config/messages.inc.php:99 From 0269d7c452aac9f3bb5ecde4f5fe294f2058f821 Mon Sep 17 00:00:00 2001 From: "fulup.jakez" Date: Mon, 11 Jul 2011 20:33:18 +0200 Subject: [PATCH 47/85] Translation update done using Pootle. --- po/br.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/br.po b/po/br.po index 680cdf7ea4..d6b9d66f29 100644 --- a/po/br.po +++ b/po/br.po @@ -2833,7 +2833,7 @@ msgstr "Arouezenn dec'hout" #: libraries/config/messages.inc.php:142 libraries/config/messages.inc.php:145 #: libraries/config/messages.inc.php:147 libraries/export/texytext.php:27 msgid "Replace NULL by" -msgstr "" +msgstr "Erlec'hiañ NULL gant" #: libraries/config/messages.inc.php:78 libraries/config/messages.inc.php:84 msgid "Remove CRLF characters within columns" From 6d7af87aa89aff9eaf812641062473db6ee33da8 Mon Sep 17 00:00:00 2001 From: "fulup.jakez" Date: Mon, 11 Jul 2011 20:33:41 +0200 Subject: [PATCH 48/85] Translation update done using Pootle. --- po/br.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/br.po b/po/br.po index d6b9d66f29..ac993dea9e 100644 --- a/po/br.po +++ b/po/br.po @@ -2837,7 +2837,7 @@ msgstr "Erlec'hiañ NULL gant" #: libraries/config/messages.inc.php:78 libraries/config/messages.inc.php:84 msgid "Remove CRLF characters within columns" -msgstr "" +msgstr "Tennañ an arouezennoù dibenn linenn e dibarzh ar bannoù" #: libraries/config/messages.inc.php:79 libraries/config/messages.inc.php:245 #: libraries/config/messages.inc.php:253 libraries/import/csv.php:63 From 5d8a7876f81e3f99e87e124d5d4c4c8e365cfe0b Mon Sep 17 00:00:00 2001 From: "fulup.jakez" Date: Mon, 11 Jul 2011 20:33:49 +0200 Subject: [PATCH 49/85] Translation update done using Pootle. --- po/br.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/br.po b/po/br.po index ac993dea9e..7452bd3233 100644 --- a/po/br.po +++ b/po/br.po @@ -2843,7 +2843,7 @@ msgstr "Tennañ an arouezennoù dibenn linenn e dibarzh ar bannoù" #: libraries/config/messages.inc.php:253 libraries/import/csv.php:63 #: libraries/import/ldi.php:41 msgid "Columns terminated by" -msgstr "" +msgstr "Bannoù a echu gant" #: libraries/config/messages.inc.php:80 libraries/config/messages.inc.php:240 #: libraries/import/csv.php:86 libraries/import/ldi.php:44 From 8c67305e3b8e019bd220b7beb83d30f816b91745 Mon Sep 17 00:00:00 2001 From: "fulup.jakez" Date: Mon, 11 Jul 2011 20:33:55 +0200 Subject: [PATCH 50/85] Translation update done using Pootle. --- po/br.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/br.po b/po/br.po index 7452bd3233..a620e5b612 100644 --- a/po/br.po +++ b/po/br.po @@ -2848,7 +2848,7 @@ msgstr "Bannoù a echu gant" #: libraries/config/messages.inc.php:80 libraries/config/messages.inc.php:240 #: libraries/import/csv.php:86 libraries/import/ldi.php:44 msgid "Lines terminated by" -msgstr "" +msgstr "Linennoù a echu gant" #: libraries/config/messages.inc.php:82 msgid "Excel edition" From 6f79c1beb8afc0162b2abdb0eea0cb75a055423d Mon Sep 17 00:00:00 2001 From: "fulup.jakez" Date: Mon, 11 Jul 2011 20:34:15 +0200 Subject: [PATCH 51/85] Translation update done using Pootle. --- po/br.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/br.po b/po/br.po index a620e5b612..f142348e0c 100644 --- a/po/br.po +++ b/po/br.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-07-07 15:16+0200\n" -"PO-Revision-Date: 2011-07-11 20:33+0200\n" +"PO-Revision-Date: 2011-07-11 20:34+0200\n" "Last-Translator: \n" "Language-Team: LANGUAGE \n" "Language: br\n" @@ -2852,7 +2852,7 @@ msgstr "Linennoù a echu gant" #: libraries/config/messages.inc.php:82 msgid "Excel edition" -msgstr "" +msgstr "Stumm Excel" #: libraries/config/messages.inc.php:85 msgid "Database name template" From 4a79bd50033fdda1a1c1aad08cfa13cb4e78a599 Mon Sep 17 00:00:00 2001 From: "fulup.jakez" Date: Mon, 11 Jul 2011 20:34:36 +0200 Subject: [PATCH 52/85] Translation update done using Pootle. --- po/br.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/br.po b/po/br.po index f142348e0c..6a87c0aedc 100644 --- a/po/br.po +++ b/po/br.po @@ -2856,7 +2856,7 @@ msgstr "Stumm Excel" #: libraries/config/messages.inc.php:85 msgid "Database name template" -msgstr "" +msgstr "Patrom anv diaz roadennoù" #: libraries/config/messages.inc.php:86 msgid "Server name template" From b2febed196f7f922773dea10c433bae24628d6a0 Mon Sep 17 00:00:00 2001 From: "fulup.jakez" Date: Mon, 11 Jul 2011 20:34:50 +0200 Subject: [PATCH 53/85] Translation update done using Pootle. --- po/br.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/br.po b/po/br.po index 6a87c0aedc..b3ff6989d0 100644 --- a/po/br.po +++ b/po/br.po @@ -2860,7 +2860,7 @@ msgstr "Patrom anv diaz roadennoù" #: libraries/config/messages.inc.php:86 msgid "Server name template" -msgstr "" +msgstr "Patrom anv servijer" #: libraries/config/messages.inc.php:87 msgid "Table name template" From 5da7e0011258cd5292ab0c015e687a4acf7f1bf7 Mon Sep 17 00:00:00 2001 From: "fulup.jakez" Date: Mon, 11 Jul 2011 20:35:01 +0200 Subject: [PATCH 54/85] Translation update done using Pootle. --- po/br.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/br.po b/po/br.po index b3ff6989d0..452884bf8b 100644 --- a/po/br.po +++ b/po/br.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-07-07 15:16+0200\n" -"PO-Revision-Date: 2011-07-11 20:34+0200\n" +"PO-Revision-Date: 2011-07-11 20:35+0200\n" "Last-Translator: \n" "Language-Team: LANGUAGE \n" "Language: br\n" @@ -2864,7 +2864,7 @@ msgstr "Patrom anv servijer" #: libraries/config/messages.inc.php:87 msgid "Table name template" -msgstr "" +msgstr "Patrom anv taolenn" #: libraries/config/messages.inc.php:91 libraries/config/messages.inc.php:104 #: libraries/config/messages.inc.php:113 libraries/config/messages.inc.php:137 From 26e33c1a2f9d365ba2f1767a1dd405456b4ee6a1 Mon Sep 17 00:00:00 2001 From: "fulup.jakez" Date: Mon, 11 Jul 2011 20:35:16 +0200 Subject: [PATCH 55/85] Translation update done using Pootle. --- po/br.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/br.po b/po/br.po index 452884bf8b..8fc187bbf7 100644 --- a/po/br.po +++ b/po/br.po @@ -2872,7 +2872,7 @@ msgstr "Patrom anv taolenn" #: libraries/export/latex.php:40 libraries/export/odt.php:32 #: libraries/export/sql.php:116 libraries/export/texytext.php:23 msgid "Dump table" -msgstr "" +msgstr "Ezporzhiañ an daolenn" #: libraries/config/messages.inc.php:92 libraries/export/latex.php:32 msgid "Include table caption" From 6a000eea428370249e0289554c91ab8d7eec6d97 Mon Sep 17 00:00:00 2001 From: "fulup.jakez" Date: Mon, 11 Jul 2011 20:35:42 +0200 Subject: [PATCH 56/85] Translation update done using Pootle. --- po/br.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/br.po b/po/br.po index 8fc187bbf7..b2051e6b27 100644 --- a/po/br.po +++ b/po/br.po @@ -2876,7 +2876,7 @@ msgstr "Ezporzhiañ an daolenn" #: libraries/config/messages.inc.php:92 libraries/export/latex.php:32 msgid "Include table caption" -msgstr "" +msgstr "Enklozañ an istitloù" #: libraries/config/messages.inc.php:95 libraries/config/messages.inc.php:101 #: libraries/export/latex.php:50 libraries/export/latex.php:74 From 825cad9b1a4ef61bdd024908f7a352540d4d8b09 Mon Sep 17 00:00:00 2001 From: "fulup.jakez" Date: Mon, 11 Jul 2011 20:35:55 +0200 Subject: [PATCH 57/85] Translation update done using Pootle. --- po/br.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/br.po b/po/br.po index b2051e6b27..ee44d7386e 100644 --- a/po/br.po +++ b/po/br.po @@ -2881,7 +2881,7 @@ msgstr "Enklozañ an istitloù" #: libraries/config/messages.inc.php:95 libraries/config/messages.inc.php:101 #: libraries/export/latex.php:50 libraries/export/latex.php:74 msgid "Table caption" -msgstr "" +msgstr "Istitl eus an daolenn" #: libraries/config/messages.inc.php:96 libraries/config/messages.inc.php:102 msgid "Continued table caption" From 1f143f8bc3519600440c37997c89e9a6f941112c Mon Sep 17 00:00:00 2001 From: "fulup.jakez" Date: Mon, 11 Jul 2011 20:36:09 +0200 Subject: [PATCH 58/85] Translation update done using Pootle. --- po/br.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/br.po b/po/br.po index ee44d7386e..83dff147d8 100644 --- a/po/br.po +++ b/po/br.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-07-07 15:16+0200\n" -"PO-Revision-Date: 2011-07-11 20:35+0200\n" +"PO-Revision-Date: 2011-07-11 20:36+0200\n" "Last-Translator: \n" "Language-Team: LANGUAGE \n" "Language: br\n" @@ -2885,7 +2885,7 @@ msgstr "Istitl eus an daolenn" #: libraries/config/messages.inc.php:96 libraries/config/messages.inc.php:102 msgid "Continued table caption" -msgstr "" +msgstr "Enklozañ an istitloù" #: libraries/config/messages.inc.php:97 libraries/config/messages.inc.php:103 #: libraries/export/latex.php:54 libraries/export/latex.php:78 From e28f990370cc2bf8a1aa1b2ba933df43218ce364 Mon Sep 17 00:00:00 2001 From: "fulup.jakez" Date: Mon, 11 Jul 2011 20:36:20 +0200 Subject: [PATCH 59/85] Translation update done using Pootle. --- po/br.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/br.po b/po/br.po index 83dff147d8..7ad1daeaea 100644 --- a/po/br.po +++ b/po/br.po @@ -2890,7 +2890,7 @@ msgstr "Enklozañ an istitloù" #: libraries/config/messages.inc.php:97 libraries/config/messages.inc.php:103 #: libraries/export/latex.php:54 libraries/export/latex.php:78 msgid "Label key" -msgstr "" +msgstr "Alc'hwez an dikedenn" #: libraries/config/messages.inc.php:98 libraries/config/messages.inc.php:110 #: libraries/config/messages.inc.php:134 libraries/export/odt.php:326 From ca3b9c5f185acbbbd4f098005e834148500d42cd Mon Sep 17 00:00:00 2001 From: "fulup.jakez" Date: Mon, 11 Jul 2011 20:36:26 +0200 Subject: [PATCH 60/85] Translation update done using Pootle. --- po/br.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/br.po b/po/br.po index 7ad1daeaea..5e7cc1ec28 100644 --- a/po/br.po +++ b/po/br.po @@ -2896,7 +2896,7 @@ msgstr "Alc'hwez an dikedenn" #: libraries/config/messages.inc.php:134 libraries/export/odt.php:326 #: libraries/tbl_properties.inc.php:145 msgid "MIME type" -msgstr "" +msgstr "Seurt MIME" #: libraries/config/messages.inc.php:100 libraries/config/messages.inc.php:112 #: libraries/config/messages.inc.php:136 tbl_relation.php:396 From 6e212d73a055bf5637e60822f73c9bc9d50da4fa Mon Sep 17 00:00:00 2001 From: "fulup.jakez" Date: Mon, 11 Jul 2011 20:36:33 +0200 Subject: [PATCH 61/85] Translation update done using Pootle. --- po/br.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/br.po b/po/br.po index 5e7cc1ec28..1b6c2f5ae3 100644 --- a/po/br.po +++ b/po/br.po @@ -2901,7 +2901,7 @@ msgstr "Seurt MIME" #: libraries/config/messages.inc.php:100 libraries/config/messages.inc.php:112 #: libraries/config/messages.inc.php:136 tbl_relation.php:396 msgid "Relations" -msgstr "" +msgstr "Darempredoù" #: libraries/config/messages.inc.php:105 msgid "Export method" From efc305dc100b0aff48886ab217f42748ef12b171 Mon Sep 17 00:00:00 2001 From: "fulup.jakez" Date: Mon, 11 Jul 2011 20:36:44 +0200 Subject: [PATCH 62/85] Translation update done using Pootle. --- po/br.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/br.po b/po/br.po index 1b6c2f5ae3..36534b05e9 100644 --- a/po/br.po +++ b/po/br.po @@ -2905,7 +2905,7 @@ msgstr "Darempredoù" #: libraries/config/messages.inc.php:105 msgid "Export method" -msgstr "" +msgstr "Doare ezporzhiañ" #: libraries/config/messages.inc.php:114 libraries/config/messages.inc.php:116 msgid "Save on server" From c8a7fbbc5425d27054831f6ea81cbe31e01dd019 Mon Sep 17 00:00:00 2001 From: "fulup.jakez" Date: Mon, 11 Jul 2011 20:36:52 +0200 Subject: [PATCH 63/85] Translation update done using Pootle. --- po/br.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/br.po b/po/br.po index 36534b05e9..65f819280b 100644 --- a/po/br.po +++ b/po/br.po @@ -2909,7 +2909,7 @@ msgstr "Doare ezporzhiañ" #: libraries/config/messages.inc.php:114 libraries/config/messages.inc.php:116 msgid "Save on server" -msgstr "" +msgstr "Enrollañ war ar servijer" #: libraries/config/messages.inc.php:115 libraries/config/messages.inc.php:117 #: libraries/display_export.lib.php:188 libraries/display_export.lib.php:214 From fb75d6f888e466097ad86b1ce6894186de38881b Mon Sep 17 00:00:00 2001 From: "fulup.jakez" Date: Mon, 11 Jul 2011 20:37:12 +0200 Subject: [PATCH 64/85] Translation update done using Pootle. --- po/br.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/br.po b/po/br.po index 65f819280b..9ec929f593 100644 --- a/po/br.po +++ b/po/br.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-07-07 15:16+0200\n" -"PO-Revision-Date: 2011-07-11 20:36+0200\n" +"PO-Revision-Date: 2011-07-11 20:37+0200\n" "Last-Translator: \n" "Language-Team: LANGUAGE \n" "Language: br\n" @@ -2914,7 +2914,7 @@ msgstr "Enrollañ war ar servijer" #: libraries/config/messages.inc.php:115 libraries/config/messages.inc.php:117 #: libraries/display_export.lib.php:188 libraries/display_export.lib.php:214 msgid "Overwrite existing file(s)" -msgstr "" +msgstr "Frikañ ar restroù zo c'hoazh" #: libraries/config/messages.inc.php:118 msgid "Remember file name template" From 1fb4a9e2e8cdc8229595889cecf82593432a4c28 Mon Sep 17 00:00:00 2001 From: "fulup.jakez" Date: Mon, 11 Jul 2011 20:37:30 +0200 Subject: [PATCH 65/85] Translation update done using Pootle. --- po/br.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/br.po b/po/br.po index 9ec929f593..bb5b3ef84b 100644 --- a/po/br.po +++ b/po/br.po @@ -2918,7 +2918,7 @@ msgstr "Frikañ ar restroù zo c'hoazh" #: libraries/config/messages.inc.php:118 msgid "Remember file name template" -msgstr "" +msgstr "Derc'hel soñj eus patrom anv ar restr" #: libraries/config/messages.inc.php:120 msgid "Enclose table and column names with backquotes" From 3553503669f4970e7f53690b1720dec6aacfb236 Mon Sep 17 00:00:00 2001 From: "fulup.jakez" Date: Mon, 11 Jul 2011 20:38:18 +0200 Subject: [PATCH 66/85] Translation update done using Pootle. --- po/br.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/br.po b/po/br.po index bb5b3ef84b..ae8f90bf24 100644 --- a/po/br.po +++ b/po/br.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-07-07 15:16+0200\n" -"PO-Revision-Date: 2011-07-11 20:37+0200\n" +"PO-Revision-Date: 2011-07-11 20:38+0200\n" "Last-Translator: \n" "Language-Team: LANGUAGE \n" "Language: br\n" @@ -2922,7 +2922,7 @@ msgstr "Derc'hel soñj eus patrom anv ar restr" #: libraries/config/messages.inc.php:120 msgid "Enclose table and column names with backquotes" -msgstr "" +msgstr "Lakaat krochedoù stouet a bep tu da anvioù an taolennoù hag ar bannoù" #: libraries/config/messages.inc.php:121 libraries/config/messages.inc.php:260 #: libraries/display_export.lib.php:346 From c69c13182c530a73950d759853e1ed1c9079f26a Mon Sep 17 00:00:00 2001 From: "fulup.jakez" Date: Mon, 11 Jul 2011 20:38:32 +0200 Subject: [PATCH 67/85] Translation update done using Pootle. --- po/br.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/br.po b/po/br.po index ae8f90bf24..0ecb274985 100644 --- a/po/br.po +++ b/po/br.po @@ -2927,7 +2927,7 @@ msgstr "Lakaat krochedoù stouet a bep tu da anvioù an taolennoù hag ar banno #: libraries/config/messages.inc.php:121 libraries/config/messages.inc.php:260 #: libraries/display_export.lib.php:346 msgid "SQL compatibility mode" -msgstr "" +msgstr "Mod kenglotañ gant SQL" #: libraries/config/messages.inc.php:122 libraries/export/sql.php:176 msgid "CREATE TABLE options:" From ed2bd357e33cf8509a7317fd90182f6596774239 Mon Sep 17 00:00:00 2001 From: "fulup.jakez" Date: Mon, 11 Jul 2011 20:38:55 +0200 Subject: [PATCH 68/85] Translation update done using Pootle. --- po/br.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/br.po b/po/br.po index 0ecb274985..5cef2fd1a5 100644 --- a/po/br.po +++ b/po/br.po @@ -2931,7 +2931,7 @@ msgstr "Mod kenglotañ gant SQL" #: libraries/config/messages.inc.php:122 libraries/export/sql.php:176 msgid "CREATE TABLE options:" -msgstr "" +msgstr "Dibarzhioù evit CREATE TABLE :" #: libraries/config/messages.inc.php:123 msgid "Creation/Update/Check dates" From 2862007dc84ccd8091e3c69183b9033bff8bce79 Mon Sep 17 00:00:00 2001 From: "fulup.jakez" Date: Mon, 11 Jul 2011 20:39:20 +0200 Subject: [PATCH 69/85] Translation update done using Pootle. --- po/br.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/br.po b/po/br.po index 5cef2fd1a5..cab30afec9 100644 --- a/po/br.po +++ b/po/br.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-07-07 15:16+0200\n" -"PO-Revision-Date: 2011-07-11 20:38+0200\n" +"PO-Revision-Date: 2011-07-11 20:39+0200\n" "Last-Translator: \n" "Language-Team: LANGUAGE \n" "Language: br\n" @@ -2935,7 +2935,7 @@ msgstr "Dibarzhioù evit CREATE TABLE :" #: libraries/config/messages.inc.php:123 msgid "Creation/Update/Check dates" -msgstr "" +msgstr "Deiziad krouiñ/hizivaat/gwiriañ" #: libraries/config/messages.inc.php:124 msgid "Use delayed inserts" From 8070dadd3274ddc68448cd89fc49bd6b13164db2 Mon Sep 17 00:00:00 2001 From: "fulup.jakez" Date: Mon, 11 Jul 2011 20:39:33 +0200 Subject: [PATCH 70/85] Translation update done using Pootle. --- po/br.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/br.po b/po/br.po index cab30afec9..a501c6e488 100644 --- a/po/br.po +++ b/po/br.po @@ -2939,7 +2939,7 @@ msgstr "Deiziad krouiñ/hizivaat/gwiriañ" #: libraries/config/messages.inc.php:124 msgid "Use delayed inserts" -msgstr "" +msgstr "Ensoc'hadennoù gant dale" #: libraries/config/messages.inc.php:125 libraries/export/sql.php:79 msgid "Disable foreign key checks" From 55740bef2c75c1228424f616a5d808936569a853 Mon Sep 17 00:00:00 2001 From: Domen Date: Mon, 11 Jul 2011 21:13:42 +0200 Subject: [PATCH 71/85] Translation update done using Pootle. --- po/sl.po | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/po/sl.po b/po/sl.po index fa62c87e5b..c960c51c83 100644 --- a/po/sl.po +++ b/po/sl.po @@ -4,15 +4,15 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-07-07 15:16+0200\n" -"PO-Revision-Date: 2011-07-07 11:50+0200\n" +"PO-Revision-Date: 2011-07-11 21:13+0200\n" "Last-Translator: Domen \n" "Language-Team: slovenian \n" "Language: sl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n" -"%100==4 ? 2 : 3);\n" +"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || " +"n%100==4 ? 2 : 3);\n" "X-Generator: Pootle 2.0.5\n" #: browse_foreigners.php:35 browse_foreigners.php:53 @@ -5319,10 +5319,10 @@ msgid "vertical" msgstr "navpičnem" #: libraries/display_tbl.lib.php:452 -#, fuzzy, php-format +#, php-format #| msgid "Headers every" msgid "Headers every %s rows" -msgstr "Glave vsakih" +msgstr "Glave vsakih %s vrstic" #: libraries/display_tbl.lib.php:546 msgid "Sort by key" From 9fad9b98105b89af6e8d25f21a45179184f35b37 Mon Sep 17 00:00:00 2001 From: Thilanka Kaushalya Date: Tue, 12 Jul 2011 06:52:08 +0530 Subject: [PATCH 72/85] Changed variable name according to jquery objects --- js/tbl_structure.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/js/tbl_structure.js b/js/tbl_structure.js index 493aa2bb02..a9b9adae77 100644 --- a/js/tbl_structure.js +++ b/js/tbl_structure.js @@ -270,7 +270,7 @@ $(document).ready(function() { /*Reload the field form*/ $("#table_index").remove(); var $temp_div = $("
").append(data.index_table); - $($temp_div).find("#table_index").insertAfter("#index_header"); + $temp_div.find("#table_index").insertAfter("#index_header"); if ($("#edit_index_dialog").length > 0) { $("#edit_index_dialog").dialog("close").remove(); } @@ -278,8 +278,8 @@ $(document).ready(function() { } else { if(data.error != undefined) { var $temp_div = $("
").append(data.error); - if($($temp_div).find(".error code").length != 0) { - var $error = $($temp_div).find(".error code").addClass("error"); + if ($temp_div.find(".error code").length != 0) { + var $error = $temp_div.find(".error code").addClass("error"); } else { var $error = $temp_div; } @@ -305,7 +305,7 @@ $(document).ready(function() { $.post($form.attr('action'), $form.serialize()+"&add_fields=Go", function(data) { $("#index_columns").remove(); var $temp_div = $("
").append(data); - $($temp_div).find("#index_columns").appendTo("#index_edit_fields"); + $temp_div.find("#index_columns").appendTo("#index_edit_fields"); }) // end $.post() }) // end insert table button "Go" From 7802be3c48de27f14f4bc8e6acf331c3aff1951e Mon Sep 17 00:00:00 2001 From: Madhura Jayaratne Date: Tue, 12 Jul 2011 19:00:44 +0530 Subject: [PATCH 73/85] Avoid notices about undefined array index --- libraries/Index.class.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libraries/Index.class.php b/libraries/Index.class.php index 1800aee33d..7cc47991e3 100644 --- a/libraries/Index.class.php +++ b/libraries/Index.class.php @@ -194,9 +194,10 @@ class PMA_Index // $columns[names][] // $columns[sub_parts][] foreach ($columns['names'] as $key => $name) { + $sub_part = isset($columns['sub_parts'][$key]) ? $columns['sub_parts'][$key] : ''; $_columns[] = array( 'Column_name' => $name, - 'Sub_part' => $columns['sub_parts'][$key], + 'Sub_part' => $sub_part, ); } } else { From f14a4e567f457582b4fda51d3eed1aa1ba9ca82d Mon Sep 17 00:00:00 2001 From: Piotr Przybylski Date: Tue, 12 Jul 2011 17:43:45 +0200 Subject: [PATCH 74/85] Unify comments for export plugins --- export.php | 5 +- libraries/export/codegen.php | 29 ++++---- libraries/export/csv.php | 22 +++--- libraries/export/htmlword.php | 47 +++++++++---- libraries/export/json.php | 24 +++---- libraries/export/latex.php | 52 +++++++------- libraries/export/mediawiki.php | 22 +++--- libraries/export/ods.php | 24 +++---- libraries/export/odt.php | 54 +++++++-------- libraries/export/pdf.php | 23 +++---- libraries/export/php_array.php | 24 +++---- libraries/export/sql.php | 121 ++++++++++++++------------------- libraries/export/texytext.php | 47 +++++++++---- libraries/export/xls.php | 22 +++--- libraries/export/xlsx.php | 22 +++--- libraries/export/xml.php | 25 +++---- libraries/export/yaml.php | 22 +++--- 17 files changed, 276 insertions(+), 309 deletions(-) diff --git a/export.php b/export.php index 9471ba0c15..6137b96e7c 100644 --- a/export.php +++ b/export.php @@ -125,8 +125,7 @@ $time_start = time(); * Output handler for all exports, if needed buffering, it stores data into * $dump_buffer, otherwise it prints thems out. * - * @param string the insert statement - * + * @param string $line the insert statement * @return bool Whether output suceeded */ function PMA_exportOutputHandler($line) @@ -512,7 +511,7 @@ if ($export_type == 'server') { } if (function_exists('PMA_exportRoutines') && strpos($GLOBALS['sql_structure_or_data'], 'structure') !== false && isset($GLOBALS['sql_procedure_function'])) { - PMA_exportRoutines($db); + PMA_exportRoutines($db); } $i = 0; diff --git a/libraries/export/codegen.php b/libraries/export/codegen.php index bb4510a480..29fa9e09dd 100644 --- a/libraries/export/codegen.php +++ b/libraries/export/codegen.php @@ -47,11 +47,10 @@ if (isset($plugin_list)) { */ /** - * Outputs comment + * Possibly outputs comment * - * @param string Text of comment - * - * @return bool Whether it suceeded + * @param string $text Text of comment + * @return string The formatted comment */ function PMA_exportComment($text) { @@ -85,8 +84,7 @@ function PMA_exportHeader() /** * Outputs database header * - * @param string Database name - * + * @param string $db Database name * @return bool Whether it suceeded * * @access public @@ -99,8 +97,7 @@ function PMA_exportDBHeader($db) /** * Outputs database footer * - * @param string Database name - * + * @param string $db Database name * @return bool Whether it suceeded * * @access public @@ -111,10 +108,9 @@ function PMA_exportDBFooter($db) } /** - * Outputs create database database - * - * @param string Database name + * Outputs CREATE DATABASE statement * + * @param string $db Database name * @return bool Whether it suceeded * * @access public @@ -127,12 +123,11 @@ function PMA_exportDBCreate($db) /** * Outputs the content of a table in NHibernate format * - * @param string the database name - * @param string the table name - * @param string the end of line sequence - * @param string the url to go back in case of error - * @param string SQL query for obtaining data - * + * @param string $db database name + * @param string $table table name + * @param string $crlf the end of line sequence + * @param string $error_url the url to go back in case of error + * @param string $sql_query SQL query for obtaining data * @return bool Whether it suceeded * * @access public diff --git a/libraries/export/csv.php b/libraries/export/csv.php index 62b1537375..30c9d8a3aa 100644 --- a/libraries/export/csv.php +++ b/libraries/export/csv.php @@ -107,8 +107,7 @@ function PMA_exportHeader() { /** * Outputs database header * - * @param string Database name - * + * @param string $db Database name * @return bool Whether it suceeded * * @access public @@ -120,8 +119,7 @@ function PMA_exportDBHeader($db) { /** * Outputs database footer * - * @param string Database name - * + * @param string $db Database name * @return bool Whether it suceeded * * @access public @@ -131,10 +129,9 @@ function PMA_exportDBFooter($db) { } /** - * Outputs create database database - * - * @param string Database name + * Outputs CREATE DATABASE statement * + * @param string $db Database name * @return bool Whether it suceeded * * @access public @@ -146,12 +143,11 @@ function PMA_exportDBCreate($db) { /** * Outputs the content of a table in CSV format * - * @param string the database name - * @param string the table name - * @param string the end of line sequence - * @param string the url to go back in case of error - * @param string SQL query for obtaining data - * + * @param string $db database name + * @param string $table table name + * @param string $crlf the end of line sequence + * @param string $error_url the url to go back in case of error + * @param string $sql_query SQL query for obtaining data * @return bool Whether it suceeded * * @access public diff --git a/libraries/export/htmlword.php b/libraries/export/htmlword.php index af5af76546..73fdd6f3a0 100644 --- a/libraries/export/htmlword.php +++ b/libraries/export/htmlword.php @@ -80,8 +80,7 @@ xmlns="http://www.w3.org/TR/REC-html40"> /** * Outputs database header * - * @param string Database name - * + * @param string $db Database name * @return bool Whether it suceeded * * @access public @@ -93,8 +92,7 @@ function PMA_exportDBHeader($db) { /** * Outputs database footer * - * @param string Database name - * + * @param string $db Database name * @return bool Whether it suceeded * * @access public @@ -104,10 +102,9 @@ function PMA_exportDBFooter($db) { } /** - * Outputs create database database - * - * @param string Database name + * Outputs CREATE DATABASE statement * + * @param string $db Database name * @return bool Whether it suceeded * * @access public @@ -117,14 +114,13 @@ function PMA_exportDBCreate($db) { } /** - * Outputs the content of a table in CSV format - * - * @param string the database name - * @param string the table name - * @param string the end of line sequence - * @param string the url to go back in case of error - * @param string SQL query for obtaining data + * Outputs the content of a table in HTML (Microsoft Word) format * + * @param string $db database name + * @param string $table table name + * @param string $crlf the end of line sequence + * @param string $error_url the url to go back in case of error + * @param string $sql_query SQL query for obtaining data * @return bool Whether it suceeded * * @access public @@ -182,7 +178,28 @@ function PMA_exportData($db, $table, $crlf, $error_url, $sql_query) return true; } -function PMA_exportStructure($db, $table, $crlf, $error_url, $do_relation = false, $do_comments = false, $do_mime = false, $dates = false, $dummy) +/** + * Outputs table's structure + * + * @param string $db database name + * @param string $table table name + * @param string $crlf the end of line sequence + * @param string $error_url the url to go back in case of error + * @param bool $do_relation whether to include relation comments + * @param bool $do_comments whether to include the pmadb-style column comments + * as comments in the structure; this is deprecated + * but the parameter is left here because export.php + * calls PMA_exportStructure() also for other export + * types which use this parameter + * @param bool $do_mime whether to include mime comments + * @param bool $dates whether to include creation/update/check dates + * @param string $export_mode 'create_table', 'triggers', 'create_view', 'stand_in' + * @param string $export_type 'server', 'database', 'table' + * @return bool Whether it suceeded + * + * @access public + */ +function PMA_exportStructure($db, $table, $crlf, $error_url, $do_relation = false, $do_comments = false, $do_mime = false, $dates = false, $export_mode, $export_type) { global $cfgRelation; diff --git a/libraries/export/json.php b/libraries/export/json.php index 9c836e136f..93e85855e5 100644 --- a/libraries/export/json.php +++ b/libraries/export/json.php @@ -80,8 +80,7 @@ function PMA_exportHeader() /** * Outputs database header * - * @param string Database name - * + * @param string $db Database name * @return bool Whether it suceeded * * @access public @@ -95,8 +94,7 @@ function PMA_exportDBHeader($db) /** * Outputs database footer * - * @param string Database name - * + * @param string $db Database name * @return bool Whether it suceeded * * @access public @@ -107,10 +105,9 @@ function PMA_exportDBFooter($db) } /** - * Outputs create database database - * - * @param string Database name + * Outputs CREATE DATABASE statement * + * @param string $db Database name * @return bool Whether it suceeded * * @access public @@ -121,14 +118,13 @@ function PMA_exportDBCreate($db) } /** - * Outputs the content of a table in YAML format - * - * @param string the database name - * @param string the table name - * @param string the end of line sequence - * @param string the url to go back in case of error - * @param string SQL query for obtaining data + * Outputs the content of a table in JSON format * + * @param string $db database name + * @param string $table table name + * @param string $crlf the end of line sequence + * @param string $error_url the url to go back in case of error + * @param string $sql_query SQL query for obtaining data * @return bool Whether it suceeded * * @access public diff --git a/libraries/export/latex.php b/libraries/export/latex.php index 565c29cba2..9c453287e2 100644 --- a/libraries/export/latex.php +++ b/libraries/export/latex.php @@ -151,8 +151,7 @@ function PMA_exportHeader() { /** * Outputs database header * - * @param string Database name - * + * @param string $db Database name * @return bool Whether it suceeded * * @access public @@ -168,8 +167,7 @@ function PMA_exportDBHeader($db) { /** * Outputs database footer * - * @param string Database name - * + * @param string $db Database name * @return bool Whether it suceeded * * @access public @@ -179,10 +177,9 @@ function PMA_exportDBFooter($db) { } /** - * Outputs create database database - * - * @param string Database name + * Outputs CREATE DATABASE statement * + * @param string $db Database name * @return bool Whether it suceeded * * @access public @@ -194,12 +191,11 @@ function PMA_exportDBCreate($db) { /** * Outputs the content of a table in LaTeX table/sideways table environment * - * @param string the database name - * @param string the table name - * @param string the end of line sequence - * @param string the url to go back in case of error - * @param string SQL query for obtaining data - * + * @param string $db database name + * @param string $table table name + * @param string $crlf the end of line sequence + * @param string $error_url the url to go back in case of error + * @param string $sql_query SQL query for obtaining data * @return bool Whether it suceeded * * @access public @@ -290,23 +286,27 @@ function PMA_exportData($db, $table, $crlf, $error_url, $sql_query) { } // end getTableLaTeX /** - * Returns $table's structure as LaTeX + * Outputs table's structure * - * @param string the database name - * @param string the table name - * @param string the end of line sequence - * @param string the url to go back in case of error - * @param boolean whether to include relation comments - * @param boolean whether to include column comments - * @param boolean whether to include mime comments - * @param string future feature: support view dependencies - * - * @return bool Whether it suceeded + * @param string $db database name + * @param string $table table name + * @param string $crlf the end of line sequence + * @param string $error_url the url to go back in case of error + * @param bool $do_relation whether to include relation comments + * @param bool $do_comments whether to include the pmadb-style column comments + * as comments in the structure; this is deprecated + * but the parameter is left here because export.php + * calls PMA_exportStructure() also for other export + * types which use this parameter + * @param bool $do_mime whether to include mime comments + * @param bool $dates whether to include creation/update/check dates + * @param string $export_mode 'create_table', 'triggers', 'create_view', 'stand_in' + * @param string $export_type 'server', 'database', 'table' + * @return bool Whether it suceeded * * @access public */ - // @@@ Table structure -function PMA_exportStructure($db, $table, $crlf, $error_url, $do_relation = false, $do_comments = false, $do_mime = false, $dates = false, $dummy) +function PMA_exportStructure($db, $table, $crlf, $error_url, $do_relation = false, $do_comments = false, $do_mime = false, $dates = false, $export_mode, $export_type) { global $cfgRelation; diff --git a/libraries/export/mediawiki.php b/libraries/export/mediawiki.php index 538c31c533..e6145d8202 100644 --- a/libraries/export/mediawiki.php +++ b/libraries/export/mediawiki.php @@ -60,8 +60,7 @@ function PMA_exportHeader() { /** * Outputs database header * - * @param string Database name - * + * @param string $db Database name * @return bool Whether it suceeded * * @access public @@ -73,8 +72,7 @@ function PMA_exportDBHeader($db) { /** * Outputs database footer * - * @param string Database name - * + * @param string $db Database name * @return bool Whether it suceeded * * @access public @@ -84,10 +82,9 @@ function PMA_exportDBFooter($db) { } /** - * Outputs create database database - * - * @param string Database name + * Outputs CREATE DATABASE statement * + * @param string $db Database name * @return bool Whether it suceeded * * @access public @@ -99,12 +96,11 @@ function PMA_exportDBCreate($db) { /** * Outputs the content of a table in MediaWiki format * - * @param string the database name - * @param string the table name - * @param string the end of line sequence - * @param string the url to go back in case of error - * @param string SQL query for obtaining data - * + * @param string $db database name + * @param string $table table name + * @param string $crlf the end of line sequence + * @param string $error_url the url to go back in case of error + * @param string $sql_query SQL query for obtaining data * @return bool Whether it suceeded * * @access public diff --git a/libraries/export/ods.php b/libraries/export/ods.php index 699aa0fa2e..79383771e4 100644 --- a/libraries/export/ods.php +++ b/libraries/export/ods.php @@ -113,8 +113,7 @@ function PMA_exportHeader() { /** * Outputs database header * - * @param string Database name - * + * @param string $db Database name * @return bool Whether it suceeded * * @access public @@ -126,8 +125,7 @@ function PMA_exportDBHeader($db) { /** * Outputs database footer * - * @param string Database name - * + * @param string $db Database name * @return bool Whether it suceeded * * @access public @@ -137,10 +135,9 @@ function PMA_exportDBFooter($db) { } /** - * Outputs create database database - * - * @param string Database name + * Outputs CREATE DATABASE statement * + * @param string $db Database name * @return bool Whether it suceeded * * @access public @@ -150,14 +147,13 @@ function PMA_exportDBCreate($db) { } /** - * Outputs the content of a table in CSV format - * - * @param string the database name - * @param string the table name - * @param string the end of line sequence - * @param string the url to go back in case of error - * @param string SQL query for obtaining data + * Outputs the content of a table in ODS format * + * @param string $db database name + * @param string $table table name + * @param string $crlf the end of line sequence + * @param string $error_url the url to go back in case of error + * @param string $sql_query SQL query for obtaining data * @return bool Whether it suceeded * * @access public diff --git a/libraries/export/odt.php b/libraries/export/odt.php index d3c42de6b1..64f68e02c4 100644 --- a/libraries/export/odt.php +++ b/libraries/export/odt.php @@ -111,8 +111,7 @@ function PMA_exportHeader() { /** * Outputs database header * - * @param string Database name - * + * @param string $db Database name * @return bool Whether it suceeded * * @access public @@ -125,8 +124,7 @@ function PMA_exportDBHeader($db) { /** * Outputs database footer * - * @param string Database name - * + * @param string $db Database name * @return bool Whether it suceeded * * @access public @@ -136,10 +134,9 @@ function PMA_exportDBFooter($db) { } /** - * Outputs create database database - * - * @param string Database name + * Outputs CREATE DATABASE statement * + * @param string $db Database name * @return bool Whether it suceeded * * @access public @@ -149,14 +146,13 @@ function PMA_exportDBCreate($db) { } /** - * Outputs the content of a table in CSV format - * - * @param string the database name - * @param string the table name - * @param string the end of line sequence - * @param string the url to go back in case of error - * @param string SQL query for obtaining data + * Outputs the content of a table in ODT format * + * @param string $db database name + * @param string $table table name + * @param string $crlf the end of line sequence + * @param string $error_url the url to go back in case of error + * @param string $sql_query SQL query for obtaining data * @return bool Whether it suceeded * * @access public @@ -222,23 +218,27 @@ function PMA_exportData($db, $table, $crlf, $error_url, $sql_query) { } /** - * Returns $table's structure as Open Document Text + * Outputs table's structure * - * @param string the database name - * @param string the table name - * @param string the end of line sequence - * @param string the url to go back in case of error - * @param boolean whether to include relation comments - * @param boolean whether to include column comments - * @param boolean whether to include mime comments - * @param string future feature: support view dependencies - * - * @return bool Whether it suceeded + * @param string $db database name + * @param string $table table name + * @param string $crlf the end of line sequence + * @param string $error_url the url to go back in case of error + * @param bool $do_relation whether to include relation comments + * @param bool $do_comments whether to include the pmadb-style column comments + * as comments in the structure; this is deprecated + * but the parameter is left here because export.php + * calls PMA_exportStructure() also for other export + * types which use this parameter + * @param bool $do_mime whether to include mime comments + * @param bool $dates whether to include creation/update/check dates + * @param string $export_mode 'create_table', 'triggers', 'create_view', 'stand_in' + * @param string $export_type 'server', 'database', 'table' + * @return bool Whether it suceeded * * @access public */ - // @@@ Table structure -function PMA_exportStructure($db, $table, $crlf, $error_url, $do_relation = false, $do_comments = false, $do_mime = false, $dates = false, $dummy) +function PMA_exportStructure($db, $table, $crlf, $error_url, $do_relation = false, $do_comments = false, $do_mime = false, $dates = false, $export_mode, $export_type) { global $cfgRelation; diff --git a/libraries/export/pdf.php b/libraries/export/pdf.php index e864454b64..9ffd13ae45 100644 --- a/libraries/export/pdf.php +++ b/libraries/export/pdf.php @@ -420,8 +420,7 @@ function PMA_exportHeader() /** * Outputs database header * - * @param string Database name - * + * @param string $db Database name * @return bool Whether it suceeded * * @access public @@ -434,8 +433,7 @@ function PMA_exportDBHeader($db) /** * Outputs database footer * - * @param string Database name - * + * @param string $db Database name * @return bool Whether it suceeded * * @access public @@ -446,10 +444,9 @@ function PMA_exportDBFooter($db) } /** - * Outputs create database database - * - * @param string Database name + * Outputs CREATE DATABASE statement * + * @param string $db Database name * @return bool Whether it suceeded * * @access public @@ -462,13 +459,11 @@ function PMA_exportDBCreate($db) /** * Outputs the content of a table in PDF format * - * @todo user-defined page orientation, paper size - * @param string the database name - * @param string the table name - * @param string the end of line sequence - * @param string the url to go back in case of error - * @param string SQL query for obtaining data - * + * @param string $db database name + * @param string $table table name + * @param string $crlf the end of line sequence + * @param string $error_url the url to go back in case of error + * @param string $sql_query SQL query for obtaining data * @return bool Whether it suceeded * * @access public diff --git a/libraries/export/php_array.php b/libraries/export/php_array.php index 66a0aa6070..0916a123c1 100644 --- a/libraries/export/php_array.php +++ b/libraries/export/php_array.php @@ -81,8 +81,7 @@ function PMA_exportHeader() /** * Outputs database header * - * @param string Database name - * + * @param string $db Database name * @return bool Whether it suceeded * * @access public @@ -96,8 +95,7 @@ function PMA_exportDBHeader($db) /** * Outputs database footer * - * @param string Database name - * + * @param string $db Database name * @return bool Whether it suceeded * * @access public @@ -108,10 +106,9 @@ function PMA_exportDBFooter($db) } /** - * Outputs create database database - * - * @param string Database name + * Outputs CREATE DATABASE statement * + * @param string $db Database name * @return bool Whether it suceeded * * @access public @@ -122,14 +119,13 @@ function PMA_exportDBCreate($db) } /** - * Outputs the content of a table in YAML format - * - * @param string the database name - * @param string the table name - * @param string the end of line sequence - * @param string the url to go back in case of error - * @param string SQL query for obtaining data + * Outputs the content of a table as a fragment of PHP code * + * @param string $db database name + * @param string $table table name + * @param string $crlf the end of line sequence + * @param string $error_url the url to go back in case of error + * @param string $sql_query SQL query for obtaining data * @return bool Whether it suceeded * * @access public diff --git a/libraries/export/sql.php b/libraries/export/sql.php index 3b0d968c38..e56d8a8d7c 100644 --- a/libraries/export/sql.php +++ b/libraries/export/sql.php @@ -297,9 +297,10 @@ if (! isset($sql_backquotes)) { /** * Exports routines (procedures and functions) * - * @param string $db + * @param string $db + * @return bool Whether it suceeded * - * @return bool Whether it suceeded + * @access public */ function PMA_exportRoutines($db) { global $crlf; @@ -357,9 +358,10 @@ function PMA_exportRoutines($db) { /** * Possibly outputs comment * - * @param string Text of comment - * + * @param string $text Text of comment * @return string The formatted comment + * + * @access private */ function PMA_exportComment($text = '') { @@ -375,10 +377,11 @@ function PMA_exportComment($text = '') * Possibly outputs CRLF * * @return string $crlf or nothing + * + * @access private */ function PMA_possibleCRLF() { - if (isset($GLOBALS['sql_include_comments']) && $GLOBALS['sql_include_comments']) { return $GLOBALS['crlf']; } else { @@ -518,10 +521,9 @@ function PMA_exportHeader() } /** - * Outputs CREATE DATABASE database - * - * @param string Database name + * Outputs CREATE DATABASE statement * + * @param string $db Database name * @return bool Whether it suceeded * * @access public @@ -557,8 +559,7 @@ function PMA_exportDBCreate($db) /** * Outputs database header * - * @param string Database name - * + * @param string $db Database name * @return bool Whether it suceeded * * @access public @@ -574,8 +575,7 @@ function PMA_exportDBHeader($db) /** * Outputs database footer * - * @param string Database name - * + * @param string $db Database name * @return bool Whether it suceeded * * @access public @@ -626,15 +626,13 @@ function PMA_exportDBFooter($db) return $result; } - /** * Returns a stand-in CREATE definition to resolve view dependencies * - * @param string the database name - * @param string the view name - * @param string the end of line sequence - * - * @return string resulting definition + * @param string $db the database name + * @param string $view the view name + * @param string $crlf the end of line sequence + * @return string resulting definition * * @access public */ @@ -662,20 +660,15 @@ function PMA_getTableDefStandIn($db, $view, $crlf) { /** * Returns $table's CREATE definition * - * @param string the database name - * @param string the table name - * @param string the end of line sequence - * @param string the url to go back in case of error - * @param boolean whether to include creation/update/check dates - * @param boolean whether to add semicolon and end-of-line at the end - * @param boolean whether we're handling view - * + * @param string $db the database name + * @param string $table the table name + * @param string $crlf the end of line sequence + * @param string $error_url the url to go back in case of error + * @param bool $show_dates whether to include creation/update/check dates + * @param bool $add_semicolon whether to add semicolon and end-of-line at the end + * @param bool $view whether we're handling a view * @return string resulting schema * - * @global boolean whether to add 'drop' statements or not - * @global boolean whether to use backquotes to allow the use of special - * characters in database, table and fields names or not - * * @access public */ function PMA_getTableDef($db, $table, $crlf, $error_url, $show_dates = false, $add_semicolon = true, $view = false) @@ -869,21 +862,19 @@ function PMA_getTableDef($db, $table, $crlf, $error_url, $show_dates = false, $a return $schema_create . ($add_semicolon ? ';' . $crlf : ''); } // end of the 'PMA_getTableDef()' function - /** * Returns $table's comments, relations etc. * - * @param string the database name - * @param string the table name - * @param string the end of line sequence - * @param boolean whether to include relation comments - * @param boolean whether to include mime comments - * + * @param string $db database name + * @param string $table table name + * @param string $crlf end of line sequence + * @param bool $do_relation whether to include relation comments + * @param bool $do_mime whether to include mime comments * @return string resulting comments * - * @access public + * @access private */ -function PMA_getTableComments($db, $table, $crlf, $do_relation = false, $do_mime = false) +function PMA_getTableComments($db, $table, $crlf, $do_relation = false, $do_mime = false) { global $cfgRelation; global $sql_backquotes; @@ -943,21 +934,21 @@ function PMA_getTableComments($db, $table, $crlf, $do_relation = false, $do_mim /** * Outputs table's structure * - * @param string the database name - * @param string the table name - * @param string the end of line sequence - * @param string the url to go back in case of error - * @param boolean whether to include relation comments - * @param boolean whether to include the pmadb-style column comments - * as comments in the structure; this is deprecated - * but the parameter is left here because export.php - * calls PMA_exportStructure() also for other export - * types which use this parameter - * @param boolean whether to include mime comments - * @param string 'stand_in', 'create_table', 'create_view' - * @param string 'server', 'database', 'table' - * - * @return bool Whether it suceeded + * @param string $db database name + * @param string $table table name + * @param string $crlf the end of line sequence + * @param string $error_url the url to go back in case of error + * @param bool $relation whether to include relation comments + * @param bool $comments whether to include the pmadb-style column comments + * as comments in the structure; this is deprecated + * but the parameter is left here because export.php + * calls PMA_exportStructure() also for other export + * types which use this parameter + * @param bool $mime whether to include mime comments + * @param bool $dates whether to include creation/update/check dates + * @param string $export_mode 'create_table', 'triggers', 'create_view', 'stand_in' + * @param string $export_type 'server', 'database', 'table' + * @return bool Whether it suceeded * * @access public */ @@ -1019,26 +1010,16 @@ function PMA_exportStructure($db, $table, $crlf, $error_url, $relation = false, } /** - * Dispatches between the versions of 'getTableContent' to use depending - * on the php version - * - * @param string the database name - * @param string the table name - * @param string the end of line sequence - * @param string the url to go back in case of error - * @param string SQL query for obtaining data + * Outputs the content of a table in SQL format * + * @param string $db database name + * @param string $table table name + * @param string $crlf the end of line sequence + * @param string $error_url the url to go back in case of error + * @param string $sql_query SQL query for obtaining data * @return bool Whether it suceeded * - * @global boolean whether to use backquotes to allow the use of special - * characters in database, table and fields names or not - * @global integer the number of records - * @global integer the current record position - * * @access public - * - * @see PMA_getTableContentFast(), PMA_getTableContentOld() - * */ function PMA_exportData($db, $table, $crlf, $error_url, $sql_query) { diff --git a/libraries/export/texytext.php b/libraries/export/texytext.php index 2b290f1725..1a1057a58f 100644 --- a/libraries/export/texytext.php +++ b/libraries/export/texytext.php @@ -68,8 +68,7 @@ function PMA_exportHeader() { /** * Outputs database header * - * @param string Database name - * + * @param string $db Database name * @return bool Whether it suceeded * * @access public @@ -81,8 +80,7 @@ function PMA_exportDBHeader($db) { /** * Outputs database footer * - * @param string Database name - * + * @param string $db Database name * @return bool Whether it suceeded * * @access public @@ -92,10 +90,9 @@ function PMA_exportDBFooter($db) { } /** - * Outputs create database database - * - * @param string Database name + * Outputs CREATE DATABASE statement * + * @param string $db Database name * @return bool Whether it suceeded * * @access public @@ -105,14 +102,13 @@ function PMA_exportDBCreate($db) { } /** - * Outputs the content of a table in CSV format - * - * @param string the database name - * @param string the table name - * @param string the end of line sequence - * @param string the url to go back in case of error - * @param string SQL query for obtaining data + * Outputs the content of a table in Texy format * + * @param string $db database name + * @param string $table table name + * @param string $crlf the end of line sequence + * @param string $error_url the url to go back in case of error + * @param string $sql_query SQL query for obtaining data * @return bool Whether it suceeded * * @access public @@ -164,7 +160,28 @@ function PMA_exportData($db, $table, $crlf, $error_url, $sql_query) return true; } -function PMA_exportStructure($db, $table, $crlf, $error_url, $do_relation = false, $do_comments = false, $do_mime = false, $dates = false, $dummy) +/** + * Outputs table's structure + * + * @param string $db database name + * @param string $table table name + * @param string $crlf the end of line sequence + * @param string $error_url the url to go back in case of error + * @param bool $do_relation whether to include relation comments + * @param bool $do_comments whether to include the pmadb-style column comments + * as comments in the structure; this is deprecated + * but the parameter is left here because export.php + * calls PMA_exportStructure() also for other export + * types which use this parameter + * @param bool $do_mime whether to include mime comments + * @param bool $dates whether to include creation/update/check dates + * @param string $export_mode 'create_table', 'triggers', 'create_view', 'stand_in' + * @param string $export_type 'server', 'database', 'table' + * @return bool Whether it suceeded + * + * @access public + */ +function PMA_exportStructure($db, $table, $crlf, $error_url, $do_relation = false, $do_comments = false, $do_mime = false, $dates = false, $export_mode, $export_type) { global $cfgRelation; diff --git a/libraries/export/xls.php b/libraries/export/xls.php index 2a1f2192a7..cfb5ac533d 100644 --- a/libraries/export/xls.php +++ b/libraries/export/xls.php @@ -102,8 +102,7 @@ function PMA_exportHeader() { /** * Outputs database header * - * @param string Database name - * + * @param string $db Database name * @return bool Whether it suceeded * * @access public @@ -117,8 +116,7 @@ function PMA_exportDBHeader($db) { /** * Outputs database footer * - * @param string Database name - * + * @param string $db Database name * @return bool Whether it suceeded * * @access public @@ -128,10 +126,9 @@ function PMA_exportDBFooter($db) { } /** - * Outputs create database database - * - * @param string Database name + * Outputs CREATE DATABASE statement * + * @param string $db Database name * @return bool Whether it suceeded * * @access public @@ -143,12 +140,11 @@ function PMA_exportDBCreate($db) { /** * Outputs the content of a table in XLS format * - * @param string the database name - * @param string the table name - * @param string the end of line sequence - * @param string the url to go back in case of error - * @param string SQL query for obtaining data - * + * @param string $db database name + * @param string $table table name + * @param string $crlf the end of line sequence + * @param string $error_url the url to go back in case of error + * @param string $sql_query SQL query for obtaining data * @return bool Whether it suceeded * * @access public diff --git a/libraries/export/xlsx.php b/libraries/export/xlsx.php index 487c2dfb59..e01663de2a 100644 --- a/libraries/export/xlsx.php +++ b/libraries/export/xlsx.php @@ -101,8 +101,7 @@ function PMA_exportHeader() { /** * Outputs database header * - * @param string Database name - * + * @param string $db Database name * @return bool Whether it suceeded * * @access public @@ -116,8 +115,7 @@ function PMA_exportDBHeader($db) { /** * Outputs database footer * - * @param string Database name - * + * @param string $db Database name * @return bool Whether it suceeded * * @access public @@ -127,10 +125,9 @@ function PMA_exportDBFooter($db) { } /** - * Outputs create database database - * - * @param string Database name + * Outputs CREATE DATABASE statement * + * @param string $db Database name * @return bool Whether it suceeded * * @access public @@ -142,12 +139,11 @@ function PMA_exportDBCreate($db) { /** * Outputs the content of a table in XLSX format * - * @param string the database name - * @param string the table name - * @param string the end of line sequence - * @param string the url to go back in case of error - * @param string SQL query for obtaining data - * + * @param string $db database name + * @param string $table table name + * @param string $crlf the end of line sequence + * @param string $error_url the url to go back in case of error + * @param string $sql_query SQL query for obtaining data * @return bool Whether it suceeded * * @access public diff --git a/libraries/export/xml.php b/libraries/export/xml.php index ba1e4fa12f..79b1115983 100644 --- a/libraries/export/xml.php +++ b/libraries/export/xml.php @@ -243,8 +243,7 @@ function PMA_exportHeader() { /** * Outputs database header * - * @param string Database name - * + * @param string $db Database name * @return bool Whether it suceeded * * @access public @@ -270,8 +269,7 @@ function PMA_exportDBHeader($db) { /** * Outputs database footer * - * @param string Database name - * + * @param string $db Database name * @return bool Whether it suceeded * * @access public @@ -290,10 +288,9 @@ function PMA_exportDBFooter($db) { } /** - * Outputs create database database - * - * @param string Database name + * Outputs CREATE DATABASE statement * + * @param string $db Database name * @return bool Whether it suceeded * * @access public @@ -302,16 +299,14 @@ function PMA_exportDBCreate($db) { return true; } - /** - * Outputs the content of a table - * - * @param string the database name - * @param string the table name - * @param string the end of line sequence - * @param string the url to go back in case of error - * @param string SQL query for obtaining data + * Outputs the content of a table in XML format * + * @param string $db database name + * @param string $table table name + * @param string $crlf the end of line sequence + * @param string $error_url the url to go back in case of error + * @param string $sql_query SQL query for obtaining data * @return bool Whether it suceeded * * @access public diff --git a/libraries/export/yaml.php b/libraries/export/yaml.php index 8c3fad045d..b1f1c8fc39 100644 --- a/libraries/export/yaml.php +++ b/libraries/export/yaml.php @@ -77,8 +77,7 @@ function PMA_exportHeader() /** * Outputs database header * - * @param string Database name - * + * @param string $db Database name * @return bool Whether it suceeded * * @access public @@ -91,8 +90,7 @@ function PMA_exportDBHeader($db) /** * Outputs database footer * - * @param string Database name - * + * @param string $db Database name * @return bool Whether it suceeded * * @access public @@ -103,10 +101,9 @@ function PMA_exportDBFooter($db) } /** - * Outputs create database database - * - * @param string Database name + * Outputs CREATE DATABASE statement * + * @param string $db Database name * @return bool Whether it suceeded * * @access public @@ -119,12 +116,11 @@ function PMA_exportDBCreate($db) /** * Outputs the content of a table in YAML format * - * @param string the database name - * @param string the table name - * @param string the end of line sequence - * @param string the url to go back in case of error - * @param string SQL query for obtaining data - * + * @param string $db database name + * @param string $table table name + * @param string $crlf the end of line sequence + * @param string $error_url the url to go back in case of error + * @param string $sql_query SQL query for obtaining data * @return bool Whether it suceeded * * @access public From ced22c9c22cb9cb51b44e0a0c25f5f3ffb645423 Mon Sep 17 00:00:00 2001 From: Piotr Przybylski Date: Tue, 12 Jul 2011 17:48:03 +0200 Subject: [PATCH 75/85] Remove unused function from most export plugins: PMA_exportComment It's used only locally in SQL export --- libraries/export/codegen.php | 11 ----------- libraries/export/csv.php | 11 ----------- libraries/export/htmlword.php | 11 ----------- libraries/export/json.php | 13 ------------- libraries/export/latex.php | 11 ----------- libraries/export/mediawiki.php | 11 ----------- libraries/export/ods.php | 11 ----------- libraries/export/odt.php | 11 ----------- libraries/export/pdf.php | 12 ------------ libraries/export/php_array.php | 13 ------------- libraries/export/texytext.php | 11 ----------- libraries/export/xls.php | 11 ----------- libraries/export/xlsx.php | 11 ----------- libraries/export/xml.php | 11 ----------- libraries/export/yaml.php | 13 ------------- 15 files changed, 172 deletions(-) diff --git a/libraries/export/codegen.php b/libraries/export/codegen.php index 29fa9e09dd..d60785c062 100644 --- a/libraries/export/codegen.php +++ b/libraries/export/codegen.php @@ -46,17 +46,6 @@ if (isset($plugin_list)) { * Set of functions used to build exports of tables */ -/** - * Possibly outputs comment - * - * @param string $text Text of comment - * @return string The formatted comment - */ -function PMA_exportComment($text) -{ - return true; -} - /** * Outputs export footer * diff --git a/libraries/export/csv.php b/libraries/export/csv.php index 30c9d8a3aa..0240e9b396 100644 --- a/libraries/export/csv.php +++ b/libraries/export/csv.php @@ -35,17 +35,6 @@ if (isset($plugin_list)) { ); } else { -/** - * Outputs comment - * - * @param string Text of comment - * - * @return bool Whether it suceeded - */ -function PMA_exportComment($text) { - return true; -} - /** * Outputs export footer * diff --git a/libraries/export/htmlword.php b/libraries/export/htmlword.php index 73fdd6f3a0..c840e932f6 100644 --- a/libraries/export/htmlword.php +++ b/libraries/export/htmlword.php @@ -34,17 +34,6 @@ if (isset($plugin_list)) { ); } else { -/** - * Outputs comment - * - * @param string Text of comment - * - * @return bool Whether it suceeded - */ -function PMA_exportComment($text) { - return true; -} - /** * Outputs export footer * diff --git a/libraries/export/json.php b/libraries/export/json.php index 93e85855e5..86e2e89d31 100644 --- a/libraries/export/json.php +++ b/libraries/export/json.php @@ -34,19 +34,6 @@ if (isset($plugin_list)) { * Set of functions used to build exports of tables */ -/** - * Outputs comment - * - * @param string Text of comment - * - * @return bool Whether it suceeded - */ -function PMA_exportComment($text) -{ - PMA_exportOutputHandler('/* ' . $text . ' */' . $GLOBALS['crlf']); - return true; -} - /** * Outputs export footer * diff --git a/libraries/export/latex.php b/libraries/export/latex.php index 9c453287e2..ee8f3a2480 100644 --- a/libraries/export/latex.php +++ b/libraries/export/latex.php @@ -100,17 +100,6 @@ function PMA_texEscape($string) { return $string; } -/** - * Outputs comment - * - * @param string Text of comment - * - * @return bool Whether it suceeded - */ -function PMA_exportComment($text) { - return PMA_exportOutputHandler('% ' . $text . $GLOBALS['crlf']); -} - /** * Outputs export footer * diff --git a/libraries/export/mediawiki.php b/libraries/export/mediawiki.php index e6145d8202..76c8b2a716 100644 --- a/libraries/export/mediawiki.php +++ b/libraries/export/mediawiki.php @@ -24,17 +24,6 @@ if (isset($plugin_list)) { ); } else { -/** - * Outputs comment - * - * @param string Text of comment - * - * @return bool Whether it suceeded - */ -function PMA_exportComment($text) { - return true; -} - /** * Outputs export footer * diff --git a/libraries/export/ods.php b/libraries/export/ods.php index 79383771e4..9d9ff1309b 100644 --- a/libraries/export/ods.php +++ b/libraries/export/ods.php @@ -33,17 +33,6 @@ if (isset($plugin_list)) { $GLOBALS['ods_buffer'] = ''; require_once './libraries/opendocument.lib.php'; -/** - * Outputs comment - * - * @param string Text of comment - * - * @return bool Whether it suceeded - */ -function PMA_exportComment($text) { - return true; -} - /** * Outputs export footer * diff --git a/libraries/export/odt.php b/libraries/export/odt.php index 64f68e02c4..b640ca34ae 100644 --- a/libraries/export/odt.php +++ b/libraries/export/odt.php @@ -65,17 +65,6 @@ if (isset($plugin_list)) { $GLOBALS['odt_buffer'] = ''; require_once './libraries/opendocument.lib.php'; -/** - * Outputs comment - * - * @param string Text of comment - * - * @return bool Whether it suceeded - */ -function PMA_exportComment($text) { - return true; -} - /** * Outputs export footer * diff --git a/libraries/export/pdf.php b/libraries/export/pdf.php index 9ffd13ae45..bb89fda34a 100644 --- a/libraries/export/pdf.php +++ b/libraries/export/pdf.php @@ -358,18 +358,6 @@ class PMA_PDF extends TCPDF $pdf = new PMA_PDF('L', 'pt', 'A3'); -/** - * Outputs comment - * - * @param string Text of comment - * - * @return bool Whether it suceeded - */ -function PMA_exportComment($text) -{ - return true; -} - /** * Finalize the pdf. * diff --git a/libraries/export/php_array.php b/libraries/export/php_array.php index 0916a123c1..1996e6fbfc 100644 --- a/libraries/export/php_array.php +++ b/libraries/export/php_array.php @@ -34,19 +34,6 @@ if (isset($plugin_list)) { * Set of functions used to build exports of tables */ -/** - * Outputs comment - * - * @param string Text of comment - * - * @return bool Whether it suceeded - */ -function PMA_exportComment($text) -{ - PMA_exportOutputHandler('// ' . $text . $GLOBALS['crlf']); - return true; -} - /** * Outputs export footer * diff --git a/libraries/export/texytext.php b/libraries/export/texytext.php index 1a1057a58f..ceffe4d018 100644 --- a/libraries/export/texytext.php +++ b/libraries/export/texytext.php @@ -32,17 +32,6 @@ if (isset($plugin_list)) { ); } else { -/** - * Outputs comment - * - * @param string Text of comment - * - * @return bool Whether it suceeded - */ -function PMA_exportComment($text) { - return true; -} - /** * Outputs export footer * diff --git a/libraries/export/xls.php b/libraries/export/xls.php index cfb5ac533d..6116e2a2e1 100644 --- a/libraries/export/xls.php +++ b/libraries/export/xls.php @@ -36,17 +36,6 @@ set_include_path(get_include_path() . PATH_SEPARATOR . getcwd() . '/libraries/PH require_once './libraries/PHPExcel/PHPExcel.php'; require_once './libraries/PHPExcel/PHPExcel/Writer/Excel5.php'; -/** - * Outputs comment - * - * @param string Text of comment - * - * @return bool Whether it suceeded - */ -function PMA_exportComment($text) { - return true; -} - /** * Outputs export footer * diff --git a/libraries/export/xlsx.php b/libraries/export/xlsx.php index e01663de2a..758d98dffe 100644 --- a/libraries/export/xlsx.php +++ b/libraries/export/xlsx.php @@ -36,17 +36,6 @@ set_include_path(get_include_path() . PATH_SEPARATOR . getcwd() . '/libraries/PH require_once './libraries/PHPExcel/PHPExcel.php'; require_once './libraries/PHPExcel/PHPExcel/Writer/Excel2007.php'; -/** - * Outputs comment - * - * @param string Text of comment - * - * @return bool Whether it suceeded - */ -function PMA_exportComment($text) { - return true; -} - /** * Outputs export footer * diff --git a/libraries/export/xml.php b/libraries/export/xml.php index 79b1115983..ec9fcfab1f 100644 --- a/libraries/export/xml.php +++ b/libraries/export/xml.php @@ -48,17 +48,6 @@ if (isset($plugin_list)) { $plugin_list['xml']['options'][] = array('type' => 'end_group'); } else { -/** - * Outputs comment - * - * @param string Text of comment - * - * @return bool Whether it suceeded - */ -function PMA_exportComment($text) { - return PMA_exportOutputHandler('' . $GLOBALS['crlf']); -} - /** * Outputs export footer * diff --git a/libraries/export/yaml.php b/libraries/export/yaml.php index b1f1c8fc39..017cae6d18 100644 --- a/libraries/export/yaml.php +++ b/libraries/export/yaml.php @@ -35,19 +35,6 @@ if (isset($plugin_list)) { * Set of functions used to build exports of tables */ -/** - * Outputs comment - * - * @param string Text of comment - * - * @return bool Whether it suceeded - */ -function PMA_exportComment($text) -{ - PMA_exportOutputHandler('# ' . $text . $GLOBALS['crlf']); - return true; -} - /** * Outputs export footer * From 2c0d2aca16ecab549900db7aa71a382e5404445d Mon Sep 17 00:00:00 2001 From: Piotr Przybylski Date: Tue, 12 Jul 2011 18:14:26 +0200 Subject: [PATCH 76/85] Use PMA_MYSQL_STR_VERSION instead of reconstructing it from PMA_MYSQL_INT_VERSION --- libraries/export/latex.php | 2 +- libraries/export/sql.php | 2 +- libraries/export/xml.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libraries/export/latex.php b/libraries/export/latex.php index ee8f3a2480..96be53681f 100644 --- a/libraries/export/latex.php +++ b/libraries/export/latex.php @@ -132,7 +132,7 @@ function PMA_exportHeader() { } $head .= $crlf . '% ' . __('Generation Time') . ': ' . PMA_localisedDate() . $crlf - . '% ' . __('Server version') . ': ' . substr(PMA_MYSQL_INT_VERSION, 0, 1) . '.' . (int) substr(PMA_MYSQL_INT_VERSION, 1, 2) . '.' . (int) substr(PMA_MYSQL_INT_VERSION, 3) . $crlf + . '% ' . __('Server version') . ': ' . PMA_MYSQL_STR_VERSION . $crlf . '% ' . __('PHP Version') . ': ' . phpversion() . $crlf; return PMA_exportOutputHandler($head); } diff --git a/libraries/export/sql.php b/libraries/export/sql.php index e56d8a8d7c..32309574d6 100644 --- a/libraries/export/sql.php +++ b/libraries/export/sql.php @@ -460,7 +460,7 @@ function PMA_exportHeader() $head .= PMA_exportComment($host_string); $head .= PMA_exportComment(__('Generation Time') . ': ' . PMA_localisedDate()) - . PMA_exportComment(__('Server version') . ': ' . substr(PMA_MYSQL_INT_VERSION, 0, 1) . '.' . (int) substr(PMA_MYSQL_INT_VERSION, 1, 2) . '.' . (int) substr(PMA_MYSQL_INT_VERSION, 3)) + . PMA_exportComment(__('Server version') . ': ' . PMA_MYSQL_STR_VERSION) . PMA_exportComment(__('PHP Version') . ': ' . phpversion()) . PMA_possibleCRLF(); diff --git a/libraries/export/xml.php b/libraries/export/xml.php index ec9fcfab1f..26650513d2 100644 --- a/libraries/export/xml.php +++ b/libraries/export/xml.php @@ -97,7 +97,7 @@ function PMA_exportHeader() { } $head .= $crlf . '- ' . __('Generation Time') . ': ' . PMA_localisedDate() . $crlf - . '- ' . __('Server version') . ': ' . substr(PMA_MYSQL_INT_VERSION, 0, 1) . '.' . (int) substr(PMA_MYSQL_INT_VERSION, 1, 2) . '.' . (int) substr(PMA_MYSQL_INT_VERSION, 3) . $crlf + . '- ' . __('Server version') . ': ' . PMA_MYSQL_STR_VERSION . $crlf . '- ' . __('PHP Version') . ': ' . phpversion() . $crlf . '-->' . $crlf . $crlf; From 82581f58a69743f7e4e07e0e167dd0357e21b154 Mon Sep 17 00:00:00 2001 From: mrbendig Date: Tue, 12 Jul 2011 23:03:11 +0200 Subject: [PATCH 77/85] Translation update done using Pootle. --- po/de.po | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/po/de.po b/po/de.po index c75838e48d..a421bb850c 100644 --- a/po/de.po +++ b/po/de.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-07-07 15:16+0200\n" -"PO-Revision-Date: 2011-07-11 09:26+0200\n" +"PO-Revision-Date: 2011-07-12 23:03+0200\n" "Last-Translator: \n" "Language-Team: german \n" "Language: de\n" @@ -957,10 +957,11 @@ msgstr "" msgid "The web server does not have permission to save the file %s." msgstr "Der Webserver hat keine Schreibrechte um die Datei %s zu speichern." +# Schema is not the right word for it, because a dump contains also data, and NOT just the scheme. #: export.php:673 #, php-format msgid "Dump has been saved to file %s." -msgstr "Dump (Schema) wurde in Datei %s gespeichert." +msgstr "Dump wurde in Datei %s gespeichert." #: import.php:57 #, php-format From 56efd262a3aa99985f486dbc6df49fe83286b6aa Mon Sep 17 00:00:00 2001 From: mrbendig Date: Tue, 12 Jul 2011 23:03:26 +0200 Subject: [PATCH 78/85] Translation update done using Pootle. --- po/de.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/de.po b/po/de.po index a421bb850c..6f539ddcb0 100644 --- a/po/de.po +++ b/po/de.po @@ -3412,7 +3412,7 @@ msgstr "Prozentwerte als Dezimalzahlen importieren (12.00% wird zu 0.12)" #: libraries/config/messages.inc.php:258 msgid "Number of queries to skip from start" -msgstr "Anzahl der am Anfang zu überspringenden Einträge (Abfragen)" +msgstr "Anzahl der am Anfang zu überspringenden Abfragen" #: libraries/config/messages.inc.php:259 msgid "Partial import: skip queries" From ded873a26cbbb3e77d50664dfbf30a2e7b71f677 Mon Sep 17 00:00:00 2001 From: mrbendig Date: Tue, 12 Jul 2011 23:04:55 +0200 Subject: [PATCH 79/85] Translation update done using Pootle. --- po/de.po | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/po/de.po b/po/de.po index 6f539ddcb0..b895e676ad 100644 --- a/po/de.po +++ b/po/de.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-07-07 15:16+0200\n" -"PO-Revision-Date: 2011-07-12 23:03+0200\n" +"PO-Revision-Date: 2011-07-12 23:04+0200\n" "Last-Translator: \n" "Language-Team: german \n" "Language: de\n" @@ -4057,10 +4057,10 @@ msgid "" "alphabetical order." msgstr "" "MySQL Wildcard-Symbole (% und _) sind möglich, mit \\ wird die urspüngliche " -"Bedeutung wiederhergestellt, d.h. 'my\\_db' und nicht 'my_db'. Mit dieser " -"Optionen können Datenbanklisten sortiert werden; geben Sie ihre Namen " -"sortiert ein und nutzen Sie am Ende [kbd]*[/kbd], um die übrigen in " -"alphabetischer Reihenfolge anzuzeigen." +"Bedeutung wiederhergestellt, d.h. [kbd]'my\\_db'[/kbd] und nicht " +"[kbd]'my_db'[/kbd]. Mit dieser Optionen können Datenbanklisten sortiert " +"werden; geben Sie ihre Namen sortiert ein und nutzen Sie am Ende " +"[kbd]*[/kbd], um die übrigen in alphabetischer Reihenfolge anzuzeigen." #: libraries/config/messages.inc.php:400 msgid "Show only listed databases" From c88f6ba57a39e29ad2ffd4203117d0dfe532d4fe Mon Sep 17 00:00:00 2001 From: mrbendig Date: Tue, 12 Jul 2011 23:05:21 +0200 Subject: [PATCH 80/85] Translation update done using Pootle. --- po/de.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/de.po b/po/de.po index b895e676ad..b5004fcb0d 100644 --- a/po/de.po +++ b/po/de.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-07-07 15:16+0200\n" -"PO-Revision-Date: 2011-07-12 23:04+0200\n" +"PO-Revision-Date: 2011-07-12 23:05+0200\n" "Last-Translator: \n" "Language-Team: german \n" "Language: de\n" @@ -5562,7 +5562,7 @@ msgstr "Unbenutzte Seiten" #: libraries/engines/innodb.lib.php:176 msgid "Dirty pages" -msgstr "Inkonsistente Seiten ("dirty")" +msgstr "Inkonsistente Seiten" #: libraries/engines/innodb.lib.php:182 msgid "Pages containing data" From 479687ae10878a340b823fea117148fff8ba99dd Mon Sep 17 00:00:00 2001 From: mrbendig Date: Tue, 12 Jul 2011 23:05:54 +0200 Subject: [PATCH 81/85] Translation update done using Pootle. --- po/de.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/de.po b/po/de.po index b5004fcb0d..f4c81ecf08 100644 --- a/po/de.po +++ b/po/de.po @@ -7299,7 +7299,7 @@ msgstr "" "können. In der ersten Möglichkeit benennen Sie den Dateinamen. Als zweite " "Option wird ein Spaltenname durch den Dateinamen gesetzt. Sollte die zweite " "Option gesetzt sein, ist es notwendig, die erste Option auf einen Leerstring " -"zu setzen ('')." +"zu setzen." #: libraries/transformations/application_octetstream__hex.inc.php:9 msgid "" From 9671a0ca847ef768bccfbb7e54ca8d0fe98f716a Mon Sep 17 00:00:00 2001 From: mrbendig Date: Tue, 12 Jul 2011 23:06:31 +0200 Subject: [PATCH 82/85] Translation update done using Pootle. --- po/de.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/po/de.po b/po/de.po index f4c81ecf08..84c4023315 100644 --- a/po/de.po +++ b/po/de.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-07-07 15:16+0200\n" -"PO-Revision-Date: 2011-07-12 23:05+0200\n" +"PO-Revision-Date: 2011-07-12 23:06+0200\n" "Last-Translator: \n" "Language-Team: german \n" "Language: de\n" @@ -7316,8 +7316,8 @@ msgid "" "Displays a clickable thumbnail. The options are the maximum width and height " "in pixels. The original aspect ratio is preserved." msgstr "" -"Ein klickbares Vorschaubild anzeigen. Optionen: Breite, Höhe in Pixeln " -"(berücksichtigt das ursprüngliche Seitenverhältnis)." +"Ein klickbares Vorschaubild anzeigen. Optionen: Breite und Höhe in Pixeln, " +"wobei das ursprüngliche Seitenverhältnis berücksichtigt wird." #: libraries/transformations/image_jpeg__link.inc.php:9 msgid "Displays a link to download this image." From dffbed852e4274129446a6829d4ff00a720cd695 Mon Sep 17 00:00:00 2001 From: mrbendig Date: Tue, 12 Jul 2011 23:07:01 +0200 Subject: [PATCH 83/85] Translation update done using Pootle. --- po/de.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/de.po b/po/de.po index 84c4023315..d9af510620 100644 --- a/po/de.po +++ b/po/de.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-07-07 15:16+0200\n" -"PO-Revision-Date: 2011-07-12 23:06+0200\n" +"PO-Revision-Date: 2011-07-12 23:07+0200\n" "Last-Translator: \n" "Language-Team: german \n" "Language: de\n" @@ -8705,7 +8705,7 @@ msgstr "Transaktions-Koordinator" #: server_status.php:285 msgid "Flush (close) all tables" -msgstr "Alle Tabellen aktualisieren und schließen" +msgstr "Alle Tabellen aktualisieren (und schließen)" #: server_status.php:287 msgid "Show open tables" From f1bd746cb9f99d8198459ed8cdf4cb57ba458696 Mon Sep 17 00:00:00 2001 From: mrbendig Date: Tue, 12 Jul 2011 23:07:34 +0200 Subject: [PATCH 84/85] Translation update done using Pootle. --- po/de.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/de.po b/po/de.po index d9af510620..ba4c35bfee 100644 --- a/po/de.po +++ b/po/de.po @@ -8827,8 +8827,8 @@ msgid "" "On a busy server, the byte counters may overrun, so those statistics as " "reported by the MySQL server may be incorrect." msgstr "" -"Auf stark frequentierten Server können die Byte-Zähler überlaufen (wieder " -"bei 0 beginnen), deshalb können diese Werte, wie sie vom MySQL Server " +"Auf stark frequentierten Server können die Byte-Zähler überlaufen, d.h. " +"wieder bei 0 beginnen, deshalb können diese Werte, wie sie vom MySQL Server " "ausgegeben werden, falsch sein." #: server_status.php:681 From 32c7781fb46b4774cbd568403dcd4f22da60ecc1 Mon Sep 17 00:00:00 2001 From: Panagiotis Papazoglou Date: Wed, 13 Jul 2011 09:17:37 +0200 Subject: [PATCH 85/85] Translation update done using Pootle. --- po/el.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/po/el.po b/po/el.po index 6ad5b3e058..0e34a18589 100644 --- a/po/el.po +++ b/po/el.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-07-07 15:16+0200\n" -"PO-Revision-Date: 2011-07-07 12:37+0200\n" +"PO-Revision-Date: 2011-07-13 09:17+0200\n" "Last-Translator: Panagiotis Papazoglou \n" "Language-Team: greek \n" "Language: el\n" @@ -5375,10 +5375,10 @@ msgid "vertical" msgstr "κάθετη" #: libraries/display_tbl.lib.php:452 -#, fuzzy, php-format +#, php-format #| msgid "Headers every" msgid "Headers every %s rows" -msgstr "Κεφαλίδες κάθε" +msgstr "Κεφαλίδες κάθε %s εγγραφές" #: libraries/display_tbl.lib.php:546 msgid "Sort by key"