From 78858248e1c5017937db6648a572e66365786c4d Mon Sep 17 00:00:00 2001
From: Ryan Mathis
Date: Thu, 20 Sep 2018 07:58:16 -0700
Subject: [PATCH] SHIBUI-814 Fixes in templates for translations
---
backend/src/main/resources/i18n/messages_en.properties | 3 ++-
ui/src/app/app.component.html | 2 +-
ui/src/app/i18n/component/translate.component.ts | 1 +
ui/src/app/i18n/directive/translate.directive.ts | 2 +-
.../component/provider-wizard-summary.component.html | 4 ++--
.../provider/component/summary-property.component.html | 4 ++--
ui/src/app/schema-form/registry.ts | 4 ++--
ui/src/app/schema-form/schema-form.module.ts | 4 +++-
.../app/schema-form/widget/array/array.component.html | 2 +-
.../widget/boolean-radio/boolean-radio.component.html | 2 +-
.../schema-form/widget/check/checklist.component.html | 2 +-
.../widget/datalist/datalist.component.html | 8 ++++----
.../widget/fieldset/fieldset.component.html | 4 +++-
.../widget/filter-target/filter-target.component.html | 9 +++++----
.../schema-form/widget/number/number.component.html | 9 ++++++---
.../schema-form/widget/object/object.component.html | 7 +++++++
.../app/schema-form/widget/object/object.component.ts | 10 ++++++++++
.../schema-form/widget/select/select.component.html | 6 +++---
.../schema-form/widget/string/string.component.html | 8 +++++---
.../widget/textarea/textarea.component.html | 2 +-
ui/src/app/shared/shared.module.ts | 4 +++-
.../assets/schema/filter/metadata-filter.schema.json | 2 +-
.../provider/filebacked-http-common.editor.schema.json | 2 +-
.../schema/provider/metadata-provider.schema.json | 2 +-
24 files changed, 67 insertions(+), 36 deletions(-)
create mode 100644 ui/src/app/schema-form/widget/object/object.component.html
create mode 100644 ui/src/app/schema-form/widget/object/object.component.ts
diff --git a/backend/src/main/resources/i18n/messages_en.properties b/backend/src/main/resources/i18n/messages_en.properties
index 61dab97c0..52cf82c81 100644
--- a/backend/src/main/resources/i18n/messages_en.properties
+++ b/backend/src/main/resources/i18n/messages_en.properties
@@ -1,5 +1,6 @@
action.dashboard=Dashboard
action.logout=Logout
+action.add=Add
action.add-new=Add New
action.add-new-provider=Add a new metadata provider
action.add-new-source=Add a new metadata source
@@ -231,7 +232,7 @@ label.script=Script
label.metadata-filter=Metadata Filter
label.metadata-filter-type=Metadata Filter Type
-label.http-connnection-attributes=HTTP Connection Attributes
+label.http-connection-attributes=HTTP Connection Attributes
label.http-security-attributes=HTTP Security Attributes
label.http-proxy-attributes=HTTP Proxy Attributes
label.http-caching-attributes=HTTP Caching Attributes
diff --git a/ui/src/app/app.component.html b/ui/src/app/app.component.html
index 57c089920..4d6ba9564 100644
--- a/ui/src/app/app.component.html
+++ b/ui/src/app/app.component.html
@@ -77,7 +77,7 @@
{{ formatted$ | async }}
|
- Copyright © Internet2
+ Copyright © Internet2
diff --git a/ui/src/app/i18n/component/translate.component.ts b/ui/src/app/i18n/component/translate.component.ts
index 9eb6f6623..42bf18407 100644
--- a/ui/src/app/i18n/component/translate.component.ts
+++ b/ui/src/app/i18n/component/translate.component.ts
@@ -37,6 +37,7 @@ export class TranslateComponent implements OnDestroy {
@Input() set params(params: any) {
this.currentParams = params || {};
+ console.log(params);
this.update();
}
diff --git a/ui/src/app/i18n/directive/translate.directive.ts b/ui/src/app/i18n/directive/translate.directive.ts
index a904c5167..099317716 100644
--- a/ui/src/app/i18n/directive/translate.directive.ts
+++ b/ui/src/app/i18n/directive/translate.directive.ts
@@ -51,7 +51,7 @@ export class TranslateDirective implements OnDestroy {
update(): void {
const translated = this.service.translate(this.key, this.currentParams, this.messages);
this.element.nativeElement.textContent = translated;
- // this.element.nativeElement.data = translated;
+ this.element.nativeElement.data = translated;
}
ngOnDestroy() {
diff --git a/ui/src/app/metadata/provider/component/provider-wizard-summary.component.html b/ui/src/app/metadata/provider/component/provider-wizard-summary.component.html
index 651bbb607..b001769f5 100644
--- a/ui/src/app/metadata/provider/component/provider-wizard-summary.component.html
+++ b/ui/src/app/metadata/provider/component/provider-wizard-summary.component.html
@@ -1,9 +1,9 @@
-