From 27f616e963ce31430dc3f4b38f62669ebdac587b Mon Sep 17 00:00:00 2001 From: Umair Khan Date: Wed, 12 Feb 2014 00:29:55 +0530 Subject: [PATCH 1/4] Contest-1 BugFix #4053 Signed-off-by: Umair Khan --- js/rte.js | 24 ++++++++++++++++++++++++ libraries/rte/rte_routines.lib.php | 2 +- 2 files changed, 25 insertions(+), 1 deletion(-) diff --git a/js/rte.js b/js/rte.js index 569931ce7f..015a0b150b 100644 --- a/js/rte.js +++ b/js/rte.js @@ -711,6 +711,30 @@ RTE.ROUTINE = { $ajaxDialog.find('input.datefield, input.datetimefield').each(function () { PMA_addDatepicker($(this).css('width', '95%')); }); + /* + * Define the function if the user presses enter + */ + $('form.rte_form').live('submit', function (event) { + event.preventDefault(); + /** + * @var data Form data to be sent in the AJAX request + */ + var data = $(this).serialize(); + $msg = PMA_ajaxShowMessage( + PMA_messages.strProcessingRequest + ); + var url = $(this).attr('action'); + $.post(url, data, function (data) { + if (data.success === true) { + // Routine executed successfully + PMA_ajaxRemoveMessage($msg); + PMA_slidingMessage(data.message); + $ajaxDialog.remove(); + } else { + PMA_ajaxShowMessage(data.error, false); + } + }); + }); } else { // Routine executed successfully PMA_slidingMessage(data.message); diff --git a/libraries/rte/rte_routines.lib.php b/libraries/rte/rte_routines.lib.php index 0f8f75a815..9aa9f69fa7 100644 --- a/libraries/rte/rte_routines.lib.php +++ b/libraries/rte/rte_routines.lib.php @@ -1578,7 +1578,7 @@ function PMA_RTN_getExecuteForm($routine) // Create the output $retval = ""; $retval .= "\n\n"; - $retval .= "
\n"; + $retval .= "\n"; $retval .= " Date: Wed, 12 Feb 2014 11:57:41 +0100 Subject: [PATCH 2/4] Translated using Weblate (Dutch) Currently translated at 100.0% (2749 of 2749) --- po/nl.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/po/nl.po b/po/nl.po index 7f02e8326e..d1a5f22b35 100644 --- a/po/nl.po +++ b/po/nl.po @@ -4,8 +4,8 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.1.6-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2014-01-19 08:19-0500\n" -"PO-Revision-Date: 2014-02-05 13:05+0200\n" -"Last-Translator: Dieter \n" +"PO-Revision-Date: 2014-02-12 11:57+0200\n" +"Last-Translator: Dieter Adriaenssens \n" "Language-Team: Dutch \n" "Language: nl\n" "MIME-Version: 1.0\n" @@ -4437,7 +4437,7 @@ msgstr "" #: libraries/config/messages.inc.php:20 msgid "Allow third party framing" -msgstr "Framing van derden toestaan" +msgstr "Frames van derden toestaan" #: libraries/config/messages.inc.php:21 msgid "Show "Drop database" link to normal users" From fdaa3d4a8db5bff4fc3c5b3f8acf937aa184cf1c Mon Sep 17 00:00:00 2001 From: Anders Jonsson Date: Wed, 12 Feb 2014 10:14:05 +0100 Subject: [PATCH 3/4] Translated using Weblate (Swedish) Currently translated at 99.9% (2748 of 2749) --- po/sv.po | 68 +++++++++++++++++++++----------------------------------- 1 file changed, 25 insertions(+), 43 deletions(-) diff --git a/po/sv.po b/po/sv.po index 564eb98e9c..dd0770f900 100644 --- a/po/sv.po +++ b/po/sv.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.1.6-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2014-01-19 08:19-0500\n" -"PO-Revision-Date: 2014-02-11 10:20+0200\n" +"PO-Revision-Date: 2014-02-12 10:14+0200\n" "Last-Translator: Anders Jonsson \n" "Language-Team: Swedish \n" "Language: sv\n" @@ -1559,7 +1559,7 @@ msgstr "Laddar…" #: js/messages.php:230 msgid "Request Aborted!!" -msgstr "" +msgstr "Förfrågan avbruten!!" #: js/messages.php:231 msgid "Processing Request" @@ -1976,14 +1976,13 @@ msgid "Hide Panel" msgstr "Dölj Panel" #: js/messages.php:395 -#, fuzzy #| msgid "Show logo in navigation panel" msgid "Show hidden navigation tree items" -msgstr "Visa logotypen i navigeringspanelen" +msgstr "Visa dolda navigationsträdsobjekt" #: js/messages.php:398 msgid "The requested page was not found in the history, it may have expired." -msgstr "Den begärda sidan hittades inte i historien, kan det ha upphört." +msgstr "Den begärda sidan hittades inte i historien, den kan ha upphört." #: js/messages.php:401 setup/lib/index.lib.php:157 #, php-format @@ -2865,7 +2864,7 @@ msgstr "Kan inte läsa (flyttad) uppladdad fil." #: libraries/Footer.class.php:74 #, php-format msgid "Currently running Git revision %1$s from the %2$s branch." -msgstr "" +msgstr "Kör nu Git version %1$s fron grenen %2$s." #: libraries/Footer.class.php:81 #| msgid "Version information" @@ -6205,10 +6204,9 @@ msgstr "" "[kbd]pma__users[/kbd]" #: libraries/config/messages.inc.php:456 -#, fuzzy #| msgid "Use Tables" msgid "Users table" -msgstr "Använd tabeller" +msgstr "Användartabell" #: libraries/config/messages.inc.php:457 #| msgid "" @@ -6222,13 +6220,11 @@ msgstr "" "[kbd]pma__usergroups[/kbd]" #: libraries/config/messages.inc.php:458 -#, fuzzy #| msgid "Use Host Table" msgid "User groups table" -msgstr "Använd värdtabell" +msgstr "Användargruppstabell" #: libraries/config/messages.inc.php:459 -#, fuzzy #| msgid "" #| "Leave blank for no user preferences storage in database, suggested: [kbd]" #| "pma__userconfig[/kbd]" @@ -6236,12 +6232,12 @@ msgid "" "Leave blank to disable the feature to hide and show navigation items, " "suggested: [kbd]pma__navigationhiding[/kbd]" msgstr "" -"Lämna tomt för att stänga av lagring av användarpreferenser i databasen, " -"förslag: [kbd]pma__userconfig[/kbd]" +"Lämna tomt för att stänga av funktionen att dölja och visa " +"navigationsobjekt, förslag: [kbd]pma__navigationhiding[/kbd]" #: libraries/config/messages.inc.php:460 msgid "Hidden navigation items table" -msgstr "" +msgstr "Tabell för dolda navigationsobjekt" #: libraries/config/messages.inc.php:462 msgid "User for config auth" @@ -7854,7 +7850,7 @@ msgstr[1] "%s andra resultat hittade" #: libraries/navigation/NavigationTree.class.php:828 msgid "Expand/Collapse" -msgstr "" +msgstr "Expandera/Vik ihop" #: libraries/navigation/NavigationTree.class.php:1044 #| msgid "filter databases by name" @@ -7900,10 +7896,9 @@ msgid "Database operations" msgstr "Databasoperationer" #: libraries/navigation/Nodes/Node_Database.class.php:318 -#, fuzzy #| msgid "Show hint" msgid "Show hidden items" -msgstr "Visa tips" +msgstr "Visa dolda objekt" #: libraries/navigation/Nodes/Node_Database_Container.class.php:31 #| msgctxt "Create new column" @@ -8973,10 +8968,9 @@ msgid "Configurable menus" msgstr "Anpassningsbara menyer" #: libraries/relation.lib.php:279 -#, fuzzy #| msgid "Reload navigation frame" msgid "Hide/show navigation items" -msgstr "Ladda om navigeringsram" +msgstr "Visa/dölj navigationsobjekt" #: libraries/relation.lib.php:285 msgid "Quick steps to setup advanced features:" @@ -9291,40 +9285,34 @@ msgid "Generate Password:" msgstr "Generera lösenord:" #: libraries/replication_gui.lib.php:908 -#, fuzzy #| msgid "Replication status" msgid "Replication started successfully." -msgstr "Replikeringsstatus" +msgstr "Replikering startade framgångsrikt." #: libraries/replication_gui.lib.php:909 -#, fuzzy #| msgid "Master replication" msgid "Error starting replication." -msgstr "Master-replikering" +msgstr "Fel vid start av replikering." #: libraries/replication_gui.lib.php:913 -#, fuzzy #| msgid "Chart generated successfully." msgid "Replication stopped successfully." -msgstr "Diagram skapadesframgångsrikt." +msgstr "Replikering stoppades framgångsrikt." #: libraries/replication_gui.lib.php:914 -#, fuzzy #| msgid "Master replication" msgid "Error stopping replication." -msgstr "Master-replikering" +msgstr "Fel vid stoppande av replikering." #: libraries/replication_gui.lib.php:918 -#, fuzzy #| msgid "Replication status" msgid "Replication resetting successfully." -msgstr "Replikeringsstatus" +msgstr "Replikering återställdes framgångsrikt." #: libraries/replication_gui.lib.php:919 -#, fuzzy #| msgid "Master replication" msgid "Error resetting replication." -msgstr "Master-replikering" +msgstr "Fel vid återställning av replikering." #: libraries/replication_gui.lib.php:923 msgid "Success." @@ -11580,22 +11568,19 @@ msgid "User groups" msgstr "Användargrupper" #: libraries/server_user_groups.lib.php:79 -#, fuzzy #| msgid "Server version" msgid "Server level tabs" -msgstr "Serverversion" +msgstr "Flikar på servernivå" #: libraries/server_user_groups.lib.php:80 -#, fuzzy #| msgid "Database server" msgid "Database level tabs" -msgstr "Databas-server" +msgstr "Flikar på databasnivå" #: libraries/server_user_groups.lib.php:81 -#, fuzzy #| msgid "Table comments" msgid "Table level tabs" -msgstr "Tabellkommentarer" +msgstr "Flikar på tabellnivå" #: libraries/server_user_groups.lib.php:110 #| msgid "Views" @@ -11625,22 +11610,19 @@ msgid "Group name:" msgstr "Gruppnamn:" #: libraries/server_user_groups.lib.php:268 -#, fuzzy #| msgid "Server version" msgid "Server-level tabs" -msgstr "Serverversion" +msgstr "Flikar på servernivå" #: libraries/server_user_groups.lib.php:271 -#, fuzzy #| msgid "Database server" msgid "Database-level tabs" -msgstr "Databas-server" +msgstr "Flikar på databasnivå" #: libraries/server_user_groups.lib.php:274 -#, fuzzy #| msgid "Table comments" msgid "Table-level tabs" -msgstr "Tabellkommentarer" +msgstr "Flikar på tabellnivå" #: libraries/server_variables.lib.php:114 msgid "Setting variable failed" From cea635925e671ff4fcedb39054c677da01b123d2 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Wed, 12 Feb 2014 08:13:17 -0500 Subject: [PATCH 4/4] ChangeLog entry for fix of bug #4053 Signed-off-by: Marc Delisle --- ChangeLog | 1 + 1 file changed, 1 insertion(+) diff --git a/ChangeLog b/ChangeLog index e60809eba0..1e69abed3f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,7 @@ phpMyAdmin - ChangeLog - bug #4276 Login loop on session expiry - bug #4249 Incorrect number of result rows for SQL with subqueries - bug #4275 Broken Link to php extension manual +- bug #4053 List of procedures is not displayed after executing with Enter 4.1.7.0 (2014-02-09) - bug #4245 initial Browse query does not match sorting order