Fixed: Fallback to English translations if invalid UI language in config

Xetera · Sep 1, 2023 · 4c72017 · 4c72017
1 parent c123596
commit 4c72017
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 1 deletion.
diff --git a/frontend/src/Settings/UI/UISettings.js b/frontend/src/Settings/UI/UISettings.js
@@ -220,6 +220,13 @@ class UISettings extends Component {
  helpTextWarning={translate('BrowserReloadRequired')}
  onChange={onInputChange}
  {...settings.uiLanguage}
+ errors={
+ languages.some((language) => language.key === settings.uiLanguage.value) ?
+ settings.uiLanguage.errors :
+ [
+ ...settings.uiLanguage.errors,
+ { message: translate('InvalidUILanguage') }
+ ]}
  />
  </FormGroup>
  </FieldSet>

diff --git a/src/NzbDrone.Core/Localization/Core/en.json b/src/NzbDrone.Core/Localization/Core/en.json
@@ -656,6 +656,7 @@
  "InteractiveSearchSeason": "Interactive search for all episodes in this season",
  "Interval": "Interval",
  "InvalidFormat": "Invalid Format",
+ "InvalidUILanguage": "Your UI is set to an invalid language, correct it and save your settings",
  "KeyboardShortcuts": "Keyboard Shortcuts",
  "KeyboardShortcutsCloseModal": "Close Current Modal",
  "KeyboardShortcutsConfirmModal": "Accept Confirmation Modal",

diff --git a/src/NzbDrone.Core/Localization/LocalizationService.cs b/src/NzbDrone.Core/Localization/LocalizationService.cs
@@ -87,7 +87,7 @@ public string GetLocalizedString(string phrase, string language)
 
  public string GetLanguageIdentifier()
  {
- var isoLanguage = IsoLanguages.Get((Language)_configService.UILanguage);
+ var isoLanguage = IsoLanguages.Get((Language)_configService.UILanguage) ?? IsoLanguages.Get(Language.English);
  var language = isoLanguage.TwoLetterCode;
 
  if (isoLanguage.CountryCode.IsNotNullOrWhiteSpace())

diff --git a/src/Sonarr.Api.V3/Config/UiConfigController.cs b/src/Sonarr.Api.V3/Config/UiConfigController.cs
@@ -1,7 +1,9 @@
 using System.Linq;
 using System.Reflection;
+using FluentValidation;
 using Microsoft.AspNetCore.Mvc;
 using NzbDrone.Core.Configuration;
+using NzbDrone.Core.Languages;
 using Sonarr.Http;
 using Sonarr.Http.REST.Attributes;
 
@@ -16,6 +18,17 @@ public UiConfigController(IConfigFileProvider configFileProvider, IConfigService
  : base(configService)
  {
  _configFileProvider = configFileProvider;
+ SharedValidator.RuleFor(c => c.UILanguage).Custom((value, context) =>
+ {
+ if (!Language.All.Any(o => o.Id == value))
+ {
+ context.AddFailure("Invalid UI Language value");
+ }
+ });
+
+ SharedValidator.RuleFor(c => c.UILanguage)
+ .GreaterThanOrEqualTo(1)
+ .WithMessage("The UI Language value cannot be less than 1");
  }
 
  [RestPutById]