Skip to content

Commit eff2253

Browse files
committed
use language for API
1 parent 913534d commit eff2253

File tree

7 files changed

+510
-84
lines changed

7 files changed

+510
-84
lines changed

TarkovMonitor/Blazor/AppLayout.razor

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
@CurrentPageTitle
1313
<MudSpacer/>
1414
</MudAppBar>
15-
<MudDrawer @bind-Open="@drawerOpen" Elevation="1" Anchor="Anchor.Left" Variant="@DrawerVariant.Responsive">
15+
<MudDrawer @bind-Open="@drawerOpen" Elevation="1" Anchor="Anchor.Left" Variant="@DrawerVariant.Responsive" @OpenChanged="OnOpenChangedHandler">
1616
<MudDrawerHeader LinkToIndex="true">
1717
<div>
1818
<img src="tarkov-dev-logo.svg" width="100%" style="vertical-align: middle;"/>
@@ -43,6 +43,11 @@
4343

4444
public string CurrentPageTitle = "TarkovMonitor";
4545

46+
protected override void OnInitialized()
47+
{
48+
LocalizationService.LanguageChanged += OnLanguageChanged;
49+
}
50+
4651
public void SetTitle(string value) {
4752
CurrentPageTitle = value;
4853
StateHasChanged();
@@ -52,4 +57,14 @@
5257
{
5358
drawerOpen = !drawerOpen;
5459
}
60+
61+
private void OnLanguageChanged(object? sender, EventArgs e)
62+
{
63+
InvokeAsync(StateHasChanged);
64+
}
65+
66+
private void OnOpenChangedHandler()
67+
{
68+
System.Diagnostics.Debug.WriteLine("OpenChanged");
69+
}
5570
}

TarkovMonitor/Blazor/Pages/Settings/Settings.razor

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -223,9 +223,9 @@
223223
if (Properties.Settings.Default.language != value)
224224
{
225225
LocalizationService.SetCulture(value);
226-
Properties.Settings.Default.language = value;
227-
Properties.Settings.Default.Save();
228-
InvokeAsync(StateHasChanged);
226+
//Properties.Settings.Default.language = value; // handled by LocalizationService.SetCulture
227+
//Properties.Settings.Default.Save();
228+
//InvokeAsync(StateHasChanged); // should be unnecessary since we're handling the OnLanguageChanged event
229229
}
230230
}
231231
}

TarkovMonitor/MainBlazorUI.cs

Lines changed: 25 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,29 @@ public MainBlazorUI()
4747
//tarkovdevRepository = new TarkovDevRepository();
4848

4949
eft = new GameWatcher();
50-
// Add event watchers
51-
eft.FleaSold += Eft_FleaSold;
50+
51+
timersManager = new TimersManager(eft);
52+
53+
// Creates the dependency injection services which are the in-betweens for the Blazor interface and the rest of the C# application.
54+
var services = new ServiceCollection();
55+
services.AddWindowsFormsBlazorWebView();
56+
services.AddMudServices();
57+
services.AddLocalization();
58+
services.AddSingleton<LocalizationService>();
59+
services.AddSingleton<GameWatcher>(eft);
60+
services.AddSingleton<MessageLog>(messageLog);
61+
services.AddSingleton<LogRepository>(logRepository);
62+
services.AddSingleton<GroupManager>(groupManager);
63+
services.AddSingleton<TimersManager>(timersManager);
64+
65+
blazorWebView1.HostPage = "wwwroot\\index.html";
66+
var serviceProvider = services.BuildServiceProvider();
67+
blazorWebView1.Services = serviceProvider;
68+
localizationService = serviceProvider.GetRequiredService<LocalizationService>();
69+
blazorWebView1.RootComponents.Add<TarkovMonitor.Blazor.App>("#app");
70+
//services.AddSingleton<TarkovDevRepository>(tarkovdevRepository);
71+
// Add event watchers
72+
eft.FleaSold += Eft_FleaSold;
5273
eft.FleaOfferExpired += Eft_FleaOfferExpired;
5374
eft.DebugMessage += Eft_DebugMessage;
5475
eft.ExceptionThrown += Eft_ExceptionThrown;
@@ -117,32 +138,12 @@ public MainBlazorUI()
117138

118139
SocketClient.ExceptionThrown += SocketClient_ExceptionThrown;
119140

120-
// Update tarkov.dev Repository data
141+
// Update tarkov.dev API data
121142
UpdateTarkovDevApiData();
122143
TarkovDev.StartAutoUpdates();
123144

124145
UpdateCheck.CheckForNewVersion();
125146

126-
timersManager = new TimersManager(eft);
127-
128-
// Creates the dependency injection services which are the in-betweens for the Blazor interface and the rest of the C# application.
129-
var services = new ServiceCollection();
130-
services.AddWindowsFormsBlazorWebView();
131-
services.AddMudServices();
132-
services.AddLocalization();
133-
services.AddSingleton<LocalizationService>();
134-
services.AddSingleton<GameWatcher>(eft);
135-
services.AddSingleton<MessageLog>(messageLog);
136-
services.AddSingleton<LogRepository>(logRepository);
137-
services.AddSingleton<GroupManager>(groupManager);
138-
services.AddSingleton<TimersManager>(timersManager);
139-
//services.AddSingleton<TarkovDevRepository>(tarkovdevRepository);
140-
blazorWebView1.HostPage = "wwwroot\\index.html";
141-
var serviceProvider = services.BuildServiceProvider();
142-
blazorWebView1.Services = serviceProvider;
143-
localizationService = serviceProvider.GetRequiredService<LocalizationService>();
144-
blazorWebView1.RootComponents.Add<TarkovMonitor.Blazor.App>("#app");
145-
146147
blazorWebView1.WebView.CoreWebView2InitializationCompleted += WebView_CoreWebView2InitializationCompleted;
147148

148149
runthroughTimer = new System.Timers.Timer(Properties.Settings.Default.runthroughTime.TotalMilliseconds)
@@ -400,7 +401,7 @@ private void Eft_GroupDisbanded(object? sender, EventArgs e)
400401

401402
private void TarkovTracker_ProgressRetrieved(object? sender, EventArgs e)
402403
{
403-
messageLog.AddMessage($"Retrieved {TarkovTracker.Progress.data.displayName} level {TarkovTracker.Progress.data.playerLevel} {TarkovTracker.Progress.data.pmcFaction} progress from Tarkov Tracker", "update", "https://tarkovtracker.io");
404+
messageLog.AddMessage(string.Format(localizationService.GetString("RetrievedDataFromTarkovTracker"), TarkovTracker.Progress.data.displayName, TarkovTracker.Progress.data.playerLevel, TarkovTracker.Progress.data.pmcFaction), "update", "https://tarkovtracker.io");
404405
}
405406

406407
private void Eft_GroupStaleEvent(object? sender, EventArgs e)

0 commit comments

Comments
 (0)