paul/yavsc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Localisation

Browse Source
This commit is contained in:
Paul Schneider
2018-03-26 23:18:48 +02:00
parent e1dd427359
commit eb5e218223
23 changed files with 26 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Yavsc.Server/Attributes/Validation/YaRegularExpression.cs
View File

@ -1,5 +1,4 @@
using System.Resources;
using Yavsc.Resources;
namespace Yavsc.Attributes.Validation
{
@ -11,7 +10,7 @@ namespace Yavsc.Attributes.Validation
public override string FormatErrorMessage(string name)
{
return ResourcesHelpers.DefaultResourceManager.GetString(this.ErrorMessageResourceName);
return ResourcesHelpers.GlobalLocalizer[this.ErrorMessageResourceName];
}
}
}

2
Yavsc.Server/Attributes/Validation/YaRequiredAttribute.cs
View File

@ -16,7 +16,7 @@ namespace Yavsc.Attributes.Validation
}
public YaRequiredAttribute ()
{
this.ErrorMessage = ResourcesHelpers.DefaultResourceManager.GetString("RequiredField");
this.ErrorMessage = ResourcesHelpers.GlobalLocalizer["RequiredField"];
}
public override bool IsValid(object value) {

6
Yavsc.Server/Attributes/Validation/YaStringLength.cs
View File

@ -6,7 +6,7 @@ namespace Yavsc.Attributes.Validation
private long maxLen;
public YaStringLength(long maxLen) : base(
()=>string.Format(
ResourcesHelpers.DefaultResourceManager.GetString("BadStringLength"),
ResourcesHelpers.GlobalLocalizer["BadStringLength"],
maxLen))
{
this.maxLen = maxLen;
@ -43,12 +43,12 @@ namespace Yavsc.Attributes.Validation
if (MinLen<0) {
// DetailledMaxStringLength
return string.Format(
ResourcesHelpers.DefaultResourceManager.GetString("DetailledMaxStringLength"),
ResourcesHelpers.GlobalLocalizer["DetailledMaxStringLength"],
maxLen,
excedent);
} else
return string.Format(
ResourcesHelpers.DefaultResourceManager.GetString("DetailledMinMaxStringLength"),
ResourcesHelpers.GlobalLocalizer["DetailledMinMaxStringLength"],
MinLen,
maxLen,
manquant,

4
Yavsc.Server/Attributes/Validation/YaValidationAttribute.cs
View File

@ -4,7 +4,7 @@ namespace Yavsc.Attributes.Validation
{
public class YaValidationAttribute : System.ComponentModel.DataAnnotations.ValidationAttribute
{
public YaValidationAttribute() : base(()=> ResourcesHelpers.DefaultResourceManager.GetString("validationError"))
public YaValidationAttribute() : base(()=> ResourcesHelpers.GlobalLocalizer["validationError"])
{
}
@ -16,7 +16,7 @@ namespace Yavsc.Attributes.Validation
public override string FormatErrorMessage(string name)
{
return ResourcesHelpers.DefaultResourceManager.GetString(name);
return ResourcesHelpers.GlobalLocalizer[name];
}
}
}

14
Yavsc.Server/Helpers/ResourcesHelpers.cs
View File

@ -1,14 +1,8 @@
using System;
using System.Resources;
using Yavsc.Resources;
using Microsoft.Extensions.Localization;
public static class ResourcesHelpers {
static ResourceManager _defaultResourceManager
= ResourceManager.CreateFileBasedResourceManager("Yavsc.Localization",".",typeof(YavscLocalisation));
public static ResourceManager DefaultResourceManager
{
get { return _defaultResourceManager; }
set { _defaultResourceManager = value; }
}
public static IStringLocalizer GlobalLocalizer = null ;
}

9
Yavsc.Server/Models/HairCut/HairCutQuery.cs
View File

@ -22,10 +22,8 @@ namespace Yavsc.Models.Haircut
// Bill description
public override string GetDescription()
{
string type = ResourcesHelpers.DefaultResourceManager
.GetString(this.GetType().Name);
string gender = ResourcesHelpers.DefaultResourceManager
.GetString(this.Prestation.Gender.ToString());
string type = ResourcesHelpers.GlobalLocalizer[this.GetType().Name];
string gender = ResourcesHelpers.GlobalLocalizer[this.Prestation.Gender.ToString()];
return $"{type} ({gender})";
}
@ -88,8 +86,7 @@ namespace Yavsc.Models.Haircut
Name = "Coupe",
Description = $"Coupe "+
ResourcesHelpers.DefaultResourceManager
.GetString(Prestation.Gender.ToString())+ " "+
ResourcesHelpers.GlobalLocalizer[Prestation.Gender.ToString()]+ " "+
(Prestation.Gender == HairCutGenders.Women ?
Prestation.Length == HairLength.Long ? longhairsuffix :
Prestation.Length == HairLength.HalfLong ? halflonghairsuffix :

3
Yavsc.Server/Models/HairCut/HairCutQueryEvent.cs
View File

@ -16,8 +16,7 @@ namespace Yavsc.Models.Haircut
public string CreateBoby()
{
return string.Format(ResourcesHelpers.DefaultResourceManager
.GetString("RdvToPerf"), Client.UserName,
return string.Format(ResourcesHelpers.GlobalLocalizer["RdvToPerf"], Client.UserName,
EventDate?.ToString("dddd dd/MM/yyyy à HH:mm"),
Location.Address,
ActivityCode);

2
Yavsc.Server/Models/Messaging/RdvQueryEvent.cs
View File

@ -50,7 +50,7 @@ using Interfaces.Workflow;
public string CreateBody()
{
return string.Format(
ResourcesHelpers.DefaultResourceManager.GetString("RdvToPerf"),
ResourcesHelpers.GlobalLocalizer["RdvToPerf"],
Client.UserName,
EventDate?.ToString("dddd dd/MM/yyyy à HH:mm"),
Location.Address,

10
Yavsc.Server/ViewModels/Account/RegisterViewModel.cs
View File

@ -8,9 +8,9 @@ namespace Yavsc.ViewModels.Account
// ErrorMessage = "",
[Display(ResourceType = typeof(Yavsc.Resources.YavscLocalisation), Name = "UserName")]
[Display(ResourceType = typeof(RegisterViewModel), Name = "UserName")]
[StringLength(102)]
[YaRegularExpression(@"[a-zA-Z0-9 .'_-]+", ErrorMessageResourceName="InvalidUserName", ErrorMessageResourceType = typeof(Yavsc.Resources.YavscLocalisation))]
[YaRegularExpression(@"[a-zA-Z0-9 .'_-]+", ErrorMessageResourceName="InvalidUserName", ErrorMessageResourceType = typeof(RegisterViewModel))]
public string UserName { get; set; }
[YaRequired()]
@ -23,12 +23,12 @@ namespace Yavsc.ViewModels.Account
// ErrorMessage = "Les mots de passe doivent contenir au moins un caractère spécial, qui ne soit ni une lettre ni un chiffre.")]
[Display(ResourceType = typeof(Yavsc.Resources.YavscLocalisation), Name = "Password")]
[Display(ResourceType = typeof(RegisterViewModel), Name = "Password")]
public string Password { get; set; }
[DataType(DataType.Password)]
[Display(ResourceType = typeof(Yavsc.Resources.YavscLocalisation), Name = "PasswordConfirm")]
[Compare("Password", ErrorMessageResourceName = "PassAndConfirmDontMach", ErrorMessageResourceType = typeof(Yavsc.Resources.YavscLocalisation) )]
[Display(ResourceType = typeof(RegisterViewModel), Name = "PasswordConfirm")]
[Compare("Password", ErrorMessageResourceName = "PassAndConfirmDontMach", ErrorMessageResourceType = typeof(RegisterViewModel) )]
public string ConfirmPassword { get; set; }
public string GoogleRegId { get; set; }

4
Yavsc.Server/project.json
View File

@ -37,7 +37,7 @@
"contrib"
]
},
"embed": [
"copyToOutput": [
"Resources/**/*.resx"
]
},
@ -77,4 +77,4 @@
}
}
}
}
}

2
Yavsc/Helpers/EventHelpers.cs
View File

@ -42,7 +42,7 @@ namespace Yavsc.Helpers
string strprestation = query.GetDescription();
var yaev = query.CreateEvent("NewHairCutQuery",
string.Format(Startup.GlobalLocalizer["HairCutQueryValidation"],query.Client.UserName),
string.Format(ResourcesHelpers.GlobalLocalizer["HairCutQueryValidation"],query.Client.UserName),
$"{query.Client.Id}");

0
Yavsc.Server/Resources/Yavsc.Controllers.AnnouncesController.resx → Yavsc/Resources/Yavsc.Controllers.AnnouncesController.resx
View File

0
Yavsc.Server/Resources/Yavsc.Models.Billing.NominativeServiceCommand.resx → Yavsc/Resources/Yavsc.Models.Billing.NominativeServiceCommand.resx
View File

0
Yavsc.Server/Resources/Yavsc.Resources.YavscLocalisation.en.resx → Yavsc/Resources/Yavsc.Resources.YavscLocalisation.en.resx
View File

0
Yavsc.Server/Resources/Yavsc.Resources.YavscLocalisation.fr.resx → Yavsc/Resources/Yavsc.Resources.YavscLocalisation.fr.resx
View File

0
Yavsc.Server/Resources/Yavsc.ViewComponents.CommentViewComponent.en.resx → Yavsc/Resources/Yavsc.ViewComponents.CommentViewComponent.en.resx
View File

0
Yavsc.Server/Resources/Yavsc.ViewComponents.CommentViewComponent.fr.resx → Yavsc/Resources/Yavsc.ViewComponents.CommentViewComponent.fr.resx
View File

0
Yavsc.Server/Resources/Yavsc.ViewComponents.CommentViewComponent.resx → Yavsc/Resources/Yavsc.ViewComponents.CommentViewComponent.resx
View File

0
Yavsc.Server/Resources/Yavsc.ViewComponents.TaggerViewComponent.en.resx → Yavsc/Resources/Yavsc.ViewComponents.TaggerViewComponent.en.resx
View File

0
Yavsc.Server/Resources/Yavsc.ViewComponents.TaggerViewComponent.fr.resx → Yavsc/Resources/Yavsc.ViewComponents.TaggerViewComponent.fr.resx
View File

0
Yavsc.Server/Resources/Yavsc.ViewComponents.TaggerViewComponent.resx → Yavsc/Resources/Yavsc.ViewComponents.TaggerViewComponent.resx
View File

0
Yavsc.Server/Resources/YavscLocalisation.cs → Yavsc/Resources/YavscLocalisation.cs
View File

6
Yavsc/Startup/Startup.cs
View File

@ -50,6 +50,7 @@ namespace Yavsc
public static PayPalSettings PayPalSettings { get; private set; }
private static ILogger logger;
public Startup(IHostingEnvironment env, IApplicationEnvironment appEnv)
{
var devtag = env.IsDevelopment()?"D":"";
@ -256,9 +257,6 @@ namespace Yavsc
CheckServices(services);
}
public static IStringLocalizer GlobalLocalizer { get; private set; }
// This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
public void Configure(IApplicationBuilder app, IHostingEnvironment env,
IOptions<SiteSettings> siteSettings,
@ -271,7 +269,7 @@ namespace Yavsc
ILoggerFactory loggerFactory)
{
GoogleSettings = googleSettings.Value;
GlobalLocalizer = localizer;
ResourcesHelpers.GlobalLocalizer = localizer;
SiteSetup = siteSettings.Value;
Authority = siteSettings.Value.Authority;
var blogsDir = siteSettings.Value.UserFiles.Blog;