gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:phpmyadmin/phpmyadmin

Browse Source
This commit is contained in:
Madhura Jayaratne 2014-12-30 18:38:41 +05:30
commit f6a19c79cb
6 changed files with 237 additions and 286 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -11,7 +11,9 @@ phpMyAdmin - ChangeLog
+ rfe #1579 Default to primary key when adding relation
+ rfe #1572 User prefs: Diff-friendly JSON for config
4.3.4.0 (not yet released)
4.3.5.0 (not yet released)
4.3.4.0 (2014-12-29)
- bug #4653 Always connection error was shown, on /setup at tab "configuration storage"
- bug #4661 Drag and drop file import always fails
- bug #4651 don't open console with esc

280
libraries/DisplayResults.class.php
View File

@ -381,16 +381,16 @@ class PMA_DisplayResults
$fields_meta = $this->__get('fields_meta');
$printview = $this->__get('printview');
// 1. Initializes the $do_display array
$do_display = array();
$do_display['edit_lnk'] = $the_disp_mode[0] . $the_disp_mode[1];
$do_display['del_lnk'] = $the_disp_mode[2] . $the_disp_mode[3];
$do_display['sort_lnk'] = (string) $the_disp_mode[4];
$do_display['nav_bar'] = (string) $the_disp_mode[5];
$do_display['ins_row'] = (string) $the_disp_mode[6];
$do_display['bkm_form'] = (string) $the_disp_mode[7];
$do_display['text_btn'] = (string) $the_disp_mode[8];
$do_display['pview_lnk'] = (string) $the_disp_mode[9];
// 1. Initializes the $displayParts array
$displayParts = array();
$displayParts['edit_lnk'] = $the_disp_mode[0] . $the_disp_mode[1];
$displayParts['del_lnk'] = $the_disp_mode[2] . $the_disp_mode[3];
$displayParts['sort_lnk'] = (string) $the_disp_mode[4];
$displayParts['nav_bar'] = (string) $the_disp_mode[5];
$displayParts['ins_row'] = (string) $the_disp_mode[6];
$displayParts['bkm_form'] = (string) $the_disp_mode[7];
$displayParts['text_btn'] = (string) $the_disp_mode[8];
$displayParts['pview_lnk'] = (string) $the_disp_mode[9];
// 2. Display mode is not "false for all elements" -> updates the
// display mode
@ -398,14 +398,14 @@ class PMA_DisplayResults
if (isset($printview) && ($printview == '1')) {
// 2.0 Print view -> set all elements to false!
$do_display['edit_lnk'] = self::NO_EDIT_OR_DELETE; // no edit link
$do_display['del_lnk'] = self::NO_EDIT_OR_DELETE; // no delete link
$do_display['sort_lnk'] = (string) '0';
$do_display['nav_bar'] = (string) '0';
$do_display['ins_row'] = (string) '0';
$do_display['bkm_form'] = (string) '0';
$do_display['text_btn'] = (string) '0';
$do_display['pview_lnk'] = (string) '0';
$displayParts['edit_lnk'] = self::NO_EDIT_OR_DELETE; // no edit link
$displayParts['del_lnk'] = self::NO_EDIT_OR_DELETE; // no delete link
$displayParts['sort_lnk'] = (string) '0';
$displayParts['nav_bar'] = (string) '0';
$displayParts['ins_row'] = (string) '0';
$displayParts['bkm_form'] = (string) '0';
$displayParts['text_btn'] = (string) '0';
$displayParts['pview_lnk'] = (string) '0';
} elseif ($this->__get('is_count') || $this->__get('is_analyse')
|| $this->__get('is_maint') || $this->__get('is_explain')
@ -413,19 +413,19 @@ class PMA_DisplayResults
// 2.1 Statement is a "SELECT COUNT", a
// "CHECK/ANALYZE/REPAIR/OPTIMIZE", an "EXPLAIN" one or
// contains a "PROC ANALYSE" part
$do_display['edit_lnk'] = self::NO_EDIT_OR_DELETE; // no edit link
$do_display['del_lnk'] = self::NO_EDIT_OR_DELETE; // no delete link
$do_display['sort_lnk'] = (string) '0';
$do_display['nav_bar'] = (string) '0';
$do_display['ins_row'] = (string) '0';
$do_display['bkm_form'] = (string) '1';
$displayParts['edit_lnk'] = self::NO_EDIT_OR_DELETE; // no edit link
$displayParts['del_lnk'] = self::NO_EDIT_OR_DELETE; // no delete link
$displayParts['sort_lnk'] = (string) '0';
$displayParts['nav_bar'] = (string) '0';
$displayParts['ins_row'] = (string) '0';
$displayParts['bkm_form'] = (string) '1';
if ($this->__get('is_maint')) {
$do_display['text_btn'] = (string) '1';
$displayParts['text_btn'] = (string) '1';
} else {
$do_display['text_btn'] = (string) '0';
$displayParts['text_btn'] = (string) '0';
}
$do_display['pview_lnk'] = (string) '1';
$displayParts['pview_lnk'] = (string) '1';
} elseif ($this->__get('is_show')) {
// 2.2 Statement is a "SHOW..."
@ -449,38 +449,38 @@ class PMA_DisplayResults
if ($bIsProcessList) {
// no edit link
$do_display['edit_lnk'] = self::NO_EDIT_OR_DELETE;
$displayParts['edit_lnk'] = self::NO_EDIT_OR_DELETE;
// "kill process" type edit link
$do_display['del_lnk'] = self::KILL_PROCESS;
$displayParts['del_lnk'] = self::KILL_PROCESS;
} else {
// Default case -> no links
// no edit link
$do_display['edit_lnk'] = self::NO_EDIT_OR_DELETE;
$displayParts['edit_lnk'] = self::NO_EDIT_OR_DELETE;
// no delete link
$do_display['del_lnk'] = self::NO_EDIT_OR_DELETE;
$displayParts['del_lnk'] = self::NO_EDIT_OR_DELETE;
}
unset($bIsProcessList);
// 2.2.2 Other settings
$do_display['sort_lnk'] = (string) '0';
$do_display['nav_bar'] = (string) '0';
$do_display['ins_row'] = (string) '0';
$do_display['bkm_form'] = (string) '1';
$do_display['text_btn'] = (string) '1';
$do_display['pview_lnk'] = (string) '1';
$displayParts['sort_lnk'] = (string) '0';
$displayParts['nav_bar'] = (string) '0';
$displayParts['ins_row'] = (string) '0';
$displayParts['bkm_form'] = (string) '1';
$displayParts['text_btn'] = (string) '1';
$displayParts['pview_lnk'] = (string) '1';
} else {
// 2.3 Other statements (ie "SELECT" ones) -> updates
// $do_display['edit_lnk'], $do_display['del_lnk'] and
// $do_display['text_btn'] (keeps other default values)
// $displayParts['edit_lnk'], $displayParts['del_lnk'] and
// $displayParts['text_btn'] (keeps other default values)
$prev_table = $fields_meta[0]->table;
$do_display['text_btn'] = (string) '1';
$displayParts['text_btn'] = (string) '1';
for ($i = 0; $i < $this->__get('fields_cnt'); $i++) {
$is_link = ($do_display['edit_lnk'] != self::NO_EDIT_OR_DELETE)
|| ($do_display['del_lnk'] != self::NO_EDIT_OR_DELETE)
|| ($do_display['sort_lnk'] != '0')
|| ($do_display['ins_row'] != '0');
$is_link = ($displayParts['edit_lnk'] != self::NO_EDIT_OR_DELETE)
|| ($displayParts['del_lnk'] != self::NO_EDIT_OR_DELETE)
|| ($displayParts['sort_lnk'] != '0')
|| ($displayParts['ins_row'] != '0');
// 2.3.2 Displays edit/delete/sort/insert links?
if ($is_link
@ -488,21 +488,21 @@ class PMA_DisplayResults
|| ($fields_meta[$i]->table != $prev_table))
) {
// don't display links
$do_display['edit_lnk'] = self::NO_EDIT_OR_DELETE;
$do_display['del_lnk'] = self::NO_EDIT_OR_DELETE;
$displayParts['edit_lnk'] = self::NO_EDIT_OR_DELETE;
$displayParts['del_lnk'] = self::NO_EDIT_OR_DELETE;
/**
* @todo May be problematic with same field names
* in two joined table.
*/
// $do_display['sort_lnk'] = (string) '0';
$do_display['ins_row'] = (string) '0';
if ($do_display['text_btn'] == '1') {
// $displayParts['sort_lnk'] = (string) '0';
$displayParts['ins_row'] = (string) '0';
if ($displayParts['text_btn'] == '1') {
break;
}
} // end if (2.3.2)
// 2.3.3 Always display print view link
$do_display['pview_lnk'] = (string) '1';
$displayParts['pview_lnk'] = (string) '1';
$prev_table = $fields_meta[$i]->table;
} // end for
@ -512,8 +512,8 @@ class PMA_DisplayResults
// 3. Gets the total number of rows if it is unknown
if (isset($unlim_num_rows) && $unlim_num_rows != '') {
$the_total = $unlim_num_rows;
} elseif ((($do_display['nav_bar'] == '1')
|| ($do_display['sort_lnk'] == '1'))
} elseif ((($displayParts['nav_bar'] == '1')
|| ($displayParts['sort_lnk'] == '1'))
&& (/*overload*/mb_strlen($db) && !empty($table))
) {
$the_total = PMA_Table::countRecords($db, $table);
@ -521,13 +521,13 @@ class PMA_DisplayResults
// if for COUNT query, number of rows returned more than 1 (may be being used GROUP BY)
if ($this->__get('is_count') && isset($num_rows) && $num_rows > 1) {
$do_display['nav_bar'] = (string) '1';
$do_display['sort_lnk'] = (string) '1';
$displayParts['nav_bar'] = (string) '1';
$displayParts['sort_lnk'] = (string) '1';
}
// 4. If navigation bar or sorting fields names URLs should be
// displayed but there is only one row, change these settings to
// false
if ($do_display['nav_bar'] == '1' || $do_display['sort_lnk'] == '1') {
if ($displayParts['nav_bar'] == '1' || $displayParts['sort_lnk'] == '1') {
// - Do not display sort links if less than 2 rows.
// - For a VIEW we (probably) did not count the number of rows
@ -538,15 +538,15 @@ class PMA_DisplayResults
&& ! PMA_Table::isView($db, $table)
) {
// force display of navbar for vertical/horizontal display-choice.
// $do_display['nav_bar'] = (string) '0';
$do_display['sort_lnk'] = (string) '0';
// $displayParts['nav_bar'] = (string) '0';
$displayParts['sort_lnk'] = (string) '0';
}
} // end if (3)
// 5. Updates the synthetic var
$the_disp_mode = join('', $do_display);
$the_disp_mode = join('', $displayParts);
return $do_display;
return $displayParts;
} // end of the 'setDisplayMode()' function
@ -1017,7 +1017,7 @@ class PMA_DisplayResults
/**
* Get the headers of the results table
*
* @param array &$is_display which elements to display
* @param array &$displayParts which elements to display
* @param array $analyzed_sql the analyzed query
* @param string $sort_expression sort expression
* @param string $sort_expression_nodirection sort expression
@ -1033,7 +1033,7 @@ class PMA_DisplayResults
* @see getTable()
*/
private function _getTableHeaders(
&$is_display, $analyzed_sql,
&$displayParts, $analyzed_sql,
$sort_expression = '', $sort_expression_nodirection = '',
$sort_direction = '', $is_limited_display = false
) {
@ -1065,7 +1065,7 @@ class PMA_DisplayResults
|| ($direction == self::DISP_DIR_HORIZONTAL_FLIPPED);
// can the result be sorted?
if ($is_display['sort_lnk'] == '1') {
if ($displayParts['sort_lnk'] == '1') {
list($unsorted_sql_query, $drop_down_html)
= $this->_getUnsortedSqlAndSortByKeyDropDown(
@ -1108,14 +1108,14 @@ class PMA_DisplayResults
// Start of form for multi-rows edit/delete/export
$table_headers_html .= $this->_getFormForMultiRowOperations(
$is_display['del_lnk']
$displayParts['del_lnk']
);
// 1. Set $colspan or $rowspan and generate html with full/partial
// text button or link
list($colspan, $rowspan, $button_html)
= $this->_getFieldVisibilityParams(
$directionCondition, $is_display, $full_or_partial_text_link
$directionCondition, $displayParts, $full_or_partial_text_link
);
$table_headers_html .= $button_html;
@ -1166,7 +1166,7 @@ class PMA_DisplayResults
$vertical_display = $this->__get('vertical_display');
if (($is_display['sort_lnk'] == '1') && ! $is_limited_display) {
if (($displayParts['sort_lnk'] == '1') && ! $is_limited_display) {
list($order_link, $sorted_header_html)
= $this->_getOrderLinkAndSortedHeaderHtml(
@ -1211,7 +1211,7 @@ class PMA_DisplayResults
// Display column at rightside - checkboxes or empty column
if (! $printview) {
$table_headers_html .= $this->_getColumnAtRightSide(
$is_display, $directionCondition, $full_or_partial_text_link,
$displayParts, $directionCondition, $full_or_partial_text_link,
$colspan, $rowspan
);
}
@ -1379,7 +1379,7 @@ class PMA_DisplayResults
*
* @param boolean $directionCondition display direction horizontal or
* horizontalflipped
* @param array &$is_display which elements to display
* @param array &$displayParts which elements to display
* @param string $full_or_partial_text_link full/partial link or text button
*
* @return array 3 element array - $colspan, $rowspan, $button_html
@ -1389,7 +1389,7 @@ class PMA_DisplayResults
* @see _getTableHeaders()
*/
private function _getFieldVisibilityParams(
$directionCondition, &$is_display, $full_or_partial_text_link
$directionCondition, &$displayParts, $full_or_partial_text_link
) {
$button_html = '';
@ -1401,27 +1401,27 @@ class PMA_DisplayResults
$button_html .= '<thead><tr>' . "\n";
$colspan = (($is_display['edit_lnk'] != self::NO_EDIT_OR_DELETE)
&& ($is_display['del_lnk'] != self::NO_EDIT_OR_DELETE))
$colspan = (($displayParts['edit_lnk'] != self::NO_EDIT_OR_DELETE)
&& ($displayParts['del_lnk'] != self::NO_EDIT_OR_DELETE))
? ' colspan="4"'
: '';
} else {
$rowspan = (($is_display['edit_lnk'] != self::NO_EDIT_OR_DELETE)
&& ($is_display['del_lnk'] != self::NO_EDIT_OR_DELETE))
$rowspan = (($displayParts['edit_lnk'] != self::NO_EDIT_OR_DELETE)
&& ($displayParts['del_lnk'] != self::NO_EDIT_OR_DELETE))
? ' rowspan="4"'
: '';
}
// ... before the result table
if ((($is_display['edit_lnk'] == self::NO_EDIT_OR_DELETE)
&& ($is_display['del_lnk'] == self::NO_EDIT_OR_DELETE))
&& ($is_display['text_btn'] == '1')
if ((($displayParts['edit_lnk'] == self::NO_EDIT_OR_DELETE)
&& ($displayParts['del_lnk'] == self::NO_EDIT_OR_DELETE))
&& ($displayParts['text_btn'] == '1')
) {
$vertical_display['emptypre']
= (($is_display['edit_lnk'] != self::NO_EDIT_OR_DELETE)
&& ($is_display['del_lnk'] != self::NO_EDIT_OR_DELETE)) ? 4 : 0;
= (($displayParts['edit_lnk'] != self::NO_EDIT_OR_DELETE)
&& ($displayParts['del_lnk'] != self::NO_EDIT_OR_DELETE)) ? 4 : 0;
if ($directionCondition) {
@ -1443,14 +1443,14 @@ class PMA_DisplayResults
} elseif ((($GLOBALS['cfg']['RowActionLinks'] == self::POSITION_LEFT)
|| ($GLOBALS['cfg']['RowActionLinks'] == self::POSITION_BOTH))
&& ($is_display['text_btn'] == '1')
&& ($displayParts['text_btn'] == '1')
) {
// ... at the left column of the result table header if possible
// and required
$vertical_display['emptypre']
= (($is_display['edit_lnk'] != self::NO_EDIT_OR_DELETE)
&& ($is_display['del_lnk'] != self::NO_EDIT_OR_DELETE)) ? 4 : 0;
= (($displayParts['edit_lnk'] != self::NO_EDIT_OR_DELETE)
&& ($displayParts['del_lnk'] != self::NO_EDIT_OR_DELETE)) ? 4 : 0;
if ($directionCondition) {
@ -1468,14 +1468,14 @@ class PMA_DisplayResults
} elseif ((($GLOBALS['cfg']['RowActionLinks'] == self::POSITION_LEFT)
|| ($GLOBALS['cfg']['RowActionLinks'] == self::POSITION_BOTH))
&& (($is_display['edit_lnk'] != self::NO_EDIT_OR_DELETE)
|| ($is_display['del_lnk'] != self::NO_EDIT_OR_DELETE))
&& (($displayParts['edit_lnk'] != self::NO_EDIT_OR_DELETE)
|| ($displayParts['del_lnk'] != self::NO_EDIT_OR_DELETE))
) {
// ... elseif no button, displays empty(ies) col(s) if required
$vertical_display['emptypre']
= (($is_display['edit_lnk'] != self::NO_EDIT_OR_DELETE)
&& ($is_display['del_lnk'] != self::NO_EDIT_OR_DELETE)) ? 4 : 0;
= (($displayParts['edit_lnk'] != self::NO_EDIT_OR_DELETE)
&& ($displayParts['del_lnk'] != self::NO_EDIT_OR_DELETE)) ? 4 : 0;
if ($directionCondition) {
@ -2390,7 +2390,7 @@ class PMA_DisplayResults
/**
* Prepare column to show at right side - check boxes or empty column
*
* @param array &$is_display which elements to display
* @param array &$displayParts which elements to display
* @param boolean $directionCondition display direction horizontal
* or horizontalflipped
* @param string $full_or_partial_text_link full/partial link or text button
@ -2404,7 +2404,7 @@ class PMA_DisplayResults
* @see _getTableHeaders()
*/
private function _getColumnAtRightSide(
&$is_display, $directionCondition, $full_or_partial_text_link,
&$displayParts, $directionCondition, $full_or_partial_text_link,
$colspan, $rowspan
) {
@ -2415,14 +2415,14 @@ class PMA_DisplayResults
// column of the result table header if possible and required...
if ((($GLOBALS['cfg']['RowActionLinks'] == self::POSITION_RIGHT)
|| ($GLOBALS['cfg']['RowActionLinks'] == self::POSITION_BOTH))
&& (($is_display['edit_lnk'] != self::NO_EDIT_OR_DELETE)
|| ($is_display['del_lnk'] != self::NO_EDIT_OR_DELETE))
&& ($is_display['text_btn'] == '1')
&& (($displayParts['edit_lnk'] != self::NO_EDIT_OR_DELETE)
|| ($displayParts['del_lnk'] != self::NO_EDIT_OR_DELETE))
&& ($displayParts['text_btn'] == '1')
) {
$vertical_display['emptyafter']
= (($is_display['edit_lnk'] != self::NO_EDIT_OR_DELETE)
&& ($is_display['del_lnk'] != self::NO_EDIT_OR_DELETE)) ? 4 : 1;
= (($displayParts['edit_lnk'] != self::NO_EDIT_OR_DELETE)
&& ($displayParts['del_lnk'] != self::NO_EDIT_OR_DELETE)) ? 4 : 1;
if ($directionCondition) {
$right_column_html .= "\n"
@ -2438,16 +2438,16 @@ class PMA_DisplayResults
} // end vertical mode
} elseif ((($GLOBALS['cfg']['RowActionLinks'] == self::POSITION_LEFT)
|| ($GLOBALS['cfg']['RowActionLinks'] == self::POSITION_BOTH))
&& (($is_display['edit_lnk'] == self::NO_EDIT_OR_DELETE)
&& ($is_display['del_lnk'] == self::NO_EDIT_OR_DELETE))
&& (($displayParts['edit_lnk'] == self::NO_EDIT_OR_DELETE)
&& ($displayParts['del_lnk'] == self::NO_EDIT_OR_DELETE))
&& (! isset($GLOBALS['is_header_sent']) || ! $GLOBALS['is_header_sent'])
) {
// ... elseif no button, displays empty columns if required
// (unless coming from Browse mode print view)
$vertical_display['emptyafter']
= (($is_display['edit_lnk'] != self::NO_EDIT_OR_DELETE)
&& ($is_display['del_lnk'] != self::NO_EDIT_OR_DELETE)) ? 4 : 1;
= (($displayParts['edit_lnk'] != self::NO_EDIT_OR_DELETE)
&& ($displayParts['del_lnk'] != self::NO_EDIT_OR_DELETE)) ? 4 : 1;
if ($directionCondition) {
$right_column_html .= "\n"
@ -2617,7 +2617,7 @@ class PMA_DisplayResults
*
* @param integer &$dt_result the link id associated to the query
* which results have to be displayed
* @param array &$is_display which elements to display
* @param array &$displayParts which elements to display
* @param array $map the list of relations
* @param array $analyzed_sql the analyzed query
* @param boolean $is_limited_display with limited operations or not
@ -2631,7 +2631,7 @@ class PMA_DisplayResults
* @see getTable()
*/
private function _getTableBody(
&$dt_result, &$is_display, $map, $analyzed_sql, $is_limited_display = false
&$dt_result, &$displayParts, $map, $analyzed_sql, $is_limited_display = false
) {
global $row; // mostly because of browser transformations,
@ -2738,11 +2738,11 @@ class PMA_DisplayResults
// 1.2 Defines the URLs for the modify/delete link(s)
if (($is_display['edit_lnk'] != self::NO_EDIT_OR_DELETE)
|| ($is_display['del_lnk'] != self::NO_EDIT_OR_DELETE)
if (($displayParts['edit_lnk'] != self::NO_EDIT_OR_DELETE)
|| ($displayParts['del_lnk'] != self::NO_EDIT_OR_DELETE)
) {
// 1.2.1 Modify link(s) - update row case
if ($is_display['edit_lnk'] == self::UPDATE_ROW) {
if ($displayParts['edit_lnk'] == self::UPDATE_ROW) {
list($edit_url, $copy_url, $edit_str, $copy_str,
$edit_anchor_class)
@ -2757,7 +2757,7 @@ class PMA_DisplayResults
list($del_url, $del_str, $js_conf)
= $this->_getDeleteAndKillLinks(
$where_clause, $clause_is_unique,
$url_sql_query, $is_display['del_lnk'],
$url_sql_query, $displayParts['del_lnk'],
$row
);
@ -2768,7 +2768,7 @@ class PMA_DisplayResults
) {
$table_body_html .= $this->_getPlacedLinks(
self::POSITION_LEFT, $del_url, $is_display, $row_no,
self::POSITION_LEFT, $del_url, $displayParts, $row_no,
$where_clause, $where_clause_html, $condition_array,
$edit_url, $copy_url, $edit_anchor_class,
$edit_str, $copy_str, $del_str, $js_conf
@ -2779,7 +2779,7 @@ class PMA_DisplayResults
) {
$table_body_html .= $this->_getPlacedLinks(
self::POSITION_NONE, $del_url, $is_display, $row_no,
self::POSITION_NONE, $del_url, $displayParts, $row_no,
$where_clause, $where_clause_html, $condition_array,
$edit_url, $copy_url, $edit_anchor_class,
$edit_str, $copy_str, $del_str, $js_conf
@ -2802,7 +2802,7 @@ class PMA_DisplayResults
) {
$table_body_html .= $this->_getPlacedLinks(
self::POSITION_RIGHT, $del_url, $is_display, $row_no,
self::POSITION_RIGHT, $del_url, $displayParts, $row_no,
$where_clause, $where_clause_html, $condition_array,
$edit_url, $copy_url, $edit_anchor_class,
$edit_str, $copy_str, $del_str, $js_conf
@ -2817,7 +2817,7 @@ class PMA_DisplayResults
// 4. Gather links of del_urls and edit_urls in an array for later
// output
$this->_gatherLinksForLaterOutputs(
$row_no, $is_display, $where_clause, $where_clause_html, $js_conf,
$row_no, $displayParts, $where_clause, $where_clause_html, $js_conf,
$del_url, $del_str, $edit_anchor_class, $edit_url,
$edit_str, $copy_url, $copy_str, $alternating_color_class,
$condition_array
@ -3109,7 +3109,7 @@ class PMA_DisplayResults
* Gather delete/edit url links for further outputs
*
* @param integer $row_no the index of current row
* @param array $is_display which elements to display
* @param array $displayParts which elements to display
* @param string $where_clause where clause
* @param string $where_clause_html the html encoded where clause
* @param string $js_conf text for the JS confirmation
@ -3131,7 +3131,7 @@ class PMA_DisplayResults
* @see _getTableBody()
*/
private function _gatherLinksForLaterOutputs(
$row_no, $is_display, $where_clause, $where_clause_html, $js_conf,
$row_no, $displayParts, $where_clause, $where_clause_html, $js_conf,
$del_url, $del_str, $edit_anchor_class, $edit_url, $edit_str,
$copy_url, $copy_str, $alternating_color_class, $condition_array
) {
@ -3155,12 +3155,12 @@ class PMA_DisplayResults
}
if (!empty($del_url)
&& ($is_display['del_lnk'] != self::KILL_PROCESS)
&& ($displayParts['del_lnk'] != self::KILL_PROCESS)
) {
$vertical_display['row_delete'][$row_no]
.= $this->_getCheckboxForMultiRowSubmissions(
$del_url, $is_display, $row_no, $where_clause_html,
$del_url, $displayParts, $row_no, $where_clause_html,
$condition_array, '[%_PMA_CHECKBOX_DIR_%]',
$alternating_color_class . $vertical_class
);
@ -3625,7 +3625,7 @@ class PMA_DisplayResults
*
* @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 array $displayParts 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
@ -3645,7 +3645,7 @@ class PMA_DisplayResults
* @see _getTableBody()
*/
private function _getPlacedLinks(
$dir, $del_url, $is_display, $row_no, $where_clause, $where_clause_html,
$dir, $del_url, $displayParts, $row_no, $where_clause, $where_clause_html,
$condition_array, $edit_url, $copy_url,
$edit_anchor_class, $edit_str, $copy_str, $del_str, $js_conf
) {
@ -3655,7 +3655,7 @@ class PMA_DisplayResults
}
return $this->_getCheckboxAndLinks(
$dir, $del_url, $is_display,
$dir, $del_url, $displayParts,
$row_no, $where_clause, $where_clause_html, $condition_array,
$edit_url, $copy_url, $edit_anchor_class,
$edit_str, $copy_str, $del_str, $js_conf
@ -4119,7 +4119,7 @@ class PMA_DisplayResults
* Get the resulted table with the vertical direction mode.
*
* @param array $analyzed_sql the analyzed query
* @param array $is_display display mode
* @param array $displayParts which elements to display
*
* @return string html content
*
@ -4127,7 +4127,7 @@ class PMA_DisplayResults
*
* @see _getTable()
*/
private function _getVerticalTable($analyzed_sql, $is_display)
private function _getVerticalTable($analyzed_sql, $displayParts)
{
$vertical_table_html = '';
@ -4148,7 +4148,7 @@ class PMA_DisplayResults
}
$vertical_table_html .= $vertical_display['textbtn']
. $this->_getCheckBoxesForMultipleRowOperations('_left', $is_display)
. $this->_getCheckBoxesForMultipleRowOperations('_left', $displayParts)
. '</tr>' . "\n";
} // end if
@ -4199,7 +4199,7 @@ class PMA_DisplayResults
$vertical_table_html .= '<tr>' . "\n"
. $vertical_display['textbtn']
. $this->_getCheckBoxesForMultipleRowOperations(
'_right', $is_display
'_right', $displayParts
)
. '</tr>' . "\n";
} // end if
@ -4258,8 +4258,8 @@ class PMA_DisplayResults
/**
* Get checkboxes for multiple row data operations
*
* @param string $dir _left / _right
* @param array $is_display display mode
* @param string $dir _left / _right
* @param array $displayParts which elements to display
*
* @return String $checkBoxes_html html content
*
@ -4267,7 +4267,7 @@ class PMA_DisplayResults
*
* @see _getVerticalTable()
*/
private function _getCheckBoxesForMultipleRowOperations($dir, $is_display)
private function _getCheckBoxesForMultipleRowOperations($dir, $displayParts)
{
$checkBoxes_html = '';
@ -4282,8 +4282,8 @@ class PMA_DisplayResults
) {
$checkBoxes_html .= '<th'
. (($is_display['edit_lnk'] != self::NO_EDIT_OR_DELETE)
&& ($is_display['del_lnk'] != self::NO_EDIT_OR_DELETE))
. (($displayParts['edit_lnk'] != self::NO_EDIT_OR_DELETE)
&& ($displayParts['del_lnk'] != self::NO_EDIT_OR_DELETE))
? ' rowspan="4"'
: ''
. '></th>' . "\n";
@ -4534,10 +4534,10 @@ class PMA_DisplayResults
// 1.1 Gets the information about which functionalities should be
// displayed
$total = '';
$is_display = $this->_setDisplayMode($the_disp_mode, $total);
$displayParts = $this->_setDisplayMode($the_disp_mode, $total);
// 1.2 Defines offsets for the next and previous pages
if ($is_display['nav_bar'] == '1') {
if ($displayParts['nav_bar'] == '1') {
list($pos_next, $pos_prev) = $this->_getOffsets();
} // end if
if (!isset($analyzed_sql[0]['order_by_clause'])) {
@ -4564,7 +4564,7 @@ class PMA_DisplayResults
// 2. ----- Prepare to display the top of the page -----
// 2.1 Prepares a messages with position information
if (($is_display['nav_bar'] == '1') && isset($pos_next)) {
if (($displayParts['nav_bar'] == '1') && isset($pos_next)) {
$message = $this->_setMessageInformation(
$sorted_column_message, $analyzed_sql[0]['limit_clause'],
@ -4599,7 +4599,7 @@ class PMA_DisplayResults
}
if (($is_display['nav_bar'] == '1')
if (($displayParts['nav_bar'] == '1')
&& empty($analyzed_sql[0]['limit_clause'])
) {
@ -4640,18 +4640,18 @@ class PMA_DisplayResults
// 3. ----- Prepare the results table -----
$table_html .= $this->_getTableHeaders(
$is_display, $analyzed_sql, $sort_expression,
$displayParts, $analyzed_sql, $sort_expression,
$sort_expression_nodirection, $sort_direction, $is_limited_display
)
. '<tbody>' . "\n";
$table_html .= $this->_getTableBody(
$dt_result, $is_display, $map, $analyzed_sql, $is_limited_display
$dt_result, $displayParts, $map, $analyzed_sql, $is_limited_display
);
// vertical output case
if ($_SESSION['tmpval']['disp_direction'] == self::DISP_DIR_VERTICAL) {
$table_html .= $this->_getVerticalTable($analyzed_sql, $is_display);
$table_html .= $this->_getVerticalTable($analyzed_sql, $displayParts);
} // end if
$this->__set('vertical_display', null);
@ -4661,18 +4661,18 @@ class PMA_DisplayResults
// 4. ----- Prepares the link for multi-fields edit and delete
if ($is_display['del_lnk'] == self::DELETE_ROW
&& $is_display['del_lnk'] != self::KILL_PROCESS
if ($displayParts['del_lnk'] == self::DELETE_ROW
&& $displayParts['del_lnk'] != self::KILL_PROCESS
) {
$table_html .= $this->_getMultiRowOperationLinks(
$dt_result, $analyzed_sql, $is_display['del_lnk']
$dt_result, $analyzed_sql, $displayParts['del_lnk']
);
}
// 5. ----- Get the navigation bar at the bottom if required -----
if (($is_display['nav_bar'] == '1')
if (($displayParts['nav_bar'] == '1')
&& empty($analyzed_sql[0]['limit_clause'])
) {
$table_html .= $this->_getPlacedTableNavigations(
@ -5800,7 +5800,7 @@ class PMA_DisplayResults
* Prepares a checkbox for multi-row submits
*
* @param string $del_url delete url
* @param array $is_display array with explicit indexes for all
* @param array $displayParts array with explicit indexes for all
* the display elements
* @param string $row_no the row number
* @param string $where_clause_html url encoded where clause
@ -5815,13 +5815,13 @@ class PMA_DisplayResults
* @see _getTableBody(), _getCheckboxAndLinks()
*/
private function _getCheckboxForMultiRowSubmissions(
$del_url, $is_display, $row_no, $where_clause_html, $condition_array,
$del_url, $displayParts, $row_no, $where_clause_html, $condition_array,
$id_suffix, $class
) {
$ret = '';
if (! empty($del_url) && $is_display['del_lnk'] != self::KILL_PROCESS) {
if (! empty($del_url) && $displayParts['del_lnk'] != self::KILL_PROCESS) {
$ret .= '<td ';
if (! empty($class)) {
@ -5979,7 +5979,7 @@ class PMA_DisplayResults
*
* @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
* @param array $displayParts array with explicit indexes for all the
* display elements
* @param string $row_no row number
* @param string $where_clause where clause
@ -6000,7 +6000,7 @@ class PMA_DisplayResults
* @see _getPlacedLinks()
*/
private function _getCheckboxAndLinks(
$position, $del_url, $is_display, $row_no, $where_clause,
$position, $del_url, $displayParts, $row_no, $where_clause,
$where_clause_html, $condition_array,
$edit_url, $copy_url, $class, $edit_str, $copy_str, $del_str, $js_conf
) {
@ -6010,7 +6010,7 @@ class PMA_DisplayResults
if ($position == self::POSITION_LEFT) {
$ret .= $this->_getCheckboxForMultiRowSubmissions(
$del_url, $is_display, $row_no, $where_clause_html, $condition_array,
$del_url, $displayParts, $row_no, $where_clause_html, $condition_array,
'_left', ''
);
@ -6037,14 +6037,14 @@ class PMA_DisplayResults
);
$ret .= $this->_getCheckboxForMultiRowSubmissions(
$del_url, $is_display, $row_no, $where_clause_html, $condition_array,
$del_url, $displayParts, $row_no, $where_clause_html, $condition_array,
'_right', ''
);
} else { // $position == self::POSITION_NONE
$ret .= $this->_getCheckboxForMultiRowSubmissions(
$del_url, $is_display, $row_no, $where_clause_html, $condition_array,
$del_url, $displayParts, $row_no, $where_clause_html, $condition_array,
'_left', ''
);
}

151
po/sk.po
View File

@ -4,16 +4,16 @@ msgstr ""
"Project-Id-Version: phpMyAdmin 4.4.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
"POT-Creation-Date: 2014-12-21 13:06+0100\n"
"PO-Revision-Date: 2014-07-30 14:19+0200\n"
"PO-Revision-Date: 2014-12-29 13:17+0200\n"
"Last-Translator: Martin Lacina <martin@whistler.sk>\n"
"Language-Team: Slovak <https://hosted.weblate.org/projects/phpmyadmin/master/"
"sk/>\n"
"Language-Team: Slovak "
"<https://hosted.weblate.org/projects/phpmyadmin/master/sk/>\n"
"Language: sk\n"
"MIME-Version: 1.0\n"
"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.10-dev\n"
"X-Generator: Weblate 2.2-dev\n"
#: changelog.php:36 license.php:28
#, php-format
@ -33,10 +33,10 @@ msgid "Click to sort."
msgstr "Kliknite pre zoradenie."
#: db_central_columns.php:125
#, fuzzy, php-format
#, php-format
#| msgid "Showing rows %1s - %2s"
msgid "Showing rows %1$s - %2$s."
msgstr "Zobrazené riadky %1s - %2s"
msgstr "Zobrazované riadky %1$s - %2$s."
#: db_create.php:61
#, php-format
@ -254,7 +254,7 @@ msgid "Database %1$s has been copied to %2$s."
msgstr "Databáza %1$s bola skopírovaná do %2$s."
#: db_operations.php:259
#, fuzzy, php-format
#, php-format
#| msgid ""
#| "The phpMyAdmin configuration storage has been deactivated. To find out "
#| "why click %shere%s."
@ -596,20 +596,18 @@ msgstr ""
"hodnotu."
#: import.php:54
#, fuzzy
#| msgid "Access denied!"
msgid "Succeeded"
msgstr "Prístup odmietnutý!"
msgstr "Úspešný"
#: import.php:58 js/messages.php:441
msgid "Failed"
msgstr ""
msgstr "Neúspešný"
#: import.php:62
#, fuzzy
#| msgid "complete inserts"
msgid "Incomplete params"
msgstr "úplné vloženia"
msgstr "Nekompletné parametre"
#: import.php:162
#, php-format
@ -892,7 +890,7 @@ msgstr ""
"narušená neautorizovanými užívateľmi, ktorí stiahnu Vašu konfiguráciu."
#: index.php:533
#, fuzzy, php-format
#, php-format
#| msgid ""
#| "The phpMyAdmin configuration storage is not completely configured, some "
#| "extended features have been deactivated. To find out why click %shere%s."
@ -901,12 +899,12 @@ msgid ""
"extended features have been deactivated. %sFind out why%s. "
msgstr ""
"Miesto uloženia phpMyAdmin konfigurácie nie je úplne nastavené, niektoré "
"rozšírené vlastnosti boli vypnuté. Ak chcete zistiť prečo, kliknite %ssem%s."
"rozšírené vlastnosti boli vypnuté. Ak chcete zistiť prečo, kliknite %ssem%s. "
#: index.php:540
msgid ""
"Or alternately go to 'Operations' tab of any database to set it up there."
msgstr ""
msgstr "Voliteľne môžete ísť do záložky 'Operácie' a nastaviť to tam."
#: index.php:585
#, php-format
@ -984,10 +982,9 @@ msgid "Dropping Primary Key/Index"
msgstr "Odstraňujem primárny kľúč/index"
#: js/messages.php:46
#, fuzzy
#| msgid "Select Foreign Key"
msgid "Dropping Foreign key."
msgstr "Zvoliť cudzí kľúč"
msgstr "Mažem cudzí kľúč."
#: js/messages.php:47
msgid "This operation could take a long time. Proceed anyway?"
@ -1005,7 +1002,6 @@ msgid "Do you really want to delete the search \"%s\"?"
msgstr "Naozaj chcete odstrániť vyhľadávanie \"%s\"?"
#: js/messages.php:50
#, 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?"
@ -1013,16 +1009,14 @@ msgid "You have unsaved changes; are you sure you want to leave this page?"
msgstr "Na stránke sú neuložené zmeny. Naozaj ju chcete opustiť?"
#: js/messages.php:51
#, fuzzy
#| msgid "Do you really want to delete the search \"%s\"?"
msgid "Do you really want to revoke the selected user(s) ?"
msgstr "Naozaj chcete odstrániť vyhľadávanie \"%s\"?"
msgstr "Naozaj chcete zrušiť zvolených užívateľov?"
#: js/messages.php:54
#, fuzzy
#| msgid "Save as file"
msgid "Save & Close"
msgstr "Uložiť ako súbor"
msgstr "Uložiť & Zavrieť"
#: js/messages.php:55 libraries/config/FormDisplay.tpl.php:395
#: libraries/insert_edit.lib.php:1543 prefs_manage.php:339
@ -1031,10 +1025,9 @@ msgid "Reset"
msgstr "Vynulovať"
#: js/messages.php:56
#, fuzzy
#| msgid "Select All"
msgid "Reset All"
msgstr "Označiť všetko"
msgstr "Zrušiť všetko"
#: js/messages.php:59
msgid "Missing value in the form!"
@ -1066,28 +1059,24 @@ msgid "Add %s column(s) to index"
msgstr "Pridať %s polí do indexu"
#: js/messages.php:66
#, fuzzy
#| msgid "Create routine"
msgid "Create single-column index"
msgstr "Vytvoriť rutinu"
msgstr "Vytvoriť jedno-stĺpcový index"
#: js/messages.php:67
#, fuzzy
#| msgid "Create routine"
msgid "Create composite index"
msgstr "Vytvoriť rutinu"
msgstr "Vytvoriť zložený index"
#: js/messages.php:68
#, fuzzy
#| msgid "Columns enclosed with:"
msgid "Composite with:"
msgstr "Polia uzatvorené do:"
msgstr "Zložený z:"
#: js/messages.php:69
#, fuzzy
#| msgid "Add %s column(s) to index"
msgid "Please select column(s) for the index."
msgstr "Pridať %s polí do indexu"
msgstr "Vyberte stĺpce pre index."
#: js/messages.php:72 libraries/structure.lib.php:1679
msgid "You have to add at least one column."
@ -1097,19 +1086,17 @@ msgstr "Musíte pridať aspoň jeden stĺpec."
#: libraries/tbl_columns_definition_form.lib.php:143
#: libraries/tbl_relation.lib.php:655
msgid "Preview SQL"
msgstr ""
msgstr "Ukážka SQL"
#: js/messages.php:78
#, fuzzy
#| msgid "in query"
msgid "Simulate query"
msgstr "v dopyte"
msgstr "Simulovať dopyt"
#: js/messages.php:79
#, fuzzy
#| msgid "Affected rows:"
msgid "Matched rows:"
msgstr "Ovplyvnené záznamy:"
msgstr "Vyhovujúce riadky:"
#: js/messages.php:80 libraries/Util.class.php:639 libraries/sql.lib.php:297
msgid "SQL query:"
@ -1766,10 +1753,9 @@ msgid "(Disabled)"
msgstr "(Vypnuté)"
#: js/messages.php:276
#, fuzzy
#| msgid "Failed to fetch headers"
msgid "Failed to get real row count."
msgstr "Chyba pri čítaní hlavičiek"
msgstr "Nepodarilo sa zístiť skutočný počet riadkov."
#: js/messages.php:279
msgid "Searching"
@ -1859,16 +1845,14 @@ msgid "Pick"
msgstr ""
#: js/messages.php:307
#, fuzzy
#| msgid "No column selected."
msgid "Column selector"
msgstr "Nebol vybraný žiadny stĺpec."
msgstr "Volič stĺpcov"
#: js/messages.php:308
#, fuzzy
#| msgid "Search this table"
msgid "Search this list"
msgstr "Hľadať v tabuľke"
msgstr "Hľadať v tomto zozname"
#: js/messages.php:309
#, php-format
@ -1878,10 +1862,9 @@ msgid ""
msgstr ""
#: js/messages.php:310
#, fuzzy
#| msgid "Free memory"
msgid "See more"
msgstr "Voľná pamäť"
msgstr "Zobraziť viac"
#: js/messages.php:311
msgid "Are you sure?"
@ -1894,10 +1877,9 @@ msgid ""
msgstr ""
#: js/messages.php:313
#, fuzzy
#| msgid "Contribute"
msgid "Continue"
msgstr "Prispejte"
msgstr "Pokračovať"
#: js/messages.php:316 libraries/structure.lib.php:2164
#: libraries/structure.lib.php:2167
@ -1905,10 +1887,9 @@ msgid "Add primary key"
msgstr ""
#: js/messages.php:317
#, fuzzy
#| msgid "A primary key has been added on %s."
msgid "Primary key added."
msgstr "Bol pridaný primárny kľúč pre %s."
msgstr "Bol pridaný primárny kľúč."
#: js/messages.php:318 libraries/normalization.lib.php:174
#, fuzzy
@ -1924,10 +1905,9 @@ msgstr ""
#: js/messages.php:320 libraries/normalization.lib.php:422
#: libraries/normalization.lib.php:469 libraries/normalization.lib.php:552
#: libraries/normalization.lib.php:612
#, fuzzy
#| msgid "At End of Table"
msgid "End of step"
msgstr "Na konci tabuľky"
msgstr "Koniec kroku"
#: js/messages.php:321
msgid "Second step of normalization (2NF)"
@ -1953,10 +1933,9 @@ msgid ""
msgstr ""
#: js/messages.php:326
#, fuzzy
#| msgid "No databases selected."
msgid "No partial dependencies selected!"
msgstr "Neboli vybrané žiadne databázy."
msgstr "Neboli vybrané žiadne čiastkové závislosti!"
#: js/messages.php:328
msgid "Show me the possible partial dependencies based on data in the table"
@ -1986,10 +1965,9 @@ msgid "DROP columns %s from the table %s"
msgstr ""
#: js/messages.php:334
#, fuzzy
#| msgid "Add privileges on the following table:"
msgid "Create the following table"
msgstr "Pridať oprávnenia pre nasledujúcu tabuľku:"
msgstr "Vytvoriť nasledujúcu tabuľku"
#: js/messages.php:337
msgid "Third step of normalization (3NF)"
@ -2004,10 +1982,9 @@ msgid "Selected dependencies are as follows:"
msgstr ""
#: js/messages.php:340
#, fuzzy
#| msgid "No databases selected."
msgid "No dependencies selected!"
msgstr "Neboli vybrané žiadne databázy."
msgstr "Neboli vybrané žiadne závislosti!"
#: js/messages.php:343 libraries/insert_edit.lib.php:1452
#: libraries/server_variables.lib.php:157
@ -2045,16 +2022,14 @@ msgid "Column minimum:"
msgstr "Názvy stĺpcov: "
#: js/messages.php:351
#, fuzzy
#| msgid "Maximum tables"
msgid "Minimum value:"
msgstr "Maximum tabuliek"
msgstr "Minimálna hodnota:"
#: js/messages.php:352
#, fuzzy
#| msgid "Maximum tables"
msgid "Maximum value:"
msgstr "Maximum tabuliek"
msgstr "Maximálna hodnota:"
#: js/messages.php:355
msgid "Hide find and replace criteria"
@ -2175,28 +2150,24 @@ msgid "Page name"
msgstr "Názov stránky"
#: js/messages.php:407
#, fuzzy
#| msgid "Select page"
msgid "Save page"
msgstr "Zvoliť stránku"
msgstr "Uložiť stránku"
#: js/messages.php:408 libraries/db_designer.lib.php:273
#, fuzzy
#| msgid "Free pages"
msgid "Open page"
msgstr "Prázdnych stránok"
msgstr "Otvoriť stránku"
#: js/messages.php:409
#, fuzzy
#| msgid "Select page"
msgid "Delete page"
msgstr "Zvoliť stránku"
msgstr "Zmazať stránku"
#: js/messages.php:410 libraries/db_designer.lib.php:382
#, fuzzy
#| msgid "Unit"
msgid "Untitled"
msgstr "Jednotka"
msgstr "Nepomenovaná"
#: js/messages.php:411
#, fuzzy
@ -2205,10 +2176,9 @@ msgid "Please select a page to continue"
msgstr "Prosím zvolte si Stránku, ktorú chcete upraviť"
#: js/messages.php:412
#, fuzzy
#| msgid "Please enter a valid number!"
msgid "Please enter a valid page name"
msgstr "Prosím zdajte platné číslo!"
msgstr "Prosím zadajte platný názov stránky"
#: js/messages.php:413
msgid "Do you want to save the changes to the current page?"
@ -2303,10 +2273,9 @@ msgid ""
msgstr ""
#: js/messages.php:439
#, fuzzy
#| msgid "Cancel"
msgid "cancel"
msgstr "Zrušiť"
msgstr "zrušiť"
#: js/messages.php:440 libraries/server_status.lib.php:269
msgid "Aborted"
@ -2317,20 +2286,18 @@ msgid "Success"
msgstr ""
#: js/messages.php:443
#, fuzzy
#| msgid "Import defaults"
msgid "Import status"
msgstr "Východzie nastavenia importu"
msgstr "Stav importu"
#: js/messages.php:444 libraries/navigation/Navigation.class.php:102
msgid "Drop files here"
msgstr ""
#: js/messages.php:445
#, fuzzy
#| msgid "Select Tables"
msgid "Select database first"
msgstr "Vybrať Tabuľky"
msgstr "Najprv vyberte databázu"
#: js/messages.php:450
msgid "You can also edit most values<br />by double-clicking directly on them."
@ -2387,16 +2354,14 @@ msgstr "Zobraziť skryté položky navigácie."
#: js/messages.php:475 libraries/config/messages.inc.php:420
#: libraries/navigation/NavigationTree.class.php:1241
#, fuzzy
#| msgid "Customize main panel"
msgid "Link with main panel"
msgstr "Prispôsobiť hlavný panel"
msgstr "Prepojiť s hlavným panelom"
#: js/messages.php:476 libraries/navigation/NavigationTree.class.php:1244
#, fuzzy
#| msgid "Customize main panel"
msgid "Unlink from main panel"
msgstr "Prispôsobiť hlavný panel"
msgstr "Zrušiť prepojenie s hlavným panelom"
#: js/messages.php:479
msgid "The requested page was not found in the history, it may have expired."
@ -2471,10 +2436,9 @@ msgid "Please look at the bottom of this window."
msgstr ""
#: js/messages.php:516 libraries/Error_Handler.class.php:353
#, fuzzy
#| msgid "Ignore"
msgid "Ignore All"
msgstr "Ignorovať"
msgstr "Ignorovať všetko"
#: js/messages.php:523
msgid ""
@ -2482,10 +2446,9 @@ msgid ""
msgstr ""
#: js/messages.php:530
#, fuzzy
#| msgid "Show this query here again"
msgid "Execute this query again?"
msgstr "Zobraziť tento dopyt znovu"
msgstr "Vykonať tento dopyt znovu?"
#: js/messages.php:531
#, fuzzy
@ -2836,10 +2799,9 @@ msgid "Expand"
msgstr ""
#: libraries/Console.class.php:95 libraries/Console.class.php:178
#, fuzzy
#| msgid "subquery"
msgid "Requery"
msgstr "poddopyt"
msgstr "Znovu spustiť dopyt"
#: libraries/Console.class.php:97 libraries/DbSearch.class.php:365
#: libraries/DisplayResults.class.php:3533
@ -2899,10 +2861,9 @@ msgid "No bookmarks"
msgstr "Nová záložka"
#: libraries/Console.class.php:180
#, fuzzy
#| msgid "Explain SQL"
msgid "Explain"
msgstr "Vysvetliť SQL"
msgstr "Vysvetliť"
#: libraries/Console.class.php:181 libraries/Util.class.php:1263
#: libraries/sql.lib.php:330
@ -2928,10 +2889,9 @@ msgid "Queried time"
msgstr "Čas behu dopytu"
#: libraries/Console.class.php:195
#, fuzzy
#| msgid "SQL Query box"
msgid "SQL Query Console"
msgstr "Pole pre SQL dopyty"
msgstr "Konzola pre SQL dopyty"
#: libraries/Console.class.php:196
msgid "Console"
@ -2943,10 +2903,9 @@ msgid "Clear"
msgstr "Vyčistiť"
#: libraries/Console.class.php:202
#, fuzzy
#| msgid "SQL history"
msgid "History"
msgstr "SQL história"
msgstr "História"
#: libraries/Console.class.php:205 libraries/Console.class.php:300
#: libraries/DisplayResults.class.php:1642 libraries/TableSearch.class.php:788
@ -2983,10 +2942,9 @@ msgid "Bookmarks"
msgstr "Tabuľka záložiek"
#: libraries/Console.class.php:218
#, fuzzy
#| msgid "Execute every"
msgid "Press Ctrl+Enter to execute query"
msgstr "Spustiť každých"
msgstr "Stlačte Ctrl+Enter pre spustenie dopytu"
#: libraries/Console.class.php:239
msgid "During current session"
@ -2999,10 +2957,9 @@ msgid "Refresh"
msgstr "Obnoviť"
#: libraries/Console.class.php:269
#, fuzzy
#| msgid "And"
msgid "Add"
msgstr "A"
msgstr "Pridať"
#: libraries/Console.class.php:278
#, fuzzy

37
po/ta.po
View File

@ -7,16 +7,16 @@ msgstr ""
"Project-Id-Version: phpMyAdmin 4.4.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
"POT-Creation-Date: 2014-12-21 13:06+0100\n"
"PO-Revision-Date: 2014-09-22 22:42+0200\n"
"Last-Translator: கணேஷ் குமார் <GANESHTHEONE@gmail.com>\n"
"Language-Team: Tamil <https://hosted.weblate.org/projects/phpmyadmin/master/"
"ta/>\n"
"PO-Revision-Date: 2014-12-29 10:51+0200\n"
"Last-Translator: Rifthy Ahmed <rifthy456@gmail.com>\n"
"Language-Team: Tamil "
"<https://hosted.weblate.org/projects/phpmyadmin/master/ta/>\n"
"Language: ta\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.10-dev\n"
"X-Generator: Weblate 2.2-dev\n"
#: changelog.php:36 license.php:28
#, php-format
@ -339,9 +339,10 @@ msgstr "நெடுவரிசைகள் வெற்றிகரமாக
msgid ""
"Version %1$s was created for selected tables, tracking is active for them."
msgstr ""
"தெரிவு செய்யப்பட்ட அட்டவனைகளுக்கான பதிப்பு %1$s உருவாக்கப்பட்டுள்ளது, "
"அவைகளுக்கான கண்காணிப்பு செயல்பாடு"
#: db_tracking.php:78
#, fuzzy
#| msgid "No databases selected."
msgid "No tables selected."
msgstr "எந்த தரவுத்தளமும் தேர்ந்தெடுக்கப்படவில்லை."
@ -391,7 +392,6 @@ msgid "Delete tracking data for this table"
msgstr "இந்த அட்டவணைக்கான கண்காணிப்பு தரவை நீக்குக"
#: db_tracking.php:145 db_tracking.php:207
#, fuzzy
#| msgid "Deleting tracking data"
msgid "Delete tracking"
msgstr "கண்காணிப்பு தரவுகள் அழிக்கப்படுகின்றன"
@ -890,15 +890,14 @@ msgstr ""
"நீட்டிக்கப்பட்ட வசதிகள் முடக்கப்படுள்ளன. %sஏனென்று அறிக%s. "
#: index.php:540
#, fuzzy
#| msgid ""
#| "<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Or alternately go to 'Operations' "
#| "tab of any database to set it up there."
msgid ""
"Or alternately go to 'Operations' tab of any database to set it up there."
msgstr ""
"<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;அல்லது மாற்றாக எதேனும் தரவுத்தளத்தின் "
"'செயல்பாடுகள்' தத்தலுக்கு சென்று அங்கு அமைத்துக்கொள்க."
"<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;அல்லது மாற்றாக எதேனும் தரவுத்தளத்தின்"
" 'செயல்பாடுகள்' தத்தலுக்கு சென்று அங்கு அமைத்தத்தல்."
#: index.php:585
#, php-format
@ -944,28 +943,24 @@ msgid "You are about to TRUNCATE a complete table!"
msgstr "நீங்கள் ஒரு முழு அட்டவணையின் தரவுகளை நீக்கவுள்ளீர்கள்!"
#: js/messages.php:40
#, fuzzy
#| msgid "Delete tracking data for this table"
msgid "Delete tracking data for this table?"
msgstr "இந்த அட்டவணைக்கான கண்காணிப்பு தரவை நீக்குக"
msgstr "இந்த அட்டவணைக்கான கண்காணிப்பு தரவை நீக்கவா?"
#: js/messages.php:41
#, fuzzy
#| msgid "Delete tracking data for this table"
msgid "Delete tracking data for these tables?"
msgstr "இந்த அட்டவணைக்கான கண்காணிப்பு தரவை நீக்குக"
msgstr "இந்த அட்டவணைக்கான கண்காணிப்பு தரவை நீக்கவா?"
#: js/messages.php:42
#, fuzzy
#| msgid "Delete tracking data for this table"
msgid "Delete tracking data for this version?"
msgstr "இந்த அட்டவணைக்கான கண்காணிப்பு தரவை நீக்குக"
msgstr "இந்த அட்டவணைக்கான பதிப்பு கண்காணிப்பு தரவை நீக்கவா?"
#: js/messages.php:43
#, fuzzy
#| msgid "Delete tracking data for this table"
msgid "Delete tracking data for these versions?"
msgstr "இந்த அட்டவணைக்கான கண்காணிப்பு தரவை நீக்குக"
msgstr "இந்த பதிப்பு அட்டவணைக்கான கண்காணிப்பு தரவை நீக்கவா?"
#: js/messages.php:44
msgid "Deleting tracking data"
@ -973,11 +968,11 @@ msgstr "கண்காணிப்பு தரவுகள் அழிக்
#: js/messages.php:45
msgid "Dropping Primary Key/Index"
msgstr "முதனிலை சுட்டு/தொகுப்புக்குறிகாட்டி கைவிடப்படுகிறது"
msgstr "முதனிலை குறிப்பெழுத்து/தொகுப்புக்குறிகாட்டி கைவிடப்படுகிறது"
#: js/messages.php:46
msgid "Dropping Foreign key."
msgstr "அயல் குறியெண் கைவிடப்படுகிறது."
msgstr "அயல் சாவி கைவிடப்படுகிறது."
#: js/messages.php:47
msgid "This operation could take a long time. Proceed anyway?"
@ -1001,7 +996,7 @@ msgstr ""
#: js/messages.php:51
msgid "Do you really want to revoke the selected user(s) ?"
msgstr "உங்களுக்கு உண்மையிலேயே தேர்ந்தெடுத்த பயனர்(களை) திருப்பியளிக்க வேண்டுமா?"
msgstr "உங்களுக்கு உண்மையிலேயே தேர்ந்தெடுத்த பயனர்(களை) திரும்பப்பெற வேண்டுமா?"
#: js/messages.php:54
msgid "Save & Close"

23
po/th.po
View File

@ -4,16 +4,16 @@ msgstr ""
"Project-Id-Version: phpMyAdmin 4.4.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
"POT-Creation-Date: 2014-12-21 13:06+0100\n"
"PO-Revision-Date: 2014-11-05 10:20+0200\n"
"Last-Translator: Michal Čihař <michal@cihar.com>\n"
"Language-Team: Thai <https://hosted.weblate.org/projects/phpmyadmin/master/"
"th/>\n"
"PO-Revision-Date: 2014-12-28 19:39+0200\n"
"Last-Translator: Somthanat Wongsa <somthanat@gmail.com>\n"
"Language-Team: Thai "
"<https://hosted.weblate.org/projects/phpmyadmin/master/th/>\n"
"Language: th\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
"X-Generator: Weblate 2.0-dev\n"
"X-Generator: Weblate 2.2-dev\n"
#: changelog.php:36 license.php:28
#, php-format
@ -25,19 +25,18 @@ msgstr ""
#: db_central_columns.php:85
msgid "The central list of columns for the current database is empty."
msgstr ""
msgstr "ไม่พบรายการสดมภ์ของฐานข้อมูลปัจจุบัน"
#: db_central_columns.php:109
#, fuzzy
#| msgid "Click to sort"
msgid "Click to sort."
msgstr "กดเพื่อเรียงลำดับ"
#: db_central_columns.php:125
#, fuzzy, php-format
#, php-format
#| msgid "Showing rows"
msgid "Showing rows %1$s - %2$s."
msgstr "แสดงแถว"
msgstr "กำลังแสดงแถวที่ %1$s - %2$s"
#: db_create.php:61
#, php-format
@ -352,10 +351,9 @@ msgid ""
msgstr ""
#: db_tracking.php:78
#, fuzzy
#| msgid "No databases selected."
msgid "No tables selected."
msgstr "ไม่มีฐานข้อมูลที่ถูกเลือก"
msgstr "ไม่มีตารางที่ถูกเลือก"
#: db_tracking.php:112
msgid "Tracked tables"
@ -14019,10 +14017,9 @@ msgid "Drag to reorder"
msgstr "ลากเพื่อเปลี่ยนลำดับ"
#: libraries/tbl_printview.lib.php:30
#, fuzzy
#| msgid "Show tables"
msgid "Showing tables:"
msgstr "แสดงตาราง"
msgstr "กำลังแสดงตาราง:"
#: libraries/tbl_printview.lib.php:174
#, fuzzy

28
test/classes/PMA_DisplayResults_test.php
View File

@ -662,16 +662,16 @@ class PMA_DisplayResults_Test extends PHPUnit_Framework_TestCase
/**
* Test for _getCheckBoxesForMultipleRowOperations
*
* @param string $dir _left / _right
* @param array $is_display display mode
* @param string $output output of _getCheckBoxesForMultipleRowOperations
* @param string $dir _left / _right
* @param array $displayParts which parts to display
* @param string $output output of _getCheckBoxesForMultipleRowOperations
*
* @return void
*
* @dataProvider dataProviderForGetCheckBoxesForMultipleRowOperations
*/
public function testGetCheckBoxesForMultipleRowOperations(
$dir, $is_display, $output
$dir, $displayParts, $output
) {
$vertical_display = array(
'row_delete' => array(
@ -697,7 +697,7 @@ class PMA_DisplayResults_Test extends PHPUnit_Framework_TestCase
$output,
$this->_callPrivateFunction(
'_getCheckBoxesForMultipleRowOperations',
array($dir, $is_display)
array($dir, $displayParts)
)
);
}
@ -827,7 +827,7 @@ class PMA_DisplayResults_Test extends PHPUnit_Framework_TestCase
* Test for _getCheckboxForMultiRowSubmissions
*
* @param string $del_url delete url
* @param array $is_display array with explicit indexes for all
* @param array $displayParts array with explicit indexes for all
* the display elements
* @param string $row_no the row number
* @param string $where_clause_html url encoded where clause
@ -841,7 +841,7 @@ class PMA_DisplayResults_Test extends PHPUnit_Framework_TestCase
* @dataProvider dataProviderForGetCheckboxForMultiRowSubmissions
*/
public function testGetCheckboxForMultiRowSubmissions(
$del_url, $is_display, $row_no, $where_clause_html, $condition_array,
$del_url, $displayParts, $row_no, $where_clause_html, $condition_array,
$id_suffix, $class, $output
) {
$this->assertEquals(
@ -849,7 +849,7 @@ class PMA_DisplayResults_Test extends PHPUnit_Framework_TestCase
$this->_callPrivateFunction(
'_getCheckboxForMultiRowSubmissions',
array(
$del_url, $is_display, $row_no, $where_clause_html,
$del_url, $displayParts, $row_no, $where_clause_html,
$condition_array, $id_suffix, $class
)
)
@ -1264,7 +1264,7 @@ class PMA_DisplayResults_Test extends PHPUnit_Framework_TestCase
*
* @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
* @param array $displayParts array with explicit indexes for all the
* display elements
* @param string $row_no row number
* @param string $where_clause where clause
@ -1284,7 +1284,7 @@ class PMA_DisplayResults_Test extends PHPUnit_Framework_TestCase
* @dataProvider dataProviderForGetCheckboxAndLinks
*/
public function testGetCheckboxAndLinks(
$position, $del_url, $is_display, $row_no, $where_clause,
$position, $del_url, $displayParts, $row_no, $where_clause,
$where_clause_html, $condition_array, $edit_url,
$copy_url, $class, $edit_str, $copy_str, $del_str, $js_conf, $output
) {
@ -1293,7 +1293,7 @@ class PMA_DisplayResults_Test extends PHPUnit_Framework_TestCase
$this->_callPrivateFunction(
'_getCheckboxAndLinks',
array(
$position, $del_url, $is_display, $row_no, $where_clause,
$position, $del_url, $displayParts, $row_no, $where_clause,
$where_clause_html, $condition_array,
$edit_url, $copy_url, $class, $edit_str,
$copy_str, $del_str, $js_conf
@ -1365,7 +1365,7 @@ class PMA_DisplayResults_Test extends PHPUnit_Framework_TestCase
*
* @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 array $displayParts 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
@ -1384,7 +1384,7 @@ class PMA_DisplayResults_Test extends PHPUnit_Framework_TestCase
* @dataProvider dataProviderForGetPlacedLinks
*/
public function testGetPlacedLinks(
$dir, $del_url, $is_display, $row_no, $where_clause, $where_clause_html,
$dir, $del_url, $displayParts, $row_no, $where_clause, $where_clause_html,
$condition_array, $edit_url, $copy_url,
$edit_anchor_class, $edit_str, $copy_str, $del_str, $js_conf, $output
) {
@ -1393,7 +1393,7 @@ class PMA_DisplayResults_Test extends PHPUnit_Framework_TestCase
$this->_callPrivateFunction(
'_getPlacedLinks',
array(
$dir, $del_url, $is_display, $row_no, $where_clause,
$dir, $del_url, $displayParts, $row_no, $where_clause,
$where_clause_html, $condition_array,
$edit_url, $copy_url, $edit_anchor_class,
$edit_str, $copy_str, $del_str, $js_conf