Changeset 38

Show
Ignore:
Timestamp:
04/10/07 05:14:29
Author:
grahack
Message:

FAL: i18n enhancements all over the lib, except in admin area (+removed the ? of 'forgottenpasword?')

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • FreakAuth/trunk/www/system/application/controllers/admin/admins.php

    r27 r38  
    647647        if (($query != null) && ($query->num_rows() > 0)) 
    648648            { 
    649                 $this->validation->set_message('_email_duplicate_check', 'A user with this e-mail has already registered. If you have forgotten your login details you can get them here'); 
     649                $this->validation->set_message('_email_duplicate_check', $this->lang->line('FAL_user_email_duplicate')); 
    650650                     
    651651                $query->free_result(); 
    …… 
    655655                 if (($query_temp != null) && ($query_temp->num_rows() > 0)) 
    656656            { 
    657                 $this->validation->set_message('_email_duplicate_check', 'A user with this e-mail has already registered and is waiting for activation. If this is your e-mail address please check your e-mail inbox and activate your '); 
     657                $this->validation->set_message('_email_duplicate_check', $this->lang->line('FAL_usertemp_email_duplicate')); 
    658658                     
    659659                $query_temp->free_result(); 

  • FreakAuth/trunk/www/system/application/controllers/admin/users.php

    r27 r38  
    642642        if (($query != null) && ($query->num_rows() > 0)) 
    643643            { 
    644                 $this->validation->set_message('_email_duplicate_check', 'A user with this e-mail has already registered. If you have forgotten your login details you can get them here'); 
     644                $this->validation->set_message('_email_duplicate_check', $this->lang->line('FAL_user_email_duplicate')); 
    645645                     
    646646                $query->free_result(); 
    …… 
    650650                 if (($query_temp != null) && ($query_temp->num_rows() > 0)) 
    651651            { 
    652                 $this->validation->set_message('_email_duplicate_check', 'A user with this e-mail has already registered and is waiting for activation. If this is your e-mail address please check your e-mail inbox and activate your '); 
     652                $this->validation->set_message('_email_duplicate_check', $this->lang->line('FAL_usertemp_email_duplicate')); 
    653653                     
    654654                $query_temp->free_result(); 

  • FreakAuth/trunk/www/system/application/controllers/auth.php

    r27 r38  
    7070        { 
    7171         // Display user name and an 'already logged in' flash message... 
    72         $msg = $this->db_session->userdata('username').', you have already logged in!'; 
     72        $msg = $this->db_session->userdata('username').', '.$this->lang->line('FAL_already_logged_in_msg'); 
    7373        $this->db_session->set_flashdata('flashMessage', $msg, 1); 
    7474 
    …… 
    128128        {        
    129129            //page title 
    130                 $data['heading']='login'; 
     130                $data['heading'] = $this->lang->line('FAL_login_label'); 
    131131                 
    132132                if ($this->config->item('FAL_use_security_code_login')) 
    …… 
    225225                         
    226226                //displays the view 
    227                 $data['heading'] = 'register'; 
     227                $data['heading'] = $this->lang->line('FAL_register_label'); 
    228228                $data['page'] = $this->config->item('FAL_register_view'); 
    229229         
    …… 
    293293        if ($this->validation->run() && $this->freakauth_light->forgotten_password()) 
    294294        {                
    295                 $data['heading'] = 'Remember password'; 
     295                $data['heading'] = $this->lang->line('FAL_forgotten_password_label'); 
    296296                $data['page'] = $this->config->item('FAL_forgotten_password_success_view'); 
    297297 
    …… 
    314314             
    315315                //display the form 
    316             $data['heading'] ='Remember password'; 
     316            $data['heading'] = $this->lang->line('FAL_forgotten_password_label'); 
    317317            $data['page'] = $this->config->item('FAL_forgotten_password_view'); 
    318318 
    …… 
    398398        {        
    399399                //page title             
    400             $data['heading'] = 'Change password'; 
     400            $data['heading'] = $this->lang->line('FAL_change_password_label'); 
    401401            //page content 
    402402            $data['page'] = $this->config->item('FAL_change_password_view'); 
    …… 
    616616        if (($query != null) && ($query->num_rows() > 0)) 
    617617            { 
    618                 $this->validation->set_message('_email_duplicate_check', 'A user with this e-mail has already registered. If you have forgotten your login details you can get them here'); 
     618                $this->validation->set_message('_email_duplicate_check', $this->lang->line('FAL_user_email_duplicate')); 
    619619                    return false; 
    620620                } 
    …… 
    622622                 if (($query_temp != null) && ($query_temp->num_rows() > 0)) 
    623623            { 
    624                 $this->validation->set_message('_email_duplicate_check', 'A user with this e-mail has already registered and is waiting for activation. If this is your e-mail address please check your e-mail inbox and activate your '); 
    625                     return false; 
     624                   $this->validation->set_message('_email_duplicate_check', $this->lang->line('FAL_usertemp_email_duplicate')); 
     625                       return false; 
    626626                } 
    627627                 

  • FreakAuth/trunk/www/system/application/views/FreakAuth_light/content/change_password.php

    r37 r38  
    33<legend><?=$heading?></legend> 
    44<?=form_open('auth/changepassword')?> 
    5       <p><label for="user_name">user name</label> 
     5      <p><label for="user_name"><?=$this->lang->line('FAL_user_name_label');?>:</label> 
    66 
    77      <?=form_input(array('name'=>'user_name',  
    …… 
    1313        </p> 
    1414 
    15       <p><label for="password">old password</label> 
     15      <p><label for="password"><?=$this->lang->line('FAL_old_password_label');?>:</label> 
    1616      <?=form_password(array('name'=>'password',  
    1717                               'id'=>'password', 
    …… 
    2121        <span><?=(isset($this->validation) ? $this->validation->{'password'.'_error'} : '')?></span> 
    2222      </p> 
    23     <p><label for="new_password">new password</label> 
     23    <p><label for="new_password"><?=$this->lang->line('FAL_new_password_label');?>:</label> 
    2424    <?=form_password(array('name'=>'new_password',  
    2525                               'id'=>'new_password', 
    …… 
    2929        <span><?=(isset($this->validation) ? $this->validation->{'new_password'.'_error'} : '')?></span> 
    3030    </p> 
    31       <p><label for="password_confirm">retype new password</label> 
     31      <p><label for="password_confirm"><?=$this->lang->line('FAL_retype_new_password_label');?>:</label> 
    3232      <?=form_password(array('name'=>'password_confirm',  
    3333                               'id'=>'password_confirm', 
    …… 
    3737    <span><?=(isset($this->validation) ? $this->validation->{'password_confirm'.'_error'} : '')?></span> 
    3838      </p> 
    39                 <input type="submit" name="Submit" value="Submit" class="submit"/> 
    40                 <input type="reset" name="Reset" value="reset" /> 
     39                <input type="submit" name="Submit" value="<?=$this->lang->line('FAL_submit')?>" class="submit"/> 
     40                <input type="reset" name="Reset" value="<?=$this->lang->line('FAL_reset')?>" /> 
    4141</form> 
    4242</fieldset> 

  • FreakAuth/trunk/www/system/application/views/FreakAuth_light/content/forgotten_password.php

    r37 r38  
    2424    <!-- END CAPTCHA (security image)--> 
    2525        <p><?=form_submit(array('name'=>'submit',  
    26   
    27                              'value'=>$this->lang->line('FAL_submit_label')))?> 
     26                             'value'=>$this->lang->line('FAL_submit')))?> 
    2827 </p> 
    2928<?=form_close()?> 

  • FreakAuth/trunk/www/system/application/views/FreakAuth_light/content/login.php

    r37 r38  
    1 <fieldset><legend accesskey="D" tabindex="1">login</legend> 
     1<fieldset><legend accesskey="D" tabindex="1"><?=$heading?></legend> 
    22<?=form_open('auth/')?> 
    33<!--USERNAME--> 

  • FreakAuth/trunk/www/system/application/views/FreakAuth_light/content/register.php

    r37 r38  
    11<div id="register"> 
    2 <fieldset><legend accesskey="D" tabindex="1">register</legend> 
     2<fieldset><legend accesskey="D" tabindex="1"><?=$heading?></legend> 
    33<?=form_open('auth/register')?> 
    44        <!--USERNAME--> 

  • FreakAuth/trunk/www/system/application/views/FreakAuth_light/email/activation_email.php

    r2 r38  
    88 
    99 
    10 username: <?=$user_name?> 
     10<?=$this->lang->line('FAL_user_name_label')?>: <?=$user_name?> 
    1111 
    12 password: <?=$password?> 
     12+<?=$this->lang->line('FAL_user_password_label')?>: <?=$password?> 
    1313 
    1414 

  • FreakAuth/trunk/www/system/language/english/freakauth_lang.php

    r37 r38  
    3131$lang['FAL_continue_label'] = 'Continue'; 
    3232$lang['FAL_donotagree_label'] = 'I Do Not Agree'; 
    33 $lang['FAL_forgotten_password_label'] = 'Forgotten Password?'; 
     33$lang['FAL_forgotten_password_label'] = 'Forgotten Password'; 
    3434$lang['FAL_register_label'] = 'Register'; 
    35 $lang['FAL_submit_label'] = 'Submit'; 
     35$lang['FAL_change_password_label'] = 'Change Password'; 
    3636 
    3737$lang['FAL_citation_message'] = 'Thank You!'; 
     38$lang['FAL_already_logged_in_msg'] = 'you have already logged in!'; 
    3839 
    3940//------------------------------------------------------------------ 
    …… 
    9394$lang['FAL_in_use_validation_message'] = 'The %s is already in use.'; 
    9495$lang['FAL_country_validation_message'] = 'Please choose the country where you live'; 
    95  
     96$lang['FAL_user_email_duplicate'] = 'A user with this e-mail has already registered. If you have forgotten your login details you can get them here.'; 
     97$lang['FAL_usertemp_email_duplicate'] = 'A user with this e-mail has already registered and is waiting for activation. If this is your e-mail address please check your e-mail inbox and activate your account.'; 
     98  
    9699//------------------------------------------------------------------ 
    97100//CHANGE PASSWORD 
    98101//------------------------------------------------------------------ 
    99102$lang['FAL_change_password_success'] = 'Your password has been successfully changed'; 
    100  
    101  
    102  
     103$lang['FAL_old_password_label'] = 'old password'; 
     104$lang['FAL_new_password_label'] = 'new password'; 
     105$lang['FAL_retype_new_password_label'] = 'retype new password'; 
     106$lang['FAL_submit'] = 'submit'; 
     107$lang['FAL_reset'] = 'reset'; 
     108  
    103109//------------------------------------------------------------------ 
    104110//FORGOTTEN PASSWORD