Merge pull request #1099 from mewtaylor/issue/gh-966

Fix GH-966: Localize default “required” message
This commit is contained in:
Matthew Taylor 2016-12-08 09:35:57 -05:00 committed by GitHub
commit 11828d2d44
3 changed files with 5 additions and 3 deletions

View file

@ -1,4 +1,5 @@
var defaults = require('lodash.defaultsdeep'); var defaults = require('lodash.defaultsdeep');
var intl = require('../../lib/intl.jsx');
var libphonenumber = require('google-libphonenumber'); var libphonenumber = require('google-libphonenumber');
var phoneNumberUtil = libphonenumber.PhoneNumberUtil.getInstance(); var phoneNumberUtil = libphonenumber.PhoneNumberUtil.getInstance();
var React = require('react'); var React = require('react');
@ -44,5 +45,5 @@ module.exports.validationHOCFactory = function (defaultValidationErrors) {
}; };
module.exports.defaultValidationHOC = module.exports.validationHOCFactory({ module.exports.defaultValidationHOC = module.exports.validationHOCFactory({
isDefaultRequiredValue: 'This field is required' isDefaultRequiredValue: <intl.FormattedMessage id="form.validationRequired" />
}); });

View file

@ -93,6 +93,8 @@
"footer.help": "Help Page", "footer.help": "Help Page",
"footer.scratchFamily": "Scratch Family", "footer.scratchFamily": "Scratch Family",
"form.validationRequired": "This field is required",
"login.forgotPassword": "Forgot Password?", "login.forgotPassword": "Forgot Password?",
"navigation.signOut": "Sign out", "navigation.signOut": "Sign out",

View file

@ -39,6 +39,5 @@
"teacherRegistration.howUseScratch": "How do you plan to use Scratch at your organization?", "teacherRegistration.howUseScratch": "How do you plan to use Scratch at your organization?",
"teacherRegistration.emailStepTitle": "Email Address", "teacherRegistration.emailStepTitle": "Email Address",
"teacherRegistration.emailStepDescription": "We will send you a confirmation email that will allow you to access your Scratch Teacher Account.", "teacherRegistration.emailStepDescription": "We will send you a confirmation email that will allow you to access your Scratch Teacher Account.",
"teacherRegistration.validationEmailMatch": "The emails do not match", "teacherRegistration.validationEmailMatch": "The emails do not match"
"teacherRegistration.validationRequired": "This field is required"
} }