diff --git a/awx/ui/static/js/controllers/Authentication.js b/awx/ui/static/js/controllers/Authentication.js
index 277aeac96f..793739ec03 100644
--- a/awx/ui/static/js/controllers/Authentication.js
+++ b/awx/ui/static/js/controllers/Authentication.js
@@ -120,7 +120,7 @@ function Authenticate($log, $cookieStore, $compile, $window, $rootScope, $locati
"
\n" +
"
\n" +
- "
A value is required!
\n" +
+ "
A value is required.
\n" +
"
\n" +
"
\n" +
"\n" +
@@ -129,7 +129,7 @@ function Authenticate($log, $cookieStore, $compile, $window, $rootScope, $locati
"\n" +
"
\n" +
- "
A value is required!
\n" +
+ "
A value is required.
\n" +
"
\n" +
"
\n" +
"\n" +
diff --git a/awx/ui/static/js/forms/SurveyMaker.js b/awx/ui/static/js/forms/SurveyMaker.js
index 6e732e556b..e16f4aa655 100644
--- a/awx/ui/static/js/forms/SurveyMaker.js
+++ b/awx/ui/static/js/forms/SurveyMaker.js
@@ -30,7 +30,7 @@ angular.module('SurveyMakerFormDefinition', [])
// 'Survey Name
// '+
// '
'+
- // '
A value is required!
'+
+ // '
A value is required.
'+
// '
'+
// '
'+
// ''+
diff --git a/awx/ui/static/js/forms/SurveyQuestion.js b/awx/ui/static/js/forms/SurveyQuestion.js
index eda11527f6..875d3ee2a5 100644
--- a/awx/ui/static/js/forms/SurveyQuestion.js
+++ b/awx/ui/static/js/forms/SurveyQuestion.js
@@ -61,7 +61,7 @@ angular.module('SurveyQuestionFormDefinition', [])
'user_id
host_name
" '+
'data-placement="right" data-container="body" data-title="Answer Variable Name" class="help-link" data-original-title="" title="" tabindex="-1">
'+
'
'+
- '
A value is required!
'+
+ '
A value is required.
'+
'
The value contains an illegal character!
'+
'
This variable is already in use.
' +
'
'+
@@ -104,13 +104,13 @@ angular.module('SurveyQuestionFormDefinition', [])
control:'
'+
'
'+
'
Minimum Length '+
- '
This is not valid integer!
'+
+ '
This is not a valid integer.
'+
'
Too high!
'+
'
Too low!
'+
'
'+
'
'+
'
Maximum Length '+
- '
This is not valid integer!
'+
+ '
This is not a valid integer.
'+
'
Too low!
'+
'
'+
'
',
@@ -125,13 +125,13 @@ angular.module('SurveyQuestionFormDefinition', [])
control:'
'+
'
'+
'
Minimum Length '+
- '
This is not valid integer!
'+
+ '
This is not a valid integer.
'+
'
Too high!
'+
'
Too low!
'+
'
'+
'
'+
'
Maximum Length '+
- '
This is not valid integer!
'+
+ '
This is not a valid integer.
'+
'
Too low!
'+
'
'+
'
',
@@ -146,12 +146,12 @@ angular.module('SurveyQuestionFormDefinition', [])
control:'
'+
'
'+
'
Minimum '+
- '
This is not valid integer!
'+
+ '
This is not a valid integer.
'+
'
Too high!
'+
'
'+
'
'+
'
Maximum '+
- '
This is not valid integer!
'+
+ '
This is not a valid integer.
'+
'
Too low!
'+
'
'+
'
',
@@ -166,12 +166,12 @@ angular.module('SurveyQuestionFormDefinition', [])
control: '
'+
'
'+
'
Minimum '+
- '
This is not valid float!
'+
+ '
This is not a valid decimal number.
'+
'
Too high!
'+
'
'+
'
'+
'
Maximum '+
- '
This is not valid float!
'+
+ '
This is not a valid decimal number.
'+
'
Too low!
'+
'
'+
@@ -217,7 +217,7 @@ angular.module('SurveyQuestionFormDefinition', [])
control: '
'+
'
Default Answer '+
'
'+
- '
This is not valid integer!
'+
+ '
This is not a valid integer.
'+
'
The value must be in range {{int_min}} to {{int_max}}!
'+
'
',
column: 2,
@@ -229,7 +229,7 @@ angular.module('SurveyQuestionFormDefinition', [])
control: '
'+
'
Default Answer '+
'
'+
- '
This is not valid float!
'+
+ '
This is not a valid decimal number.
'+
'
The value must be in range {{float_min}} to {{float_max}}!
'+
'
',
column: 2,
diff --git a/awx/ui/static/js/helpers/JobSubmission.js b/awx/ui/static/js/helpers/JobSubmission.js
index 5b65178856..9d63b472de 100644
--- a/awx/ui/static/js/helpers/JobSubmission.js
+++ b/awx/ui/static/js/helpers/JobSubmission.js
@@ -308,7 +308,7 @@ function($location, Wait, GetBasePath, LookUpInit, JobTemplateForm, CredentialLi
html += " >";
// Add error messages
html += "
A value is required!
\n";
+ "job_launch_form." + fld + ".$error.required\">A value is required.
\n";
html += "
\n";
html += "
\n";
@@ -330,7 +330,7 @@ function($location, Wait, GetBasePath, LookUpInit, JobTemplateForm, CredentialLi
html += "/>";
// Add error messages
html += "
A value is required!\n";
+ "job_launch_form." + fld + ".$error.required\">A value is required.\n";
html += (field.awPassMatch) ? "Must match Password value
\n" : "";
html += "
\n";
@@ -529,7 +529,7 @@ function($location, Wait, GetBasePath, LookUpInit, JobTemplateForm, CredentialLi
'ng-minlength="'+minlength+'" ng-maxlength="'+maxlength+'" '+
'class="form-control" ng-required='+question.required+'>'+
'
A value is required!
'+
+ 'job_launch_form.'+question.variable+'.$error.required\">A value is required.
'+
'
The answer must be between {{'+minlength+'}} to {{'+maxlength+'}} characters long.
'+
'
';
@@ -543,7 +543,7 @@ function($location, Wait, GetBasePath, LookUpInit, JobTemplateForm, CredentialLi
'ng-minlength="'+minlength+'" ng-maxlength="'+maxlength+'" '+
'class="form-control final" ng-required="'+question.required+'" rows="3">'+
'
A value is required!
'+
+ 'job_launch_form.'+question.variable+'.$error.required\">A value is required.
'+
'The answer must be between {{'+minlength+'}} to {{'+maxlength+'}} characters long.
'+
'
';
@@ -562,7 +562,7 @@ function($location, Wait, GetBasePath, LookUpInit, JobTemplateForm, CredentialLi
''+choices[j] +' ' ;
}
html+= 'A value is required!
'+
+ 'job_launch_form.'+question.variable+'.$error.required\">A value is required.'+
'
';
html+= ''; //end survey_taker_input
}
@@ -587,15 +587,15 @@ function($location, Wait, GetBasePath, LookUpInit, JobTemplateForm, CredentialLi
//surveyCheckboxes takes a list of checkboxes and connects them to one scope variable
html += ''+
' {{job_launch_form.'+question.variable+'_object.$error.checkbox}}'+
- 'A value is required!
';
+ 'A value is required.
';
}
if(question.type === 'integer'){
min = (!Empty(question.min)) ? Number(question.min) : "";
max = (!Empty(question.max)) ? Number(question.max) : "" ;
html+=' '+
- 'A value is required!
'+
- 'This is not valid integer!
'+
+ 'A value is required.
'+
+ 'This is not a valid integer.
'+
' The value must be in range {{'+min+'}} to {{'+max+'}}!
';
}
@@ -605,8 +605,8 @@ function($location, Wait, GetBasePath, LookUpInit, JobTemplateForm, CredentialLi
max = (!Empty(question.max)) ? question.max : "" ;
defaultValue = (!Empty(question.default)) ? question.default : (!Empty(question.default_float)) ? question.default_float : "" ;
html+=' '+
- 'A value is required!
'+
- 'This is not valid float!
'+
+ 'A value is required.
'+
+ 'This is not a valid decimal number.
'+
' The value must be in range {{'+min+'}} to {{'+max+'}}!
';
}
html+='';
diff --git a/awx/ui/static/lib/ansible/form-generator.js b/awx/ui/static/lib/ansible/form-generator.js
index facf8768d5..452e17927b 100644
--- a/awx/ui/static/lib/ansible/form-generator.js
+++ b/awx/ui/static/lib/ansible/form-generator.js
@@ -776,11 +776,11 @@ angular.module('FormGenerator', ['GeneratorHelpers', 'Utilities', 'ListGenerator
if ((options.mode === 'add' && field.addRequired) || (options.mode === 'edit' && field.editRequired) ||
field.awRequiredWhen) {
html += "A value is required!
\n";
+ this.form.name + '_form.' + fld + ".$error.required\">A value is required.\n";
}
if (field.type === "email") {
html += "A valid email address is required!
\n";
+ this.form.name + '_form.' + fld + ".$error.email\">A valid email address is required.\n";
}
if (field.awPassMatch) {
html += "A value is required!
\n";
+ this.form.name + '_form.' + fld + ".$error.required\">A value is required.\n";
}
html += "
\n";
html += "\n";
@@ -916,7 +916,7 @@ angular.module('FormGenerator', ['GeneratorHelpers', 'Utilities', 'ListGenerator
if ((options.mode === 'add' && field.addRequired) || (options.mode === 'edit' && field.editRequired) ||
field.awRequiredWhen) {
html += "A value is required!
\n";
+ this.form.name + '_form.' + fld + ".$error.required\">A value is required.\n";
}
html += "
\n";
@@ -962,7 +962,7 @@ angular.module('FormGenerator', ['GeneratorHelpers', 'Utilities', 'ListGenerator
// Add error messages
if ((options.mode === 'add' && field.addRequired) || (options.mode === 'edit' && field.editRequired)) {
html += "A value is required!
\n";
+ this.form.name + '_form.' + fld + ".$error.required\">A value is required.\n";
}
if (field.integer) {
html += "Must be an integer value
\n";
@@ -995,7 +995,7 @@ angular.module('FormGenerator', ['GeneratorHelpers', 'Utilities', 'ListGenerator
// Add error messages
if ((options.mode === 'add' && field.addRequired) || (options.mode === 'edit' && field.editRequired)) {
html += "A value is required!
\n";
+ this.form.name + '_form.' + fld + ".$error.required\">A value is required.\n";
}
if (field.integer) {
html += "Must be an integer value
\n";
@@ -1066,7 +1066,7 @@ angular.module('FormGenerator', ['GeneratorHelpers', 'Utilities', 'ListGenerator
if ((options.mode === 'add' && field.addRequired) || (options.mode === 'edit' && field.editRequired)) {
html += "A value is required!
\n";
+ this.form.name + '_form.' + fld + ".$error.required\">A value is required.\n";
}
html += "
\n";
@@ -1145,7 +1145,7 @@ angular.module('FormGenerator', ['GeneratorHelpers', 'Utilities', 'ListGenerator
this.form.name + '_form.' +
field.sourceModel + '_' + field.sourceField + ".$dirty && " +
this.form.name + '_form.' + field.sourceModel + '_' + field.sourceField +
- ".$error.required\">A value is required!\n";
+ ".$error.required\">A value is required.\n";
}
html += "
How many days of data would you like to
keep ?
-
A value is required!
+
A value is required.
\ No newline at end of file
diff --git a/awx/ui/static/partials/job_templates.html b/awx/ui/static/partials/job_templates.html
index df51fc051c..7676a7cda2 100644
--- a/awx/ui/static/partials/job_templates.html
+++ b/awx/ui/static/partials/job_templates.html
@@ -8,7 +8,7 @@
\ No newline at end of file
diff --git a/awx/ui/static/partials/login-dialog.html b/awx/ui/static/partials/login-dialog.html
index f39c5155af..94b30ba6b0 100644
--- a/awx/ui/static/partials/login-dialog.html
+++ b/awx/ui/static/partials/login-dialog.html
@@ -12,7 +12,7 @@
Username:
- A value is required!
+ A value is required.
@@ -20,7 +20,7 @@
Password:
- A value is required!
+ A value is required.
diff --git a/awx/ui/templates/ui/index.html b/awx/ui/templates/ui/index.html
index d0c0e8e45f..29e6259c65 100644
--- a/awx/ui/templates/ui/index.html
+++ b/awx/ui/templates/ui/index.html
@@ -426,8 +426,8 @@