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] 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' }}