diff --git a/src/NzbDrone.Core/ImportLists/Trakt/Popular/TraktPopularSettings.cs b/src/NzbDrone.Core/ImportLists/Trakt/Popular/TraktPopularSettings.cs index 7c40539f71..8db66429fd 100644 --- a/src/NzbDrone.Core/ImportLists/Trakt/Popular/TraktPopularSettings.cs +++ b/src/NzbDrone.Core/ImportLists/Trakt/Popular/TraktPopularSettings.cs @@ -45,21 +45,24 @@ public TraktPopularSettings() Years = ""; } - [FieldDefinition(1, Label = "List Type", Type = FieldType.Select, SelectOptions = typeof(TraktPopularListType), HelpText = "Type of list you're seeking to import from")] + [FieldDefinition(1, Label = "ImportListsTraktSettingsListType", Type = FieldType.Select, SelectOptions = typeof(TraktPopularListType), HelpText = "ImportListsTraktSettingsListTypeHelpText")] public int TraktListType { get; set; } - [FieldDefinition(2, Label = "Rating", HelpText = "Filter movies by rating range (0-100)")] + [FieldDefinition(2, Label = "ImportListsTraktSettingsRating", HelpText = "ImportListsTraktSettingsRatingMovieHelpText")] public string Rating { get; set; } - [FieldDefinition(3, Label = "Certification", HelpText = "Filter movies by a certification (NR,G,PG,PG-13,R,NC-17), (Comma Separated)")] + [FieldDefinition(3, Label = "ImportListsTraktSettingsCertification", HelpText = "ImportListsTraktSettingsCertificationMovieHelpText")] public string Certification { get; set; } - [FieldDefinition(4, Label = "Genres", HelpText = "Filter movies by Trakt Genre Slug (Comma Separated) Only for Popular Lists")] + [FieldDefinition(4, Label = "ImportListsTraktSettingsGenres", HelpText = "ImportListsTraktSettingsGenresMovieHelpText")] public string Genres { get; set; } - [FieldDefinition(5, Label = "Years", HelpText = "Filter movies by year or year range")] + [FieldDefinition(5, Label = "ImportListsTraktSettingsYears", HelpText = "ImportListsTraktSettingsYearsMovieHelpText")] public string Years { get; set; } + [FieldDefinition(6, Label = "ImportListsTraktSettingsAdditionalParameters", HelpText = "ImportListsTraktSettingsAdditionalParametersHelpText", Advanced = true)] + public string TraktAdditionalParameters { get; set; } + public override NzbDroneValidationResult Validate() { return new NzbDroneValidationResult(Validator.Validate(this)); diff --git a/src/NzbDrone.Core/ImportLists/Trakt/TraktSettingsBase.cs b/src/NzbDrone.Core/ImportLists/Trakt/TraktSettingsBase.cs index c9d9bc4670..50cc2d7bd1 100644 --- a/src/NzbDrone.Core/ImportLists/Trakt/TraktSettingsBase.cs +++ b/src/NzbDrone.Core/ImportLists/Trakt/TraktSettingsBase.cs @@ -46,7 +46,6 @@ public TraktSettingsBase() } public string Link => "https://api.trakt.tv"; - public virtual string Scope => ""; [FieldDefinition(0, Label = "Access Token", Type = FieldType.Textbox, Hidden = HiddenType.Hidden)] public string AccessToken { get; set; } @@ -60,13 +59,10 @@ public TraktSettingsBase() [FieldDefinition(0, Label = "Auth User", Type = FieldType.Textbox, Hidden = HiddenType.Hidden)] public string AuthUser { get; set; } - [FieldDefinition(5, Label = "Limit", HelpText = "Limit the number of movies to get")] + [FieldDefinition(98, Label = "ImportListsTraktSettingsLimit", HelpText = "ImportListsTraktSettingsLimitMovieHelpText")] public int Limit { get; set; } - [FieldDefinition(6, Label = "Additional Parameters", HelpText = "Additional Trakt API parameters", Advanced = true)] - public string TraktAdditionalParameters { get; set; } - - [FieldDefinition(99, Label = "Authenticate with Trakt", Type = FieldType.OAuth)] + [FieldDefinition(99, Label = "ImportListsTraktSettingsAuthenticateWithTrakt", Type = FieldType.OAuth)] public string SignIn { get; set; } public override NzbDroneValidationResult Validate() diff --git a/src/NzbDrone.Core/Localization/Core/en.json b/src/NzbDrone.Core/Localization/Core/en.json index becd8996d3..27eb57fd16 100644 --- a/src/NzbDrone.Core/Localization/Core/en.json +++ b/src/NzbDrone.Core/Localization/Core/en.json @@ -767,6 +767,21 @@ "ImportLists": "Import Lists", "ImportListsLoadError": "Unable to load Import Lists", "ImportListsSettingsSummary": "Import from another {appName} instance or Trakt lists and manage list exclusions", + "ImportListsTraktSettingsAdditionalParameters": "Additional Parameters", + "ImportListsTraktSettingsAdditionalParametersHelpText": "Additional Trakt API parameters", + "ImportListsTraktSettingsAuthenticateWithTrakt": "Authenticate with Trakt", + "ImportListsTraktSettingsCertification": "Certification", + "ImportListsTraktSettingsCertificationMovieHelpText": "Filter movies by a certification (NR,G,PG,PG-13,R,NC-17) (Comma Separated)", + "ImportListsTraktSettingsGenres": "Genres", + "ImportListsTraktSettingsGenresMovieHelpText": "Filter movies by Trakt Genre Slug (Comma Separated) Only for Popular Lists", + "ImportListsTraktSettingsLimit": "Limit", + "ImportListsTraktSettingsLimitMovieHelpText": "Limit the number of movies to get", + "ImportListsTraktSettingsListType": "List Type", + "ImportListsTraktSettingsListTypeHelpText": "Type of list you're seeking to import from", + "ImportListsTraktSettingsRating": "Rating", + "ImportListsTraktSettingsRatingMovieHelpText": "Filter movies by rating range (0-100)", + "ImportListsTraktSettingsYears": "Years", + "ImportListsTraktSettingsYearsMovieHelpText": "Filter movies by year or year range", "ImportMechanismHealthCheckMessage": "Enable Completed Download Handling", "ImportMovies": "Import Movies", "ImportNotForDownloads": "Do not use for importing downloads from your download client, this is only for existing organized libraries, not unsorted files.",