From f6a0e4cf46ceee2cb536e84e290ca50163821f06 Mon Sep 17 00:00:00 2001 From: Chanaka Indrajith Date: Tue, 3 Jul 2012 11:34:35 +0530 Subject: [PATCH 01/11] Test for _getEditLink function in PMA_DisplayResults class --- test/classes/PMA_DisplayResults_test.php | 61 ++++++++++++++++++++++-- 1 file changed, 57 insertions(+), 4 deletions(-) diff --git a/test/classes/PMA_DisplayResults_test.php b/test/classes/PMA_DisplayResults_test.php index 39397cf475..f6fa594c67 100644 --- a/test/classes/PMA_DisplayResults_test.php +++ b/test/classes/PMA_DisplayResults_test.php @@ -640,7 +640,7 @@ class PMA_DisplayResults_test extends PHPUnit_Framework_TestCase /** * Data provider for testGetCheckBoxesForMultipleRowOperations * - * return array parameters and output + * @return array parameters and output */ public function dataProviderForGetCheckBoxesForMultipleRowOperations() { @@ -778,7 +778,7 @@ class PMA_DisplayResults_test extends PHPUnit_Framework_TestCase /** * Data provider for testGetSortParamsCase1 * - * return array parameters and output + * @return array parameters and output */ public function dataProviderForGetSortParamsCase1() { @@ -808,7 +808,7 @@ class PMA_DisplayResults_test extends PHPUnit_Framework_TestCase /** * Data provider for testGetSortParamsCase2 * - * return array parameters and output + * @return array parameters and output */ public function dataProviderForGetSortParamsCase2() { @@ -845,7 +845,7 @@ class PMA_DisplayResults_test extends PHPUnit_Framework_TestCase /** * Data provider for testGetCheckboxForMultiRowSubmissions * - * return array parameters and output + * @return array parameters and output */ public function dataProviderForGetCheckboxForMultiRowSubmissions() { @@ -886,6 +886,7 @@ class PMA_DisplayResults_test extends PHPUnit_Framework_TestCase * @param string $id_suffix suffix for the id * @param string $class css classes for the td element * @param string $output output of _getSortParams + * @param string $output output of _getCheckboxForMultiRowSubmissions * * @dataProvider dataProviderForGetCheckboxForMultiRowSubmissions */ @@ -905,5 +906,57 @@ class PMA_DisplayResults_test extends PHPUnit_Framework_TestCase ); } + /** + * Data provider for testGetEditLink + * + * @return array parametres and output + */ + public function dataProviderForGetEditLink() + { + return array( + array( + 'tbl_change.php?db=Data&table=customer&where_clause=%60customer%60.%60id%60+%3D+1&clause_is_unique=1&sql_query=SELECT+%2A+FROM+%60customer%60&goto=sql.php&default_action=update&token=bbd5003198a3bd856b21d9607d6c6a1e', + 'odd edit_row_anchor row_0 vpointer vmarker', + 'Edit Edit', + '`customer`.`id` = 1', + '%60customer%60.%60id%60+%3D+1', + ' +Edit Edit +' + ) + ); + } + + /** + * Test for _getEditLink + * + * @param string $edit_url edit url + * @param string $class css classes for td element + * @param string $edit_str text for the edit link + * @param string $where_clause where clause + * @param string $where_clause_html url encoded where clause + * @param string $output _getEditLink + * + * @dataProvider dataProviderForGetEditLink + */ + public function testGetEditLink( + $edit_url, $class, $edit_str, $where_clause, $where_clause_html, $output + ) { + + $GLOBALS['cfg']['PropertiesIconic'] = 'both'; + $GLOBALS['cfg']['LinkLengthLimit'] = 1000; + + $this->assertEquals( + $this->_callPrivateFunction( + '_getEditLink', + array( + $edit_url, $class, $edit_str, $where_clause, $where_clause_html + ) + ), + $output + ); + + } + } From a4b02c26e6573ae5de9277aec2d253ae8b946913 Mon Sep 17 00:00:00 2001 From: Chanaka Indrajith Date: Tue, 3 Jul 2012 12:32:21 +0530 Subject: [PATCH 02/11] Test for _getCopyLink function in PMA_DisplayResults class --- test/classes/PMA_DisplayResults_test.php | 53 +++++++++++++++++++++++- 1 file changed, 52 insertions(+), 1 deletion(-) diff --git a/test/classes/PMA_DisplayResults_test.php b/test/classes/PMA_DisplayResults_test.php index f6fa594c67..7acf64e230 100644 --- a/test/classes/PMA_DisplayResults_test.php +++ b/test/classes/PMA_DisplayResults_test.php @@ -935,7 +935,7 @@ class PMA_DisplayResults_test extends PHPUnit_Framework_TestCase * @param string $edit_str text for the edit link * @param string $where_clause where clause * @param string $where_clause_html url encoded where clause - * @param string $output _getEditLink + * @param string $output output of _getEditLink * * @dataProvider dataProviderForGetEditLink */ @@ -958,5 +958,56 @@ class PMA_DisplayResults_test extends PHPUnit_Framework_TestCase } + /** + * Data provider for testGetCopyLink + * + * @return array parameters and output + */ + public function dataProviderForGetCopyLink() + { + return array( + array( + 'tbl_change.php?db=Data&table=customer&where_clause=%60customer%60.%60id%60+%3D+1&clause_is_unique=1&sql_query=SELECT+%2A+FROM+%60customer%60&goto=sql.php&default_action=insert&token=f597309d3a066c3c81a6cb015a79636d', + 'Copy Copy', + '`customer`.`id` = 1', + '%60customer%60.%60id%60+%3D+1', + 'odd row_0 vpointer vmarker', + ' +Copy Copy +' + ) + ); + } + + /** + * Test for _getCopyLink + * + * @param string $copy_url copy url + * @param string $copy_str text for the copy link + * @param string $where_clause where clause + * @param string $where_clause_html url encoded where clause + * @param string $class css classes for the td element + * @param string $output output of _getCopyLink + * + * @dataProvider dataProviderForGetCopyLink + */ + public function testGetCopyLink( + $copy_url, $copy_str, $where_clause, $where_clause_html, $class, $output + ) { + + $GLOBALS['cfg']['PropertiesIconic'] = 'both'; + $GLOBALS['cfg']['LinkLengthLimit'] = 1000; + + $this->assertEquals( + $this->_callPrivateFunction( + '_getCopyLink', + array( + $copy_url, $copy_str, $where_clause, $where_clause_html, $class + ) + ), + $output + ); + } + } From c35dd10750a14edaae8291342521aa91da90ffe8 Mon Sep 17 00:00:00 2001 From: Chanaka Indrajith Date: Tue, 3 Jul 2012 12:44:24 +0530 Subject: [PATCH 03/11] Test for _getDeleteLink function in PMA_DisplayResults class --- test/classes/PMA_DisplayResults_test.php | 50 ++++++++++++++++++++++++ 1 file changed, 50 insertions(+) diff --git a/test/classes/PMA_DisplayResults_test.php b/test/classes/PMA_DisplayResults_test.php index 7acf64e230..ca8afa0888 100644 --- a/test/classes/PMA_DisplayResults_test.php +++ b/test/classes/PMA_DisplayResults_test.php @@ -12,6 +12,7 @@ require_once 'libraries/DisplayResults.class.php'; require_once 'libraries/url_generating.lib.php'; require_once 'libraries/php-gettext/gettext.inc'; require_once 'libraries/CommonFunctions.class.php'; +require_once 'libraries/js_escape.lib.php'; class PMA_DisplayResults_test extends PHPUnit_Framework_TestCase @@ -1009,5 +1010,54 @@ class PMA_DisplayResults_test extends PHPUnit_Framework_TestCase ); } + /** + * Data provider for testGetDeleteLink + * + * @return array parameters and output + */ + public function dataProviderForGetDeleteLink() + { + return array( + array( + 'sql.php?db=Data&table=customer&sql_query=DELETE+FROM+%60Data%60.%60customer%60+WHERE+%60customer%60.%60id%60+%3D+1&message_to_show=The+row+has+been+deleted&goto=sql.php%3Fdb%3DData%26table%3Dcustomer%26sql_query%3DSELECT%2B%252A%2BFROM%2B%2560customer%2560%26message_to_show%3DThe%2Brow%2Bhas%2Bbeen%2Bdeleted%26goto%3Dtbl_structure.php%26token%3Df597309d3a066c3c81a6cb015a79636d&token=f597309d3a066c3c81a6cb015a79636d', + 'Delete Delete', + 'DELETE FROM `Data`.`customer` WHERE `customer`.`id` = 1', + 'odd row_0 vpointer vmarker', + ' +Delete Delete +' + ) + ); + } + + /** + * Test for _getDeleteLink + * + * @param string $del_url delete url + * @param string $del_str text for the delete link + * @param string $js_conf text for the JS confirmation + * @param string $class css classes for the td element + * @param string $output output of _getDeleteLink + * + * @dataProvider dataProviderForGetDeleteLink + */ + public function testGetDeleteLink( + $del_url, $del_str, $js_conf, $class, $output + ) { + + $GLOBALS['cfg']['PropertiesIconic'] = 'both'; + $GLOBALS['cfg']['LinkLengthLimit'] = 1000; + + $this->assertEquals( + $this->_callPrivateFunction( + '_getDeleteLink', + array( + $del_url, $del_str, $js_conf, $class + ) + ), + $output + ); + } + } From 68ddeb300873019ede8384d66a0e862fd51092b0 Mon Sep 17 00:00:00 2001 From: Chanaka Indrajith Date: Tue, 3 Jul 2012 13:26:46 +0530 Subject: [PATCH 04/11] Test for _getCheckboxAndLinks function in PMA_DisplayResults class --- test/classes/PMA_DisplayResults_test.php | 267 +++++++++++++++++++++++ 1 file changed, 267 insertions(+) diff --git a/test/classes/PMA_DisplayResults_test.php b/test/classes/PMA_DisplayResults_test.php index ca8afa0888..4912d357c3 100644 --- a/test/classes/PMA_DisplayResults_test.php +++ b/test/classes/PMA_DisplayResults_test.php @@ -1059,5 +1059,272 @@ class PMA_DisplayResults_test extends PHPUnit_Framework_TestCase ); } + /** + * Data provider for testGetCheckboxAndLinksCase1 + * + * @return array parameters and output + */ + public function dataProviderForGetCheckboxAndLinksCase1() + { + return array( + array( + PMA_DisplayResults::POSITION_LEFT, + 'sql.php?db=data&table=new&sql_query=DELETE+FROM+%60data%60.%60new%60+WHERE+%60new%60.%60id%60+%3D+1&message_to_show=The+row+has+been+deleted&goto=sql.php%3Fdb%3Ddata%26table%3Dnew%26sql_query%3DSELECT%2B%252A%2BFROM%2B%2560new%2560%26message_to_show%3DThe%2Brow%2Bhas%2Bbeen%2Bdeleted%26goto%3Dtbl_structure.php%26token%3Dae4c6d18375f446dfa068420c1f6a4e8&token=ae4c6d18375f446dfa068420c1f6a4e8', + array( + 'edit_lnk' => 'ur', + 'del_lnk' => 'dr', + 'sort_lnk' => '0', + 'nav_bar' => '1', + 'ins_row' => '1', + 'bkm_form' => '1', + 'text_btn' => '1', + 'pview_lnk' => '1' + ), + 0, + '`new`.`id` = 1', + '%60new%60.%60id%60+%3D+1', + array( + '`new`.`id`' => '= 1', + ), + 'DELETE FROM `data`.`new` WHERE `new`.`id` = 1', + 'l', + 'tbl_change.php?db=data&table=new&where_clause=%60new%60.%60id%60+%3D+1&clause_is_unique=1&sql_query=SELECT+%2A+FROM+%60new%60&goto=sql.php&default_action=update&token=ae4c6d18375f446dfa068420c1f6a4e8', + 'tbl_change.php?db=data&table=new&where_clause=%60new%60.%60id%60+%3D+1&clause_is_unique=1&sql_query=SELECT+%2A+FROM+%60new%60&goto=sql.php&default_action=insert&token=ae4c6d18375f446dfa068420c1f6a4e8', + 'edit_row_anchor', + 'Edit Edit', + 'Copy Copy', + 'Delete Delete', + 'DELETE FROM `data`.`new` WHERE `new`.`id` = 1', + ' +Edit Edit + +Copy Copy + +Delete Delete +' + ) + ); + } + + /** + * Test for _getCheckboxAndLinks - case 1 + * + * @param string $position the position of the checkbox and links + * @param string $del_url delete url + * @param array $is_display array with explicit indexes for all the + * display elements + * @param string $row_no row number + * @param string $where_clause where clause + * @param string $where_clause_html url encoded where clause + * @param array $condition_array array of conditions in the where clause + * @param string $del_query delete query + * @param string $id_suffix suffix for the id + * @param string $edit_url edit url + * @param string $copy_url copy url + * @param string $class css classes for the td elements + * @param string $edit_str text for the edit link + * @param string $copy_str text for the copy link + * @param string $del_str text for the delete link + * @param string $js_conf text for the JS confirmation + * @param string $output output of _getCheckboxAndLinks + * + * @dataProvider dataProviderForGetCheckboxAndLinksCase1 + */ + public function testGetCheckboxAndLinksCase1( + $position, $del_url, $is_display, $row_no, $where_clause, + $where_clause_html, $condition_array, $del_query, $id_suffix, $edit_url, + $copy_url, $class, $edit_str, $copy_str, $del_str, $js_conf, $output + ) { + + $this->assertEquals( + $this->_callPrivateFunction( + '_getCheckboxAndLinks', + array( + $position, $del_url, $is_display, $row_no, $where_clause, + $where_clause_html, $condition_array, $del_query, + $id_suffix, $edit_url, $copy_url, $class, $edit_str, + $copy_str, $del_str, $js_conf + ) + ), + $output + ); + } + + /** + * Data provider for testGetCheckboxAndLinksCase2 + * + * @return array parameters and output + */ + public function dataProviderForGetCheckboxAndLinksCase2() + { + return array( + array( + PMA_DisplayResults::POSITION_RIGHT, + 'sql.php?db=data&table=new&sql_query=DELETE+FROM+%60data%60.%60new%60+WHERE+%60new%60.%60id%60+%3D+1&message_to_show=The+row+has+been+deleted&goto=sql.php%3Fdb%3Ddata%26table%3Dnew%26sql_query%3DSELECT%2B%252A%2BFROM%2B%2560new%2560%26message_to_show%3DThe%2Brow%2Bhas%2Bbeen%2Bdeleted%26goto%3Dtbl_structure.php%26token%3Dae4c6d18375f446dfa068420c1f6a4e8&token=ae4c6d18375f446dfa068420c1f6a4e8', + array( + 'edit_lnk' => 'ur', + 'del_lnk' => 'dr', + 'sort_lnk' => '0', + 'nav_bar' => '1', + 'ins_row' => '1', + 'bkm_form' => '1', + 'text_btn' => '1', + 'pview_lnk' => '1' + ), + 0, + '`new`.`id` = 1', + '%60new%60.%60id%60+%3D+1', + array( + '`new`.`id`' => '= 1', + ), + 'DELETE FROM `data`.`new` WHERE `new`.`id` = 1', + 'l', + 'tbl_change.php?db=data&table=new&where_clause=%60new%60.%60id%60+%3D+1&clause_is_unique=1&sql_query=SELECT+%2A+FROM+%60new%60&goto=sql.php&default_action=update&token=ae4c6d18375f446dfa068420c1f6a4e8', + 'tbl_change.php?db=data&table=new&where_clause=%60new%60.%60id%60+%3D+1&clause_is_unique=1&sql_query=SELECT+%2A+FROM+%60new%60&goto=sql.php&default_action=insert&token=ae4c6d18375f446dfa068420c1f6a4e8', + 'edit_row_anchor', + 'Edit Edit', + 'Copy Copy', + 'Delete Delete', + 'DELETE FROM `data`.`new` WHERE `new`.`id` = 1', + ' +Delete Delete + +Copy Copy + +Edit Edit + ' + ) + ); + } + + /** + * Test for _getCheckboxAndLinks - case 2 + * + * @param string $position the position of the checkbox and links + * @param string $del_url delete url + * @param array $is_display array with explicit indexes for all the + * display elements + * @param string $row_no row number + * @param string $where_clause where clause + * @param string $where_clause_html url encoded where clause + * @param array $condition_array array of conditions in the where clause + * @param string $del_query delete query + * @param string $id_suffix suffix for the id + * @param string $edit_url edit url + * @param string $copy_url copy url + * @param string $class css classes for the td elements + * @param string $edit_str text for the edit link + * @param string $copy_str text for the copy link + * @param string $del_str text for the delete link + * @param string $js_conf text for the JS confirmation + * @param string $output output of _getCheckboxAndLinks + * + * @dataProvider dataProviderForGetCheckboxAndLinksCase2 + */ + public function testGetCheckboxAndLinksCase2( + $position, $del_url, $is_display, $row_no, $where_clause, + $where_clause_html, $condition_array, $del_query, $id_suffix, $edit_url, + $copy_url, $class, $edit_str, $copy_str, $del_str, $js_conf, $output + ) { + + $this->assertEquals( + $this->_callPrivateFunction( + '_getCheckboxAndLinks', + array( + $position, $del_url, $is_display, $row_no, $where_clause, + $where_clause_html, $condition_array, $del_query, + $id_suffix, $edit_url, $copy_url, $class, $edit_str, + $copy_str, $del_str, $js_conf + ) + ), + $output + ); + } + + /** + * Data provider for testGetCheckboxAndLinksCase3 + * + * @return array parameters and output + */ + public function dataProviderForGetCheckboxAndLinksCase3() + { + return array( + array( + PMA_DisplayResults::POSITION_NONE, + 'sql.php?db=data&table=new&sql_query=DELETE+FROM+%60data%60.%60new%60+WHERE+%60new%60.%60id%60+%3D+1&message_to_show=The+row+has+been+deleted&goto=sql.php%3Fdb%3Ddata%26table%3Dnew%26sql_query%3DSELECT%2B%252A%2BFROM%2B%2560new%2560%26message_to_show%3DThe%2Brow%2Bhas%2Bbeen%2Bdeleted%26goto%3Dtbl_structure.php%26token%3Dae4c6d18375f446dfa068420c1f6a4e8&token=ae4c6d18375f446dfa068420c1f6a4e8', + array( + 'edit_lnk' => 'ur', + 'del_lnk' => 'dr', + 'sort_lnk' => '0', + 'nav_bar' => '1', + 'ins_row' => '1', + 'bkm_form' => '1', + 'text_btn' => '1', + 'pview_lnk' => '1' + ), + 0, + '`new`.`id` = 1', + '%60new%60.%60id%60+%3D+1', + array( + '`new`.`id`' => '= 1', + ), + 'DELETE FROM `data`.`new` WHERE `new`.`id` = 1', + 'l', + 'tbl_change.php?db=data&table=new&where_clause=%60new%60.%60id%60+%3D+1&clause_is_unique=1&sql_query=SELECT+%2A+FROM+%60new%60&goto=sql.php&default_action=update&token=ae4c6d18375f446dfa068420c1f6a4e8', + 'tbl_change.php?db=data&table=new&where_clause=%60new%60.%60id%60+%3D+1&clause_is_unique=1&sql_query=SELECT+%2A+FROM+%60new%60&goto=sql.php&default_action=insert&token=ae4c6d18375f446dfa068420c1f6a4e8', + 'edit_row_anchor', + 'Edit Edit', + 'Copy Copy', + 'Delete Delete', + 'DELETE FROM `data`.`new` WHERE `new`.`id` = 1', + ' ' + ) + ); + } + + /** + * Test for _getCheckboxAndLinks - case 3 + * + * @param string $position the position of the checkbox and links + * @param string $del_url delete url + * @param array $is_display array with explicit indexes for all the + * display elements + * @param string $row_no row number + * @param string $where_clause where clause + * @param string $where_clause_html url encoded where clause + * @param array $condition_array array of conditions in the where clause + * @param string $del_query delete query + * @param string $id_suffix suffix for the id + * @param string $edit_url edit url + * @param string $copy_url copy url + * @param string $class css classes for the td elements + * @param string $edit_str text for the edit link + * @param string $copy_str text for the copy link + * @param string $del_str text for the delete link + * @param string $js_conf text for the JS confirmation + * @param string $output output of _getCheckboxAndLinks + * + * @dataProvider dataProviderForGetCheckboxAndLinksCase3 + */ + public function testGetCheckboxAndLinksCase3( + $position, $del_url, $is_display, $row_no, $where_clause, + $where_clause_html, $condition_array, $del_query, $id_suffix, $edit_url, + $copy_url, $class, $edit_str, $copy_str, $del_str, $js_conf, $output + ) { + + $this->assertEquals( + $this->_callPrivateFunction( + '_getCheckboxAndLinks', + array( + $position, $del_url, $is_display, $row_no, $where_clause, + $where_clause_html, $condition_array, $del_query, + $id_suffix, $edit_url, $copy_url, $class, $edit_str, + $copy_str, $del_str, $js_conf + ) + ), + $output + ); + } + } From d357356e45ab887c7eb301f62f43bf74567bb6d5 Mon Sep 17 00:00:00 2001 From: Chanaka Indrajith Date: Tue, 3 Jul 2012 20:37:47 +0530 Subject: [PATCH 05/11] Test for _mimeDefaultFunction function in PMA_DisplayResults class --- test/classes/PMA_DisplayResults_test.php | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/test/classes/PMA_DisplayResults_test.php b/test/classes/PMA_DisplayResults_test.php index 4912d357c3..feb0da32dd 100644 --- a/test/classes/PMA_DisplayResults_test.php +++ b/test/classes/PMA_DisplayResults_test.php @@ -1326,5 +1326,19 @@ class PMA_DisplayResults_test extends PHPUnit_Framework_TestCase ); } + /** + * Test for _mimeDefaultFunction + */ + public function testMimeDefaultFunction() + { + $this->assertEquals( + $this->_callPrivateFunction( + '_mimeDefaultFunction', + array("A 'quote' is bold") + ), + "A 'quote' is <b>bold</b>" + ); + } + } From 1c245c06f3adcf76d216cd763ca656e2458a0492 Mon Sep 17 00:00:00 2001 From: Chanaka Indrajith Date: Tue, 3 Jul 2012 20:41:13 +0530 Subject: [PATCH 06/11] Test for _getPlacedLinks function in PMA_DisplayResults class --- test/classes/PMA_DisplayResults_test.php | 85 +++++++++++++++++++++++- 1 file changed, 84 insertions(+), 1 deletion(-) diff --git a/test/classes/PMA_DisplayResults_test.php b/test/classes/PMA_DisplayResults_test.php index feb0da32dd..12bb7127b2 100644 --- a/test/classes/PMA_DisplayResults_test.php +++ b/test/classes/PMA_DisplayResults_test.php @@ -1338,7 +1338,90 @@ class PMA_DisplayResults_test extends PHPUnit_Framework_TestCase ), "A 'quote' is <b>bold</b>" ); - } + } + + /** + * Data provider for testGetPlacedLinks + * + * @return array parameters and output + */ + public function dataProviderForGetPlacedLinks() + { + return array( + array( + PMA_DisplayResults::POSITION_NONE, + 'sql.php?db=data&table=new&sql_query=DELETE+FROM+%60data%60.%60new%60+WHERE+%60new%60.%60id%60+%3D+1&message_to_show=The+row+has+been+deleted&goto=sql.php%3Fdb%3Ddata%26table%3Dnew%26sql_query%3DSELECT%2B%252A%2BFROM%2B%2560new%2560%26message_to_show%3DThe%2Brow%2Bhas%2Bbeen%2Bdeleted%26goto%3Dtbl_structure.php%26token%3Dae4c6d18375f446dfa068420c1f6a4e8&token=ae4c6d18375f446dfa068420c1f6a4e8', + array( + 'edit_lnk' => 'ur', + 'del_lnk' => 'dr', + 'sort_lnk' => '0', + 'nav_bar' => '1', + 'ins_row' => '1', + 'bkm_form' => '1', + 'text_btn' => '1', + 'pview_lnk' => '1' + ), + 0, + '`new`.`id` = 1', + '%60new%60.%60id%60+%3D+1', + array( + '`new`.`id`' => '= 1', + ), + 'DELETE FROM `data`.`new` WHERE `new`.`id` = 1', + 'l', + 'tbl_change.php?db=data&table=new&where_clause=%60new%60.%60id%60+%3D+1&clause_is_unique=1&sql_query=SELECT+%2A+FROM+%60new%60&goto=sql.php&default_action=update&token=ae4c6d18375f446dfa068420c1f6a4e8', + 'tbl_change.php?db=data&table=new&where_clause=%60new%60.%60id%60+%3D+1&clause_is_unique=1&sql_query=SELECT+%2A+FROM+%60new%60&goto=sql.php&default_action=insert&token=ae4c6d18375f446dfa068420c1f6a4e8', + 'edit_row_anchor', + 'Edit Edit', + 'Copy Copy', + 'Delete Delete', + null, + ' ' + ) + ); + } + + /** + * Test for _getPlacedLinks + * + * @param string $dir the direction of links should place + * @param string $del_url the url for delete row + * @param array $is_display which elements to display + * @param integer $row_no the index of current row + * @param string $where_clause the where clause of the sql + * @param string $where_clause_html the html encoded where clause + * @param array $condition_array array of keys (primary, unique, condition) + * @param string $del_query the query for delete row + * @param string $dir_letter the letter denoted the direction + * @param string $edit_url the url for edit row + * @param string $copy_url the url for copy row + * @param string $edit_anchor_class the class for html element for edit + * @param string $edit_str the label for edit row + * @param string $copy_str the label for copy row + * @param string $del_str the label for delete row + * @param string $js_conf text for the JS confirmation + * @param string $output output of _getPlacedLinks + * + * @dataProvider dataProviderForGetPlacedLinks + */ + public function testGetPlacedLinks( + $dir, $del_url, $is_display, $row_no, $where_clause, $where_clause_html, + $condition_array, $del_query, $dir_letter, $edit_url, $copy_url, + $edit_anchor_class, $edit_str, $copy_str, $del_str, $js_conf, $output + ) { + $this->assertEquals( + $this->_callPrivateFunction( + '_getPlacedLinks', + array( + $dir, $del_url, $is_display, $row_no, $where_clause, + $where_clause_html, $condition_array, $del_query, + $dir_letter, $edit_url, $copy_url, $edit_anchor_class, + $edit_str, $copy_str, $del_str, $js_conf + ) + ), + $output + ); + } } From 682adac5e2abcdf32f1edbabe6ec69b6c7824762 Mon Sep 17 00:00:00 2001 From: Aputsiaq Niels Janussen Date: Wed, 4 Jul 2012 02:53:55 +0200 Subject: [PATCH 07/11] Translated using Weblate. --- po/da.po | 45 +++++++++++++++++++++------------------------ 1 file changed, 21 insertions(+), 24 deletions(-) diff --git a/po/da.po b/po/da.po index 5906659ad7..8dd9b15df6 100644 --- a/po/da.po +++ b/po/da.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.0.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2012-07-03 09:19+0200\n" -"PO-Revision-Date: 2012-06-25 16:57+0200\n" +"PO-Revision-Date: 2012-07-04 01:34+0200\n" "Last-Translator: Aputsiaq Niels Janussen \n" "Language-Team: danish \n" "Language: da\n" @@ -12,7 +12,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Weblate 1.0\n" +"X-Generator: Weblate 1.1\n" #: browse_foreigners.php:36 browse_foreigners.php:60 js/messages.php:354 #: libraries/DisplayResults.class.php:609 server_privileges.php:1851 @@ -1868,15 +1868,14 @@ msgstr "Når der holdes over et punkt vises dets etiket." #: js/messages.php:304 msgid "To zoom in, select a section of the plot with the mouse." -msgstr "" +msgstr "For at forstørre, vælg en sektion af plottet med musen." #: js/messages.php:306 -#, fuzzy #| msgid "Click reset zoom link to come back to original state." msgid "Click reset zoom button to come back to original state." msgstr "" -"Klik på linket for nulstil zoom for at vende tilbage til den oprindelige " -"tilstand." +"Klik på knap til nulstilling af zoom for at vende tilbage til den " +"oprindelige tilstand." #: js/messages.php:308 msgid "Click a data point to view and possibly edit the data row." @@ -1900,10 +1899,9 @@ msgid "Query results" msgstr "Forespørgselsresultater" #: js/messages.php:315 -#, fuzzy #| msgid "Data pointer size" msgid "Data point content" -msgstr "Data pointer-størrelse" +msgstr "Datapunkt-indhold" #: js/messages.php:318 tbl_change.php:244 tbl_indexes.php:249 #: tbl_indexes.php:284 @@ -2329,22 +2327,24 @@ msgstr "Mislykkedes med at formatere streng for reglen '%s'." msgid "" "Invalid rule declaration on line %1$s, expected line %2$s of previous rule" msgstr "" +"Ugyldig regel-deklaration på linje %1$s, forventede linje %2$s fra forrige " +"regel" #: libraries/Advisor.class.php:378 -#, fuzzy, php-format +#, php-format #| msgid "Invalid format of CSV input on line %d." msgid "Invalid rule declaration on line %s" -msgstr "Ugyldigt format for CSV-input på linie %d." +msgstr "Ugyldig regel-deklaration på linie %s" #: libraries/Advisor.class.php:386 #, php-format msgid "Unexpected characters on line %s" -msgstr "" +msgstr "Uventet tegn på linje %s" #: libraries/Advisor.class.php:400 #, php-format msgid "Unexpected character on line %1$s. Expected tab, but found \"%2$s\"" -msgstr "" +msgstr "Uventet tegn på linje %1$s. Forventede tabulering, men fandt \"%2$s\"" #: libraries/Advisor.class.php:425 server_status.php:972 msgid "per second" @@ -2361,7 +2361,7 @@ msgstr "pr. time" #: libraries/Advisor.class.php:434 msgid "per day" -msgstr "" +msgstr "per dag" #: libraries/CommonFunctions.class.php:251 #, php-format @@ -2654,10 +2654,10 @@ msgid "vertical" msgstr "lodret" #: libraries/DisplayResults.class.php:734 -#, fuzzy, php-format +#, php-format #| msgid "Headers every %s rows" msgid "Headers every %s rows" -msgstr "Overskrifter for hver %s rows" +msgstr "Overskrifter for hver %s. række" #: libraries/DisplayResults.class.php:1217 msgid "Sort by key" @@ -2724,10 +2724,9 @@ msgid "Show binary contents as HEX" msgstr "Vis binært indhold som HEX" #: libraries/DisplayResults.class.php:1417 -#, fuzzy #| msgid "Browser transformation" msgid "Hide browser transformation" -msgstr "Browser transformation" +msgstr "Skjul browser-transformation" #: libraries/DisplayResults.class.php:1426 msgid "Well Known Text" @@ -2810,7 +2809,7 @@ msgstr "Link ikke fundet" #: libraries/Error_Handler.class.php:65 msgid "Too many error messages, some are not displayed." -msgstr "" +msgstr "For mange fejlmeddelelser, nogle vises ikke." #: libraries/File.class.php:235 msgid "File was not an uploaded file." @@ -2876,10 +2875,9 @@ msgstr "Herefter skal cookies være slået til." #: libraries/Header.class.php:500 #: libraries/plugins/auth/AuthenticationCookie.class.php:152 -#, fuzzy #| msgid "Cookies must be enabled past this point." msgid "Javascript must be enabled past this point" -msgstr "Herefter skal cookies være slået til." +msgstr "Herefter skal JavaScript være slået til" #: libraries/Index.class.php:433 tbl_relation.php:540 msgid "No index defined!" @@ -2990,10 +2988,9 @@ msgid "Designer" msgstr "Designer" #: libraries/Menu.class.php:484 -#, fuzzy #| msgid "User" msgid "Users" -msgstr "Bruger" +msgstr "Brugere" #: libraries/Menu.class.php:505 server_synchronize.php:1320 #: server_synchronize.php:1327 @@ -3085,10 +3082,10 @@ msgid "unknown table status: " msgstr "ukendt tabelstatus: " #: libraries/Table.class.php:766 -#, fuzzy, php-format +#, php-format #| msgid "Source database" msgid "Source database `%s` was not found!" -msgstr "Kildedatabase" +msgstr "Kildedatabasen '%s' blev ikke fundet!" #: libraries/Table.class.php:774 #, fuzzy, php-format From 7ff3160f709c524f599f06a7542c30a8289eedca Mon Sep 17 00:00:00 2001 From: Nicholas Arnesen Date: Wed, 4 Jul 2012 02:53:59 +0200 Subject: [PATCH 08/11] Translated using Weblate. --- po/nb.po | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/po/nb.po b/po/nb.po index 3672ea8f74..69aed731da 100644 --- a/po/nb.po +++ b/po/nb.po @@ -4,15 +4,15 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.0.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2012-07-03 09:19+0200\n" -"PO-Revision-Date: 2012-05-17 15:22+0200\n" -"Last-Translator: Michal Čihař \n" +"PO-Revision-Date: 2012-07-04 01:21+0200\n" +"Last-Translator: Nicholas Arnesen \n" "Language-Team: norwegian \n" "Language: nb\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Weblate 1.0\n" +"X-Generator: Weblate 1.1\n" #: browse_foreigners.php:36 browse_foreigners.php:60 js/messages.php:354 #: libraries/DisplayResults.class.php:609 server_privileges.php:1851 @@ -823,7 +823,7 @@ msgstr "Geometri" #: gis_data_editor.php:161 js/messages.php:322 msgid "Point" -msgstr "" +msgstr "Punkt" #: gis_data_editor.php:162 gis_data_editor.php:186 gis_data_editor.php:234 #: gis_data_editor.php:286 js/messages.php:320 @@ -839,12 +839,12 @@ msgstr "Y" #: js/messages.php:323 #, php-format msgid "Point %d" -msgstr "" +msgstr "Peker %d" #: gis_data_editor.php:193 gis_data_editor.php:239 gis_data_editor.php:291 #: js/messages.php:329 msgid "Add a point" -msgstr "" +msgstr "Legg til peker" #: gis_data_editor.php:209 js/messages.php:324 msgid "Linestring" @@ -12676,14 +12676,13 @@ msgid "Distinct values" msgstr "Se gjennom distinkte verdier" #: tbl_structure.php:166 tbl_structure.php:167 -#, fuzzy #| msgid "Adding Primary Key" msgid "Add primary key" -msgstr "Legger til primærnøkkel" +msgstr "Legg til primærnøkkel" #: tbl_structure.php:170 tbl_structure.php:171 msgid "Add unique index" -msgstr "" +msgstr "Legg til unik indeks" #: tbl_structure.php:172 tbl_structure.php:173 #, fuzzy From 7ee2568b9c011e2080a9aeceb46bd7eb203cc1cc Mon Sep 17 00:00:00 2001 From: Ashiyane Digital Security Team Date: Wed, 4 Jul 2012 02:54:00 +0200 Subject: [PATCH 09/11] Translated using Weblate. --- po/fa.po | 49 +++++++++++++++++++++++++++---------------------- 1 file changed, 27 insertions(+), 22 deletions(-) diff --git a/po/fa.po b/po/fa.po index e4ab1343d0..bff1f2727a 100644 --- a/po/fa.po +++ b/po/fa.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.0.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2012-07-03 09:19+0200\n" -"PO-Revision-Date: 2012-07-03 16:34+0200\n" +"PO-Revision-Date: 2012-07-04 00:33+0200\n" "Last-Translator: Ashiyane Digital Security Team \n" "Language-Team: persian \n" "Language: fa\n" @@ -1893,26 +1893,28 @@ msgstr "" #: js/messages.php:308 msgid "Click a data point to view and possibly edit the data row." msgstr "" +"با کیک بر روی داده ها ان ها را بینید و احتمالا ردیف داده ها راویرایش کنید. " +" " #: js/messages.php:310 msgid "The plot can be resized by dragging it along the bottom right corner." msgstr "" +" . تغییر اندازه طرح با کشیدن آن در امتداد گوشه پایین سمت راس میتواند انجام " +"گیرد" #: js/messages.php:312 -#, fuzzy #| msgid "Add/Delete columns" msgid "Select two columns" -msgstr "اضافه/حذف ستون ها" +msgstr "انتخاب دو ستون" #: js/messages.php:313 msgid "Select two different columns" -msgstr "" +msgstr "انتخاب دو ستون متفاوت" #: js/messages.php:314 -#, fuzzy #| msgid "SQL result" msgid "Query results" -msgstr "نتيجه SQL" +msgstr "نتایج پرس و جو" #: js/messages.php:315 #, fuzzy @@ -1926,27 +1928,25 @@ msgstr "در نظر نگرفتن" #: js/messages.php:319 libraries/DisplayResults.class.php:2592 msgid "Copy" -msgstr "" +msgstr "کپی" #: js/messages.php:334 -#, fuzzy msgid "Add columns" -msgstr "افزودن ستون جديد" +msgstr "افزودن ستونها" #: js/messages.php:337 msgid "Select referenced key" -msgstr "" +msgstr "انتخاب کلید اشاره" #: js/messages.php:338 msgid "Select Foreign Key" -msgstr "" +msgstr "انتخاب کلید خارجی" #: js/messages.php:339 msgid "Please select the primary key or a unique key" -msgstr "" +msgstr "لطفا کلید اولیه و یا یک کلید منحصر به فرد را انتخاب کنید" #: js/messages.php:340 pmd_general.php:97 tbl_relation.php:559 -#, fuzzy #| msgid "Choose field to display" msgid "Choose column to display" msgstr "ستون را براي نمايش انتخاب نماييد" @@ -1956,34 +1956,38 @@ msgid "" "You haven't saved the changes in the layout. They will be lost if you don't " "save them. Do you want to continue?" msgstr "" +"تغییر در طرح شما ذخیره نشده است. آنها از دست خواهد رفت اگر شما آنها را ذخیره " +"نکنید. ایا شما میخواهید ادامه دهید؟" #: js/messages.php:344 msgid "Add an option for column " -msgstr "" +msgstr "اضافه کردن تنظیمات برای ستون " #: js/messages.php:347 msgid "Press escape to cancel editing" -msgstr "" +msgstr "دکمه ی escape را برای صرفنظر کردن از ویرایش" #: js/messages.php:348 +#, fuzzy msgid "" "You have edited some data and they have not been saved. Are you sure you " "want to leave this page before saving the data?" msgstr "" +"شما مقداری داده اضافه کردید و ان ها ذخیره نشده اند.ایا شما برای ترک این صفحه " +"بدون ذخیره کردن داده ها اطمینان دارید؟ " #: js/messages.php:349 msgid "Drag to reorder" -msgstr "" +msgstr "برای دوباره مرتب کردن drag کنید " #: js/messages.php:350 -#, fuzzy #| msgid "Click to select" msgid "Click to sort" -msgstr "برای انتخاب کلیک کنبد" +msgstr "برای مرتب کردن کلیک کنید" #: js/messages.php:351 msgid "Click to mark/unmark" -msgstr "" +msgstr "برای علامتگذاری / برداشتن علامت اینجا را کلبک کن" #: js/messages.php:352 msgid "Double-click to copy column name" @@ -1991,7 +1995,7 @@ msgstr "" #: js/messages.php:353 msgid "Click the drop-down arrow
to toggle column's visibility" -msgstr "" +msgstr "با کلیک بر روی منوی کشویی
به ضامن دید ستون" #: js/messages.php:355 msgid "" @@ -9615,7 +9619,7 @@ msgstr "" #: server_privileges.php:109 server_privileges.php:347 #: server_privileges.php:759 msgid "Allows to set up events for the event scheduler" -msgstr "" +msgstr "دادن مجوز برای قرار دهی رویداد برای لیست رویدادهای زمانی" #: server_privileges.php:110 server_privileges.php:381 #: server_privileges.php:747 @@ -9625,12 +9629,13 @@ msgstr "" #: server_privileges.php:111 server_privileges.php:303 #: server_privileges.php:734 msgid "Allows importing data from and exporting data into files." -msgstr "" +msgstr ".دادن اجازه برای وارد و خارج کردن اطلاعات از فایل ها" #: server_privileges.php:112 server_privileges.php:765 msgid "" "Allows adding users and privileges without reloading the privilege tables." msgstr "" +"دادن اجازه برای ایجاد کاربران و اعطای امتیازات بدون بارگذاری اطلاعات جداول" #: server_privileges.php:113 server_privileges.php:311 #: server_privileges.php:741 From 35a8af479906beaf431dd2726e3b87a54d5eb6bc Mon Sep 17 00:00:00 2001 From: Ashiyane Digital Security Team Date: Wed, 4 Jul 2012 09:16:15 +0200 Subject: [PATCH 10/11] Translated using Weblate. --- po/fa.po | 95 ++++++++++++++++++++------------------------------------ 1 file changed, 33 insertions(+), 62 deletions(-) diff --git a/po/fa.po b/po/fa.po index bff1f2727a..bedfc21971 100644 --- a/po/fa.po +++ b/po/fa.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.0.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2012-07-03 09:19+0200\n" -"PO-Revision-Date: 2012-07-04 00:33+0200\n" +"PO-Revision-Date: 2012-07-04 09:10+0200\n" "Last-Translator: Ashiyane Digital Security Team \n" "Language-Team: persian \n" "Language: fa\n" @@ -1876,7 +1876,7 @@ msgstr "زوم جستجو" #: js/messages.php:300 msgid "Each point represents a data row." -msgstr ".هر نقطه نشان دهنده یک سطر داده ها" +msgstr "هر نقطه نشان دهنده یک سطر داده ها." #: js/messages.php:302 msgid "Hovering over a point will show its label." @@ -1893,14 +1893,13 @@ msgstr "" #: js/messages.php:308 msgid "Click a data point to view and possibly edit the data row." msgstr "" -"با کیک بر روی داده ها ان ها را بینید و احتمالا ردیف داده ها راویرایش کنید. " -" " +"با کیک بر روی داده ها ان ها را بینید و احتمالا ردیف داده ها راویرایش کنید." #: js/messages.php:310 msgid "The plot can be resized by dragging it along the bottom right corner." msgstr "" -" . تغییر اندازه طرح با کشیدن آن در امتداد گوشه پایین سمت راس میتواند انجام " -"گیرد" +"تغییر اندازه طرح با کشیدن آن در امتداد گوشه پایین سمت راس میتواند انجام " +"گیرد." #: js/messages.php:312 #| msgid "Add/Delete columns" @@ -1917,9 +1916,8 @@ msgid "Query results" msgstr "نتایج پرس و جو" #: js/messages.php:315 -#, fuzzy msgid "Data point content" -msgstr "توضيحات جدول" +msgstr "محتوای داده ها" #: js/messages.php:318 tbl_change.php:244 tbl_indexes.php:249 #: tbl_indexes.php:284 @@ -1968,13 +1966,12 @@ msgid "Press escape to cancel editing" msgstr "دکمه ی escape را برای صرفنظر کردن از ویرایش" #: js/messages.php:348 -#, fuzzy msgid "" "You have edited some data and they have not been saved. Are you sure you " "want to leave this page before saving the data?" msgstr "" -"شما مقداری داده اضافه کردید و ان ها ذخیره نشده اند.ایا شما برای ترک این صفحه " -"بدون ذخیره کردن داده ها اطمینان دارید؟ " +"شما مقداری داده ویرایش کردید و ان ها ذخیره نشده اند.ایا شما برای ترک این " +"صفحه بدون ذخیره کردن داده ها اطمینان دارید؟" #: js/messages.php:349 msgid "Drag to reorder" @@ -2002,15 +1999,18 @@ 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:356 msgid "" "You can also edit most columns
by clicking directly on their content." msgstr "" +"شما همچنین می توانید بیشتر ستون ها را
با کلیک روی آنها ویرایش کنید." #: js/messages.php:357 msgid "Go to link" -msgstr "" +msgstr "به لینک بروید" #: js/messages.php:358 #, fuzzy @@ -2029,27 +2029,23 @@ msgid "Show data row(s)" msgstr "شنبه" #: js/messages.php:363 -#, fuzzy #| msgid "Change password" msgid "Generate password" msgstr "تغيير اسم رمز" #: js/messages.php:364 libraries/replication_gui.lib.php:381 -#, fuzzy msgid "Generate" -msgstr "توليد‌شده توسط" +msgstr "توليد‌ کن" #: js/messages.php:365 -#, fuzzy #| msgid "Change password" msgid "Change Password" msgstr "تغيير اسم رمز" #: js/messages.php:368 tbl_structure.php:470 -#, fuzzy #| msgid "Mon" msgid "More" -msgstr "دوشنبه" +msgstr "بیشتر" #: js/messages.php:371 setup/lib/index.lib.php:188 #, php-format @@ -2057,35 +2053,32 @@ msgid "" "A newer version of phpMyAdmin is available and you should consider " "upgrading. The newest version is %s, released on %s." msgstr "" +"نسخه جدید phpmyadmin آمده است و شما باید به فکر به روز رسانی باشید. جدیدترین " +"نسخه %s و در %s بیرون آمده است." #. l10n: Latest available phpMyAdmin version #: js/messages.php:373 -#, fuzzy #| msgid "Last version" msgid ", latest stable version:" -msgstr "نسخه قبلی" +msgstr "نسخه قبلی:" #: js/messages.php:374 -#, fuzzy msgid "up to date" -msgstr "No databases" +msgstr "به روز" #. l10n: Display text for calendar close link #: js/messages.php:393 -#, fuzzy #| msgid "None" msgid "Done" -msgstr "خير" +msgstr "انجام شد" #: js/messages.php:397 -#, fuzzy #| msgid "Previous" msgctxt "Previous month" msgid "Prev" msgstr "قبل" #: js/messages.php:402 -#, fuzzy #| msgid "Next" msgctxt "Next month" msgid "Next" @@ -2093,29 +2086,25 @@ msgstr "بعد" #. l10n: Display text for current month link in calendar #: js/messages.php:405 -#, fuzzy #| msgid "Total" msgid "Today" -msgstr "جمع كل" +msgstr "امروز" #: js/messages.php:409 -#, fuzzy #| msgid "Binary" msgid "January" -msgstr "دودويي" +msgstr "ژانویه" #: js/messages.php:410 msgid "February" -msgstr "" +msgstr "فوریه" #: js/messages.php:411 -#, fuzzy #| msgid "Mar" msgid "March" msgstr "مارس" #: js/messages.php:412 -#, fuzzy #| msgid "Apr" msgid "April" msgstr "آوريل" @@ -2125,40 +2114,36 @@ msgid "May" msgstr "مي" #: js/messages.php:414 -#, fuzzy #| msgid "Jun" msgid "June" msgstr "ژوئن" #: js/messages.php:415 -#, fuzzy #| msgid "Jul" msgid "July" msgstr "جولاي" #: js/messages.php:416 -#, fuzzy #| msgid "Aug" msgid "August" msgstr "آگوست" #: js/messages.php:417 msgid "September" -msgstr "" +msgstr "سپتامبر" #: js/messages.php:418 -#, fuzzy #| msgid "Oct" msgid "October" msgstr "اكتبر" #: js/messages.php:419 msgid "November" -msgstr "" +msgstr "نوامبر" #: js/messages.php:420 msgid "December" -msgstr "" +msgstr "دسامبر" #. l10n: Short month name #: js/messages.php:427 libraries/CommonFunctions.class.php:1721 @@ -2182,7 +2167,6 @@ msgstr "آوريل" #. l10n: Short month name #: js/messages.php:435 libraries/CommonFunctions.class.php:1729 -#, fuzzy #| msgid "May" msgctxt "Short month name" msgid "May" @@ -2224,19 +2208,16 @@ msgid "Dec" msgstr "دسامبر" #: js/messages.php:455 -#, fuzzy #| msgid "Sun" msgid "Sunday" msgstr "يكشنبه" #: js/messages.php:456 -#, fuzzy #| msgid "Mon" msgid "Monday" msgstr "دوشنبه" #: js/messages.php:457 -#, fuzzy #| msgid "Tue" msgid "Tuesday" msgstr "سه‌شنبه" @@ -2250,7 +2231,6 @@ msgid "Thursday" msgstr "پنجشنبه" #: js/messages.php:460 -#, fuzzy #| msgid "Fri" msgid "Friday" msgstr "جمعه" @@ -2261,7 +2241,6 @@ msgstr "شنبه" #. l10n: Short week day name #: js/messages.php:468 -#, fuzzy #| msgctxt "Short week day name" #| msgid "Sun" msgid "Sun" @@ -2299,49 +2278,42 @@ msgstr "شنبه" #. l10n: Minimal week day name #: js/messages.php:487 -#, fuzzy #| msgid "Sun" msgid "Su" msgstr "يكشنبه" #. l10n: Minimal week day name #: js/messages.php:489 -#, fuzzy #| msgid "Mon" msgid "Mo" msgstr "دوشنبه" #. l10n: Minimal week day name #: js/messages.php:491 -#, fuzzy #| msgid "Tue" msgid "Tu" msgstr "سه‌شنبه" #. l10n: Minimal week day name #: js/messages.php:493 -#, fuzzy #| msgid "Wed" msgid "We" msgstr "چهارشنبه" #. l10n: Minimal week day name #: js/messages.php:495 -#, fuzzy #| msgid "Thu" msgid "Th" msgstr "پنج‌شنبه" #. l10n: Minimal week day name #: js/messages.php:497 -#, fuzzy #| msgid "Fri" msgid "Fr" msgstr "جمعه" #. l10n: Minimal week day name #: js/messages.php:499 -#, fuzzy #| msgid "Sat" msgid "Sa" msgstr "شنبه" @@ -2354,15 +2326,14 @@ msgstr "هفته" #. l10n: Month-year order for calendar, use either "calendar-month-year" or "calendar-year-month". #: js/messages.php:506 msgid "calendar-month-year" -msgstr "" +msgstr "تقویم-ماه-سال" #. l10n: Year suffix for calendar, "none" is empty. #: js/messages.php:508 -#, fuzzy #| msgid "None" msgctxt "Year suffix" msgid "none" -msgstr "خير" +msgstr "هیچ" #: js/messages.php:517 msgid "Hour" @@ -2437,7 +2408,7 @@ msgstr "در ساعت" #: libraries/Advisor.class.php:434 msgid "per day" -msgstr "" +msgstr "هر روز" #: libraries/CommonFunctions.class.php:251 #, php-format @@ -2701,7 +2672,7 @@ msgstr "چاپ" #: libraries/Config.class.php:915 #, php-format msgid "Existing configuration file (%s) is not readable." -msgstr "" +msgstr "فایل تنظیمات فعلی (%s) قابل خواندن نیست." #: libraries/Config.class.php:945 msgid "Wrong permissions on configuration file, should not be world writable!" @@ -4920,7 +4891,7 @@ msgstr "" #: libraries/config/messages.inc.php:285 msgid "Display databases in a tree" -msgstr "پایگاه داده را در یک درخت نمایش بده." +msgstr "پایگاه داده را در یک درخت نمایش بده" #: libraries/config/messages.inc.php:286 msgid "Disable this if you want to see all databases at once" @@ -9629,13 +9600,13 @@ msgstr "" #: server_privileges.php:111 server_privileges.php:303 #: server_privileges.php:734 msgid "Allows importing data from and exporting data into files." -msgstr ".دادن اجازه برای وارد و خارج کردن اطلاعات از فایل ها" +msgstr "دادن اجازه برای وارد و خارج کردن اطلاعات از فایل ها." #: server_privileges.php:112 server_privileges.php:765 msgid "" "Allows adding users and privileges without reloading the privilege tables." msgstr "" -"دادن اجازه برای ایجاد کاربران و اعطای امتیازات بدون بارگذاری اطلاعات جداول" +"دادن اجازه برای ایجاد کاربران و اعطای امتیازات بدون بارگذاری اطلاعات جداول." #: server_privileges.php:113 server_privileges.php:311 #: server_privileges.php:741 @@ -13039,7 +13010,7 @@ msgid "" "restarting after changing open_files_limit." msgstr "" "می توانید با افزایش {open_files_limit}، و چک کردن سابقه اجرایی در هنگام " -"اجرای مجدد" +"اجرای مجدد." #: libraries/advisory_rules.txt:332 #, php-format From 549b5de9f80338a4603b7e61c4112792a56cbbb5 Mon Sep 17 00:00:00 2001 From: Ashiyane Digital Security Team Date: Wed, 4 Jul 2012 09:28:19 +0200 Subject: [PATCH 11/11] Translated using Weblate. --- po/fa.po | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/po/fa.po b/po/fa.po index bedfc21971..dcb8942548 100644 --- a/po/fa.po +++ b/po/fa.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.0.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2012-07-03 09:19+0200\n" -"PO-Revision-Date: 2012-07-04 09:10+0200\n" +"PO-Revision-Date: 2012-07-04 09:27+0200\n" "Last-Translator: Ashiyane Digital Security Team \n" "Language-Team: persian \n" "Language: fa\n" @@ -1794,7 +1794,7 @@ msgstr "پاک کردن" #: js/messages.php:269 msgid "The definition of a stored function must contain a RETURN statement!" -msgstr "تعریف یک تابع ذخیره شده باید شامل یک دستور بازگشت باشد" +msgstr "تعریف یک تابع ذخیره شده باید شامل یک دستور بازگشت باشد!" #: js/messages.php:272 libraries/rte/rte_routines.lib.php:747 msgid "ENUM/SET editor" @@ -1816,14 +1816,14 @@ msgstr "هر کدام از مقادیر را در یک فیلد وارد کنی #: js/messages.php:276 #, php-format msgid "Add %d value(s)" -msgstr "اضافه کردن مقدار %d " +msgstr "اضافه کردن مقدار %d" #: js/messages.php:279 msgid "" "Note: If the file contains multiple tables, they will be combined into one" msgstr "" "توجه داشته باشید:اگر این فایل شامل جداول چند گانه میباشد,انها به یکی تبدیل " -"خواهند شد " +"خواهند شد" #: js/messages.php:282 msgid "Hide query box"