Browse Source
Merge pull request #26344 from johnkaram02/fix/enum-localizer-undefined-value
Handle undefined and combined flag values in AbpEnumLocalizer
pull/26464/head
Ma Liming
1 week ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with
28 additions and
2 deletions
-
framework/src/Volo.Abp.BlazoriseUI/Components/ObjectExtending/EnumHelper.cs
-
framework/src/Volo.Abp.Localization/Volo/Abp/Localization/AbpEnumLocalizer.cs
-
framework/test/Volo.Abp.Localization.Tests/Volo/Abp/Localization/AbpEnumLocalizer_Tests.cs
|
|
|
@ -9,7 +9,7 @@ public static class EnumHelper |
|
|
|
[Obsolete("Use IAbpEnumLocalizer instead.")] |
|
|
|
public static string GetLocalizedMemberName(Type enumType, object value, IStringLocalizerFactory stringLocalizerFactory) |
|
|
|
{ |
|
|
|
var memberName = enumType.GetEnumName(value); |
|
|
|
var memberName = enumType.GetEnumName(value) ?? Enum.ToObject(enumType, value).ToString(); |
|
|
|
var localizedMemberName = AbpInternalLocalizationHelper.LocalizeWithFallback( |
|
|
|
new[] |
|
|
|
{ |
|
|
|
|
|
|
|
@ -26,7 +26,7 @@ public class AbpEnumLocalizer : IAbpEnumLocalizer, ITransientDependency |
|
|
|
|
|
|
|
protected virtual string GetStringInternal(Type enumType, object enumValue, params IStringLocalizer?[] specifyLocalizers) |
|
|
|
{ |
|
|
|
var memberName = enumType.GetEnumName(enumValue)!; |
|
|
|
var memberName = enumType.GetEnumName(enumValue) ?? Enum.ToObject(enumType, enumValue).ToString()!; |
|
|
|
var localizedString = GetStringOrNull( |
|
|
|
specifyLocalizers, |
|
|
|
new[] |
|
|
|
|
|
|
|
@ -37,6 +37,24 @@ public class AbpEnumLocalizer_Tests : AbpIntegratedTest<AbpLocalizationTestModul |
|
|
|
_enumLocalizer.GetString<BookType>(BookType.Biography, specifyLocalizer).ShouldBe("Biography from ValidationResource"); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
[Fact] |
|
|
|
public void GetString_With_Undefined_Value_Test() |
|
|
|
{ |
|
|
|
using (CultureHelper.Use("en")) |
|
|
|
{ |
|
|
|
_enumLocalizer.GetString<BookType>(42).ShouldBe("42"); |
|
|
|
_enumLocalizer.GetString<BookType>((BookType)42).ShouldBe("42"); |
|
|
|
_enumLocalizer.GetString<BookPermissions>(BookPermissions.Read | BookPermissions.Write).ShouldBe("Read, Write"); |
|
|
|
_enumLocalizer.GetString<BookPermissions>(3).ShouldBe("Read, Write"); |
|
|
|
|
|
|
|
var specifyLocalizer = new[] |
|
|
|
{ |
|
|
|
GetRequiredService<IStringLocalizerFactory>().Create<LocalizationTestValidationResource>() |
|
|
|
}; |
|
|
|
_enumLocalizer.GetString<BookType>(42, specifyLocalizer).ShouldBe("42"); |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
enum BookType |
|
|
|
@ -45,3 +63,11 @@ enum BookType |
|
|
|
Adventure, |
|
|
|
Biography, |
|
|
|
} |
|
|
|
|
|
|
|
[System.Flags] |
|
|
|
enum BookPermissions |
|
|
|
{ |
|
|
|
None = 0, |
|
|
|
Read = 1, |
|
|
|
Write = 2, |
|
|
|
} |
|
|
|
|