From 16a2716c5c3cf6f27073bfbf962094b5523694ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E0=AE=95=E0=AE=A3=E0=AF=87=E0=AE=B7=E0=AF=8D=20=E0=AE=95?= =?UTF-8?q?=E0=AF=81=E0=AE=AE=E0=AE=BE=E0=AE=B0=E0=AF=8D?= Date: Sun, 4 May 2014 09:33:31 +0200 Subject: [PATCH 1/2] Translated using Weblate (Tamil) Currently translated at 27.8% (772 of 2768) --- po/ta.po | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/po/ta.po b/po/ta.po index f182b76eb2..0b0c1da634 100644 --- a/po/ta.po +++ b/po/ta.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.2.0-beta1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2014-04-24 14:50-0400\n" -"PO-Revision-Date: 2014-05-02 21:47+0200\n" +"PO-Revision-Date: 2014-05-04 09:33+0200\n" "Last-Translator: கணேஷ் குமார் \n" "Language-Team: Tamil \n" "Language: ta\n" @@ -835,6 +835,9 @@ msgid "" "multibyte charset. Without the mbstring extension phpMyAdmin is unable to " "split strings correctly and it may result in unexpected results." msgstr "" +"mbstring PHP நீட்சி காணப்படவில்லை மேலும் நீங்கள் பல்லுரு எழுத்துக்கணத்தை " +"பயன்படுத்துகிறீர்கள். mbstring PHP நீட்சி இல்லாமல் PHPMyAdminஆல் சரங்களை " +"சரியாக பிரிக்கவியலாது அதனால் எதிர்பாரா முடிவுகள் கிடைக்கலாம்." #: index.php:471 msgid "" @@ -3840,7 +3843,7 @@ msgstr "%s நாட்கள் %s மணித்தியாலங்கள #: libraries/Util.class.php:2036 msgid "Missing parameter:" -msgstr "அளவுருக்கள் காணப்படவில்லை:" +msgstr "மதிப்புருக்கள் காணப்படவில்லை:" #: libraries/Util.class.php:2557 #, php-format @@ -9228,11 +9231,11 @@ msgstr "" #: libraries/rte/rte_routines.lib.php:999 msgid "Add parameter" -msgstr "" +msgstr "மதிப்புருவை சேர்க்க" #: libraries/rte/rte_routines.lib.php:1003 msgid "Remove last parameter" -msgstr "" +msgstr "கடைசி மதிப்புருவை நீக்குக" #: libraries/rte/rte_routines.lib.php:1008 msgid "Return type" @@ -9266,7 +9269,7 @@ msgstr "" #: libraries/rte/rte_routines.lib.php:1174 #, php-format msgid "Invalid direction \"%s\" given for parameter." -msgstr "" +msgstr "மதிப்புருபுக்கு தகா வழிமதிப்பு \"%s\" அளிக்கப்பட்டுள்ளது." #: libraries/rte/rte_routines.lib.php:1196 #: libraries/rte/rte_routines.lib.php:1256 From 68761dad9129c151927935d480dcca93e9bcadf1 Mon Sep 17 00:00:00 2001 From: Madhura Jayaratne Date: Sun, 4 May 2014 19:39:20 +0530 Subject: [PATCH 2/2] Update tests to reflect the changes in PMA_GIS_modifyQuery function Signed-off-by: Madhura Jayaratne --- test/libraries/PMA_GIS_modifyQuery_test.php | 53 +++++---------------- 1 file changed, 13 insertions(+), 40 deletions(-) diff --git a/test/libraries/PMA_GIS_modifyQuery_test.php b/test/libraries/PMA_GIS_modifyQuery_test.php index a03322a265..c97595d884 100644 --- a/test/libraries/PMA_GIS_modifyQuery_test.php +++ b/test/libraries/PMA_GIS_modifyQuery_test.php @@ -46,53 +46,26 @@ class PMA_GIS_ModifyQueryTest extends PHPUnit_Framework_TestCase public function provider() { return array( - // select * + // with label column array( - 'SELECT * FROM `foo` WHERE `bar` = `zoo`', + "SELECT * FROM `foo` WHERE `bar` = `zoo`", array('spatialColumn' => 'moo', 'labelColumn' => 'noo'), - 'SELECT `noo`, ASTEXT(`moo`) AS `moo`, SRID(`moo`) AS `srid` FROM `foo` WHERE `bar` = `zoo`' + "SELECT `noo`, ASTEXT(`moo`) AS `moo`, SRID(`moo`) AS `srid` " + . "FROM (SELECT * FROM `foo` WHERE `bar` = `zoo`) AS `temp_gis`" ), - // select * with no label column + // with no label column array( - 'SELECT * FROM `foo` WHERE `bar` = `zoo`', + "SELECT * FROM `foo` WHERE `bar` = `zoo`", array('spatialColumn' => 'moo'), - 'SELECT ASTEXT(`moo`) AS `moo`, SRID(`moo`) AS `srid` FROM `foo` WHERE `bar` = `zoo`' + "SELECT ASTEXT(`moo`) AS `moo`, SRID(`moo`) AS `srid` " + . "FROM (SELECT * FROM `foo` WHERE `bar` = `zoo`) AS `temp_gis`" ), - // more columns + // with spatial column genereted on the fly array( - 'SELECT `aaa`, `moo`, `bbb`, `noo` FROM `foo` WHERE `bar` = `zoo`', - array('spatialColumn' => 'moo', 'labelColumn' => 'noo'), - 'SELECT `noo`, ASTEXT(`moo`) AS `moo`, SRID(`moo`) AS `srid` FROM `foo` WHERE `bar` = `zoo`' - ), - // no labelColumn defined - array( - 'SELECT `moo`, `noo` FROM `foo` WHERE `bar` = `zoo`', - array('spatialColumn' => 'moo'), - 'SELECT ASTEXT(`moo`) AS `moo`, SRID(`moo`) AS `srid` FROM `foo` WHERE `bar` = `zoo`' - ), - // alias for spatialColumn - array( - 'SELECT `aaa` AS `moo`, `noo` FROM `foo` WHERE `bar` = `zoo`', - array('spatialColumn' => 'moo', 'labelColumn' => 'noo'), - 'SELECT `noo`, ASTEXT(`aaa`) AS `moo`, SRID(`aaa`) AS `srid` FROM `foo` WHERE `bar` = `zoo`' - ), - // alias for labelColumn - array( - 'SELECT `moo`, `bbb` AS `noo` FROM `foo` WHERE `bar` = `zoo`', - array('spatialColumn' => 'moo', 'labelColumn' => 'noo'), - 'SELECT `bbb` AS `noo`, ASTEXT(`moo`) AS `moo`, SRID(`moo`) AS `srid` FROM `foo` WHERE `bar` = `zoo`' - ), - // with database names - array( - 'SELECT `db`.`moo`, `db`.`noo` FROM `foo` WHERE `bar` = `zoo`', - array('spatialColumn' => 'moo', 'labelColumn' => 'noo'), - 'SELECT `db`.`noo`, ASTEXT(`db`.`moo`) AS `moo`, SRID(`db`.`moo`) AS `srid` FROM `foo` WHERE `bar` = `zoo`' - ), - // database names plus alias - array( - 'SELECT `db`.`aaa` AS `moo`, `noo` FROM `foo` WHERE `bar` = `zoo`', - array('spatialColumn' => 'moo', 'labelColumn' => 'noo'), - 'SELECT `noo`, ASTEXT(`db`.`aaa`) AS `moo`, SRID(`db`.`aaa`) AS `srid` FROM `foo` WHERE `bar` = `zoo`' + "SELECT name, PointFromText( Concat( 'POINT (', geo_lat, ' ', geo_lon, ')' ) ) AS coordinates FROM users", + array('spatialColumn' => 'coordinates', 'labelColumn' => 'name'), + "SELECT `name`, ASTEXT(`coordinates`) AS `coordinates`, SRID(`coordinates`) AS `srid` " + . "FROM (SELECT name, PointFromText( Concat( 'POINT (', geo_lat, ' ', geo_lon, ')' ) ) AS coordinates FROM users) AS `temp_gis`" ), ); }