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

r9177 merged from trunk to branch 2.20

File:
1 edited

Legend:

Unmodified
Added
Removed

  • extensions/NBC_UserAdvManager/branches/2.20/include/functions.inc.php

    r9161 r9178  
    174174        if ($PasswordCheck < $conf_UAM[14])
    175175        {
    176           $message = get_l10n_args('reg_err_login4_%s', $PasswordCheck);
     176          $message = get_l10n_args('UAM_reg_err_login4_%s', $PasswordCheck);
    177177          $lang['reg_err_pass'] = l10n_args($message).$conf_UAM[14];
    178178          array_push($errors, $lang['reg_err_pass']);
    … …  
    185185        if ($PasswordCheck < $conf_UAM[14])
    186186        {
    187           $message = get_l10n_args('reg_err_login4_%s', $PasswordCheck);
     187          $message = get_l10n_args('UAM_reg_err_login4_%s', $PasswordCheck);
    188188          $lang['reg_err_pass'] = l10n_args($message).$conf_UAM[14];
    189189          array_push($errors, $lang['reg_err_pass']);
    … …  
    195195    if (isset($conf_UAM[6]) and $conf_UAM[6] == 'true' and !empty($user['username']) and ValidateUsername($user['username']) and !is_admin())
    196196    {
    197       $lang['reg_err_login1'] = l10n('reg_err_login6')."'".$conf_UAM[7]."'";
     197      $lang['reg_err_login1'] = l10n('UAM_reg_err_login2')."'".$conf_UAM[7]."'";
    198198      array_push($errors, $lang['reg_err_login1']);
    199199    }
    … …  
    202202    if (isset($conf_UAM[11]) and $conf_UAM[11] == 'true' and !empty($user['email']) and ValidateEmailProvider($user['email']) and !is_admin())
    203203    {
    204       $lang['reg_err_login1'] = l10n('reg_err_login7')."'".$conf_UAM[12]."'";
     204      $lang['reg_err_login1'] = l10n('UAM_reg_err_login5')."'".$conf_UAM[12]."'";
    205205      array_push($errors, $lang['reg_err_login1']);
    206206    }
    … …  
    241241      if (ValidateEmailProvider($_POST['mail_address']))
    242242      {
    243         $template->append('errors', l10n('reg_err_login7')."'".$conf_UAM[12]."'");
     243        $template->append('errors', l10n('UAM_reg_err_login5')."'".$conf_UAM[12]."'");
    244244        unset($_POST['validate']);
    245245      }
    … …  
    259259        if ($PasswordCheck < $conf_UAM[14])
    260260        {
    261           $message = get_l10n_args('reg_err_login4_%s', $PasswordCheck);
     261          $message = get_l10n_args('UAM_reg_err_login4_%s', $PasswordCheck);
    262262          $template->append('errors', l10n_args($message).$conf_UAM[14]);
    263263          unset($_POST['use_new_pwd']);
    … …  
    629629      if (isset($conf_UAM[11]) and $conf_UAM[11] == 'true' and !empty($_POST['email']) and ValidateEmailProvider($_POST['email']))
    630630      {
    631         $template->append('errors', l10n('reg_err_login7')."'".$conf_UAM[12]."'");
     631        $template->append('errors', l10n('UAM_reg_err_login5')."'".$conf_UAM[12]."'");
    632632        unset($_POST['submit_add']);
    633633      }
    … …  
    741741  {
    742742    case 1:
    743       $subject = '['.$conf['gallery_title'].'] '.l10n_args(get_l10n_args('Add of %s', stripslashes($username)));
     743      $subject = '['.$conf['gallery_title'].'] '.l10n_args(get_l10n_args('UAM_Add of %s', stripslashes($username)));
    744744      $password = $password <> '' ? $password : l10n('UAM_empty_pwd');
    745745     
    … …  
    762762     
    763763    case 2:
    764       $subject = '['.$conf['gallery_title'].'] '.l10n_args(get_l10n_args('Update of %s', stripslashes($username)));
     764      $subject = '['.$conf['gallery_title'].'] '.l10n_args(get_l10n_args('UAM_Update of %s', stripslashes($username)));
    765765      $password = $password <> '' ? $password : l10n('UAM_empty_pwd');
    766766
    … …  
    768768       
    769769    case 3:
    770       $subject = '['.$conf['gallery_title'].'] '.l10n_args(get_l10n_args('Update of %s', stripslashes($username)));
     770      $subject = '['.$conf['gallery_title'].'] '.l10n_args(get_l10n_args('UAM_Update of %s', stripslashes($username)));
    771771      $password = $password <> '' ? $password : l10n('UAM_no_update_pwd');
    772772
    … …  
    777777  {
    778778    $infos1 = array(
    779       get_l10n_args('infos_mail %s', stripslashes($username)),
    780       get_l10n_args('User: %s', stripslashes($username)),
    781       get_l10n_args('Password: %s', $password),
     779      get_l10n_args('UAM_infos_mail %s', stripslashes($username)),
     780      get_l10n_args('UAM_User: %s', stripslashes($username)),
     781      get_l10n_args('UAM_Password: %s', $password),
    782782      get_l10n_args('Email: %s', $email),
    783783      get_l10n_args('', ''),
    … …  
    790790    $infos2 = array
    791791    (
    792       get_l10n_args('Link: %s', AddConfirmMail($id, $email)),
     792      get_l10n_args('UAM_Link: %s', AddConfirmMail($id, $email)),
    793793      get_l10n_args('', ''),
    794794    );
    … …  
    888888  {
    889889    case 1:
    890       $subject = '['.$conf['gallery_title'].'] '.l10n_args(get_l10n_args('Reminder_with_key_of_%s', $username));
     890      $subject = '['.$conf['gallery_title'].'] '.l10n_args(get_l10n_args('UAM_Reminder_with_key_of_%s', $username));
    891891     
    892892      if (isset($conf_UAM_ConfirmMail[2]) and $conf_UAM_ConfirmMail[2] <> '' and isset($conf_UAM_ConfirmMail[3]) and $conf_UAM_ConfirmMail[3] == 'true' and $confirm)
    … …  
    906906        $infos2 = array
    907907        (
    908           get_l10n_args('Link: %s', ResetConfirmMail($user_id)),
     908          get_l10n_args('UAM_Link: %s', ResetConfirmMail($user_id)),
    909909          get_l10n_args('', ''),
    910910        );       
    … …  
    922922     
    923923    case 2:
    924       $subject = '['.$conf['gallery_title'].'] '.l10n_args(get_l10n_args('Reminder_without_key_of_%s',$username));
     924      $subject = '['.$conf['gallery_title'].'] '.l10n_args(get_l10n_args('UAM_Reminder_without_key_of_%s',$username));
    925925     
    926926      if (isset($conf_UAM_ConfirmMail[4]) and $conf_UAM_ConfirmMail[4] <> '' and isset($conf_UAM_ConfirmMail[3]) and $conf_UAM_ConfirmMail[3] == 'true' and !$confirm)
    … …  
    999999  load_language('plugin.lang', UAM_PATH);
    10001000 
    1001   $subject = '['.$conf['gallery_title'].'] '.l10n_args(get_l10n_args('Ghost_reminder_of_%s', $username));     
     1001  $subject = '['.$conf['gallery_title'].'] '.l10n_args(get_l10n_args('UAM_Ghost_reminder_of_%s', $username));     
    10021002
    10031003  if (isset($conf_UAM[18]) and $conf_UAM[18] <> '' and isset($conf_UAM[16]) and $conf_UAM[16] == 'true')
    … …  
    10791079  }
    10801080
    1081   $subject = '['.$conf['gallery_title'].'] '.l10n_args(get_l10n_args('Demotion of %s', stripslashes($username)));
     1081  $subject = '['.$conf['gallery_title'].'] '.l10n_args(get_l10n_args('UAM_Demotion of %s', stripslashes($username)));
    10821082     
    10831083  if (isset($conf_UAM[25]) and $conf_UAM[25] <> '')
    … …  
    10971097
    10981098  $infos1 = array(
    1099     get_l10n_args('User: %s', stripslashes($username)),
     1099    get_l10n_args('UAM_User: %s', stripslashes($username)),
    11001100    get_l10n_args('Email: %s', $email),
    11011101    get_l10n_args('', ''),
    … …  
    11041104  $infos2 = array
    11051105  (
    1106     get_l10n_args('Link: %s', ResetConfirmMail($id)),
     1106    get_l10n_args('UAM_Link: %s', ResetConfirmMail($id)),
    11071107    get_l10n_args('', ''),
    11081108  );
    … …  
    11761176  $result = pwg_db_fetch_assoc(pwg_query($query));
    11771177
    1178   $subject = '['.$conf['gallery_title'].'] '.l10n_args(get_l10n_args('Validation of %s', stripslashes($result['username'])));
     1178  $subject = '['.$conf['gallery_title'].'] '.l10n_args(get_l10n_args('UAM_Validation of %s', stripslashes($result['username'])));
    11791179     
    11801180  if (isset($conf_UAM[28]) and $conf_UAM[28] <> '')
    … …  
    11941194
    11951195  $infos = array(
    1196     get_l10n_args('User: %s', stripslashes($result['username'])),
     1196    get_l10n_args('UAM_User: %s', stripslashes($result['username'])),
    11971197    get_l10n_args('Email: %s', $result['mail_address']),
    11981198    get_l10n_args('', ''),
Note: See TracChangeset for help on using the changeset viewer.