Browse Source

fix(theme-shared): fix confirmation and toast localizations

pull/2606/head
mehmet-erim 7 years ago
parent
commit
423192e57f
  1. 4
      npm/ng-packs/packages/theme-shared/src/lib/components/confirmation/confirmation.component.html
  2. 14
      npm/ng-packs/packages/theme-shared/src/lib/components/confirmation/confirmation.component.ts
  3. 4
      npm/ng-packs/packages/theme-shared/src/lib/components/toast/toast.component.html
  4. 14
      npm/ng-packs/packages/theme-shared/src/lib/components/toast/toast.component.ts

4
npm/ng-packs/packages/theme-shared/src/lib/components/confirmation/confirmation.component.html

@ -6,10 +6,10 @@
</div>
<div class="content">
<h1 class="title" *ngIf="data.title">
{{ title }}
{{ data.title | abpLocalization: data.options?.titleLocalizationParams }}
</h1>
<p class="message" *ngIf="data.message">
{{ message }}
{{ data.message | abpLocalization: data.options?.messageLocalizationParams }}
</p>
</div>
<div class="footer">

14
npm/ng-packs/packages/theme-shared/src/lib/components/confirmation/confirmation.component.ts

@ -32,20 +32,6 @@ export class ConfirmationComponent {
}
}
get title(): string {
return this.localizationService.instant(
this.data.title,
...(this.data.options.titleLocalizationParams || []),
);
}
get message(): string {
return this.localizationService.instant(
this.data.message,
...(this.data.options.messageLocalizationParams || []),
);
}
constructor(
private confirmationService: ConfirmationService,
private localizationService: LocalizationService,

4
npm/ng-packs/packages/theme-shared/src/lib/components/toast/toast.component.html

@ -7,10 +7,10 @@
<i class="fa fa-times"></i>
</button>
<div class="toast-title">
{{ toast.title | abpLocalization: messageLocalizationParams }}
{{ toast.title | abpLocalization: toast.options?.titleLocalizationParams }}
</div>
<div class="toast-message">
{{ toast.message | abpLocalization: titleLocalizationParams }}
{{ toast.message | abpLocalization: toast.options?.messageLocalizationParams }}
</div>
</div>
</div>

14
npm/ng-packs/packages/theme-shared/src/lib/components/toast/toast.component.ts

@ -32,20 +32,6 @@ export class ToastComponent implements OnInit {
}
}
get titleLocalizationParams(): string {
return this.localizationService.instant(
this.toast.title,
...this.toast.options.titleLocalizationParams,
);
}
get messageLocalizationParams() {
return this.localizationService.instant(
this.toast.message,
...this.toast.options.messageLocalizationParams,
);
}
constructor(
private toastService: ToasterService,
private localizationService: LocalizationService,

Loading…
Cancel
Save