diff options
| author | Piotr Przybylski <piotrprz@gmail.com> | 2011-08-13 00:02:40 +0400 |
|---|---|---|
| committer | Piotr Przybylski <piotrprz@gmail.com> | 2011-08-13 00:02:40 +0400 |
| commit | a7c0c55c7fa9c0ee45cef59245e2572f3c2f1be1 (patch) | |
| tree | 5796d8d201939016ef01bacc626f517e10f56795 /tbl_printview.php | |
| parent | 64926ead73dadd10b323712304d72fa86c6a3982 (diff) | |
| parent | 9147f30dc6b00dc63c998f1d2d3972d1a47e6c57 (diff) | |
Merge remote-tracking branch 'origin/master' into drizzle
Conflicts:
js/server_status.js
libraries/common.lib.php
tbl_printview.php
tbl_select.php
tbl_structure.php
Diffstat (limited to 'tbl_printview.php')
| -rw-r--r-- | tbl_printview.php | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/tbl_printview.php b/tbl_printview.php index 9ece0c37fd..24949094aa 100644 --- a/tbl_printview.php +++ b/tbl_printview.php @@ -101,10 +101,10 @@ foreach ($the_tables as $key => $table) { $columns = PMA_DBI_get_columns($db, $table); -// We need this to correctly learn if a TIMESTAMP is NOT NULL, since -// SHOW FULL COLUMNS or INFORMATION_SCHEMA incorrectly says NULL -// and SHOW CREATE TABLE says NOT NULL (tested -// in MySQL 4.0.25 and 5.0.21, http://bugs.mysql.com/20910). + // We need this to correctly learn if a TIMESTAMP is NOT NULL, since +// SHOW FULL FIELDS or INFORMATION_SCHEMA incorrectly says NULL + // and SHOW CREATE TABLE says NOT NULL (tested + // in MySQL 4.0.25 and 5.0.21, http://bugs.mysql.com/20910). $show_create_table = PMA_DBI_fetch_value( 'SHOW CREATE TABLE ' . PMA_backquote($db) . '.' . PMA_backquote($table), @@ -338,7 +338,7 @@ foreach ($the_tables as $key => $table) { if (isset($showtable['Row_format'])) { ?> <tr> - <td><?php echo ucfirst(__('Format')); ?></td> + <td><?php echo __('Format'); ?></td> <td align="<?php echo $cell_align_left; ?>"> <?php if ($showtable['Row_format'] == 'Fixed') { @@ -356,7 +356,7 @@ foreach ($the_tables as $key => $table) { if (isset($showtable['Rows'])) { ?> <tr> - <td><?php echo ucfirst(__('Rows')); ?></td> + <td><?php echo __('Rows'); ?></td> <td align="right"> <?php echo PMA_formatNumber($showtable['Rows'], 0) . "\n"; ?> </td> @@ -366,7 +366,7 @@ foreach ($the_tables as $key => $table) { if (isset($showtable['Avg_row_length']) && $showtable['Avg_row_length'] > 0) { ?> <tr> - <td><?php echo ucfirst(__('Row length')); ?> ø</td> + <td><?php echo __('Row length'); ?> ø</td> <td> <?php echo PMA_formatNumber($showtable['Avg_row_length'], 0) . "\n"; ?> </td> @@ -376,7 +376,7 @@ foreach ($the_tables as $key => $table) { if (isset($showtable['Data_length']) && $showtable['Rows'] > 0 && $mergetable == false) { ?> <tr> - <td><?php echo ucfirst(__(' Row size ')); ?> ø</td> + <td><?php echo __('Row size'); ?> ø</td> <td align="right"> <?php echo $avg_size . ' ' . $avg_unit . "\n"; ?> </td> @@ -386,7 +386,7 @@ foreach ($the_tables as $key => $table) { if (isset($showtable['Auto_increment'])) { ?> <tr> - <td><?php echo ucfirst(__('Next')); ?> Autoindex</td> + <td><?php echo __('Next autoindex'); ?></td> <td align="right"> <?php echo PMA_formatNumber($showtable['Auto_increment'], 0) . "\n"; ?> </td> |