Merge pull request #253 from stayintarkov/fix-localisation-not-working

Fix strings not localising
stayintarkov · May 13, 2024 · 02dc1ce · 02dc1ce
2 parents a8a1d2c + fca195f
commit 02dc1ce
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 5 deletions.
diff --git a/SIT.Manager/ViewModels/Settings/EftViewModel.cs b/SIT.Manager/ViewModels/Settings/EftViewModel.cs
@@ -36,10 +36,6 @@ public partial class EftViewModel : SettingsViewModelBase
 
         BsgEftInstallPath = Path.GetDirectoryName(_installerService.GetEFTInstallPath()) ?? _localizationService.TranslateSource("EftViewModelBsgEftInstallPathMissing");
         SitEftInstallPath = _configsService.Config.SitEftInstallPath;
-        if (string.IsNullOrEmpty(SitEftInstallPath))
-        {
-            SitEftInstallPath = _localizationService.TranslateSource("EftViewModelSitEftInstallPathMissing");
-        }
 
         ChangeInstallLocationCommand = new AsyncRelayCommand(ChangeInstallLocation);
     }
@@ -74,4 +70,9 @@ private async Task ChangeInstallLocation()
             _barNotificationService.ShowError(_localizationService.TranslateSource("SettingsPageViewModelErrorTitle"), _localizationService.TranslateSource("SettingsPageViewModelConfigErrorEFTDescription"));
         }
     }
+
+    protected override void OnActivated()
+    {
+        base.OnActivated();
+    }
 }
diff --git a/SIT.Manager/Views/Settings/EftView.axaml b/SIT.Manager/Views/Settings/EftView.axaml
@@ -38,7 +38,15 @@
 					   VerticalAlignment="Center"
 					   TextTrimming="CharacterEllipsis"
 					   TextWrapping="WrapWithOverflow"
-					   Text="{Binding SitEftInstallPath}"/>
+					   Text="{Binding SitEftInstallPath}"
+					   IsVisible="{Binding SitEftInstallPath, Converter={x:Static StringConverters.IsNotNullOrEmpty}}"/>
+			<TextBlock Grid.Column="1"
+					   Grid.Row="1"
+					   VerticalAlignment="Center"
+					   TextTrimming="CharacterEllipsis"
+					   TextWrapping="WrapWithOverflow"
+					   Text="{DynamicResource EftViewModelSitEftInstallPathMissing}"
+					   IsVisible="{Binding SitEftInstallPath}, Converter={x:Static StringConverters.IsNullOrEmpty}}"/>
 			<Button Grid.Column="2"
 					Grid.Row="1"
 					VerticalAlignment="Center"