Merge pull request #2621 from tidusjar/develop

Develop
Ombi-app · Oct 25, 2018 · 4f87f75 · 4f87f75
2 parents 627c145 + c4dfe90
commit 4f87f75
Show file tree

Hide file tree

Showing 8 changed files with 49 additions and 17 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,34 @@
 
 ## v3.0.3919 (2018-10-18)
 
+### **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]

diff --git 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<SearchViewModel>
     {
-        public CouchPotatoCacheRule(IRepository<CouchPotatoCache> ctx)
+        public CouchPotatoCacheRule(IExternalRepository<CouchPotatoCache> ctx)
         {
             _ctx = ctx;
         }
 
-        private readonly IRepository<CouchPotatoCache> _ctx;
+        private readonly IExternalRepository<CouchPotatoCache> _ctx;
 
         public async Task<RuleResult> Execute(SearchViewModel obj)
         {

diff --git 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<object>
     {
-        public LidarrAlbumCacheRule(IRepository<LidarrAlbumCache> db)
+        public LidarrAlbumCacheRule(IExternalRepository<LidarrAlbumCache> db)
         {
             _db = db;
         }
 
-        private readonly IRepository<LidarrAlbumCache> _db;
+        private readonly IExternalRepository<LidarrAlbumCache> _db;
 
         public Task<RuleResult> Execute(object objec)
         {

diff --git 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<object>
     {
-        public LidarrArtistCacheRule(IRepository<LidarrArtistCache> db)
+        public LidarrArtistCacheRule(IExternalRepository<LidarrArtistCache> db)
         {
             _db = db;
         }
 
-        private readonly IRepository<LidarrArtistCache> _db;
+        private readonly IExternalRepository<LidarrArtistCache> _db;
 
         public Task<RuleResult> Execute(object objec)
         {

diff --git 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<SearchViewModel>
     {
-        public RadarrCacheRule(IRepository<RadarrCache> db)
+        public RadarrCacheRule(IExternalRepository<RadarrCache> db)
         {
             _db = db;
         }
 
-        private readonly IRepository<RadarrCache> _db;
+        private readonly IExternalRepository<RadarrCache> _db;
 
         public Task<RuleResult> Execute(SearchViewModel obj)
         {

diff --git a/src/Ombi/Startup.cs b/src/Ombi/Startup.cs
@@ -207,7 +207,11 @@ public IServiceProvider ConfigureServices(IServiceCollection services)
             var jobSetup = app.ApplicationServices.GetService<IJobSetup>();
             jobSetup.Setup();
             ctx.Seed();
-
+            var settingsctx = serviceProvider.GetService<ISettingsContext>();
+            var externalctx = serviceProvider.GetService<IExternalContext>();
+            settingsctx.Seed();
+            externalctx.Seed();
+
             var provider = new FileExtensionContentTypeProvider { Mappings = { [".map"] = "application/octet-stream" } };
 
             app.UseStaticFiles(new StaticFileOptions()

diff --git a/src/Ombi/wwwroot/translations/fr.json b/src/Ombi/wwwroot/translations/fr.json
@@ -29,7 +29,7 @@
     }
   },
   "PasswordReset": {
-    "EmailAddressPlaceholder": "Adresse e-mail",
+    "EmailAddressPlaceholder": "Courriel",
     "ResetPasswordButton": "Réinitialiser le mot de passe"
   },
   "LandingPage": {
@@ -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": {

diff --git 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",