fix i18n ids and translations values

ui/src/app/account/password/password.component.html

@@ -34,7 +34,7 @@ <h1 class="mt-3" *ngIf="username">{{ passwordForUsernameString }}</h1>
             class="form-control"
             id="currentPassword"
             name="currentPassword"
-            i18n-placeholder="@@global.form.currentpassword.placeholder.string'"
+            i18n-placeholder="@@global.form.currentpassword.placeholder.string"
             placeholder="Current password"
             formControlName="currentPassword"
           />

ui/src/app/account/settings/settings.component.html

@@ -164,12 +164,13 @@ <h1 class="mt-3" i18n="@@settings.security.heading.string">Security</h1>
           <div class="col-md-8">
             <ul>
               <li i18n="@@settings.security.mfaQrCodeSteps.one.string">
-                <strong>Install a two-factor authentication app</strong><br />A 2FA app is required to create the six-digit code you need
-                to access your account each time you sign in. Most apps are for mobile devices; some are also available
-                as desktop or web-based apps. Download and install your preferred 2FA app, such as
+                <strong>Install a two-factor authentication app</strong><br />A 2FA app is required to create the
+                six-digit code you need to access your account each time you sign in. Most apps are for mobile devices;
+                some are also available as desktop or web-based apps. Download and install your preferred 2FA app, such
+                as
                 <a href="https://play.google.com/store/apps/details?id=com.google.android.apps.authenticator2"
                   >Google Authenticator</a
-                >, <a href="https://freeotp.github.io/">FreeOTP</a>, or <a href="https://authy.com/">Authy</a>.
+                >, <a href="https://freeotp.github.io/">FreeOTP</a> or <a href="https://authy.com/">Authy</a>.
               </li>
               <li i18n="@@settings.security.mfaQrCodeSteps.two.string">
                 <strong>Scan this QR code with your device</strong><br />Open your 2FA app and scan the image below.
@@ -193,7 +194,8 @@ <h1 class="mt-3" i18n="@@settings.security.heading.string">Security</h1>
           <div class="col-md-8">
             <ul>
               <li>
-                <span i18n="@@settings.security.mfaCannotScan.one.string"><strong>Can't scan the QR code?</strong></span><br /><a
+                <span i18n="@@settings.security.mfaCannotScan.one.string"><strong>Can't scan the QR code?</strong></span
+                ><br /><a
                   href="JavaScript:void(0);"
                   (click)="toggleMfaTextCode()"
                   i18n="@@settings.security.mfaCannotScan.two.string"
@@ -203,8 +205,9 @@ <h1 class="mt-3" i18n="@@settings.security.heading.string">Security</h1>
                 >
               </li>
               <li i18n="@@settings.security.mfaTextCodeSteps.one.string">
-                <strong>Enter the six-digit code from the app</strong><br />After scanning the QR code or entering in the text code, your
-                2FA app will display a six-digit code. Enter this code in the box below and click Save.
+                <strong>Enter the six-digit code from the app</strong><br />After scanning the QR code or entering in
+                the text code, your 2FA app will display a six-digit code. Enter this code in the box below and click
+                Save.
               </li>
             </ul>
           </div>

ui/src/app/affiliation/affiliation-detail.component.html

@@ -16,7 +16,7 @@ <h1 class="mt-5" i18n="@@gatewayApp.assertionServiceAssertion.detail.title.strin
           </dd>
           <dt class="col-md-3" i18n="@@gatewayApp.assertionServiceAssertion.status.string">Status</dt>
           <dd class="col-md-9">
-            {{ affiliation.prettyStatus }}
+            {{ affiliation.prettyStatus || '' | localize }}
           </dd>
           <dt
             *ngIf="affiliation.permissionLink"
@@ -50,9 +50,7 @@ <h1 class="mt-5" i18n="@@gatewayApp.assertionServiceAssertion.detail.title.strin
             Affiliation Section
           </dt>
           <dd class="col-md-9">
-            <span i18n="@@{{'gatewayApp.AffiliationSection.' + affiliation.affiliationSection + '.string'}}">{{
-              affiliation.affiliationSection
-            }}</span>
+            <span>{{ affiliation.affiliationSection! | localize }}</span>
           </dd>
           <dt class="col-md-3" i18n="@@gatewayApp.assertionServiceAssertion.detail.org.string">Organization</dt>
           <dd class="col-md-9">

ui/src/app/affiliation/affiliations.component.html

@@ -165,9 +165,7 @@ <h1 id="page-heading" class="mt-3" i18n="@@gatewayApp.assertionServiceAssertion.
             >
           </td>
           <td>
-            <span i18n="@@{{'gatewayApp.AffiliationSection.' + affiliation.affiliationSection + '.string'}}">{{
-              affiliation.affiliationSection
-            }}</span
+            <span>{{ affiliation.affiliationSection! | localize }}</span
             ><br />
             {{ affiliation.orgName }}: <span *ngIf="affiliation.orgCity">{{ affiliation.orgCity }}</span
             ><span *ngIf="affiliation.orgRegion">, {{ affiliation.orgRegion }}</span

ui/src/app/error/error-alert.component.html

@@ -2,7 +2,9 @@
   <div *ngFor="let alert of alerts">
     <ngb-alert *ngIf="alert && alert.type && alert.msg" [type]="alert.type" [dismissible]="false">
       <div class="d-flex">
-        <p i18n="@@error.subtitle" class="font-size-16 font-weight-bold mr-auto mb-2">Sorry, an error has occurred</p>
+        <p i18n="@@error.subtitle.string" class="font-size-16 font-weight-bold mr-auto mb-2">
+          Sorry, an error has occurred
+        </p>
         <a (click)="close(alert)" (keyup.esc)="closeOldestAlert()" (keyup.enter)="closeOldestAlert()" tabindex="0">
           <svg width="12" height="12" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
             <path

ui/src/app/home/home.component.html

@@ -1,5 +1,5 @@
 <div class="d-flex flex-column h-100">
-  <div class="alert alert-success mt-3" data-cy="signedInMessage">{{ loggedInMessage }}</div>
+  <div class="alert alert-success mt-3" data-cy="signedInMessage" [innerHTML]="loggedInMessage"></div>
   <div class="h-100 pb-3">
     <router-outlet></router-outlet>
   </div>

ui/src/app/member/member-import-dialog.component.html

@@ -35,7 +35,7 @@ <h4 class="modal-title" i18n="@@gatewayApp.msUserServiceMSMember.import.title.st
     <div class="form-group">
       <label
         class="form-control-label sr-only"
-        i18n="@@gatewayApp.msUserServiceMSMember.import.filePath"
+        i18n="@@gatewayApp.msUserServiceMSMember.import.filePath.string"
         for="field_filePath.string"
         >File Path</label
       >

ui/src/app/member/member-import-dialog.component.ts

@@ -57,7 +57,7 @@ export class MemberImportDialogComponent {
       })
     } else {
       alert(
-        $localize`:gatewayApp.msUserServiceMSUser.import.emptyFile.string:There is no file to upload. Please select one.`
+        $localize`:@@gatewayApp.msUserServiceMSUser.import.emptyFile.string:There is no file to upload. Please select one.`
       )
     }
   }

ui/src/app/user/user-import-dialog.component.ts

@@ -59,7 +59,7 @@ export class UserImportDialogComponent {
       })
     } else {
       alert(
-        $localize`:gatewayApp.msUserServiceMSUser.import.emptyFile.string:There is no file to upload. Please select one.`
+        $localize`:@@gatewayApp.msUserServiceMSUser.import.emptyFile.string:There is no file to upload. Please select one.`
       )
     }
   }