gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:phpmyadmin/phpmyadmin

Browse Source
This commit is contained in:
Madhura Jayaratne 2015-07-13 15:59:25 +05:30
commit cb8a75b719
5 changed files with 71 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
js/ajax.js
View File

@ -255,9 +255,7 @@ var AJAX = {
AJAX.$msgbox = PMA_ajaxShowMessage(PMA_messages.strAbortedRequest);
AJAX.active = false;
AJAX.xhr = null;
if (isLink) {
previousLinkAborted = true;
}
previousLinkAborted = true;
} else {
//If can't abort
return false;
@ -292,12 +290,15 @@ var AJAX = {
//Save reference for the new link request
AJAX.xhr = $.get(url, params, AJAX.responseHandler);
if (history && history.pushState) {
var state = {
url : href
};
if (previousLinkAborted) {
//hack: there is already an aborted entry on stack
//so just modify the aborted one
history.replaceState(null, null, href);
history.replaceState(state, null, href);
} else {
history.pushState(null, null, href);
history.pushState(state, null, href);
}
}
} else {
@ -353,11 +354,11 @@ var AJAX = {
}
if (data._menu) {
if (history && history.pushState) {
history.replaceState({
menu : data._menu
},
null
);
var state = {
url : data._selflink,
menu : data._menu
};
history.replaceState(state, null);
AJAX.handleMenu.replace(data._menu);
} else {
PMA_MicroHistory.menus.replace(data._menu);
@ -704,11 +705,28 @@ $(function () {
.append($('#topmenucontainer').clone())
.html();
if (history && history.pushState) {
//set initial state reload
var initState = ('state' in window.history && window.history.state !== null);
var initURL = $('#selflink > a').attr('href') || location.href;
var state = {
url : initURL,
menu : menuContent
};
history.replaceState(state, null);
$(window).on('popstate', function(event) {
if (event && event.originalEvent.state && event.originalEvent.state.menu) {
var initPop = (! initState && location.href == initURL);
initState = true;
//check if popstate fired on first page itself
if (initPop) {
return;
}
var state = event.originalEvent.state;
if (state && state.menu) {
AJAX.$msgbox = PMA_ajaxShowMessage();
var params = 'ajax_request=true&ajax_page_request=true';
$.get(location.href, params, AJAX.responseHandler);
var url = state.url || location.href;
$.get(url, params, AJAX.responseHandler);
//TODO: Check if sometimes menu is not retrieved from server,
// Not sure but it seems menu was missing only for printview which
// been removed lately, so if it's right some dead menu checks/fallbacks
@ -716,12 +734,6 @@ $(function () {
//AJAX.handleMenu.replace(event.originalEvent.state.menu);
}
});
// Add initial menu to history state object
history.replaceState({
menu : menuContent
},
null
);
} else {
// Fallback to microhistory mechanism
AJAX.scriptHandler

2
libraries/server_status_processes.lib.php
View File

@ -251,7 +251,7 @@ function PMA_getHtmlForProcessListFilter()
$retval = '';
$retval .= '<fieldset id="tableFilter">';
$retval .= '<legend>' . __('Filters') . '</legend>';
$retval .= '<form action="server_status_processes.php?'
$retval .= '<form action="server_status_processes.php'
. PMA_URL_getCommon($url_params) . '">';
$retval .= '<input type="submit" value="' . __('Refresh') . '" />';
$retval .= '<div class="formelement">';

24
po/ia.po
View File

@ -8,10 +8,10 @@ msgstr ""
"Project-Id-Version: phpMyAdmin 4.5.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
"POT-Creation-Date: 2015-07-12 11:07-0400\n"
"PO-Revision-Date: 2015-07-08 22:55+0200\n"
"PO-Revision-Date: 2015-07-12 22:13+0200\n"
"Last-Translator: Giovanni Sora <g.sora@tiscali.it>\n"
"Language-Team: Interlingua <https://hosted.weblate.org/projects/phpmyadmin/"
"master/ia/>\n"
"Language-Team: Interlingua "
"<https://hosted.weblate.org/projects/phpmyadmin/master/ia/>\n"
"Language: ia\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@ -1083,6 +1083,7 @@ msgid ""
"Are you sure you wish to change all the column collations and convert the "
"data?"
msgstr ""
"Tu es secur que tu vole modificar omne collationes e converter le datos?"
#: js/messages.php:88
msgid "Save & Close"
@ -1203,11 +1204,11 @@ msgstr "Patrono ha essite create."
#: js/messages.php:130
msgid "Template was loaded."
msgstr ""
msgstr "Patrono esseva cargate."
#: js/messages.php:131
msgid "Template was updated."
msgstr ""
msgstr "Patrono esseva actualisate."
#: js/messages.php:132
msgid "Template was deleted."
@ -2652,6 +2653,8 @@ msgstr "Tu es vermente secur que tu vole deler iste marcator de libro?"
#: js/messages.php:598
msgid "Some error occurred while getting SQL debug info."
msgstr ""
"Alcun error occurreva durante que on obteneva information super le debug de "
"SQL."
#: js/messages.php:599
#, php-format
@ -2661,7 +2664,7 @@ msgstr "%s queries executate %s vices in %s secundas."
#: js/messages.php:600
#, php-format
msgid "%s argument(s) passed"
msgstr ""
msgstr "%s argumento(s) passate"
#: js/messages.php:601
msgid "Show arguments"
@ -2673,7 +2676,7 @@ msgstr "Cela argumentos"
#: js/messages.php:603 libraries/Console.class.php:318
msgid "Time taken:"
msgstr ""
msgstr "Tempore utilisate:"
#: js/messages.php:604
msgid ""
@ -3266,7 +3269,7 @@ msgstr "Ordine de executar"
#: libraries/Console.class.php:295
msgid "Time taken"
msgstr ""
msgstr "Tempore utilisate"
#: libraries/Console.class.php:298
msgid "Order by:"
@ -3375,7 +3378,7 @@ msgstr "Columna:"
#: libraries/DBQbe.class.php:513
msgid "Alias:"
msgstr ""
msgstr "Alias:"
#: libraries/DBQbe.class.php:566
msgid "Sort:"
@ -7283,7 +7286,6 @@ msgid "Export templates table"
msgstr "Exporta tabella de patronos"
#: libraries/config/messages.inc.php:657
#, fuzzy
#| msgid ""
#| "Leave blank for no export template support, suggested: "
#| "[kbd]pma__exporttemplates[/kbd]."
@ -7291,7 +7293,7 @@ msgid ""
"Leave blank for no export template support, suggested: "
"[kbd]pma__export_templates[/kbd]."
msgstr ""
"Lassa vacue pro nulle supporto de patrono, proponite: "
"Lassa vacue pro nulle supporto de patrono de exportation, proponite: "
"[kbd]pma__exporttemplates[/kbd]."
#: libraries/config/messages.inc.php:660

11
po/pt_BR.po
View File

@ -4,10 +4,10 @@ msgstr ""
"Project-Id-Version: phpMyAdmin 4.5.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
"POT-Creation-Date: 2015-07-12 11:07-0400\n"
"PO-Revision-Date: 2015-06-27 11:53+0200\n"
"Last-Translator: Marc Delisle <marc@infomarc.info>\n"
"Language-Team: Portuguese (Brazil) <https://hosted.weblate.org/projects/"
"phpmyadmin/master/pt_BR/>\n"
"PO-Revision-Date: 2015-07-12 20:11+0200\n"
"Last-Translator: Helder Santana <helder.bs.santana@gmail.com>\n"
"Language-Team: Portuguese (Brazil) "
"<https://hosted.weblate.org/projects/phpmyadmin/master/pt_BR/>\n"
"Language: pt_BR\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@ -275,7 +275,6 @@ msgid "Data"
msgstr "Dados"
#: db_export.php:54
#, fuzzy
#| msgid "Select All"
msgid "Select all"
msgstr "Selecionar todos"
@ -708,7 +707,7 @@ msgstr ""
#: import_status.php:103
msgid "Could not load the progress of the import."
msgstr ""
msgstr "Não foi possível carregar o progresso da importação."
#: import_status.php:112 js/messages.php:378 libraries/Util.class.php:774
#: libraries/export.lib.php:515

50
po/sr.po
View File

@ -4,17 +4,17 @@ msgstr ""
"Project-Id-Version: phpMyAdmin 4.5.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
"POT-Creation-Date: 2015-07-12 11:07-0400\n"
"PO-Revision-Date: 2014-06-08 19:34+0200\n"
"Last-Translator: Nikola Stojaković <nikola.stojakovic@hotmail.com>\n"
"Language-Team: Serbian <https://hosted.weblate.org/projects/phpmyadmin/"
"master/sr/>\n"
"PO-Revision-Date: 2015-07-13 00:25+0200\n"
"Last-Translator: Smart Kid <kidsmart33@gmail.com>\n"
"Language-Team: Serbian "
"<https://hosted.weblate.org/projects/phpmyadmin/master/sr/>\n"
"Language: sr\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
"X-Generator: Weblate 1.10-dev\n"
"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<="
"4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
"X-Generator: Weblate 2.4-dev\n"
#: changelog.php:37 license.php:28
#, php-format
@ -31,7 +31,7 @@ msgstr ""
#: db_central_columns.php:130
msgid "Click to sort."
msgstr ""
msgstr "Кликните да би сте сортирали."
#: db_central_columns.php:149
#, fuzzy, php-format
@ -376,7 +376,7 @@ msgstr "Направи"
#: db_tracking.php:128 libraries/tracking.lib.php:277
msgid "Updated"
msgstr ""
msgstr "Ажурирано"
#: db_tracking.php:129 js/messages.php:243 libraries/Menu.class.php:551
#: libraries/Util.class.php:4339 libraries/config.values.php:104
@ -411,30 +411,28 @@ msgid "Delete tracking"
msgstr "Дозвољава уметање и замену података."
#: db_tracking.php:140
#, fuzzy
msgid "Versions"
msgstr "Персијски"
msgstr "Верзије"
#: db_tracking.php:141 libraries/tracking.lib.php:288
#: libraries/tracking.lib.php:456
msgid "Tracking report"
msgstr ""
msgstr "Извештај о праћењу"
#: db_tracking.php:142 libraries/tracking.lib.php:289
#: libraries/tracking.lib.php:826
#, fuzzy
msgid "Structure snapshot"
msgstr "Само структура"
msgstr "Снимак структуре"
#: db_tracking.php:184 libraries/tracking.lib.php:418
#: libraries/tracking.lib.php:1444
msgid "not active"
msgstr ""
msgstr "неактивно"
#: db_tracking.php:189 libraries/tracking.lib.php:416
#: libraries/tracking.lib.php:1442
msgid "active"
msgstr ""
msgstr "активно"
#: db_tracking.php:277
#, fuzzy
@ -442,9 +440,8 @@ msgid "Untracked tables"
msgstr "Провери табелу"
#: db_tracking.php:303 db_tracking.php:334 libraries/structure.lib.php:1698
#, fuzzy
msgid "Track table"
msgstr "Провери табелу"
msgstr "Прати табелу"
#: db_tracking.php:347
#, fuzzy
@ -476,31 +473,28 @@ msgid "You may want to refresh the page."
msgstr ""
#: export.php:189 schema_export.php:61
#, fuzzy
#| msgid "Bar type"
msgid "Bad type!"
msgstr "Врста упита"
msgstr "Погрешан тип!"
#: export.php:281
#, fuzzy
#| msgid "Add new field"
msgid "Bad parameters!"
msgstr "Додај ново поље"
msgstr "Погрешни параметри!"
#: file_echo.php:22
#, fuzzy
msgid "Invalid export type"
msgstr "Тип извоза"
msgstr "Погрешан тип извоза"
#: gis_data_editor.php:116
#, php-format
msgid "Value for the column \"%s\""
msgstr ""
msgstr "Вредност за колону %s"
#: gis_data_editor.php:144
#: templates/gis_visualization/gis_visualization.phtml:37
msgid "Use OpenStreetMaps as Base Layer"
msgstr ""
msgstr "Искористи OpenStreetMaps као основни слој"
#. l10n: Spatial Reference System Identifier
#: gis_data_editor.php:166
@ -579,9 +573,8 @@ msgid "Add a polygon"
msgstr "Додај %s поља"
#: gis_data_editor.php:401
#, fuzzy
msgid "Add geometry"
msgstr "Додај новог корисника"
msgstr "Додај геометрију"
#: gis_data_editor.php:407 js/messages.php:292
#: libraries/DbSearch.class.php:467 libraries/DisplayResults.class.php:1801
@ -705,6 +698,7 @@ msgstr ""
msgid ""
"Cannot convert file's character set without character set conversion library!"
msgstr ""
"Није могуће променити сет знакова датотеке без библиотеке за конверзију!"
#: import.php:615 libraries/display_import.inc.php:33
msgid "Could not load import plugins, please check your installation!"