Mirrors/Radarr
1
0
Fork 0
mirror of https://github.com/Radarr/Radarr.git synced 2024-11-04 10:02:40 +01:00
Code Issues Releases Wiki Activity

New: Separate UI Language into two settings for Movie Info and Main UI

Browse Source
This commit is contained in:
Qstick 2020-09-08 21:38:05 -04:00
parent 2014ff6610
commit ecbdd58f42
7 changed files with 37 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
frontend/src/Components/Page/Sidebar/PageSidebar.js
View File

@ -117,7 +117,7 @@ const links = [
to: '/settings/general'
},
{
title: translate('Ui'),
title: translate('UI'),
to: '/settings/ui'
}
]

17
frontend/src/Settings/UI/UISettings.js
View File

@ -196,17 +196,30 @@ class UISettings extends Component {
<FieldSet legend={translate('Language')}>
<FormGroup>
<FormLabel>{translate('SettingsUiLanguage')}</FormLabel>
<FormLabel>{translate('MovieInfoLanguage')}</FormLabel>
<FormInputGroup
type={inputTypes.SELECT}
name="movieInfoLanguage"
values={languages}
helpText={translate('SettingsUiLanguageHelpText')}
helpText={translate('MovieInfoLanguageHelpText')}
helpTextWarning={translate('MovieInfoLanguageHelpTextWarning')}
onChange={onInputChange}
{...settings.movieInfoLanguage}
/>
</FormGroup>
<FormGroup>
<FormLabel>{translate('UILanguage')}</FormLabel>
<FormInputGroup
type={inputTypes.SELECT}
name="uiLanguage"
values={languages}
helpText={translate('UILanguageHelpText')}
helpTextWarning={translate('UILanguageHelpTextWarning')}
onChange={onInputChange}
{...settings.uiLanguage}
/>
</FormGroup>
</FieldSet>
</Form>
}

7
src/NzbDrone.Core/Configuration/ConfigService.cs
View File

@ -386,6 +386,13 @@ public int MovieInfoLanguage
set { SetValue("MovieInfoLanguage", value); }
}
public int UILanguage
{
get { return GetValueInt("UILanguage", (int)Language.English); }
set { SetValue("UILanguage", value); }
}
public bool CleanupMetadataImages
{
get { return GetValueBoolean("CleanupMetadataImages", true); }

1
src/NzbDrone.Core/Configuration/IConfigService.cs
View File

@ -77,6 +77,7 @@ public interface IConfigService
bool ShowRelativeDates { get; set; }
bool EnableColorImpairedMode { get; set; }
int MovieInfoLanguage { get; set; }
int UILanguage { get; set; }
//Internal
bool CleanupMetadataImages { get; set; }

11
src/NzbDrone.Core/Localization/Core/en.json
View File

@ -116,12 +116,12 @@
"Crew": "Crew",
"CustomFilters": "Custom Filters",
"CustomFormatJSON": "Custom Format JSON",
"CustomFormatUnknownCondition": "Unknown Custom Format condition '{0}'",
"CustomFormatUnknownConditionOption": "Unknown option '{0}' for condition '{1}'",
"CustomFormats": "Custom Formats",
"CustomFormatScore": "Custom Format score",
"CustomFormatsSettings": "Custom Formats Settings",
"CustomFormatsSettingsSummary": "Custom Formats and Settings",
"CustomFormatUnknownCondition": "Unknown Custom Format condition '{0}'",
"CustomFormatUnknownConditionOption": "Unknown option '{0}' for condition '{1}'",
"Cutoff": "Cutoff",
"CutoffFormatScoreHelpText": "Once this custom format score is reached Radarr will no longer download movies",
"CutoffHelpText": "Once this quality is reached Radarr will no longer download movies",
@ -413,6 +413,8 @@
"MovieFolderFormat": "Movie Folder Format",
"MovieID": "Movie ID",
"MovieIndex": "Movie Index",
"MovieInfoLanguage": "Movie Info Language",
"MovieInfoLanguageHelpText": "Language that Radarr will use for Movie Information in UI",
"MovieInfoLanguageHelpTextWarning": "Browser Reload Required",
"MovieIsDownloading": "Movie is downloading",
"MovieIsDownloadingInterp": "Movie is downloading - {0}% {1}",
@ -635,8 +637,6 @@
"SettingsShowRelativeDates": "Show Relative Dates",
"SettingsShowRelativeDatesHelpText": "Show relative (Today/Yesterday/etc) or absolute dates",
"SettingsTimeFormat": "Time Format",
"SettingsUiLanguage": "UI Language",
"SettingsUiLanguageHelpText": "Language that Radarr will use for UI",
"SettingsWeekColumnHeader": "Week Column Header",
"SettingsWeekColumnHeaderHelpText": "Shown above each column when week is the active view",
"ShouldMonitorHelpText": "If enabled, movies added by this list are added and monitored",
@ -718,6 +718,9 @@
"TotalSpace": "Total Space",
"Type": "Type",
"UI": "UI",
"UILanguage": "UI Language",
"UILanguageHelpText": "Language that Radarr will use for UI",
"UILanguageHelpTextWarning": "Browser Reload Required",
"UISettings": "UI Settings",
"UISettingsSummary": "Calendar, date and color impaired options",
"UnableToAddANewConditionPleaseTryAgain": "Unable to add a new condition, please try again.",

6
src/NzbDrone.Core/Localization/LocalizationService.cs
View File

@ -45,14 +45,14 @@ public LocalizationService(IConfigService configService,
public Dictionary<string, string> GetLocalizationDictionary()
{
var language = IsoLanguages.Get((Language)_configService.MovieInfoLanguage).TwoLetterCode;
var language = IsoLanguages.Get((Language)_configService.UILanguage).TwoLetterCode;
return GetLocalizationDictionary(language);
}
public string GetLocalizedString(string phrase)
{
var language = IsoLanguages.Get((Language)_configService.MovieInfoLanguage).TwoLetterCode;
var language = IsoLanguages.Get((Language)_configService.UILanguage).TwoLetterCode;
return GetLocalizedString(phrase, language);
}
@ -66,7 +66,7 @@ public string GetLocalizedString(string phrase, string language)
if (language.IsNullOrWhiteSpace())
{
language = IsoLanguages.Get((Language)_configService.MovieInfoLanguage).TwoLetterCode;
language = IsoLanguages.Get((Language)_configService.UILanguage).TwoLetterCode;
}
if (language == null)

4
src/Radarr.Api.V3/Config/UiConfigResource.cs
View File

@ -20,6 +20,7 @@ public class UiConfigResource : RestResource
public bool EnableColorImpairedMode { get; set; }
public int MovieInfoLanguage { get; set; }
public int UILanguage { get; set; }
}
public static class UiConfigResourceMapper
@ -39,7 +40,8 @@ public static UiConfigResource ToResource(IConfigService model)
ShowRelativeDates = model.ShowRelativeDates,
EnableColorImpairedMode = model.EnableColorImpairedMode,
MovieInfoLanguage = model.MovieInfoLanguage
MovieInfoLanguage = model.MovieInfoLanguage,
UILanguage = model.UILanguage
};
}
}