Merged stable branch up to 2.3.10

[fa-stable.git] / includes / system_tests.inc

diff --git a/includes/system_tests.inc b/includes/system_tests.inc
index 339f085b5c86568ad49dbb8d7b068ae3eb96b7ec..46cb9ac512b8063464efba03229bf71b6820c41b 100644 (file)
--- a/includes/system_tests.inc
+++ b/includes/system_tests.inc
@@ -14,7 +14,7 @@
 $test_level = array(
        0 => _('Info'),
        1 => _('Optional'),
-       2 => _('Recomended'),
+       2 => _('Recommended'),
        3 => _('Required ')
 );
 
@@ -34,7 +34,7 @@ function tst_phpmysql()
 {
        $test['descr'] = _('PHP MySQL extension');
        $test['type'] = 3;
-       $test['result'] = function_exists('gettext');
+       $test['result'] = function_exists('mysql_connect');
        $test['test'] = $test['result'] ? _('Yes'): _('No');
        
        $test['comments'] = _('Your PHP has to have MySQL extension enabled.');
@@ -113,7 +113,7 @@ function tst_gettext()
        $test['test'] = function_exists('gettext') ? _('Yes'): _('No');
        $test['type'] = 1;
        $test['result'] = true;
-       $test['comments'] = _('In case of no getext support, php emulation is used');
+       $test['comments'] = _('In case of no gettext support, php emulation is used');
 
        return $test;
 }
@@ -228,8 +228,8 @@ function tst_tmpdir()
 
 function tst_langs($install)
 {
-       global $installed_languages, $path_to_root;
-       
+       global $installed_languages, $path_to_root, $GetText;
+
        $test['descr'] = _('Language configuration consistency');
        $test['type'] = 3;
        $test['result'] = true;
@@ -269,7 +269,7 @@ function tst_langs($install)
                        $test['result'] = false;
                        $test['comments'][] = sprintf( _('Missing %s translation file.'), $file);
                }
-               if (!$_SESSION['get_text']->check_support($lang['code'], $lang['encoding']))
+               if (!$GetText->check_support($lang['code'], $lang['encoding']))
                {
                        $test['result'] = false;
                        $test['comments'][] = sprintf(_('Missing system locale: %s'), $lang['code'].".".$lang['encoding']);