From e218cc5169351494573b233084e7c6d44f3ce92e Mon Sep 17 00:00:00 2001 From: Ray Schamp Date: Thu, 28 Jul 2016 12:26:56 -0400 Subject: [PATCH] Move "select country" to general strings It's reused in the other registration views so doesn't belong in teacherregistration/l10n.json Fixes #783 --- src/components/registration/steps.jsx | 2 +- src/l10n.json | 1 + src/views/teacherregistration/l10n.json | 1 - 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/registration/steps.jsx b/src/components/registration/steps.jsx index b505d71ca..5cb9ee1c1 100644 --- a/src/components/registration/steps.jsx +++ b/src/components/registration/steps.jsx @@ -29,7 +29,7 @@ require('./steps.scss'); var DEFAULT_COUNTRY = 'us'; var getCountryOptions = function (defaultCountry) { var options = countryData.countryOptions.concat({ - label: , + label: , disabled: true, selected: true }); diff --git a/src/l10n.json b/src/l10n.json index c55cb851f..098cccf48 100644 --- a/src/l10n.json +++ b/src/l10n.json @@ -128,6 +128,7 @@ "registration.notYou": "Not you? Log in as another user", "registration.personalStepTitle": "Personal Information", "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.showPassword": "Show password", "registration.usernameStepDescription": "Fill in the following forms to request an account. The approval process may take up to 24 hours.", diff --git a/src/views/teacherregistration/l10n.json b/src/views/teacherregistration/l10n.json index 423370537..0d5f9680b 100644 --- a/src/views/teacherregistration/l10n.json +++ b/src/views/teacherregistration/l10n.json @@ -25,7 +25,6 @@ "teacherRegistration.orgChoiceCamp": "Camp", "teacherRegistration.orgChoiceOther": " ", "teacherRegistration.notRequired": "Not Required", - "teacherRegistration.selectCountry": "select country", "teacherRegistration.addressValidationError": "This doesn't look like a real address", "teacherRegistration.addressLine1": "Address Line 1", "teacherRegistration.addressLine2": "Address Line 2 (Optional)",