From 55ca7bb3a3cf4d597f1606ae514d1c686dbf850b Mon Sep 17 00:00:00 2001 From: Yungu Kim Date: Mon, 13 Feb 2017 14:07:23 +0000 Subject: [PATCH 1/3] Translated using Weblate (Korean) Currently translated at 81.0% (2592 of 3199 strings) [CI skip] --- po/ko.po | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/po/ko.po b/po/ko.po index 19b47ba273..fa06cad300 100644 --- a/po/ko.po +++ b/po/ko.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.7.0-dev\n" "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n" "POT-Creation-Date: 2017-01-25 10:08+0100\n" -"PO-Revision-Date: 2017-02-13 13:58+0000\n" +"PO-Revision-Date: 2017-02-13 14:07+0000\n" "Last-Translator: Yungu Kim \n" "Language-Team: Korean " "\n" @@ -9463,7 +9463,7 @@ msgstr "" #: libraries/normalization.lib.php:810 msgid "Third step of normalization (1NF+2NF+3NF)" -msgstr "" +msgstr "정규화 세번째 단계" #: libraries/normalization.lib.php:817 msgid "" @@ -14658,7 +14658,7 @@ msgstr "계" #: templates/database/structure/check_all_tables.phtml:6 msgid "Check tables having overhead" -msgstr "오버헤드를 가진 테이블들을 체크" +msgstr "오버헤드가 있는 테이블 체크" #: templates/database/structure/check_all_tables.phtml:10 #, fuzzy @@ -15053,16 +15053,12 @@ msgid "Foreign key constraints" msgstr "외래키 제약" #: templates/table/relation/common_form.phtml:9 -#, fuzzy -#| msgid "Action" msgid "Actions" -msgstr "실행" +msgstr "액션" #: templates/table/relation/common_form.phtml:10 -#, fuzzy -#| msgid "Constraints for table" msgid "Constraint properties" -msgstr "테이블의 제약사항" +msgstr "제약사항" #: templates/table/relation/common_form.phtml:13 msgid "" @@ -15070,6 +15066,8 @@ msgid "" "an index on it. Alternatively, you can define an index below, before " "creating the foreign key." msgstr "" +"인덱스가 설정되지 않은 컬럼에 대해 외래키를 생성할경우 해당 컬럼에 자동으로 인덱스가 생성됩니다. 또는, 외래키를 생성하기 전에 아래에서 " +"직접 인덱스를 정의할 수 있습니다." #: templates/table/relation/common_form.phtml:20 msgid "" From 7da83511ec3443bd198e5a29d3c149a1866d495f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Mon, 13 Feb 2017 15:24:25 +0100 Subject: [PATCH 2/3] Do not use deprecated jQuery functionality MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Michal Čihař --- js/normalization.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/js/normalization.js b/js/normalization.js index 4d0644290c..341ca744ce 100644 --- a/js/normalization.js +++ b/js/normalization.js @@ -393,7 +393,7 @@ function processDependencies(primary_key, isTransitive) tablesTds[tblname].push(primary_key); } var form_id = $(this).attr('id'); - $('#' + form_id + ' input[type=checkbox]:not(:checked)').removeAttr('checked'); + $('#' + form_id + ' input[type=checkbox]:not(:checked)').prop('checked', false); dependsOn = ''; $('#' + form_id + ' input[type=checkbox]:checked').each(function(){ dependsOn += $(this).val() + ', '; @@ -637,7 +637,7 @@ AJAX.registerOnload('normalization.js', function() { '( ' + escapeHtml(primary_key.toString()) + ', )' + ''; $("#newCols").html(confirmStr); - $('.tblFooters').html('' + + $('.tblFooters').html('' + ''); } }); From 58472a97d2b593681cdef7c767f4054790dfd5cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Mon, 13 Feb 2017 15:30:51 +0100 Subject: [PATCH 3/3] Fixed javascript error on 3NF normalization MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes #12927 Signed-off-by: Michal Čihař --- ChangeLog | 1 + js/normalization.js | 6 +++--- libraries/normalization.lib.php | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 48edcb14a3..1ee6aa6a52 100644 --- a/ChangeLog +++ b/ChangeLog @@ -70,6 +70,7 @@ phpMyAdmin - ChangeLog - issue #12957 Fixed manipulation with GIS data having zero coordinates - issue #12804 Fixed various designer javascript errors - issue #12934 Fixed possible javascript error on server status page +- issue #12927 Fixed javascript error on 3NF normalization 4.6.6 (2017-01-23) - issue #12759 Fix Notice regarding 'Undefined index: old_usergroup' diff --git a/js/normalization.js b/js/normalization.js index 341ca744ce..f9484c6dbc 100644 --- a/js/normalization.js +++ b/js/normalization.js @@ -303,7 +303,7 @@ function goTo2NFStep2(pd, primary_key) "pd": JSON.stringify(pd), "getNewTables2NF":1}; $.ajax({ - type: "GET", + type: "POST", url: "normalization.php", data: datastring, async:false, @@ -352,12 +352,12 @@ function goTo3NFStep2(pd, tablesTds) "pd": JSON.stringify(pd), "getNewTables3NF":1}; $.ajax({ - type: "GET", + type: "POST", url: "normalization.php", data: datastring, async:false, success: function(data) { - data_parsed = JSON.parse(data.message); + data_parsed = data; if (data.success === true) { extra += data_parsed.html; } else { diff --git a/libraries/normalization.lib.php b/libraries/normalization.lib.php index bdcab1ddc5..39572ec9fd 100644 --- a/libraries/normalization.lib.php +++ b/libraries/normalization.lib.php @@ -558,7 +558,7 @@ function PMA_getHtmlForNewTables3NF($dependencies, $tables, $db) } } } - return array('html' => $html, 'newTables' => $newTables); + return array('html' => $html, 'newTables' => $newTables, 'success' => true); } /**