Merge pull request #3393 from benjiwheeler/join-flow-country-fixes

Join flow country placeholder
This commit is contained in:
Benjamin Wheeler 2019-09-25 09:50:59 -04:00 committed by GitHub
commit 030f88f754
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions

View file

@ -30,7 +30,7 @@ class CountryStep extends React.Component {
this.countryOptions = [...countryData.registrationCountryOptions]; this.countryOptions = [...countryData.registrationCountryOptions];
this.countryOptions.unshift({ // add placeholder as first option this.countryOptions.unshift({ // add placeholder as first option
disabled: true, disabled: true,
label: this.props.intl.formatMessage({id: 'general.country'}), label: this.props.intl.formatMessage({id: 'registration.selectCountry'}),
value: 'null' value: 'null'
}); });
} }

View file

@ -185,7 +185,7 @@
"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.private": "We will keep this information private.", "registration.private": "We will keep this information private.",
"registration.receiveEmails": "I'd like to receive emails from the Scratch Team about project ideas, events, and more.", "registration.receiveEmails": "I'd like to receive emails from the Scratch Team about project ideas, events, and more.",
"registration.selectCountry": "select country", "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.troubleReload": "Scratch is having trouble finishing registration. Try reloading the page or try again in another browser.", "registration.troubleReload": "Scratch is having trouble finishing registration. Try reloading the page or try again in another browser.",