By default use new format strings.

This commit is contained in:
Michal Čihař
2010-07-21 10:06:16 +02:00
parent dba7151245
commit 906d7bc632
3 changed files with 11 additions and 10 deletions

View File

@@ -1116,21 +1116,21 @@ $cfg['Export']['remember_file_template'] = true;
* *
* @global string $cfg['Export']['file_template_table'] * @global string $cfg['Export']['file_template_table']
*/ */
$cfg['Export']['file_template_table'] = '__TABLE__'; $cfg['Export']['file_template_table'] = '@TABLE@';
/** /**
* *
* *
* @global string $cfg['Export']['file_template_database'] * @global string $cfg['Export']['file_template_database']
*/ */
$cfg['Export']['file_template_database'] = '__DB__'; $cfg['Export']['file_template_database'] = '@DB@';
/** /**
* *
* *
* @global string $cfg['Export']['file_template_server'] * @global string $cfg['Export']['file_template_server']
*/ */
$cfg['Export']['file_template_server'] = '__SERVER__'; $cfg['Export']['file_template_server'] = '@SERVER@';
/** /**
* *
@@ -1431,14 +1431,14 @@ $cfg['Export']['latex_data_continued_caption'] = 'strLatexContent strLatexContin
* *
* @global string $cfg['Export']['latex_data_label'] * @global string $cfg['Export']['latex_data_label']
*/ */
$cfg['Export']['latex_data_label'] = 'tab:__TABLE__-data'; $cfg['Export']['latex_data_label'] = 'tab:@TABLE@-data';
/** /**
* *
* *
* @global string $cfg['Export']['latex_structure_label'] * @global string $cfg['Export']['latex_structure_label']
*/ */
$cfg['Export']['latex_structure_label'] = 'tab:__TABLE__-structure'; $cfg['Export']['latex_structure_label'] = 'tab:@TABLE@-structure';
/** /**
* *

View File

@@ -147,13 +147,13 @@ echo PMA_pluginGetJavascript($export_list);
echo __('File name template'); echo __('File name template');
$trans = new PMA_Message; $trans = new PMA_Message;
$trans->addMessage('__SERVER__/'); $trans->addMessage('@SERVER@/');
$trans->addString(__('server name')); $trans->addString(__('server name'));
if ($export_type == 'database' || $export_type == 'table') { if ($export_type == 'database' || $export_type == 'table') {
$trans->addMessage('__DB__/'); $trans->addMessage('@DB@/');
$trans->addString(__('database name')); $trans->addString(__('database name'));
if ($export_type == 'table') { if ($export_type == 'table') {
$trans->addMessage('__TABLE__/'); $trans->addMessage('@TABLE@/');
$trans->addString(__('table name')); $trans->addString(__('table name'));
} }
} }
@@ -163,6 +163,7 @@ echo PMA_pluginGetJavascript($export_list);
. __('Documentation') . '">', false); . __('Documentation') . '">', false);
$message->addParam('</a>', false); $message->addParam('</a>', false);
$message->addParam($trans); $message->addParam($trans);
$message->addMessage(' ' . PMA_showDocu('faq6_27'));
echo PMA_showHint($message); echo PMA_showHint($message);
?> ?>

View File

@@ -10,9 +10,9 @@ if (! defined('PHPMYADMIN')) {
} }
/* Messages used in default captions */ /* Messages used in default captions */
$GLOBALS['strLatexContent'] = __('Content of table __TABLE__'); $GLOBALS['strLatexContent'] = __('Content of table @TABLE@');
$GLOBALS['strLatexContinued'] = __('(continued)'); $GLOBALS['strLatexContinued'] = __('(continued)');
$GLOBALS['strLatexStructure'] = __('Structure of table __TABLE__'); $GLOBALS['strLatexStructure'] = __('Structure of table @TABLE@');
/** /**
* *