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

Remove strError occurences.

Browse Source
This commit is contained in:
Michal Čihař
2010-05-24 11:27:08 +02:00
parent 0620f3df03
commit 88ff43da9f
3 changed files with 30 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libraries/core.lib.php
View File

@@ -231,8 +231,6 @@ function PMA_fatalError($error_message, $message_args = null)
// Loads the language file // Loads the language file
require_once './libraries/select_lang.lib.php'; require_once './libraries/select_lang.lib.php';
$GLOBALS['strError'] = __('Error');
// $text_dir is set in po file // $text_dir is set in po file
if (isset($text_dir)) { if (isset($text_dir)) {
$GLOBALS['text_dir'] = $text_dir; $GLOBALS['text_dir'] = $text_dir;

6
libraries/messages.inc.php
View File

@@ -20,16 +20,10 @@ $text_dir = __('ltr');
$strDocu = __('Documentation'); $strDocu = __('Documentation');
$strError = __('Error');
$strErrorSaveTable = __('Error saving coordinates for Designer.'); $strErrorSaveTable = __('Error saving coordinates for Designer.');
$strFormEmpty = __('Missing value in the form!'); $strFormEmpty = __('Missing value in the form!');
$strHide = __('Hide');
$strLatexContent = __('Content of table __TABLE__'); $strLatexContent = __('Content of table __TABLE__');
$strLatexContinued = __('(continued)'); $strLatexContinued = __('(continued)');
$strLatexStructure = __('Structure of table __TABLE__'); $strLatexStructure = __('Structure of table __TABLE__');

2
test/PMA_Message_test.php
View File

@@ -77,7 +77,7 @@ class PMA_Message_test extends PHPUnit_Extensions_OutputTestCase
{ {
$this->object = new PMA_Message('test<&>', PMA_Message::ERROR); $this->object = new PMA_Message('test<&>', PMA_Message::ERROR);
$this->assertEquals($this->object, PMA_Message::error('test<&>')); $this->assertEquals($this->object, PMA_Message::error('test<&>'));
$this->assertEquals('strError', PMA_Message::error()->getString()); $this->assertEquals('Error', PMA_Message::error()->getString());
} }
/** /**