From 68faee2d232ea6ac3023cb4a103a68badd6f1b86 Mon Sep 17 00:00:00 2001 From: Mikhail Shabanov Date: Sat, 15 May 2021 19:47:48 +0200 Subject: [PATCH] chore: request language optimised --- .../Pages/SearchDialogTypeBase.cs | 5 ++-- .../Services/GraphQlBackendMockService.cs | 24 ++++++++++++++--- .../Services/GraphQlBackendService.cs | 25 +++++++++++++++--- .../Services/IGraphQlBackendService.cs | 6 ++--- .../wwwroot/realm/region.asia.scale-200.png | Bin 0 -> 2972 bytes .../wwwroot/realm/region.eu.scale-200.png | Bin 0 -> 2496 bytes .../wwwroot/realm/region.na.scale-200.png | Bin 0 -> 2342 bytes .../wwwroot/realm/region.ru.scale-200.png | Bin 0 -> 977 bytes 8 files changed, 45 insertions(+), 15 deletions(-) create mode 100644 WotBlitzStatisticsPro.Blazor/wwwroot/realm/region.asia.scale-200.png create mode 100644 WotBlitzStatisticsPro.Blazor/wwwroot/realm/region.eu.scale-200.png create mode 100644 WotBlitzStatisticsPro.Blazor/wwwroot/realm/region.na.scale-200.png create mode 100644 WotBlitzStatisticsPro.Blazor/wwwroot/realm/region.ru.scale-200.png 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 0000000000000000000000000000000000000000..28a2dd7a532cf28445d8619129b70c62559e17a5 GIT binary patch literal 2972 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 literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..da152790603d96733da315f100c16d1ede8ec573 GIT binary patch literal 2342 zcmaJ@dpuO@8lIB~rD!{&cG7CX){eQG8Iz&87)FuCY}w-lyqCAM8QjdY=QN>}YvO3rAfef~I|_4}>$eed^sp67kP_kI3YX#xJ; z7UtiYBM=A+jt`4#Se*I_ecn|bY*-e;ULkNGB!X3Z1&E*vp-2$mNcmA97vu}$ zW7|P@1j5Ks!V7^z{MJwfkQB|I!l2bsxq*#9xO=MQd_gn_1Cd~qL`FkBZ@7R0BtjZ0 z*wqi~Cuf3UiBEz83{3Fn2@;|OZbFo&2jH%z8U&;u%m>uc7@3l)rlCIRQVsj5V+;!T z1c9SzsK1H|@e2T$kOBl;(IgiE7DoigZfKk_UBxNh=vlwu$+p)s8lMnihza`Q5c+?n;Qm;$KdfU284?;UIz2kE;8k^ zX$2Oj6euKeSOUp_DMfxHv=yeI43++M1*!attW5d2O@@YH)O_|0;LN4pO-xGYeEm;y@u=0ZD;R*QQFoS__^1 zRlUz#;n!=yewB+c6oZ)>?tcw?`pDp*sqGi*8iFt82W1AwD-71IKa~4B0%3fJ!=m%l z`X`4Z0fE8RZFg30V*Gx1=gyeSQ>OIH?o7n)Aiwn`s{^a5!{{C40N`t(x1Fo z%PZdEz4$47)M{pdJ~ljhR%TH(7*-uoEm$17?B*{`7#e)y4#$(YIl(dOsOpcV#AkJH zR3FL1XTTm)jiniDrkAD}n9nesY3-1|JsE2~XFd+)Zqn>+X{s?c+F_Z#)StGKQ2;a| z&82qnz@H%-S#xq~_)zJ?J-S=<`q}=)Q4c#^O9>8lH*}2cUTmz0Kf_jT|4q1J#pZ)q zxnbu=er^}9KzAl?;P|3sRr412k>MFWpuBl`^t-Bm-bFvAnb zTNg^SExw>GaLB@vw9P~Jx;`#&;4j$aJKvmg!E^BrN(Mb`&jX9OO@-WJKK5&l0K-og zyBF@);jo@NuoF5T-_iH5{>t^@ih;U`vmt+?&91JDd*Z8lGqm%qh0uBO#l5Qov=AB7rLD2F&rJe11nZ+)t7<^zu++y8f8g(eou50LYLgK6l zdVBk6#yWT{`E9}d1AToVo1)s7l%zC!M;xcGpI~V^vxwWY2C14DpLfkBx-hmeV8Lrt zU;08+c2#xJb&;w(+?Bi@*{jzV^lo@HdcfSvH?eu)S_SbBJ+ZEb*;sIFbu&#l1+bx31kYC<;_Z3rqX;*5-F zU6Aij41TzIHp^omxjQn}8tJmDh)5!?9d_)k40H*)CMkjN{j?ui#`9h=bkF9LMVh3T zdpaIB*8jMRP(n1npPij8#5yftBMQB}Eo@0Cz8N!aeCN34uI@!hTthU>TU)gMc*#1C z%H+MGec8S*=xhD&G`UZ>*zONFb;vh#`=Gjipkd@^pO^O3 zVKz=nRMe|oJgzxh&zXw=wt*x}su*2r$-q`5yB zHJCRM^PbCVn`iyXY7wWl3b5I+;dVkaMCZ<0ARa;J}wywKuo?Rn6bUB3=ic8)2qWyLybZ6Y`@=ymk+QXx_`(;3B zpChvTTKjF;+$HE^?u2<4|IsC`VwC3x0sNpnMn|+uT1{@A3CsO8g25-I$5IEV1NJ|4 zHT$sowm5~^57rMfX_AaP^DjzC6Y~m= zi)B=vOX8iMYgyJ87a1P?v%XIBZuH5?D_NM2H(D%ePDV6WY>YbhtsN)eoYrz~c<2?W z5Kkf&rfBlXtCq0Y@F_>9*?Z%};u*w+Rc5eA9WoE0$!@*$di24Hf2Fhzo^DIswB925 zn^bj6%E(g{(!^+~W0pC&{_3Nbvox7T6a8=A&9F?(P0bs7_aQwwsj|)UpWo%%?dy8* z^6c<|@T{Ycl!>kDDoT^BeC+2iQ3v1dRY-*M_f6=na&)^NZ?odq;%ZHOcFt+g=Gx@w zmQB1tWl>(G=qK-uLp9@xJ&%8}uW{dQ`)^&c85Z%!Y|m$Re=^UU`g7rU`Lik*5t{!1 DiP+W# literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..b281033fd614ebe48b862c0e5cdafd62a91695da GIT binary patch literal 977 zcmaJ=O=#3W7!6iMihESFhz==81vfKEH=8CjE$L?0E|{`xSGu=0O{U%0CKD%9H|d*Qf_!;SP+C< zb=I!)eT*+~>=6I&eb`yx+i6yAvU#$?+AhU{<&$L$s-e4z>)7=-uf4^Sf-rPGXf#>V zxomhOl-vv>rD4q3f-pIq#;&)98Cb@vL1c=1&tHfj@J(?+b&wO6a4VSIqIiC5uHkL1 zdAcu7Pl3tQ-~u6LE=a@mC^1q~?C2W&oLxf^bRcZa6c2)GIyF!t6a!T%<~<}AfTl~b zTGVvyB2c&u(F9ab9_fZUZXgA8KaqQ*{)$nzD_vjQGQ}2Su>oPb-Im(p5}~V5)^!~s z1u9COBl5{+#N0F=C8IqB8z&wOViu4HWQy)G*H!_+|Ije(qZ3xgf8zb8aMIX}F|6Z+Y*3FkZe=uc6&odrT}Ehwko8^_Yc0Y^(jqY^ zl{!@eV+%p#lXh~U!*Lv=8YRq)JY2O+k*i2S;2Xt?WoepLQLVBj%Vl+@P(U-PjEZWd zY)@Efk82ZeBg7Hwas57b0uAJ5;}FK&vyEwR9s3nZLeNRu2nNSu57g^&{eiJ)<$+wt zgMnFd|7v#cice5>?2j%t`ooVSKJk=~_Pw3L5Pud{)wUYx=Wm~^oB)m=-aUD4NqGI{ zRqg4^J9poY-2ZxZ`^pJ;^~V@G^=taU$L&YEOKAVQ^7G8Yqc?ZIJiaXq2~+e)?%CqI Q#q5z)%X9XVnWY=Q0V;Vib^rhX literal 0 HcmV?d00001