From 720adca89666d60466a26149338c70749630a32a Mon Sep 17 00:00:00 2001 From: Jamie Date: Sat, 20 Oct 2018 15:49:01 +0100 Subject: [PATCH 1/7] Fixed #2514 --- src/Ombi.Core/Rule/Rules/Search/CouchPotatoCacheRule.cs | 4 ++-- src/Ombi.Core/Rule/Rules/Search/LidarrAlbumCacheRule.cs | 4 ++-- src/Ombi.Core/Rule/Rules/Search/LidarrArtistCacheRule.cs | 4 ++-- src/Ombi.Core/Rule/Rules/Search/RadarrCacheRule.cs | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/Ombi.Core/Rule/Rules/Search/CouchPotatoCacheRule.cs b/src/Ombi.Core/Rule/Rules/Search/CouchPotatoCacheRule.cs index a6deb95d2..277266b91 100644 --- a/src/Ombi.Core/Rule/Rules/Search/CouchPotatoCacheRule.cs +++ b/src/Ombi.Core/Rule/Rules/Search/CouchPotatoCacheRule.cs @@ -11,12 +11,12 @@ namespace Ombi.Core.Rule.Rules.Search { public class CouchPotatoCacheRule : BaseSearchRule, IRules { - public CouchPotatoCacheRule(IRepository ctx) + public CouchPotatoCacheRule(IExternalRepository ctx) { _ctx = ctx; } - private readonly IRepository _ctx; + private readonly IExternalRepository _ctx; public async Task Execute(SearchViewModel obj) { diff --git a/src/Ombi.Core/Rule/Rules/Search/LidarrAlbumCacheRule.cs b/src/Ombi.Core/Rule/Rules/Search/LidarrAlbumCacheRule.cs index 97a27d47f..fe28c3acf 100644 --- a/src/Ombi.Core/Rule/Rules/Search/LidarrAlbumCacheRule.cs +++ b/src/Ombi.Core/Rule/Rules/Search/LidarrAlbumCacheRule.cs @@ -10,12 +10,12 @@ namespace Ombi.Core.Rule.Rules.Search { public class LidarrAlbumCacheRule : SpecificRule, ISpecificRule { - public LidarrAlbumCacheRule(IRepository db) + public LidarrAlbumCacheRule(IExternalRepository db) { _db = db; } - private readonly IRepository _db; + private readonly IExternalRepository _db; public Task Execute(object objec) { diff --git a/src/Ombi.Core/Rule/Rules/Search/LidarrArtistCacheRule.cs b/src/Ombi.Core/Rule/Rules/Search/LidarrArtistCacheRule.cs index db472a951..d9667d66b 100644 --- a/src/Ombi.Core/Rule/Rules/Search/LidarrArtistCacheRule.cs +++ b/src/Ombi.Core/Rule/Rules/Search/LidarrArtistCacheRule.cs @@ -10,12 +10,12 @@ namespace Ombi.Core.Rule.Rules.Search { public class LidarrArtistCacheRule : SpecificRule, ISpecificRule { - public LidarrArtistCacheRule(IRepository db) + public LidarrArtistCacheRule(IExternalRepository db) { _db = db; } - private readonly IRepository _db; + private readonly IExternalRepository _db; public Task Execute(object objec) { diff --git a/src/Ombi.Core/Rule/Rules/Search/RadarrCacheRule.cs b/src/Ombi.Core/Rule/Rules/Search/RadarrCacheRule.cs index ae3cb4782..105681c82 100644 --- a/src/Ombi.Core/Rule/Rules/Search/RadarrCacheRule.cs +++ b/src/Ombi.Core/Rule/Rules/Search/RadarrCacheRule.cs @@ -9,12 +9,12 @@ namespace Ombi.Core.Rule.Rules.Search { public class RadarrCacheRule : BaseSearchRule, IRules { - public RadarrCacheRule(IRepository db) + public RadarrCacheRule(IExternalRepository db) { _db = db; } - private readonly IRepository _db; + private readonly IExternalRepository _db; public Task Execute(SearchViewModel obj) { From be180e67909a5fe44bd4d1e03da6b8c0223e84f9 Mon Sep 17 00:00:00 2001 From: Jamie Date: Wed, 24 Oct 2018 09:41:41 +0100 Subject: [PATCH 2/7] New translations en.json (Dutch) --- src/Ombi/wwwroot/translations/nl.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/Ombi/wwwroot/translations/nl.json b/src/Ombi/wwwroot/translations/nl.json index 24ce67966..624650620 100644 --- a/src/Ombi/wwwroot/translations/nl.json +++ b/src/Ombi/wwwroot/translations/nl.json @@ -65,7 +65,7 @@ "Paragraph": "Wil je iets kijken dat momenteel niet beschikbaar is? Geen probleem, zoek het hieronder op en vraag het aan!", "MoviesTab": "Films", "TvTab": "TV Series", - "MusicTab": "Music", + "MusicTab": "Muziek", "Suggestions": "Suggesties", "NoResults": "Sorry, we hebben geen resultaten gevonden!", "DigitalDate": "Digital Release: {{date}}", @@ -103,7 +103,7 @@ "Paragraph": "Hieronder zie je jouw en alle andere verzoeken, evenals hun download en goedkeuring status.", "MoviesTab": "Films", "TvTab": "TV Series", - "MusicTab": "Music", + "MusicTab": "Muziek", "RequestedBy": "Verzocht Door:", "Status": "Status:", "RequestStatus": "Aanvraagstatus:", @@ -129,8 +129,8 @@ "Filter": "Filter", "Sort": "Sort", "SeasonNumberHeading": "Seizoen: {seasonNumber}", - "SortTitleAsc": "Title ▲", - "SortTitleDesc": "Title ▼", + "SortTitleAsc": "Titel ▲", + "SortTitleDesc": "Titel ▼", "SortRequestDateAsc": "Request Date ▲", "SortRequestDateDesc": "Request Date ▼", "SortStatusAsc": "Status ▲", @@ -174,8 +174,8 @@ "MovieRemaining": "Movies: {{remaining}}/{{total}} remaining", "MusicRemaining": "Music: {{remaining}}/{{total}} remaining", "TvDue": "TV: {{date}}", - "MovieDue": "Movie: {{date}}", - "MusicDue": "Music: {{date}}" + "MovieDue": "Film: {{date}}", + "MusicDue": "Muziek: {{date}}" }, "Votes": { "CompletedVotesTab": "Voted", From e7a776640b877180f0d965797ad151f1c860ecfc Mon Sep 17 00:00:00 2001 From: Jamie Date: Wed, 24 Oct 2018 19:26:44 +0100 Subject: [PATCH 3/7] Fixed the issue with mobile notifications --- src/Ombi/Startup.cs | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/Ombi/Startup.cs b/src/Ombi/Startup.cs index cad5da907..7e3f48c8f 100644 --- a/src/Ombi/Startup.cs +++ b/src/Ombi/Startup.cs @@ -207,7 +207,11 @@ public IServiceProvider ConfigureServices(IServiceCollection services) var jobSetup = app.ApplicationServices.GetService(); jobSetup.Setup(); ctx.Seed(); - + var settingsctx = serviceProvider.GetService(); + var externalctx = serviceProvider.GetService(); + settingsctx.Seed(); + externalctx.Seed(); + var provider = new FileExtensionContentTypeProvider { Mappings = { [".map"] = "application/octet-stream" } }; app.UseStaticFiles(new StaticFileOptions() From 7d44cc579fa92893cf310d2b2d32aa5240e8cf6e Mon Sep 17 00:00:00 2001 From: Jamie Date: Thu, 25 Oct 2018 13:51:06 +0100 Subject: [PATCH 4/7] New translations en.json (French) --- src/Ombi/wwwroot/translations/fr.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Ombi/wwwroot/translations/fr.json b/src/Ombi/wwwroot/translations/fr.json index 013dc9865..c1f7c3c77 100644 --- a/src/Ombi/wwwroot/translations/fr.json +++ b/src/Ombi/wwwroot/translations/fr.json @@ -45,7 +45,7 @@ }, "NavigationBar": { "Search": "Rechercher", - "Requests": "Demandes", + "Requests": "Requêtes", "UserManagement": "Gestion des utilisateurs", "Issues": "Problèmes", "Vote": "Vote", @@ -79,7 +79,7 @@ "UpcomingMovies": "Films à venir", "TopRatedMovies": "Films les mieux notés", "NowPlayingMovies": "Films à l'affiche", - "HomePage": "Site du film", + "HomePage": "Accueil", "Trailer": "Bande-annonce" }, "TvShows": { @@ -93,7 +93,7 @@ "FirstSeason": "Première saison", "LatestSeason": "Dernière saison", "Select": "Sélectionner...", - "SubmitRequest": "Envoyer la demande", + "SubmitRequest": "Envoyer la requête", "Season": "Saison: {{seasonNumber}}", "SelectAllInSeason": "Tout sélectionner dans la saison {{seasonNumber}}" } From 3090a8cb5faa1c21b35711b5eec64aa9d9e83873 Mon Sep 17 00:00:00 2001 From: Jamie Date: Thu, 25 Oct 2018 14:00:46 +0100 Subject: [PATCH 5/7] New translations en.json (French) --- src/Ombi/wwwroot/translations/fr.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Ombi/wwwroot/translations/fr.json b/src/Ombi/wwwroot/translations/fr.json index c1f7c3c77..6c045f1bf 100644 --- a/src/Ombi/wwwroot/translations/fr.json +++ b/src/Ombi/wwwroot/translations/fr.json @@ -17,7 +17,7 @@ "NotAvailable": "Non disponible", "ProcessingRequest": "En cours de traitement", "PendingApproval": "En attente d'approbation", - "RequestDenied": "Demande refusée", + "RequestDenied": "Requête refusée", "NotRequested": "Non demandé", "Requested": "Demandé", "Request": "Demander", @@ -29,7 +29,7 @@ } }, "PasswordReset": { - "EmailAddressPlaceholder": "Adresse e-mail", + "EmailAddressPlaceholder": "Courriel", "ResetPasswordButton": "Réinitialiser le mot de passe" }, "LandingPage": { @@ -72,7 +72,7 @@ "TheatricalRelease": "Sortie en salle: {{date}}", "ViewOnPlex": "Regarder sur Plex", "ViewOnEmby": "Regarder sur Emby", - "RequestAdded": "La demande pour {{title}} a été ajoutée avec succès", + "RequestAdded": "La requête pour {{title}} a été ajoutée avec succès", "Similar": "Similaires", "Movies": { "PopularMovies": "Films populaires", @@ -99,7 +99,7 @@ } }, "Requests": { - "Title": "Demandes", + "Title": "Requêtes", "Paragraph": "Vous pouvez voir ci-dessous vos demandes et celles des autres, ainsi que leur statut de téléchargement et d'approbation.", "MoviesTab": "Films", "TvTab": "Émissions", From 0d7e28562b4147ccaa9fe9803ad1bb13390a6fd5 Mon Sep 17 00:00:00 2001 From: Jamie Date: Thu, 25 Oct 2018 14:07:49 +0100 Subject: [PATCH 6/7] New translations en.json (French) --- src/Ombi/wwwroot/translations/fr.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/Ombi/wwwroot/translations/fr.json b/src/Ombi/wwwroot/translations/fr.json index 6c045f1bf..2706afbfb 100644 --- a/src/Ombi/wwwroot/translations/fr.json +++ b/src/Ombi/wwwroot/translations/fr.json @@ -17,7 +17,7 @@ "NotAvailable": "Non disponible", "ProcessingRequest": "En cours de traitement", "PendingApproval": "En attente d'approbation", - "RequestDenied": "Requête refusée", + "RequestDenied": "Demande refusée", "NotRequested": "Non demandé", "Requested": "Demandé", "Request": "Demander", @@ -45,7 +45,7 @@ }, "NavigationBar": { "Search": "Rechercher", - "Requests": "Requêtes", + "Requests": "Demandes", "UserManagement": "Gestion des utilisateurs", "Issues": "Problèmes", "Vote": "Vote", @@ -72,7 +72,7 @@ "TheatricalRelease": "Sortie en salle: {{date}}", "ViewOnPlex": "Regarder sur Plex", "ViewOnEmby": "Regarder sur Emby", - "RequestAdded": "La requête pour {{title}} a été ajoutée avec succès", + "RequestAdded": "La demande pour {{title}} a été ajoutée avec succès", "Similar": "Similaires", "Movies": { "PopularMovies": "Films populaires", @@ -93,13 +93,13 @@ "FirstSeason": "Première saison", "LatestSeason": "Dernière saison", "Select": "Sélectionner...", - "SubmitRequest": "Envoyer la requête", + "SubmitRequest": "Envoyer la demande", "Season": "Saison: {{seasonNumber}}", "SelectAllInSeason": "Tout sélectionner dans la saison {{seasonNumber}}" } }, "Requests": { - "Title": "Requêtes", + "Title": "Demandes", "Paragraph": "Vous pouvez voir ci-dessous vos demandes et celles des autres, ainsi que leur statut de téléchargement et d'approbation.", "MoviesTab": "Films", "TvTab": "Émissions", From c4dfe9097c2465432905203da32b2f620680bcca Mon Sep 17 00:00:00 2001 From: TidusJar Date: Thu, 25 Oct 2018 20:38:09 +0100 Subject: [PATCH 7/7] !wip changelog --- CHANGELOG.md | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1f3cafffb..a9fdea5a0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,34 @@ ## (unreleased) +### **Fixes** + +- New translations en.json (French) [Jamie] + +- New translations en.json (French) [Jamie] + +- New translations en.json (French) [Jamie] + +- New translations en.json (Dutch) [Jamie] + +- Fixed the issue with mobile notifications. [Jamie] + +- Fixed #2514. [Jamie] + + +## v3.0.3923 (2018-10-19) + +### **New Features** + +- Update CHANGELOG.md. [Jamie] + +### **Fixes** + +- Fixed #2601. [Jamie] + + +## v3.0.3919 (2018-10-17) + ### **New Features** - Added automation tests for the voting feature. [TidusJar]