External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-01-21 14:38:00 -03:30
Code Issues Packages Projects Releases Wiki Activity

Mark prompt strings for translation

Browse Source
This commit is contained in:
mabashian 2018-04-24 10:26:54 -04:00
parent e5a1049edf
commit 82f2783c97
7 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
awx/ui/client/features/templates/templates.strings.js
View File

@ -28,6 +28,7 @@ function TemplatesStrings (BaseString) {
SURVEY: t.s('Survey'),
PREVIEW: t.s('Preview'),
LAUNCH: t.s('LAUNCH'),
CONFIRM: t.s('CONFIRM'),
SELECTED: t.s('SELECTED'),
NO_CREDENTIALS_SELECTED: t.s('No credentials selected'),
NO_INVENTORY_SELECTED: t.s('No inventory selected'),
@ -51,6 +52,7 @@ function TemplatesStrings (BaseString) {
CHOOSE_JOB_TYPE: t.s('Choose a job type'),
CHOOSE_VERBOSITY: t.s('Choose a verbosity'),
EXTRA_VARIABLES: t.s('Extra Variables'),
EXTRA_VARIABLES_HELP: t.s('<p>Pass extra command line variables to the playbook. This is the -e or --extra-vars command line parameter for ansible-playbook. Provide key/value pairs using either YAML or JSON.</p>JSON:<br /><blockquote>{<br />&quot;somevar&quot;: &quot;somevalue&quot;,<br />&quot;password&quot;: &quot;magic&quot;<br /> }</blockquote>YAML:<br /><blockquote>---<br />somevar: somevalue<br />password: magic<br /></blockquote>'),
PLEASE_ENTER_ANSWER: t.s('Please enter an answer.'),
PLEASE_SELECT_VALUE: t.s('Please select a value'),
VALID_INTEGER: t.s('Please enter an answer that is a valid integer.'),

6
awx/ui/client/src/scheduler/schedulerAdd.controller.js
View File

@ -8,12 +8,12 @@ export default ['$filter', '$state', '$stateParams', '$http', 'Wait',
'$scope', '$rootScope', 'CreateSelect2', 'ParseTypeChange', 'GetBasePath',
'Rest', 'ParentObject', 'JobTemplateModel', '$q', 'Empty', 'SchedulePost',
'ProcessErrors', 'SchedulerInit', '$location', 'PromptService', 'RRuleToAPI', 'moment',
'WorkflowJobTemplateModel',
'WorkflowJobTemplateModel', 'TemplatesStrings',
function($filter, $state, $stateParams, $http, Wait,
$scope, $rootScope, CreateSelect2, ParseTypeChange, GetBasePath,
Rest, ParentObject, JobTemplate, $q, Empty, SchedulePost,
ProcessErrors, SchedulerInit, $location, PromptService, RRuleToAPI, moment,
WorkflowJobTemplate
WorkflowJobTemplate, TemplatesStrings
) {
var base = $scope.base || $location.path().replace(/^\//, '').split('/')[0],
@ -88,6 +88,8 @@ export default ['$filter', '$state', '$stateParams', '$http', 'Wait',
$scope.hideForm = true;
$scope.promptActionText = TemplatesStrings.get('prompt.CONFIRM');
// extra_data field is not manifested in the UI when scheduling a Management Job
if ($state.current.name === 'jobTemplateSchedules.add'){
$scope.parseType = 'yaml';

6
awx/ui/client/src/scheduler/schedulerEdit.controller.js
View File

@ -1,11 +1,11 @@
export default ['$filter', '$state', '$stateParams', 'Wait', '$scope', 'moment',
'$rootScope', '$http', 'CreateSelect2', 'ParseTypeChange', 'ParentObject', 'ProcessErrors', 'Rest',
'GetBasePath', 'SchedulerInit', 'SchedulePost', 'JobTemplateModel', '$q', 'Empty', 'PromptService', 'RRuleToAPI',
'WorkflowJobTemplateModel',
'WorkflowJobTemplateModel', 'TemplatesStrings',
function($filter, $state, $stateParams, Wait, $scope, moment,
$rootScope, $http, CreateSelect2, ParseTypeChange, ParentObject, ProcessErrors, Rest,
GetBasePath, SchedulerInit, SchedulePost, JobTemplate, $q, Empty, PromptService, RRuleToAPI,
WorkflowJobTemplate
WorkflowJobTemplate, TemplatesStrings
) {
let schedule, scheduler, scheduleCredentials = [];
@ -21,6 +21,8 @@ function($filter, $state, $stateParams, Wait, $scope, moment,
$scope.hideForm = true;
$scope.parseType = 'yaml';
$scope.promptActionText = TemplatesStrings.get('prompt.CONFIRM');
$scope.processSchedulerEndDt = function(){
// set the schedulerEndDt to be equal to schedulerStartDt + 1 day @ midnight
var dt = new Date($scope.schedulerUTCTime);

2
awx/ui/client/src/scheduler/schedulerForm.partial.html
View File

@ -686,5 +686,5 @@
ng-disabled="!schedulerIsValid || promptModalMissingReqFields"> Save</button>
</div>
</div>
<prompt prompt-data="promptData" action-text="CONFIRM" prevent-creds-with-passwords="preventCredsWithPasswords"></prompt>
<prompt prompt-data="promptData" action-text="promptActionText" prevent-creds-with-passwords="preventCredsWithPasswords"></prompt>
</div>

2
awx/ui/client/src/templates/prompt/steps/other-prompts/prompt-other-prompts.partial.html
View File

@ -93,7 +93,7 @@
<div class="form-group Form-formGroup Form-formGroup--singleColumn" ng-if="promptData.launchConf.ask_variables_on_launch && !promptData.prompts.variables.ignore">
<label for="variables">
<span class="Form-inputLabel">{{:: vm.strings.get('prompt.EXTRA_VARIABLES') }}</span>
<a id="awp-variables" href="" aw-pop-over="<p>Pass extra command line variables to the playbook. This is the -e or --extra-vars command line parameter for ansible-playbook. Provide key/value pairs using either YAML or JSON.</p>JSON:<br /><blockquote>{<br />&quot;somevar&quot;: &quot;somevalue&quot;,<br />&quot;password&quot;: &quot;magic&quot;<br /> }</blockquote>YAML:<br /><blockquote>---<br />somevar: somevalue<br />password: magic<br /></blockquote>" data-placement="right" data-container="body" over-title="Extra Variables" class="help-link" data-original-title="" title="" tabindex="-1">
<a id="awp-variables" href="" aw-pop-over="{{:: vm.strings.get('prompt.EXTRA_VARIABLES_HELP')}}" data-placement="right" data-container="body" over-title="Extra Variables" class="help-link" data-original-title="" title="" tabindex="-1">
<i class="fa fa-question-circle"></i>
</a>
<div class="parse-selection" id="job_launch_variables_parse_type">

2
awx/ui/client/src/templates/workflows/workflow-maker/workflow-maker.controller.js
View File

@ -16,6 +16,8 @@ export default ['$scope', 'WorkflowService', 'GetBasePath', 'TemplatesService',
$scope.strings = TemplatesStrings;
$scope.preventCredsWithPasswords = true;
$scope.promptActionText = $scope.strings.get('prompt.CONFIRM');
$scope.workflowMakerFormConfig = {
nodeMode: "idle",
activeTab: "jobs",

2
awx/ui/client/src/templates/workflows/workflow-maker/workflow-maker.partial.html
View File

@ -129,5 +129,5 @@
<button type="button" class="btn btn-sm WorkflowMaker-cancelButton" ng-click="closeWorkflowMaker()"> Close</button>
<button type="button" class="btn btn-sm WorkflowMaker-saveButton" ng-click="saveWorkflowMaker()" ng-show="workflowJobTemplateObj.summary_fields.user_capabilities.edit || canAddWorkflowJobTemplate" ng-disabled="edgeFlags.conflict || workflowMakerFormConfig.nodeMode === 'add'"> Save</button>
</div>
<prompt prompt-data="promptData" action-text="CONFIRM" prevent-creds-with-passwords="preventCredsWithPasswords"></prompt>
<prompt prompt-data="promptData" action-text="promptActionText" prevent-creds-with-passwords="preventCredsWithPasswords"></prompt>
</div>