diff --git a/WotBlitzStatisticsPro.Blazor/Pages/SearchDialogTypeBase.cs b/WotBlitzStatisticsPro.Blazor/Pages/SearchDialogTypeBase.cs index 34e5a07..79045cb 100644 --- a/WotBlitzStatisticsPro.Blazor/Pages/SearchDialogTypeBase.cs +++ b/WotBlitzStatisticsPro.Blazor/Pages/SearchDialogTypeBase.cs @@ -32,7 +32,7 @@ namespace WotBlitzStatisticsPro.Blazor.Pages public List FilteredList { get; set; } = new(); - //public RealmType CurrentRealmType { get; set; } = RealmType.Eu; + public RealmType CurrentRealmType { get; set; } = RealmType.Eu; public long CurrentValue { get; set; } @@ -40,7 +40,6 @@ namespace WotBlitzStatisticsPro.Blazor.Pages public async Task OnSearchTextChange(string value) { - var env = Environment.GetEnvironmentVariable("USE_GRAPH_QL_MOCK"); if (DialogType == DialogType.FindPlayer && value.Length < 3) { return; @@ -52,7 +51,7 @@ namespace WotBlitzStatisticsPro.Blazor.Pages // ToDo: Move this call to a service var accounts = - await GraphQlBackendService.FindPlayers(value, RealmType.Ru, RequestLanguage.En); + await GraphQlBackendService.FindPlayers(value, CurrentRealmType); if (accounts != null) { diff --git a/WotBlitzStatisticsPro.Blazor/Services/GraphQlBackendMockService.cs b/WotBlitzStatisticsPro.Blazor/Services/GraphQlBackendMockService.cs index 9be81b2..e0bb99f 100644 --- a/WotBlitzStatisticsPro.Blazor/Services/GraphQlBackendMockService.cs +++ b/WotBlitzStatisticsPro.Blazor/Services/GraphQlBackendMockService.cs @@ -1,5 +1,6 @@ using System; using System.Collections.Generic; +using System.Globalization; using System.Threading.Tasks; using Bogus; using Bogus.Extensions; @@ -9,11 +10,11 @@ namespace WotBlitzStatisticsPro.Blazor.Services { public class GraphQlBackendMockService: IGraphQlBackendService { - public async Task?> FindPlayers(string accountNick, RealmType realmType, RequestLanguage language) + public async Task?> FindPlayers(string accountNick, RealmType realmType) { var result = new List(); - var faker = new Faker(FakerLanguage(language)); + var faker = new Faker(FakerLanguage(GetLanguage())); var random = faker.Random.Number(10, 80); for (int i = 0; i < random; i++) @@ -32,11 +33,11 @@ namespace WotBlitzStatisticsPro.Blazor.Services return result; } - public async Task?> FindClans(string clanNameOrTag, RealmType realmType, RequestLanguage language) + public async Task?> FindClans(string clanNameOrTag, RealmType realmType) { var result = new List(); - var faker = new Faker(FakerLanguage(language)); + var faker = new Faker(FakerLanguage(GetLanguage())); var random = faker.Random.Number(10, 80); for (int i = 0; i < random; i++) @@ -67,5 +68,20 @@ namespace WotBlitzStatisticsPro.Blazor.Services return "en"; } } + + private RequestLanguage GetLanguage() + { + var culture = CultureInfo.CurrentCulture; + + switch (culture.Name) + { + case "ru-RU": + return RequestLanguage.Ru; + case "de-DE": + return RequestLanguage.De; + default: + return RequestLanguage.En; + } + } } } \ No newline at end of file diff --git a/WotBlitzStatisticsPro.Blazor/Services/GraphQlBackendService.cs b/WotBlitzStatisticsPro.Blazor/Services/GraphQlBackendService.cs index 23a6bcb..f11eb7f 100644 --- a/WotBlitzStatisticsPro.Blazor/Services/GraphQlBackendService.cs +++ b/WotBlitzStatisticsPro.Blazor/Services/GraphQlBackendService.cs @@ -1,4 +1,5 @@ using System.Collections.Generic; +using System.Globalization; using System.Threading.Tasks; using WotBlitzStatisticsPro.Blazor.GraphQl; @@ -13,20 +14,36 @@ namespace WotBlitzStatisticsPro.Blazor.Services _client = client; } - public async Task?> FindPlayers(string accountNick, RealmType realmType, RequestLanguage language) + public async Task?> FindPlayers(string accountNick, RealmType realmType) { var accounts = - await _client.FindPlayers.ExecuteAsync(accountNick, RealmType.Ru, RequestLanguage.En); + await _client.FindPlayers.ExecuteAsync(accountNick, realmType, GetLanguage()); return accounts.Data?.Players; } - public async Task?> FindClans(string clanNameOrTag, RealmType realmType, RequestLanguage language) + public async Task?> FindClans(string clanNameOrTag, RealmType realmType) { var clans = - await _client.FindClans.ExecuteAsync(clanNameOrTag, RealmType.Ru, RequestLanguage.En); + await _client.FindClans.ExecuteAsync(clanNameOrTag, realmType, GetLanguage()); return clans.Data?.Clans; } + + private RequestLanguage GetLanguage() + { + var culture = CultureInfo.CurrentCulture; + + switch (culture.Name) + { + case "ru-RU": + return RequestLanguage.Ru; + case "de-DE": + return RequestLanguage.De; + default: + return RequestLanguage.En; + } + } + } } \ No newline at end of file diff --git a/WotBlitzStatisticsPro.Blazor/Services/IGraphQlBackendService.cs b/WotBlitzStatisticsPro.Blazor/Services/IGraphQlBackendService.cs index 5fbef43..01b8513 100644 --- a/WotBlitzStatisticsPro.Blazor/Services/IGraphQlBackendService.cs +++ b/WotBlitzStatisticsPro.Blazor/Services/IGraphQlBackendService.cs @@ -8,12 +8,10 @@ namespace WotBlitzStatisticsPro.Blazor.Services { Task?> FindPlayers( string accountNick, - RealmType realmType, - RequestLanguage language); + RealmType realmType); Task?> FindClans( string clanNameOrTag, - RealmType realmType, - RequestLanguage language); + RealmType realmType); } } \ No newline at end of file diff --git a/WotBlitzStatisticsPro.Blazor/wwwroot/realm/region.asia.scale-200.png b/WotBlitzStatisticsPro.Blazor/wwwroot/realm/region.asia.scale-200.png new file mode 100644 index 0000000..28a2dd7 Binary files /dev/null and b/WotBlitzStatisticsPro.Blazor/wwwroot/realm/region.asia.scale-200.png differ diff --git a/WotBlitzStatisticsPro.Blazor/wwwroot/realm/region.eu.scale-200.png b/WotBlitzStatisticsPro.Blazor/wwwroot/realm/region.eu.scale-200.png new file mode 100644 index 0000000..556c58b Binary files /dev/null and b/WotBlitzStatisticsPro.Blazor/wwwroot/realm/region.eu.scale-200.png differ diff --git a/WotBlitzStatisticsPro.Blazor/wwwroot/realm/region.na.scale-200.png b/WotBlitzStatisticsPro.Blazor/wwwroot/realm/region.na.scale-200.png new file mode 100644 index 0000000..da15279 Binary files /dev/null and b/WotBlitzStatisticsPro.Blazor/wwwroot/realm/region.na.scale-200.png differ diff --git a/WotBlitzStatisticsPro.Blazor/wwwroot/realm/region.ru.scale-200.png b/WotBlitzStatisticsPro.Blazor/wwwroot/realm/region.ru.scale-200.png new file mode 100644 index 0000000..b281033 Binary files /dev/null and b/WotBlitzStatisticsPro.Blazor/wwwroot/realm/region.ru.scale-200.png differ