From 557780bf083d376766a2b2da401d48512d701c12 Mon Sep 17 00:00:00 2001 From: Jared Tabor Date: Wed, 20 Sep 2017 17:52:13 -0700 Subject: [PATCH 1/2] adding translation tag for "No records matched your search" --- awx/ui/client/src/shared/form-generator.js | 2 +- .../client/src/shared/list-generator/list-generator.factory.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/awx/ui/client/src/shared/form-generator.js b/awx/ui/client/src/shared/form-generator.js index 05df8c2153..325d7b9e68 100644 --- a/awx/ui/client/src/shared/form-generator.js +++ b/awx/ui/client/src/shared/form-generator.js @@ -1875,7 +1875,7 @@ angular.module('FormGenerator', [GeneratorHelpers.name, 'Utilities', listGenerat
-
`; +
`; html += i18n._('No records matched your search.'); html += `
diff --git a/awx/ui/client/src/shared/list-generator/list-generator.factory.js b/awx/ui/client/src/shared/list-generator/list-generator.factory.js index 68a3760823..8ec37ebfcd 100644 --- a/awx/ui/client/src/shared/list-generator/list-generator.factory.js +++ b/awx/ui/client/src/shared/list-generator/list-generator.factory.js @@ -237,7 +237,7 @@ export default ['$compile', 'Attr', 'Icon', // Message for when a search returns no results. This should only get shown after a search is executed with no results. html +=`
-
No records matched your search.
+
No records matched your search.
`; } From 28c171896516998149f14bce3987886d5543a344 Mon Sep 17 00:00:00 2001 From: Jared Tabor Date: Wed, 20 Sep 2017 17:58:52 -0700 Subject: [PATCH 2/2] tagging ON/OFF toggles for translations --- awx/ui/client/src/shared/form-generator.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/awx/ui/client/src/shared/form-generator.js b/awx/ui/client/src/shared/form-generator.js index 325d7b9e68..d90cac087a 100644 --- a/awx/ui/client/src/shared/form-generator.js +++ b/awx/ui/client/src/shared/form-generator.js @@ -535,11 +535,11 @@ angular.module('FormGenerator', [GeneratorHelpers.name, 'Utilities', listGenerat html += (field.flag) ? field.flag : 'enabled'; html += "' "; html += (field.ngDisabled) ? `ng-disabled="${field.ngDisabled}" ` : ""; - html += " class='ScheduleToggle-switch is-on' ng-click='" + field.ngClick + "'>" + i18n._("ON") + "
"; + html += " class='ScheduleToggle-switch' ng-click='" + field.ngClick + "' translate>" + i18n._("OFF") + ""; } return html; }, @@ -706,9 +706,9 @@ angular.module('FormGenerator', [GeneratorHelpers.name, 'Utilities', listGenerat html += (field.ngDisabled) ? ', "ScheduleToggle--disabled": ' + field.ngDisabled : ''; html += "\}' aw-tool-tip='" + field.awToolTip + "' data-placement='" + field.dataPlacement + "' data-tip-watch='" + field.dataTipWatch + "'>
ON
ON
OFF
"; + html += "' class='ScheduleToggle-switch' ng-click='" + field.ngClick + "' translate>OFF"; } if (field.type === 'alertblock') { @@ -768,9 +768,9 @@ angular.module('FormGenerator', [GeneratorHelpers.name, 'Utilities', listGenerat html += (field.ngShow) ? "ng-show=\"" + field.ngShow + "\" " : ""; html += `data-placement="top">`; html += ` + ng-disabled="${field.ngDisabled}" translate>${i18n._("ON")} + ng-disabled="${field.ngDisabled}" translate>${i18n._("OFF")} `; }