Merged in bugfix/SHIBUI-814 (pull request #204)

SHIBUI-814 Implemented fixes for i18n issues
TIER · Sep 26, 2018 · b5fb56e · b5fb56e
2 parents c0a8a91 + e93eda9
commit b5fb56e
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/ui/src/app/metadata/domain/component/forms/finish-form.component.html b/ui/src/app/metadata/domain/component/forms/finish-form.component.html
@@ -250,7 +250,7 @@ <h3 class="tag tag-success tag-sm my-4">
                     </thead>
                     <tbody>
                     <tr *ngFor="let attr of attributesToRelease$ | async">
-                        <td>{{ attr.label }}</td>
+                        <td [translate]="attr.label">{{ attr.label }}</td>
                         <td>
                             <i class="fa fa-fw fa-check" *ngIf="resolver.attributeRelease.indexOf(attr.key) > -1"></i>
                         </td>

diff --git a/ui/src/app/metadata/manager/container/manager.component.html b/ui/src/app/metadata/manager/container/manager.component.html
@@ -1,10 +1,10 @@
 <div class="container-fluid p-3" role="main">
     <ul class="nav nav-tabs">
         <li class="nav-item">
-            <a class="nav-link" [routerLink]="['./', 'resolvers']" routerLinkActive="active">Metadata Sources</a>
+            <a class="nav-link" [routerLink]="['./', 'resolvers']" routerLinkActive="active" translate="label.metadata-sources">Metadata Sources</a>
         </li>
         <li class="nav-item">
-            <a class="nav-link" [routerLink]="['./', 'providers']" routerLinkActive="active">Metadata Providers</a>
+            <a class="nav-link" [routerLink]="['./', 'providers']" routerLinkActive="active" translate="label.metadata-providers">Metadata Providers</a>
         </li>
     </ul>
     <router-outlet></router-outlet>

diff --git a/ui/src/app/metadata/resolver/container/new-resolver.component.scss b/ui/src/app/metadata/resolver/container/new-resolver.component.scss
@@ -1,5 +1,6 @@
 :host {
     .resolver-nav-option {
-        width: 160px;
+        min-width: 160px;
+        height: 100%;
     }
 }
diff --git a/ui/src/app/metadata/resolver/container/wizard.component.html b/ui/src/app/metadata/resolver/container/wizard.component.html
@@ -6,7 +6,7 @@
                     <span class="display-6" role="heading" aria-level="1">
                         <i class="fa fa-fw fa-plus-square"></i>
                         <translate-i18n key="message.add-new-md-resolver">Add a new metadata source</translate-i18n>
-                        &ndash; {{ (currentPage$ | async).label }} ({{ (resolver$ | async).serviceProviderName }})
+                        &ndash; {{ (currentPage$ | async).label | translate }} ({{ (resolver$ | async).serviceProviderName }})
                         <span class="pull-right">
                             (<translate-i18n key="message.wizard-status" [params]="{ index: wizardIndex$ | async, length: wizard.length + 1 }">
                                 Step {{ wizardIndex }} of {{ wizard.length + 1 }}