mirror of
https://github.com/Ombi-app/Ombi.git
synced 2025-08-20 13:23:20 -07:00
Merge branch 'develop' into feature/2407-native-language-selector
This commit is contained in:
commit
e20f2dfc1b
4 changed files with 53 additions and 54 deletions
|
@ -129,7 +129,7 @@
|
||||||
</form>
|
</form>
|
||||||
|
|
||||||
<!--Radarr Root Folder-->
|
<!--Radarr Root Folder-->
|
||||||
<div *ngIf="radarrRootFolders" class="btn-group btn-split" id="rootFolderBtn">
|
<div *ngIf="radarrRootFolders?.length > 1" class="btn-group btn-split" id="rootFolderBtn">
|
||||||
<button type="button" class="btn btn-sm btn-warning-outline">
|
<button type="button" class="btn btn-sm btn-warning-outline">
|
||||||
<i class="fa fa-plus"></i> {{ 'Requests.ChangeRootFolder' | translate }}
|
<i class="fa fa-plus"></i> {{ 'Requests.ChangeRootFolder' | translate }}
|
||||||
</button>
|
</button>
|
||||||
|
@ -145,7 +145,7 @@
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<!--Radarr Quality Profiles -->
|
<!--Radarr Quality Profiles -->
|
||||||
<div *ngIf="radarrProfiles" class="btn-group btn-split" id="changeQualityBtn">
|
<div *ngIf="radarrProfiles?.length > 1" class="btn-group btn-split" id="changeQualityBtn">
|
||||||
<button type="button" class="btn btn-sm btn-warning-outline">
|
<button type="button" class="btn btn-sm btn-warning-outline">
|
||||||
<i class="fa fa-plus"></i> {{ 'Requests.ChangeQualityProfile' | translate }}
|
<i class="fa fa-plus"></i> {{ 'Requests.ChangeQualityProfile' | translate }}
|
||||||
</button>
|
</button>
|
||||||
|
|
|
@ -3,7 +3,6 @@ using System.Collections.Generic;
|
||||||
using System.Threading.Tasks;
|
using System.Threading.Tasks;
|
||||||
using Microsoft.AspNetCore.Authorization;
|
using Microsoft.AspNetCore.Authorization;
|
||||||
using Microsoft.AspNetCore.Mvc;
|
using Microsoft.AspNetCore.Mvc;
|
||||||
using Microsoft.Extensions.Caching.Memory;
|
|
||||||
using Ombi.Api.Radarr;
|
using Ombi.Api.Radarr;
|
||||||
using Ombi.Api.Radarr.Models;
|
using Ombi.Api.Radarr.Models;
|
||||||
using Ombi.Attributes;
|
using Ombi.Attributes;
|
||||||
|
@ -24,6 +23,7 @@ namespace Ombi.Controllers.External
|
||||||
RadarrApi = radarr;
|
RadarrApi = radarr;
|
||||||
RadarrSettings = settings;
|
RadarrSettings = settings;
|
||||||
Cache = mem;
|
Cache = mem;
|
||||||
|
RadarrSettings.ClearCache();
|
||||||
}
|
}
|
||||||
|
|
||||||
private IRadarrApi RadarrApi { get; }
|
private IRadarrApi RadarrApi { get; }
|
||||||
|
@ -59,9 +59,8 @@ namespace Ombi.Controllers.External
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <returns></returns>
|
/// <returns></returns>
|
||||||
[HttpGet("Profiles")]
|
[HttpGet("Profiles")]
|
||||||
|
[PowerUser]
|
||||||
public async Task<IEnumerable<RadarrProfile>> GetProfiles()
|
public async Task<IEnumerable<RadarrProfile>> GetProfiles()
|
||||||
{
|
|
||||||
return await Cache.GetOrAdd(CacheKeys.RadarrQualityProfiles, async () =>
|
|
||||||
{
|
{
|
||||||
var settings = await RadarrSettings.GetSettingsAsync();
|
var settings = await RadarrSettings.GetSettingsAsync();
|
||||||
if (settings.Enabled)
|
if (settings.Enabled)
|
||||||
|
@ -69,7 +68,6 @@ namespace Ombi.Controllers.External
|
||||||
return await RadarrApi.GetProfiles(settings.ApiKey, settings.FullUri);
|
return await RadarrApi.GetProfiles(settings.ApiKey, settings.FullUri);
|
||||||
}
|
}
|
||||||
return null;
|
return null;
|
||||||
}, DateTime.Now.AddHours(1));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
|
@ -78,9 +76,8 @@ namespace Ombi.Controllers.External
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <returns></returns>
|
/// <returns></returns>
|
||||||
[HttpGet("RootFolders")]
|
[HttpGet("RootFolders")]
|
||||||
|
[PowerUser]
|
||||||
public async Task<IEnumerable<RadarrRootFolder>> GetRootFolders()
|
public async Task<IEnumerable<RadarrRootFolder>> GetRootFolders()
|
||||||
{
|
|
||||||
return await Cache.GetOrAdd(CacheKeys.RadarrRootProfiles, async () =>
|
|
||||||
{
|
{
|
||||||
var settings = await RadarrSettings.GetSettingsAsync();
|
var settings = await RadarrSettings.GetSettingsAsync();
|
||||||
if (settings.Enabled)
|
if (settings.Enabled)
|
||||||
|
@ -88,7 +85,6 @@ namespace Ombi.Controllers.External
|
||||||
return await RadarrApi.GetRootFolders(settings.ApiKey, settings.FullUri);
|
return await RadarrApi.GetRootFolders(settings.ApiKey, settings.FullUri);
|
||||||
}
|
}
|
||||||
return null;
|
return null;
|
||||||
}, DateTime.Now.AddHours(1));
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
|
@ -20,6 +20,7 @@ namespace Ombi.Controllers.External
|
||||||
{
|
{
|
||||||
SonarrApi = sonarr;
|
SonarrApi = sonarr;
|
||||||
SonarrSettings = settings;
|
SonarrSettings = settings;
|
||||||
|
SonarrSettings.ClearCache();
|
||||||
}
|
}
|
||||||
|
|
||||||
private ISonarrApi SonarrApi { get; }
|
private ISonarrApi SonarrApi { get; }
|
||||||
|
@ -54,6 +55,7 @@ namespace Ombi.Controllers.External
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <returns></returns>
|
/// <returns></returns>
|
||||||
[HttpGet("Profiles")]
|
[HttpGet("Profiles")]
|
||||||
|
[PowerUser]
|
||||||
public async Task<IEnumerable<SonarrProfile>> GetProfiles()
|
public async Task<IEnumerable<SonarrProfile>> GetProfiles()
|
||||||
{
|
{
|
||||||
var settings = await SonarrSettings.GetSettingsAsync();
|
var settings = await SonarrSettings.GetSettingsAsync();
|
||||||
|
@ -69,6 +71,7 @@ namespace Ombi.Controllers.External
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <returns></returns>
|
/// <returns></returns>
|
||||||
[HttpGet("RootFolders")]
|
[HttpGet("RootFolders")]
|
||||||
|
[PowerUser]
|
||||||
public async Task<IEnumerable<SonarrRootFolder>> GetRootFolders()
|
public async Task<IEnumerable<SonarrRootFolder>> GetRootFolders()
|
||||||
{
|
{
|
||||||
var settings = await SonarrSettings.GetSettingsAsync();
|
var settings = await SonarrSettings.GetSettingsAsync();
|
||||||
|
|
|
@ -12,8 +12,8 @@
|
||||||
"Common": {
|
"Common": {
|
||||||
"ContinueButton": "Fortsæt",
|
"ContinueButton": "Fortsæt",
|
||||||
"Available": "Tilgængelig",
|
"Available": "Tilgængelig",
|
||||||
"PartiallyAvailable": "Partially Available",
|
"PartiallyAvailable": "Delvist tilgængelig",
|
||||||
"Monitored": "Monitored",
|
"Monitored": "Overvåget",
|
||||||
"NotAvailable": "Ikke tilgængelig",
|
"NotAvailable": "Ikke tilgængelig",
|
||||||
"ProcessingRequest": "Behandler anmodning",
|
"ProcessingRequest": "Behandler anmodning",
|
||||||
"PendingApproval": "Afventer godkendelse",
|
"PendingApproval": "Afventer godkendelse",
|
||||||
|
@ -48,7 +48,7 @@
|
||||||
"Requests": "Anmodninger",
|
"Requests": "Anmodninger",
|
||||||
"UserManagement": "Brugeradministration",
|
"UserManagement": "Brugeradministration",
|
||||||
"Issues": "Problemer",
|
"Issues": "Problemer",
|
||||||
"Vote": "Vote",
|
"Vote": "Stem",
|
||||||
"Donate": "Donér!",
|
"Donate": "Donér!",
|
||||||
"DonateLibraryMaintainer": "Donér til vedligeholder af bibliotek",
|
"DonateLibraryMaintainer": "Donér til vedligeholder af bibliotek",
|
||||||
"DonateTooltip": "Sådan overbeviser jeg min kone om, at jeg skal bruge min fritid på at udvikle Ombi :)",
|
"DonateTooltip": "Sådan overbeviser jeg min kone om, at jeg skal bruge min fritid på at udvikle Ombi :)",
|
||||||
|
@ -58,22 +58,22 @@
|
||||||
"UpdateDetails": "Opdater loginoplysninger",
|
"UpdateDetails": "Opdater loginoplysninger",
|
||||||
"Logout": "Log af",
|
"Logout": "Log af",
|
||||||
"OpenMobileApp": "Åbn mobilapp",
|
"OpenMobileApp": "Åbn mobilapp",
|
||||||
"RecentlyAdded": "Recently Added"
|
"RecentlyAdded": "Senest tilføjet"
|
||||||
},
|
},
|
||||||
"Search": {
|
"Search": {
|
||||||
"Title": "Søg",
|
"Title": "Søg",
|
||||||
"Paragraph": "Ønsker du at se noget, som er utilgængeligt? intet problem, bare søg efter det nedenfor og anmod om det!",
|
"Paragraph": "Ønsker du at se noget, som er utilgængeligt? intet problem, bare søg efter det nedenfor og anmod om det!",
|
||||||
"MoviesTab": "Film",
|
"MoviesTab": "Film",
|
||||||
"TvTab": "Tv-serier",
|
"TvTab": "Tv-serier",
|
||||||
"MusicTab": "Music",
|
"MusicTab": "Musik",
|
||||||
"Suggestions": "Forslag",
|
"Suggestions": "Forslag",
|
||||||
"NoResults": "Beklager, vi fandt ingen resultater!",
|
"NoResults": "Beklager, vi fandt ingen resultater!",
|
||||||
"DigitalDate": "Digital Release: {{date}}",
|
"DigitalDate": "Digital udgivelse: {{date}}",
|
||||||
"TheatricalRelease": "Theatrical Release: {{date}}",
|
"TheatricalRelease": "Biografudgivelse: {{date}}",
|
||||||
"ViewOnPlex": "Se på Plex",
|
"ViewOnPlex": "Se på Plex",
|
||||||
"ViewOnEmby": "Se på Emby",
|
"ViewOnEmby": "Se på Emby",
|
||||||
"RequestAdded": "{{title}} er anmodet med succes",
|
"RequestAdded": "{{title}} er anmodet med succes",
|
||||||
"Similar": "Similar",
|
"Similar": "Lignende",
|
||||||
"Movies": {
|
"Movies": {
|
||||||
"PopularMovies": "Populære film",
|
"PopularMovies": "Populære film",
|
||||||
"UpcomingMovies": "Kommende film",
|
"UpcomingMovies": "Kommende film",
|
||||||
|
@ -103,15 +103,15 @@
|
||||||
"Paragraph": "Herunder kan du se dine og alle andre anmodninger, samt status for download og godkendelse.",
|
"Paragraph": "Herunder kan du se dine og alle andre anmodninger, samt status for download og godkendelse.",
|
||||||
"MoviesTab": "Film",
|
"MoviesTab": "Film",
|
||||||
"TvTab": "Tv-serier",
|
"TvTab": "Tv-serier",
|
||||||
"MusicTab": "Music",
|
"MusicTab": "Musik",
|
||||||
"RequestedBy": "Anmodet af:",
|
"RequestedBy": "Anmodet af:",
|
||||||
"Status": "Status:",
|
"Status": "Status:",
|
||||||
"RequestStatus": "Status for anmodning:",
|
"RequestStatus": "Status for anmodning:",
|
||||||
"Denied": " Afvist:",
|
"Denied": " Afvist:",
|
||||||
"TheatricalRelease": "Theatrical Release: {{date}}",
|
"TheatricalRelease": "Biografudgivelse: {{date}}",
|
||||||
"ReleaseDate": "Released: {{date}}",
|
"ReleaseDate": "Udgivet: {{date}}",
|
||||||
"TheatricalReleaseSort": "Theatrical Release",
|
"TheatricalReleaseSort": "Biografudgivelse",
|
||||||
"DigitalRelease": "Digital Release: {{date}}",
|
"DigitalRelease": "Digital udgivelse: {{date}}",
|
||||||
"RequestDate": "Dato for anmodning:",
|
"RequestDate": "Dato for anmodning:",
|
||||||
"QualityOverride": "Tilsidesæt kvalitet:",
|
"QualityOverride": "Tilsidesæt kvalitet:",
|
||||||
"RootFolderOverride": "Tilsidesæt rodmappe:",
|
"RootFolderOverride": "Tilsidesæt rodmappe:",
|
||||||
|
@ -127,20 +127,20 @@
|
||||||
"GridStatus": "Status",
|
"GridStatus": "Status",
|
||||||
"ReportIssue": "Rapportér problem",
|
"ReportIssue": "Rapportér problem",
|
||||||
"Filter": "Filter",
|
"Filter": "Filter",
|
||||||
"Sort": "Sort",
|
"Sort": "Sorter",
|
||||||
"SeasonNumberHeading": "Sæson: {seasonNumber}",
|
"SeasonNumberHeading": "Sæson: {seasonNumber}",
|
||||||
"SortTitleAsc": "Title ▲",
|
"SortTitleAsc": "Titel ▲",
|
||||||
"SortTitleDesc": "Title ▼",
|
"SortTitleDesc": "Titel ▼",
|
||||||
"SortRequestDateAsc": "Request Date ▲",
|
"SortRequestDateAsc": "Dato for anmodning ▲",
|
||||||
"SortRequestDateDesc": "Request Date ▼",
|
"SortRequestDateDesc": "Dato for anmodning ▼",
|
||||||
"SortStatusAsc": "Status ▲",
|
"SortStatusAsc": "Status ▲",
|
||||||
"SortStatusDesc": "Status ▼",
|
"SortStatusDesc": "Status ▼",
|
||||||
"Remaining": {
|
"Remaining": {
|
||||||
"Quota": "{{remaining}}/{{total}} requests remaining",
|
"Quota": "{{remaining}}/{{total}} anmodninger, der er tilbage",
|
||||||
"NextDays": "Another request will be added in {{time}} days",
|
"NextDays": "En anden anmodning vil blive tilføjet i {{time}} Dage",
|
||||||
"NextHours": "Another request will be added in {{time}} hours",
|
"NextHours": "En anden anmodning vil blive tilføjet i {{time}} Timer",
|
||||||
"NextMinutes": "Another request will be added in {{time}} minutes",
|
"NextMinutes": "En anden anmodning vil blive tilføjet i {{time}} Minutter",
|
||||||
"NextMinute": "Another request will be added in {{time}} minute"
|
"NextMinute": "En anden anmodning vil blive tilføjet i {{time}} Minut"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"Issues": {
|
"Issues": {
|
||||||
|
@ -167,18 +167,18 @@
|
||||||
"FilterHeaderAvailability": "Tilgængelighed",
|
"FilterHeaderAvailability": "Tilgængelighed",
|
||||||
"FilterHeaderRequestStatus": "Status",
|
"FilterHeaderRequestStatus": "Status",
|
||||||
"Approved": "Godkendt",
|
"Approved": "Godkendt",
|
||||||
"PendingApproval": "Pending Approval"
|
"PendingApproval": "Afventer godkendelse"
|
||||||
},
|
},
|
||||||
"UserManagment": {
|
"UserManagment": {
|
||||||
"TvRemaining": "TV: {{remaining}}/{{total}} remaining",
|
"TvRemaining": "Tv: {{remaining}}/{{total}} Resterende",
|
||||||
"MovieRemaining": "Movies: {{remaining}}/{{total}} remaining",
|
"MovieRemaining": "Film: {{remaining}}/{{total}} Resterende",
|
||||||
"MusicRemaining": "Music: {{remaining}}/{{total}} remaining",
|
"MusicRemaining": "Musik: {{remaining}}/{{total}} Resterende",
|
||||||
"TvDue": "TV: {{date}}",
|
"TvDue": "Tv: {{date}}",
|
||||||
"MovieDue": "Movie: {{date}}",
|
"MovieDue": "Film: {{date}}",
|
||||||
"MusicDue": "Music: {{date}}"
|
"MusicDue": "Musik: {{date}}"
|
||||||
},
|
},
|
||||||
"Votes": {
|
"Votes": {
|
||||||
"CompletedVotesTab": "Voted",
|
"CompletedVotesTab": "Stemt",
|
||||||
"VotesTab": "Votes Needed"
|
"VotesTab": "Nødvendige stemmer"
|
||||||
}
|
}
|
||||||
}
|
}
|
Loading…
Add table
Add a link
Reference in a new issue