[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_3-3291-g25f7b89
Marc Delisle
lem9 at users.sourceforge.net
Fri May 14 18:43:33 CEST 2010
The branch, master has been updated
via 25f7b894435f0565840f0397728ff5462b767735 (commit)
from 211299621773591d15ed16bfab93143aa24cab97 (commit)
- Log -----------------------------------------------------------------
commit 25f7b894435f0565840f0397728ff5462b767735
Author: Marc Delisle <marc at infomarc.info>
Date: Fri May 14 12:43:23 2010 -0400
gettext conversion
-----------------------------------------------------------------------
Summary of changes:
setup/frames/config.inc.php | 4 ++--
setup/frames/index.inc.php | 36 ++++++++++++++++++------------------
setup/frames/menu.inc.php | 8 ++++----
setup/frames/servers.inc.php | 4 ++--
setup/lib/FormDisplay.tpl.php | 4 ++--
setup/lib/form_processing.lib.php | 2 +-
6 files changed, 29 insertions(+), 29 deletions(-)
diff --git a/setup/frames/config.inc.php b/setup/frames/config.inc.php
index 22d8718..4e925d9 100644
--- a/setup/frames/config.inc.php
+++ b/setup/frames/config.inc.php
@@ -22,7 +22,7 @@ $config_writable = false;
$config_exists = false;
check_config_rw($config_readable, $config_writable, $config_exists);
?>
-<h2><?php echo $GLOBALS['strSetupConfigurationFile'] ?></h2>
+<h2><?php echo __('Configuration file') ?></h2>
<?php display_form_top('config.php'); ?>
<input type="hidden" name="eol" value="<?php echo htmlspecialchars(PMA_ifSetOr($_GET['eol'], 'unix')) ?>" />
<?php display_fieldset_top('', '', null, array('class' => 'simple')); ?>
@@ -35,7 +35,7 @@ check_config_rw($config_readable, $config_writable, $config_exists);
</tr>
<tr>
<td class="lastrow" style="text-align: left">
- <input type="submit" name="submit_download" value="<?php echo $GLOBALS['strSetupDownload'] ?>" class="green" />
+ <input type="submit" name="submit_download" value="<?php echo __('Download') ?>" class="green" />
<input type="submit" name="submit_save" value="<?php echo __('Save') ?>"<?php if (!$config_writable) echo ' disabled="disabled"' ?> />
</td>
</tr>
diff --git a/setup/frames/index.inc.php b/setup/frames/index.inc.php
index 7e383f5..43b6574 100644
--- a/setup/frames/index.inc.php
+++ b/setup/frames/index.inc.php
@@ -55,7 +55,7 @@ if (!$config_writable || !$config_readable) {
//
$is_https = !empty($_SERVER['HTTPS']) && strtolower($_SERVER['HTTPS']) == 'on';
if (!$is_https) {
- $text = $GLOBALS['strSetupInsecureConnectionMsg1'];
+ $text = __('You are not using a secure connection; all data (including potentially sensitive information, like passwords) is transferred unencrypted!');
if (!empty($_SERVER['REQUEST_URI']) && !empty($_SERVER['HTTP_HOST'])) {
$text .= ' ' . PMA_lang('InsecureConnectionMsg2',
'https://' . htmlspecialchars($_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI']));
@@ -84,7 +84,7 @@ if (!$is_https) {
</select>
</form>
-<h2><?php echo $GLOBALS['strSetupOverview'] ?></h2>
+<h2><?php echo __('Overview') ?></h2>
<?php
// message handling
@@ -92,7 +92,7 @@ messages_end();
messages_show_html();
?>
-<a href="#" id="show_hidden_messages" style="display:none"><?php echo $GLOBALS['strSetupShowHiddenMessages'] ?></a>
+<a href="#" id="show_hidden_messages" style="display:none"><?php echo __('Show hidden messages (#MSG_COUNT)') ?></a>
<h3><?php echo __('Servers') ?></h3>
<?php
@@ -132,7 +132,7 @@ display_form_top('index.php', 'get', array(
<table width="100%">
<tr>
<td>
- <i><?php echo $GLOBALS['strSetupNoServers'] ?></i>
+ <i><?php echo __('There are no configured servers') ?></i>
</td>
</tr>
</table>
@@ -140,7 +140,7 @@ display_form_top('index.php', 'get', array(
<table width="100%">
<tr>
<td class="lastrow" style="text-align: left">
- <input type="submit" name="submit" value="<?php echo $GLOBALS['strSetupNewServer'] ?>" />
+ <input type="submit" name="submit" value="<?php echo __('New server') ?>" />
</td>
</tr>
</table>
@@ -149,7 +149,7 @@ display_form_top('index.php', 'get', array(
display_form_bottom();
?>
-<h3><?php echo $GLOBALS['strSetupConfigurationFile'] ?></h3>
+<h3><?php echo __('Configuration file') ?></h3>
<?php
//
// Display config file settings and load/save form
@@ -169,7 +169,7 @@ foreach ($all_languages as $each_lang_key => $each_lang) {
$lang_name = PMA_langName($each_lang);
$opts['values'][$each_lang_key] = $lang_name;
}
-display_input('DefaultLang', $GLOBALS['strSetupDefaultLanguage'], '', 'select',
+display_input('DefaultLang', __('Default language'), '', 'select',
$cf->getValue('DefaultLang'), true, $opts);
// Display server list
@@ -179,7 +179,7 @@ $opts = array(
'values' => array(),
'values_disabled' => array());
if ($cf->getServerCount() > 0) {
- $opts['values']['0'] = $GLOBALS['strSetupLetUserChoose'];
+ $opts['values']['0'] = __('let the user choose');
$opts['values']['-'] = '------------------------------';
if ($cf->getServerCount() == 1) {
$opts['values_disabled'][] = '0';
@@ -190,10 +190,10 @@ if ($cf->getServerCount() > 0) {
$opts['values'][(string)$id] = $cf->getServerName($id) . " [$id]";
}
} else {
- $opts['values']['1'] = $GLOBALS['strSetupOptionNone'];
+ $opts['values']['1'] = __('- none -');
$opts['values_escaped'] = true;
}
-display_input('ServerDefault', $GLOBALS['strSetupDefaultServer'], '', 'select',
+display_input('ServerDefault', __('Default server'), '', 'select',
$cf->getValue('ServerDefault'), true, $opts);
// Display EOL list
@@ -203,19 +203,19 @@ $opts = array(
'win' => 'Windows (\r\n)'),
'values_escaped' => true);
$eol = PMA_ifSetOr($_SESSION['eol'], (PMA_IS_WINDOWS ? 'win' : 'unix'));
-display_input('eol', $GLOBALS['strSetupEndOfLine'], '', 'select',
+display_input('eol', __('End of line'), '', 'select',
$eol, true, $opts);
?>
<tr>
<td colspan="2" class="lastrow" style="text-align: left">
- <input type="submit" name="submit_display" value="<?php echo $GLOBALS['strSetupDisplay'] ?>" />
- <input type="submit" name="submit_download" value="<?php echo $GLOBALS['strSetupDownload'] ?>" />
+ <input type="submit" name="submit_display" value="<?php echo __('Display') ?>" />
+ <input type="submit" name="submit_download" value="<?php echo __('Download') ?>" />
<input type="submit" name="submit_save" value="<?php echo __('Save') ?>"<?php if (!$config_writable) echo ' disabled="disabled"' ?> />
- <input type="submit" name="submit_load" value="<?php echo $GLOBALS['strSetupLoad'] ?>"<?php if (!$config_exists) echo ' disabled="disabled"' ?> />
+ <input type="submit" name="submit_load" value="<?php echo __('Load') ?>"<?php if (!$config_exists) echo ' disabled="disabled"' ?> />
<input type="submit" name="submit_delete" value="<?php echo __('Delete') ?>"<?php if (!$config_exists || !$config_writable) echo ' disabled="disabled"' ?> />
- <input type="submit" name="submit_clear" value="<?php echo $GLOBALS['strSetupClear'] ?>" class="red" />
+ <input type="submit" name="submit_clear" value="<?php echo __('Clear') ?>" class="red" />
</td>
</tr>
<?php
@@ -223,7 +223,7 @@ display_fieldset_bottom_simple();
display_form_bottom();
?>
<div id="footer">
- <a href="http://phpmyadmin.net"><?php echo $GLOBALS['strSetupHomepageLink'] ?></a>
- <a href="http://sourceforge.net/donate/index.php?group_id=23067"><?php echo $GLOBALS['strSetupDonateLink'] ?></a>
- <a href="?version_check=1<?php echo "{$separator}token=" . $_SESSION[' PMA_token '] ?>"><?php echo $GLOBALS['strSetupVersionCheckLink'] ?></a>
+ <a href="http://phpmyadmin.net"><?php echo __('phpMyAdmin homepage') ?></a>
+ <a href="http://sourceforge.net/donate/index.php?group_id=23067"><?php echo __('Donate') ?></a>
+ <a href="?version_check=1<?php echo "{$separator}token=" . $_SESSION[' PMA_token '] ?>"><?php echo __('Check for latest version') ?></a>
</div>
diff --git a/setup/frames/menu.inc.php b/setup/frames/menu.inc.php
index c72adc7..1da3851 100644
--- a/setup/frames/menu.inc.php
+++ b/setup/frames/menu.inc.php
@@ -14,10 +14,10 @@ if (!defined('PHPMYADMIN')) {
$separator = PMA_get_arg_separator('html');
?>
<ul>
- <li><a href="index.php"><?php echo $GLOBALS['strSetupOverview'] ?></a></li>
- <li><a href="?page=form<?php echo $separator ?>formset=features"><?php echo $GLOBALS['strSetupFormset_features'] ?></a></li>
- <li><a href="?page=form<?php echo $separator ?>formset=left_frame"><?php echo $GLOBALS['strSetupForm_Left_frame'] ?></a></li>
- <li><a href="?page=form<?php echo $separator ?>formset=main_frame"><?php echo $GLOBALS['strSetupForm_Main_frame'] ?></a></li>
+ <li><a href="index.php"><?php echo __('Overview') ?></a></li>
+ <li><a href="?page=form<?php echo $separator ?>formset=features"><?php echo __('Features') ?></a></li>
+ <li><a href="?page=form<?php echo $separator ?>formset=left_frame"><?php echo __('Navigation frame') ?></a></li>
+ <li><a href="?page=form<?php echo $separator ?>formset=main_frame"><?php echo __('Main frame') ?></a></li>
<li><a href="?page=form<?php echo $separator ?>formset=import"><?php echo __('Import') ?></a></li>
<li><a href="?page=form<?php echo $separator ?>formset=export"><?php echo __('Export') ?></a></li>
</ul>
diff --git a/setup/frames/servers.inc.php b/setup/frames/servers.inc.php
index ee5b2af..17ff2f9 100644
--- a/setup/frames/servers.inc.php
+++ b/setup/frames/servers.inc.php
@@ -25,7 +25,7 @@ $cf = ConfigFile::getInstance();
$server_exists = !empty($id) && $cf->get("Servers/$id") !== null;
if ($mode == 'edit' && $server_exists) {
- $page_title = $GLOBALS['strSetupServersEdit']
+ $page_title = __('Edit server')
. ' ' . $id . ' <small>(' . $cf->getServerDSN($id) . ')</small>';
} elseif ($mode == 'remove' && $server_exists) {
$cf->removeServer($id);
@@ -34,7 +34,7 @@ if ($mode == 'edit' && $server_exists) {
} elseif ($mode == 'revert' && $server_exists) {
// handled by process_formset()
} else {
- $page_title = $GLOBALS['strSetupServersAdd'];
+ $page_title = __('Add a new server');
$id = 0;
}
if (isset($page_title)) {
diff --git a/setup/lib/FormDisplay.tpl.php b/setup/lib/FormDisplay.tpl.php
index b5e512d..f6cb5a5 100644
--- a/setup/lib/FormDisplay.tpl.php
+++ b/setup/lib/FormDisplay.tpl.php
@@ -179,12 +179,12 @@ function display_input($path, $name, $description = '', $type, $value, $value_is
}
if (isset($opts['setvalue']) && $opts['setvalue']) {
?>
- <a class="set-value" href="#<?php echo "$path={$opts['setvalue']}" ?>" title="<?php echo sprintf($GLOBALS['strSetupSetValue'], htmlspecialchars($opts['setvalue'])) ?>" style="display:none"><img alt="set-value" src="../<?php echo $GLOBALS['cfg']['ThemePath'] ?>/original/img/b_edit.png" width="16" height="16" /></a>
+ <a class="set-value" href="#<?php echo "$path={$opts['setvalue']}" ?>" title="<?php echo sprintf(__('Set value: %s'), htmlspecialchars($opts['setvalue'])) ?>" style="display:none"><img alt="set-value" src="../<?php echo $GLOBALS['cfg']['ThemePath'] ?>/original/img/b_edit.png" width="16" height="16" /></a>
<?php
}
if (isset($opts['show_restore_default']) && $opts['show_restore_default']) {
?>
- <a class="restore-default" href="#<?php echo $path ?>" title="<?php echo $GLOBALS['strSetupRestoreDefaultValue'] ?>" style="display:none"><img alt="restore-default" src="../<?php echo $GLOBALS['cfg']['ThemePath'] ?>/original/img/s_reload.png" width="16" height="16" /></a>
+ <a class="restore-default" href="#<?php echo $path ?>" title="<?php echo __('Restore default value') ?>" style="display:none"><img alt="restore-default" src="../<?php echo $GLOBALS['cfg']['ThemePath'] ?>/original/img/s_reload.png" width="16" height="16" /></a>
<?php
}
// this must match with displayErrors() in scripts.js
diff --git a/setup/lib/form_processing.lib.php b/setup/lib/form_processing.lib.php
index da72f57..7128a61 100644
--- a/setup/lib/form_processing.lib.php
+++ b/setup/lib/form_processing.lib.php
@@ -40,7 +40,7 @@ function process_formset(FormDisplay $form_display) {
$id = $id ? "{$separator}id=$id" : '';
?>
<div class="warning">
- <h4><?php echo $GLOBALS['strSetupWarning'] ?></h4>
+ <h4><?php echo __('Warning') ?></h4>
<?php echo PMA_lang('error_form') ?><br />
<a href="?page=<?php echo $page . $formset . $id . $separator ?>mode=revert"><?php echo PMA_lang('RevertErroneousFields') ?></a>
</div>
hooks/post-receive
--
phpMyAdmin
More information about the Git
mailing list