From 4d72c7b43d82a560df50409bb09f67a9095b864c Mon Sep 17 00:00:00 2001 From: Rouslan Placella Date: Fri, 7 Dec 2012 11:38:30 +0000 Subject: [PATCH 1/7] Proxy ajax calls to pma.net to avoid browser notices --- js/functions.js | 38 ++++++++++++++++++++++---------------- version_check.php | 16 ++++++++++++++++ 2 files changed, 38 insertions(+), 16 deletions(-) create mode 100644 version_check.php diff --git a/js/functions.js b/js/functions.js index 6d8a9dcb21..c748d70aee 100644 --- a/js/functions.js +++ b/js/functions.js @@ -130,23 +130,29 @@ function parseVersionString (str) */ function PMA_current_version(data) { - var current = parseVersionString(pmaversion); - var latest = parseVersionString(data['version']); - var version_information_message = PMA_messages['strLatestAvailable'] + ' ' + escapeHtml(data['version']); - if (latest > current) { - var message = $.sprintf(PMA_messages['strNewerVersion'], escapeHtml(data['version']), escapeHtml(data['date'])); - if (Math.floor(latest / 10000) == Math.floor(current / 10000)) { - /* Security update */ - klass = 'error'; - } else { - klass = 'notice'; + if (data && data.version && data.date) { + var current = parseVersionString(pmaversion); + var latest = parseVersionString(data['version']); + var version_information_message = PMA_messages['strLatestAvailable'] + ' ' + escapeHtml(data['version']); + if (latest > current) { + var message = $.sprintf( + PMA_messages['strNewerVersion'], + escapeHtml(data['version']), + escapeHtml(data['date']) + ); + if (Math.floor(latest / 10000) === Math.floor(current / 10000)) { + /* Security update */ + klass = 'error'; + } else { + klass = 'notice'; + } + $('#maincontainer').after('
' + message + '
'); } - $('#maincontainer').after('
' + message + '
'); + if (latest === current) { + version_information_message = ' (' + PMA_messages['strUpToDate'] + ')'; + } + $('#li_pma_version').append(version_information_message); } - if (latest == current) { - version_information_message = ' (' + PMA_messages['strUpToDate'] + ')'; - } - $('#li_pma_version').append(version_information_message); } /** @@ -3034,7 +3040,7 @@ $(document).ready(function() { * Load version information asynchronously. */ if ($('.jsversioncheck').length > 0) { - $.getJSON('http://www.phpmyadmin.net/home_page/version.json', {}, PMA_current_version); + $.getJSON('version_check.php', {}, PMA_current_version); } /** diff --git a/version_check.php b/version_check.php new file mode 100644 index 0000000000..d893b9daaf --- /dev/null +++ b/version_check.php @@ -0,0 +1,16 @@ + From ea285702dd4f82a37cd4651f5ad4f83e06e8ad44 Mon Sep 17 00:00:00 2001 From: Genti Ereqi Date: Tue, 4 Dec 2012 11:37:53 +0100 Subject: [PATCH 2/7] Translated using Weblate (Albanian) Currently translated at 30.4% (779 of 2562) --- po/sq.po | 66 +++++++++++++++++++++++++++----------------------------- 1 file changed, 32 insertions(+), 34 deletions(-) diff --git a/po/sq.po b/po/sq.po index 4dffd64bae..925c7bec83 100644 --- a/po/sq.po +++ b/po/sq.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.4-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2012-10-16 14:37+0200\n" -"PO-Revision-Date: 2012-11-24 13:37+0200\n" +"PO-Revision-Date: 2012-12-04 11:37+0200\n" "Last-Translator: Genti Ereqi \n" "Language-Team: Albanian \n" "Language: sq\n" @@ -2956,7 +2956,7 @@ msgstr "Madhësia maksimum: %s%s" #: libraries/sql_query_form.lib.php:392 libraries/sql_query_form.lib.php:395 #: main.php:237 server_variables.php:129 msgid "Documentation" -msgstr "Dokumentet" +msgstr "Dokumentacioni" #: libraries/common.lib.php:622 libraries/header_printview.inc.php:63 #: server_status.php:591 server_status.php:1257 @@ -3310,7 +3310,7 @@ msgstr "" #: libraries/config/FormDisplay.tpl.php:141 main.php:238 msgid "Wiki" -msgstr "" +msgstr "Wiki" #: libraries/config/FormDisplay.tpl.php:199 msgid "This setting is disabled, it will not be applied to your configuration" @@ -6054,9 +6054,8 @@ msgid "Link not found" msgstr "Lidhja nuk u gjet" #: libraries/engines/bdb.lib.php:20 main.php:236 -#, fuzzy msgid "Version information" -msgstr "Informacione mbi Identifikimin" +msgstr "Informacione mbi versionin" #: libraries/engines/innodb.lib.php:20 msgid "Data home directory" @@ -8523,46 +8522,41 @@ msgid "Error in ZIP archive:" msgstr "" #: main.php:65 -#, fuzzy #| msgid "General relation features" msgid "General Settings" -msgstr "Karakteristikat e përgjithshme të relacionit" +msgstr "Karakteristikat e përgjithshme" #: main.php:109 -#, fuzzy #| msgid "MySQL connection collation" msgid "Server connection collation" msgstr "Vendosja e lidhjes MySQL" #: main.php:124 msgid "Appearance Settings" -msgstr "" +msgstr "Parametrat e Pamjes" #: main.php:153 prefs_manage.php:272 -#, fuzzy #| msgid "General relation features" msgid "More settings" -msgstr "Karakteristikat e përgjithshme të relacionit" +msgstr "Karakteristika të mëtejshme" #: main.php:169 -#, fuzzy #| msgid "Databases" msgid "Database server" -msgstr "Databazat" +msgstr "Serveri i Bazës së të Dhënave" #: main.php:172 msgid "Software" -msgstr "" +msgstr "Software" #: main.php:173 -#, fuzzy #| msgid "Server version" msgid "Software version" -msgstr "Versioni i MySQL" +msgstr "Versioni i software" #: main.php:175 msgid "Protocol version" -msgstr "" +msgstr "Versioni i protokollit" #: main.php:179 server_privileges.php:1547 server_privileges.php:1702 #: server_privileges.php:1826 server_privileges.php:2256 @@ -8571,48 +8565,43 @@ msgid "User" msgstr "Përdorues" #: main.php:184 -#, fuzzy msgid "Server charset" -msgstr "Zgjedhja e serverit" +msgstr "Kodifikimi karaktereve te server" #: main.php:196 msgid "Web server" -msgstr "" +msgstr "Serveri web" #: main.php:209 -#, fuzzy #| msgid "Database comment: " msgid "Database client version" -msgstr "Komenti për databazën: " +msgstr "Versioni i klientit të bazës së të dhënave" #: main.php:213 -#, fuzzy msgid "PHP extension" -msgstr "Versioni i PHP" +msgstr "Shtesa PHP" #: main.php:221 msgid "Show PHP information" -msgstr "Trego info mbi PHP" +msgstr "Afisho informacion mbi PHP" #: main.php:241 msgid "Official Homepage" msgstr "Faqja zyrtare e phpMyAdmin" #: main.php:242 -#, fuzzy #| msgid "Attributes" msgid "Contribute" -msgstr "Pronësi" +msgstr "Kontribuoni" #: main.php:243 msgid "Get support" -msgstr "" +msgstr "Merrni ndihmë" #: main.php:244 -#, fuzzy #| msgid "No change" msgid "List of changes" -msgstr "Asnjë ndryshim" +msgstr "Lista e ndryshimeve" #: main.php:268 msgid "" @@ -8657,7 +8646,8 @@ msgstr "" #: main.php:307 msgid "The configuration file now needs a secret passphrase (blowfish_secret)." msgstr "" -"Tani nevoitet një fjalëkalim sekret për file e konfigurimit(blowfish_secret)." +"Tani nevojitet një fjalëkalim sekret për skedarin e " +"konfigurimit(blowfish_secret)." #: main.php:315 msgid "" @@ -8665,9 +8655,12 @@ msgid "" "exists in your phpMyAdmin directory. You should remove it once phpMyAdmin " "has been configured." msgstr "" +"Dosja [code]config[/code], e cila përdoret nga skripti i instalimit, " +"ekziston akoma në dosjen tuaj të phpMyAdmin. Ju këshillojmë që ta hiqni pasi " +"të keni konfiguruar phpMyAdmin." #: main.php:321 -#, fuzzy, php-format +#, php-format #| msgid "" #| " additional features for working with linked tables have been ctivated. " #| "To find out why click %shere%s." @@ -8675,8 +8668,9 @@ msgid "" "The phpMyAdmin configuration storage is not completely configured, some " "extended features have been deactivated. To find out why click %shere%s." msgstr "" -"Karakteristikat shtesë janë çaktivizuar për sa i takon funksionimit me " -"tabelat e lidhura. Për të kuptuar përse, klikoni %skëtu%s." +"Konfigurimi i depos së phpMyAdmin nuk është kryer plotësisht, prandaj disa " +"nga karakteristikat shtesë janë ç'aktivizuar. Për të kuptuar përse, klikoni " +"%skëtu%s." #: main.php:336 msgid "" @@ -8691,6 +8685,8 @@ msgid "" "Your PHP MySQL library version %s differs from your MySQL server version %s. " "This may cause unpredictable behavior." msgstr "" +"Libraria juaj e PHP për MySQL me version %s janë të ndryshme nga versioni i " +"serverit MySQL %s. Kjo mund të shkaktoje sjellje të paparashikueshme." #: main.php:378 #, php-format @@ -8698,6 +8694,8 @@ msgid "" "Server running with Suhosin. Please refer to %sdocumentation%s for possible " "issues." msgstr "" +"Serveri është në gjendje ekzekutimi Suhosin. Referojuni %sdokumentacionit%s " +"për probleme të mundshme." #: navigation.php:182 server_databases.php:284 server_synchronize.php:1294 msgid "No databases" From 74997662a3508bad7ad5762ab0c79918d7805e16 Mon Sep 17 00:00:00 2001 From: Roger Pueyo Centelles Date: Tue, 4 Dec 2012 16:09:12 +0100 Subject: [PATCH 3/7] Translated using Weblate (Catalan) Currently translated at 99.9% (2560 of 2562) --- po/ca.po | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/po/ca.po b/po/ca.po index 86130a4bfa..1dd7229f0f 100644 --- a/po/ca.po +++ b/po/ca.po @@ -4,15 +4,15 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.4-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2012-10-16 14:37+0200\n" -"PO-Revision-Date: 2012-11-05 10:27+0200\n" -"Last-Translator: Michal Čihař \n" +"PO-Revision-Date: 2012-12-04 16:09+0200\n" +"Last-Translator: Roger Pueyo Centelles \n" "Language-Team: Catalan \n" "Language: ca\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Weblate 1.3-dev\n" +"X-Generator: Weblate 1.4-dev\n" #: browse_foreigners.php:35 browse_foreigners.php:53 js/messages.php:353 #: libraries/display_tbl.lib.php:359 server_privileges.php:1679 @@ -5661,12 +5661,12 @@ msgstr "Exportant bases de dades des del servidor actual" #: libraries/display_export.lib.php:84 #, php-format msgid "Exporting tables from \"%s\" database" -msgstr "Crear una taula nova a la base de dades \"%s\"" +msgstr "Exportar les taules de la base de dades \"%s\"" #: libraries/display_export.lib.php:86 #, php-format msgid "Exporting rows from \"%s\" table" -msgstr "Crear una taula nova a la base de dades \"%s\"" +msgstr "Exportar les files de la taula \"%s\"" #: libraries/display_export.lib.php:92 msgid "Export Method:" From d1d40990a0d03d88e50dd7f37d29879e9b0c2833 Mon Sep 17 00:00:00 2001 From: dansaania bro Date: Thu, 6 Dec 2012 19:34:56 +0100 Subject: [PATCH 4/7] Translated using Weblate (Finnish) Currently translated at 74.2% (1900 of 2562) --- po/fi.po | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/po/fi.po b/po/fi.po index 4f176c888d..1efc5448ed 100644 --- a/po/fi.po +++ b/po/fi.po @@ -4,8 +4,8 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.4-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2012-10-16 14:37+0200\n" -"PO-Revision-Date: 2012-11-21 15:54+0200\n" -"Last-Translator: Michal Čihař \n" +"PO-Revision-Date: 2012-12-06 19:34+0200\n" +"Last-Translator: dansaania bro \n" "Language-Team: Finnish \n" "Language: fi\n" "MIME-Version: 1.0\n" @@ -4358,7 +4358,7 @@ msgstr "" #: libraries/config/messages.inc.php:318 msgid "mcrypt warning" -msgstr "" +msgstr "mcrypt varoitus" #: libraries/config/messages.inc.php:319 msgid "" @@ -4527,7 +4527,7 @@ msgstr "" #: libraries/config/messages.inc.php:359 msgid "Save all edited cells at once" -msgstr "" +msgstr "Tallenna kaikki muokatut solut kerralla" #: libraries/config/messages.inc.php:360 msgid "Directory where exports can be saved on server" @@ -13200,7 +13200,7 @@ msgstr "Jatkuvat yhteydet" #: po/advisory_rules.php:231 po/advisory_rules.php:236 msgid "Too many connections are aborted." -msgstr "" +msgstr "Liian monta yhtettä keskeytetty." #: po/advisory_rules.php:232 po/advisory_rules.php:237 msgid "" @@ -13262,7 +13262,7 @@ msgstr "" #: po/advisory_rules.php:250 msgid "Is InnoDB disabled?" -msgstr "" +msgstr "Onko InnoDB poistettu käytöstä?" #: po/advisory_rules.php:251 #, fuzzy From c2d21d88ca751135c704397b74e8f288685842f7 Mon Sep 17 00:00:00 2001 From: "J. M" Date: Wed, 5 Dec 2012 17:28:51 +0100 Subject: [PATCH 5/7] Translated using Weblate (German) Currently translated at 100.0% (2562 of 2562) --- po/de.po | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/po/de.po b/po/de.po index 1c7deb4492..146f0b9e33 100644 --- a/po/de.po +++ b/po/de.po @@ -4,7 +4,7 @@ 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-10-16 14:37+0200\n" -"PO-Revision-Date: 2012-09-11 14:29+0200\n" +"PO-Revision-Date: 2012-12-05 17:28+0200\n" "Last-Translator: J. M. \n" "Language-Team: German \n" "Language: de\n" @@ -12,7 +12,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Weblate 1.2\n" +"X-Generator: Weblate 1.4-dev\n" #: browse_foreigners.php:35 browse_foreigners.php:53 js/messages.php:353 #: libraries/display_tbl.lib.php:359 server_privileges.php:1679 @@ -5896,9 +5896,9 @@ msgid "" "to the PHP timeout limit. (This might be a good way to import large " "files, however it can break transactions.)" msgstr "" -"Abbruch, wenn die maximale PHP-Scriptlaufzeit erreicht wird. (Damit ist " -"es möglich, große Dateien zu importieren, allerdings kann es Transaktionen " -"zerstören.)" +"Import abbrechen, wenn die maximale PHP-Scriptlaufzeit erreicht wird. " +"(Damit ist es möglich, große Dateien zu importieren, allerdings kann es " +"Transaktionen zerstören.)" #: libraries/display_import.lib.php:228 msgid "Number of rows to skip, starting from the first row:" From a581c38b6aa36bfdfa742a2163d7716914ff6314 Mon Sep 17 00:00:00 2001 From: Stefan Ionut Date: Wed, 5 Dec 2012 00:02:04 +0100 Subject: [PATCH 6/7] Translated using Weblate (Romanian) Currently translated at 59.3% (1519 of 2562) --- po/ro.po | 27 +++++++++++---------------- 1 file changed, 11 insertions(+), 16 deletions(-) diff --git a/po/ro.po b/po/ro.po index dead688060..6546d1c30e 100644 --- a/po/ro.po +++ b/po/ro.po @@ -4,8 +4,8 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.4-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2012-10-16 14:37+0200\n" -"PO-Revision-Date: 2012-11-05 09:56+0200\n" -"Last-Translator: Michal Čihař \n" +"PO-Revision-Date: 2012-12-05 00:02+0200\n" +"Last-Translator: Stefan Ionut \n" "Language-Team: Romanian \n" "Language: ro\n" "MIME-Version: 1.0\n" @@ -13,7 +13,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < " "20)) ? 1 : 2);;\n" -"X-Generator: Weblate 1.3-dev\n" +"X-Generator: Weblate 1.4-dev\n" #: browse_foreigners.php:35 browse_foreigners.php:53 js/messages.php:353 #: libraries/display_tbl.lib.php:359 server_privileges.php:1679 @@ -408,7 +408,7 @@ msgstr "Ultima verficare" #, php-format msgid "%s table" msgid_plural "%s tables" -msgstr[0] "%s tabelă" +msgstr[0] "%s tabel" msgstr[1] "%s tabele" msgstr[2] "%s tabele" @@ -789,7 +789,6 @@ msgid "Delete tracking data for this table" msgstr "Șterge datele urmărite din acest tabel" #: db_tracking.php:120 tbl_tracking.php:605 tbl_tracking.php:663 -#, fuzzy msgid "active" msgstr "activ(ă)" @@ -820,9 +819,8 @@ msgid "Track table" msgstr "Monitorizează tabel" #: db_tracking.php:227 -#, fuzzy msgid "Database Log" -msgstr "Jurnalul (log) bazei de date" +msgstr "Jurnalul bazei de date" #: enum_editor.php:23 js/messages.php:272 #: libraries/rte/rte_routines.lib.php:707 @@ -855,20 +853,18 @@ msgid "Copy and paste the joined values into the \"Length/Values\" field" msgstr "Copiază si lipește valorile unite în câmpul \"Lungime/Valori\"" #: export.php:29 -#, fuzzy #| msgid "Bar type" msgid "Bad type!" -msgstr "Tip interogare" +msgstr "Tipul este greșit!" #: export.php:77 msgid "Selected export type has to be saved in file!" msgstr "Tipul selectat pentru export trebuie salvat într-un fișier!" #: export.php:106 -#, fuzzy #| msgid "Routines" msgid "Bad parameters!" -msgstr "Rutine" +msgstr "Parametrii greșiţi!" #: export.php:166 export.php:191 export.php:652 #, php-format @@ -894,9 +890,8 @@ msgid "Dump has been saved to file %s." msgstr "Copia a fost salvată în fișierul %s." #: file_echo.php:21 -#, fuzzy msgid "Invalid export type" -msgstr "Modul de export" +msgstr "Modul de export este invalid" #: gis_data_editor.php:84 #, php-format @@ -909,12 +904,12 @@ msgstr "" #: gis_data_editor.php:134 msgid "SRID" -msgstr "" +msgstr "SRID" #: gis_data_editor.php:151 js/messages.php:326 #: libraries/display_tbl.lib.php:693 msgid "Geometry" -msgstr "" +msgstr "Geometrie" #: gis_data_editor.php:172 js/messages.php:322 msgid "Point" @@ -928,7 +923,7 @@ msgstr "" #: gis_data_editor.php:175 gis_data_editor.php:199 gis_data_editor.php:247 #: gis_data_editor.php:299 js/messages.php:321 msgid "Y" -msgstr "" +msgstr "Y" #: gis_data_editor.php:195 gis_data_editor.php:243 gis_data_editor.php:295 #: js/messages.php:323 From 7b802b89d75f546228f9caec7356449c63490703 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Fri, 7 Dec 2012 07:47:59 -0500 Subject: [PATCH 7/7] ChangeLog entry for "Proxy ajax calls to pma.net to avoid browser notices" --- ChangeLog | 1 + 1 file changed, 1 insertion(+) diff --git a/ChangeLog b/ChangeLog index 510aef6c24..5bda0a8857 100644 --- a/ChangeLog +++ b/ChangeLog @@ -8,6 +8,7 @@ phpMyAdmin - ChangeLog - bug #3585695 [CSS] Font size in inline query editor is way too big - bug #3588354 [l10n] Portuguese Language not displaying correctly - bug #3591412 [status] Live charts don't work for non-default server +- bug [core] Proxy ajax calls to pma.net to avoid browser notices 3.5.4.0 (2012-11-16) - bug #3570212 [edit] uuid_short() is a no-arguments function