From eaa7a688f41c24e30fe9d22db8c2b926538b6260 Mon Sep 17 00:00:00 2001
From: sumeyyeKurtulus <sumeyye.kurtulus.business@gmail.com>
Date: Tue, 4 Jun 2024 11:28:00 +0300
Subject: [PATCH 1/2] fix: localization fix for extra form properties

---
 .../extensible-form-prop.component.html       | 30 ++++++++++++-------
 1 file changed, 19 insertions(+), 11 deletions(-)

diff --git a/npm/ng-packs/packages/components/extensible/src/lib/components/extensible-form/extensible-form-prop.component.html b/npm/ng-packs/packages/components/extensible/src/lib/components/extensible-form/extensible-form-prop.component.html
index 1f8833f929..8b913b671c 100644
--- a/npm/ng-packs/packages/components/extensible/src/lib/components/extensible-form/extensible-form-prop.component.html
+++ b/npm/ng-packs/packages/components/extensible/src/lib/components/extensible-form/extensible-form-prop.component.html
@@ -1,4 +1,7 @@
-<ng-container [ngSwitch]="getComponent(prop)" *abpPermission="prop.permission; runChangeDetection: false">
+<ng-container
+  [ngSwitch]="getComponent(prop)"
+  *abpPermission="prop.permission; runChangeDetection: false"
+>
   <ng-template ngSwitchCase="template">
     <ng-container *ngComponentOutlet="prop.template; injector: injectorForCustomComponent">
     </ng-container>
@@ -50,9 +53,7 @@
         class="form-select form-control"
       >
         @for (option of options$ | async; track option.value) {
-          <option
-            [ngValue]="option.value"
-          >
+          <option [ngValue]="option.value">
             {{ option.key }}
           </option>
         }
@@ -152,7 +153,7 @@
             aria-hidden="true"
             [ngClass]="{
               'fa-eye-slash': !showPassword,
-              'fa-eye': showPassword
+              'fa-eye': showPassword,
             }"
           ></i>
         </button>
@@ -160,9 +161,7 @@
     </ng-template>
 
     @if (prop.formText) {
-    <small class="text-muted d-block">{{
-      prop.formText | abpLocalization
-    }}</small>
+      <small class="text-muted d-block">{{ prop.formText | abpLocalization }}</small>
     }
   </div>
 </ng-container>
@@ -171,12 +170,21 @@
   <label [htmlFor]="prop.id" [ngClass]="classes || 'form-label'">
     @if (prop.displayTextResolver) {
       {{ prop.displayTextResolver(data) | abpLocalization }}
-    }@else{
-      {{ prop.displayName | abpLocalization }}
+    } @else {
+      @if (prop.isExtra) {
+        {{ '::' + prop.displayName | abpLocalization }}
+      } @else {
+        {{ prop.displayName | abpLocalization }}
+      }
     }
     {{ asterisk }}
     @if (prop.tooltip) {
-      <i [ngbTooltip]="prop.tooltip.text | abpLocalization" [placement]="prop.tooltip.placement || 'auto'"  container="body" class="bi bi-info-circle"></i>
+      <i
+        [ngbTooltip]="prop.tooltip.text | abpLocalization"
+        [placement]="prop.tooltip.placement || 'auto'"
+        container="body"
+        class="bi bi-info-circle"
+      ></i>
     }
   </label>
 </ng-template>

From c302936b7e1abe29ac49b60f813aab4310420af1 Mon Sep 17 00:00:00 2001
From: sumeyyeKurtulus <sumeyye.kurtulus.business@gmail.com>
Date: Tue, 4 Jun 2024 11:28:29 +0300
Subject: [PATCH 2/2] update: delete unused import from
 DEFAULT_USERS_CREATE_FORM_PROPS

---
 .../identity/src/lib/defaults/default-users-form-props.ts       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/npm/ng-packs/packages/identity/src/lib/defaults/default-users-form-props.ts b/npm/ng-packs/packages/identity/src/lib/defaults/default-users-form-props.ts
index 9f802c8283..6b0b03ccf0 100644
--- a/npm/ng-packs/packages/identity/src/lib/defaults/default-users-form-props.ts
+++ b/npm/ng-packs/packages/identity/src/lib/defaults/default-users-form-props.ts
@@ -1,5 +1,5 @@
 import { Validators } from '@angular/forms';
-import { ConfigStateService, CurrentUserDto } from '@abp/ng.core';
+import { ConfigStateService } from '@abp/ng.core';
 import { getPasswordValidators } from '@abp/ng.theme.shared';
 import { ePropType, FormProp } from '@abp/ng.components/extensible';
 import { IdentityUserDto } from '@abp/ng.identity/proxy';