diff --git a/src/Ombi/ClientApp/src/app/search/moviesearch.component.html b/src/Ombi/ClientApp/src/app/search/moviesearch.component.html
index f6a27677f..77702a6d5 100644
--- a/src/Ombi/ClientApp/src/app/search/moviesearch.component.html
+++ b/src/Ombi/ClientApp/src/app/search/moviesearch.component.html
@@ -103,7 +103,7 @@
amDateFormat: 'LL'} }}
+ amLocal | amUserLocale | amDateFormat: 'LL'} }}
From abf0ddf74a9ad5f10951732b2aec160ed942a46c Mon Sep 17 00:00:00 2001
From: Florian Dupret <34862846+sephrat@users.noreply.github.com>
Date: Tue, 19 Oct 2021 13:49:27 +0200
Subject: [PATCH 06/11] Refactor status translation into a dedicated pipe
---
.../movie-information-panel.component.html | 2 +-
.../movie-information-panel.component.ts | 14 +-------------
.../tv-information-panel.component.html | 2 +-
.../tv-information-panel.component.ts | 14 +-------------
.../src/app/pipes/TranslateStatus.ts | 19 +++++++++++++++++++
.../ClientApp/src/app/pipes/pipe.module.ts | 5 +++--
.../movies-grid/movies-grid.component.html | 2 +-
.../components/tv-grid/tv-grid.component.html | 2 +-
8 files changed, 28 insertions(+), 32 deletions(-)
create mode 100644 src/Ombi/ClientApp/src/app/pipes/TranslateStatus.ts
diff --git a/src/Ombi/ClientApp/src/app/media-details/components/movie/panels/movie-information-panel.component.html b/src/Ombi/ClientApp/src/app/media-details/components/movie/panels/movie-information-panel.component.html
index 480e19ddd..50070e47e 100644
--- a/src/Ombi/ClientApp/src/app/media-details/components/movie/panels/movie-information-panel.component.html
+++ b/src/Ombi/ClientApp/src/app/media-details/components/movie/panels/movie-information-panel.component.html
@@ -27,7 +27,7 @@
{{'MediaDetails.Availability' | translate }}
diff --git a/src/Ombi/ClientApp/src/app/media-details/components/movie/panels/movie-information-panel.component.ts b/src/Ombi/ClientApp/src/app/media-details/components/movie/panels/movie-information-panel.component.ts
index 174f692de..c11a0f61c 100644
--- a/src/Ombi/ClientApp/src/app/media-details/components/movie/panels/movie-information-panel.component.ts
+++ b/src/Ombi/ClientApp/src/app/media-details/components/movie/panels/movie-information-panel.component.ts
@@ -1,5 +1,4 @@
import { Component, ViewEncapsulation, Input, OnInit, Inject } from "@angular/core";
-import { TranslateService } from "@ngx-translate/core";
import { ISearchMovieResultV2 } from "../../../../interfaces/ISearchMovieResultV2";
import { IMovieRequests } from "../../../../interfaces";
import { SearchV2Service } from "../../../../services/searchV2.service";
@@ -14,8 +13,7 @@ import { IStreamingData } from "../../../../interfaces/IStreams";
})
export class MovieInformationPanelComponent implements OnInit {
- constructor(private searchService: SearchV2Service, @Inject(APP_BASE_HREF) public internalBaseUrl: string,
- private translate: TranslateService) { }
+ constructor(private searchService: SearchV2Service, @Inject(APP_BASE_HREF) public internalBaseUrl: string) { }
@Input() public movie: ISearchMovieResultV2;
@Input() public request: IMovieRequests;
@@ -35,14 +33,4 @@ export class MovieInformationPanelComponent implements OnInit {
this.searchService.getMovieStreams(this.movie.id).subscribe(x => this.streams = x);
}
-
- public getMovieStatusLabel() {
- const textKey = 'MediaDetails.StatusValues.' + this.movie.status;
- const text = this.translate.instant(textKey);
- if (text !== textKey) {
- return text;
- } else {
- return this.movie.status;
- }
- }
}
diff --git a/src/Ombi/ClientApp/src/app/media-details/components/tv/panels/tv-information-panel/tv-information-panel.component.html b/src/Ombi/ClientApp/src/app/media-details/components/tv/panels/tv-information-panel/tv-information-panel.component.html
index ddf6fd44c..8fc23d39f 100644
--- a/src/Ombi/ClientApp/src/app/media-details/components/tv/panels/tv-information-panel/tv-information-panel.component.html
+++ b/src/Ombi/ClientApp/src/app/media-details/components/tv/panels/tv-information-panel/tv-information-panel.component.html
@@ -22,7 +22,7 @@
{{'MediaDetails.Status' | translate }}
- {{ getTVStatusLabel()}}
+ {{ this.tv.status | translateStatus }}
{{'MediaDetails.FirstAired' | translate }}
{{tv.firstAired | localizedDate: 'mediumDate'}}
diff --git a/src/Ombi/ClientApp/src/app/media-details/components/tv/panels/tv-information-panel/tv-information-panel.component.ts b/src/Ombi/ClientApp/src/app/media-details/components/tv/panels/tv-information-panel/tv-information-panel.component.ts
index 46175847f..1ee844967 100644
--- a/src/Ombi/ClientApp/src/app/media-details/components/tv/panels/tv-information-panel/tv-information-panel.component.ts
+++ b/src/Ombi/ClientApp/src/app/media-details/components/tv/panels/tv-information-panel/tv-information-panel.component.ts
@@ -1,6 +1,5 @@
import { APP_BASE_HREF } from "@angular/common";
import { Component, ViewEncapsulation, Input, OnInit, Inject } from "@angular/core";
-import { TranslateService } from "@ngx-translate/core";
import { ITvRequests } from "../../../../../interfaces";
import { ITvRatings } from "../../../../../interfaces/IRatings";
import { ISearchTvResultV2 } from "../../../../../interfaces/ISearchTvResultV2";
@@ -15,8 +14,7 @@ import { SearchV2Service } from "../../../../../services";
})
export class TvInformationPanelComponent implements OnInit {
- constructor(private searchService: SearchV2Service, @Inject(APP_BASE_HREF) public internalBaseUrl: string,
- private translate: TranslateService) { }
+ constructor(private searchService: SearchV2Service, @Inject(APP_BASE_HREF) public internalBaseUrl: string) { }
@Input() public tv: ISearchTvResultV2;
@Input() public request: ITvRequests;
@@ -46,14 +44,4 @@ export class TvInformationPanelComponent implements OnInit {
public sortBy(prop: string) {
return this.streams.sort((a, b) => a[prop] > b[prop] ? 1 : a[prop] === b[prop] ? 0 : -1);
}
-
- public getTVStatusLabel() {
- const textKey = 'MediaDetails.StatusValues.' + this.tv.status;
- const text = this.translate.instant(textKey);
- if (text !== textKey) {
- return text;
- } else {
- return this.tv.status;
- }
- }
}
diff --git a/src/Ombi/ClientApp/src/app/pipes/TranslateStatus.ts b/src/Ombi/ClientApp/src/app/pipes/TranslateStatus.ts
new file mode 100644
index 000000000..1d7ebf1bd
--- /dev/null
+++ b/src/Ombi/ClientApp/src/app/pipes/TranslateStatus.ts
@@ -0,0 +1,19 @@
+import { Pipe, PipeTransform } from '@angular/core';
+import { TranslateService } from '@ngx-translate/core';
+
+@Pipe({
+ name: 'translateStatus'
+ })
+export class TranslateStatusPipe implements PipeTransform {
+ constructor(private translateService: TranslateService) {}
+
+ transform(value: string): string {
+ const textKey = 'MediaDetails.StatusValues.' + value;
+ const text = this.translateService.instant(textKey);
+ if (text !== textKey) {
+ return text;
+ } else {
+ return value;
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/Ombi/ClientApp/src/app/pipes/pipe.module.ts b/src/Ombi/ClientApp/src/app/pipes/pipe.module.ts
index f41924060..7a9520af8 100644
--- a/src/Ombi/ClientApp/src/app/pipes/pipe.module.ts
+++ b/src/Ombi/ClientApp/src/app/pipes/pipe.module.ts
@@ -1,6 +1,7 @@
import { ModuleWithProviders, NgModule } from "@angular/core";
import { HumanizePipe } from "./HumanizePipe";
import { LocalizedDatePipe } from "./LocalizedDate";
+import { TranslateStatusPipe } from "./TranslateStatus";
import { ThousandShortPipe } from "./ThousandShortPipe";
import { SafePipe } from "./SafePipe";
import { QualityPipe } from "./QualityPipe";
@@ -8,8 +9,8 @@ import { UserLocalePipe } from "./UserLocalePipe";
@NgModule({
imports: [],
- declarations: [HumanizePipe, ThousandShortPipe, SafePipe, QualityPipe, UserLocalePipe, LocalizedDatePipe ],
- exports: [HumanizePipe, ThousandShortPipe, SafePipe, QualityPipe, UserLocalePipe, LocalizedDatePipe ],
+ declarations: [HumanizePipe, ThousandShortPipe, SafePipe, QualityPipe, UserLocalePipe, LocalizedDatePipe, TranslateStatusPipe ],
+ exports: [HumanizePipe, ThousandShortPipe, SafePipe, QualityPipe, UserLocalePipe, LocalizedDatePipe, TranslateStatusPipe ],
})
export class PipeModule {
diff --git a/src/Ombi/ClientApp/src/app/requests-list/components/movies-grid/movies-grid.component.html b/src/Ombi/ClientApp/src/app/requests-list/components/movies-grid/movies-grid.component.html
index 0d397b778..0e6e31521 100644
--- a/src/Ombi/ClientApp/src/app/requests-list/components/movies-grid/movies-grid.component.html
+++ b/src/Ombi/ClientApp/src/app/requests-list/components/movies-grid/movies-grid.component.html
@@ -63,7 +63,7 @@
{{ 'Requests.Status' | translate}} |
- {{element.status}} |
+ {{element.status |translateStatus }} |
diff --git a/src/Ombi/ClientApp/src/app/requests-list/components/tv-grid/tv-grid.component.html b/src/Ombi/ClientApp/src/app/requests-list/components/tv-grid/tv-grid.component.html
index 4fda46b6c..8cb00d3bb 100644
--- a/src/Ombi/ClientApp/src/app/requests-list/components/tv-grid/tv-grid.component.html
+++ b/src/Ombi/ClientApp/src/app/requests-list/components/tv-grid/tv-grid.component.html
@@ -56,7 +56,7 @@
{{'Requests.Status' | translate}} |
- {{element.parentRequest.status}}
+ {{element.parentRequest.status | translateStatus }}
|
From 907ce4be0fb41227e1769b0a7ad2e1280f27d12a Mon Sep 17 00:00:00 2001
From: Florian Dupret <34862846+sephrat@users.noreply.github.com>
Date: Tue, 19 Oct 2021 15:51:45 +0200
Subject: [PATCH 07/11] Refactor localized dates into angular moment
---
src/Ombi/ClientApp/src/app/app.module.ts | 33 -------------------
.../details-group.component.html | 2 +-
.../movie-information-panel.component.html | 6 ++--
.../tv-information-panel.component.html | 2 +-
.../ClientApp/src/app/pipes/LocalizedDate.ts | 16 ---------
.../ClientApp/src/app/pipes/pipe.module.ts | 5 ++-
.../about/update-dialog.component.html | 2 +-
7 files changed, 8 insertions(+), 58 deletions(-)
delete mode 100644 src/Ombi/ClientApp/src/app/pipes/LocalizedDate.ts
diff --git a/src/Ombi/ClientApp/src/app/app.module.ts b/src/Ombi/ClientApp/src/app/app.module.ts
index d22edbfbc..b4e78087c 100644
--- a/src/Ombi/ClientApp/src/app/app.module.ts
+++ b/src/Ombi/ClientApp/src/app/app.module.ts
@@ -66,39 +66,6 @@ import { TranslateHttpLoader } from "@ngx-translate/http-loader";
import { UnauthorizedInterceptor } from "./auth/unauthorized.interceptor";
import { environment } from "../environments/environment";
-import { registerLocaleData } from '@angular/common';
-// TODO: lazy load locales, probably somewhere in app.component
-import localeDa from '@angular/common/locales/da';
-import localeDe from '@angular/common/locales/de';
-import localeEs from '@angular/common/locales/es';
-import localeFr from '@angular/common/locales/fr';
-import localeIt from '@angular/common/locales/it';
-import localeHu from '@angular/common/locales/hu';
-import localeNl from '@angular/common/locales/nl';
-// import localeNo from '@angular/common/locales/no';
-import localePl from '@angular/common/locales/pl';
-import localePt from '@angular/common/locales/pt';
-import localeSk from '@angular/common/locales/sk';
-import localeSv from '@angular/common/locales/sv';
-import localeBg from '@angular/common/locales/bg';
-import localeRu from '@angular/common/locales/ru';
-
-
-registerLocaleData(localeDa);
-registerLocaleData(localeDe);
-registerLocaleData(localeEs);
-registerLocaleData(localeFr);
-registerLocaleData(localeIt);
-registerLocaleData(localeHu);
-registerLocaleData(localeNl);
-// registerLocaleData(localeNo);
-registerLocaleData(localePl);
-registerLocaleData(localePt);
-registerLocaleData(localeSk);
-registerLocaleData(localeSv);
-registerLocaleData(localeBg);
-registerLocaleData(localeRu);
-
const routes: Routes = [
{ path: "*", component: PageNotFoundComponent },
{ path: "", redirectTo: "/discover", pathMatch: "full" },
diff --git a/src/Ombi/ClientApp/src/app/issues/components/details-group/details-group.component.html b/src/Ombi/ClientApp/src/app/issues/components/details-group/details-group.component.html
index 46a77d575..315cb86ae 100644
--- a/src/Ombi/ClientApp/src/app/issues/components/details-group/details-group.component.html
+++ b/src/Ombi/ClientApp/src/app/issues/components/details-group/details-group.component.html
@@ -1,7 +1,7 @@
{{issue.subject}}
- {{issue.userReported?.userName}} on {{issue.createdDate | localizedDate:short}}
+ {{issue.userReported?.userName}} on {{issue.createdDate | amLocal | amUserLocale | amDateFormat: 'LL' }}
diff --git a/src/Ombi/ClientApp/src/app/media-details/components/movie/panels/movie-information-panel.component.html b/src/Ombi/ClientApp/src/app/media-details/components/movie/panels/movie-information-panel.component.html
index 50070e47e..6970c913d 100644
--- a/src/Ombi/ClientApp/src/app/media-details/components/movie/panels/movie-information-panel.component.html
+++ b/src/Ombi/ClientApp/src/app/media-details/components/movie/panels/movie-information-panel.component.html
@@ -50,7 +50,7 @@
{{'MediaDetails.RequestDate' | translate }}
- {{request.requestedDate | localizedDate}}
+ {{request.requestedDate | amUserLocale | amDateFormat: 'LL'}}
@@ -78,11 +78,11 @@
{{'MediaDetails.TheatricalRelease' | translate }}
- {{movie.releaseDate | localizedDate: 'mediumDate'}}
+ {{movie.releaseDate | amUserLocale | amDateFormat: 'LL': 'mediumDate'}}
{{'MediaDetails.DigitalRelease' | translate }}
- {{movie.digitalReleaseDate | localizedDate: 'mediumDate'}}
+ {{movie.digitalReleaseDate | amUserLocale | amDateFormat: 'LL': 'mediumDate'}}
diff --git a/src/Ombi/ClientApp/src/app/media-details/components/tv/panels/tv-information-panel/tv-information-panel.component.html b/src/Ombi/ClientApp/src/app/media-details/components/tv/panels/tv-information-panel/tv-information-panel.component.html
index 8fc23d39f..dcdf6fe8e 100644
--- a/src/Ombi/ClientApp/src/app/media-details/components/tv/panels/tv-information-panel/tv-information-panel.component.html
+++ b/src/Ombi/ClientApp/src/app/media-details/components/tv/panels/tv-information-panel/tv-information-panel.component.html
@@ -25,7 +25,7 @@
{{ this.tv.status | translateStatus }}
{{'MediaDetails.FirstAired' | translate }}
- {{tv.firstAired | localizedDate: 'mediumDate'}}
+ {{tv.firstAired | amLocal | amUserLocale | amDateFormat: 'LL' }}
diff --git a/src/Ombi/ClientApp/src/app/pipes/LocalizedDate.ts b/src/Ombi/ClientApp/src/app/pipes/LocalizedDate.ts
deleted file mode 100644
index ab71fa36d..000000000
--- a/src/Ombi/ClientApp/src/app/pipes/LocalizedDate.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-import { DatePipe } from '@angular/common';
-import { Pipe, PipeTransform } from '@angular/core';
-import { TranslateService } from '@ngx-translate/core';
-
-@Pipe({
- name: 'localizedDate',
- pure: false
- })
-export class LocalizedDatePipe implements PipeTransform {
- constructor(private translateService: TranslateService) {}
-
- transform(value: any, pattern: string = 'mediumDate'): any {
- const datePipe: DatePipe = new DatePipe(this.translateService.currentLang);
- return datePipe.transform(value, pattern);
- }
-}
\ No newline at end of file
diff --git a/src/Ombi/ClientApp/src/app/pipes/pipe.module.ts b/src/Ombi/ClientApp/src/app/pipes/pipe.module.ts
index 7a9520af8..6f063c91c 100644
--- a/src/Ombi/ClientApp/src/app/pipes/pipe.module.ts
+++ b/src/Ombi/ClientApp/src/app/pipes/pipe.module.ts
@@ -1,6 +1,5 @@
import { ModuleWithProviders, NgModule } from "@angular/core";
import { HumanizePipe } from "./HumanizePipe";
-import { LocalizedDatePipe } from "./LocalizedDate";
import { TranslateStatusPipe } from "./TranslateStatus";
import { ThousandShortPipe } from "./ThousandShortPipe";
import { SafePipe } from "./SafePipe";
@@ -9,8 +8,8 @@ import { UserLocalePipe } from "./UserLocalePipe";
@NgModule({
imports: [],
- declarations: [HumanizePipe, ThousandShortPipe, SafePipe, QualityPipe, UserLocalePipe, LocalizedDatePipe, TranslateStatusPipe ],
- exports: [HumanizePipe, ThousandShortPipe, SafePipe, QualityPipe, UserLocalePipe, LocalizedDatePipe, TranslateStatusPipe ],
+ declarations: [HumanizePipe, ThousandShortPipe, SafePipe, QualityPipe, UserLocalePipe, TranslateStatusPipe ],
+ exports: [HumanizePipe, ThousandShortPipe, SafePipe, QualityPipe, UserLocalePipe, TranslateStatusPipe ],
})
export class PipeModule {
diff --git a/src/Ombi/ClientApp/src/app/settings/about/update-dialog.component.html b/src/Ombi/ClientApp/src/app/settings/about/update-dialog.component.html
index 2327f2834..5377c463f 100644
--- a/src/Ombi/ClientApp/src/app/settings/about/update-dialog.component.html
+++ b/src/Ombi/ClientApp/src/app/settings/about/update-dialog.component.html
@@ -18,7 +18,7 @@
-Updated at {{data.updateDate | localizedDate}}
+Updated at {{data.updateDate | amUserLocale | amDateFormat: 'LL' }}
From 4f6cc120bb31acab6f4eec38d33b46ee29e938b9 Mon Sep 17 00:00:00 2001
From: Florian Dupret <34862846+sephrat@users.noreply.github.com>
Date: Tue, 19 Oct 2021 15:52:13 +0200
Subject: [PATCH 08/11] Fix pipes not available in DetailsGroupComponent
---
src/Ombi/ClientApp/src/app/shared/shared.module.ts | 2 ++
1 file changed, 2 insertions(+)
diff --git a/src/Ombi/ClientApp/src/app/shared/shared.module.ts b/src/Ombi/ClientApp/src/app/shared/shared.module.ts
index 50dfc4538..01d70f1c6 100644
--- a/src/Ombi/ClientApp/src/app/shared/shared.module.ts
+++ b/src/Ombi/ClientApp/src/app/shared/shared.module.ts
@@ -38,6 +38,7 @@ import { MatTreeModule } from '@angular/material/tree';
import { MomentModule } from "ngx-moment";
import { NgModule } from "@angular/core";
import { SidebarModule } from "primeng/sidebar";
+import { PipeModule } from "../pipes/pipe.module";
import { TheMovieDbService } from "../services";
import { TranslateModule } from "@ngx-translate/core";
import { TruncateModule } from "@yellowspot/ng-truncate";
@@ -87,6 +88,7 @@ import { WatchProvidersSelectComponent } from "./components/watch-providers-sele
MatTreeModule,
MatStepperModule,
MatSnackBarModule,
+ PipeModule,
],
exports: [
TranslateModule,
From 8106097ea3a4140d4925cb73909056883d547c63 Mon Sep 17 00:00:00 2001
From: Florian Dupret <34862846+sephrat@users.noreply.github.com>
Date: Tue, 19 Oct 2021 16:03:16 +0200
Subject: [PATCH 09/11] Translate Issue details group
---
.../components/details-group/details-group.component.html | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/Ombi/ClientApp/src/app/issues/components/details-group/details-group.component.html b/src/Ombi/ClientApp/src/app/issues/components/details-group/details-group.component.html
index 315cb86ae..01ddaf75e 100644
--- a/src/Ombi/ClientApp/src/app/issues/components/details-group/details-group.component.html
+++ b/src/Ombi/ClientApp/src/app/issues/components/details-group/details-group.component.html
@@ -1,7 +1,7 @@
{{issue.subject}}
- {{issue.userReported?.userName}} on {{issue.createdDate | amLocal | amUserLocale | amDateFormat: 'LL' }}
+ {{'Issues.UserOnDate' | translate: { user: issue.userReported?.userName, date: issue.createdDate | amLocal | amUserLocale | amDateFormat: 'LL' } }}
From 496b399d67808c9880f70d2d442aaf82b2bdf16b Mon Sep 17 00:00:00 2001
From: Florian Dupret <34862846+sephrat@users.noreply.github.com>
Date: Tue, 19 Oct 2021 16:15:58 +0200
Subject: [PATCH 10/11] Fix minor regressions
---
.../movie/panels/movie-information-panel.component.html | 4 ++--
.../tv-information-panel/tv-information-panel.component.html | 2 +-
src/Ombi/wwwroot/translations/en.json | 3 ++-
3 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/src/Ombi/ClientApp/src/app/media-details/components/movie/panels/movie-information-panel.component.html b/src/Ombi/ClientApp/src/app/media-details/components/movie/panels/movie-information-panel.component.html
index 6970c913d..1aafc30bf 100644
--- a/src/Ombi/ClientApp/src/app/media-details/components/movie/panels/movie-information-panel.component.html
+++ b/src/Ombi/ClientApp/src/app/media-details/components/movie/panels/movie-information-panel.component.html
@@ -27,7 +27,7 @@
{{'MediaDetails.Status' | translate }}
- {{ this.movie.status | translateStatus }}
+ {{ this.movie.status | translateStatus }}
{{'MediaDetails.Availability' | translate }}
@@ -45,7 +45,7 @@
{{'MediaDetails.RequestedBy' | translate }}
- {{request.requestedUser.userAlias}}
+ {{request.requestedUser.userAlias}}
diff --git a/src/Ombi/ClientApp/src/app/media-details/components/tv/panels/tv-information-panel/tv-information-panel.component.html b/src/Ombi/ClientApp/src/app/media-details/components/tv/panels/tv-information-panel/tv-information-panel.component.html
index dcdf6fe8e..9d1d927bd 100644
--- a/src/Ombi/ClientApp/src/app/media-details/components/tv/panels/tv-information-panel/tv-information-panel.component.html
+++ b/src/Ombi/ClientApp/src/app/media-details/components/tv/panels/tv-information-panel/tv-information-panel.component.html
@@ -22,7 +22,7 @@
{{'MediaDetails.Status' | translate }}
- {{ this.tv.status | translateStatus }}
+ {{ tv.status | translateStatus }}
{{'MediaDetails.FirstAired' | translate }}
{{tv.firstAired | amLocal | amUserLocale | amDateFormat: 'LL' }}
diff --git a/src/Ombi/wwwroot/translations/en.json b/src/Ombi/wwwroot/translations/en.json
index 643f00d37..791ec3285 100644
--- a/src/Ombi/wwwroot/translations/en.json
+++ b/src/Ombi/wwwroot/translations/en.json
@@ -239,7 +239,8 @@
"Delete": "Delete issue",
"DeletedIssue": "Issue has been deleted",
"Chat":"Chat",
- "Requested":"Requested"
+ "Requested":"Requested",
+ "UserOnDate": "{{user}} on {{date}}"
},
"Filter": {
"ClearFilter": "Clear Filter",
From 9191e558925a327063313a1dab59ddbfc7ef8d3f Mon Sep 17 00:00:00 2001
From: Florian Dupret <34862846+sephrat@users.noreply.github.com>
Date: Wed, 20 Oct 2021 13:57:20 +0200
Subject: [PATCH 11/11] Localize user preferences
---
.../user-preference.component.html | 30 +++++++++++--------
.../user-preference.component.ts | 2 +-
src/Ombi/wwwroot/translations/en.json | 21 ++++++++++++-
3 files changed, 38 insertions(+), 15 deletions(-)
diff --git a/src/Ombi/ClientApp/src/app/user-preferences/components/user-preference/user-preference.component.html b/src/Ombi/ClientApp/src/app/user-preferences/components/user-preference/user-preference.component.html
index 7d466d972..6942eb3ad 100644
--- a/src/Ombi/ClientApp/src/app/user-preferences/components/user-preference/user-preference.component.html
+++ b/src/Ombi/ClientApp/src/app/user-preferences/components/user-preference/user-preference.component.html
@@ -7,15 +7,15 @@
- User Type:
+ {{'UserPreferences.UserType' | translate}}
- {{UserType[user?.userType]}}
+ {{'UserTypeLabel.' + user?.userType | translate }}
@@ -58,7 +58,7 @@
+ src="https://play.google.com/intl/{{ selectedLang }}/badges/static/images/badges/{{ selectedLang }}_badge_web_generic.png" />
-
+
@@ -75,15 +77,15 @@
@@ -26,11 +26,11 @@
