Browse Source

Merge pull request #20196 from abpframework/issue-20165

Angular - Localization Updates for Extra Select and Multiselect Props
pull/20210/head
oykuermann 2 years ago
committed by GitHub
parent
commit
b7fc330e09
No known key found for this signature in database GPG Key ID: B5690EEEBB952194
  1. 14
      npm/ng-packs/packages/components/extensible/src/lib/components/extensible-form/extensible-form-prop.component.html
  2. 6
      npm/ng-packs/packages/components/extensible/src/lib/components/extensible-table/extensible-table.component.html

14
npm/ng-packs/packages/components/extensible/src/lib/components/extensible-form/extensible-form-prop.component.html

@ -51,7 +51,11 @@
>
@for (option of options$ | async; track option.value) {
<option [ngValue]="option.value">
{{ option.key }}
@if (prop.isExtra) {
{{ '::' + option.key | abpLocalization }}
} @else {
{{ option.key }}
}
</option>
}
</select>
@ -68,7 +72,11 @@
>
@for (option of options$ | async; track option.value) {
<option [ngValue]="option.value">
{{ option.key }}
@if (prop.isExtra) {
{{ '::' + option.key | abpLocalization }}
} @else {
{{ option.key }}
}
</option>
}
</select>
@ -142,7 +150,7 @@
aria-hidden="true"
[ngClass]="{
'fa-eye-slash': !showPassword,
'fa-eye': showPassword
'fa-eye': showPassword,
}"
></i>
</button>

6
npm/ng-packs/packages/components/extensible/src/lib/components/extensible-table/extensible-table.component.html

@ -50,7 +50,11 @@
<ng-container *abpVisible="row['_' + prop.name]?.visible">
@if (!row['_' + prop.name].component) {
<div
[innerHTML]="row['_' + prop.name]?.value | async"
[innerHTML]="
!prop.isExtra
? (row['_' + prop.name]?.value | async)
: ('::' + (row['_' + prop.name]?.value | async) | abpLocalization)
"
(click)="
prop.action && prop.action({ getInjected: getInjected, record: row, index: i })
"

Loading…
Cancel
Save