scratchfoundation/scratch-www
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-www.git synced 2024-11-23 07:38:07 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Move "select country" to general strings

Browse source 
It's reused in the other registration views so doesn't belong in teacherregistration/l10n.json

Fixes #783
This commit is contained in:
Ray Schamp 2016-07-28 12:26:56 -04:00
parent 9e9ffc96e9
commit e218cc5169
3 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/components/registration/steps.jsx
View file

@ -29,7 +29,7 @@ require('./steps.scss');
var DEFAULT_COUNTRY = 'us'; var DEFAULT_COUNTRY = 'us';
var getCountryOptions = function (defaultCountry) { var getCountryOptions = function (defaultCountry) {
var options = countryData.countryOptions.concat({ var options = countryData.countryOptions.concat({
label: <intl.FormattedMessage id="teacherRegistration.selectCountry" />, label: <intl.FormattedMessage id="registration.selectCountry" />,
disabled: true, disabled: true,
selected: true selected: true
}); });

1
src/l10n.json
View file

@ -128,6 +128,7 @@
"registration.notYou": "Not you? Log in as another user", "registration.notYou": "Not you? Log in as another user",
"registration.personalStepTitle": "Personal Information", "registration.personalStepTitle": "Personal Information",
"registration.personalStepDescription": "Your individual responses will not be displayed publicly, and will be kept confidential and secure", "registration.personalStepDescription": "Your individual responses will not be displayed publicly, and will be kept confidential and secure",
"registration.selectCountry": "select country",
"registration.studentPersonalStepDescription": "This information will not appear on the Scratch website.", "registration.studentPersonalStepDescription": "This information will not appear on the Scratch website.",
"registration.showPassword": "Show password", "registration.showPassword": "Show password",
"registration.usernameStepDescription": "Fill in the following forms to request an account. The approval process may take up to 24 hours.", "registration.usernameStepDescription": "Fill in the following forms to request an account. The approval process may take up to 24 hours.",

1
src/views/teacherregistration/l10n.json
View file

@ -25,7 +25,6 @@
"teacherRegistration.orgChoiceCamp": "Camp", "teacherRegistration.orgChoiceCamp": "Camp",
"teacherRegistration.orgChoiceOther": " ", "teacherRegistration.orgChoiceOther": " ",
"teacherRegistration.notRequired": "Not Required", "teacherRegistration.notRequired": "Not Required",
"teacherRegistration.selectCountry": "select country",
"teacherRegistration.addressValidationError": "This doesn't look like a real address", "teacherRegistration.addressValidationError": "This doesn't look like a real address",
"teacherRegistration.addressLine1": "Address Line 1", "teacherRegistration.addressLine1": "Address Line 1",
"teacherRegistration.addressLine2": "Address Line 2 (Optional)", "teacherRegistration.addressLine2": "Address Line 2 (Optional)",