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

gettext conversion

Browse Source
This commit is contained in:
Marc Delisle
2010-05-14 12:43:23 -04:00
parent 2112996217
commit 25f7b89443
6 changed files with 29 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
setup/frames/config.inc.php
View File

@@ -22,7 +22,7 @@ $config_writable = false;
$config_exists = false; $config_exists = false;
check_config_rw($config_readable, $config_writable, $config_exists); 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'); ?> <?php display_form_top('config.php'); ?>
<input type="hidden" name="eol" value="<?php echo htmlspecialchars(PMA_ifSetOr($_GET['eol'], 'unix')) ?>" /> <input type="hidden" name="eol" value="<?php echo htmlspecialchars(PMA_ifSetOr($_GET['eol'], 'unix')) ?>" />
<?php display_fieldset_top('', '', null, array('class' => 'simple')); ?> <?php display_fieldset_top('', '', null, array('class' => 'simple')); ?>
@@ -35,7 +35,7 @@ check_config_rw($config_readable, $config_writable, $config_exists);
</tr> </tr>
<tr> <tr>
<td class="lastrow" style="text-align: left"> <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"' ?> /> <input type="submit" name="submit_save" value="<?php echo __('Save') ?>"<?php if (!$config_writable) echo ' disabled="disabled"' ?> />
</td> </td>
</tr> </tr>

36
setup/frames/index.inc.php
View File

@@ -55,7 +55,7 @@ if (!$config_writable || !$config_readable) {
// //
$is_https = !empty($_SERVER['HTTPS']) && strtolower($_SERVER['HTTPS']) == 'on'; $is_https = !empty($_SERVER['HTTPS']) && strtolower($_SERVER['HTTPS']) == 'on';
if (!$is_https) { 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'])) { if (!empty($_SERVER['REQUEST_URI']) && !empty($_SERVER['HTTP_HOST'])) {
$text .= ' ' . PMA_lang('InsecureConnectionMsg2', $text .= ' ' . PMA_lang('InsecureConnectionMsg2',
'https://' . htmlspecialchars($_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'])); 'https://' . htmlspecialchars($_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI']));
@@ -84,7 +84,7 @@ if (!$is_https) {
</select> </select>
</form> </form>
<h2><?php echo $GLOBALS['strSetupOverview'] ?></h2> <h2><?php echo __('Overview') ?></h2>
<?php <?php
// message handling // message handling
@@ -92,7 +92,7 @@ messages_end();
messages_show_html(); 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> <h3><?php echo __('Servers') ?></h3>
<?php <?php
@@ -132,7 +132,7 @@ display_form_top('index.php', 'get', array(
<table width="100%"> <table width="100%">
<tr> <tr>
<td> <td>
<i><?php echo $GLOBALS['strSetupNoServers'] ?></i> <i><?php echo __('There are no configured servers') ?></i>
</td> </td>
</tr> </tr>
</table> </table>
@@ -140,7 +140,7 @@ display_form_top('index.php', 'get', array(
<table width="100%"> <table width="100%">
<tr> <tr>
<td class="lastrow" style="text-align: left"> <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> </td>
</tr> </tr>
</table> </table>
@@ -149,7 +149,7 @@ display_form_top('index.php', 'get', array(
display_form_bottom(); display_form_bottom();
?> ?>
<h3><?php echo $GLOBALS['strSetupConfigurationFile'] ?></h3> <h3><?php echo __('Configuration file') ?></h3>
<?php <?php
// //
// Display config file settings and load/save form // 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); $lang_name = PMA_langName($each_lang);
$opts['values'][$each_lang_key] = $lang_name; $opts['values'][$each_lang_key] = $lang_name;
} }
display_input('DefaultLang', $GLOBALS['strSetupDefaultLanguage'], '', 'select', display_input('DefaultLang', __('Default language'), '', 'select',
$cf->getValue('DefaultLang'), true, $opts); $cf->getValue('DefaultLang'), true, $opts);
// Display server list // Display server list
@@ -179,7 +179,7 @@ $opts = array(
'values' => array(), 'values' => array(),
'values_disabled' => array()); 'values_disabled' => array());
if ($cf->getServerCount() > 0) { if ($cf->getServerCount() > 0) {
$opts['values']['0'] = $GLOBALS['strSetupLetUserChoose']; $opts['values']['0'] = __('let the user choose');
$opts['values']['-'] = '------------------------------'; $opts['values']['-'] = '------------------------------';
if ($cf->getServerCount() == 1) { if ($cf->getServerCount() == 1) {
$opts['values_disabled'][] = '0'; $opts['values_disabled'][] = '0';
@@ -190,10 +190,10 @@ if ($cf->getServerCount() > 0) {
$opts['values'][(string)$id] = $cf->getServerName($id) . " [$id]"; $opts['values'][(string)$id] = $cf->getServerName($id) . " [$id]";
} }
} else { } else {
$opts['values']['1'] = $GLOBALS['strSetupOptionNone']; $opts['values']['1'] = __('- none -');
$opts['values_escaped'] = true; $opts['values_escaped'] = true;
} }
display_input('ServerDefault', $GLOBALS['strSetupDefaultServer'], '', 'select', display_input('ServerDefault', __('Default server'), '', 'select',
$cf->getValue('ServerDefault'), true, $opts); $cf->getValue('ServerDefault'), true, $opts);
// Display EOL list // Display EOL list
@@ -203,19 +203,19 @@ $opts = array(
'win' => 'Windows (\r\n)'), 'win' => 'Windows (\r\n)'),
'values_escaped' => true); 'values_escaped' => true);
$eol = PMA_ifSetOr($_SESSION['eol'], (PMA_IS_WINDOWS ? 'win' : 'unix')); $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); $eol, true, $opts);
?> ?>
<tr> <tr>
<td colspan="2" class="lastrow" style="text-align: left"> <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_display" value="<?php echo __('Display') ?>" />
<input type="submit" name="submit_download" value="<?php echo $GLOBALS['strSetupDownload'] ?>" /> <input type="submit" name="submit_download" value="<?php echo __('Download') ?>" />
&nbsp; &nbsp; &nbsp; &nbsp;
<input type="submit" name="submit_save" value="<?php echo __('Save') ?>"<?php if (!$config_writable) echo ' disabled="disabled"' ?> /> <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_delete" value="<?php echo __('Delete') ?>"<?php if (!$config_exists || !$config_writable) echo ' disabled="disabled"' ?> />
&nbsp; &nbsp; &nbsp; &nbsp;
<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> </td>
</tr> </tr>
<?php <?php
@@ -223,7 +223,7 @@ display_fieldset_bottom_simple();
display_form_bottom(); display_form_bottom();
?> ?>
<div id="footer"> <div id="footer">
<a href="http://phpmyadmin.net"><?php echo $GLOBALS['strSetupHomepageLink'] ?></a> <a href="http://phpmyadmin.net"><?php echo __('phpMyAdmin homepage') ?></a>
<a href="http://sourceforge.net/donate/index.php?group_id=23067"><?php echo $GLOBALS['strSetupDonateLink'] ?></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 $GLOBALS['strSetupVersionCheckLink'] ?></a> <a href="?version_check=1<?php echo "{$separator}token=" . $_SESSION[' PMA_token '] ?>"><?php echo __('Check for latest version') ?></a>
</div> </div>

8
setup/frames/menu.inc.php
View File

@@ -14,10 +14,10 @@ if (!defined('PHPMYADMIN')) {
$separator = PMA_get_arg_separator('html'); $separator = PMA_get_arg_separator('html');
?> ?>
<ul> <ul>
<li><a href="index.php"><?php echo $GLOBALS['strSetupOverview'] ?></a></li> <li><a href="index.php"><?php echo __('Overview') ?></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=features"><?php echo __('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=left_frame"><?php echo __('Navigation 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="?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=import"><?php echo __('Import') ?></a></li>
<li><a href="?page=form<?php echo $separator ?>formset=export"><?php echo __('Export') ?></a></li> <li><a href="?page=form<?php echo $separator ?>formset=export"><?php echo __('Export') ?></a></li>
</ul> </ul>

4
setup/frames/servers.inc.php
View File

@@ -25,7 +25,7 @@ $cf = ConfigFile::getInstance();
$server_exists = !empty($id) && $cf->get("Servers/$id") !== null; $server_exists = !empty($id) && $cf->get("Servers/$id") !== null;
if ($mode == 'edit' && $server_exists) { if ($mode == 'edit' && $server_exists) {
$page_title = $GLOBALS['strSetupServersEdit'] $page_title = __('Edit server')
. ' ' . $id . ' <small>(' . $cf->getServerDSN($id) . ')</small>'; . ' ' . $id . ' <small>(' . $cf->getServerDSN($id) . ')</small>';
} elseif ($mode == 'remove' && $server_exists) { } elseif ($mode == 'remove' && $server_exists) {
$cf->removeServer($id); $cf->removeServer($id);
@@ -34,7 +34,7 @@ if ($mode == 'edit' && $server_exists) {
} elseif ($mode == 'revert' && $server_exists) { } elseif ($mode == 'revert' && $server_exists) {
// handled by process_formset() // handled by process_formset()
} else { } else {
$page_title = $GLOBALS['strSetupServersAdd']; $page_title = __('Add a new server');
$id = 0; $id = 0;
} }
if (isset($page_title)) { if (isset($page_title)) {

4
setup/lib/FormDisplay.tpl.php
View File

@@ -179,12 +179,12 @@ function display_input($path, $name, $description = '', $type, $value, $value_is
} }
if (isset($opts['setvalue']) && $opts['setvalue']) { 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 <?php
} }
if (isset($opts['show_restore_default']) && $opts['show_restore_default']) { 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 <?php
} }
// this must match with displayErrors() in scripts.js // this must match with displayErrors() in scripts.js

2
setup/lib/form_processing.lib.php
View File

@@ -40,7 +40,7 @@ function process_formset(FormDisplay $form_display) {
$id = $id ? "{$separator}id=$id" : ''; $id = $id ? "{$separator}id=$id" : '';
?> ?>
<div class="warning"> <div class="warning">
<h4><?php echo $GLOBALS['strSetupWarning'] ?></h4> <h4><?php echo __('Warning') ?></h4>
<?php echo PMA_lang('error_form') ?><br /> <?php echo PMA_lang('error_form') ?><br />
<a href="?page=<?php echo $page . $formset . $id . $separator ?>mode=revert"><?php echo PMA_lang('RevertErroneousFields') ?></a> <a href="?page=<?php echo $page . $formset . $id . $separator ?>mode=revert"><?php echo PMA_lang('RevertErroneousFields') ?></a>
</div> </div>