Changeset 695

Show
Ignore:
Timestamp:
11/05/06 19:00:07 (2 years ago)
Author:
sven
Message:

some calls to gettext() before it was loaded

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • devel/lib/elgglib.php

    r691 r695  
    363363        set_config('session_error_counter', 1); 
    364364    } 
    365     redirect($FULLME, __gettext('A server error that affects your login session was detected. Please login again or restart your browser.'), 5); 
     365    //called from setup.php, so gettext module hasn't been loaded yet 
     366    redirect($FULLME, 'A server error that affects your login session was detected. Please login again or restart your browser.', 5); 
    366367} 
    367368 
    …… 
    31973198        echo '<div style="text-align: center;">'; 
    31983199        echo '<p>'. $message .'</p>'; 
    3199         echo '<p>( <a href="'. $encodedurl .'">'. __gettext('Continue') .'</a> )</p>'; 
     3200        //called from setup.php, so gettext module hasn't been loaded yet 
     3201        if (function_exists("__gettext")) { 
     3202            $continue = __gettext('Continue'); 
     3203        } else { 
     3204            $continue = 'Continue'; 
     3205        } 
     3206        echo '<p>( <a href="'. $encodedurl .'">'. $continue .'</a> )</p>'; 
    32003207        echo '</div>'; 
    32013208