Skip to content

Commit c953890

Browse files
authored
Merge pull request #104 from NosCoreIO/betterNaming
Fix culture
2 parents 0768573 + 611a646 commit c953890

4 files changed

Lines changed: 8 additions & 6 deletions

File tree

src/NosCore.Shared/I18N/I18NTestHelpers.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@ public static IEnumerable<T> GetKeysWithMissingTranslations<T>(ILogLanguageLocal
2222

2323
public static IEnumerable<string> GetUselessTranslations(ILogLanguageLocalizer localizer, List<string> keys)
2424
{
25-
return localizer.GetAllStrings(false)
25+
return localizer.GetAllStrings()
2626
.Where(resourceKey => !keys.Contains(resourceKey.Name))
27-
.Select(translation => translation.Value);
27+
.Select(translation => translation.Name);
2828
}
2929

3030
public static IEnumerable<T> GetUselessLanguageKeys<T>()

src/NosCore.Shared/I18N/ILogLanguageLocalizer.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,5 +18,5 @@ public interface ILogLanguageLocalizer<T> : ILogLanguageLocalizer where T : stru
1818

1919
public interface ILogLanguageLocalizer
2020
{
21-
IEnumerable<LocalizedString> GetAllStrings(bool includeParentCultures);
21+
IEnumerable<LocalizedString> GetAllStrings();
2222
}

src/NosCore.Shared/I18N/LogLanguageLocalizer.cs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,9 @@
66

77
using System;
88
using System.Collections.Generic;
9+
using System.Globalization;
910
using Microsoft.Extensions.Localization;
11+
using NosCore.Shared.Enumerations;
1012

1113
namespace NosCore.Shared.I18N
1214
{
@@ -37,7 +39,7 @@ public LocalizedString this[T key]
3739
}
3840
}
3941

40-
public IEnumerable<LocalizedString> GetAllStrings(bool includeParentCultures) =>
41-
_stringLocalizer.GetAllStrings(includeParentCultures);
42+
public IEnumerable<LocalizedString> GetAllStrings() =>
43+
_stringLocalizer.GetAllStrings(CultureInfo.CurrentUICulture.Equals(new CultureInfo(RegionType.EN.ToString())));
4244
}
4345
}

src/NosCore.Shared/NosCore.Shared.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<RepositoryUrl>https://github.com/NosCoreIO/NosCore.Dao.git</RepositoryUrl>
1313
<PackageIconUrl></PackageIconUrl>
1414
<PackageTags>nostale, noscore, nostale private server source, nostale emulator</PackageTags>
15-
<Version>3.3.0</Version>
15+
<Version>3.4.0</Version>
1616
<PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
1717
<Description>NosCore's Shared Components</Description>
1818
<PackageLicenseExpression></PackageLicenseExpression>

0 commit comments

Comments
 (0)