Changeset 21696


Ignore:
Timestamp:
03/18/13 21:54:56 (6 years ago)
Author:
Eric
Message:

merge from trunk to branch 2.50:
Bug 2874 fixed : Warning message on tracking confirmation tab when confirmation by admins is set and a user is added manually by an admin
Reference language/en_UK/help.lang.php improved
language/fr_FR/help.lang.php updated
Update de_DE, thanks to : stephy
Update lv_LV, thanks to : agrisans

Location:
extensions/UserAdvManager/branches/2.50
Files:
7 edited

Legend:

Unmodified
Added
Removed
  • extensions/UserAdvManager/branches/2.50/admin/UAM_admin.php

    r21633 r21696  
    13171317        $reminder = l10n('UAM_Reminder_Sent_OK'); 
    13181318      } 
    1319       else if ((isset($row['reminder']) and $row['reminder'] == 'false') or !isset($row['reminder'])) 
     1319      else if ((isset($row['reminder']) and $row['reminder'] == 'false') or $row['reminder'] == null) 
    13201320      { 
    13211321        $reminder = l10n('UAM_Reminder_Sent_NOK'); 
    13221322      } 
    1323  
    13241323 
    13251324      if (isset($_POST['pref_submit']) 
  • extensions/UserAdvManager/branches/2.50/changelog.txt.php

    r21633 r21696  
    402402            Bug 2871 fixed - Improved process : User registration is confirmed by default when user is added by an admin and confirmation of registration for admins is set to OFF 
    403403            Bug 2872 fixed - Check if confirmed users group is set as the default group and set it if not 
    404             Bug 2873 fixed - Remove annoying flashing message on config submit  
     404            Bug 2873 fixed - Remove annoying flashing message on config submit 
     405 
     406-- 2.50.4 : Bug 2874 fixed - Warning message on tracking confirmation tab when confirmation by admins is set and a user is added manually by an admin 
     407            Update de_DE, thanks to : stephy 
     408            Update lv_LV, thanks to : agrisans 
    405409*/ 
    406410?> 
  • extensions/UserAdvManager/branches/2.50/include/functions.inc.php

    r21633 r21696  
    13141314  } 
    13151315 
    1316   if ((isset($conf_UAM['CONFIRM_MAIL']) and ($conf_UAM['CONFIRM_MAIL'] == 'true' or $conf_UAM['CONFIRM_MAIL'] == 'local')) and $confirm) // Add confirmation link ? 
     1316  if ((isset($conf_UAM['CONFIRM_MAIL']) and ($conf_UAM['CONFIRM_MAIL'] == 'true')) and $confirm) // Add confirmation link ? 
    13171317  { 
    13181318    $infos2 = array( 
     
    19521952  (id, user_id, mail_address, status, date_check, reminder) 
    19531953VALUES 
    1954   ('".$Confirm_Mail_ID."', '".$user_id."', '".$email."', '".$status."', null, false) 
     1954  ('".$Confirm_Mail_ID."', '".$user_id."', '".$email."', '".$status."', null, 'false') 
    19551955;"; 
    19561956    pwg_query($query); 
  • extensions/UserAdvManager/branches/2.50/language/de_DE/plugin.lang.php

    r21294 r21696  
    430430$lang['UAM_Change'] = 'Ändere die Gruppe/den Status/die Privatsphäre des Benutzers der bestätigt wurde.'; 
    431431$lang['UAM_Customize_messagesandmails'] = 'Anpassen der Nachrichten und E-Mails.'; 
     432$lang['UAM_group "%s" updated'] = 'Für die beste Geschwindigkeit, wurde die Gruppe %s als Standardgruppe eingestellt.'; 
    432433?> 
  • extensions/UserAdvManager/branches/2.50/language/en_UK/help.lang.php

    r19234 r21696  
    1818$lang['UAM_tipsTitle_d'] = 'Tips and various examples of use'; 
    1919 
    20  
    21 // --------- Starting below: New or revised $lang ---- from version 2.14.0 
    2220$lang['UAM_adminconfmailTitle_d'] = 'You can disable this confirmation only for user accounts created by the administrator via Piwigo\'s users management interface.<br><br> 
    2321By activating this option, email confirmation for registration will be sent to each user created by admin.<br><br> 
    24 By disabling this option (default), only the email information is sent (if &quot;Information email to user&quot; is enabled).'; 
    25 // --------- End: New or revised $lang ---- from version 2.14.0 
     22By disabling this option (default), only the email information is sent (if &quot;Information email to user&quot; is enabled). In addition, the user created will be <b>considered validated</b> by default.'; 
    2623 
    2724 
  • extensions/UserAdvManager/branches/2.50/language/fr_FR/help.lang.php

    r19234 r21696  
    1717$lang['UAM_tipsTitle_d'] = 'Astuces et exemples divers d\'utilisation'; 
    1818 
    19  
    20 // --------- Starting below: New or revised $lang ---- from version 2.14.0 
    2119$lang['UAM_adminconfmailTitle_d'] = 'On peut ici désactiver la confirmation des inscriptions uniquement pour les comptes d\'utilisateurs créés par l\'administrateur via l\'interface de gestion des utilisateurs de Piwigo.<br><br> 
    2220En activant cette option, l\'email de confirmation d\'inscription sera envoyé à chaque utilisateur créé par l\'admin.<br><br> 
    23 En désactivant cette option (mode par défaut), seul l\'email d\'information est envoyé (si la fonction &quot;Email d\'information &agrave; l\'utilisateur&quot; est activée).'; 
    24 // --------- End: New or revised $lang ---- from version 2.14.0 
     21En désactivant cette option (mode par défaut), seul l\'email d\'information est envoyé (si la fonction &quot;Email d\'information &agrave; l\'utilisateur&quot; est activée). De plus, l\'utilisateur ainsi créé sera <b>considéré comme validé</b> par défaut.'; 
    2522 
    2623 
  • extensions/UserAdvManager/branches/2.50/language/lv_LV/plugin.lang.php

    r19234 r21696  
    385385$lang['UAM_Change'] = 'Izmainīt apstiprināto lietotāju Grupas/Statuss/Konfidencialitāte Līmeni'; 
    386386$lang['UAM_Customize_messagesandmails'] = 'Pielāgojiet ziņojumus un pastu'; 
     387$lang['UAM_group "%s" updated'] = 'Labākam sniegumam, grupa %s automātiski tika iestatīta kā noklusējuma grupa.'; 
    387388?> 
Note: See TracChangeset for help on using the changeset viewer.