diff --git a/Yavsc/ViewModels/Account/RegisterViewModel.cs b/Yavsc/ViewModels/Account/RegisterViewModel.cs
index ecdc603b..c890f224 100644
--- a/Yavsc/ViewModels/Account/RegisterViewModel.cs
+++ b/Yavsc/ViewModels/Account/RegisterViewModel.cs
@@ -4,7 +4,7 @@ namespace Yavsc.ViewModels.Account
{
public class RegisterViewModel
{
- [Required]
+ [Required][Display(Name = "Nom d'utilisateur")]
public string UserName { get; set; }
[Required]
@@ -13,14 +13,14 @@ namespace Yavsc.ViewModels.Account
public string Email { get; set; }
[Required]
- [StringLength(100, ErrorMessage = "The {0} must be at least {2} characters long.", MinimumLength = 6)]
- [DataType(DataType.Password)]
- [Display(Name = "Password")]
+ [StringLength(100, ErrorMessage = "Le {0} doit être long d'au moins {2} caractères.", MinimumLength = 6)]
+ [DataType(DataType.Password, ErrorMessage="Les mots de passe doivent contenir au moins un caractère spécial, qui ne soit ni une lettre ni un chiffre.")]
+ [Display(Name = "Mot de passe")]
public string Password { get; set; }
[DataType(DataType.Password)]
- [Display(Name = "Confirm password")]
- [Compare("Password", ErrorMessage = "The password and confirmation password do not match.")]
+ [Display(Name = "Confirmer le mot de passe")]
+ [Compare("Password", ErrorMessage = "Le mot de passe et sa confirmation ne sont pas les mêmes.")]
public string ConfirmPassword { get; set; }
public string GoogleRegId { get; set; }
diff --git a/Yavsc/ViewModels/Account/ResetPasswordViewModel.cs b/Yavsc/ViewModels/Account/ResetPasswordViewModel.cs
index 092eed44..942adbff 100644
--- a/Yavsc/ViewModels/Account/ResetPasswordViewModel.cs
+++ b/Yavsc/ViewModels/Account/ResetPasswordViewModel.cs
@@ -9,13 +9,13 @@ namespace Yavsc.ViewModels.Account
public string Email { get; set; }
[Required]
- [StringLength(100, ErrorMessage = "The {0} must be at least {2} characters long.", MinimumLength = 6)]
+ [StringLength(100, ErrorMessage = "Le {0} doit être long d'au moins {2} caractères.", MinimumLength = 6)]
[DataType(DataType.Password)]
public string Password { get; set; }
[DataType(DataType.Password)]
- [Display(Name = "Confirm password")]
- [Compare("Password", ErrorMessage = "The password and confirmation password do not match.")]
+ [Display(Name = "Confirmer le mot de passe")]
+ [Compare("Password", ErrorMessage = "Le mot de passe et sa confirmation ne sont pas les mêmes.")]
public string ConfirmPassword { get; set; }
public string Code { get; set; }
diff --git a/Yavsc/ViewModels/Account/VerifyCodeViewModel.cs b/Yavsc/ViewModels/Account/VerifyCodeViewModel.cs
index 6439dcf4..0158cb1f 100644
--- a/Yavsc/ViewModels/Account/VerifyCodeViewModel.cs
+++ b/Yavsc/ViewModels/Account/VerifyCodeViewModel.cs
@@ -12,10 +12,10 @@ namespace Yavsc.ViewModels.Account
public string ReturnUrl { get; set; }
- [Display(Name = "Remember this browser?")]
+ [Display(Name = "Se souvenir de ce navigateur?")]
public bool RememberBrowser { get; set; }
- [Display(Name = "Remember me?")]
+ [Display(Name = "Se souvenir de moi?")]
public bool RememberMe { get; set; }
}
}
diff --git a/Yavsc/Views/Account/ExternalLoginConfirmation.cshtml b/Yavsc/Views/Account/ExternalLoginConfirmation.cshtml
index 97298458..4754361e 100755
--- a/Yavsc/Views/Account/ExternalLoginConfirmation.cshtml
+++ b/Yavsc/Views/Account/ExternalLoginConfirmation.cshtml
@@ -6,6 +6,8 @@
@ViewData["Title"].
Associate your @ViewData["LoginProvider"] account.
+@ViewData["jsonres"]
+