diff --git a/libraries/config.default.php b/libraries/config.default.php index 4b6bd969f..7ec7c5dc5 100644 --- a/libraries/config.default.php +++ b/libraries/config.default.php @@ -1116,21 +1116,21 @@ $cfg['Export']['remember_file_template'] = true; * * @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'] */ -$cfg['Export']['file_template_database'] = '__DB__'; +$cfg['Export']['file_template_database'] = '@DB@'; /** * * * @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'] */ -$cfg['Export']['latex_data_label'] = 'tab:__TABLE__-data'; +$cfg['Export']['latex_data_label'] = 'tab:@TABLE@-data'; /** * * * @global string $cfg['Export']['latex_structure_label'] */ -$cfg['Export']['latex_structure_label'] = 'tab:__TABLE__-structure'; +$cfg['Export']['latex_structure_label'] = 'tab:@TABLE@-structure'; /** * diff --git a/libraries/display_export.lib.php b/libraries/display_export.lib.php index ae099e034..48c760cf8 100644 --- a/libraries/display_export.lib.php +++ b/libraries/display_export.lib.php @@ -147,13 +147,13 @@ echo PMA_pluginGetJavascript($export_list); echo __('File name template'); $trans = new PMA_Message; - $trans->addMessage('__SERVER__/'); + $trans->addMessage('@SERVER@/'); $trans->addString(__('server name')); if ($export_type == 'database' || $export_type == 'table') { - $trans->addMessage('__DB__/'); + $trans->addMessage('@DB@/'); $trans->addString(__('database name')); if ($export_type == 'table') { - $trans->addMessage('__TABLE__/'); + $trans->addMessage('@TABLE@/'); $trans->addString(__('table name')); } } @@ -163,6 +163,7 @@ echo PMA_pluginGetJavascript($export_list); . __('Documentation') . '">', false); $message->addParam('', false); $message->addParam($trans); + $message->addMessage(' ' . PMA_showDocu('faq6_27')); echo PMA_showHint($message); ?> diff --git a/libraries/export/latex.php b/libraries/export/latex.php index 86200d8bd..19d5eaa8d 100644 --- a/libraries/export/latex.php +++ b/libraries/export/latex.php @@ -10,9 +10,9 @@ if (! defined('PHPMYADMIN')) { } /* Messages used in default captions */ -$GLOBALS['strLatexContent'] = __('Content of table __TABLE__'); +$GLOBALS['strLatexContent'] = __('Content of table @TABLE@'); $GLOBALS['strLatexContinued'] = __('(continued)'); -$GLOBALS['strLatexStructure'] = __('Structure of table __TABLE__'); +$GLOBALS['strLatexStructure'] = __('Structure of table @TABLE@'); /** *