Skip to content

Commit

Permalink
Fixed placeholder text problems
Browse files Browse the repository at this point in the history
  • Loading branch information
rmathis committed Oct 25, 2021
1 parent 006b7fb commit fea89d1
Show file tree
Hide file tree
Showing 8 changed files with 11 additions and 9 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"properties": {
"name": {
"title": "label.metadata-provider-name-dashboard-display-only",
"description": "tooltip.metadata-provider-name-dashboard-display-only",
"description": "tooltip.metadata-provider-name",
"type": "string"
},
"@type": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"properties": {
"name": {
"title": "label.metadata-provider-name-dashboard-display-only",
"description": "tooltip.metadata-provider-name-dashboard-display-only",
"description": "tooltip.metadata-provider-name",
"type": "string",
"widget": {
"id": "string",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
"properties": {
"name": {
"title": "label.metadata-provider-name-dashboard-display-only",
"description": "tooltip.metadata-provider-name-dashboard-display-only",
"description": "tooltip.metadata-provider-name",
"type": "string",
"widget": {
"id": "string",
Expand Down
6 changes: 4 additions & 2 deletions backend/src/main/resources/i18n/messages.properties
Original file line number Diff line number Diff line change
Expand Up @@ -662,7 +662,7 @@ tooltip.max-cache-entry-size=The maximum response body size that may be cached,
tooltip.metadata-provider-name=Metadata Provider Name (for display on the Dashboard only)
tooltip.metadata-provider-type=Metadata Provider Type
tooltip.xml-id=Identifier for logging, identification for command line reload, etc.
tooltip.metadata-url=Identifier for logging, identification for command line reload, etc.
tooltip.metadata-url=The URL that the metadata is served from.
tooltip.metadata-file=The absolute path to the local metadata file to be loaded.
tooltip.init-from-backup=Flag indicating whether initialization should first attempt to load metadata from the backup file. If true, foreground initialization will be performed by loading the backing file, and then a refresh from the remote HTTP server will be scheduled to execute in a background thread, after a configured delay. This can improve IdP startup times when the remote HTTP file is large in size.
tooltip.backing-file=Specifies where the backing file is located. If the remote server is unavailable at startup, the backing file is loaded instead.
Expand Down Expand Up @@ -718,4 +718,6 @@ tooltip.group-name=Group Name
tooltip.group-description=Group Description

tooltip.role-name=Role Name
tooltip.role-description=Role Description
tooltip.role-description=Role Description

tooltip.contact-information=Contact Information
2 changes: 1 addition & 1 deletion backend/src/main/resources/i18n/messages_en.properties
Original file line number Diff line number Diff line change
Expand Up @@ -513,7 +513,7 @@ tooltip.max-cache-entry-size=The maximum response body size that may be cached,
tooltip.metadata-provider-name=Metadata Provider Name (for display on the Dashboard only)
tooltip.metadata-provider-type=Metadata Provider Type
tooltip.xml-id=Identifier for logging, identification for command line reload, etc.
tooltip.metadata-url=Identifier for logging, identification for command line reload, etc.
tooltip.metadata-url=The URL that the metadata is served from.
tooltip.metadata-file=The absolute path to the local metadata file to be loaded.
tooltip.init-from-backup=Flag indicating whether initialization should first attempt to load metadata from the backup file. If true, foreground initialization will be performed by loading the backing file, and then a refresh from the remote HTTP server will be scheduled to execute in a background thread, after a configured delay. This can improve IdP startup times when the remote HTTP file is large in size.
tooltip.backing-file=Specifies where the backing file is located. If the remote server is unavailable at startup, the backing file is loaded instead.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"properties": {
"name": {
"title": "label.metadata-provider-name-dashboard-display-only",
"description": "tooltip.metadata-provider-name-dashboard-display-only",
"description": "tooltip.metadata-provider-name",
"type": "string",
"widget": {
"id": "string",
Expand Down
2 changes: 1 addition & 1 deletion ui/src/app/form/component/fields/FilterTargetField.js
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ const FilterTargetField = ({
<i className="fa fa-asterisk text-danger" aria-hidden="true"></i>
</span>
<span>
<InfoIcon value={translate('label.search-criteria-by', translate(displayType))}></InfoIcon>
<InfoIcon value={translate('label.search-criteria-by')} params={{ displayType: translate(displayType) }}></InfoIcon>
</span>
</label>
<div className="d-flex justify-content-between">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ export const BaseFilterDefinition = {

return (formData, errors) => {
if (names.indexOf(formData.name) > -1) {
errors.name.addError('message.name-unique');
errors.name.addError('message.name-must-be-unique');
}

if (formData.hasOwnProperty(targetProp)) {
Expand Down

0 comments on commit fea89d1

Please sign in to comment.