locale

Yavsc/Controllers/AccountController.cs

@@ -14,12 +14,9 @@ using Microsoft.AspNet.Http;
 using Yavsc.Models;
 using Yavsc.Services;
 using Yavsc.ViewModels.Account;
-using Yavsc.Helpers;
 using Microsoft.Extensions.Localization;
 using Microsoft.Data.Entity;
 using Newtonsoft.Json;
-using System.Collections.Generic;
-using Yavsc.Models.Messaging;
 
 namespace Yavsc.Controllers
 {
@@ -224,16 +221,19 @@ namespace Yavsc.Controllers
                     // Send an email with this link
                     var code = await _userManager.GenerateEmailConfirmationTokenAsync(user);
                     var callbackUrl = Url.Action("ConfirmEmail", "Account", new { userId = user.Id, code = code }, protocol: HttpContext.Request.Scheme);
-                    var emailSent = await _emailSender.SendEmailAsync(_siteSettings, _smtpSettings, model.Email, "Confirm your account",
+                    var emailSent = await _emailSender.SendEmailAsync(_siteSettings, _smtpSettings, model.Email, _localizer["ConfirmYourAccountTitle"],
-                        "Please confirm your account by clicking this link: <a href=\"" + callbackUrl + "\">link</a>");
+                      string.Format(_localizer["ConfirmYourAccountBody"], _siteSettings.Title, callbackUrl, _siteSettings.Slogan, _siteSettings.Audience));
                     await _signInManager.SignInAsync(user, isPersistent: false);
-                     if (!emailSent) {
+                    if (!emailSent)
+                    {
                         _logger.LogWarning("User created with error sending email confirmation request");
                         this.NotifyWarning(
                                 "E-mail confirmation",
                                 _localizer["ErrorSendingEmailForConfirm"]
                          );
-                    } else this.NotifyInfo (
+                    }
+                    else
+                        this.NotifyInfo(
                              "E-mail confirmation",
                              _localizer["EmailSentForConfirm"]
                       );
@@ -248,13 +248,20 @@ namespace Yavsc.Controllers
         }
 
         [Authorize, HttpPost, ValidateAntiForgeryToken]
-        public async Task <IActionResult> SendEMailForConfirm () {
+        public async Task<IActionResult> SendEMailForConfirm()
+        {
             var user = await _userManager.FindByIdAsync(User.GetUserId());
+            ViewBag.EmailSent = SendEMailForConfirm(user);
+            return View("ConfirmEmailSent");
+        }
+
+        private async Task<bool> SendEMailForConfirm(ApplicationUser user)
+        {
             var code = await _userManager.GenerateEmailConfirmationTokenAsync(user);
             var callbackUrl = Url.Action("ConfirmEmail", "Account", new { userId = user.Id, code = code }, protocol: HttpContext.Request.Scheme);
-                    await _emailSender.SendEmailAsync(_siteSettings, _smtpSettings, user.Email, "Confirm your account",
+            var res = await _emailSender.SendEmailAsync(_siteSettings, _smtpSettings, user.Email, "Confirm your account",
                    "Please confirm your account by clicking this link: <a href=\"" + callbackUrl + "\">link</a>");
-            return View("ConfirmEmailSent");
+            return res;
         }
         //
         // POST: /Account/LogOff
@@ -419,7 +426,8 @@ namespace Yavsc.Controllers
                 var user = await _userManager.FindByEmailAsync(model.LoginOrEmail);
 
                 // Don't reveal that the user does not exist or is not confirmed
-                if (user == null) {
+                if (user == null)
+                {
                     user = await _userManager.FindByNameAsync(model.LoginOrEmail);
                     if (user == null)
                     {
@@ -430,7 +438,8 @@ namespace Yavsc.Controllers
                 // user != null
                 // We want him to have a confirmed e-mail, and prevent this script
                 // to be used to send e-mail to any arbitrary person
-                if (!await _userManager.IsEmailConfirmedAsync(user)) {
+                if (!await _userManager.IsEmailConfirmedAsync(user))
+                {
                     _logger.LogWarning($"ForgotPassword: Email {model.LoginOrEmail} not confirmed");
                     return View("ForgotPasswordConfirmation");
                 }

Yavsc/Resources/Yavsc.Resources.YavscLocalisation.en.resx

@@ -774,4 +774,13 @@ Valid caracters are: underscore '_',  '-',  'a' - 'z', 'A' - 'Z',  '0' - '9', th
   <data name="EmailSentForConfirm">
     <value>An email has been sent to confirm your addresse.</value>
   </data>
+    <data name="ConfirmYourAccountTitle"><value>Please, confirm your e-mail</value></data>
+  <data name="ConfirmYourAccountBody"><value>You successfully created your {0} account,
+but your e-mail address is not yet confirmed.
+Please, in order to validate it, follow this link &lt;{1}&gt;.
+
+Thanks.
+-- 
+{0} - {2} &lt;https://{3}&gt;</value>
+  </data>
 </root>

Yavsc/Resources/Yavsc.Resources.YavscLocalisation.fr.resx

@@ -449,5 +449,11 @@
   <data name="PasswordConfirm"><value>Confirmation du mot de passe</value></data>
   <data name="ErrorSendingEmailForConfirm"><value>L'envoi de de courrier pour confirmation de l'adresse e-mail a échoué.</value></data>
   <data name="EmailSentForConfirm"><value>Un courrier a été envoyé pour confirmation de l'adresse e-mail .</value></data>
+  <data name="ConfirmYourAccountTitle"><value>S'il vous plait, confirmez votre addresse e-mail</value></data>
+  <data name="ConfirmYourAccountBody"><value>Vous avez créé avec succès votre compte {0},
+mais votre adresse e-mail reste à confirmer.
+Pour ce faire, suivez le lien suivant : &lt;{1}&gt;.
 
+-- 
+{0} - {2} &lt;{3}&gt;</value></data>
 </root>