Movies now show in the specified user language

src/Ombi.Core/Engine/BaseMediaEngine.cs

@@ -162,18 +162,23 @@ namespace Ombi.Core.Engine
             }
         }
 
-        private string defaultLangCode;
         protected async Task<string> DefaultLanguageCode(string currentCode)
         {
             if (currentCode.HasValue())
             {
                 return currentCode;
             }
+            var user = await GetUser();
 
+            if (string.IsNullOrEmpty(user.Language))
+            {
                 var s = await GetOmbiSettings();
                 return s.DefaultLanguageCode;
             }
 
+            return user.Language;
+        }
+
         private OmbiSettings ombiSettings;
         protected async Task<OmbiSettings> GetOmbiSettings()
         {

src/Ombi.Core/Engine/V2/IMultiSearchEngine.cs

@@ -8,6 +8,6 @@ namespace Ombi.Core.Engine.V2
 {
     public interface IMultiSearchEngine
     {
-        Task<List<MultiSearchResult>> MultiSearch(string searchTerm, CancellationToken cancellationToken, string lang = "en");
+        Task<List<MultiSearchResult>> MultiSearch(string searchTerm, CancellationToken cancellationToken);
     }
 }

src/Ombi.Core/Engine/V2/MultiSearchEngine.cs

@@ -36,8 +36,9 @@ namespace Ombi.Core.Engine.V2
         private readonly IMusicBrainzApi _musicApi;
 
 
-        public async Task<List<MultiSearchResult>> MultiSearch(string searchTerm, CancellationToken cancellationToken, string lang = "en")
+        public async Task<List<MultiSearchResult>> MultiSearch(string searchTerm, CancellationToken cancellationToken)
         {
+            var lang = await DefaultLanguageCode(null);
             var model = new List<MultiSearchResult>();
 
             var movieDbData = (await _movieDbApi.MultiSearch(searchTerm, lang, cancellationToken)).results;

src/Ombi.Core/Models/UI/UserViewModel.cs

@@ -13,6 +13,7 @@ namespace Ombi.Core.Models.UI
         public string EmailAddress { get; set; }
         public string Password { get; set; }
         public DateTime? LastLoggedIn { get; set; }
+        public string Language { get; set; }
         public bool HasLoggedIn { get; set; }
         public UserType UserType { get; set; }
         public int MovieRequestLimit { get; set; }

src/Ombi/ClientApp/src/app/app.component.ts

@@ -5,7 +5,7 @@ import { NavigationStart, Router } from "@angular/router";
 import { TranslateService } from "@ngx-translate/core";
 import { AuthService } from "./auth/auth.service";
 import { ILocalUser } from "./auth/IUserLogin";
-import { NotificationService, CustomPageService } from "./services";
+import { NotificationService, CustomPageService, IdentityService } from "./services";
 import { SettingsService } from "./services";
 import { MatSnackBar } from '@angular/material/snack-bar';
 
@@ -49,21 +49,26 @@ export class AppComponent implements OnInit {
         private storage: StorageService,
         private signalrNotification: SignalRNotificationService,
         private readonly snackBar: MatSnackBar,
+        private readonly identity: IdentityService,
         @Inject(DOCUMENT) private document: HTMLDocument) {
 
         this.translate.addLangs(["en", "de", "fr", "da", "es", "it", "nl", "sk", "sv", "no", "pl", "pt"]);
 
-        const selectedLang = this.storage.get("Language");
+        if (this.authService.loggedIn()) {
+            this.identity.getUser().subscribe(u => {
+                if (u.language) {
+                    this.translate.use(u.language);
+                }
+            });
+        }
 
         // this language will be used as a fallback when a translation isn't found in the current language
         this.translate.setDefaultLang("en");
-        if (selectedLang) {
-            this.translate.use(selectedLang);
-        } else {
+
         // See if we can match the supported langs with the current browser lang
         const browserLang: string = translate.getBrowserLang();
         this.translate.use(browserLang.match(/en|fr|da|de|es|it|nl|sk|sv|no|pl|pt/) ? browserLang : "en");
-        }
+
     }
 
     public ngOnInit() {

src/Ombi/ClientApp/src/app/interfaces/IUser.ts

@@ -15,6 +15,7 @@ export interface IUser {
     episodeRequestLimit: number;
     musicRequestLimit: number;
     userAccessToken: string;
+    language: string;
     userQualityProfiles: IUserQualityProfiles;
 
     // FOR UI

src/Ombi/ClientApp/src/app/media-details/components/movie/movie-details.component.ts

@@ -9,6 +9,7 @@ import { AuthService } from "../../../auth/auth.service";
 import { IMovieRequests, RequestType, IAdvancedData } from "../../../interfaces";
 import { DenyDialogComponent } from "../shared/deny-dialog/deny-dialog.component";
 import { NewIssueComponent } from "../shared/new-issue/new-issue.component";
+import { StorageService } from "../../../shared/storage/storage-service";
 
 @Component({
     templateUrl: "./movie-details.component.html",
@@ -29,7 +30,8 @@ export class MovieDetailsComponent {
     constructor(private searchService: SearchV2Service, private route: ActivatedRoute,
         private sanitizer: DomSanitizer, private imageService: ImageService,
         public dialog: MatDialog, private requestService: RequestService,
-        public messageService: MessageService, private auth: AuthService) {
+        public messageService: MessageService, private auth: AuthService,
+        private storage: StorageService) {
         this.route.params.subscribe((params: any) => {
             debugger;
                 if (typeof params.movieDbId === 'string' || params.movieDbId instanceof String) {

src/Ombi/ClientApp/src/app/services/identity.service.ts

@@ -75,7 +75,12 @@ export class IdentityService extends ServiceHelpers {
     public getNotificationPreferences(): Observable<INotificationPreferences[]> {
         return this.http.get<INotificationPreferences[]>(`${this.url}notificationpreferences`, {headers: this.headers});
     }
+
     public getNotificationPreferencesForUser(userId: string): Observable<INotificationPreferences[]> {
         return this.http.get<INotificationPreferences[]>(`${this.url}notificationpreferences/${userId}`, {headers: this.headers});
     }
+    
+    public updateLanguage(lang: string): Observable<null> {
+        return this.http.post<any>(`${this.url}language`, {lang: lang}, {headers: this.headers});
+    }
 }

src/Ombi/ClientApp/src/app/user-preferences/components/user-preference/user-preference.component.ts

@@ -4,6 +4,7 @@ import { TranslateService } from "@ngx-translate/core";
 import { AvailableLanguages, ILanguage } from "./user-preference.constants";
 import { StorageService } from "../../../shared/storage/storage-service";
 import { IdentityService, SettingsService } from "../../../services";
+import { IUser } from "../../../interfaces";
 
 @Component({
     templateUrl: "./user-preference.component.html",
@@ -17,6 +18,8 @@ export class UserPreferenceComponent implements OnInit {
     public qrCode: string;
     public qrCodeEnabled: boolean;
 
+    private user: IUser;
+
     constructor(private authService: AuthService,
         private readonly translate: TranslateService,
         private storage: StorageService,
@@ -39,14 +42,14 @@ export class UserPreferenceComponent implements OnInit {
            this.qrCodeEnabled = true;
         }
 
-        const selectedLang = this.storage.get("Language");
-        if (selectedLang) {
-            this.selectedLang = selectedLang;
+        this.user = await this.identityService.getUser().toPromise();
+        if (this.user.language) {
+            this.selectedLang = this.user.language;
         }
     }
 
     public languageSelected() {
-        this.storage.save("Language", this.selectedLang);
+        this.identityService.updateLanguage(this.selectedLang).subscribe();
         this.translate.use(this.selectedLang);
     }
 

src/Ombi/ClientApp/src/app/usermanagement/usermanagement-user.component.ts

@@ -71,6 +71,7 @@ export class UserManagementUserComponent implements OnInit {
                 musicRequestLimit: 0,
                 episodeRequestQuota: null,
                 movieRequestQuota: null,
+                language: null,
                 userQualityProfiles: {
                     radarrQualityProfile: 0,
                     radarrRootPath: 0,

src/Ombi/Controllers/V1/IdentityController.cs

@@ -330,6 +330,7 @@ namespace Ombi.Controllers.V1
                 EpisodeRequestLimit = user.EpisodeRequestLimit ?? 0,
                 MovieRequestLimit = user.MovieRequestLimit ?? 0,
                 MusicRequestLimit = user.MusicRequestLimit ?? 0,
+                Language = user.Language
             };
 
             foreach (var role in userRoles)