The branch, master has been updated
via b2d8e0b60ffdda22bbbc165674088094d26f31f1 (commit)
from 0131d16548e5bc32d7619d43c97272a5a2c1474f (commit)
- Log -----------------------------------------------------------------
commit b2d8e0b60ffdda22bbbc165674088094d26f31f1
Author: Marc Delisle <[email protected]>
Date: Wed Jul 13 09:19:38 2011 -0400
Clarify directive name: ShowDisplayDir -> ShowDisplayDirection
-----------------------------------------------------------------------
Summary of changes:
Documentation.html | 2 +-
libraries/config.default.php | 2 +-
libraries/config/messages.inc.php | 10 +++++-----
libraries/config/setup.forms.php | 2 +-
libraries/config/user_preferences.forms.php | 2 +-
libraries/display_tbl.lib.php | 2 +-
6 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/Documentation.html b/Documentation.html
index 0b3bd92..6a8d5dc 100644
--- a/Documentation.html
+++ b/Documentation.html
@@ -2143,7 +2143,7 @@ setfacl -d -m "g:www-data:rwx" tmp
identify what they mean.
</dd>
- <dt id="cfg_ShowDisplayDir">$cfg['ShowDisplayDir'] boolean</dt>
+ <dt id="cfg_ShowDisplayDirection">$cfg['ShowDisplayDirection'] boolean</dt>
<dd>
Defines whether or not type display direction option is shown
when browsing a table.
diff --git a/libraries/config.default.php b/libraries/config.default.php
index d54dc5a..5762531 100644
--- a/libraries/config.default.php
+++ b/libraries/config.default.php
@@ -2315,7 +2315,7 @@ $cfg['ShowPropertyComments']= true;
/**
* shows table display direction.
*/
-$cfg['ShowDisplayDir'] = false;
+$cfg['ShowDisplayDirection'] = false;
/**
* repeat header names every X cells? (0 = deactivate)
diff --git a/libraries/config/messages.inc.php
b/libraries/config/messages.inc.php
index 0602cae..5d42f89 100644
--- a/libraries/config/messages.inc.php
+++ b/libraries/config/messages.inc.php
@@ -3,9 +3,9 @@
/**
* Messages for phpMyAdmin.
*
- * This file is here for easy transition to Gettext. You should not add any
- * new messages here, use instead gettext directly in your template/PHP
- * file.
+ * This file defines variables in a special format suited for the
+ * configuration subsystem, with $strConfig as a prefix, _desc or _name
+ * as a suffix, and the directive name in between.
*
* @package phpMyAdmin
*/
@@ -450,8 +450,8 @@ $strConfigShowAll_name = __('Allow to display all the
rows');
$strConfigShowChgPassword_desc = __('Please note that enabling this has no
effect with [kbd]config[/kbd] authentication mode because the password is hard
coded in the configuration file; this does not limit the ability to execute the
same command directly');
$strConfigShowChgPassword_name = __('Show password change form');
$strConfigShowCreateDb_name = __('Show create database form');
-$strConfigShowDisplayDir_desc = __('Defines whether or not type display
direction option is shown when browsing a table');
-$strConfigShowDisplayDir_name = __('Show display direction');
+$strConfigShowDisplayDirection_desc = __('Defines whether or not type display
direction option is shown when browsing a table');
+$strConfigShowDisplayDirection_name = __('Show display direction');
$strConfigShowFieldTypesInDataEditView_desc = __('Defines whether or not type
fields should be initially displayed in edit/insert mode');
$strConfigShowFieldTypesInDataEditView_name = __('Show field types');
$strConfigShowFunctionFields_desc = __('Display the function fields in
edit/insert mode');
diff --git a/libraries/config/setup.forms.php b/libraries/config/setup.forms.php
index e1865fa..5598b93 100644
--- a/libraries/config/setup.forms.php
+++ b/libraries/config/setup.forms.php
@@ -198,7 +198,7 @@ $forms['Main_frame']['Browse'] = array(
'Order',
'BrowsePointerEnable',
'BrowseMarkerEnable',
- 'ShowDisplayDir',
+ 'ShowDisplayDirection',
'RepeatCells',
'LimitChars',
'RowActionLinks',
diff --git a/libraries/config/user_preferences.forms.php
b/libraries/config/user_preferences.forms.php
index f1363b4..8dc78fe 100644
--- a/libraries/config/user_preferences.forms.php
+++ b/libraries/config/user_preferences.forms.php
@@ -108,7 +108,7 @@ $forms['Main_frame']['Browse'] = array(
'DisplayBinaryAsHex',
'BrowsePointerEnable',
'BrowseMarkerEnable',
- 'ShowDisplayDir',
+ 'ShowDisplayDirection',
'RepeatCells',
'LimitChars',
'RowActionLinks',
diff --git a/libraries/display_tbl.lib.php b/libraries/display_tbl.lib.php
index a120037..e231b84 100644
--- a/libraries/display_tbl.lib.php
+++ b/libraries/display_tbl.lib.php
@@ -438,7 +438,7 @@ function PMA_displayTableNavigation($pos_next, $pos_prev,
$sql_query, $id_for_di
<?php echo __('Number of rows') . ': ' . "\n"; ?>
<input type="text" name="session_max_rows" size="3" value="<?php
echo (($_SESSION['tmp_user_values']['max_rows'] != 'all') ?
$_SESSION['tmp_user_values']['max_rows'] : $GLOBALS['cfg']['MaxRows']); ?>"
class="textfield" onfocus="this.select()" />
<?php
- if ($GLOBALS['cfg']['ShowDisplayDir']) {
+ if ($GLOBALS['cfg']['ShowDisplayDirection']) {
// Display mode (horizontal/vertical and repeat headers)
echo __('Mode') . ': ' . "\n";
$choices = array(
hooks/post-receive
--
phpMyAdmin
------------------------------------------------------------------------------
AppSumo Presents a FREE Video for the SourceForge Community by Eric
Ries, the creator of the Lean Startup Methodology on "Lean Startup
Secrets Revealed." This video shows you how to validate your ideas,
optimize your ideas and identify your business strategy.
http://p.sf.net/sfu/appsumosfdev2dev
_______________________________________________
Phpmyadmin-git mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/phpmyadmin-git
