Skip to content

Commit 6081eda

Browse files
converting all aria-label attributes to use i18n resource bundle (#94)
1 parent edb5a6b commit 6081eda

11 files changed

+27
-13
lines changed

electron/app/locales/en/webui.json

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{
22
"copyright-footer-text": "Copyright (c) 2021, {{currentYear}}, Oracle and/or its affiliates. Licensed under The Universal Permissive License (UPL), Version 1.0, as shown at",
33

4+
"nav-aria-label": "Choose a navigation item",
45
"nav-model": "Model",
56
"nav-project-settings": "Project Settings",
67
"nav-image": "Image",
@@ -81,12 +82,14 @@
8182
"project-settings-form-name": "Project Settings",
8283
"project-settings-title": "Project Settings",
8384
"project-settings-mac-environment-question": "For macOS, do you need to add directories to the PATH or define other environment variables for Docker/Podman or Kubernetes?",
85+
"project-settings-mac-path-table-aria-label": "macOS Extra Path Directories Table",
8486
"project-settings-add-path-row-icon-text": "Add Extra Path Directory",
8587
"project-settings-choose-path-icon-text": "Choose Extra Path Directory",
8688
"project-settings-delete-path-row-icon-text": "Remove Extra Path Directory",
8789
"project-settings-extra-path-directory-header": "Extra Path Directory",
8890
"project-settings-hints-macos-path-directories": "Show System Path Directories",
8991
"project-settings-button-macos-path-directories": "Show System Path",
92+
"project-settings-mac-env-var-table-aria-label": "macOS Extra Environment Variables Table",
9093
"project-settings-add-env-var-row-icon-text": "Add Extra Environment Variable",
9194
"project-settings-delete-env-var-row-icon-text": "Remove Extra Environment Variable",
9295
"project-settings-extra-environment-variable-name-header": "Extra Environment Variable Name",
@@ -144,9 +147,11 @@
144147
"project-settings-credential-store-policy-answer-message": "The Credential Store Policy controls how credentials are handled when the project is saved and loaded. The options are to store them in the machine's native credential store, store them in the project file encrypted with a passphrase, or not store them at all.",
145148

146149
"macos-path-directories-dialog-title": "System Path",
150+
"macos-path-directories-dialog-table-aria-label": "System Path Environment Variable Directories",
147151
"macos-path-directories-dialog-name-header": "Path Directory",
148152

149153
"macos-environment-variables-dialog-title": "System Environment Variables",
154+
"macos-environment-variables-dialog-table-aria-label": "System Environment Variables Table",
150155
"macos-environment-variables-dialog-name-header": "Environment Variable Name",
151156
"macos-environment-variables-dialog-value-header": "Environment Variable Value",
152157

@@ -578,6 +583,7 @@
578583
"domain-design-cluster-additional-java-options-label": "Additional Java Options",
579584
"domain-design-cluster-additional-java-options-help": "A list of additional Java runtime options, separated by spaces, tabs, or commas.",
580585

586+
"domain-design-configmap-table-aria-label": "ConfigMap Properties Table",
581587
"domain-design-configmap-title": "Model Variables Overrides",
582588
"domain-design-configmap-label": "Kubernetes ConfigMap Name",
583589
"domain-design-configmap-help": "The name of the Kubernetes ConfigMap that holds the model variable overrides.",
@@ -614,6 +620,7 @@
614620
"domain-design-propname-header": "Model Variable Name",
615621
"domain-design-propvalue-header": "Model Variable File Value",
616622
"domain-design-propoverride-header": "Model Variable Override Value",
623+
"domain-design-secrets-table-aria-label": "Secrets Table",
617624
"domain-design-secretname-header": "Secret Name",
618625
"domain-design-username-header": "Username",
619626
"domain-design-password-header": "Password",
@@ -678,6 +685,7 @@
678685
"ingress-design-ingress-route-is-console-svc-help": "For SSL terminating at ingress and accessing WebLogic Console Service, turn on this option. Your domain must have 'WeblogicPluginEnabled: true' in the 'resources->WebAppContainer' section",
679686
"ingress-design-ingress-route-name-label": "Name",
680687
"ingress-design-ingress-route-dialog-title": "Edit Ingress Route",
688+
"ingress-design-ingress-route-annotations-table-aria-label": "Ingress Route Annotations Table",
681689
"ingress-design-ingress-route-annotation-label": "Annotation",
682690
"ingress-design-ingress-route-annotationValue-label": "Value",
683691
"ingress-design-ingress-annotations": "Optional Annotations",
@@ -720,6 +728,7 @@
720728
"ingress-design-generate-tls-subject-label": "Subject to Use for the Generated TLS Certificate",
721729
"ingress-design-generate-tls-subject-help": "The Subject (e.g., /CN=www.mydomain.org) to use when generating TLS certificate. The format must be /type0=value0/type1=value1/type2=...",
722730

731+
"ingress-design-routes-table-aria-label": "Ingress Routes Table",
723732
"ingress-design-add-route-label": "Add Route",
724733
"ingress-design-edit-route-label": "Edit Route",
725734
"ingress-design-delete-route-label": "Delete Route",
@@ -1004,10 +1013,14 @@
10041013
"model-page-hints-prepareModel": "Prepare Model for Kubernetes",
10051014
"model-page-model-editor-contents": "Model Editor Contents",
10061015

1016+
"model-properties-table-aria-label": "Model Variables Editable Table",
10071017
"model-properties-name-header": "Variable Name",
10081018
"model-properties-value-header": "Variable Value",
10091019
"model-properties-add-label": "Add Variable",
10101020
"model-properties-delete-label": "Delete",
1021+
1022+
"model-archive-toolbar-aria-label": "Archive Editing Toolbar",
1023+
"model-archive-tree-view-aria-label": "Archive Editor Tree View",
10111024
"model-archive-add-label": "Add",
10121025
"model-archive-delete-label": "Delete",
10131026
"model-archive-no-archive-label": "(no archive)",
@@ -1299,6 +1312,7 @@
12991312
"quickstart-dialog-title": "WebLogic Kubernetes Toolkit (WKT) UI Introduction",
13001313
"quickstart-dialog-stop-showing-quickstart-message": "Stop showing this introduction at startup.",
13011314

1315+
"quickstart-dialog-filmstrip-aria-label": "WebLogic Kubernetes Toolkit UI Tutorial",
13021316
"quickstart-page1-title": "Introduction",
13031317
"quickstart-page1-paragraph-1": "Ready to get your WebLogic Server domain running in Kubernetes?",
13041318
"quickstart-page1-paragraph-2": "This application will guide you through the process of creating a WebLogic Server domain in Kubernetes.",

webui/src/js/views/app-main.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<div id="pageContent" class="oj-web-applayout-page">
1717
<div id="wkt-container" class="oj-sm-flex-wrap-nowrap oj-flex">
1818
<div id="navlistcontainer" class="oj-bg-neutral-170 oj-color-invert" :class="[[{collapsed : navCollapsed}]]">
19-
<oj-navigation-list aria-label="Choose a navigation item"
19+
<oj-navigation-list :aria-label="[[labelMapper('aria-label')]]"
2020
class="oj-bg-neutral-170 oj-color-invert wkt-navigation-list"
2121
data="[[navDataProvider]]"
2222
display="[[navDisplay]]"

webui/src/js/views/domain-design-view.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -284,7 +284,7 @@ <h6 class="wkt-subheading"><oj-bind-text value="[[labelMapper('configmap-title')
284284

285285
<oj-table id="properties-table"
286286
class="wkt-domain-properties-table"
287-
aria-label="ConfigMap Properties Table"
287+
:aria-label="[[labelMapper('configmap-table-aria-label')]]"
288288
data="{{configMapDP}}"
289289
display="grid"
290290
horizontal-grid-visible="enabled"
@@ -315,7 +315,7 @@ <h6 class="wkt-subheading"><oj-bind-text value="[[labelMapper('configmap-title')
315315
<h6 class="wkt-subheading"><oj-bind-text value="[[labelMapper('secrets-title')]]"></oj-bind-text></h6>
316316
<oj-table id="secrets-table"
317317
class="wkt-domain-secrets-table"
318-
aria-label="Secrets Table"
318+
:aria-label="[[labelMapper('secrets-table-aria-label')]]"
319319
data="[[secretsDP]]"
320320
display="grid"
321321
horizontal-grid-visible="enabled"

webui/src/js/views/ingress-design-view.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ <h6 class="wkt-subheading">
176176
</h6>
177177
<oj-table id="routes-table"
178178
class="wkt-model-properties-table"
179-
aria-label="Editable Properties Table"
179+
:aria-label="[[labelMapper('routes-table-aria-label')]]"
180180
data="[[routesDataProvider]]"
181181
display="grid"
182182
horizontal-grid-visible="enabled"

webui/src/js/views/macos-environment-variables-dialog.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<div class="oj-panel wkt-notop wkt-full-height">
1212
<oj-table id="macos-environment-variables-table"
1313
class="wkt-env-vars-table"
14-
aria-label="Inherited Environment Variables Table"
14+
:aria-label="[[labelMapper('table-aria-label')]]"
1515
data="[[environmentVariablesDataProvider]]"
1616
display="grid"
1717
layout="fixed"

webui/src/js/views/macos-path-directories-dialog.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<div class="oj-panel wkt-notop wkt-full-height">
1212
<oj-table id="macos-path-variable-table"
1313
class="wkt-paths-table"
14-
aria-label="Inherited PATH Environment Variable Table"
14+
aria-label="[[labelMapper('table-aria-label')]]"
1515
data="[[pathDirectoriesDataProvider]]"
1616
display="grid"
1717
horizontal-grid-visible="enabled"

webui/src/js/views/model-archive-view.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
-->
55

66
<div id="wkt-model-archive" class="wkt-model-archive">
7-
<oj-toolbar id='myToolbar1' aria-label='Editing Toolbar' aria-controls='controlled'
7+
<oj-toolbar id='myToolbar1' :aria-label="[[labelMapper('toolbar-aria-label')]]" aria-controls='controlled'
88
class="wkt-archive-toolbar" :class="oj-toolbar-bottom-border">
99

1010
<div class="wkt-archive-label"><oj-bind-text value="[[archiveLabel]]"></oj-bind-text></div>
@@ -27,7 +27,7 @@
2727
data="[[archiveDataProvider]]"
2828
selection-mode="single"
2929
on-selected-changed="[[selectionChanged]]"
30-
aria-label="Tree View with JSON Data">
30+
:aria-label="[[labelMapper('tree-view-aria-label')]]">
3131
<template slot="itemTemplate" data-oj-as="row">
3232
<span class="oj-treeview-item-icon"></span>
3333
<span class="oj-treeview-item-text">

webui/src/js/views/model-properties-view.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
-->
55
<oj-table id="properties-table"
66
class="wkt-model-properties-table"
7-
aria-label="Editable Properties Table"
7+
:aria-label="[[labelMapper('table-aria-label')]]"
88
data="[[propertiesDataProvider]]"
99
edit-mode="rowEdit"
1010
display="grid"

webui/src/js/views/project-settings-page.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ <h6 class="wkt-subheading"><oj-bind-text value="[[labelMapper('mac-environment-q
1111
<div class="wkt-table-button-grid">
1212
<oj-table id="extra-path-directories-table"
1313
class="wkt-paths-table"
14-
aria-label="Extra Path Directories Table"
14+
:aria-label="[[labelMapper('mac-path-table-aria-label')]]"
1515
data="[[extraPathDirectoriesDataProvider]]"
1616
display="grid"
1717
layout="fixed"
@@ -71,7 +71,7 @@ <h6 class="wkt-subheading"><oj-bind-text value="[[labelMapper('mac-environment-q
7171

7272
<oj-table id="extra-environment-variables-table"
7373
class="wkt-env-vars-table"
74-
aria-label="Extra Environment Variables Table"
74+
:aria-label="[[labelMapper('mac-env-var-table-aria-label')]]"
7575
data="[[extraEnvironmentVariablesDataProvider]]"
7676
display="grid"
7777
layout="fixed"

webui/src/js/views/quickstart-dialog.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
class="wkt-quickstart-filmstrip"
1313
arrow-placement="adjacent"
1414
arrow-visibility="auto"
15-
aria-label="WebLogic Kubernetes Toolkit UI Tutorial"
15+
:aria-label="[[labelMapper('filmstrip-aria-label')]]"
1616
max-items-per-page="1">
1717
<oj-bind-for-each data="[[quickstartPagesConfig]]">
1818
<template>

webui/src/js/views/route-edit-dialog.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ <h6 class="wkt-subheading">
7979
<oj-bind-text value="[[labelMapper('route-annotations-table-title')]]"></oj-bind-text>
8080
</h6>
8181
<oj-table class="wkt-model-properties-table"
82-
aria-label="Ingress Routes Table"
82+
:aria-label="[[labelMapper('route-annotations-table-aria-label')]]"
8383
data="[[annotationsProvider]]"
8484
edit-mode="rowEdit"
8585
columns='[[annotationColumns]]'>

0 commit comments

Comments
 (0)