Skip to content

Commit b9e97ab

Browse files
zhenlei520zhenlei520
committed
rename: I18N -> I18n
1 parent 93951b9 commit b9e97ab

File tree

81 files changed

+320
-323
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

81 files changed

+320
-323
lines changed

‎Masa.Framework.sln‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -597,15 +597,15 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Masa.Contrib.Development.Da
597597
EndProject
598598
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Masa.Contrib.Development.DaprStarter.AspNetCore.Tests", "src\Contrib\Development\Tests\Masa.Contrib.Development.DaprStarter.AspNetCore.Tests\Masa.Contrib.Development.DaprStarter.AspNetCore.Tests.csproj", "{DD899DC4-A2B7-4C7B-A644-EDB56A61145C}"
599599
EndProject
600-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Masa.Contrib.Globalization.I18N", "src\Contrib\Globalization\Masa.Contrib.Globalization.I18N\Masa.Contrib.Globalization.I18N.csproj", "{F9E3EBD9-EE96-40F7-BDC7-818B88557D6B}"
600+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Masa.Contrib.Globalization.I18n", "src\Contrib\Globalization\Masa.Contrib.Globalization.I18n\Masa.Contrib.Globalization.I18n.csproj", "{F9E3EBD9-EE96-40F7-BDC7-818B88557D6B}"
601601
EndProject
602602
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{D2E598D5-5E44-4275-AF03-4BAD07A0E13B}"
603603
EndProject
604-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Masa.Contrib.Globalization.I18N.Tests", "src\Contrib\Globalization\Tests\Masa.Contrib.Globalization.I18N.Tests\Masa.Contrib.Globalization.I18N.Tests.csproj", "{6C732EBE-22CC-4160-B427-F4558C899024}"
604+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Masa.Contrib.Globalization.I18n.Tests", "src\Contrib\Globalization\Tests\Masa.Contrib.Globalization.I18n.Tests\Masa.Contrib.Globalization.I18n.Tests.csproj", "{6C732EBE-22CC-4160-B427-F4558C899024}"
605605
EndProject
606-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Masa.Contrib.Globalization.I18N.Dcc", "src\Contrib\Globalization\Masa.Contrib.Globalization.I18N.Dcc\Masa.Contrib.Globalization.I18N.Dcc.csproj", "{B0EFDF9E-81FF-4880-992B-8A65A2008717}"
606+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Masa.Contrib.Globalization.I18n.Dcc", "src\Contrib\Globalization\Masa.Contrib.Globalization.I18n.Dcc\Masa.Contrib.Globalization.I18n.Dcc.csproj", "{B0EFDF9E-81FF-4880-992B-8A65A2008717}"
607607
EndProject
608-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Masa.Contrib.Globalization.I18N.Dcc.Tests", "src\Contrib\Globalization\Tests\Masa.Contrib.Globalization.I18N.Dcc.Tests\Masa.Contrib.Globalization.I18N.Dcc.Tests.csproj", "{91FE0D47-D6DB-4D2D-8C6F-15FCE974AB52}"
608+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Masa.Contrib.Globalization.I18n.Dcc.Tests", "src\Contrib\Globalization\Tests\Masa.Contrib.Globalization.I18n.Dcc.Tests\Masa.Contrib.Globalization.I18n.Dcc.Tests.csproj", "{91FE0D47-D6DB-4D2D-8C6F-15FCE974AB52}"
609609
EndProject
610610
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Exception", "Exception", "{84F366D3-6E9A-4101-AEC0-287CBA6984A8}"
611611
EndProject
@@ -617,11 +617,11 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Masa.Contrib.Exceptions", "
617617
EndProject
618618
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Masa.BuildingBlocks.Exceptions.Tests", "src\BuildingBlocks\Exception\Masa.BuildingBlocks.Exceptions.Tests\Masa.BuildingBlocks.Exceptions.Tests.csproj", "{921DCAAC-3146-4EDB-891C-D76089E4A451}"
619619
EndProject
620-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Masa.Contrib.Globalization.I18N.AspNetCore", "src\Contrib\Globalization\Masa.Contrib.Globalization.I18N.AspNetCore\Masa.Contrib.Globalization.I18N.AspNetCore.csproj", "{B7AEC624-6A40-42E7-BDB5-4487ACE48CE4}"
620+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Masa.Contrib.Globalization.I18n.AspNetCore", "src\Contrib\Globalization\Masa.Contrib.Globalization.I18n.AspNetCore\Masa.Contrib.Globalization.I18n.AspNetCore.csproj", "{B7AEC624-6A40-42E7-BDB5-4487ACE48CE4}"
621621
EndProject
622622
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Masa.Contrib.Dispatcher.Events.FluentValidation", "src\Contrib\Dispatcher\Masa.Contrib.Dispatcher.Events.FluentValidation\Masa.Contrib.Dispatcher.Events.FluentValidation.csproj", "{66B1723A-D578-418C-B21C-2C3B5CBD1180}"
623623
EndProject
624-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Masa.BuildingBlocks.Globalization.I18N", "src\BuildingBlocks\Globalization\Masa.BuildingBlocks.Globalization.I18N\Masa.BuildingBlocks.Globalization.I18N.csproj", "{6088C3D3-E17E-41BC-A21F-F222F5123DF1}"
624+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Masa.BuildingBlocks.Globalization.I18n", "src\BuildingBlocks\Globalization\Masa.BuildingBlocks.Globalization.I18n\Masa.BuildingBlocks.Globalization.I18n.csproj", "{6088C3D3-E17E-41BC-A21F-F222F5123DF1}"
625625
EndProject
626626
Global
627627
GlobalSection(SolutionConfigurationPlatforms) = preSolution

‎src/BuildingBlocks/Data/Masa.BuildingBlocks.Data/Constants/ErrorCode.cs‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -140,19 +140,20 @@ public static class ErrorCode
140140
/// <summary>
141141
/// '{PropertyName}' must not be more than {ExpectedPrecision} digits in total, with allowance for {ExpectedScale} decimals. {Digits} digits and {ActualScale} decimals were found.
142142
/// </summary>
143-
[Description(
144-
"'{0}' must not be more than {1} digits in total, with allowance for {2} decimals. {3} digits and {4} decimals were found.")]
143+
[Description("'{0}' must not be more than {1} digits in total, with allowance for {2} decimals. {3} digits and {4} decimals were found.")]
145144
public const string SCALE_PRECISION_VALIDATOR = $"{ARGUMENT}0020";
146145

147146
/// <summary>
148147
/// '{PropertyName}' must be empty.
149148
/// </summary>
150-
[Description("'{0}' must be empty.")] public const string EMPTY_VALIDATOR = $"{ARGUMENT}0021";
149+
[Description("'{0}' must be empty.")]
150+
public const string EMPTY_VALIDATOR = $"{ARGUMENT}0021";
151151

152152
/// <summary>
153153
/// '{PropertyName}' must be empty.
154154
/// </summary>
155-
[Description("'{0}' must be empty.")] public const string NULL_VALIDATOR = $"{ARGUMENT}0022";
155+
[Description("'{0}' must be empty.")]
156+
public const string NULL_VALIDATOR = $"{ARGUMENT}0022";
156157

157158
/// <summary>
158159
/// '{0}' has a range of values which does not include '{1}'.

‎src/BuildingBlocks/Exception/Masa.BuildingBlocks.Exceptions/Masa.BuildingBlocks.Exceptions.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<ItemGroup>
1010
<ProjectReference Include="..\..\..\Utils\Extensions\Masa.Utils.Extensions.DotNet\Masa.Utils.Extensions.DotNet.csproj" />
1111
<ProjectReference Include="..\..\Data\Masa.BuildingBlocks.Data\Masa.BuildingBlocks.Data.csproj" />
12-
<ProjectReference Include="..\..\Globalization\Masa.BuildingBlocks.Globalization.I18N\Masa.BuildingBlocks.Globalization.I18N.csproj" />
12+
<ProjectReference Include="..\..\Globalization\Masa.BuildingBlocks.Globalization.I18n\Masa.BuildingBlocks.Globalization.I18n.csproj" />
1313
</ItemGroup>
1414

1515
<ItemGroup>

‎src/BuildingBlocks/Exception/Masa.BuildingBlocks.Exceptions/MasaException.cs‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ public class MasaException : Exception
1515
public string? ErrorCode => _errorCode;
1616

1717
/// <summary>
18-
/// Provides error message that I18N is not used
18+
/// Provides error message that I18n is not used
1919
/// </summary>
2020
protected string? ErrorMessage { get; set; }
2121

@@ -25,36 +25,36 @@ public class MasaException : Exception
2525

2626
private bool _initialize;
2727

28-
private II18N? _i18N;
28+
private II18n? _i18n;
2929

30-
internal II18N? I18N
30+
internal II18n? I18n
3131
{
3232
get
3333
{
3434
TryInitialize();
35-
return _i18N;
35+
return _i18n;
3636
}
3737
}
3838

39-
private II18N? _frameworkI18N;
39+
private II18n? _frameworkI18n;
4040

41-
internal II18N? FrameworkI18N
41+
internal II18n? FrameworkI18n
4242
{
4343
get
4444
{
4545
TryInitialize();
46-
return _frameworkI18N;
46+
return _frameworkI18n;
4747
}
4848
}
4949

50-
private bool _supportI18N;
50+
private bool _supportI18n;
5151

52-
internal bool SupportI18N
52+
internal bool SupportI18n
5353
{
5454
get
5555
{
5656
TryInitialize();
57-
return _supportI18N;
57+
return _supportI18n;
5858
}
5959
}
6060

@@ -68,9 +68,9 @@ private void TryInitialize()
6868

6969
private void Initialize()
7070
{
71-
_frameworkI18N = MasaApp.GetService<II18N<MasaFrameworkResource>>();
72-
_i18N = MasaApp.GetService<II18N<DefaultResource>>();
73-
_supportI18N = _frameworkI18N != null;
71+
_frameworkI18n = MasaApp.GetService<II18n<MasaFrameworkResource>>();
72+
_i18n = MasaApp.GetService<II18n<DefaultResource>>();
73+
_supportI18n = _frameworkI18n != null;
7474
_initialize = true;
7575
}
7676

@@ -118,7 +118,7 @@ public string GetLocalizedMessage()
118118

119119
protected virtual string GetLocalizedMessageExecuting()
120120
{
121-
if (!SupportI18N)
121+
if (!SupportI18n)
122122
{
123123
if (string.IsNullOrWhiteSpace(ErrorMessage))
124124
return Message;
@@ -129,10 +129,10 @@ protected virtual string GetLocalizedMessageExecuting()
129129
if (ErrorCode!.StartsWith(Masa.BuildingBlocks.Data.Constants.ErrorCode.FRAMEWORK_PREFIX))
130130
{
131131
//The current framework frame exception
132-
return FrameworkI18N!.T(ErrorCode!, false, GetParameters()) ?? Message;
132+
return FrameworkI18n!.T(ErrorCode!, false, GetParameters()) ?? Message;
133133
}
134134

135-
return I18N!.T(ErrorCode, false, GetParameters()) ?? Message;
135+
return I18n!.T(ErrorCode, false, GetParameters()) ?? Message;
136136
}
137137

138138
protected virtual object[] GetParameters() => Parameters;

‎src/BuildingBlocks/Exception/Masa.BuildingBlocks.Exceptions/MasaValidatorException.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -207,19 +207,19 @@ private static void Throw(
207207
protected override string GetLocalizedMessageExecuting()
208208
{
209209
string message;
210-
if (!SupportI18N)
210+
if (!SupportI18n)
211211
{
212212
message = string.IsNullOrWhiteSpace(ErrorMessage) ? Message : string.Format(ErrorMessage, GetParameters());
213213
}
214214

215215
else if (ErrorCode!.StartsWith(Masa.BuildingBlocks.Data.Constants.ErrorCode.FRAMEWORK_PREFIX))
216216
{
217217
//The current framework frame exception
218-
message = FrameworkI18N!.T(ErrorCode!, false, GetParameters()) ?? Message;
218+
message = FrameworkI18n!.T(ErrorCode!, false, GetParameters()) ?? Message;
219219
}
220220
else
221221
{
222-
message = I18N!.T(ErrorCode, false, GetParameters()) ?? Message;
222+
message = I18n!.T(ErrorCode, false, GetParameters()) ?? Message;
223223
}
224224

225225
return FormatMessage(new ValidationModel(ParamName!, message));

‎src/BuildingBlocks/Exception/Masa.BuildingBlocks.Exceptions/_Imports.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// Licensed under the MIT License. See LICENSE.txt in the project root for license information.
33

44
global using Masa.BuildingBlocks.Data;
5-
global using Masa.BuildingBlocks.Globalization.I18N;
5+
global using Masa.BuildingBlocks.Globalization.I18n;
66
global using Microsoft.Extensions.Logging;
77
global using System.Diagnostics.CodeAnalysis;
88
global using System.Runtime.CompilerServices;

‎src/BuildingBlocks/Globalization/Masa.BuildingBlocks.Globalization.I18N/Constant.cs‎ renamed to ‎src/BuildingBlocks/Globalization/Masa.BuildingBlocks.Globalization.I18n/Constant.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
// Copyright (c) MASA Stack All rights reserved.
22
// Licensed under the MIT License. See LICENSE.txt in the project root for license information.
33

4-
namespace Masa.BuildingBlocks.Globalization.I18N;
4+
namespace Masa.BuildingBlocks.Globalization.I18n;
55

66
public static class Constant
77
{
8-
public const string DEFAULT_LOCAL_SECTION = "I18N";
8+
public const string DEFAULT_LOCAL_SECTION = "I18n";
99
}

‎src/BuildingBlocks/Globalization/Masa.BuildingBlocks.Globalization.I18N/CultureModel.cs‎ renamed to ‎src/BuildingBlocks/Globalization/Masa.BuildingBlocks.Globalization.I18n/CultureModel.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// Copyright (c) MASA Stack All rights reserved.
22
// Licensed under the MIT License. See LICENSE.txt in the project root for license information.
33

4-
namespace Masa.BuildingBlocks.Globalization.I18N;
4+
namespace Masa.BuildingBlocks.Globalization.I18n;
55

66
public class CultureModel
77
{

‎src/BuildingBlocks/Globalization/Masa.BuildingBlocks.Globalization.I18N/CultureSettings.cs‎ renamed to ‎src/BuildingBlocks/Globalization/Masa.BuildingBlocks.Globalization.I18n/CultureSettings.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// Copyright (c) MASA Stack All rights reserved.
22
// Licensed under the MIT License. See LICENSE.txt in the project root for license information.
33

4-
namespace Masa.BuildingBlocks.Globalization.I18N;
4+
namespace Masa.BuildingBlocks.Globalization.I18n;
55

66
public class CultureSettings
77
{

‎src/BuildingBlocks/Globalization/Masa.BuildingBlocks.Globalization.I18N/DefaultLanguageProvider.cs‎ renamed to ‎src/BuildingBlocks/Globalization/Masa.BuildingBlocks.Globalization.I18n/DefaultLanguageProvider.cs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
// Copyright (c) MASA Stack All rights reserved.
22
// Licensed under the MIT License. See LICENSE.txt in the project root for license information.
33

4-
namespace Masa.BuildingBlocks.Globalization.I18N;
4+
namespace Masa.BuildingBlocks.Globalization.I18n;
55

66
public class DefaultLanguageProvider : ILanguageProvider
77
{
8-
private readonly II18N<MasaLanguageResource> _i18N;
8+
private readonly II18n<MasaLanguageResource> _i18n;
99
private readonly IOptions<CultureSettings> _options;
1010

1111
private static readonly Dictionary<string, string> _languages = new()
@@ -14,22 +14,22 @@ public class DefaultLanguageProvider : ILanguageProvider
1414
{ "zh-CN", "中文 (简体)" }
1515
};
1616

17-
public DefaultLanguageProvider(II18N<MasaLanguageResource> i18N, IOptions<CultureSettings> options)
17+
public DefaultLanguageProvider(II18n<MasaLanguageResource> i18n, IOptions<CultureSettings> options)
1818
{
19-
_i18N = i18N;
19+
_i18n = i18n;
2020
_options = options;
2121
}
2222

2323
public IReadOnlyList<LanguageInfo> GetLanguages()
2424
{
2525
var list = new List<LanguageInfo>();
26-
string cultureName = _i18N.GetCultureInfo().Name;
26+
string cultureName = _i18n.GetCultureInfo().Name;
2727
_options.Value.SupportedCultures.ForEach(culture =>
2828
{
2929
string key = culture.Culture.Equals(cultureName, StringComparison.OrdinalIgnoreCase) ?
3030
nameof(LanguageInfo.UIDisplayName) :
3131
$"{culture.Culture}\\.{nameof(LanguageInfo.UIDisplayName)}";
32-
var uiDisplayName = _i18N.T(key);
32+
var uiDisplayName = _i18n.T(key);
3333
var languageInfo = new LanguageInfo(culture.Culture, culture.DisplayName ?? GetDisplayName(cultureName), culture.Icon)
3434
{
3535
UIDisplayName = uiDisplayName

0 commit comments

Comments
 (0)