From 662757a8678cd4afd6bd821b9a7343874f63a3ef Mon Sep 17 00:00:00 2001 From: Dong-bum Kim Date: Fri, 11 Jan 2013 11:36:58 +0100 Subject: [PATCH 01/10] Translated using Weblate (Korean) Currently translated at 40.6% (1040 of 2562) --- po/ko.po | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/po/ko.po b/po/ko.po index 2ea86c74e3..8e6e3a37da 100644 --- a/po/ko.po +++ b/po/ko.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: 2013-01-03 22:27+0200\n" -"Last-Translator: Nabu Marduk \n" +"PO-Revision-Date: 2013-01-11 11:36+0200\n" +"Last-Translator: Dong-bum Kim \n" "Language-Team: Korean \n" "Language: ko\n" "MIME-Version: 1.0\n" @@ -1988,6 +1988,8 @@ msgid "" "This table does not contain a unique column. Features related to the grid " "edit, checkbox, Edit, Copy and Delete links may not work after saving." msgstr "" +"이 테이블에는 유일 속성을 가진 컬럼이 없습니다. 저장 시에 격자창 편집, 체크박스, 편집, 복사, 삭제 등의 기능이 정상적으로 동작하지 " +"않을 수 있습니다." #: js/messages.php:355 msgid "" @@ -2359,7 +2361,7 @@ msgstr "HTML 폼에 지정된 MAX_FILE_SIZE 값보다 더 큰 파일이 업로 #: libraries/File.class.php:284 msgid "The uploaded file was only partially uploaded." -msgstr "" +msgstr "파일업로드가 완전하지 않게 실행되었습니다." #: libraries/File.class.php:287 msgid "Missing a temporary folder." @@ -2529,7 +2531,7 @@ msgstr "테이블 %s을(를) %s(으)로 이름을 변경하였습니다." #: libraries/Table.class.php:1385 msgid "Could not save table UI preferences" -msgstr "테이블 UI 환경 설정을 저장할 수 없습니다." +msgstr "테이블 UI 설정을 저장할 수 없습니다." #: libraries/Table.class.php:1408 #, php-format @@ -3304,7 +3306,7 @@ msgstr "" #: libraries/config/messages.inc.php:35 msgid "Minimum size for input field" -msgstr "" +msgstr "입력 필드의 최소 크기" #: libraries/config/messages.inc.php:36 msgid "" @@ -3314,7 +3316,7 @@ msgstr "" #: libraries/config/messages.inc.php:37 msgid "Maximum size for input field" -msgstr "" +msgstr "입력 필드의 최대 크기" #: libraries/config/messages.inc.php:38 msgid "Number of columns for CHAR/VARCHAR textareas" @@ -3334,7 +3336,7 @@ msgstr "" #: libraries/config/messages.inc.php:42 msgid "Check config file permissions" -msgstr "" +msgstr "설정 파일에 대한 권한을 확인해주세요." #: libraries/config/messages.inc.php:43 msgid "" @@ -3349,7 +3351,7 @@ msgstr "" #: libraries/config/messages.inc.php:45 setup/frames/config.inc.php:25 #: setup/frames/index.inc.php:167 msgid "Configuration file" -msgstr "" +msgstr "설정 파일" #: libraries/config/messages.inc.php:46 msgid "" @@ -3408,7 +3410,7 @@ msgstr "" #: libraries/config/messages.inc.php:59 msgid "Display databases as a list" -msgstr "" +msgstr "데이터베이스들을 목록으로 표시" #: libraries/config/messages.inc.php:60 msgid "Show server listing as a list instead of a drop down" @@ -3416,7 +3418,7 @@ msgstr "" #: libraries/config/messages.inc.php:61 msgid "Display servers as a list" -msgstr "" +msgstr "서버들을 목록으로 표시" #: libraries/config/messages.inc.php:62 msgid "" @@ -3431,7 +3433,7 @@ msgstr "다중테이블 유지보수기능 해제" #: libraries/config/messages.inc.php:64 msgid "Edit SQL queries in popup window" -msgstr "" +msgstr "팝업창으로 SQL 쿼리 편집" #: libraries/config/messages.inc.php:65 msgid "Edit in window" @@ -3462,7 +3464,7 @@ msgstr "" #: libraries/config/messages.inc.php:71 msgid "Maximum execution time" -msgstr "" +msgstr "최대 실행 시간" #: libraries/config/messages.inc.php:72 prefs_manage.php:297 msgid "Save as file" @@ -8245,10 +8247,9 @@ msgid "More settings" msgstr "" #: main.php:169 -#, fuzzy #| msgid "Databases" msgid "Database server" -msgstr "데이터베이스 " +msgstr "데이터베이스 서버" #: main.php:172 msgid "Software" @@ -8305,10 +8306,9 @@ msgid "Get support" msgstr "" #: main.php:244 -#, fuzzy #| msgid "No change" msgid "List of changes" -msgstr "변화 없음" +msgstr "변경 목록" #: main.php:268 msgid "" @@ -9417,7 +9417,7 @@ msgstr "쓰레드 %s 를 죽였습니다." #, php-format msgid "" "phpMyAdmin was unable to kill thread %s. It probably has already been closed." -msgstr "" +msgstr "phpMyAdmin이 쓰레드 %s를 종료하는데 실패했습니다. 이미 해당 쓰레드가 종료되었을 것입니다." #: server_status.php:594 msgid "Handler" @@ -9430,11 +9430,11 @@ msgstr "질의 종류" #: server_status.php:596 msgid "Threads" -msgstr "" +msgstr "쓰레드" #: server_status.php:598 msgid "Temporary data" -msgstr "" +msgstr "임시 데이터" #: server_status.php:599 #, fuzzy From d30aaaee73e4391c15095280cf0345d5cf23e671 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Tue, 15 Jan 2013 09:08:32 +0100 Subject: [PATCH 02/10] Escape HTML in chart title --- js/server_status_monitor.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/js/server_status_monitor.js b/js/server_status_monitor.js index 98d79c127b..152a6b3385 100644 --- a/js/server_status_monitor.js +++ b/js/server_status_monitor.js @@ -1030,7 +1030,10 @@ $(function() { function addChart(chartObj, initialize) { var settings = { - title: chartObj.title, + title: { + text: chartObj.title, + escapeHtml: true, + }, grid: { drawBorder: false, shadow: false, From d876574e61e413cca6906da7c208c1d3c8ae34d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Tue, 15 Jan 2013 09:08:39 +0100 Subject: [PATCH 03/10] Whitespace cleanup --- js/server_status_monitor.js | 240 ++++++++++++++++++------------------ 1 file changed, 120 insertions(+), 120 deletions(-) diff --git a/js/server_status_monitor.js b/js/server_status_monitor.js index 152a6b3385..610e7286a1 100644 --- a/js/server_status_monitor.js +++ b/js/server_status_monitor.js @@ -14,15 +14,15 @@ $(function() { $('div#logAnalyseDialog .datetimefield').each(function() { PMA_addDatepicker($(this)); }); - + /**** Monitor charting implementation ****/ /* Saves the previous ajax response for differential values */ var oldChartData = null; // Holds about to created chart var newChart = null; var chartSpacing; - - // Whenever the monitor object (runtime.charts) or the settings object (monitorSettings) + + // Whenever the monitor object (runtime.charts) or the settings object (monitorSettings) // changes in a way incompatible to the previous version, increase this number // It will reset the users monitor and settings object in his localStorage to the default configuration var monitorProtocolVersion = '1.0'; @@ -47,7 +47,7 @@ $(function() { xmin: -1, xmax: -1 }; - + var monitorSettings = null; var defaultMonitorSettings = { @@ -61,7 +61,7 @@ $(function() { // Allows drag and drop rearrange and print/edit icons on charts var editMode = false; - + /* List of preconfigured charts that the user may select */ var presetCharts = { // Query cache efficiency @@ -97,14 +97,14 @@ $(function() { // chart tooltip var tooltipBox; - + /* Add OS specific system info charts to the preset chart list */ switch(server_os) { - case 'WINNT': - $.extend(presetCharts, { + case 'WINNT': + $.extend(presetCharts, { 'cpu': { title: PMA_messages['strSystemCPUUsage'], - series: [ { + series: [ { label: PMA_messages['strAverageLoad'] } ], nodes: [ { @@ -112,7 +112,7 @@ $(function() { } ], maxYLabel: [] }, - + 'memory': { title: PMA_messages['strSystemMemory'], series: [ { @@ -130,7 +130,7 @@ $(function() { ], maxYLabel: [] }, - + 'swap': { title: PMA_messages['strSystemSwap'], series: [ { @@ -149,7 +149,7 @@ $(function() { } }); break; - + case 'Linux': $.extend(presetCharts, { 'cpu': { @@ -192,12 +192,12 @@ $(function() { } }); break; - + case 'SunOS': $.extend(presetCharts, { 'cpu': { title: PMA_messages['strSystemCPUUsage'], - series: [ { + series: [ { label: PMA_messages['strAverageLoad'] } ], nodes: [ { @@ -409,7 +409,7 @@ $(function() { // To many cells in one row => put into next row $tr.find('td').each(function() { if (numColumns > monitorSettings.columns) { - if ($tr.next().length == 0) { + if ($tr.next().length == 0) { $tr.after(''); } $tr.next().prepend($(this)); @@ -505,14 +505,14 @@ $(function() { $(this).dialog("close"); }; - + dlgButtons[PMA_messages['strClose']] = function() { newChart = null; $('span#clearSeriesLink').hide(); $('#seriesPreview').html(''); $(this).dialog("close"); }; - + var $presetList = $('div#addChartDialog select[name="presetCharts"]'); if ($presetList.html().length == 0) { $.each(presetCharts, function(key, value) { @@ -523,7 +523,7 @@ $(function() { $('input[name="chartTitle"]').attr('value', presetCharts[$(this).prop('value')].title); }); } - + $('div#addChartDialog').dialog({ width: 'auto', height: 'auto', @@ -534,7 +534,7 @@ $(function() { return false; }); - + $('a[href="#exportMonitorConfig"]').click(function() { var gridCopy = {}; @@ -544,15 +544,15 @@ $(function() { gridCopy[key].settings = elem.settings; gridCopy[key].title = elem.title; }); - + var exportData = { monitorCharts: gridCopy, monitorSettings: monitorSettings }; var $form; - + $('body').append($form = $('
')); - + $form.append(''); $form.submit(); $form.remove(); @@ -562,16 +562,16 @@ $(function() { $('div#emptyDialog').dialog({title: PMA_messages['strImportDialogTitle']}); $('div#emptyDialog').html(PMA_messages['strImportDialogMessage'] + ':
' + '
'); - + var dlgBtns = {}; - + dlgBtns[PMA_messages['strImport']] = function() { var $iframe, $form; $('body').append($iframe = $('')); var d = $iframe[0].contentWindow.document; d.open(); d.close(); mew = d; - + $iframe.load(function() { var json; @@ -585,14 +585,14 @@ $(function() { $('div#emptyDialog').dialog('close'); return; } - + // Basic check, is this a monitor config json? if (!json || ! json.monitorCharts || ! json.monitorCharts) { alert(PMA_messages['strFailedParsingConfig']); $('div#emptyDialog').dialog('close'); return; } - + // If json ok, try applying config try { window.localStorage['monitorCharts'] = $.toJSON(json.monitorCharts); @@ -605,20 +605,20 @@ $(function() { window.localStorage.removeItem('monitorSettings'); rebuildGrid(); } - + $('div#emptyDialog').dialog('close'); }); - + $("body", d).append($form = $('div#emptyDialog').find('form')); $form.submit(); $('div#emptyDialog').append(''); }; - + dlgBtns[PMA_messages['strCancel']] = function() { $(this).dialog('close'); } - - + + $('div#emptyDialog').dialog({ width: 'auto', height: 'auto', @@ -647,7 +647,7 @@ $(function() { } return false; }); - + $('a[href="#monitorInstructionsDialog"]').click(function() { var $dialog = $('div#monitorInstructionsDialog'); @@ -699,7 +699,7 @@ $(function() { + $.sprintf(PMA_messages['strSmallerLongQueryTimeAdvice'], logVars['long_query_time']) + '
'; } - + if (logVars['long_query_time'] < 2) { str += PMA_getImage('s_success.png') + ' ' + $.sprintf(PMA_messages['strLongQueryTimeSet'], logVars['long_query_time']) @@ -718,7 +718,7 @@ $(function() { if (logVars['log_output'] == 'TABLE') { varValue = 'FILE'; } - + str += '- ' + $.sprintf(PMA_messages['strSetLogOutput'], varValue) + '
'; @@ -772,8 +772,8 @@ $(function() { } ); }; - - + + loadLogVars(); return false; @@ -782,7 +782,7 @@ $(function() { $('input[name="chartType"]').change(function() { $('#chartVariableSettings').toggle(this.checked && this.value == 'variable'); var title = $('input[name="chartTitle"]').attr('value'); - if (title == PMA_messages['strChartTitle'] + if (title == PMA_messages['strChartTitle'] || title == $('label[for="' + $('input[name="chartTitle"]').data('lastRadio') + '"]').text() ) { $('input[name="chartTitle"]') @@ -831,7 +831,7 @@ $(function() { if ($('input#variableInput').attr('value').length == 0) { return false; } - + if (newChart == null) { $('#seriesPreview').html(''); @@ -905,11 +905,11 @@ $(function() { var dlgBtns = {}; dlgBtns[PMA_messages['strClose']] = function() { $(this).dialog('close'); }; - $('div#emptyDialog').dialog({ + $('div#emptyDialog').dialog({ width: 400, - buttons: dlgBtns + buttons: dlgBtns }); - } + } } if (runtime.charts == null) { @@ -934,13 +934,13 @@ $(function() { /* Calculate how much spacing there is between each chart */ $('table#chartGrid').html(''); chartSpacing = { - width: $('table#chartGrid td:nth-child(2)').offset().left + width: $('table#chartGrid td:nth-child(2)').offset().left - $('table#chartGrid td:nth-child(1)').offset().left, - height: $('table#chartGrid tr:nth-child(2) td:nth-child(2)').offset().top + height: $('table#chartGrid tr:nth-child(2) td:nth-child(2)').offset().top - $('table#chartGrid tr:nth-child(1) td:nth-child(1)').offset().top } $('table#chartGrid').html(''); - + /* Add all charts - in correct order */ var keys = []; $.each(runtime.charts, function(key, value) { @@ -959,11 +959,11 @@ $(function() { // Empty cells should keep their size so you can drop onto them $('table#chartGrid tr td').css('width', chartSize().width + 'px'); - + buildRequiredDataList(); refreshChartGrid(); } - + /* Destroys all monitor related resources */ function destroyGrid() { if (runtime.charts) { @@ -973,22 +973,22 @@ $(function() { } catch(err) {} }); } - + try { runtime.refreshRequest.abort(); } catch(err) {} - try { + try { clearTimeout(runtime.refreshTimeout); } catch(err) {} - + $('table#chartGrid').html(''); runtime.charts = null; runtime.chartAI = 0; monitorSettings = null; } - - /* Calls destroyGrid() and initGrid(), but before doing so it saves the chart + + /* Calls destroyGrid() and initGrid(), but before doing so it saves the chart * data from each chart and restores it after the monitor is initialized again */ function rebuildGrid() { var oldData = null; @@ -1002,10 +1002,10 @@ $(function() { } }); } - + destroyGrid(); initGrid(); - + if (oldData) { $.each(runtime.charts, function(key, chartObj) { for (var j = 0; j < chartObj.nodes.length; j++) { @@ -1014,7 +1014,7 @@ $(function() { } } }); - } + } } /* Calculactes the dynamic chart size that depends on the column width */ @@ -1211,7 +1211,7 @@ $(function() { if (! htmlnode ) { return; } - + var chart = null; var chartKey = null; $.each(runtime.charts, function(key, value) { @@ -1221,7 +1221,7 @@ $(function() { return false; } }); - + if (chart == null) { return; } @@ -1231,18 +1231,18 @@ $(function() { for (var i = 0; i
'; } - + dlgBtns = {}; dlgBtns[PMA_messages['strSave']] = function() { runtime.charts[chartKey].title = $('div#emptyDialog input[name="chartTitle"]').attr('value'); runtime.charts[chartKey].chart.setTitle({ text: runtime.charts[chartKey].title }); - + $('div#emptyDialog input[name*="chartSerie"]').each(function() { var idx = $(this).attr('name').split('-')[1]; runtime.charts[chartKey].nodes[idx].name = $(this).attr('value'); runtime.charts[chartKey].chart.series[idx].name = $(this).attr('value'); }); - + $(this).dialog('close'); saveMonitor(); }; @@ -1271,7 +1271,7 @@ $(function() { loadLog('slow', min, max); $(this).dialog("close"); }; - + dlgBtns[PMA_messages['strFromGeneralLog']] = function() { loadLog('general', min, max); $(this).dialog("close"); @@ -1296,15 +1296,15 @@ $(function() { limitTypes: $('input#limitTypes').prop('checked') }); } - - + + /* Removes a chart from the grid */ function removeChart(chartObj) { var htmlnode = chartObj.options.chart.renderTo; if (! htmlnode ) { return; } - + $.each(runtime.charts, function(key, value) { if (value.chart.options.chart.renderTo == htmlnode) { delete runtime.charts[key]; @@ -1328,10 +1328,10 @@ $(function() { function refreshChartGrid() { /* Send to server */ runtime.refreshRequest = $.post('server_status.php?' + url_query, { - ajax_request: true, - chart_data: 1, - type: 'chartgrid', - requiredData: $.toJSON(runtime.dataList) + ajax_request: true, + chart_data: 1, + type: 'chartgrid', + requiredData: $.toJSON(runtime.dataList) }, function(data) { var chartData; try { @@ -1341,7 +1341,7 @@ $(function() { } var value, i = 0; var diff; - + /* Update values in each graph */ $.each(runtime.charts, function(orderKey, elem) { var key = elem.chartID; @@ -1366,7 +1366,7 @@ $(function() { //elem.chart.xAxis[0].setExtremes(runtime.xmin, runtime.xmax, false); /* Calculate y value */ - + // If transform function given, use it if (elem.nodes[j].transformFn) { value = chartValueTransform( @@ -1382,7 +1382,7 @@ $(function() { value = parseFloat(chartData[key][j][0].value); if (elem.nodes[j].display == 'differential') { - if (oldChartData == null || oldChartData[key] == null) { + if (oldChartData == null || oldChartData[key] == null) { continue; } value -= oldChartData[key][j][0].value; @@ -1392,7 +1392,7 @@ $(function() { value = value / elem.nodes[j].valueDivisor; } } - + // Set y value, if defined if (value != undefined) { elem.chart.series[j].data.push([chartData.x, value]); @@ -1432,9 +1432,9 @@ $(function() { runtime.refreshTimeout = setTimeout(refreshChartGrid, monitorSettings.gridRefresh); }); } - + /* Function that supplies special value transform functions for chart values */ - function chartValueTransform(name, cur, prev) { + function chartValueTransform(name, cur, prev) { switch(name) { case 'cpu-linux': if (prev == null) { @@ -1474,7 +1474,7 @@ $(function() { */ function buildRequiredDataList() { runtime.dataList = {}; - // Store an own id, because the property name is subject of reordering, + // Store an own id, because the property name is subject of reordering, // thus destroying our mapping with runtime.charts <=> runtime.dataList var chartID = 0; $.each(runtime.charts, function(key, chart) { @@ -1498,10 +1498,10 @@ $(function() { if (! opts.limitTypes) { opts.limitTypes = false; } - + $('#emptyDialog').dialog({title: PMA_messages['strAnalysingLogsTitle']}); - $('#emptyDialog').html(PMA_messages['strAnalysingLogs'] + - ' '); var dlgBtns = {}; @@ -1529,14 +1529,14 @@ $(function() { removeVariables: opts.removeVariables, limitTypes: opts.limitTypes }, - function(data) { + function(data) { var logData; try { logData = $.parseJSON(data); } catch(err) { return serverResponseError(); } - + if (logData.rows.length != 0) { runtime.logDataCols = buildLogTable(logData); @@ -1585,26 +1585,26 @@ $(function() { $(this).dialog("close"); $(document).scrollTop($('div#logTable').offset().top); }; - + $('#emptyDialog').dialog( "option", "buttons", dlgBtns); - + } else { $('#emptyDialog').dialog({title: PMA_messages['strNoDataFoundTitle']}); $('#emptyDialog').html('

' + PMA_messages['strNoDataFound'] + '

'); - + var dlgBtns = {}; - dlgBtns[PMA_messages['strClose']] = function() { - $(this).dialog("close"); + dlgBtns[PMA_messages['strClose']] = function() { + $(this).dialog("close"); }; - + $('#emptyDialog').dialog( "option", "buttons", dlgBtns ); } } ); - /* Handles the actions performed when the user uses any of the log table filters + /* Handles the actions performed when the user uses any of the log table filters * which are the filter by name and grouping with ignoring data in WHERE clauses - * + * * @param boolean Should be true when the users enabled or disabled to group queries ignoring data in WHERE clauses */ function filterQueries(varFilterChange) { @@ -1616,7 +1616,7 @@ $(function() { } else { textFilter = new RegExp(val, 'i'); } - + var rowSum = 0, totalSum = 0, i = 0, q; var noVars = $('div#logTable input#noWHEREData').attr('checked'); var equalsFilter = /([^=]+)=(\d+|((\'|"|).*?[^\\])\4((\s+)|$))/gi; @@ -1627,7 +1627,7 @@ $(function() { var sumColumnName = runtime.logDataCols[runtime.logDataCols.length - 1]; var isSlowLog = opts.src == 'slow'; var columnSums = {}; - + // For the slow log we have to count many columns (query_time, lock_time, rows_examined, rows_sent, etc.) var countRow = function(query, row) { var cells = row.match(/(.*?)<\/td>/gi); @@ -1642,15 +1642,15 @@ $(function() { columnSums[query][2] += parseInt(cells[4].replace(/(|<\/td>)/gi, '')); columnSums[query][3] += parseInt(cells[5].replace(/(|<\/td>)/gi, '')); }; - + // We just assume the sql text is always in the second last column, and that the total count is right of it $('div#logTable table tbody tr td:nth-child(' + (runtime.logDataCols.length - 1) + ')').each(function() { - // If query is a SELECT and user enabled or disabled to group queries ignoring data in where statements, we + // If query is a SELECT and user enabled or disabled to group queries ignoring data in where statements, we // need to re-calculate the sums of each row if (varFilterChange && $(this).html().match(/^SELECT/i)) { if (noVars) { // Group on => Sum up identical columns, and hide all but 1 - + q = $(this).text().replace(equalsFilter, '$1=...$6').trim(); q = q.replace(functionFilter, ' $1(...)'); @@ -1712,7 +1712,7 @@ $(function() { hide = false; i++; }); - + // We finished summarizing counts => Update count values of all grouped entries if (varFilterChange) { if (noVars) { @@ -1721,11 +1721,11 @@ $(function() { if (filteredQueries[key] <= 1) { return; } - + row = $table.children('tr:nth-child(' + (value + 1) + ')'); numCol = row.children(':nth-child(' + (runtime.logDataCols.length) + ')'); numCol.text(filteredQueries[key]); - + if (isSlowLog) { row.children('td:nth-child(3)').text(secToTime(columnSums[key][0])); row.children('td:nth-child(4)').text(secToTime(columnSums[key][1])); @@ -1734,9 +1734,9 @@ $(function() { } }); } - - $('div#logTable table').trigger("update"); - setTimeout(function() { + + $('div#logTable table').trigger("update"); + setTimeout(function() { $('div#logTable table').trigger('sorton', [[[runtime.logDataCols.length - 1, 1]]]); }, 0); } @@ -1754,14 +1754,14 @@ $(function() { var time = timeStr.split(':'); return parseInt(time[0]*3600) + parseInt(time[1]*60) + parseInt(time[2]); } - + /* Turns a number into a timespan (100 into 00:01:40) */ function secToTime(timeInt) { hours = Math.floor(timeInt / 3600); timeInt -= hours*3600; minutes = Math.floor(timeInt / 60); timeInt -= minutes*60; - + if (hours < 10) { hours = '0' + hours; } @@ -1771,10 +1771,10 @@ $(function() { if (timeInt < 10) { timeInt = '0' + timeInt; } - + return hours + ':' + minutes + ':' + timeInt; } - + /* Constructs the log table out of the retrieved server data */ function buildLogTable(data) { var rows = data.rows; @@ -1791,7 +1791,7 @@ $(function() { } return value; }; - + for (var i = 0; i < rows.length; i++) { if (i == 0) { $.each(rows[0], function(key, value) { @@ -1856,7 +1856,7 @@ $(function() { return cols; } - + /* Opens the query analyzer dialog */ function openQueryAnalyzer() { var rowData = $(this).parent().data('query'); @@ -1871,11 +1871,11 @@ $(function() { var profilingChart = null; var dlgBtns = {}; - - dlgBtns[PMA_messages['strAnalyzeQuery']] = function() { - loadQueryAnalysis(rowData); + + dlgBtns[PMA_messages['strAnalyzeQuery']] = function() { + loadQueryAnalysis(rowData); }; - dlgBtns[PMA_messages['strClose']] = function() { + dlgBtns[PMA_messages['strClose']] = function() { if (profilingChart != null) { profilingChart.destroy(); } @@ -1891,13 +1891,13 @@ $(function() { buttons: dlgBtns }); } - + /* Loads and displays the analyzed query data */ function loadQueryAnalysis(rowData) { var db = rowData.db || ''; - + $('div#queryAnalyzerDialog div.placeHolder').html( - PMA_messages['strAnalyzing'] + ' '); $.post('server_status.php?' + url_query, { @@ -1917,7 +1917,7 @@ $(function() { // Float sux, I'll use table :( $('div#queryAnalyzerDialog div.placeHolder') .html('
'); - + var explain = '' + PMA_messages['strExplainOutput'] + ' ' + explain_docu; if (data.explain.length > 1) { explain += ' ('; @@ -1934,7 +1934,7 @@ $(function() { explain += '
0? 'style="display:none;"' : '' ) + '>'; $.each(data.explain[i], function(key, value) { value = (value == null)?'null':value; - + if (key == 'type' && value.toLowerCase() == 'all') { value = '' + value + ''; } @@ -1945,17 +1945,17 @@ $(function() { }); explain += '
'; } - + explain += '

' + PMA_messages['strAffectedRows'] + ' ' + data.affectedRows; $('div#queryAnalyzerDialog div.placeHolder td.explain').append(explain); - + $('div#queryAnalyzerDialog div.placeHolder a[href*="#showExplain"]').click(function() { var id = $(this).attr('href').split('-')[1]; $(this).parent().find('div[class*="explain"]').hide(); $(this).parent().find('div[class*="explain-' + id + '"]').show(); }); - + if (data.profiling) { var chartData = []; var numberTable = ''; @@ -1971,12 +1971,12 @@ $(function() { } numberTable += ''; numberTable += '
' + PMA_messages['strStatus'] + '' + PMA_messages['strTime'] + '
' + PMA_messages['strTotalTime'] + '' + PMA_prettyProfilingNum(totalTime, 2) + '
'; - + $('div#queryAnalyzerDialog div.placeHolder td.chart').append( '' + PMA_messages['strProfilingResults'] + ' ' + profiling_docu + ' ' + '(' + PMA_messages['strTable'] + ', ' + PMA_messages['strChart'] + ')
' + numberTable + '

'); - + $('div#queryAnalyzerDialog div.placeHolder a[href="#showNums"]').click(function() { $('div#queryAnalyzerDialog div#queryProfiling').hide(); $('div#queryAnalyzerDialog table.queryNums').show(); @@ -1990,7 +1990,7 @@ $(function() { }); profilingChart = PMA_createProfilingChartJqplot( - 'queryProfiling', + 'queryProfiling', chartData ); From 75ab209aaff202e35b7e524483855c8a8acee247 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Tue, 15 Jan 2013 09:00:43 +0100 Subject: [PATCH 04/10] Translated using Weblate (Czech) Currently translated at 100.0% (2562 of 2562) --- po/cs.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/po/cs.po b/po/cs.po index de3c0f5525..7c41dd22da 100644 --- a/po/cs.po +++ b/po/cs.po @@ -6,7 +6,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-14 13:43+0200\n" +"PO-Revision-Date: 2013-01-15 09:00+0200\n" "Last-Translator: Michal Čihař \n" "Language-Team: Czech \n" "Language: cs\n" @@ -14,7 +14,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 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 @@ -10600,7 +10600,7 @@ msgstr "Vynásobit" #: server_status.php:1703 msgid "Append unit to data values" -msgstr "Přidat jednoty" +msgstr "Zobrazit hodnoty s jednotkou" #: server_status.php:1709 msgid "Add this series" From 90ed3865ea287638b6b014404ffba4b18eb1f5ee Mon Sep 17 00:00:00 2001 From: Pham Andrei Date: Mon, 14 Jan 2013 20:21:27 +0100 Subject: [PATCH 05/10] Translated using Weblate (Romanian) Currently translated at 60.2% (1543 of 2562) --- po/ro.po | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/po/ro.po b/po/ro.po index 99d6b7d559..8ea3860008 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: 2013-01-10 13:37+0200\n" -"Last-Translator: Michal Čihař \n" +"PO-Revision-Date: 2013-01-14 20:21+0200\n" +"Last-Translator: Pham Andrei \n" "Language-Team: Romanian \n" "Language: ro\n" "MIME-Version: 1.0\n" @@ -11761,15 +11761,15 @@ msgstr "Vizualizarea schemei tabelului" #: tbl_gis_visualization.php:112 msgid "Display GIS Visualization" -msgstr "" +msgstr "Afișează Vizualizarea GIS" #: tbl_gis_visualization.php:128 msgid "Width" -msgstr "" +msgstr "Lățime" #: tbl_gis_visualization.php:132 msgid "Height" -msgstr "" +msgstr "Înălțime" #: tbl_gis_visualization.php:136 #, fuzzy @@ -11789,7 +11789,7 @@ msgstr "Număr de fișiere-jurnal" #: tbl_gis_visualization.php:175 msgid "Redraw" -msgstr "" +msgstr "Redesenează" #: tbl_gis_visualization.php:177 #, fuzzy From fb0fb6c756724bc12a8e68fe5a8a311bcc54d0ef Mon Sep 17 00:00:00 2001 From: ProUser Date: Mon, 14 Jan 2013 23:55:59 +0100 Subject: [PATCH 06/10] Translated using Weblate (Swedish) Currently translated at 100.0% (2562 of 2562) --- po/sv.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/po/sv.po b/po/sv.po index fe050ac1b8..8f985aad92 100644 --- a/po/sv.po +++ b/po/sv.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-12-13 12:56+0200\n" -"Last-Translator: Michal Čihař \n" +"PO-Revision-Date: 2013-01-14 23:55+0200\n" +"Last-Translator: ProUser \n" "Language-Team: Swedish \n" "Language: sv\n" "MIME-Version: 1.0\n" @@ -26,7 +26,7 @@ msgstr "Visa alla" #: libraries/schema/User_Schema.class.php:396 #: libraries/select_lang.lib.php:489 msgid "Page number:" -msgstr "Sida:" +msgstr "Sida nummer:" #: browse_foreigners.php:142 msgid "" From 7e968cf30e811fd2dc51ae754907d01049468505 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Tue, 15 Jan 2013 09:10:48 +0100 Subject: [PATCH 07/10] Escape HTML in titles of table charts --- js/tbl_chart.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/js/tbl_chart.js b/js/tbl_chart.js index 6e395e72c1..f139ca06e7 100644 --- a/js/tbl_chart.js +++ b/js/tbl_chart.js @@ -53,6 +53,7 @@ $(document).ready(function() { }, title: { text: $('input[name="chartTitle"]').attr('value') + escapeHtml: true, //margin:20 }, legend: { @@ -245,7 +246,8 @@ function PMA_queryChart(data, passedSettings, passedNonJqplotSettings) var settings = { title: { - text: '' + text: '' + escapeHtml: true, //margin:20 } }; @@ -279,7 +281,7 @@ function PMA_queryChart(data, passedSettings, passedNonJqplotSettings) if (passedNonJqplotSettings.chart.type == 'spline') { settings.seriesDefaults = { rendererOptions: { - smooth: true + smooth: true } }; } From b489fdffb6572e7036933d5d87dbe648cd583733 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Tue, 15 Jan 2013 09:08:32 +0100 Subject: [PATCH 08/10] Escape HTML in chart title --- js/server_status_monitor.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/js/server_status_monitor.js b/js/server_status_monitor.js index 29dd8790cd..dd50b3cb24 100644 --- a/js/server_status_monitor.js +++ b/js/server_status_monitor.js @@ -1136,7 +1136,10 @@ AJAX.registerOnload('server_status_monitor.js', function() { function addChart(chartObj, initialize) { var settings = { - title: chartObj.title, + title: { + text: chartObj.title, + escapeHtml: true, + }, grid: { drawBorder: false, shadow: false, From b23372a3368d33d7adf3bfe5a0466a572d7ec5a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Tue, 15 Jan 2013 09:10:48 +0100 Subject: [PATCH 09/10] Escape HTML in titles of table charts Conflicts: js/tbl_chart.js --- js/tbl_chart.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/js/tbl_chart.js b/js/tbl_chart.js index 14baf4749e..758cea0505 100644 --- a/js/tbl_chart.js +++ b/js/tbl_chart.js @@ -71,6 +71,7 @@ AJAX.registerOnload('tbl_chart.js', function() { }, title: { text: $('input[name="chartTitle"]').attr('value') + escapeHtml: true, //margin:20 }, legend: { @@ -286,6 +287,7 @@ function PMA_queryChart(data, passedSettings, passedNonJqplotSettings) var settings = { title: { + escapeHtml: true, text: '' //margin:20 } From 7ddc71c033256baad76957c42fc1b9ad83bac8e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Tue, 15 Jan 2013 09:13:24 +0100 Subject: [PATCH 10/10] Fix possibly wrong commas --- js/server_status_monitor.js | 2 +- js/tbl_chart.js | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/js/server_status_monitor.js b/js/server_status_monitor.js index 610e7286a1..b3f40cd446 100644 --- a/js/server_status_monitor.js +++ b/js/server_status_monitor.js @@ -1032,7 +1032,7 @@ $(function() { var settings = { title: { text: chartObj.title, - escapeHtml: true, + escapeHtml: true }, grid: { drawBorder: false, diff --git a/js/tbl_chart.js b/js/tbl_chart.js index f139ca06e7..050d020c91 100644 --- a/js/tbl_chart.js +++ b/js/tbl_chart.js @@ -52,8 +52,8 @@ $(document).ready(function() { } }, title: { - text: $('input[name="chartTitle"]').attr('value') - escapeHtml: true, + text: $('input[name="chartTitle"]').attr('value'), + escapeHtml: true //margin:20 }, legend: { @@ -246,8 +246,8 @@ function PMA_queryChart(data, passedSettings, passedNonJqplotSettings) var settings = { title: { - text: '' - escapeHtml: true, + text: '', + escapeHtml: true //margin:20 } };