Ignore:
Timestamp:
Feb 11, 2011, 7:03:06 PM (13 years ago)
Author:
Eric
Message:

r9177 merged from trunk to branch 2.20

Location:
extensions/NBC_UserAdvManager/branches/2.20/admin
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • extensions/NBC_UserAdvManager/branches/2.20/admin/UAM_admin.php

    r9154 r9178  
    4545$tabsheet = new tabsheet();
    4646$tabsheet->add('global',
    47                l10n('Tab_Global'),
     47               l10n('UAM_Tab_Global'),
    4848               $my_base_url.'&tab=global');
    4949  $tabsheet->add('userlist',
    50                  l10n('Tab_UserList'),
     50                 l10n('UAM_Tab_UserList'),
    5151                 $my_base_url.'&tab=userlist');
    5252$tabsheet->add('usermanager',
    53                l10n('Tab_UserManager'),
     53               l10n('UAM_Tab_UserManager'),
    5454               $my_base_url.'&tab=usermanager');
    5555$tabsheet->add('ghosttracker',
    56                l10n('Tab_GhostTracker'),
     56               l10n('UAM_Tab_GhostTracker'),
    5757               $my_base_url.'&tab=ghosttracker');
    5858$tabsheet->select($page['tab']);
    … …  
    126126    if (preg_match('/^[\s]+/', $_POST['UAM_MailExclusion_List']))
    127127    {
    128       array_push($page['errors'], l10n('mail_exclusionlist_error'));
     128      array_push($page['errors'], l10n('UAM_mail_exclusionlist_error'));
    129129      $UAM_Exclusionlist_Error = true;
    130130    }
    … …  
    137137      $newvalue = 'false';
    138138      $_POST['UAM_GTAutoMail'] = $newvalue;
    139       array_push($page['errors'], l10n('Error_GTAutoMail_cannot_be_set_without_ConfirmMail'));
     139      array_push($page['errors'], l10n('UAM_Error_GTAutoMail_cannot_be_set_without_ConfirmMail'));
    140140    }
    141141
    … …  
    225225  else if (isset($_POST['PasswordTest']) and empty($_POST['UAM_Password_Test']))
    226226  {
    227     array_push($page['errors'], l10n('reg_err_login3'));
     227    array_push($page['errors'], l10n('UAM_reg_err_login3'));
    228228  }
    229229
    … …  
    443443                        {
    444444                                if (!ValidateUsername(stripslashes($row['username'])))
    445                                         $msg_error1 .= (($msg_error1 <> '') ? '<br>' : '') . l10n('Err_audit_username_char').stripslashes($row['username']);
     445                                        $msg_error1 .= (($msg_error1 <> '') ? '<br>' : '') . l10n('UAM_Err_audit_username_char').stripslashes($row['username']);
    446446                        }
    447447                }
    … …  
    467467                                  if (preg_match($pattern, $row['mail_address']))
    468468                                  {
    469                                                 $msg_error2 .=  (($msg_error2 <> '') ? '<br>' : '') . l10n('Err_audit_email_forbidden').stripslashes($row['username']).' ('.$row['mail_address'].')';
     469                                                $msg_error2 .=  (($msg_error2 <> '') ? '<br>' : '') . l10n('UAM_Err_audit_email_forbidden').stripslashes($row['username']).' ('.$row['mail_address'].')';
    470470                                        }
    471471                                }
    … …  
    480480               
    481481                if ($msg_error1 <> '' or $msg_error2 <> '')
    482                 array_push($page['errors'], l10n('Err_audit_advise'));
     482                array_push($page['errors'], l10n('UAM_Err_audit_advise'));
    483483                else
    484484        array_push($page['infos'], l10n('UAM_audit_ok'));
    … …  
    629629  else
    630630  {
    631                 array_push($page['errors'], l10n('Err_Userlist_Settings'));
     631                array_push($page['errors'], l10n('UAM_Err_Userlist_Settings'));
    632632  }
    633633  break;
    … …  
    791791                        if (in_array($conf['guest_id'], $collection))
    792792                {
    793                 array_push($page['errors'], l10n('No_validation_for_Guest'));
     793                array_push($page['errors'], l10n('UAM_No_validation_for_Guest'));
    794794        }
    795795        if (($conf['guest_id'] != $conf['default_user_id']) and
    796796                in_array($conf['default_user_id'], $collection))
    797797        {
    798                 array_push($page['errors'], l10n('No_validation_for_default_user'));
     798                array_push($page['errors'], l10n('UAM_No_validation_for_default_user'));
    799799        }
    800800                if (in_array($conf['webmaster_id'], $collection))
    801801        {
    802                 array_push($page['errors'], l10n('No_validation_for_Webmaster'));
     802                array_push($page['errors'], l10n('UAM_No_validation_for_Webmaster'));
    803803        }
    804804        if (in_array($user['id'], $collection))
    805805        {
    806                 array_push($page['errors'], l10n('No_validation_for_your_account'));
     806                array_push($page['errors'], l10n('UAM_No_validation_for_your_account'));
    807807        }
    808808
    … …  
    824824                $page['infos'],
    825825                l10n_dec(
    826                         '%d_Mail_With_Key', '%d_Mails_With_Key',
     826                        'UAM_%d_Mail_With_Key', 'UAM_%d_Mails_With_Key',
    827827                count($collection)
    828828                )
    … …  
    875875                        if (in_array($conf['guest_id'], $collection))
    876876                {
    877                 array_push($page['errors'], l10n('No_validation_for_Guest'));
     877                array_push($page['errors'], l10n('UAM_No_validation_for_Guest'));
    878878        }
    879879        if (($conf['guest_id'] != $conf['default_user_id']) and
    880880                in_array($conf['default_user_id'], $collection))
    881881        {
    882                 array_push($page['errors'], l10n('No_validation_for_default_user'));
     882                array_push($page['errors'], l10n('UAM_No_validation_for_default_user'));
    883883        }
    884884                if (in_array($conf['webmaster_id'], $collection))
    885885        {
    886                 array_push($page['errors'], l10n('No_validation_for_Webmaster'));
     886                array_push($page['errors'], l10n('UAM_No_validation_for_Webmaster'));
    887887        }
    888888        if (in_array($user['id'], $collection))
    889889        {
    890                 array_push($page['errors'], l10n('No_validation_for_your_account'));
     890                array_push($page['errors'], l10n('UAM_No_validation_for_your_account'));
    891891        }
    892892
    … …  
    909909                $page['infos'],
    910910                l10n_dec(
    911                         '%d_Reminder_Sent', '%d_Reminders_Sent',
     911                        'UAM_%d_Reminder_Sent', 'UAM_%d_Reminders_Sent',
    912912                count($collection)
    913913                )
    … …  
    960960                        if (in_array($conf['guest_id'], $collection))
    961961                {
    962                 array_push($page['errors'], l10n('No_validation_for_Guest'));
     962                array_push($page['errors'], l10n('UAM_No_validation_for_Guest'));
    963963        }
    964964        if (($conf['guest_id'] != $conf['default_user_id']) and
    965965                in_array($conf['default_user_id'], $collection))
    966966        {
    967                 array_push($page['errors'], l10n('No_validation_for_default_user'));
     967                array_push($page['errors'], l10n('UAM_No_validation_for_default_user'));
    968968        }
    969969                if (in_array($conf['webmaster_id'], $collection))
    970970        {
    971                 array_push($page['errors'], l10n('No_validation_for_Webmaster'));
     971                array_push($page['errors'], l10n('UAM_No_validation_for_Webmaster'));
    972972        }
    973973        if (in_array($user['id'], $collection))
    974974        {
    975                 array_push($page['errors'], l10n('No_validation_for_your_account'));
     975                array_push($page['errors'], l10n('UAM_No_validation_for_your_account'));
    976976        }
    977977
    … …  
    986986                $page['infos'],
    987987                l10n_dec(
    988                         '%d_Validated_User', '%d_Validated_Users',
     988                        'UAM_%d_Validated_User', 'UAM_%d_Validated_Users',
    989989                count($collection)
    990990                )
    … …  
    10561056      if (isset($row['reminder']) and $row['reminder'] == 'true')
    10571057      {
    1058         $reminder = l10n('Reminder_Sent_OK');
     1058        $reminder = l10n('UAM_Reminder_Sent_OK');
    10591059      }
    10601060      else if ((isset($row['reminder']) and $row['reminder'] == 'false') or !isset($row['reminder']))
    10611061      {
    1062         $reminder = l10n('Reminder_Sent_NOK');
     1062        $reminder = l10n('UAM_Reminder_Sent_NOK');
    10631063      }
    10641064
    … …  
    11511151  else
    11521152  {
    1153                 array_push($page['errors'], l10n('Err_UserManager_Settings'));
     1153                array_push($page['errors'], l10n('UAM_Err_UserManager_Settings'));
    11541154  }
    11551155  break;
    … …  
    13111311                        if (in_array($conf['guest_id'], $collection))
    13121312                {
    1313                 array_push($page['errors'], l10n('No_reminder_for_Guest'));
     1313                array_push($page['errors'], l10n('UAM_No_reminder_for_Guest'));
    13141314        }
    13151315        if (($conf['guest_id'] != $conf['default_user_id']) and
    13161316                in_array($conf['default_user_id'], $collection))
    13171317        {
    1318                 array_push($page['errors'], l10n('No_reminder_for_default_user'));
     1318                array_push($page['errors'], l10n('UAM_No_reminder_for_default_user'));
    13191319        }
    13201320                if (in_array($conf['webmaster_id'], $collection))
    13211321        {
    1322                 array_push($page['errors'], l10n('No_reminder_for_Webmaster'));
     1322                array_push($page['errors'], l10n('UAM_No_reminder_for_Webmaster'));
    13231323        }
    13241324        if (in_array($user['id'], $collection))
    13251325        {
    1326                 array_push($page['errors'], l10n('No_reminder_for_your_account'));
     1326                array_push($page['errors'], l10n('UAM_No_reminder_for_your_account'));
    13271327        }
    13281328
    … …  
    13441344                $page['infos'],
    13451345                l10n_dec(
    1346                         '%d_Reminder_Sent', '%d_Reminders_Sent',
     1346                        'UAM_%d_Reminder_Sent', 'UAM_%d_Reminders_Sent',
    13471347                count($collection)
    13481348                )
    … …  
    14201420        }
    14211421       
    1422         array_push($page['infos'], l10n('GhostTracker_Init_OK'));
     1422        array_push($page['infos'], l10n('UAM_GhostTracker_Init_OK'));
    14231423      }
    14241424    }
    … …  
    14461446      if (isset($local_user['reminder']) and $local_user['reminder'] == 'true')
    14471447      {
    1448         $reminder = l10n('Reminder_Sent_OK');
     1448        $reminder = l10n('UAM_Reminder_Sent_OK');
    14491449      }
    14501450      else if (isset($local_user['reminder']) and $local_user['reminder'] == 'false')
    14511451      {
    1452         $reminder = l10n('Reminder_Sent_NOK');
     1452        $reminder = l10n('UAM_Reminder_Sent_NOK');
    14531453      }
    14541454   
    … …  
    15031503  else
    15041504  {
    1505                 array_push($page['errors'], l10n('Err_GhostTracker_Settings'));
     1505                array_push($page['errors'], l10n('UAM_Err_GhostTracker_Settings'));
    15061506  }
    15071507

  • extensions/NBC_UserAdvManager/branches/2.20/admin/template/ghosttracker.tpl

    r8841 r9178  
    1 {combine_script id="jquery" path=$ROOT_URL|@cat:"themes/default/js/jquery.js"}
     1{combine_script id="jquery" path=$ROOT_URL|@cat:"themes/default/js/jquery.js"}
    22{combine_script id="jquery.cluetip" path=$ROOT_URL|@cat:"themes/default/js/plugins/jquery.cluetip.packed.js"}
    33{combine_script id="jquery.tablesorter" path=$UAM_PATH|@cat:"admin/template/js/jquery.tablesorter.js"}
    … …  
    2525
    2626<div class="titrePage">
    27   <h2>{'Title_Tab'|@translate} {$UAM_VERSION}<br>{'SubTitle4'|@translate}</h2>
     27  <h2>{'UAM_Title_Tab'|@translate} {$UAM_VERSION}<br>{'UAM_SubTitle4'|@translate}</h2>
    2828</div>
    2929
    3030<form method="post" action="" class="general">
    3131  <fieldset>
    32         <legend>{'GT_Init'|@translate}</legend>
     32        <legend>{'UAM_GT_Init'|@translate}</legend>
    3333    <ul>
    3434                  <li>
    … …  
    3636      </li>
    3737    </ul>
    38     <p><input class="submit" type="submit" value="{'GT_Reset'|@translate}" name="GhostTracker_Init" ></p>
     38    <p><input class="submit" type="submit" value="{'UAM_GT_Reset'|@translate}" name="GhostTracker_Init" ></p>
    3939  </fieldset>
    4040 
    4141  <fieldset>
    42     <legend class="cluetip" title="{'UAM_gtTitle'|translate}|{'UAM_gtTitle_d'|translate}">{'GhostTracker_Title'|@translate}</legend>
     42    <legend class="cluetip" title="{'UAM_gtTitle'|translate}|{'UAM_gtTitle_d'|translate}">{'UAM_GhostTracker_Title'|@translate}</legend>
    4343      <table id="sorting" class="table2" width="97%" summary="">
    4444        <thead>
    … …  
    4848            <th>{'Profile'|@translate}</th>
    4949            <th>{'Email address'|@translate}</th>
    50             <th>{'LastVisit_Date'|@translate}</th>
    51             <th>{'Reminder'|@translate}</th>
     50            <th>{'UAM_LastVisit_Date'|@translate}</th>
     51            <th>{'UAM_Reminder'|@translate}</th>
    5252          </tr>
    5353        </thead>
    … …  
    5959              <td style="text-align:center;"><a href="./admin.php?page=profile&amp;user_id={$user.ID}" title="{'Profile'|@translate}" onclick="window.open(this.href); return false;"><img src="{$UAM_PATH}admin/template/icon/edit_s.png"></a></td>
    6060              <td>{$user.EMAIL}</td>
    61 {if $user.REMINDER == l10n('Reminder_Sent_NOK')}
     61{if $user.REMINDER == l10n('UAM_Reminder_Sent_NOK')}
    6262              <td style="color:orange;text-align:center;">{$user.LASTVISIT}</td>
    6363              <td style="color:orange;text-align:center;">{$user.REMINDER}</td>
    64 {else $user.REMINDER == l10n('Reminder_Sent_OK')}
     64{else $user.REMINDER == l10n('UAM_Reminder_Sent_OK')}
    6565              <td style="color:red;text-align:center;">{$user.LASTVISIT}</td>
    6666              <td style="color:red;text-align:center;">{$user.REMINDER}</td>
    … …  
    9696
    9797<p>
    98   <input class="submit" type="submit" value="{'Delete_selected'|@translate}" name="Del_Selected" >
    99   <input class="submit" type="submit" value="{'Reminder'|@translate}" name="Reminder_Email" >
     98  <input class="submit" type="submit" value="{'UAM_Delete_selected'|@translate}" name="Del_Selected" >
     99  <input class="submit" type="submit" value="{'UAM_Reminder'|@translate}" name="Reminder_Email" >
    100100</p>
    101101  </fieldset>

  • extensions/NBC_UserAdvManager/branches/2.20/admin/template/global.tpl

    r9136 r9178  
    4444
    4545<div class="titrePage">
    46   <h2>{'Title_Tab'|@translate} {$UAM_VERSION}<br>{'SubTitle1'|@translate}</h2>
     46  <h2>{'UAM_Title_Tab'|@translate} {$UAM_VERSION}<br>{'UAM_SubTitle1'|@translate}</h2>
    4747</div>
    4848
    … …  
    5050
    5151  <p>
    52     <input class="submit" type="submit" value="{'submit'|@translate}" name="submit" {$TAG_INPUT_ENABLED}>
     52    <input class="submit" type="submit" value="{'UAM_submit'|@translate}" name="submit" {$TAG_INPUT_ENABLED}>
    5353      &nbsp;
    54     <input class="submit" type="submit" value="{'audit'|@translate}" name="audit">
     54    <input class="submit" type="submit" value="{'UAM_audit'|@translate}" name="audit">
    5555  </p>
    5656
    … …  
    9898              <input class="cluetip" title="{'UAM_passwtestTitle'|translate}|{'UAM_passwtestTitle_d'|translate}" type="text" name="UAM_Password_Test" value="{$UAM_PASSWORD_TEST}" size="50" style="text-align: left;">
    9999              &nbsp;&nbsp;&nbsp;
    100               <input class="submit" type="submit" value="{'PasswordTest'|@translate}" name="PasswordTest">
     100              <input class="submit" type="submit" value="{'UAM_PasswordTest'|@translate}" name="PasswordTest">
    101101              &nbsp;&nbsp;&nbsp;{'UAM_ScoreTest'|@translate}{$UAM_PASSWORD_TEST_SCORE}
    102102            <br><br>
    … …  
    530530
    531531  <p>
    532     <input class="submit" type="submit" value="{'submit'|@translate}" name="submit" {$TAG_INPUT_ENABLED} >&nbsp;<input class="submit" type="submit" value="{'audit'|@translate}" name="audit">
     532    <input class="submit" type="submit" value="{'UAM_submit'|@translate}" name="submit" {$TAG_INPUT_ENABLED} >&nbsp;<input class="submit" type="submit" value="{'UAM_audit'|@translate}" name="audit">
    533533  </p>
    534534</form>

  • extensions/NBC_UserAdvManager/branches/2.20/admin/template/userlist.tpl

    r9091 r9178  
    1 {combine_script id="jquery" path=$ROOT_URL|@cat:"themes/default/js/jquery.js"}
     1{combine_script id="jquery" path=$ROOT_URL|@cat:"themes/default/js/jquery.js"}
    22{combine_script id="jquery.cluetip" path=$ROOT_URL|@cat:"themes/default/js/plugins/jquery.cluetip.packed.js"}
    33{combine_script id="jquery.tablesorter" path=$UAM_PATH|@cat:"admin/template/js/jquery.tablesorter.js"}
    … …  
    3939
    4040<div class="titrePage">
    41   <h2>{'Title_Tab'|@translate} {$UAM_VERSION}<br>{'SubTitle5'|@translate}</h2>
     41  <h2>{'UAM_Title_Tab'|@translate} {$UAM_VERSION}<br>{'UAM_SubTitle5'|@translate}</h2>
    4242</div>
    4343
    4444<form method="post" action="" class="general">
    4545  <fieldset>
    46         <legend class="cluetip" title="{'UAM_userlistTitle'|translate}|{'UAM_userlistTitle_d'|translate}">{'UserList_Title'|@translate}</legend>
     46        <legend class="cluetip" title="{'UAM_userlistTitle'|translate}|{'UAM_userlistTitle_d'|translate}">{'UAM_UserList_Title'|@translate}</legend>
    4747
    4848      <table id="sorting" class="table2" width="97%" summary="">
    … …  
    5252            <th>{'Profile'|@translate}</th>
    5353                        <th>{'Email address'|@translate}</th>
    54             <th>{'LastVisit_Date'|@translate}</th>
    55             <th>{'Nb_Days'|@translate}</th>
     54            <th>{'UAM_LastVisit_Date'|@translate}</th>
     55            <th>{'UAM_Nb_Days'|@translate}</th>
    5656                        </tr>
    5757                        </thead>

  • extensions/NBC_UserAdvManager/branches/2.20/admin/template/usermanager.tpl

    r8841 r9178  
    1 {combine_script id="jquery" path=$ROOT_URL|@cat:"themes/default/js/jquery.js"}
     1{combine_script id="jquery" path=$ROOT_URL|@cat:"themes/default/js/jquery.js"}
    22{combine_script id="jquery.cluetip" path=$ROOT_URL|@cat:"themes/default/js/plugins/jquery.cluetip.packed.js"}
    33{combine_script id="jquery.tablesorter" path=$UAM_PATH|@cat:"admin/template/js/jquery.tablesorter.js"}
    … …  
    2626
    2727<div class="titrePage">
    28   <h2>{'Title_Tab'|@translate} {$UAM_VERSION}<br>{'SubTitle3'|@translate}</h2>
     28  <h2>{'UAM_Title_Tab'|@translate} {$UAM_VERSION}<br>{'UAM_SubTitle3'|@translate}</h2>
    2929</div>
    3030
    3131<form method="post" action="" class="general">
    3232  <fieldset>
    33         <legend class="cluetip" title="{'UAM_usermanTitle'|translate}|{'UAM_usermanTitle_d'|translate}">{'UserManager_Title'|@translate}</legend>
     33        <legend class="cluetip" title="{'UAM_usermanTitle'|translate}|{'UAM_usermanTitle_d'|translate}">{'UAM_UserManager_Title'|@translate}</legend>
    3434      <table id="sorting" class="table2" width="97%" summary="">
    3535                  <thead>
    … …  
    4141                        <th>{'Email address'|@translate}&nbsp;&nbsp;</th>
    4242                        <th>{'Groups'|@translate}&nbsp;&nbsp;</th>
    43                         <th>{'Registration_Date'|@translate}&nbsp;&nbsp;</th>
     43                        <th>{'UAM_Registration_Date'|@translate}&nbsp;&nbsp;</th>
    4444          {if $CONFIRM_LOCAL == ""}
    45             <th>{'Reminder'|@translate}&nbsp;&nbsp;</th>
     45            <th>{'UAM_Reminder'|@translate}&nbsp;&nbsp;</th>
    4646          {/if}
    4747                        </tr>
    … …  
    9494<p>
    9595{if $CONFIRM_LOCAL == "local"}
    96   <input class="submit" type="submit" value="{'Delete_selected'|@translate}" name="Del_Selected">
    97   <input class="submit" type="submit" value="{'Force_Validation'|@translate}" name="Force_Validation">
     96  <input class="submit" type="submit" value="{'UAM_Delete_selected'|@translate}" name="Del_Selected">
     97  <input class="submit" type="submit" value="{'UAM_Force_Validation'|@translate}" name="Force_Validation">
    9898{else}
    99   <input class="submit" type="submit" value="{'Delete_selected'|@translate}" name="Del_Selected">
    100   <input class="submit" type="submit" value="{'Mail_without_key'|@translate}" name="Mail_Without_Key">
    101   <input class="submit" type="submit" value="{'Mail_with_key'|@translate}" name="Mail_With_Key">
    102   <input class="submit" type="submit" value="{'Force_Validation'|@translate}" name="Force_Validation">
     99  <input class="submit" type="submit" value="{'UAM_Delete_selected'|@translate}" name="Del_Selected">
     100  <input class="submit" type="submit" value="{'UAM_Mail_without_key'|@translate}" name="Mail_Without_Key">
     101  <input class="submit" type="submit" value="{'UAM_Mail_with_key'|@translate}" name="Mail_With_Key">
     102  <input class="submit" type="submit" value="{'UAM_Force_Validation'|@translate}" name="Force_Validation">
    103103{/if}
    104104</p>
Note: See TracChangeset for help on using the changeset viewer.