From a21a18cf562925e256aa780024bc3674001ffcd3 Mon Sep 17 00:00:00 2001 From: Madhura Jayaratne Date: Wed, 4 Dec 2013 00:09:59 +0530 Subject: [PATCH 01/11] Scroll to view only when the item is not in view --- js/navigation.js | 36 ++++++++++++++++++++++++++++-------- 1 file changed, 28 insertions(+), 8 deletions(-) diff --git a/js/navigation.js b/js/navigation.js index 7b75628310..d7c3819895 100644 --- a/js/navigation.js +++ b/js/navigation.js @@ -294,14 +294,22 @@ function expandTreeNode($expandElem, callback) * Auto-scrolls the newly chosen database * * @param object $element The element to set to view - * @param object $container The container srollable element * */ -function scrollToView($element, $container) { - var pushToOffset = $element.offset().top - $container.offset().top + $container.scrollTop(); - $('#pma_navigation_tree_content').stop().animate({ - scrollTop: pushToOffset - }); +function scrollToView($element) { + var $container = $('#pma_navigation_tree_content'); + var elemTop = $element.offset().top - $container.offset().top; + var textHeight = 20; + var scrollPadding = 20; // extra padding from top of bottom when scrolling to view + if (elemTop < 0) { + $container.stop().animate({ + scrollTop: elemTop + $container.scrollTop() - scrollPadding + }); + } else if (elemTop + textHeight > $container.height()) { + $container.stop().animate({ + scrollTop: elemTop + textHeight - $container.height() + $container.scrollTop() + scrollPadding + }); + } } /** @@ -400,10 +408,10 @@ function PMA_showCurrentNavigation() if ($tableContainer.length > 0) { var $expander = $tableContainer.children('div:first').children('a.expander'); expandTreeNode($expander, function () { - scrollToView($dbItem, $('#pma_navigation_tree_content')); + scrollToView($dbItem); }); } else { - scrollToView($dbItem, $('#pma_navigation_tree_content')); + scrollToView($dbItem); } } } @@ -473,6 +481,9 @@ function PMA_showCurrentNavigation() } else { // no containers, highlight the item var $tableOrView = findLoadedItem($container, table, null, true); + if ($tableOrView){ + scrollToView($tableOrView); + } } } @@ -489,6 +500,9 @@ function PMA_showCurrentNavigation() $tableContainer.children('div.list_container'), table, 'table', true ); + if ($table) { + scrollToView($table); + } } else if ($viewContainer.length > 0) { highlightView($viewContainer, table); } @@ -519,12 +533,18 @@ function PMA_showCurrentNavigation() $viewContainer.children('div.list_container'), view, 'view', true ); + if ($view) { + scrollToView($view); + } }); } else { var $view = findLoadedItem( $viewContainer.children('div.list_container'), view, 'view', true ); + if ($view) { + scrollToView($view); + } } } } From eee6c9f6c0b9cc31ecde0a8f3d024ba2ebf13c5b Mon Sep 17 00:00:00 2001 From: Giovanni Sora Date: Wed, 4 Dec 2013 14:16:45 +0100 Subject: [PATCH 02/11] Translated using Weblate (Interlingua) Currently translated at 37.1% (1020 of 2742) --- po/ia.po | 100 +++++++++++++++++++++++++++++-------------------------- 1 file changed, 52 insertions(+), 48 deletions(-) diff --git a/po/ia.po b/po/ia.po index f12d93db7a..5fd13e21a6 100644 --- a/po/ia.po +++ b/po/ia.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.1.0-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2013-11-25 16:19-0500\n" -"PO-Revision-Date: 2013-12-04 13:55+0200\n" +"PO-Revision-Date: 2013-12-04 14:16+0200\n" "Last-Translator: Giovanni Sora \n" "Language-Team: Interlingua " "\n" @@ -4974,7 +4974,7 @@ msgstr "Personalisa le modo de modificar" #: libraries/config/messages.inc.php:166 msgid "Export defaults" -msgstr "Exporta le predefinites" +msgstr "Exporta le valores predefinite" #: libraries/config/messages.inc.php:167 msgid "Customize default export options" @@ -4999,64 +4999,64 @@ msgstr "Importa valores predefinite" #: libraries/config/messages.inc.php:173 msgid "Customize default common import options" -msgstr "" +msgstr "Personalisa le optiones de importar commun predefinite" #: libraries/config/messages.inc.php:174 msgid "Import / export" -msgstr "" +msgstr "Importa / exporta" #: libraries/config/messages.inc.php:175 msgid "Set import and export directories and compression options" -msgstr "" +msgstr "Fixa le optiones de compression e le dossiers de importar e exportar" #: libraries/config/messages.inc.php:176 msgid "LaTeX" -msgstr "" +msgstr "LaTeX" #: libraries/config/messages.inc.php:179 msgid "Databases display options" -msgstr "" +msgstr "Optiones pro monstrar base de datos" #: libraries/config/messages.inc.php:180 setup/frames/menu.inc.php:21 msgid "Navigation panel" -msgstr "" +msgstr "Pannello de navigation" #: libraries/config/messages.inc.php:181 msgid "Customize appearance of the navigation panel" -msgstr "" +msgstr "Personalisa apparentia del pannello de navigation" #: libraries/config/messages.inc.php:182 libraries/select_server.lib.php:44 #: setup/frames/index.inc.php:141 msgid "Servers" -msgstr "" +msgstr "Servitores" #: libraries/config/messages.inc.php:183 msgid "Servers display options" -msgstr "" +msgstr "Optiones pro monstrar servitores" #: libraries/config/messages.inc.php:185 msgid "Tables display options" -msgstr "" +msgstr "Optiones pro monstrar tabellas" #: libraries/config/messages.inc.php:186 setup/frames/menu.inc.php:23 msgid "Main panel" -msgstr "" +msgstr "Pannello principal" #: libraries/config/messages.inc.php:187 msgid "Microsoft Office" -msgstr "" +msgstr "Microsoft Office" #: libraries/config/messages.inc.php:191 msgid "Other core settings" -msgstr "" +msgstr "Altere preferentias principal" #: libraries/config/messages.inc.php:192 msgid "Settings that didn't fit anywhere else" -msgstr "" +msgstr "Altere preferentias que on non pote poner in altere loco" #: libraries/config/messages.inc.php:193 msgid "Page titles" -msgstr "" +msgstr "Titulos de pagina" #: libraries/config/messages.inc.php:194 msgid "" @@ -5067,37 +5067,39 @@ msgstr "" #: libraries/config/messages.inc.php:195 #: libraries/navigation/NavigationHeader.class.php:216 msgid "Query window" -msgstr "" +msgstr "Fenestra de query" #: libraries/config/messages.inc.php:196 msgid "Customize query window options" -msgstr "" +msgstr "Personalisa le optiones de fenestra de query" #: libraries/config/messages.inc.php:197 msgid "Security" -msgstr "" +msgstr "Securitate" #: libraries/config/messages.inc.php:198 msgid "" "Please note that phpMyAdmin is just a user interface and its features do not " "limit MySQL" msgstr "" +"Pro favor tu nota que phpMyAdmin es solo un interfacie e su characteristicas " +"non limita MySQL" #: libraries/config/messages.inc.php:199 msgid "Basic settings" -msgstr "" +msgstr "Preferentias basic" #: libraries/config/messages.inc.php:200 msgid "Authentication" -msgstr "" +msgstr "Authentication" #: libraries/config/messages.inc.php:201 msgid "Authentication settings" -msgstr "" +msgstr "Preferentias de authentication" #: libraries/config/messages.inc.php:202 msgid "Server configuration" -msgstr "" +msgstr "Configuration del servitor" #: libraries/config/messages.inc.php:203 msgid "" @@ -5107,11 +5109,11 @@ msgstr "" #: libraries/config/messages.inc.php:204 msgid "Enter server connection parameters" -msgstr "" +msgstr "Inserta parametros de connexion del servitor" #: libraries/config/messages.inc.php:205 msgid "Configuration storage" -msgstr "" +msgstr "Immagazinage de configuration" #: libraries/config/messages.inc.php:206 msgid "" @@ -5122,7 +5124,7 @@ msgstr "" #: libraries/config/messages.inc.php:207 msgid "Changes tracking" -msgstr "" +msgstr "Traciamento de modificationes" #: libraries/config/messages.inc.php:208 msgid "" @@ -5132,40 +5134,40 @@ msgstr "" #: libraries/config/messages.inc.php:209 msgid "Customize export options" -msgstr "" +msgstr "Personalisa optiones de exportar" #: libraries/config/messages.inc.php:211 msgid "Customize import defaults" -msgstr "" +msgstr "Personalisa optiones predefinite de importar" #: libraries/config/messages.inc.php:212 msgid "Customize navigation panel" -msgstr "" +msgstr "Personalisa pannello de navigation" #: libraries/config/messages.inc.php:213 msgid "Customize main panel" -msgstr "" +msgstr "Personalisa pannello principal" #: libraries/config/messages.inc.php:214 libraries/config/messages.inc.php:219 #: setup/frames/menu.inc.php:19 msgid "SQL queries" -msgstr "" +msgstr "Queries de SQL" #: libraries/config/messages.inc.php:216 msgid "SQL Query box" -msgstr "" +msgstr "Quadro de Query de SQL" #: libraries/config/messages.inc.php:217 msgid "Customize links shown in SQL Query boxes" -msgstr "" +msgstr "Personalisa ligamines monstrate in le quadros de Query de SQL" #: libraries/config/messages.inc.php:220 msgid "SQL queries settings" -msgstr "" +msgstr "Preferentias de queries de SQL" #: libraries/config/messages.inc.php:221 msgid "SQL Validator" -msgstr "" +msgstr "Validator de SQL" #: libraries/config/messages.inc.php:222 msgid "" @@ -5177,55 +5179,57 @@ msgstr "" #: libraries/config/messages.inc.php:223 msgid "Startup" -msgstr "" +msgstr "Initiar" #: libraries/config/messages.inc.php:224 msgid "Customize startup page" -msgstr "" +msgstr "Personalisa le pagina de initiar" #: libraries/config/messages.inc.php:225 msgid "Database structure" -msgstr "" +msgstr "Structura de base de datos" #: libraries/config/messages.inc.php:226 msgid "Choose which details to show in the database structure (list of tables)" msgstr "" +"Selige qual detalios monstrar in le structura de base de datos (lista de " +"tabellas)" #: libraries/config/messages.inc.php:227 msgid "Table structure" -msgstr "" +msgstr "Structura de tabella" #: libraries/config/messages.inc.php:228 msgid "Settings for the table structure (list of columns)" -msgstr "" +msgstr "Preferentias del structura de tabella (lista de columnas)" #: libraries/config/messages.inc.php:229 msgid "Tabs" -msgstr "" +msgstr "Schedas" #: libraries/config/messages.inc.php:230 msgid "Choose how you want tabs to work" -msgstr "" +msgstr "Selige como tu vole que le schedas functiona" #: libraries/config/messages.inc.php:231 msgid "Text fields" -msgstr "" +msgstr "Campos de texto" #: libraries/config/messages.inc.php:232 msgid "Customize text input fields" -msgstr "" +msgstr "Personalisa le campos de ingresso de texto" #: libraries/config/messages.inc.php:233 msgid "Texy! text" -msgstr "" +msgstr "Texy! texto" #: libraries/config/messages.inc.php:235 msgid "Warnings" -msgstr "" +msgstr "Avisos" #: libraries/config/messages.inc.php:236 msgid "Disable some of the warnings shown by phpMyAdmin" -msgstr "" +msgstr "Dishabilita alcun avisos monstrate per phpMyAdmin" #: libraries/config/messages.inc.php:237 msgid "" From 9b40496c0b5f77dbc8daf673a7f2ec4e28bc3cc8 Mon Sep 17 00:00:00 2001 From: Madhura Jayaratne Date: Thu, 5 Dec 2013 07:08:17 +0530 Subject: [PATCH 03/11] Force scroll to top for databases --- js/navigation.js | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/js/navigation.js b/js/navigation.js index d7c3819895..bb46edddf8 100644 --- a/js/navigation.js +++ b/js/navigation.js @@ -294,14 +294,15 @@ function expandTreeNode($expandElem, callback) * Auto-scrolls the newly chosen database * * @param object $element The element to set to view + * @param boolean $forceToTop Whether to force scroll to top * */ -function scrollToView($element) { +function scrollToView($element, $forceToTop) { var $container = $('#pma_navigation_tree_content'); var elemTop = $element.offset().top - $container.offset().top; var textHeight = 20; var scrollPadding = 20; // extra padding from top of bottom when scrolling to view - if (elemTop < 0) { + if (elemTop < 0 || $forceToTop) { $container.stop().animate({ scrollTop: elemTop + $container.scrollTop() - scrollPadding }); @@ -408,10 +409,10 @@ function PMA_showCurrentNavigation() if ($tableContainer.length > 0) { var $expander = $tableContainer.children('div:first').children('a.expander'); expandTreeNode($expander, function () { - scrollToView($dbItem); + scrollToView($dbItem, true); }); } else { - scrollToView($dbItem); + scrollToView($dbItem, true); } } } @@ -482,7 +483,7 @@ function PMA_showCurrentNavigation() // no containers, highlight the item var $tableOrView = findLoadedItem($container, table, null, true); if ($tableOrView){ - scrollToView($tableOrView); + scrollToView($tableOrView, false); } } } @@ -501,7 +502,7 @@ function PMA_showCurrentNavigation() table, 'table', true ); if ($table) { - scrollToView($table); + scrollToView($table, false); } } else if ($viewContainer.length > 0) { highlightView($viewContainer, table); @@ -534,7 +535,7 @@ function PMA_showCurrentNavigation() view, 'view', true ); if ($view) { - scrollToView($view); + scrollToView($view, false); } }); } else { @@ -543,7 +544,7 @@ function PMA_showCurrentNavigation() view, 'view', true ); if ($view) { - scrollToView($view); + scrollToView($view, false); } } } From fdb7655cf10456b4ceab3744b473426c3e4b16fa Mon Sep 17 00:00:00 2001 From: Madhura Jayaratne Date: Thu, 5 Dec 2013 07:26:54 +0530 Subject: [PATCH 04/11] Follow consistent coding style on opening curly braces for JS functions --- js/navigation.js | 27 +++++++++------------------ 1 file changed, 9 insertions(+), 18 deletions(-) diff --git a/js/navigation.js b/js/navigation.js index 7b75628310..463c719751 100644 --- a/js/navigation.js +++ b/js/navigation.js @@ -244,8 +244,7 @@ $(function () { * * @returns void */ -function expandTreeNode($expandElem, callback) -{ +function expandTreeNode($expandElem, callback) { var $children = $expandElem.closest('li').children('div.list_container'); var $icon = $expandElem.find('img'); if ($expandElem.hasClass('loaded')) { @@ -365,8 +364,7 @@ function loadChildNodes($expandElem, callback) { * * @returns void */ -function PMA_showCurrentNavigation() -{ +function PMA_showCurrentNavigation() { var db = PMA_commonParams.get('db'); var table = PMA_commonParams.get('table'); $('#pma_navigation_tree') @@ -476,8 +474,7 @@ function PMA_showCurrentNavigation() } } - function highlightTableOrView($tableContainer, $viewContainer, table) - { + function highlightTableOrView($tableContainer, $viewContainer, table) { if (isItemInContainer($tableContainer, table, 'table')) { var $expander = $tableContainer .children('div:first') @@ -494,8 +491,7 @@ function PMA_showCurrentNavigation() } } - function isItemInContainer($container, name, clazz) - { + function isItemInContainer($container, name, clazz) { $items = $container.find('li.' + clazz); var found = false; $items.each(function () { @@ -611,8 +607,7 @@ function PMA_reloadNavigation(callback) { * * @return void */ -function PMA_navigationTreePagination($this) -{ +function PMA_navigationTreePagination($this) { var $msgbox = PMA_ajaxShowMessage(); var isDbSelector = $this.closest('div.pageselector').is('.dbselector'); var url, params; @@ -1080,8 +1075,7 @@ var PMA_fastFilter = { * * @return void */ -PMA_fastFilter.filter.prototype.update = function (searchClause) -{ +PMA_fastFilter.filter.prototype.update = function (searchClause) { if (this.searchClause != searchClause) { this.searchClause = searchClause; this.$this.find('.moreResults').remove(); @@ -1094,8 +1088,7 @@ PMA_fastFilter.filter.prototype.update = function (searchClause) * * @return void */ -PMA_fastFilter.filter.prototype.request = function () -{ +PMA_fastFilter.filter.prototype.request = function () { var self = this; clearTimeout(self.timeout); if (self.$this.find('li.fast_filter').find('img.throbber').length === 0) { @@ -1151,8 +1144,7 @@ PMA_fastFilter.filter.prototype.request = function () * * @return void */ -PMA_fastFilter.filter.prototype.swap = function (list) -{ +PMA_fastFilter.filter.prototype.swap = function (list) { this.swapped = true; this.$this .html($(list).html()) @@ -1170,8 +1162,7 @@ PMA_fastFilter.filter.prototype.swap = function (list) * * @return void */ -PMA_fastFilter.filter.prototype.restore = function (focus) -{ +PMA_fastFilter.filter.prototype.restore = function (focus) { if (this.swapped) { this.swapped = false; this.$this.html(this.$clone.html()).children().show(); From 85066fee7414a3715adee1769b12e9b771247262 Mon Sep 17 00:00:00 2001 From: Dieter Adriaenssens Date: Thu, 5 Dec 2013 10:24:03 +0100 Subject: [PATCH 05/11] Translated using Weblate (Dutch) Currently translated at 100.0% (2744 of 2744) --- po/nl.po | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/po/nl.po b/po/nl.po index 7a8efa7ee8..6a3c7133a4 100644 --- a/po/nl.po +++ b/po/nl.po @@ -4,13 +4,13 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.2.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2013-12-03 12:52-0500\n" -"PO-Revision-Date: 2013-12-02 13:40+0200\n" +"PO-Revision-Date: 2013-12-05 10:24+0200\n" "Last-Translator: Dieter Adriaenssens \n" "Language-Team: Dutch \n" +"Language: nl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: nl\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Generator: Weblate 1.9-dev\n" @@ -8819,6 +8819,8 @@ msgid "" "Converts Boolean values to text (default 'T' and 'F'). First option is for " "TRUE, second for FALSE. Nonzero=true." msgstr "" +"Zet booleaanse waarden om naar tekst (standaard 'T' en 'F'). De eerste optie " +"is voor WAAR en de tweede voor ONWAAR. Een lege waarde komt neer op waar." #: libraries/plugins/transformations/abstract/DateFormatTransformationsPlugin.class.php:31 msgid "" From 6432f1e753f7940728763ef4b39ea6b2877dd0a7 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Thu, 5 Dec 2013 06:16:55 -0500 Subject: [PATCH 06/11] Fix coding style Signed-off-by: Marc Delisle --- pmd_relation_new.php | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/pmd_relation_new.php b/pmd_relation_new.php index 9c780e21bb..c2cb1d53e8 100644 --- a/pmd_relation_new.php +++ b/pmd_relation_new.php @@ -76,7 +76,8 @@ if (PMA_Util::isForeignKeySupported($type_T1) $upd_query .= ' ON UPDATE ' . $on_update; } $upd_query .= ';'; - $GLOBALS['dbi']->tryQuery($upd_query) or PMD_Return_new(0, __('Error: Relation not added.')); + $GLOBALS['dbi']->tryQuery($upd_query) + || PMD_Return_new(0, __('Error: Relation not added.')); PMD_Return_new(1, __('FOREIGN KEY relation added')); } } else { // internal (pmadb) relation @@ -86,15 +87,18 @@ if (PMA_Util::isForeignKeySupported($type_T1) // no need to recheck if the keys are primary or unique at this point, // this was checked on the interface part - $q = 'INSERT INTO ' . PMA_Util::backquote($GLOBALS['cfgRelation']['db']) . '.' . PMA_Util::backquote($cfgRelation['relation']) - . '(master_db, master_table, master_field, foreign_db, foreign_table, foreign_field)' - . ' values(' - . '\'' . PMA_Util::sqlAddSlashes($db) . '\', ' - . '\'' . PMA_Util::sqlAddSlashes($T2) . '\', ' - . '\'' . PMA_Util::sqlAddSlashes($F2) . '\', ' - . '\'' . PMA_Util::sqlAddSlashes($db) . '\', ' - . '\'' . PMA_Util::sqlAddSlashes($T1) . '\',' - . '\'' . PMA_Util::sqlAddSlashes($F1) . '\')'; + $q = 'INSERT INTO ' + . PMA_Util::backquote($GLOBALS['cfgRelation']['db']) + . '.' . PMA_Util::backquote($cfgRelation['relation']) + . '(master_db, master_table, master_field,' + . 'foreign_db, foreign_table, foreign_field)' + . ' values(' + . '\'' . PMA_Util::sqlAddSlashes($db) . '\', ' + . '\'' . PMA_Util::sqlAddSlashes($T2) . '\', ' + . '\'' . PMA_Util::sqlAddSlashes($F2) . '\', ' + . '\'' . PMA_Util::sqlAddSlashes($db) . '\', ' + . '\'' . PMA_Util::sqlAddSlashes($T1) . '\',' + . '\'' . PMA_Util::sqlAddSlashes($F1) . '\')'; if (PMA_queryAsControlUser($q, false, PMA_DatabaseInterface::QUERY_STORE)) { PMD_Return_new(1, __('Internal relation added')); @@ -109,6 +113,8 @@ if (PMA_Util::isForeignKeySupported($type_T1) * * @param string $b Value of attribute "b" * @param string $ret Value of attribute "return" + * + * @return void */ function PMD_Return_new($b,$ret) { From 8f73e8d26b7a8f5a9266fd1f1416a8e79950c12b Mon Sep 17 00:00:00 2001 From: Alfred Woo Date: Thu, 5 Dec 2013 12:51:40 +0100 Subject: [PATCH 07/11] Translated using Weblate (Korean) Currently translated at 71.0% (1950 of 2744) --- po/ko.po | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/po/ko.po b/po/ko.po index 8059ba4bf2..ae4760128e 100644 --- a/po/ko.po +++ b/po/ko.po @@ -4,14 +4,13 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.2.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2013-12-03 12:52-0500\n" -"PO-Revision-Date: 2013-11-29 11:18+0200\n" -"Last-Translator: 흥재 신 \n" -"Language-Team: Korean \n" +"PO-Revision-Date: 2013-12-05 12:51+0200\n" +"Last-Translator: Alfred Woo \n" +"Language-Team: Korean \n" +"Language: ko\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: ko\n" "Plural-Forms: nplurals=1; plural=0;\n" "X-Generator: Weblate 1.9-dev\n" @@ -433,7 +432,7 @@ msgstr "보고서를 제출해 주셔서 고맙습니다." #: error_report.php:74 msgid "Unfortunately the submission failed." -msgstr "" +msgstr "안타깝지만 제출하지 못했습니다." #: export.php:160 msgid "Bad type!" @@ -1983,10 +1982,9 @@ msgid "Create view" msgstr "뷰 생성" #: js/messages.php:408 -#, fuzzy #| msgid "Server port" msgid "Send Error Report" -msgstr "전송오류 보고서" +msgstr "오류 보고서 전송" #: js/messages.php:409 msgid "Submit Error Report" From 75983f3ced50f2d65aca33976c31a552c54cdaca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Wed, 4 Dec 2013 08:58:58 +0100 Subject: [PATCH 08/11] Add script to check Signed-off-by header in patches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Michal Čihař --- scripts/check-dco | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100755 scripts/check-dco diff --git a/scripts/check-dco b/scripts/check-dco new file mode 100755 index 0000000000..15c36bef0d --- /dev/null +++ b/scripts/check-dco @@ -0,0 +1,21 @@ +#!/bin/sh +# Checks whether all commits in given range have Signed-Off-By + +if [ -z "$1" ] ; then + echo "Usage: check-dco COMMITRANGE" + exit 1 +fi + +RESULT=0 + +for rev in `git rev-list --no-merges $1` ; do + if ! git log -1 $rev | grep -iq '^ Signed-Off-By:' ; then + echo '------------------------------------------' + echo "Missing Signed-Off-By in following commit:" + git --no-pager log -1 $rev + echo + RESULT=1 + fi +done + +exit $RESULT From 0c02835f8be0c6bcd96e016e3b7e51650177fcbf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Wed, 4 Dec 2013 09:05:42 +0100 Subject: [PATCH 09/11] Check Signed-off-by in pull requests MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Michal Čihař --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 0d8d1b7051..9e2181af6f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,5 +14,6 @@ before_script: script: - ./scripts/generate-mo --quiet - ant phpunit lint + - if [[ $TRAVIS_PULL_REQUEST != "false" ]] ; then ./scripts/check-dco $TRAVIS_COMMIT_RANGE ; fi after_script: - php vendor/bin/coveralls -v From aa92009230d913f936c2f6bd4371b6477af26120 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Wed, 4 Dec 2013 11:07:37 +0100 Subject: [PATCH 10/11] Better way to discover new commits MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Michal Čihař --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 9e2181af6f..7ce0bf3eda 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,6 +14,6 @@ before_script: script: - ./scripts/generate-mo --quiet - ant phpunit lint - - if [[ $TRAVIS_PULL_REQUEST != "false" ]] ; then ./scripts/check-dco $TRAVIS_COMMIT_RANGE ; fi + - if [[ $TRAVIS_PULL_REQUEST != "false" ]] ; then ./scripts/check-dco origin/master..FETCH_HEAD ; fi after_script: - php vendor/bin/coveralls -v From 8a398b8f00898210329787dd0a335f979ee762b0 Mon Sep 17 00:00:00 2001 From: Alfred Woo Date: Thu, 5 Dec 2013 12:51:39 +0100 Subject: [PATCH 11/11] Translated using Weblate (Korean) Currently translated at 71.1% (1950 of 2742) --- po/ko.po | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/po/ko.po b/po/ko.po index 5953a9ea58..745838adec 100644 --- a/po/ko.po +++ b/po/ko.po @@ -4,8 +4,8 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.1.0-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2013-11-25 16:19-0500\n" -"PO-Revision-Date: 2013-11-29 11:18+0200\n" -"Last-Translator: 흥재 신 \n" +"PO-Revision-Date: 2013-12-05 12:51+0200\n" +"Last-Translator: Alfred Woo \n" "Language-Team: Korean \n" "Language: ko\n" "MIME-Version: 1.0\n" @@ -432,7 +432,7 @@ msgstr "보고서를 제출해 주셔서 고맙습니다." #: error_report.php:74 msgid "Unfortunately the submission failed." -msgstr "" +msgstr "안타깝지만 제출하지 못했습니다." #: export.php:160 msgid "Bad type!" @@ -1993,10 +1993,9 @@ msgid "Create view" msgstr "뷰 생성" #: js/messages.php:408 -#, fuzzy #| msgid "Server port" msgid "Send Error Report" -msgstr "전송오류 보고서" +msgstr "오류 보고서 전송" #: js/messages.php:409 msgid "Submit Error Report"