From 1243d870e73f10dd161e8e08e94ccc92ca62edc0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Thu, 21 Jan 2010 11:10:33 +0000 Subject: [PATCH] rfe #2420684 [export] Allow export of timestamps in UTC. --- ChangeLog | 1 + lang/afrikaans-utf-8.inc.php | 1 + lang/albanian-utf-8.inc.php | 1 + lang/arabic-utf-8.inc.php | 1 + lang/azerbaijani-utf-8.inc.php | 1 + lang/bangla-utf-8.inc.php | 1 + lang/basque-utf-8.inc.php | 1 + lang/belarusian_cyrillic-utf-8.inc.php | 1 + lang/belarusian_latin-utf-8.inc.php | 1 + lang/bosnian-utf-8.inc.php | 1 + lang/brazilian_portuguese-utf-8.inc.php | 1 + lang/bulgarian-utf-8.inc.php | 1 + lang/catalan-utf-8.inc.php | 1 + lang/chinese_simplified-utf-8.inc.php | 1 + lang/chinese_traditional-utf-8.inc.php | 1 + lang/croatian-utf-8.inc.php | 1 + lang/czech-utf-8.inc.php | 1 + lang/danish-utf-8.inc.php | 1 + lang/dutch-utf-8.inc.php | 1 + lang/english-utf-8.inc.php | 1 + lang/estonian-utf-8.inc.php | 1 + lang/finnish-utf-8.inc.php | 1 + lang/french-utf-8.inc.php | 1 + lang/galician-utf-8.inc.php | 1 + lang/georgian-utf-8.inc.php | 1 + lang/german-utf-8.inc.php | 1 + lang/greek-utf-8.inc.php | 1 + lang/hebrew-utf-8.inc.php | 1 + lang/hindi-utf-8.inc.php | 1 + lang/hungarian-utf-8.inc.php | 1 + lang/indonesian-utf-8.inc.php | 1 + lang/italian-utf-8.inc.php | 1 + lang/japanese-utf-8.inc.php | 1 + lang/korean-utf-8.inc.php | 1 + lang/latvian-utf-8.inc.php | 1 + lang/lithuanian-utf-8.inc.php | 1 + lang/macedonian_cyrillic-utf-8.inc.php | 1 + lang/malay-utf-8.inc.php | 1 + lang/mongolian-utf-8.inc.php | 1 + lang/norwegian-utf-8.inc.php | 1 + lang/persian-utf-8.inc.php | 1 + lang/polish-utf-8.inc.php | 1 + lang/portuguese-utf-8.inc.php | 1 + lang/romanian-utf-8.inc.php | 1 + lang/russian-utf-8.inc.php | 1 + lang/serbian_cyrillic-utf-8.inc.php | 1 + lang/serbian_latin-utf-8.inc.php | 1 + lang/sinhala-utf-8.inc.php | 1 + lang/slovak-utf-8.inc.php | 1 + lang/slovenian-utf-8.inc.php | 1 + lang/spanish-utf-8.inc.php | 1 + lang/swedish-utf-8.inc.php | 1 + lang/tatarish-utf-8.inc.php | 1 + lang/thai-utf-8.inc.php | 1 + lang/turkish-utf-8.inc.php | 1 + lang/ukrainian-utf-8.inc.php | 1 + lang/uzbek_cyrillic-utf-8.inc.php | 1 + lang/uzbek_latin-utf-8.inc.php | 1 + libraries/config.default.php | 7 +++++++ libraries/export/sql.php | 15 +++++++++++++++ 60 files changed, 80 insertions(+) diff --git a/ChangeLog b/ChangeLog index 753bb0f89..6e1324437 100644 --- a/ChangeLog +++ b/ChangeLog @@ -13,6 +13,7 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA + rfe #2924956 [interface] Add insert ignore option to editing row. + rfe #2838080 [interface] Show warning when javascript is disabled. + rfe #2823707 [edit] Call UUID function separately to show it in insert. ++ rfe #2420684 [export] Allow export of timestamps in UTC. 3.3.0.0 (not yet released) + rfe #2308632 [edit] Use hex for (var)binary fields, diff --git a/lang/afrikaans-utf-8.inc.php b/lang/afrikaans-utf-8.inc.php index 801ef0f0e..9b64d9c08 100644 --- a/lang/afrikaans-utf-8.inc.php +++ b/lang/afrikaans-utf-8.inc.php @@ -1642,4 +1642,5 @@ $strDeleteTrackingData = 'Delete tracking data for this table'; //to translate $strRenameView = 'Rename view to'; //to translate $strInsertIgnoreAsNewRow = 'Insert as new row and ignore errors'; //to translate $strJavascriptDisabled = 'Javascript support is missing or disabled in your browser, some phpMyAdmin functionality will be missing. For example navigation frame will not refresh automatically.'; //to translate +$strSQLExportUTC = 'Export time in UTC'; //to translate ?> diff --git a/lang/albanian-utf-8.inc.php b/lang/albanian-utf-8.inc.php index 90ba7958c..34a670efb 100644 --- a/lang/albanian-utf-8.inc.php +++ b/lang/albanian-utf-8.inc.php @@ -1640,4 +1640,5 @@ $strDeleteTrackingData = 'Delete tracking data for this table'; //to translate $strRenameView = 'Rename view to'; //to translate $strInsertIgnoreAsNewRow = 'Insert as new row and ignore errors'; //to translate $strJavascriptDisabled = 'Javascript support is missing or disabled in your browser, some phpMyAdmin functionality will be missing. For example navigation frame will not refresh automatically.'; //to translate +$strSQLExportUTC = 'Export time in UTC'; //to translate ?> diff --git a/lang/arabic-utf-8.inc.php b/lang/arabic-utf-8.inc.php index d365bce9d..beb0bdea6 100644 --- a/lang/arabic-utf-8.inc.php +++ b/lang/arabic-utf-8.inc.php @@ -1644,4 +1644,5 @@ $strDeleteTrackingData = 'Delete tracking data for this table'; //to translate $strRenameView = 'Rename view to'; //to translate $strInsertIgnoreAsNewRow = 'Insert as new row and ignore errors'; //to translate $strJavascriptDisabled = 'Javascript support is missing or disabled in your browser, some phpMyAdmin functionality will be missing. For example navigation frame will not refresh automatically.'; //to translate +$strSQLExportUTC = 'Export time in UTC'; //to translate ?> diff --git a/lang/azerbaijani-utf-8.inc.php b/lang/azerbaijani-utf-8.inc.php index cb199ece0..d3ffd62a2 100644 --- a/lang/azerbaijani-utf-8.inc.php +++ b/lang/azerbaijani-utf-8.inc.php @@ -1639,4 +1639,5 @@ $strDeleteTrackingData = 'Delete tracking data for this table'; //to translate $strRenameView = 'Rename view to'; //to translate $strInsertIgnoreAsNewRow = 'Insert as new row and ignore errors'; //to translate $strJavascriptDisabled = 'Javascript support is missing or disabled in your browser, some phpMyAdmin functionality will be missing. For example navigation frame will not refresh automatically.'; //to translate +$strSQLExportUTC = 'Export time in UTC'; //to translate ?> diff --git a/lang/bangla-utf-8.inc.php b/lang/bangla-utf-8.inc.php index d61137bb2..60fad4362 100644 --- a/lang/bangla-utf-8.inc.php +++ b/lang/bangla-utf-8.inc.php @@ -1641,4 +1641,5 @@ $strDeleteTrackingData = 'Delete tracking data for this table'; //to translate $strRenameView = 'Rename view to'; //to translate $strInsertIgnoreAsNewRow = 'Insert as new row and ignore errors'; //to translate $strJavascriptDisabled = 'Javascript support is missing or disabled in your browser, some phpMyAdmin functionality will be missing. For example navigation frame will not refresh automatically.'; //to translate +$strSQLExportUTC = 'Export time in UTC'; //to translate ?> diff --git a/lang/basque-utf-8.inc.php b/lang/basque-utf-8.inc.php index b033f6970..5fc606f2d 100644 --- a/lang/basque-utf-8.inc.php +++ b/lang/basque-utf-8.inc.php @@ -1636,4 +1636,5 @@ $strDeleteTrackingData = 'Delete tracking data for this table'; //to translate $strRenameView = 'Rename view to'; //to translate $strInsertIgnoreAsNewRow = 'Insert as new row and ignore errors'; //to translate $strJavascriptDisabled = 'Javascript support is missing or disabled in your browser, some phpMyAdmin functionality will be missing. For example navigation frame will not refresh automatically.'; //to translate +$strSQLExportUTC = 'Export time in UTC'; //to translate ?> diff --git a/lang/belarusian_cyrillic-utf-8.inc.php b/lang/belarusian_cyrillic-utf-8.inc.php index 246b5ba9b..7527b488d 100644 --- a/lang/belarusian_cyrillic-utf-8.inc.php +++ b/lang/belarusian_cyrillic-utf-8.inc.php @@ -1636,4 +1636,5 @@ $strDeleteTrackingData = 'Delete tracking data for this table'; //to translate $strRenameView = 'Rename view to'; //to translate $strInsertIgnoreAsNewRow = 'Insert as new row and ignore errors'; //to translate $strJavascriptDisabled = 'Javascript support is missing or disabled in your browser, some phpMyAdmin functionality will be missing. For example navigation frame will not refresh automatically.'; //to translate +$strSQLExportUTC = 'Export time in UTC'; //to translate ?> diff --git a/lang/belarusian_latin-utf-8.inc.php b/lang/belarusian_latin-utf-8.inc.php index 46aeb1672..43a04ce21 100644 --- a/lang/belarusian_latin-utf-8.inc.php +++ b/lang/belarusian_latin-utf-8.inc.php @@ -1648,4 +1648,5 @@ $strDeleteTrackingData = 'Delete tracking data for this table'; //to translate $strRenameView = 'Rename view to'; //to translate $strInsertIgnoreAsNewRow = 'Insert as new row and ignore errors'; //to translate $strJavascriptDisabled = 'Javascript support is missing or disabled in your browser, some phpMyAdmin functionality will be missing. For example navigation frame will not refresh automatically.'; //to translate +$strSQLExportUTC = 'Export time in UTC'; //to translate ?> diff --git a/lang/bosnian-utf-8.inc.php b/lang/bosnian-utf-8.inc.php index 67df6763f..54ff9690c 100644 --- a/lang/bosnian-utf-8.inc.php +++ b/lang/bosnian-utf-8.inc.php @@ -1642,4 +1642,5 @@ $strDeleteTrackingData = 'Delete tracking data for this table'; //to translate $strRenameView = 'Rename view to'; //to translate $strInsertIgnoreAsNewRow = 'Insert as new row and ignore errors'; //to translate $strJavascriptDisabled = 'Javascript support is missing or disabled in your browser, some phpMyAdmin functionality will be missing. For example navigation frame will not refresh automatically.'; //to translate +$strSQLExportUTC = 'Export time in UTC'; //to translate ?> diff --git a/lang/brazilian_portuguese-utf-8.inc.php b/lang/brazilian_portuguese-utf-8.inc.php index b722500bb..01e0df508 100644 --- a/lang/brazilian_portuguese-utf-8.inc.php +++ b/lang/brazilian_portuguese-utf-8.inc.php @@ -1636,4 +1636,5 @@ $strDeleteTrackingData = 'Delete tracking data for this table'; //to translate $strRenameView = 'Rename view to'; //to translate $strInsertIgnoreAsNewRow = 'Insert as new row and ignore errors'; //to translate $strJavascriptDisabled = 'Javascript support is missing or disabled in your browser, some phpMyAdmin functionality will be missing. For example navigation frame will not refresh automatically.'; //to translate +$strSQLExportUTC = 'Export time in UTC'; //to translate ?> diff --git a/lang/bulgarian-utf-8.inc.php b/lang/bulgarian-utf-8.inc.php index 5e0b0fe47..14f169ca1 100644 --- a/lang/bulgarian-utf-8.inc.php +++ b/lang/bulgarian-utf-8.inc.php @@ -1642,4 +1642,5 @@ $strDeleteTrackingData = 'Delete tracking data for this table'; //to translate $strRenameView = 'Rename view to'; //to translate $strInsertIgnoreAsNewRow = 'Insert as new row and ignore errors'; //to translate $strJavascriptDisabled = 'Javascript support is missing or disabled in your browser, some phpMyAdmin functionality will be missing. For example navigation frame will not refresh automatically.'; //to translate +$strSQLExportUTC = 'Export time in UTC'; //to translate ?> diff --git a/lang/catalan-utf-8.inc.php b/lang/catalan-utf-8.inc.php index 979450e93..2cf02e86b 100644 --- a/lang/catalan-utf-8.inc.php +++ b/lang/catalan-utf-8.inc.php @@ -1628,4 +1628,5 @@ $strDeleteTrackingData = 'Delete tracking data for this table'; //to translate $strRenameView = 'Rename view to'; //to translate $strInsertIgnoreAsNewRow = 'Insert as new row and ignore errors'; //to translate $strJavascriptDisabled = 'Javascript support is missing or disabled in your browser, some phpMyAdmin functionality will be missing. For example navigation frame will not refresh automatically.'; //to translate +$strSQLExportUTC = 'Export time in UTC'; //to translate ?> diff --git a/lang/chinese_simplified-utf-8.inc.php b/lang/chinese_simplified-utf-8.inc.php index 722b72361..a3c55e3b0 100644 --- a/lang/chinese_simplified-utf-8.inc.php +++ b/lang/chinese_simplified-utf-8.inc.php @@ -1641,4 +1641,5 @@ $strDeleteTrackingData = 'Delete tracking data for this table'; //to translate $strRenameView = 'Rename view to'; //to translate $strInsertIgnoreAsNewRow = 'Insert as new row and ignore errors'; //to translate $strJavascriptDisabled = 'Javascript support is missing or disabled in your browser, some phpMyAdmin functionality will be missing. For example navigation frame will not refresh automatically.'; //to translate +$strSQLExportUTC = 'Export time in UTC'; //to translate ?> diff --git a/lang/chinese_traditional-utf-8.inc.php b/lang/chinese_traditional-utf-8.inc.php index 05f8fd222..b1d8b284e 100644 --- a/lang/chinese_traditional-utf-8.inc.php +++ b/lang/chinese_traditional-utf-8.inc.php @@ -1643,4 +1643,5 @@ $strDeleteTrackingData = 'Delete tracking data for this table'; //to translate $strRenameView = 'Rename view to'; //to translate $strInsertIgnoreAsNewRow = 'Insert as new row and ignore errors'; //to translate $strJavascriptDisabled = 'Javascript support is missing or disabled in your browser, some phpMyAdmin functionality will be missing. For example navigation frame will not refresh automatically.'; //to translate +$strSQLExportUTC = 'Export time in UTC'; //to translate ?> diff --git a/lang/croatian-utf-8.inc.php b/lang/croatian-utf-8.inc.php index be7eac5ce..833914242 100644 --- a/lang/croatian-utf-8.inc.php +++ b/lang/croatian-utf-8.inc.php @@ -1636,4 +1636,5 @@ $strDeleteTrackingData = 'Delete tracking data for this table'; //to translate $strRenameView = 'Rename view to'; //to translate $strInsertIgnoreAsNewRow = 'Insert as new row and ignore errors'; //to translate $strJavascriptDisabled = 'Javascript support is missing or disabled in your browser, some phpMyAdmin functionality will be missing. For example navigation frame will not refresh automatically.'; //to translate +$strSQLExportUTC = 'Export time in UTC'; //to translate ?> diff --git a/lang/czech-utf-8.inc.php b/lang/czech-utf-8.inc.php index 91b40e792..c12bf21dd 100644 --- a/lang/czech-utf-8.inc.php +++ b/lang/czech-utf-8.inc.php @@ -1630,4 +1630,5 @@ $strDeleteTrackingData = 'Delete tracking data for this table'; //to translate $strRenameView = 'Rename view to'; //to translate $strInsertIgnoreAsNewRow = 'Insert as new row and ignore errors'; //to translate $strJavascriptDisabled = 'Javascript support is missing or disabled in your browser, some phpMyAdmin functionality will be missing. For example navigation frame will not refresh automatically.'; //to translate +$strSQLExportUTC = 'Export time in UTC'; //to translate ?> diff --git a/lang/danish-utf-8.inc.php b/lang/danish-utf-8.inc.php index 722f535a1..febe0160c 100644 --- a/lang/danish-utf-8.inc.php +++ b/lang/danish-utf-8.inc.php @@ -1639,4 +1639,5 @@ $strDeleteTrackingData = 'Delete tracking data for this table'; //to translate $strRenameView = 'Rename view to'; //to translate $strInsertIgnoreAsNewRow = 'Insert as new row and ignore errors'; //to translate $strJavascriptDisabled = 'Javascript support is missing or disabled in your browser, some phpMyAdmin functionality will be missing. For example navigation frame will not refresh automatically.'; //to translate +$strSQLExportUTC = 'Export time in UTC'; //to translate ?> diff --git a/lang/dutch-utf-8.inc.php b/lang/dutch-utf-8.inc.php index 98b4ae250..8b9ee18f6 100644 --- a/lang/dutch-utf-8.inc.php +++ b/lang/dutch-utf-8.inc.php @@ -1635,4 +1635,5 @@ $strDeleteTrackingData = 'Delete tracking data for this table'; //to translate $strRenameView = 'Rename view to'; //to translate $strInsertIgnoreAsNewRow = 'Insert as new row and ignore errors'; //to translate $strJavascriptDisabled = 'Javascript support is missing or disabled in your browser, some phpMyAdmin functionality will be missing. For example navigation frame will not refresh automatically.'; //to translate +$strSQLExportUTC = 'Export time in UTC'; //to translate ?> diff --git a/lang/english-utf-8.inc.php b/lang/english-utf-8.inc.php index 92fd187b9..b77a30a36 100644 --- a/lang/english-utf-8.inc.php +++ b/lang/english-utf-8.inc.php @@ -1372,6 +1372,7 @@ $strSpanish = 'Spanish'; $strSplitWordsWithSpace = 'Words are separated by a space character (" ").'; $strSQLCompatibility = 'SQL compatibility mode'; $strSQLExportType = 'Export type'; +$strSQLExportUTC = 'Export time in UTC'; $strSQLParserBugMessage = 'There is a chance that you may have found a bug in the SQL parser. Please examine your query closely, and check that the quotes are correct and not mis-matched. Other possible failure causes may be that you are uploading a file with binary outside of a quoted text area. You can also try your query on the MySQL command line interface. The MySQL server error output below, if there is any, may also help you in diagnosing the problem. If you still have problems or if the parser fails where the command line interface succeeds, please reduce your SQL query input to the single query that causes problems, and submit a bug report with the data chunk in the CUT section below:'; $strSQLParserUserError = 'There seems to be an error in your SQL query. The MySQL server error output below, if there is any, may also help you in diagnosing the problem'; $strSQLQuery = 'SQL query'; diff --git a/lang/estonian-utf-8.inc.php b/lang/estonian-utf-8.inc.php index 976c1016b..cb17375ab 100644 --- a/lang/estonian-utf-8.inc.php +++ b/lang/estonian-utf-8.inc.php @@ -1641,4 +1641,5 @@ $strDeleteTrackingData = 'Delete tracking data for this table'; //to translate $strRenameView = 'Rename view to'; //to translate $strInsertIgnoreAsNewRow = 'Insert as new row and ignore errors'; //to translate $strJavascriptDisabled = 'Javascript support is missing or disabled in your browser, some phpMyAdmin functionality will be missing. For example navigation frame will not refresh automatically.'; //to translate +$strSQLExportUTC = 'Export time in UTC'; //to translate ?> diff --git a/lang/finnish-utf-8.inc.php b/lang/finnish-utf-8.inc.php index 3d7155ac8..cc6e5be74 100644 --- a/lang/finnish-utf-8.inc.php +++ b/lang/finnish-utf-8.inc.php @@ -1618,4 +1618,5 @@ $strZip = '"zip-pakattu"'; $strRenameView = 'Rename view to'; //to translate $strInsertIgnoreAsNewRow = 'Insert as new row and ignore errors'; //to translate $strJavascriptDisabled = 'Javascript support is missing or disabled in your browser, some phpMyAdmin functionality will be missing. For example navigation frame will not refresh automatically.'; //to translate +$strSQLExportUTC = 'Export time in UTC'; //to translate ?> diff --git a/lang/french-utf-8.inc.php b/lang/french-utf-8.inc.php index 44440e629..b9d2efec1 100644 --- a/lang/french-utf-8.inc.php +++ b/lang/french-utf-8.inc.php @@ -1614,4 +1614,5 @@ $strZeroRemovesTheLimit = 'Note: Une valeur de 0 (zero) enlève la limite.'; $strZip = '"zippé"'; $strJavascriptDisabled = 'Javascript support is missing or disabled in your browser, some phpMyAdmin functionality will be missing. For example navigation frame will not refresh automatically.'; //to translate +$strSQLExportUTC = 'Export time in UTC'; //to translate ?> diff --git a/lang/galician-utf-8.inc.php b/lang/galician-utf-8.inc.php index 8ff8f2e41..ca131cbac 100644 --- a/lang/galician-utf-8.inc.php +++ b/lang/galician-utf-8.inc.php @@ -1622,4 +1622,5 @@ $strDeleteTrackingData = 'Delete tracking data for this table'; //to translate $strRenameView = 'Rename view to'; //to translate $strInsertIgnoreAsNewRow = 'Insert as new row and ignore errors'; //to translate $strJavascriptDisabled = 'Javascript support is missing or disabled in your browser, some phpMyAdmin functionality will be missing. For example navigation frame will not refresh automatically.'; //to translate +$strSQLExportUTC = 'Export time in UTC'; //to translate ?> diff --git a/lang/georgian-utf-8.inc.php b/lang/georgian-utf-8.inc.php index e40154bb4..5fb842bdf 100644 --- a/lang/georgian-utf-8.inc.php +++ b/lang/georgian-utf-8.inc.php @@ -1639,4 +1639,5 @@ $strDeleteTrackingData = 'Delete tracking data for this table'; //to translate $strRenameView = 'Rename view to'; //to translate $strInsertIgnoreAsNewRow = 'Insert as new row and ignore errors'; //to translate $strJavascriptDisabled = 'Javascript support is missing or disabled in your browser, some phpMyAdmin functionality will be missing. For example navigation frame will not refresh automatically.'; //to translate +$strSQLExportUTC = 'Export time in UTC'; //to translate ?> diff --git a/lang/german-utf-8.inc.php b/lang/german-utf-8.inc.php index 29f78e3f3..959510d17 100644 --- a/lang/german-utf-8.inc.php +++ b/lang/german-utf-8.inc.php @@ -1639,4 +1639,5 @@ $strDeleteTrackingData = 'Delete tracking data for this table'; //to translate $strRenameView = 'Rename view to'; //to translate $strInsertIgnoreAsNewRow = 'Insert as new row and ignore errors'; //to translate $strJavascriptDisabled = 'Javascript support is missing or disabled in your browser, some phpMyAdmin functionality will be missing. For example navigation frame will not refresh automatically.'; //to translate +$strSQLExportUTC = 'Export time in UTC'; //to translate ?> diff --git a/lang/greek-utf-8.inc.php b/lang/greek-utf-8.inc.php index 0ab015603..73e30b28b 100644 --- a/lang/greek-utf-8.inc.php +++ b/lang/greek-utf-8.inc.php @@ -1645,4 +1645,5 @@ $strRenameView = 'Rename view to'; //to translate $strSynchronizeDb = 'Synchronize Databases'; //to translate $strInsertIgnoreAsNewRow = 'Insert as new row and ignore errors'; //to translate $strJavascriptDisabled = 'Javascript support is missing or disabled in your browser, some phpMyAdmin functionality will be missing. For example navigation frame will not refresh automatically.'; //to translate +$strSQLExportUTC = 'Export time in UTC'; //to translate ?> diff --git a/lang/hebrew-utf-8.inc.php b/lang/hebrew-utf-8.inc.php index 7974cdf8c..a4a584a77 100644 --- a/lang/hebrew-utf-8.inc.php +++ b/lang/hebrew-utf-8.inc.php @@ -1637,4 +1637,5 @@ $strDeleteTrackingData = 'Delete tracking data for this table'; //to translate $strRenameView = 'Rename view to'; //to translate $strInsertIgnoreAsNewRow = 'Insert as new row and ignore errors'; //to translate $strJavascriptDisabled = 'Javascript support is missing or disabled in your browser, some phpMyAdmin functionality will be missing. For example navigation frame will not refresh automatically.'; //to translate +$strSQLExportUTC = 'Export time in UTC'; //to translate ?> diff --git a/lang/hindi-utf-8.inc.php b/lang/hindi-utf-8.inc.php index 344e39124..a39130ac4 100644 --- a/lang/hindi-utf-8.inc.php +++ b/lang/hindi-utf-8.inc.php @@ -1643,4 +1643,5 @@ $strDeleteTrackingData = 'Delete tracking data for this table'; //to translate $strRenameView = 'Rename view to'; //to translate $strInsertIgnoreAsNewRow = 'Insert as new row and ignore errors'; //to translate $strJavascriptDisabled = 'Javascript support is missing or disabled in your browser, some phpMyAdmin functionality will be missing. For example navigation frame will not refresh automatically.'; //to translate +$strSQLExportUTC = 'Export time in UTC'; //to translate ?> diff --git a/lang/hungarian-utf-8.inc.php b/lang/hungarian-utf-8.inc.php index d7e169ed4..afa4ff136 100644 --- a/lang/hungarian-utf-8.inc.php +++ b/lang/hungarian-utf-8.inc.php @@ -1636,4 +1636,5 @@ $strDeleteTrackingData = 'Delete tracking data for this table'; //to translate $strRenameView = 'Rename view to'; //to translate $strInsertIgnoreAsNewRow = 'Insert as new row and ignore errors'; //to translate $strJavascriptDisabled = 'Javascript support is missing or disabled in your browser, some phpMyAdmin functionality will be missing. For example navigation frame will not refresh automatically.'; //to translate +$strSQLExportUTC = 'Export time in UTC'; //to translate ?> diff --git a/lang/indonesian-utf-8.inc.php b/lang/indonesian-utf-8.inc.php index b62fa2f97..45e689f69 100644 --- a/lang/indonesian-utf-8.inc.php +++ b/lang/indonesian-utf-8.inc.php @@ -1636,4 +1636,5 @@ $strDeleteTrackingData = 'Delete tracking data for this table'; //to translate $strRenameView = 'Rename view to'; //to translate $strInsertIgnoreAsNewRow = 'Insert as new row and ignore errors'; //to translate $strJavascriptDisabled = 'Javascript support is missing or disabled in your browser, some phpMyAdmin functionality will be missing. For example navigation frame will not refresh automatically.'; //to translate +$strSQLExportUTC = 'Export time in UTC'; //to translate ?> diff --git a/lang/italian-utf-8.inc.php b/lang/italian-utf-8.inc.php index addcaaa50..7445b1362 100644 --- a/lang/italian-utf-8.inc.php +++ b/lang/italian-utf-8.inc.php @@ -1636,4 +1636,5 @@ $strDeleteTrackingData = 'Delete tracking data for this table'; //to translate $strRenameView = 'Rename view to'; //to translate $strInsertIgnoreAsNewRow = 'Insert as new row and ignore errors'; //to translate $strJavascriptDisabled = 'Javascript support is missing or disabled in your browser, some phpMyAdmin functionality will be missing. For example navigation frame will not refresh automatically.'; //to translate +$strSQLExportUTC = 'Export time in UTC'; //to translate ?> diff --git a/lang/japanese-utf-8.inc.php b/lang/japanese-utf-8.inc.php index 6b4f4a0dc..88afdd750 100644 --- a/lang/japanese-utf-8.inc.php +++ b/lang/japanese-utf-8.inc.php @@ -1641,4 +1641,5 @@ $strDeleteTrackingData = 'Delete tracking data for this table'; //to translate $strRenameView = 'Rename view to'; //to translate $strInsertIgnoreAsNewRow = 'Insert as new row and ignore errors'; //to translate $strJavascriptDisabled = 'Javascript support is missing or disabled in your browser, some phpMyAdmin functionality will be missing. For example navigation frame will not refresh automatically.'; //to translate +$strSQLExportUTC = 'Export time in UTC'; //to translate ?> diff --git a/lang/korean-utf-8.inc.php b/lang/korean-utf-8.inc.php index 0478a1e9a..aaafac149 100644 --- a/lang/korean-utf-8.inc.php +++ b/lang/korean-utf-8.inc.php @@ -1638,4 +1638,5 @@ $strDeleteTrackingData = 'Delete tracking data for this table'; //to translate $strRenameView = 'Rename view to'; //to translate $strInsertIgnoreAsNewRow = 'Insert as new row and ignore errors'; //to translate $strJavascriptDisabled = 'Javascript support is missing or disabled in your browser, some phpMyAdmin functionality will be missing. For example navigation frame will not refresh automatically.'; //to translate +$strSQLExportUTC = 'Export time in UTC'; //to translate ?> diff --git a/lang/latvian-utf-8.inc.php b/lang/latvian-utf-8.inc.php index 8f48d4e3a..a916bb76d 100644 --- a/lang/latvian-utf-8.inc.php +++ b/lang/latvian-utf-8.inc.php @@ -1641,4 +1641,5 @@ $strDeleteTrackingData = 'Delete tracking data for this table'; //to translate $strRenameView = 'Rename view to'; //to translate $strInsertIgnoreAsNewRow = 'Insert as new row and ignore errors'; //to translate $strJavascriptDisabled = 'Javascript support is missing or disabled in your browser, some phpMyAdmin functionality will be missing. For example navigation frame will not refresh automatically.'; //to translate +$strSQLExportUTC = 'Export time in UTC'; //to translate ?> diff --git a/lang/lithuanian-utf-8.inc.php b/lang/lithuanian-utf-8.inc.php index b76417d79..2aede6dd5 100644 --- a/lang/lithuanian-utf-8.inc.php +++ b/lang/lithuanian-utf-8.inc.php @@ -1634,4 +1634,5 @@ $strXMLExportTriggers = 'Export triggers'; //to translate $strXMLExportViews = 'Export views'; //to translate $strJavascriptDisabled = 'Javascript support is missing or disabled in your browser, some phpMyAdmin functionality will be missing. For example navigation frame will not refresh automatically.'; //to translate +$strSQLExportUTC = 'Export time in UTC'; //to translate ?> diff --git a/lang/macedonian_cyrillic-utf-8.inc.php b/lang/macedonian_cyrillic-utf-8.inc.php index c5062143a..448ea81c8 100644 --- a/lang/macedonian_cyrillic-utf-8.inc.php +++ b/lang/macedonian_cyrillic-utf-8.inc.php @@ -1642,4 +1642,5 @@ $strDeleteTrackingData = 'Delete tracking data for this table'; //to translate $strRenameView = 'Rename view to'; //to translate $strInsertIgnoreAsNewRow = 'Insert as new row and ignore errors'; //to translate $strJavascriptDisabled = 'Javascript support is missing or disabled in your browser, some phpMyAdmin functionality will be missing. For example navigation frame will not refresh automatically.'; //to translate +$strSQLExportUTC = 'Export time in UTC'; //to translate ?> diff --git a/lang/malay-utf-8.inc.php b/lang/malay-utf-8.inc.php index 7e6d8dc2b..2f25f46e4 100644 --- a/lang/malay-utf-8.inc.php +++ b/lang/malay-utf-8.inc.php @@ -1655,4 +1655,5 @@ $strDeleteTrackingData = 'Delete tracking data for this table'; //to translate $strRenameView = 'Rename view to'; //to translate $strInsertIgnoreAsNewRow = 'Insert as new row and ignore errors'; //to translate $strJavascriptDisabled = 'Javascript support is missing or disabled in your browser, some phpMyAdmin functionality will be missing. For example navigation frame will not refresh automatically.'; //to translate +$strSQLExportUTC = 'Export time in UTC'; //to translate ?> diff --git a/lang/mongolian-utf-8.inc.php b/lang/mongolian-utf-8.inc.php index 879c409c0..3ca6ef3d4 100644 --- a/lang/mongolian-utf-8.inc.php +++ b/lang/mongolian-utf-8.inc.php @@ -1641,4 +1641,5 @@ $strDeleteTrackingData = 'Delete tracking data for this table'; //to translate $strRenameView = 'Rename view to'; //to translate $strInsertIgnoreAsNewRow = 'Insert as new row and ignore errors'; //to translate $strJavascriptDisabled = 'Javascript support is missing or disabled in your browser, some phpMyAdmin functionality will be missing. For example navigation frame will not refresh automatically.'; //to translate +$strSQLExportUTC = 'Export time in UTC'; //to translate ?> diff --git a/lang/norwegian-utf-8.inc.php b/lang/norwegian-utf-8.inc.php index 0cba47050..eeb4799ce 100644 --- a/lang/norwegian-utf-8.inc.php +++ b/lang/norwegian-utf-8.inc.php @@ -1617,4 +1617,5 @@ $strZip = 'Komprimert (zip)'; $strRenameView = 'Rename view to'; //to translate $strInsertIgnoreAsNewRow = 'Insert as new row and ignore errors'; //to translate $strJavascriptDisabled = 'Javascript support is missing or disabled in your browser, some phpMyAdmin functionality will be missing. For example navigation frame will not refresh automatically.'; //to translate +$strSQLExportUTC = 'Export time in UTC'; //to translate ?> diff --git a/lang/persian-utf-8.inc.php b/lang/persian-utf-8.inc.php index 8e791235e..af7400384 100644 --- a/lang/persian-utf-8.inc.php +++ b/lang/persian-utf-8.inc.php @@ -1644,4 +1644,5 @@ $strDeleteTrackingData = 'Delete tracking data for this table'; //to translate $strRenameView = 'Rename view to'; //to translate $strInsertIgnoreAsNewRow = 'Insert as new row and ignore errors'; //to translate $strJavascriptDisabled = 'Javascript support is missing or disabled in your browser, some phpMyAdmin functionality will be missing. For example navigation frame will not refresh automatically.'; //to translate +$strSQLExportUTC = 'Export time in UTC'; //to translate ?> diff --git a/lang/polish-utf-8.inc.php b/lang/polish-utf-8.inc.php index 6e106acf2..13086aafe 100644 --- a/lang/polish-utf-8.inc.php +++ b/lang/polish-utf-8.inc.php @@ -1627,4 +1627,5 @@ $strDeleteTrackingData = 'Delete tracking data for this table'; //to translate $strRenameView = 'Rename view to'; //to translate $strInsertIgnoreAsNewRow = 'Insert as new row and ignore errors'; //to translate $strJavascriptDisabled = 'Javascript support is missing or disabled in your browser, some phpMyAdmin functionality will be missing. For example navigation frame will not refresh automatically.'; //to translate +$strSQLExportUTC = 'Export time in UTC'; //to translate ?> diff --git a/lang/portuguese-utf-8.inc.php b/lang/portuguese-utf-8.inc.php index 62fac99e2..dc395a871 100644 --- a/lang/portuguese-utf-8.inc.php +++ b/lang/portuguese-utf-8.inc.php @@ -1645,4 +1645,5 @@ $strDeleteTrackingData = 'Delete tracking data for this table'; //to translate $strRenameView = 'Rename view to'; //to translate $strInsertIgnoreAsNewRow = 'Insert as new row and ignore errors'; //to translate $strJavascriptDisabled = 'Javascript support is missing or disabled in your browser, some phpMyAdmin functionality will be missing. For example navigation frame will not refresh automatically.'; //to translate +$strSQLExportUTC = 'Export time in UTC'; //to translate ?> diff --git a/lang/romanian-utf-8.inc.php b/lang/romanian-utf-8.inc.php index 06a47d937..7e0b16374 100644 --- a/lang/romanian-utf-8.inc.php +++ b/lang/romanian-utf-8.inc.php @@ -1635,4 +1635,5 @@ $strDeleteTrackingData = 'Delete tracking data for this table'; //to translate $strRenameView = 'Rename view to'; //to translate $strInsertIgnoreAsNewRow = 'Insert as new row and ignore errors'; //to translate $strJavascriptDisabled = 'Javascript support is missing or disabled in your browser, some phpMyAdmin functionality will be missing. For example navigation frame will not refresh automatically.'; //to translate +$strSQLExportUTC = 'Export time in UTC'; //to translate ?> diff --git a/lang/russian-utf-8.inc.php b/lang/russian-utf-8.inc.php index 22a5130e5..537ae29a9 100644 --- a/lang/russian-utf-8.inc.php +++ b/lang/russian-utf-8.inc.php @@ -1620,4 +1620,5 @@ $strZip = 'zip'; $strRenameView = 'Rename view to'; //to translate $strInsertIgnoreAsNewRow = 'Insert as new row and ignore errors'; //to translate $strJavascriptDisabled = 'Javascript support is missing or disabled in your browser, some phpMyAdmin functionality will be missing. For example navigation frame will not refresh automatically.'; //to translate +$strSQLExportUTC = 'Export time in UTC'; //to translate ?> diff --git a/lang/serbian_cyrillic-utf-8.inc.php b/lang/serbian_cyrillic-utf-8.inc.php index 7398c0922..ae71c5841 100644 --- a/lang/serbian_cyrillic-utf-8.inc.php +++ b/lang/serbian_cyrillic-utf-8.inc.php @@ -1639,4 +1639,5 @@ $strDeleteTrackingData = 'Delete tracking data for this table'; //to translate $strRenameView = 'Rename view to'; //to translate $strInsertIgnoreAsNewRow = 'Insert as new row and ignore errors'; //to translate $strJavascriptDisabled = 'Javascript support is missing or disabled in your browser, some phpMyAdmin functionality will be missing. For example navigation frame will not refresh automatically.'; //to translate +$strSQLExportUTC = 'Export time in UTC'; //to translate ?> diff --git a/lang/serbian_latin-utf-8.inc.php b/lang/serbian_latin-utf-8.inc.php index 31066381d..a09399806 100644 --- a/lang/serbian_latin-utf-8.inc.php +++ b/lang/serbian_latin-utf-8.inc.php @@ -1639,4 +1639,5 @@ $strDeleteTrackingData = 'Delete tracking data for this table'; //to translate $strRenameView = 'Rename view to'; //to translate $strInsertIgnoreAsNewRow = 'Insert as new row and ignore errors'; //to translate $strJavascriptDisabled = 'Javascript support is missing or disabled in your browser, some phpMyAdmin functionality will be missing. For example navigation frame will not refresh automatically.'; //to translate +$strSQLExportUTC = 'Export time in UTC'; //to translate ?> diff --git a/lang/sinhala-utf-8.inc.php b/lang/sinhala-utf-8.inc.php index c13bd1e64..0db490e41 100644 --- a/lang/sinhala-utf-8.inc.php +++ b/lang/sinhala-utf-8.inc.php @@ -1643,4 +1643,5 @@ $strDeleteTrackingData = 'Delete tracking data for this table'; //to translate $strRenameView = 'Rename view to'; //to translate $strInsertIgnoreAsNewRow = 'Insert as new row and ignore errors'; //to translate $strJavascriptDisabled = 'Javascript support is missing or disabled in your browser, some phpMyAdmin functionality will be missing. For example navigation frame will not refresh automatically.'; //to translate +$strSQLExportUTC = 'Export time in UTC'; //to translate ?> diff --git a/lang/slovak-utf-8.inc.php b/lang/slovak-utf-8.inc.php index ca890d19e..953c1ae9b 100644 --- a/lang/slovak-utf-8.inc.php +++ b/lang/slovak-utf-8.inc.php @@ -1635,4 +1635,5 @@ $strDeleteTrackingData = 'Delete tracking data for this table'; //to translate $strRenameView = 'Rename view to'; //to translate $strInsertIgnoreAsNewRow = 'Insert as new row and ignore errors'; //to translate $strJavascriptDisabled = 'Javascript support is missing or disabled in your browser, some phpMyAdmin functionality will be missing. For example navigation frame will not refresh automatically.'; //to translate +$strSQLExportUTC = 'Export time in UTC'; //to translate ?> diff --git a/lang/slovenian-utf-8.inc.php b/lang/slovenian-utf-8.inc.php index 73a60d6d0..701be3759 100644 --- a/lang/slovenian-utf-8.inc.php +++ b/lang/slovenian-utf-8.inc.php @@ -1638,4 +1638,5 @@ $strDeleteTrackingData = 'Delete tracking data for this table'; //to translate $strRenameView = 'Rename view to'; //to translate $strInsertIgnoreAsNewRow = 'Insert as new row and ignore errors'; //to translate $strJavascriptDisabled = 'Javascript support is missing or disabled in your browser, some phpMyAdmin functionality will be missing. For example navigation frame will not refresh automatically.'; //to translate +$strSQLExportUTC = 'Export time in UTC'; //to translate ?> diff --git a/lang/spanish-utf-8.inc.php b/lang/spanish-utf-8.inc.php index 65e8d6299..c78ed2670 100644 --- a/lang/spanish-utf-8.inc.php +++ b/lang/spanish-utf-8.inc.php @@ -1630,4 +1630,5 @@ $strDeleteTrackingData = 'Delete tracking data for this table'; //to translate $strRenameView = 'Rename view to'; //to translate $strInsertIgnoreAsNewRow = 'Insert as new row and ignore errors'; //to translate $strJavascriptDisabled = 'Javascript support is missing or disabled in your browser, some phpMyAdmin functionality will be missing. For example navigation frame will not refresh automatically.'; //to translate +$strSQLExportUTC = 'Export time in UTC'; //to translate ?> diff --git a/lang/swedish-utf-8.inc.php b/lang/swedish-utf-8.inc.php index 06e834fa6..5bf4f9906 100644 --- a/lang/swedish-utf-8.inc.php +++ b/lang/swedish-utf-8.inc.php @@ -1631,4 +1631,5 @@ $strDeleteTrackingData = 'Delete tracking data for this table'; //to translate $strRenameView = 'Rename view to'; //to translate $strInsertIgnoreAsNewRow = 'Insert as new row and ignore errors'; //to translate $strJavascriptDisabled = 'Javascript support is missing or disabled in your browser, some phpMyAdmin functionality will be missing. For example navigation frame will not refresh automatically.'; //to translate +$strSQLExportUTC = 'Export time in UTC'; //to translate ?> diff --git a/lang/tatarish-utf-8.inc.php b/lang/tatarish-utf-8.inc.php index 9c66f8cef..25b7a2737 100644 --- a/lang/tatarish-utf-8.inc.php +++ b/lang/tatarish-utf-8.inc.php @@ -1635,4 +1635,5 @@ $strDeleteTrackingData = 'Delete tracking data for this table'; //to translate $strRenameView = 'Rename view to'; //to translate $strInsertIgnoreAsNewRow = 'Insert as new row and ignore errors'; //to translate $strJavascriptDisabled = 'Javascript support is missing or disabled in your browser, some phpMyAdmin functionality will be missing. For example navigation frame will not refresh automatically.'; //to translate +$strSQLExportUTC = 'Export time in UTC'; //to translate ?> diff --git a/lang/thai-utf-8.inc.php b/lang/thai-utf-8.inc.php index 0be9bcd61..81311193f 100644 --- a/lang/thai-utf-8.inc.php +++ b/lang/thai-utf-8.inc.php @@ -1640,4 +1640,5 @@ $strDeleteTrackingData = 'Delete tracking data for this table'; //to translate $strRenameView = 'Rename view to'; //to translate $strInsertIgnoreAsNewRow = 'Insert as new row and ignore errors'; //to translate $strJavascriptDisabled = 'Javascript support is missing or disabled in your browser, some phpMyAdmin functionality will be missing. For example navigation frame will not refresh automatically.'; //to translate +$strSQLExportUTC = 'Export time in UTC'; //to translate ?> diff --git a/lang/turkish-utf-8.inc.php b/lang/turkish-utf-8.inc.php index 28d8bfdbf..e78f7d9ab 100644 --- a/lang/turkish-utf-8.inc.php +++ b/lang/turkish-utf-8.inc.php @@ -1630,4 +1630,5 @@ $strDeleteTrackingData = 'Delete tracking data for this table'; //to translate $strRenameView = 'Rename view to'; //to translate $strInsertIgnoreAsNewRow = 'Insert as new row and ignore errors'; //to translate $strJavascriptDisabled = 'Javascript support is missing or disabled in your browser, some phpMyAdmin functionality will be missing. For example navigation frame will not refresh automatically.'; //to translate +$strSQLExportUTC = 'Export time in UTC'; //to translate ?> diff --git a/lang/ukrainian-utf-8.inc.php b/lang/ukrainian-utf-8.inc.php index 4e6f25841..04c4f7daf 100644 --- a/lang/ukrainian-utf-8.inc.php +++ b/lang/ukrainian-utf-8.inc.php @@ -1638,4 +1638,5 @@ $strDeleteTrackingData = 'Delete tracking data for this table'; //to translate $strRenameView = 'Rename view to'; //to translate $strInsertIgnoreAsNewRow = 'Insert as new row and ignore errors'; //to translate $strJavascriptDisabled = 'Javascript support is missing or disabled in your browser, some phpMyAdmin functionality will be missing. For example navigation frame will not refresh automatically.'; //to translate +$strSQLExportUTC = 'Export time in UTC'; //to translate ?> diff --git a/lang/uzbek_cyrillic-utf-8.inc.php b/lang/uzbek_cyrillic-utf-8.inc.php index 50e9f8abc..0a5fdd8b1 100644 --- a/lang/uzbek_cyrillic-utf-8.inc.php +++ b/lang/uzbek_cyrillic-utf-8.inc.php @@ -1635,4 +1635,5 @@ $strDeleteTrackingData = 'Delete tracking data for this table'; //to translate $strRenameView = 'Rename view to'; //to translate $strInsertIgnoreAsNewRow = 'Insert as new row and ignore errors'; //to translate $strJavascriptDisabled = 'Javascript support is missing or disabled in your browser, some phpMyAdmin functionality will be missing. For example navigation frame will not refresh automatically.'; //to translate +$strSQLExportUTC = 'Export time in UTC'; //to translate ?> diff --git a/lang/uzbek_latin-utf-8.inc.php b/lang/uzbek_latin-utf-8.inc.php index 2eece1952..da371328b 100644 --- a/lang/uzbek_latin-utf-8.inc.php +++ b/lang/uzbek_latin-utf-8.inc.php @@ -1635,4 +1635,5 @@ $strDeleteTrackingData = 'Delete tracking data for this table'; //to translate $strRenameView = 'Rename view to'; //to translate $strInsertIgnoreAsNewRow = 'Insert as new row and ignore errors'; //to translate $strJavascriptDisabled = 'Javascript support is missing or disabled in your browser, some phpMyAdmin functionality will be missing. For example navigation frame will not refresh automatically.'; //to translate +$strSQLExportUTC = 'Export time in UTC'; //to translate ?> diff --git a/libraries/config.default.php b/libraries/config.default.php index 5327c2a74..ddb5c3a5d 100644 --- a/libraries/config.default.php +++ b/libraries/config.default.php @@ -1566,6 +1566,13 @@ $cfg['Export']['sql_delayed'] = false; */ $cfg['Export']['sql_ignore'] = false; +/** + * Export time in UTC. + * + * @global boolean $cfg['Export']['sql_utc_time'] + */ +$cfg['Export']['sql_utc_time'] = true; + /** * * diff --git a/libraries/export/sql.php b/libraries/export/sql.php index 9c177b4b3..5b8ec032e 100644 --- a/libraries/export/sql.php +++ b/libraries/export/sql.php @@ -116,6 +116,8 @@ if (isset($plugin_list)) { array('type' => 'bool', 'name' => 'ignore', 'text' => 'strIgnoreInserts'); $plugin_list['sql']['options'][] = array('type' => 'bool', 'name' => 'hex_for_blob', 'text' => 'strHexForBLOB'); + $plugin_list['sql']['options'][] = + array('type' => 'bool', 'name' => 'utc_time', 'text' => 'strSQLExportUTC'); $plugin_list['sql']['options'][] = array('type' => 'select', 'name' => 'type', 'text' => 'strSQLExportType', 'values' => array('INSERT' => 'INSERT', 'UPDATE' => 'UPDATE', 'REPLACE' => 'REPLACE')); $plugin_list['sql']['options'][] = @@ -194,6 +196,11 @@ function PMA_exportFooter() . '/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;' . $crlf; } + /* Restore timezone */ + if ($GLOBALS['sql_utc_time']) { + PMA_DBI_query('SET time_zone = "' . $GLOBALS['old_tz'] . '"'); + } + return PMA_exportOutputHandler($foot); } @@ -254,6 +261,14 @@ function PMA_exportHeader() . 'START TRANSACTION;' . $crlf; } + + /* Change timezone if we should export timestamps in UTC */ + if ($GLOBALS['sql_utc_time']) { + $head .= 'SET time_zone = "+00:00";' . $crlf; + $GLOBALS['old_tz'] = PMA_DBI_fetch_value('SELECT @@session.time_zone'); + PMA_DBI_query('SET time_zone = "+00:00"'); + } + $head .= PMA_possibleCRLF(); if (! empty($GLOBALS['asfile'])) {