From e7914252551669dae6acb5002f02d6624ecebf8b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=ADas=20Bellone?= Date: Wed, 22 Aug 2012 15:15:52 +0200 Subject: [PATCH 1/4] Translated using Weblate. --- po/es.po | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/po/es.po b/po/es.po index 41f27eb617..c5b5bff8e0 100644 --- a/po/es.po +++ b/po/es.po @@ -4,15 +4,15 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.3-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2012-08-22 06:32-0400\n" -"PO-Revision-Date: 2012-06-03 22:21+0200\n" +"PO-Revision-Date: 2012-08-22 15:15+0200\n" "Last-Translator: Matías Bellone \n" -"Language-Team: spanish \n" +"Language-Team: Spanish \n" +"Language: es\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: es\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Weblate 1.0\n" +"X-Generator: Weblate 1.2\n" #: browse_foreigners.php:35 browse_foreigners.php:53 js/messages.php:353 #: libraries/display_tbl.lib.php:359 server_privileges.php:1679 @@ -8682,7 +8682,6 @@ msgstr "" "de caracteres sin la extensión mbstring y podría dar resultados inesperados." #: main.php:292 -#, fuzzy #| msgid "" #| "Your PHP parameter [a@http://php.net/manual/en/session.configuration." #| "php#ini.session.gc-maxlifetime@_blank]session.gc_maxlifetime[/a] is lower " @@ -8694,10 +8693,11 @@ msgid "" "cookie validity configured in phpMyAdmin, because of this, your login will " "expire sooner than configured in phpMyAdmin." msgstr "" -"El parámetro [a@http://php.net/manual/en/session.configuration.php#ini." -"session.gc-maxlifetime@_blank]session.gc_maxlifetime[/a] es menor que la " -"validez de la cookie configurada en phpMyAdmin. Por ello, la sesión expirará " -"antes de lo configurado en phpMyAdmin." +"El parámetro " +"[a@http://php.net/manual/en/session.configuration.php#ini.session.gc-" +"maxlifetime@_blank]session.gc_maxlifetime[/a] es menor que la validez de la " +"cookie configurada en phpMyAdmin. Por ello, la sesión expirará antes de lo " +"configurado en phpMyAdmin." #: main.php:299 msgid "" @@ -9868,10 +9868,9 @@ msgid "Advisor" msgstr "Consejero" #: server_status.php:807 server_status.php:833 -#, fuzzy #| msgid "Number of rows:" msgid "Number of data points: " -msgstr "Número de filas:" +msgstr "Cantidad de datos: " #: server_status.php:811 server_status.php:837 msgid "Refresh rate: " From 822064203732c63e0ff4fe59ca9d50f778a50801 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Wed, 22 Aug 2012 16:10:45 +0200 Subject: [PATCH 2/4] Translated using Weblate. --- po/fr.po | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/po/fr.po b/po/fr.po index 64aec6bf4b..5741ed9ec9 100644 --- a/po/fr.po +++ b/po/fr.po @@ -4,15 +4,15 @@ msgstr "" "Project-Id-Version: phpMyAdmin-docs 3.5.1-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2012-08-22 06:32-0400\n" -"PO-Revision-Date: 2012-06-20 18:40+0200\n" +"PO-Revision-Date: 2012-08-22 16:10+0200\n" "Last-Translator: Marc Delisle \n" -"Language-Team: none\n" +"Language-Team: French \n" +"Language: fr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: fr\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -"X-Generator: Weblate 1.0\n" +"X-Generator: Weblate 1.2\n" #: browse_foreigners.php:35 browse_foreigners.php:53 js/messages.php:353 #: libraries/display_tbl.lib.php:359 server_privileges.php:1679 @@ -8619,7 +8619,6 @@ msgstr "" "résulter des problèmes." #: main.php:292 -#, fuzzy #| msgid "" #| "Your PHP parameter [a@http://php.net/manual/en/session.configuration." #| "php#ini.session.gc-maxlifetime@_blank]session.gc_maxlifetime[/a] is lower " @@ -8631,10 +8630,11 @@ msgid "" "cookie validity configured in phpMyAdmin, because of this, your login will " "expire sooner than configured in phpMyAdmin." msgstr "" -"La valeur du paramètre PHP [a@http://php.net/manual/fr/session.configuration." -"php#ini.session.gc-maxlifetime@_blank]session.gc_maxlifetime[/a] est plus " -"petite que la durée du cookie configurée dans phpMyAdmin; donc, votre " -"session de travail expirera plus tôt." +"La valeur du paramètre PHP " +"[a@http://php.net/manual/fr/session.configuration.php#ini.session.gc-" +"maxlifetime@_blank]session.gc_maxlifetime[/a] est plus petite que la durée " +"du cookie configurée dans phpMyAdmin; donc, votre session de travail " +"expirera plus tôt." #: main.php:299 msgid "" @@ -9799,10 +9799,9 @@ msgid "Advisor" msgstr "Conseiller" #: server_status.php:807 server_status.php:833 -#, fuzzy #| msgid "Number of rows:" msgid "Number of data points: " -msgstr "Nombre de lignes : " +msgstr "Nombre de points : " #: server_status.php:811 server_status.php:837 msgid "Refresh rate: " From bfb76fd967870a05fb422220c0c5bc02b18ff9fe Mon Sep 17 00:00:00 2001 From: Burak Yavuz Date: Wed, 22 Aug 2012 18:44:28 +0200 Subject: [PATCH 3/4] Translated using Weblate. --- po/tr.po | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/po/tr.po b/po/tr.po index 590d85500b..dac40f26d7 100644 --- a/po/tr.po +++ b/po/tr.po @@ -4,13 +4,13 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.3-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2012-08-22 06:32-0400\n" -"PO-Revision-Date: 2012-08-03 20:24+0200\n" +"PO-Revision-Date: 2012-08-22 18:52+0200\n" "Last-Translator: Burak Yavuz \n" "Language-Team: Turkish \n" +"Language: tr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: tr\n" "Plural-Forms: nplurals=1; plural=0;\n" "X-Generator: Weblate 1.2\n" @@ -8584,7 +8584,6 @@ msgstr "" "olarak bölemez ve bu beklenmedik sonuçlar doğurabilir." #: main.php:292 -#, fuzzy #| msgid "" #| "Your PHP parameter [a@http://php.net/manual/en/session.configuration." #| "php#ini.session.gc-maxlifetime@_blank]session.gc_maxlifetime[/a] is lower " @@ -8596,10 +8595,10 @@ msgid "" "cookie validity configured in phpMyAdmin, because of this, your login will " "expire sooner than configured in phpMyAdmin." msgstr "" -"phpMyAdmin içinde yapılandırılmış tanımlama bilgisi geçerliliği PHP " -"parametreleriniz [a@http://php.net/manual/en/session.configuration.php#ini." -"session.gc-maxlifetime@_blank]session.gc_maxlifetime[/a] düşük, bundan " -"dolayı oturum açmanızın süresi phpMyAdmin içinde yapılandırılmadıkça " +"phpMyAdmin içinde yapılandırılmış tanımlama bilgisi geçerliliği, " +"[a@http://php.net/manual/tr/session.configuration.php#ini.session.gc-" +"maxlifetime@_blank]session.gc_maxlifetime[/a] PHP parametrenizden düşük, " +"bundan dolayı phpMyAdmin içinde yapılandırılmadıkça oturum açmanızın süresi " "dolacaktır." #: main.php:299 @@ -9745,10 +9744,9 @@ msgid "Advisor" msgstr "Danışman" #: server_status.php:807 server_status.php:833 -#, fuzzy #| msgid "Number of rows:" msgid "Number of data points: " -msgstr "Satır sayısı:" +msgstr "Veri noktası sayısı: " #: server_status.php:811 server_status.php:837 msgid "Refresh rate: " From 155b25a09412a05d273fae799b0c3e0fdf12bb5b Mon Sep 17 00:00:00 2001 From: Madhura Jayaratne Date: Sun, 26 Aug 2012 18:44:45 +0530 Subject: [PATCH 4/4] bug #3561224 [edit] cell edit date field with empty date fills in current date --- ChangeLog | 1 + js/makegrid.js | 9 ++++++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8800c15556..076c4bfcc6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -17,6 +17,7 @@ phpMyAdmin - ChangeLog - bug #3540922 [edit] Error searching table with many fields - bug #3555104 [edit] Cannot copy a DB with table & views - bug #3559925 [privileges] Incorrect updating of the list of users +- bug #3561224 [edit] cell edit date field with empty date fills in current date 3.5.2.2 (2012-08-12) - [security] Fixed XSS vulnerabilities, see PMASA-2012-4 diff --git a/js/makegrid.js b/js/makegrid.js index 6355305aa1..cae77e318d 100644 --- a/js/makegrid.js +++ b/js/makegrid.js @@ -970,10 +970,13 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi // force to restore modified $input_field value after adding datepicker // (after adding a datepicker, the input field doesn't display the time anymore, only the date) - if (!is_null) { - $editArea.datetimepicker('setDate', current_datetime_value); + if (is_null + || current_datetime_value == '0000-00-00' + || current_datetime_value == '0000-00-00 00:00:00' + ) { + $input_field.val(current_datetime_value); } else { - $input_field.val(''); + $editArea.datetimepicker('setDate', current_datetime_value); } $editArea.append('
' + g.cellEditHint + '
');