feat: hide signup page on the bases of flag (#837)

Co-authored-by: attiyaishaque <atiya.ishaq@arbisoft.com>

.env

@@ -13,23 +13,20 @@ ORDER_HISTORY_URL=null
 REFRESH_ACCESS_TOKEN_ENDPOINT=null
 SEGMENT_KEY=''
 SITE_NAME=null
-INFO_EMAIL=''
-# ***** Cookies *****
-REGISTER_CONVERSION_COOKIE_NAME=null
-USER_SURVEY_COOKIE_NAME=null
-# ***** Links *****
+USER_INFO_COOKIE_NAME=null
+AUTHN_MINIMAL_HEADER=true
 LOGIN_ISSUE_SUPPORT_LINK=''
-AUTHN_PROGRESSIVE_PROFILING_SUPPORT_LINK=null
-# ***** Features flags *****
+USER_SURVEY_COOKIE_NAME=null
+COOKIE_DOMAIN=null
+WELCOME_PAGE_SUPPORT_LINK=null
+INFO_EMAIL=''
 DISABLE_ENTERPRISE_LOGIN=''
-ENABLE_DYNAMIC_REGISTRATION_FIELDS=''
-ENABLE_PROGRESSIVE_PROFILING_ON_AUTHN=''
-ENABLE_PERSONALIZED_RECOMMENDATIONS=''
+REGISTER_CONVERSION_COOKIE_NAME=null
+ENABLE_PROGRESSIVE_PROFILING=''
 MARKETING_EMAILS_OPT_IN=''
-SHOW_CONFIGURABLE_EDX_FIELDS=''
-# ***** Zendesk related keys *****
+ENABLE_COPPA_COMPLIANCE=''
 ZENDESK_KEY=''
 ZENDESK_LOGO_URL=''
-# ***** Miscellaneous *****
 APP_ID=''
 MFE_CONFIG_API_URL=''
+ENABLE_COOKIE_POLICY_BANNER=''

.env.development

@@ -18,20 +18,21 @@ ORDER_HISTORY_URL='http://localhost:1996/orders'
 REFRESH_ACCESS_TOKEN_ENDPOINT='http://localhost:18000/login_refresh'
 SEGMENT_KEY=''
 SITE_NAME='Your Platform Name Here'
-INFO_EMAIL='info@example.com'
-# ***** Cookies *****
-REGISTER_CONVERSION_COOKIE_NAME='openedx-user-register-conversion'
-SESSION_COOKIE_DOMAIN='localhost'
 USER_INFO_COOKIE_NAME='edx-user-info'
-USER_SURVEY_COOKIE_NAME='openedx-user-survey-type'
-# ***** Links *****
-LOGIN_ISSUE_SUPPORT_LINK='http://localhost:18000/login-issue-support-url'
+AUTHN_MINIMAL_HEADER=true
+LOGIN_ISSUE_SUPPORT_LINK='/login-issue-support-url'
 TOS_AND_HONOR_CODE='http://localhost:18000/honor'
 TOS_LINK='http://localhost:18000/tos'
 PRIVACY_POLICY='http://localhost:18000/privacy'
-AUTHN_PROGRESSIVE_PROFILING_SUPPORT_LINK='http://localhost:1999/welcome'
-# ***** Miscellaneous *****
-APP_ID=''
-MFE_CONFIG_API_URL=''
+USER_SURVEY_COOKIE_NAME='openedx-user-survey-type'
+COOKIE_DOMAIN='localhost'
+WELCOME_PAGE_SUPPORT_LINK='http://localhost:1999/welcome'
+INFO_EMAIL='info@edx.org'
+DISABLE_ENTERPRISE_LOGIN=''
+REGISTER_CONVERSION_COOKIE_NAME='openedx-user-register-conversion'
+ENABLE_COPPA_COMPLIANCE=''
+MARKETING_EMAILS_OPT_IN=''
 ZENDESK_KEY=''
 ZENDESK_LOGO_URL=''
+APP_ID=''
+MFE_CONFIG_API_URL=''

.env.private.example

@@ -1,4 +0,0 @@
-# Copy these to the .env.private to enable edX specific functionality on local system
-ENABLE_PROGRESSIVE_PROFILING_ON_AUTHN='true'
-MARKETING_EMAILS_OPT_IN='true'
-SHOW_CONFIGURABLE_EDX_FIELDS='true'

.env.test

@@ -16,7 +16,15 @@ ORDER_HISTORY_URL='http://localhost:1996/orders'
 REFRESH_ACCESS_TOKEN_ENDPOINT='http://localhost:18000/login_refresh'
 SEGMENT_KEY=''
 SITE_NAME='Your Platform Name Here'
+USER_INFO_COOKIE_NAME='edx-user-info'
+LOGIN_ISSUE_SUPPORT_LINK='https://login-issue-support-url.com'
 USER_SURVEY_COOKIE_NAME='openedx-user-survey-type'
+WELCOME_PAGE_SUPPORT_LINK='http://localhost:1999/welcome'
+DISABLE_ENTERPRISE_LOGIN=''
 REGISTER_CONVERSION_COOKIE_NAME='openedx-user-register-conversion'
+MARKETING_EMAILS_OPT_IN=''
+ENABLE_COPPA_COMPLIANCE=''
+ZENDESK_KEY=''
+ZENDESK_LOGO_URL=''
 APP_ID=''
 MFE_CONFIG_API_URL=''

.eslintignore

@@ -1,6 +1,5 @@
 coverage/*
 dist/
-docs
 node_modules/
 __mocks__/
 __snapshots__/

.eslintrc.js

@@ -1,17 +1,16 @@
-// eslint-disable-next-line import/no-extraneous-dependencies
 const { createConfig } = require('@edx/frontend-build');
 
 module.exports = createConfig('eslint', {
   rules: {
     // Temporarily update the 'indent', 'template-curly-spacing' and
     // 'no-multiple-empty-lines' rules since they are causing eslint
-    // to fail for no apparent reason since upgrading
+    // to fail for no apparent reason since upgrading 
     // @edx/frontend-build from v3 to v5:
     // - TypeError: Cannot read property 'range' of null
-    indent: [
+    'indent': [
       'error',
       2,
-      { ignoredNodes: ['TemplateLiteral', 'SwitchCase'] },
+      { 'ignoredNodes': ['TemplateLiteral', 'SwitchCase'] }
     ],
     'template-curly-spacing': 'off',
     'jsx-a11y/label-has-associated-control': ['error', {
@@ -19,9 +18,9 @@ module.exports = createConfig('eslint', {
       labelAttributes: [],
       controlComponents: [],
       assert: 'htmlFor',
-      depth: 25,
+      depth: 25
     }],
-    'sort-imports': ['error', { ignoreCase: true, ignoreDeclarationSort: true }],
+    'sort-imports': ['error', {ignoreCase: true, ignoreDeclarationSort: true}],
     'import/order': [
       'error',
       {
@@ -47,6 +46,5 @@ module.exports = createConfig('eslint', {
         },
       },
     ],
-    'function-paren-newline': 'off',
   },
 });

.github/pull_request_template.md

@@ -2,16 +2,11 @@
 
 Include a description of your changes here, along with a link to any relevant Jira tickets and/or Github issues.
 
-#### JIRA
-
-[XXX-XXXX](https://2u-internal.atlassian.net/browse/XXX-XXXX)
-
 #### How Has This Been Tested?
 
 Please describe in detail how you tested your changes.
 
 #### Screenshots/sandbox (optional):
-
 Include a link to the sandbox for design changes or screenshot for before and after. **Remove this section if its not applicable.**
 
 |Before|After|
@@ -26,4 +21,4 @@ Include a link to the sandbox for design changes or screenshot for before and af
 #### Post-merge Checklist
 
 * [ ] Deploy the changes to prod after verifying on stage or ask **@openedx/vanguards** to do it. 
-* [ ] 🎉 🙌 Celebrate! Thanks for your contribution.
+* [ ] 🎉 🙌 Celebrate! Thanks for your contribution.

.github/workflows/add-depr-ticket-to-depr-board.yml

@@ -16,4 +16,4 @@ jobs:
     secrets:
       GITHUB_APP_ID: ${{ secrets.GRAPHQL_AUTH_APP_ID }}
       GITHUB_APP_PRIVATE_KEY: ${{ secrets.GRAPHQL_AUTH_APP_PEM }}
-      SLACK_BOT_TOKEN: ${{ secrets.SLACK_ISSUE_BOT_TOKEN }}
+      SLACK_BOT_TOKEN: ${{ secrets.SLACK_ISSUE_BOT_TOKEN }}

.github/workflows/add-remove-label-on-comment.yml

@@ -1,20 +0,0 @@
-# This workflow runs when a comment is made on the ticket
-# If the comment starts with "label: " it tries to apply
-# the label indicated in rest of comment.
-# If the comment starts with "remove label: ", it tries
-# to remove the indicated label.
-# Note: Labels are allowed to have spaces and this script does
-# not parse spaces (as often a space is legitimate), so the command
-# "label: really long lots of words label" will apply the
-# label "really long lots of words label"
-
-name: Allows for the adding and removing of labels via comment
-
-on:
-  issue_comment:
-    types: [created]
-
-jobs:
-  add_remove_labels:
-    uses: openedx/.github/.github/workflows/add-remove-label-on-comment.yml@master
-

.github/workflows/autoupdate-pull-request.yml

@@ -1,25 +0,0 @@
-name: autoupdate
-on:
-  push:
-    branches:
-      - master
-  pull_request:
-    types: [ labeled ]  
-    branches:
-      - master  
-jobs:
-  autoupdate:
-    name: autoupdate
-    runs-on: ubuntu-20.04
-    steps:
-      - uses: docker://chinthakagodawita/autoupdate-action:v1
-        env:
-          GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
-          DRY_RUN: "false"
-          PR_FILTER: "labelled"
-          PR_LABELS: "autoupdate"
-          EXCLUDED_LABELS: "dependencies,wontfix"
-          MERGE_MSG: "Branch was auto-updated."
-          RETRY_COUNT: "5"
-          RETRY_SLEEP: "300"
-          MERGE_CONFLICT_ACTION: "fail"

.github/workflows/ci.yml

@@ -11,16 +11,17 @@ on:
 jobs:
   tests:
     runs-on: ubuntu-20.04
-
+    strategy:
+      matrix:
+        node: [16]
     steps:
     - name: Checkout
-      uses: actions/checkout@v3
-    - name: Setup Nodejs Env
-      run: echo "NODE_VER=`cat .nvmrc`" >> $GITHUB_ENV
+      uses: actions/checkout@v2
+
     - name: Setup Nodejs
-      uses: actions/setup-node@v3
+      uses: actions/setup-node@v2
       with:
-        node-version: ${{ env.NODE_VER }}
+        node-version: ${{ matrix.node }}
 
     - name: Install Dependencies
       run: npm ci

.github/workflows/lockfileversion-check.yml

@@ -10,4 +10,4 @@ on:
 
 jobs:
   version-check:
-    uses: openedx/.github/.github/workflows/lockfileversion-check-v3.yml@master
+    uses: openedx/.github/.github/workflows/lockfileversion-check.yml@master

.github/workflows/self-assign-issue.yml

@@ -1,12 +0,0 @@
-# This workflow runs when a comment is made on the ticket
-# If the comment starts with "assign me" it assigns the author to the
-# ticket (case insensitive)
-
-name: Assign comment author to ticket if they say "assign me"
-on:
-  issue_comment:
-    types: [created]
-
-jobs:
-  self_assign_by_comment:
-    uses: openedx/.github/.github/workflows/self-assign-issue.yml@master

.gitignore

@@ -5,7 +5,6 @@ node_modules
 npm-debug.log
 coverage
 module.config.js
-.env.private
 
 dist/
 src/i18n/transifex_input.json

.nvmrc

@@ -1 +0,0 @@
-18

CODEOWNERS

@@ -1,2 +1,2 @@
 # The following users are the owners of all frontend-app-authn files
-*       @openedx/vanguards
+*       @edx/vanguards

Makefile

@@ -1,7 +1,6 @@
 export TRANSIFEX_RESOURCE = frontend-app-authn
-transifex_langs = "ar,fr,es_419,zh_CN,pt,it,de,uk,ru,hi,fr_CA,it_IT,pt_PT,de_DE"
+transifex_langs = "ar,fr,es_419,zh_CN,it_IT,pt_PT,de_DE,uk,ru,hi"
 
-intl_imports = ./node_modules/.bin/intl-imports.js
 transifex_utils = ./node_modules/.bin/transifex-utils.js
 i18n = ./src/i18n
 transifex_input = $(i18n)/transifex_input.json
@@ -43,37 +42,11 @@ push_translations:
 	# Pushing comments to Transifex...
 	./node_modules/@edx/reactifex/bash_scripts/put_comments_v3.sh
 
-ifeq ($(OPENEDX_ATLAS_PULL),)
 # Pulls translations from Transifex.
 pull_translations:
 	tx pull -t -f --mode reviewed --languages=$(transifex_langs)
-else
-# Experimental: OEP-58 Pulls translations using atlas
-pull_translations:
-	rm -rf src/i18n/messages
-	mkdir src/i18n/messages
-	cd src/i18n/messages \
-	  && atlas pull --filter=$(transifex_langs) \
-	           translations/paragon/src/i18n/messages:paragon \
-	           translations/frontend-app-authn/src/i18n/messages:frontend-app-authn
 
-	$(intl_imports) paragon frontend-app-authn
-endif
-
-# This target is used by Travis.
+# This target is used by CI.
 validate-no-uncommitted-package-lock-changes:
 	# Checking for package-lock.json changes...
 	git diff --exit-code package-lock.json
-
-.PHONY: validate
-validate:
-	make validate-no-uncommitted-package-lock-changes
-	npm run i18n_extract
-	npm run lint -- --max-warnings 0
-	npm run test
-	npm run build
-
-.PHONY: validate.ci
-validate.ci:
-	npm ci
-	make validate

README.rst

@@ -72,8 +72,8 @@ The authentication micro-frontend also requires the following additional variabl
      - The fully-qualified URL to the password reset support page in the target environment.
      - ``https://support.example.com``
 
-   * - ``AUTHN_PROGRESSIVE_PROFILING_SUPPORT_LINK``
-     - The fully-qualified URL to the progressive profiling support page in the target environment.
+   * - ``WELCOME_PAGE_SUPPORT_LINK``
+     - The fully-qualified URL to the welcome support page in the target environment.
      - ``https://support.example.com``
 
    * - ``TOS_AND_HONOR_CODE``
@@ -96,7 +96,7 @@ The authentication micro-frontend also requires the following additional variabl
      - Enables support for configurable registration fields on the MFE. This flag must be enabled to show any required registration field besides the default fields (name, email, username, password).
      - ``true`` | ``''`` (empty strings are falsy)
 
-   * - ``ENABLE_PROGRESSIVE_PROFILING_ON_AUTHN``
+   * - ``ENABLE_PROGRESSIVE_PROFILING``
      - Enables support for progressive profiling. If enabled, users are redirected to a second page where data for optional registration fields can be collected.
      - ``true`` | ``''`` (empty strings are falsy)
 
@@ -104,15 +104,6 @@ The authentication micro-frontend also requires the following additional variabl
      - Disables the enterprise login from Authn MFE.
      - ``true`` | ``''`` (empty strings are falsy)
 
-   * - ``MFE_CONFIG_API_URL``
-     - Link of the API to get runtime mfe configuration variables from the site configuration or django settings.
-     - ``/api/v1/mfe_config`` | ``''`` (empty strings are falsy)  
-
-   * - ``APP_ID``
-     - Name of MFE, this will be used by the API to get runtime configurations for the specific micro frontend. For a frontend repo `frontend-app-appName`, use `appName` as APP_ID.
-     - ``authn`` | ``''``
-
-
 edX-specific Environment Variables
 **********************************
 
@@ -130,52 +121,14 @@ Furthermore, there are several edX-specific environment variables that enable in
      - Enables support for opting in marketing emails that helps us getting user consent for sending marketing emails.
      - ``true`` | ``''`` (empty strings are falsy)
 
-   * - ``SHOW_CONFIGURABLE_EDX_FIELDS``
-     - For edX, country and honor code fields are required by default. This flag enables edX specific required fields.
-     - ``true`` | ``''`` (empty strings are falsy)    
-
 For more information see the document: `Micro-frontend applications in Open
 edX <https://edx.readthedocs.io/projects/edx-developer-docs/en/latest/developers_guide/micro_frontends_in_open_edx.html#required-environment-variables>`__.
 
-How To Contribute
-------------
-Contributions are very welcome, and strongly encouraged! We've
-put together `some documentation that describes our contribution process <https://edx.readthedocs.org/projects/edx-developer-guide/en/latest/process/index.html>`_.
-
-Even though they were written with edx-platform in mind, the guidelines should be followed for Open edX code in general.
-
-PR description template should be automatically applied if you are sending PR from github interface; otherwise you
-can find it it at `PULL_REQUEST_TEMPLATE.md <https://github.com/openedx/frontend-app-authn/blob/master/.github/pull_request_template.md>`_
-
-This project is currently accepting all types of contributions, bug fixes and security fixes.
-
-Open edX Code of Conduct
-------------------------
-All community members are expected to follow the `Open edX Code of Conduct <https://openedx.org/code-of-conduct/>`_.
-
-People
-------
-The assigned maintainers for this component and other project details may be
-found in `Backstage <https://backstage.openedx.org/catalog/default/group/vanguards>`_. Backstage pulls this data from the ``catalog-info.yaml``
-file in this repo.
-
-Reporting Security Issues
--------------------------
-
-Please do not report security issues in public. Please email security@edx.org.
-
 Known Issues
 ------------
 
 None
 
-License
--------
-
-The code in this repository is licensed under the GNU Affero General Public License v3.0, unless
-otherwise noted.
-
-Please see `LICENSE <https://github.com/openedx/frontend-app-authn/blob/master/LICENSE>`_ for details.
 
 ==============================
 

catalog-info.yaml

@@ -1,18 +0,0 @@
-# This file records information about this repo. Its use is described in OEP-55:
-# https://open-edx-proposals.readthedocs.io/en/latest/processes/oep-0055-proc-project-maintainers.html
-
-apiVersion: backstage.io/v1alpha1
-kind: Component
-metadata:
-  name: 'frontend-app-authn'
-  description: "Micro-frontend for authentication service. It contains views for login, registration and password reset functionality."
-  links:
-    - url: 'https://github.com/openedx/frontend-app-authn/blob/master/README.rst'
-      title: 'Documentation'
-      icon: 'Article'
-  annotations:
-    openedx.org/arch-interest-groups: ""
-spec:
-  owner: group:vanguards
-  type: 'service'
-  lifecycle: 'production'

docs/decisions/0002-feature-based-application-organization.rst

@@ -91,7 +91,7 @@ In the data sub-directory, the file names describe what each piece of code does.
     /ProfilePhotoUploader.jsx // supporting view
     /data // Note: most files here are named with a plural, as they contain many of the things in question.
       /actions.js
-      /mockedData.js
+      /constants.js
       /reducers.js
       /sagas.js
       /selectors.js

openedx.yaml

@@ -3,6 +3,6 @@
 
 nick: Authn MFE
 oeps: {}
-owner: openedx/vanguards
+owner: edx/vanguards
 openedx-release:
   ref: master

package.json

@@ -32,52 +32,57 @@
     "url": "https://github.com/openedx/frontend-app-authn/issues"
   },
   "dependencies": {
-    "@edx/brand": "npm:@edx/brand-openedx@1.2.0",
-    "@edx/frontend-platform": "4.5.1",
-    "@edx/paragon": "20.40.2",
-    "@fortawesome/fontawesome-svg-core": "6.4.0",
-    "@fortawesome/free-brands-svg-icons": "6.4.0",
-    "@fortawesome/free-solid-svg-icons": "6.4.0",
+    "@edx/brand": "npm:@edx/brand-openedx@1.1.0",
+    "@edx/frontend-component-cookie-policy-banner": "2.2.0",
+    "@edx/frontend-platform": "3.1.1",
+    "@edx/paragon": "20.20.0",
+    "@fortawesome/fontawesome-svg-core": "6.2.1",
+    "@fortawesome/free-brands-svg-icons": "6.2.1",
+    "@fortawesome/free-regular-svg-icons": "6.2.1",
+    "@fortawesome/free-solid-svg-icons": "6.2.1",
     "@fortawesome/react-fontawesome": "0.2.0",
-    "@optimizely/react-sdk": "^2.9.1",
-    "@redux-devtools/extension": "3.2.5",
-    "algoliasearch": "^4.14.3",
+    "@redux-devtools/extension": "3.2.3",
     "classnames": "2.3.2",
-    "core-js": "3.30.2",
+    "core-js": "3.26.1",
+    "extract-react-intl-messages": "4.1.1",
     "fastest-levenshtein": "1.0.16",
-    "form-urlencoded": "6.1.0",
+    "form-urlencoded": "4.2.1",
+    "lodash.camelcase": "4.3.0",
+    "lodash.snakecase": "4.1.1",
     "prop-types": "15.8.1",
-    "query-string": "7.1.3",
+    "query-string": "5.1.1",
     "react": "16.14.0",
     "react-dom": "16.14.0",
     "react-helmet": "6.1.0",
-    "react-loading-skeleton": "3.2.1",
+    "react-loading-skeleton": "2.2.0",
+    "react-onclickoutside": "6.12.2",
     "react-redux": "7.2.9",
     "react-responsive": "8.2.0",
     "react-router": "5.3.4",
     "react-router-dom": "5.3.4",
-    "react-zendesk": "^0.1.13",
     "redux": "4.2.0",
     "redux-logger": "3.0.6",
     "redux-mock-store": "1.5.4",
-    "redux-saga": "1.2.3",
+    "redux-saga": "1.2.1",
     "redux-thunk": "2.4.2",
     "regenerator-runtime": "0.13.11",
-    "reselect": "4.1.8",
+    "reselect": "4.1.7",
+    "sanitize-html": "2.7.3",
+    "semver-regex": "3.1.4",
     "universal-cookie": "4.0.4"
   },
   "devDependencies": {
     "@edx/browserslist-config": "^1.1.1",
-    "@edx/frontend-build": "12.8.38",
+    "@edx/frontend-build": "11.0.2",
     "@edx/reactifex": "1.1.0",
-    "babel-plugin-formatjs": "10.5.1",
+    "babel-plugin-formatjs": "10.3.31",
     "enzyme": "3.11.0",
     "enzyme-adapter-react-16": "1.15.7",
-    "eslint-plugin-import": "2.27.5",
+    "eslint-plugin-import": "2.26.0",
     "glob": "7.2.3",
     "history": "5.3.0",
     "husky": "7.0.4",
-    "jest": "29.5.0",
+    "jest": "27.5.1",
     "react-test-renderer": "16.14.0"
   }
 }

public/index.html

@@ -4,6 +4,67 @@
       <title>Authn | <%= process.env.SITE_NAME %></title>
       <meta charset="utf-8">
       <meta name="viewport" content="width=device-width, initial-scale=1.0">
+      <% if (process.env.OPTIMIZELY_URL) { %>
+        <script
+          src="<%= process.env.OPTIMIZELY_URL %>"
+        ></script>
+      <% } else if (process.env.OPTIMIZELY_PROJECT_ID) { %>
+        <script
+          src="<%= process.env.MARKETING_SITE_BASE_URL %>/optimizelyjs/<%= process.env.OPTIMIZELY_PROJECT_ID %>.js"
+        ></script>
+      <% } %>
+      <% if (process.env.ZENDESK_KEY) { %>
+        <script
+          id="ze-snippet"
+          src="https://static.zdassets.com/ekr/snippet.js?key=<%= process.env.ZENDESK_KEY %>"
+        >
+        </script>
+        <script type="text/javascript">
+          window.zESettings = {
+            cookies: true,
+            webWidget: {
+              contactOptions: {
+                enabled: false,
+              },
+              chat: {
+                suppress: false,
+              },
+              contactForm: {
+                ticketForms: [
+                  {
+                    id: 360003368814,
+                    subject: false,
+                    fields: [
+                      {
+                        id: 'description',
+                        prefill: {
+                          '*': '',
+                        },
+                      },
+                    ],
+                  },
+                ],
+                selectTicketForm: {
+                  '*': 'Please choose your request type:',
+                },
+                attachments: true,
+              },
+              helpCenter: {
+                originalArticleButton: true,
+              },
+              answerBot: {
+                suppress: false,
+                contactOnlyAfterQuery: true,
+                title: { '*': 'edX Support' },
+                avatar: {
+                  url: '<%= process.env.ZENDESK_LOGO_URL %>',
+                  name: { '*': 'edX Support' },
+                },
+              },
+            },
+          };
+        </script>
+      <% } %>
   </head>
   <body>
     <div id="root"></div>

src/MainApp.jsx

@@ -6,24 +6,16 @@ import { Helmet } from 'react-helmet';
 import { Redirect, Route, Switch } from 'react-router-dom';
 
 import {
-  NotFoundPage, registerIcons, UnAuthOnlyRoute, Zendesk,
+  Logistration, NotFoundPage, registerIcons, UnAuthOnlyRoute,
 } from './common-components';
 import configureStore from './data/configureStore';
 import {
-  AUTHN_PROGRESSIVE_PROFILING,
-  LOGIN_PAGE,
-  PAGE_NOT_FOUND,
-  PASSWORD_RESET_CONFIRM,
-  RECOMMENDATIONS,
-  REGISTER_PAGE,
-  RESET_PAGE,
+  LOGIN_PAGE, PAGE_NOT_FOUND, PASSWORD_RESET_CONFIRM, REGISTER_PAGE, RESET_PAGE, WELCOME_PAGE,
 } from './data/constants';
 import { updatePathWithQueryParams } from './data/utils';
-import { ForgotPasswordPage } from './forgot-password';
-import Logistration from './logistration/Logistration';
-import { ProgressiveProfiling } from './progressive-profiling';
-import { RecommendationsPage } from './recommendations';
-import { ResetPasswordPage } from './reset-password';
+import ForgotPasswordPage from './forgot-password';
+import ResetPasswordPage from './reset-password';
+import { ProgressiveProfiling } from './welcome';
 import './index.scss';
 
 registerIcons();
@@ -33,7 +25,6 @@ const MainApp = () => (
     <Helmet>
       <link rel="shortcut icon" href={getConfig().FAVICON_URL} type="image/x-icon" />
     </Helmet>
-    {getConfig().ZENDESK_KEY && <Zendesk />}
     <Switch>
       <Route exact path="/">
         <Redirect to={updatePathWithQueryParams(REGISTER_PAGE)} />
@@ -42,8 +33,7 @@ const MainApp = () => (
       <UnAuthOnlyRoute exact path={REGISTER_PAGE} component={Logistration} />
       <UnAuthOnlyRoute exact path={RESET_PAGE} component={ForgotPasswordPage} />
       <Route exact path={PASSWORD_RESET_CONFIRM} component={ResetPasswordPage} />
-      <Route exact path={AUTHN_PROGRESSIVE_PROFILING} component={ProgressiveProfiling} />
-      <Route exact path={RECOMMENDATIONS} component={RecommendationsPage} />
+      <Route exact path={WELCOME_PAGE} component={ProgressiveProfiling} />
       <Route path={PAGE_NOT_FOUND} component={NotFoundPage} />
       <Route path="*">
         <Redirect to={PAGE_NOT_FOUND} />

src/base-component/AuthLargeLayout.jsx

@@ -1,49 +1,46 @@
 import React from 'react';
 
 import { getConfig } from '@edx/frontend-platform';
-import { useIntl } from '@edx/frontend-platform/i18n';
+import { injectIntl, intlShape } from '@edx/frontend-platform/i18n';
 import { Hyperlink, Image } from '@edx/paragon';
 import PropTypes from 'prop-types';
 
 import messages from './messages';
 
-const AuthLargeLayout = ({ username }) => {
-  const { formatMessage } = useIntl();
-
-  return (
-    <div className="w-50 d-flex">
-      <div className="col-md-10 bg-light-200 p-0">
-        <Hyperlink destination={getConfig().MARKETING_SITE_BASE_URL}>
-          <Image className="logo position-absolute" alt={getConfig().SITE_NAME} src={getConfig().LOGO_URL} />
-        </Hyperlink>
-        <div className="min-vh-100 d-flex align-items-center">
-          <div className="large-screen-left-container mr-n4.5 large-yellow-line mt-5" />
-          <div>
-            <h1 className="welcome-to-platform data-hj-suppress">
-              {formatMessage(messages['welcome.to.platform'], { siteName: getConfig().SITE_NAME, username })}
-            </h1>
-            <h2 className="complete-your-profile">
-              {formatMessage(messages['complete.your.profile.1'])}
-              <div className="text-accent-a">
-                {formatMessage(messages['complete.your.profile.2'])}
-              </div>
-            </h2>
-          </div>
+const AuthLargeLayout = ({ intl, username }) => (
+  <div className="w-50 d-flex">
+    <div className="col-md-10 bg-light-200 p-0">
+      <Hyperlink destination={getConfig().MARKETING_SITE_BASE_URL}>
+        <Image className="logo position-absolute" alt={getConfig().SITE_NAME} src={getConfig().LOGO_URL} />
+      </Hyperlink>
+      <div className="min-vh-100 d-flex align-items-center">
+        <div className="large-screen-left-container mr-n4.5 large-yellow-line mt-5" />
+        <div>
+          <h1 className="welcome-to-platform data-hj-suppress">
+            {intl.formatMessage(messages['welcome.to.platform'], { siteName: getConfig().SITE_NAME, username })}
+          </h1>
+          <h2 className="complete-your-profile">
+            {intl.formatMessage(messages['complete.your.profile.1'])}
+            <div className="text-accent-a">
+              {intl.formatMessage(messages['complete.your.profile.2'])}
+            </div>
+          </h2>
         </div>
       </div>
-      <div className="col-md-2 bg-white p-0">
-        <svg className="m1-n1 w-100 h-100 large-screen-svg-light" preserveAspectRatio="xMaxYMin meet">
-          <g transform="skewX(171.6)">
-            <rect x="0" y="0" height="100%" width="100%" />
-          </g>
-        </svg>
-      </div>
     </div>
-  );
-};
+    <div className="col-md-2 bg-white p-0">
+      <svg className="m1-n1 w-100 h-100 large-screen-svg-light" preserveAspectRatio="xMaxYMin meet">
+        <g transform="skewX(171.6)">
+          <rect x="0" y="0" height="100%" width="100%" />
+        </g>
+      </svg>
+    </div>
+  </div>
+);
 
 AuthLargeLayout.propTypes = {
+  intl: intlShape.isRequired,
   username: PropTypes.string.isRequired,
 };
 
-export default AuthLargeLayout;
+export default injectIntl(AuthLargeLayout);

src/base-component/AuthMediumLayout.jsx

@@ -1,52 +1,49 @@
 import React from 'react';
 
 import { getConfig } from '@edx/frontend-platform';
-import { useIntl } from '@edx/frontend-platform/i18n';
+import { injectIntl, intlShape } from '@edx/frontend-platform/i18n';
 import { Hyperlink, Image } from '@edx/paragon';
 import PropTypes from 'prop-types';
 
 import messages from './messages';
 
-const AuthMediumLayout = ({ username }) => {
-  const { formatMessage } = useIntl();
-
-  return (
-    <>
-      <div className="w-100 medium-screen-top-stripe" />
-      <div className="w-100 p-0 mb-3 d-flex">
-        <div className="col-md-10 bg-light-200">
-          <Hyperlink destination={getConfig().MARKETING_SITE_BASE_URL}>
-            <Image className="logo" alt={getConfig().SITE_NAME} src={getConfig().LOGO_URL} />
-          </Hyperlink>
-          <div className="d-flex align-items-center justify-content-center mb-4 ml-5">
-            <div className="medium-yellow-line mt-5 mr-n2" />
-            <div>
-              <h1 className="h3 data-hj-suppress mw-320">
-                {formatMessage(messages['welcome.to.platform'], { siteName: getConfig().SITE_NAME, username })}
-              </h1>
-              <h2 className="display-1">
-                {formatMessage(messages['complete.your.profile.1'])}
-                <div className="text-accent-a">
-                  {formatMessage(messages['complete.your.profile.2'])}
-                </div>
-              </h2>
-            </div>
+const AuthMediumLayout = ({ intl, username }) => (
+  <>
+    <div className="w-100 medium-screen-top-stripe" />
+    <div className="w-100 p-0 mb-3 d-flex">
+      <div className="col-md-10 bg-light-200">
+        <Hyperlink destination={getConfig().MARKETING_SITE_BASE_URL}>
+          <Image className="logo" alt={getConfig().SITE_NAME} src={getConfig().LOGO_URL} />
+        </Hyperlink>
+        <div className="d-flex align-items-center justify-content-center mb-4 ml-5">
+          <div className="medium-yellow-line mt-5 mr-n2" />
+          <div>
+            <h1 className="h3 data-hj-suppress mw-320">
+              {intl.formatMessage(messages['welcome.to.platform'], { siteName: getConfig().SITE_NAME, username })}
+            </h1>
+            <h2 className="display-1">
+              {intl.formatMessage(messages['complete.your.profile.1'])}
+              <div className="text-accent-a">
+                {intl.formatMessage(messages['complete.your.profile.2'])}
+              </div>
+            </h2>
           </div>
         </div>
-        <div className="col-md-2 bg-white p-0">
-          <svg className="w-100 h-100 medium-screen-svg-light" preserveAspectRatio="xMaxYMin meet">
-            <g transform="skewX(168)">
-              <rect x="0" y="0" height="100%" width="100%" />
-            </g>
-          </svg>
-        </div>
       </div>
-    </>
-  );
-};
+      <div className="col-md-2 bg-white p-0">
+        <svg className="w-100 h-100 medium-screen-svg-light" preserveAspectRatio="xMaxYMin meet">
+          <g transform="skewX(168)">
+            <rect x="0" y="0" height="100%" width="100%" />
+          </g>
+        </svg>
+      </div>
+    </div>
+  </>
+);
 
 AuthMediumLayout.propTypes = {
+  intl: intlShape.isRequired,
   username: PropTypes.string.isRequired,
 };
 
-export default AuthMediumLayout;
+export default injectIntl(AuthMediumLayout);

src/base-component/AuthSmallLayout.jsx

@@ -1,41 +1,38 @@
 import React from 'react';
 
 import { getConfig } from '@edx/frontend-platform';
-import { useIntl } from '@edx/frontend-platform/i18n';
+import { injectIntl, intlShape } from '@edx/frontend-platform/i18n';
 import { Hyperlink, Image } from '@edx/paragon';
 import PropTypes from 'prop-types';
 
 import messages from './messages';
 
-const AuthSmallLayout = ({ username }) => {
-  const { formatMessage } = useIntl();
-
-  return (
-    <div className="min-vw-100 bg-light-200">
-      <div className="col-md-12 small-screen-top-stripe" />
-      <Hyperlink destination={getConfig().MARKETING_SITE_BASE_URL}>
-        <Image className="logo-small" alt={getConfig().SITE_NAME} src={getConfig().LOGO_URL} />
-      </Hyperlink>
-      <div className="d-flex align-items-center mb-3 mt-3 mr-3">
-        <div className="small-yellow-line mt-4.5" />
-        <div>
-          <h1 className="h5 data-hj-suppress">
-            {formatMessage(messages['welcome.to.platform'], { siteName: getConfig().SITE_NAME, username })}
-          </h1>
-          <h2 className="h1">
-            {formatMessage(messages['complete.your.profile.1'])}
-            <div className="text-accent-a">
-              {formatMessage(messages['complete.your.profile.2'])}
-            </div>
-          </h2>
-        </div>
+const AuthSmallLayout = ({ intl, username }) => (
+  <div className="min-vw-100 bg-light-200">
+    <div className="col-md-12 small-screen-top-stripe" />
+    <Hyperlink destination={getConfig().MARKETING_SITE_BASE_URL}>
+      <Image className="logo-small" alt={getConfig().SITE_NAME} src={getConfig().LOGO_URL} />
+    </Hyperlink>
+    <div className="d-flex align-items-center mb-3 mt-3 mr-3">
+      <div className="small-yellow-line mt-4.5" />
+      <div>
+        <h1 className="h5 data-hj-suppress">
+          {intl.formatMessage(messages['welcome.to.platform'], { siteName: getConfig().SITE_NAME, username })}
+        </h1>
+        <h2 className="h1">
+          {intl.formatMessage(messages['complete.your.profile.1'])}
+          <div className="text-accent-a">
+            {intl.formatMessage(messages['complete.your.profile.2'])}
+          </div>
+        </h2>
       </div>
     </div>
-  );
-};
+  </div>
+);
 
 AuthSmallLayout.propTypes = {
+  intl: intlShape.isRequired,
   username: PropTypes.string.isRequired,
 };
 
-export default AuthSmallLayout;
+export default injectIntl(AuthSmallLayout);

src/base-component/BaseComponent.jsx

@@ -1,6 +1,9 @@
 import React from 'react';
 
+import CookiePolicyBanner from '@edx/frontend-component-cookie-policy-banner';
+import { getConfig } from '@edx/frontend-platform';
 import { getAuthenticatedUser } from '@edx/frontend-platform/auth';
+import { getLocale } from '@edx/frontend-platform/i18n';
 import { breakpoints } from '@edx/paragon';
 import classNames from 'classnames';
 import PropTypes from 'prop-types';
@@ -19,6 +22,7 @@ const BaseComponent = ({ children, showWelcomeBanner }) => {
 
   return (
     <>
+      {getConfig().ENABLE_COOKIE_POLICY_BANNER ? <CookiePolicyBanner languageCode={getLocale()} /> : null}
       <div className="col-md-12 extra-large-screen-top-stripe" />
       <div className="layout">
         <MediaQuery maxWidth={breakpoints.small.maxWidth - 1}>

src/base-component/LargeLayout.jsx

@@ -1,45 +1,45 @@
 import React from 'react';
 
 import { getConfig } from '@edx/frontend-platform';
-import { useIntl } from '@edx/frontend-platform/i18n';
+import { injectIntl, intlShape } from '@edx/frontend-platform/i18n';
 import { Hyperlink, Image } from '@edx/paragon';
 import classNames from 'classnames';
 
 import messages from './messages';
 
-const LargeLayout = () => {
-  const { formatMessage } = useIntl();
-
-  return (
-    <div className="w-50 d-flex">
-      <div className="col-md-9 bg-primary-400">
-        <Hyperlink destination={getConfig().MARKETING_SITE_BASE_URL}>
-          <Image className="logo position-absolute" alt={getConfig().SITE_NAME} src={getConfig().LOGO_WHITE_URL} />
-        </Hyperlink>
-        <div className="min-vh-100 d-flex align-items-center">
-          <div className={classNames({ 'large-yellow-line mr-n4.5': getConfig().SITE_NAME === 'edX' })} />
-          <h1
-            className={classNames(
-              'display-2 text-white mw-xs',
-              { 'ml-6': getConfig().SITE_NAME !== 'edX' },
-            )}
-          >
-            {formatMessage(messages['start.learning'])}
-            <div className="text-accent-a">
-              {formatMessage(messages['with.site.name'], { siteName: getConfig().SITE_NAME })}
-            </div>
-          </h1>
-        </div>
-      </div>
-      <div className="col-md-3 bg-white p-0">
-        <svg className="ml-n1 w-100 h-100 large-screen-svg-primary" preserveAspectRatio="xMaxYMin meet">
-          <g transform="skewX(171.6)">
-            <rect x="0" y="0" height="100%" width="100%" />
-          </g>
-        </svg>
+const LargeLayout = ({ intl }) => (
+  <div className="w-50 d-flex">
+    <div className="col-md-9 bg-primary-400">
+      <Hyperlink destination={getConfig().MARKETING_SITE_BASE_URL}>
+        <Image className="logo position-absolute" alt={getConfig().SITE_NAME} src={getConfig().LOGO_WHITE_URL} />
+      </Hyperlink>
+      <div className="min-vh-100 d-flex align-items-center">
+        <div className={classNames({ 'large-yellow-line mr-n4.5': getConfig().SITE_NAME === 'edX' })} />
+        <h1
+          className={classNames(
+            'display-2 text-white mw-xs',
+            { 'ml-6': getConfig().SITE_NAME !== 'edX' },
+          )}
+        >
+          {intl.formatMessage(messages['start.learning'])}
+          <div className="text-accent-a">
+            {intl.formatMessage(messages['with.site.name'], { siteName: getConfig().SITE_NAME })}
+          </div>
+        </h1>
       </div>
     </div>
-  );
+    <div className="col-md-3 bg-white p-0">
+      <svg className="ml-n1 w-100 h-100 large-screen-svg-primary" preserveAspectRatio="xMaxYMin meet">
+        <g transform="skewX(171.6)">
+          <rect x="0" y="0" height="100%" width="100%" />
+        </g>
+      </svg>
+    </div>
+  </div>
+);
+
+LargeLayout.propTypes = {
+  intl: intlShape.isRequired,
 };
 
-export default LargeLayout;
+export default injectIntl(LargeLayout);

src/base-component/MediumLayout.jsx

@@ -1,50 +1,50 @@
 import React from 'react';
 
 import { getConfig } from '@edx/frontend-platform';
-import { useIntl } from '@edx/frontend-platform/i18n';
+import { injectIntl, intlShape } from '@edx/frontend-platform/i18n';
 import { Hyperlink, Image } from '@edx/paragon';
 import classNames from 'classnames';
 
 import messages from './messages';
 
-const MediumLayout = () => {
-  const { formatMessage } = useIntl();
-
-  return (
-    <>
-      <div className="w-100 medium-screen-top-stripe" />
-      <div className="w-100 p-0 mb-3 d-flex">
-        <div className="col-md-10 bg-primary-400">
-          <Hyperlink destination={getConfig().MARKETING_SITE_BASE_URL}>
-            <Image alt={getConfig().SITE_NAME} className="logo" src={getConfig().LOGO_WHITE_URL} />
-          </Hyperlink>
-          <div className="d-flex align-items-center justify-content-center mb-4 ">
-            <div className={classNames({ 'mt-1 medium-yellow-line': getConfig().SITE_NAME === 'edX' })} />
-            <div>
-              <h1
-                className={classNames(
-                  'display-1 text-white mt-5 mb-5 mr-2',
-                  { 'ml-4.5': getConfig().SITE_NAME !== 'edX' },
-                )}
-              >
-                <span className="mr-2">{formatMessage(messages['start.learning'])}</span>
-                <span className="text-accent-a d-inline-block">
-                  {formatMessage(messages['with.site.name'], { siteName: getConfig().SITE_NAME })}
-                </span>
-              </h1>
-            </div>
+const MediumLayout = ({ intl }) => (
+  <>
+    <div className="w-100 medium-screen-top-stripe" />
+    <div className="w-100 p-0 mb-3 d-flex">
+      <div className="col-md-10 bg-primary-400">
+        <Hyperlink destination={getConfig().MARKETING_SITE_BASE_URL}>
+          <Image alt={getConfig().SITE_NAME} className="logo" src={getConfig().LOGO_WHITE_URL} />
+        </Hyperlink>
+        <div className="d-flex align-items-center justify-content-center mb-4 ">
+          <div className={classNames({ 'mt-1 medium-yellow-line': getConfig().SITE_NAME === 'edX' })} />
+          <div>
+            <h1
+              className={classNames(
+                'display-1 text-white mt-5 mb-5 mr-2',
+                { 'ml-4.5': getConfig().SITE_NAME !== 'edX' },
+              )}
+            >
+              <span className="mr-2">{intl.formatMessage(messages['start.learning'])}</span>
+              <span className="text-accent-a d-inline-block">
+                {intl.formatMessage(messages['with.site.name'], { siteName: getConfig().SITE_NAME })}
+              </span>
+            </h1>
           </div>
         </div>
-        <div className="col-md-2 bg-white p-0">
-          <svg className="w-100 h-100 medium-screen-svg-primary" preserveAspectRatio="xMaxYMin meet">
-            <g transform="skewX(168)">
-              <rect x="0" y="0" height="100%" width="100%" />
-            </g>
-          </svg>
-        </div>
       </div>
-    </>
-  );
+      <div className="col-md-2 bg-white p-0">
+        <svg className="w-100 h-100 medium-screen-svg-primary" preserveAspectRatio="xMaxYMin meet">
+          <g transform="skewX(168)">
+            <rect x="0" y="0" height="100%" width="100%" />
+          </g>
+        </svg>
+      </div>
+    </div>
+  </>
+);
+
+MediumLayout.propTypes = {
+  intl: intlShape.isRequired,
 };
 
-export default MediumLayout;
+export default injectIntl(MediumLayout);

src/base-component/SmallLayout.jsx

@@ -1,39 +1,39 @@
 import React from 'react';
 
 import { getConfig } from '@edx/frontend-platform';
-import { useIntl } from '@edx/frontend-platform/i18n';
+import { injectIntl, intlShape } from '@edx/frontend-platform/i18n';
 import { Hyperlink, Image } from '@edx/paragon';
 import classNames from 'classnames';
 
 import messages from './messages';
 
-const SmallLayout = () => {
-  const { formatMessage } = useIntl();
-
-  return (
-    <span className="bg-primary-400 w-100">
-      <div className="col-md-12 small-screen-top-stripe" />
-      <div>
-        <Hyperlink destination={getConfig().MARKETING_SITE_BASE_URL}>
-          <Image className="logo-small" alt={getConfig().SITE_NAME} src={getConfig().LOGO_WHITE_URL} />
-        </Hyperlink>
-        <div className="d-flex align-items-center mb-3 mt-3 mr-3">
-          <div className={classNames({ 'small-yellow-line mr-n2.5': getConfig().SITE_NAME === 'edX' })} />
-          <h1
-            className={classNames(
-              'text-white mt-3.5 mb-3.5',
-              { 'ml-4.5': getConfig().SITE_NAME !== 'edX' },
-            )}
-          >
-            <span className="mr-1">{formatMessage(messages['start.learning'])}</span>
-            <span className="text-accent-a d-inline-block">
-              {formatMessage(messages['with.site.name'], { siteName: getConfig().SITE_NAME })}
-            </span>
-          </h1>
-        </div>
+const SmallLayout = ({ intl }) => (
+  <span className="bg-primary-400 w-100">
+    <div className="col-md-12 small-screen-top-stripe" />
+    <div>
+      <Hyperlink destination={getConfig().MARKETING_SITE_BASE_URL}>
+        <Image className="logo-small" alt={getConfig().SITE_NAME} src={getConfig().LOGO_WHITE_URL} />
+      </Hyperlink>
+      <div className="d-flex align-items-center mb-3 mt-3 mr-3">
+        <div className={classNames({ 'small-yellow-line mr-n2.5': getConfig().SITE_NAME === 'edX' })} />
+        <h1
+          className={classNames(
+            'text-white mt-3.5 mb-3.5',
+            { 'ml-4.5': getConfig().SITE_NAME !== 'edX' },
+          )}
+        >
+          <span className="mr-1">{intl.formatMessage(messages['start.learning'])}</span>
+          <span className="text-accent-a d-inline-block">
+            {intl.formatMessage(messages['with.site.name'], { siteName: getConfig().SITE_NAME })}
+          </span>
+        </h1>
       </div>
-    </span>
-  );
+    </div>
+  </span>
+);
+
+SmallLayout.propTypes = {
+  intl: intlShape.isRequired,
 };
 
-export default SmallLayout;
+export default injectIntl(SmallLayout);

src/base-component/index.jsx

@@ -1,2 +1 @@
-/* eslint-disable import/prefer-default-export */
-export { default as BaseComponent } from './BaseComponent';
+export { default } from './BaseComponent';

src/common-components/EnterpriseSSO.jsx

@@ -1,23 +1,19 @@
 import React from 'react';
 
 import { getConfig } from '@edx/frontend-platform';
-import { useIntl } from '@edx/frontend-platform/i18n';
+import { injectIntl, intlShape } from '@edx/frontend-platform/i18n';
 import {
   Button, Form,
-  Icon,
 } from '@edx/paragon';
-import { Login } from '@edx/paragon/icons';
+import { faSignInAlt } from '@fortawesome/free-solid-svg-icons';
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
 import PropTypes from 'prop-types';
 
-import messages from './messages';
 import { LOGIN_PAGE, SUPPORTED_ICON_CLASSES } from '../data/constants';
+import messages from './messages';
 
-/**
- * This component renders the Single sign-on (SSO) button only for the tpa provider passed
- * */
 const EnterpriseSSO = (props) => {
-  const { formatMessage } = useIntl();
+  const { intl } = props;
   const tpaProvider = props.provider;
   const disablePublicAccountCreation = getConfig().ALLOW_PUBLIC_ACCOUNT_CREATION === false;
 
@@ -37,7 +33,7 @@ const EnterpriseSSO = (props) => {
         <div className="d-flex flex-column">
           <div className="mw-450">
             <Form className="m-0">
-              <p>{formatMessage(messages['enterprisetpa.title.heading'], { providerName: tpaProvider.name })}</p>
+              <p>{intl.formatMessage(messages['enterprisetpa.title.heading'], { providerName: tpaProvider.name })}</p>
               <Button
                 id={tpaProvider.id}
                 key={tpaProvider.id}
@@ -48,18 +44,16 @@ const EnterpriseSSO = (props) => {
               >
                 {tpaProvider.iconImage ? (
                   <div aria-hidden="true">
-                    <img className="btn-tpa__image-icon" src={tpaProvider.iconImage} alt={`icon ${tpaProvider.name}`} />
+                    <img className="icon-image" src={tpaProvider.iconImage} alt={`icon ${tpaProvider.name}`} />
                     <span className="pl-2" aria-hidden="true">{ tpaProvider.name }</span>
                   </div>
                 )
                   : (
                     <>
-                      <div className="btn-tpa__font-container" aria-hidden="true">
-                        {SUPPORTED_ICON_CLASSES.includes(tpaProvider.iconClass) ? (
-                          <FontAwesomeIcon icon={['fab', tpaProvider.iconClass]} />)
-                          : (
-                            <Icon className="h-75" src={Login} />
-                          )}
+                      <div className="font-container" aria-hidden="true">
+                        <FontAwesomeIcon
+                          icon={SUPPORTED_ICON_CLASSES.includes(tpaProvider.iconClass) ? ['fab', tpaProvider.iconClass] : faSignInAlt}
+                        />
                       </div>
                       <span className="pl-2" aria-hidden="true">{ tpaProvider.name }</span>
                     </>
@@ -75,8 +69,8 @@ const EnterpriseSSO = (props) => {
                 onClick={(e) => handleClick(e)}
               >
                 {disablePublicAccountCreation
-                  ? formatMessage(messages['enterprisetpa.login.button.text.public.account.creation.disabled'])
-                  : formatMessage(messages['enterprisetpa.login.button.text'])}
+                  ? intl.formatMessage(messages['enterprisetpa.login.button.text.public.account.creation.disabled'])
+                  : intl.formatMessage(messages['enterprisetpa.login.button.text'])}
               </Button>
             </Form>
           </div>
@@ -107,6 +101,7 @@ EnterpriseSSO.propTypes = {
     loginUrl: PropTypes.string,
     registerUrl: PropTypes.string,
   }),
+  intl: intlShape.isRequired,
 };
 
-export default EnterpriseSSO;
+export default injectIntl(EnterpriseSSO);

src/common-components/FormGroup.jsx

@@ -27,7 +27,7 @@ const FormGroup = (props) => {
         readOnly={props.readOnly}
         type={props.type}
         aria-invalid={props.errorMessage !== ''}
-        className="form-group__form-field"
+        className="form-field"
         autoComplete={props.autoComplete}
         spellCheck={props.spellCheck}
         name={props.name}
@@ -37,6 +37,7 @@ const FormGroup = (props) => {
         onClick={handleClick}
         onChange={props.handleChange}
         controlClassName={props.borderClass}
+
         trailingElement={props.trailingElement}
         floatingLabel={props.floatingLabel}
       >

src/common-components/InstitutionLogistration.jsx

@@ -1,16 +1,13 @@
 import React from 'react';
 
 import { getConfig } from '@edx/frontend-platform';
-import { useIntl } from '@edx/frontend-platform/i18n';
+import { injectIntl, intlShape } from '@edx/frontend-platform/i18n';
 import { Button, Hyperlink, Icon } from '@edx/paragon';
 import { Institution } from '@edx/paragon/icons';
 import PropTypes from 'prop-types';
 
 import messages from './messages';
 
-/**
- * This component renders the Institution login button
- * */
 export const RenderInstitutionButton = props => {
   const { onSubmitHandler, buttonTitle } = props;
 
@@ -27,13 +24,10 @@ export const RenderInstitutionButton = props => {
   );
 };
 
-/**
- * This component renders the page list of available institutions for login
- * */
 const InstitutionLogistration = props => {
   const lmsBaseUrl = getConfig().LMS_BASE_URL;
-  const { formatMessage } = useIntl();
   const {
+    intl,
     secondaryProviders,
     headingTitle,
   } = props;
@@ -42,11 +36,11 @@ const InstitutionLogistration = props => {
     <>
       <div className="d-flex justify-content-left mb-4 mt-2">
         <div className="flex-column">
-          <h4 className="mb-2 font-weight-bold institutions__heading">
+          <h4 className="mb-2 font-weight-bold institute-heading">
             {headingTitle}
           </h4>
           <p className="mb-2">
-            {formatMessage(messages['institution.login.page.sub.heading'])}
+            {intl.formatMessage(messages['institution.login.page.sub.heading'])}
           </p>
         </div>
       </div>
@@ -57,7 +51,7 @@ const InstitutionLogistration = props => {
               <tr key={provider} className="pgn__data-table-row">
                 <td>
                   <Hyperlink
-                    className="btn nav-item p-0 mb-1 institutions--provider-link"
+                    className="btn nav-item p-0 mb-1 secondary-provider-link"
                     destination={lmsBaseUrl + provider.loginUrl}
                   >
                     {provider.name}
@@ -95,6 +89,7 @@ RenderInstitutionButton.defaultProps = {
 
 InstitutionLogistration.propTypes = {
   ...LogistrationProps,
+  intl: intlShape.isRequired,
   headingTitle: PropTypes.string,
 };
 InstitutionLogistration.defaultProps = {
@@ -102,4 +97,4 @@ InstitutionLogistration.defaultProps = {
   headingTitle: '',
 };
 
-export default InstitutionLogistration;
+export default injectIntl(InstitutionLogistration);

src/common-components/Logistration.jsx

@@ -0,0 +1,131 @@
+import React, { useEffect, useState } from 'react';
+
+import { getConfig } from '@edx/frontend-platform';
+import { sendPageEvent, sendTrackEvent } from '@edx/frontend-platform/analytics';
+import { getAuthService } from '@edx/frontend-platform/auth';
+import { injectIntl, intlShape } from '@edx/frontend-platform/i18n';
+import {
+  Icon,
+  Tab,
+  Tabs,
+} from '@edx/paragon';
+import { ChevronLeft } from '@edx/paragon/icons';
+import PropTypes from 'prop-types';
+import { Redirect } from 'react-router-dom';
+
+import BaseComponent from '../base-component';
+import { LOGIN_PAGE, REGISTER_PAGE } from '../data/constants';
+import { getTpaHint, updatePathWithQueryParams } from '../data/utils';
+import { LoginPage } from '../login';
+import { RegistrationPage } from '../register';
+import messages from './messages';
+
+const Logistration = (props) => {
+  const { intl, selectedPage } = props;
+  const tpa = getTpaHint();
+  const [institutionLogin, setInstitutionLogin] = useState(false);
+  const [key, setKey] = useState('');
+  const disablePublicAccountCreation = getConfig().ALLOW_PUBLIC_ACCOUNT_CREATION === false;
+
+  useEffect(() => {
+    const authService = getAuthService();
+    if (authService) {
+      authService.getCsrfTokenService().getCsrfToken(getConfig().LMS_BASE_URL);
+    }
+  });
+
+  const handleInstitutionLogin = (e) => {
+    sendTrackEvent('edx.bi.institution_login_form.toggled', { category: 'user-engagement' });
+    if (typeof e === 'string') {
+      sendPageEvent('login_and_registration', e === '/login' ? 'login' : 'register');
+    } else {
+      sendPageEvent('login_and_registration', e.target.dataset.eventName);
+    }
+
+    setInstitutionLogin(!institutionLogin);
+  };
+
+  const handleOnSelect = (tabKey) => {
+    sendTrackEvent(`edx.bi.${tabKey.replace('/', '')}_form.toggled`, { category: 'user-engagement' });
+    setKey(tabKey);
+  };
+
+  const tabTitle = (
+    <div className="d-flex">
+      <Icon src={ChevronLeft} className="left-icon" />
+      <span className="ml-2">
+        {selectedPage === LOGIN_PAGE
+          ? intl.formatMessage(messages['logistration.sign.in'])
+          : intl.formatMessage(messages['logistration.register'])}
+      </span>
+    </div>
+  );
+
+  return (
+    <BaseComponent>
+      <div>
+        {disablePublicAccountCreation
+          ? (
+            <>
+              <Redirect to={updatePathWithQueryParams(LOGIN_PAGE)} />
+              {institutionLogin && (
+                <Tabs defaultActiveKey="" id="controlled-tab" onSelect={handleInstitutionLogin}>
+                  <Tab title={tabTitle} eventKey={LOGIN_PAGE} />
+                </Tabs>
+              )}
+              <div id="main-content" className="main-content">
+                {!institutionLogin && (
+                  <h3 className="mb-4.5">{intl.formatMessage(messages['logistration.sign.in'])}</h3>
+                )}
+                <LoginPage institutionLogin={institutionLogin} handleInstitutionLogin={handleInstitutionLogin} />
+              </div>
+            </>
+          )
+          : (
+            <div>
+              {institutionLogin
+                ? (
+                  <Tabs defaultActiveKey="" id="controlled-tab" onSelect={handleInstitutionLogin}>
+                    <Tab title={tabTitle} eventKey={selectedPage === LOGIN_PAGE ? LOGIN_PAGE : REGISTER_PAGE} />
+                  </Tabs>
+                )
+                : (
+                  <>
+                    {!tpa && (
+                      <Tabs defaultActiveKey={selectedPage} id="controlled-tab" onSelect={handleOnSelect}>
+                        <Tab title={intl.formatMessage(messages['logistration.register'])} eventKey={REGISTER_PAGE} />
+                        <Tab title={intl.formatMessage(messages['logistration.sign.in'])} eventKey={LOGIN_PAGE} />
+                      </Tabs>
+                    )}
+                  </>
+                )}
+              { key && (
+                <Redirect to={updatePathWithQueryParams(key)} />
+              )}
+              <div id="main-content" className="main-content">
+                {selectedPage === LOGIN_PAGE
+                  ? <LoginPage institutionLogin={institutionLogin} handleInstitutionLogin={handleInstitutionLogin} />
+                  : (
+                    <RegistrationPage
+                      institutionLogin={institutionLogin}
+                      handleInstitutionLogin={handleInstitutionLogin}
+                    />
+                  )}
+              </div>
+            </div>
+          )}
+      </div>
+    </BaseComponent>
+  );
+};
+
+Logistration.propTypes = {
+  intl: intlShape.isRequired,
+  selectedPage: PropTypes.string,
+};
+
+Logistration.defaultProps = {
+  selectedPage: REGISTER_PAGE,
+};
+
+export default injectIntl(Logistration);

src/common-components/NotFoundPage.jsx

@@ -2,16 +2,16 @@ import React from 'react';
 
 import { FormattedMessage } from '@edx/frontend-platform/i18n';
 
-const NotFoundPage = () => (
-  <div className="container-fluid d-flex py-5 justify-content-center align-items-start text-center">
-    <p className="my-0 py-5 text-muted mw-32em">
-      <FormattedMessage
-        id="error.notfound.message"
-        defaultMessage="The page you're looking for is unavailable or there's an error in the URL. Please check the URL and try again."
-        description="error message when a page does not exist"
-      />
-    </p>
-  </div>
-);
-
-export default NotFoundPage;
+export default function NotFoundPage() {
+  return (
+    <div className="container-fluid d-flex py-5 justify-content-center align-items-start text-center">
+      <p className="my-0 py-5 text-muted mw-32em">
+        <FormattedMessage
+          id="error.notfound.message"
+          defaultMessage="The page you're looking for is unavailable or there's an error in the URL. Please check the URL and try again."
+          description="error message when a page does not exist"
+        />
+      </p>
+    </div>
+  );
+}

src/common-components/PasswordField.jsx

@@ -1,6 +1,6 @@
 import React, { useState } from 'react';
 
-import { useIntl } from '@edx/frontend-platform/i18n';
+import { injectIntl, intlShape } from '@edx/frontend-platform/i18n';
 import {
   Form, Icon, IconButton, OverlayTrigger, Tooltip, useToggle,
 } from '@edx/paragon';
@@ -9,11 +9,11 @@ import {
 } from '@edx/paragon/icons';
 import PropTypes from 'prop-types';
 
-import messages from './messages';
 import { LETTER_REGEX, NUMBER_REGEX } from '../data/constants';
+import messages from './messages';
 
 const PasswordField = (props) => {
-  const { formatMessage } = useIntl();
+  const { formatMessage } = props.intl;
   const [isPasswordHidden, setHiddenTrue, setHiddenFalse] = useToggle(true);
   const [showTooltip, setShowTooltip] = useState(false);
 
@@ -30,11 +30,11 @@ const PasswordField = (props) => {
   };
 
   const HideButton = (
-    <IconButton onFocus={handleFocus} onBlur={handleBlur} name="password" src={VisibilityOff} iconAs={Icon} onClick={setHiddenTrue} size="sm" variant="secondary" alt={formatMessage(messages['hide.password'])} />
+    <IconButton onFocus={handleFocus} onBlur={handleBlur} name="passwordValidation" src={VisibilityOff} iconAs={Icon} onClick={setHiddenTrue} size="sm" variant="secondary" alt={formatMessage(messages['hide.password'])} />
   );
 
   const ShowButton = (
-    <IconButton onFocus={handleFocus} onBlur={handleBlur} name="password" src={Visibility} iconAs={Icon} onClick={setHiddenFalse} size="sm" variant="secondary" alt={formatMessage(messages['show.password'])} />
+    <IconButton onFocus={handleFocus} onBlur={handleBlur} name="passwordValidation" src={Visibility} iconAs={Icon} onClick={setHiddenFalse} size="sm" variant="secondary" alt={formatMessage(messages['show.password'])} />
   );
   const placement = window.innerWidth < 768 ? 'top' : 'left';
   const tooltip = (
@@ -59,7 +59,7 @@ const PasswordField = (props) => {
       <OverlayTrigger key="tooltip" placement={placement} overlay={tooltip} show={showTooltip}>
         <Form.Control
           as="input"
-          className="form-group__form-field"
+          className="form-field"
           type={isPasswordHidden ? 'password' : 'text'}
           name={props.name}
           value={props.value}
@@ -100,10 +100,11 @@ PasswordField.propTypes = {
   handleBlur: PropTypes.func,
   handleFocus: PropTypes.func,
   handleChange: PropTypes.func,
+  intl: intlShape.isRequired,
   name: PropTypes.string.isRequired,
   showRequirements: PropTypes.bool,
   value: PropTypes.string.isRequired,
   autoComplete: PropTypes.string,
 };
 
-export default PasswordField;
+export default injectIntl(PasswordField);

src/common-components/RedirectLogistration.jsx

@@ -4,19 +4,12 @@ import { getConfig } from '@edx/frontend-platform';
 import PropTypes from 'prop-types';
 import { Redirect } from 'react-router-dom';
 
-import { AUTHN_PROGRESSIVE_PROFILING, RECOMMENDATIONS } from '../data/constants';
+import { WELCOME_PAGE } from '../data/constants';
 import { setCookie } from '../data/utils';
 
-const RedirectLogistration = (props) => {
+function RedirectLogistration(props) {
   const {
-    finishAuthUrl,
-    redirectUrl,
-    redirectToProgressiveProfilingPage,
-    success,
-    optionalFields,
-    redirectToRecommendationsPage,
-    educationLevel,
-    userId,
+    finishAuthUrl, redirectUrl, redirectToWelcomePage, success, optionalFields,
   } = props;
   let finalRedirectUrl = '';
 
@@ -31,14 +24,14 @@ const RedirectLogistration = (props) => {
       finalRedirectUrl = redirectUrl;
     }
 
-    // Redirect to Progressive Profiling after successful registration
-    if (redirectToProgressiveProfilingPage) {
-      // TODO: Do we still need this cookie?
+    if (redirectToWelcomePage) {
       setCookie('van-504-returning-user', true);
+      // use this component to redirect WelcomePage after successful registration
+      // return <Redirect to={WELCOME_PAGE} />;
       const registrationResult = { redirectUrl: finalRedirectUrl, success };
       return (
         <Redirect to={{
-          pathname: AUTHN_PROGRESSIVE_PROFILING,
+          pathname: WELCOME_PAGE,
           state: {
             registrationResult,
             optionalFields,
@@ -48,48 +41,25 @@ const RedirectLogistration = (props) => {
       );
     }
 
-    // Redirect to Recommendation page
-    if (redirectToRecommendationsPage) {
-      const registrationResult = { redirectUrl: finalRedirectUrl, success };
-      return (
-        <Redirect to={{
-          pathname: RECOMMENDATIONS,
-          state: {
-            registrationResult,
-            educationLevel,
-            userId,
-          },
-        }}
-        />
-      );
-    }
-
     window.location.href = finalRedirectUrl;
   }
-
-  return null;
-};
+  return <></>;
+}
 
 RedirectLogistration.defaultProps = {
-  educationLevel: null,
   finishAuthUrl: null,
   success: false,
   redirectUrl: '',
-  redirectToProgressiveProfilingPage: false,
+  redirectToWelcomePage: false,
   optionalFields: {},
-  redirectToRecommendationsPage: false,
-  userId: null,
 };
 
 RedirectLogistration.propTypes = {
-  educationLevel: PropTypes.string,
   finishAuthUrl: PropTypes.string,
   success: PropTypes.bool,
   redirectUrl: PropTypes.string,
-  redirectToProgressiveProfilingPage: PropTypes.bool,
+  redirectToWelcomePage: PropTypes.bool,
   optionalFields: PropTypes.shape({}),
-  redirectToRecommendationsPage: PropTypes.bool,
-  userId: PropTypes.number,
 };
 
 export default RedirectLogistration;

src/common-components/SocialAuthProviders.jsx

@@ -1,18 +1,16 @@
 import React from 'react';
 
 import { getConfig } from '@edx/frontend-platform';
-import { useIntl } from '@edx/frontend-platform/i18n';
-import { Icon } from '@edx/paragon';
-import { Login } from '@edx/paragon/icons';
+import { injectIntl, intlShape } from '@edx/frontend-platform/i18n';
+import { faSignInAlt } from '@fortawesome/free-solid-svg-icons';
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
 import PropTypes from 'prop-types';
 
-import messages from './messages';
 import { LOGIN_PAGE, SUPPORTED_ICON_CLASSES } from '../data/constants';
+import messages from './messages';
 
-const SocialAuthProviders = (props) => {
-  const { formatMessage } = useIntl();
-  const { referrer, socialAuthProviders } = props;
+function SocialAuthProviders(props) {
+  const { intl, referrer, socialAuthProviders } = props;
 
   function handleSubmit(e) {
     e.preventDefault();
@@ -32,30 +30,29 @@ const SocialAuthProviders = (props) => {
     >
       {provider.iconImage ? (
         <div aria-hidden="true">
-          <img className="btn-tpa__image-icon" src={provider.iconImage} alt={`icon ${provider.name}`} />
+          <img className="icon-image" src={provider.iconImage} alt={`icon ${provider.name}`} />
         </div>
       )
         : (
-          <div className="btn-tpa__font-container" aria-hidden="true">
-            {SUPPORTED_ICON_CLASSES.includes(provider.iconClass) ? (
-              <FontAwesomeIcon icon={['fab', provider.iconClass]} />)
-              : (
-                <Icon className="h-75" src={Login} />
-              )}
-          </div>
+          <>
+            <div className="font-container" aria-hidden="true">
+              <FontAwesomeIcon
+                icon={SUPPORTED_ICON_CLASSES.includes(provider.iconClass) ? ['fab', provider.iconClass] : faSignInAlt}
+              />
+            </div>
+          </>
         )}
       <span id="provider-name" className="notranslate mr-auto pl-2" aria-hidden="true">{provider.name}</span>
       <span className="sr-only">
         {referrer === LOGIN_PAGE
-          ? formatMessage(messages['sso.sign.in.with'], { providerName: provider.name })
-          : formatMessage(messages['sso.create.account.using'], { providerName: provider.name })}
+          ? intl.formatMessage(messages['sso.sign.in.with'], { providerName: provider.name })
+          : intl.formatMessage(messages['sso.create.account.using'], { providerName: provider.name })}
       </span>
     </button>
   ));
 
-  // eslint-disable-next-line react/jsx-no-useless-fragment
   return <>{socialAuth}</>;
-};
+}
 
 SocialAuthProviders.defaultProps = {
   referrer: LOGIN_PAGE,
@@ -63,6 +60,7 @@ SocialAuthProviders.defaultProps = {
 };
 
 SocialAuthProviders.propTypes = {
+  intl: intlShape.isRequired,
   referrer: PropTypes.string,
   socialAuthProviders: PropTypes.arrayOf(PropTypes.shape({
     id: PropTypes.string,
@@ -71,8 +69,7 @@ SocialAuthProviders.propTypes = {
     iconImage: PropTypes.string,
     loginUrl: PropTypes.string,
     registerUrl: PropTypes.string,
-    skipRegistrationForm: PropTypes.bool,
   })),
 };
 
-export default SocialAuthProviders;
+export default injectIntl(SocialAuthProviders);

src/common-components/SwitchContent.jsx

@@ -0,0 +1,62 @@
+import React from 'react';
+
+import { TransitionReplace } from '@edx/paragon';
+import PropTypes from 'prop-types';
+
+const onChildExit = (htmlNode) => {
+  // If the leaving child has focus, take control and redirect it
+  if (htmlNode.contains(document.activeElement)) {
+    // Get the newly entering sibling.
+    // It's the previousSibling, but not for any explicit reason. So checking for both.
+    const enteringChild = htmlNode.previousSibling || htmlNode.nextSibling;
+
+    // There's no replacement, do nothing.
+    if (!enteringChild) return; // eslint-disable-line curly
+
+    // Get all the focusable elements in the entering child and focus the first one
+    const focusableElements = enteringChild.querySelectorAll('button, [href], input, select, textarea, [tabindex]:not([tabindex="-1"])');
+    if (focusableElements.length) {
+      focusableElements[0].focus();
+    }
+  }
+};
+
+function SwitchContent({ expression, cases, className }) {
+  const getContent = (caseKey) => {
+    if (cases[caseKey]) {
+      if (typeof cases[caseKey] === 'string') {
+        return getContent(cases[caseKey]);
+      }
+      return React.cloneElement(cases[caseKey], { key: caseKey });
+    } else if (cases.default) { // eslint-disable-line no-else-return
+      if (typeof cases.default === 'string') {
+        return getContent(cases.default);
+      }
+      React.cloneElement(cases.default, { key: 'default' });
+    }
+
+    return null;
+  };
+
+  return (
+    <TransitionReplace
+      className={className}
+      onChildExit={onChildExit}
+    >
+      {getContent(expression)}
+    </TransitionReplace>
+  );
+}
+
+SwitchContent.propTypes = {
+  expression: PropTypes.string,
+  cases: PropTypes.objectOf(PropTypes.node).isRequired,
+  className: PropTypes.string,
+};
+
+SwitchContent.defaultProps = {
+  expression: null,
+  className: null,
+};
+
+export default SwitchContent;

src/common-components/ThirdPartyAuthAlert.jsx

@@ -1,52 +1,42 @@
 import React from 'react';
 
 import { getConfig } from '@edx/frontend-platform';
-import { useIntl } from '@edx/frontend-platform/i18n';
+import { injectIntl, intlShape } from '@edx/frontend-platform/i18n';
 import { Alert } from '@edx/paragon';
 import PropTypes from 'prop-types';
 
-import messages from './messages';
 import { LOGIN_PAGE, REGISTER_PAGE } from '../data/constants';
+import messages from './messages';
 
 const ThirdPartyAuthAlert = (props) => {
-  const { formatMessage } = useIntl();
-  const { currentProvider, referrer } = props;
+  const { currentProvider, intl, referrer } = props;
   const platformName = getConfig().SITE_NAME;
   let message;
 
   if (referrer === LOGIN_PAGE) {
-    message = formatMessage(messages['login.third.party.auth.account.not.linked'], { currentProvider, platformName });
+    message = intl.formatMessage(messages['login.third.party.auth.account.not.linked'], { currentProvider, platformName });
   } else {
-    message = formatMessage(messages['register.third.party.auth.account.not.linked'], { currentProvider, platformName });
-  }
-
-  if (!currentProvider) {
-    return null;
+    message = intl.formatMessage(messages['register.third.party.auth.account.not.linked'], { currentProvider, platformName });
   }
 
   return (
-    <>
-      <Alert id="tpa-alert" className={referrer === REGISTER_PAGE ? 'alert-success mt-n2 mb-5' : 'alert-warning mt-n2 mb-5'}>
-        {referrer === REGISTER_PAGE ? (
-          <Alert.Heading>{formatMessage(messages['tpa.alert.heading'])}</Alert.Heading>
-        ) : null}
-        <p>{ message }</p>
-      </Alert>
+    <Alert id="tpa-alert" className={referrer === REGISTER_PAGE ? 'alert-success mt-n2' : 'alert-warning mt-n2'}>
       {referrer === REGISTER_PAGE ? (
-        <h4 className="mt-4 mb-4">{formatMessage(messages['registration.using.tpa.form.heading'])}</h4>
+        <Alert.Heading>{intl.formatMessage(messages['tpa.alert.heading'])}</Alert.Heading>
       ) : null}
-    </>
+      <p>{ message }</p>
+    </Alert>
   );
 };
 
 ThirdPartyAuthAlert.defaultProps = {
-  currentProvider: '',
   referrer: LOGIN_PAGE,
 };
 
 ThirdPartyAuthAlert.propTypes = {
-  currentProvider: PropTypes.string,
+  currentProvider: PropTypes.string.isRequired,
+  intl: intlShape.isRequired,
   referrer: PropTypes.string,
 };
 
-export default ThirdPartyAuthAlert;
+export default injectIntl(ThirdPartyAuthAlert);

src/common-components/UnAuthOnlyRoute.jsx

@@ -23,9 +23,6 @@ const UnAuthOnlyRoute = (props) => {
 
   if (isReady) {
     if (authUser && authUser.username) {
-      if (true) { // check for query param
-        window.parent.postMessage({ authenticated: true }, 'https://discover.edx.org/social-reg');
-      }
       global.location.href = getConfig().LMS_BASE_URL.concat(DEFAULT_REDIRECT_URL);
       return null;
     }
@@ -33,7 +30,7 @@ const UnAuthOnlyRoute = (props) => {
     return <Route {...props} />;
   }
 
-  return null;
+  return <></>;
 };
 
 export default UnAuthOnlyRoute;

src/common-components/Zendesk.jsx

@@ -1,56 +0,0 @@
-import React from 'react';
-
-import { getConfig } from '@edx/frontend-platform';
-import { useIntl } from '@edx/frontend-platform/i18n';
-import Zendesk from 'react-zendesk';
-
-import messages from './messages';
-
-const ZendeskHelp = () => {
-  const { formatMessage } = useIntl();
-  const setting = {
-    cookies: true,
-    webWidget: {
-      contactOptions: {
-        enabled: false,
-      },
-      chat: {
-        suppress: false,
-        departments: {
-          enabled: ['account settings', 'billing and payments', 'certificates', 'deadlines', 'errors and technical issues', 'other', 'proctoring'],
-        },
-      },
-      contactForm: {
-        ticketForms: [
-          {
-            id: 360003368814,
-            subject: false,
-            fields: [{ id: 'description', prefill: { '*': '' } }],
-          },
-        ],
-        selectTicketForm: {
-          '*': formatMessage(messages.selectTicketForm),
-        },
-        attachments: true,
-      },
-      helpCenter: {
-        originalArticleButton: true,
-      },
-      answerBot: {
-        suppress: false,
-        contactOnlyAfterQuery: true,
-        title: { '*': formatMessage(messages.supportTitle) },
-        avatar: {
-          url: getConfig().ZENDESK_LOGO_URL,
-          name: { '*': formatMessage(messages.supportTitle) },
-        },
-      },
-    },
-  };
-
-  return (
-    <Zendesk defer zendeskKey={getConfig().ZENDESK_KEY} {...setting} />
-  );
-};
-
-export default ZendeskHelp;

src/common-components/data/actions.js

@@ -1,7 +1,6 @@
 import { AsyncActionType } from '../../data/utils';
 
 export const THIRD_PARTY_AUTH_CONTEXT = new AsyncActionType('THIRD_PARTY_AUTH', 'GET_THIRD_PARTY_AUTH_CONTEXT');
-export const THIRD_PARTY_AUTH_CONTEXT_CLEAR_ERROR_MSG = 'THIRD_PARTY_AUTH_CONTEXT_CLEAR_ERROR_MSG';
 
 // Third party auth context
 export const getThirdPartyAuthContext = (urlParams) => ({
@@ -21,7 +20,3 @@ export const getThirdPartyAuthContextSuccess = (fieldDescriptions, optionalField
 export const getThirdPartyAuthContextFailure = () => ({
   type: THIRD_PARTY_AUTH_CONTEXT.FAILURE,
 });
-
-export const clearThirdPartyAuthContextErrorMessage = () => ({
-  type: THIRD_PARTY_AUTH_CONTEXT_CLEAR_ERROR_MSG,
-});

src/common-components/data/reducers.js

@@ -1,51 +1,34 @@
-import { THIRD_PARTY_AUTH_CONTEXT, THIRD_PARTY_AUTH_CONTEXT_CLEAR_ERROR_MSG } from './actions';
 import { COMPLETE_STATE, PENDING_STATE } from '../../data/constants';
+import { THIRD_PARTY_AUTH_CONTEXT } from './actions';
 
 export const defaultState = {
+  extendedProfile: [],
   fieldDescriptions: {},
   optionalFields: {},
   thirdPartyAuthApiStatus: null,
-  thirdPartyAuthContext: {
-    currentProvider: null,
-    finishAuthUrl: null,
-    countryCode: null,
-    providers: [],
-    secondaryProviders: [],
-    pipelineUserDetails: null,
-    errorMessage: null,
-  },
 };
 
-const reducer = (state = defaultState, action = {}) => {
+const reducer = (state = defaultState, action) => {
   switch (action.type) {
     case THIRD_PARTY_AUTH_CONTEXT.BEGIN:
       return {
         ...state,
         thirdPartyAuthApiStatus: PENDING_STATE,
       };
-    case THIRD_PARTY_AUTH_CONTEXT.SUCCESS: {
+    case THIRD_PARTY_AUTH_CONTEXT.SUCCESS:
       return {
         ...state,
+        extendedProfile: action.payload.fieldDescriptions.extendedProfile,
         fieldDescriptions: action.payload.fieldDescriptions.fields,
         optionalFields: action.payload.optionalFields,
         thirdPartyAuthContext: action.payload.thirdPartyAuthContext,
         thirdPartyAuthApiStatus: COMPLETE_STATE,
       };
-    }
     case THIRD_PARTY_AUTH_CONTEXT.FAILURE:
       return {
         ...state,
         thirdPartyAuthApiStatus: COMPLETE_STATE,
       };
-    case THIRD_PARTY_AUTH_CONTEXT_CLEAR_ERROR_MSG:
-      return {
-        ...state,
-        thirdPartyAuthApiStatus: PENDING_STATE,
-        thirdPartyAuthContext: {
-          ...state.thirdPartyAuthContext,
-          errorMessage: null,
-        },
-      };
     default:
       return state;
   }

src/common-components/data/sagas.js

@@ -1,6 +1,7 @@
 import { logError } from '@edx/frontend-platform/logging';
 import { call, put, takeEvery } from 'redux-saga/effects';
 
+import { setCountryFromThirdPartyAuthContext } from '../../register/data/actions';
 import {
   getThirdPartyAuthContextBegin,
   getThirdPartyAuthContextFailure,
@@ -10,17 +11,18 @@ import {
 import {
   getThirdPartyAuthContext,
 } from './service';
-import { setCountryFromThirdPartyAuthContext } from '../../register/data/actions';
 
 export function* fetchThirdPartyAuthContext(action) {
   try {
     yield put(getThirdPartyAuthContextBegin());
-    const {
-      fieldDescriptions, optionalFields, thirdPartyAuthContext,
-    } = yield call(getThirdPartyAuthContext, action.payload.urlParams);
+    const { fieldDescriptions, optionalFields, thirdPartyAuthContext } = yield call(
+      getThirdPartyAuthContext, action.payload.urlParams,
+    );
 
     yield put(setCountryFromThirdPartyAuthContext(thirdPartyAuthContext.countryCode));
-    yield put(getThirdPartyAuthContextSuccess(fieldDescriptions, optionalFields, thirdPartyAuthContext));
+    yield put(getThirdPartyAuthContextSuccess(
+      fieldDescriptions, optionalFields, thirdPartyAuthContext,
+    ));
   } catch (e) {
     yield put(getThirdPartyAuthContextFailure());
     logError(e);

src/common-components/data/selectors.js

@@ -14,15 +14,12 @@ export const fieldDescriptionSelector = createSelector(
   commonComponents => commonComponents.fieldDescriptions,
 );
 
+export const extendedProfileSelector = createSelector(
+  commonComponentsSelector,
+  commonComponents => commonComponents.extendedProfile,
+);
+
 export const optionalFieldsSelector = createSelector(
   commonComponentsSelector,
   commonComponents => commonComponents.optionalFields,
 );
-
-export const tpaProvidersSelector = createSelector(
-  commonComponentsSelector,
-  commonComponents => ({
-    providers: commonComponents.thirdPartyAuthContext.providers,
-    secondaryProviders: commonComponents.thirdPartyAuthContext.secondaryProviders,
-  }),
-);

src/common-components/data/service.js

@@ -1,4 +1,4 @@
-import { getConfig } from '@edx/frontend-platform';
+import { camelCaseObject, convertKeyNames, getConfig } from '@edx/frontend-platform';
 import { getAuthenticatedHttpClient } from '@edx/frontend-platform/auth';
 
 // eslint-disable-next-line import/prefer-default-export
@@ -18,8 +18,12 @@ export async function getThirdPartyAuthContext(urlParams) {
       throw (e);
     });
   return {
-    fieldDescriptions: data.registrationFields || {},
-    optionalFields: data.optionalFields || {},
-    thirdPartyAuthContext: data.contextData || {},
+    fieldDescriptions: data.registration_fields || {},
+    optionalFields: data.optional_fields || {},
+    // For backward compatibility with the API, once https://github.com/openedx/edx-platform/pull/30198 is merged
+    // and deployed update it to use data.context_data
+    thirdPartyAuthContext: camelCaseObject(
+      convertKeyNames(data.context_data || data, { fullname: 'name' }),
+    ),
   };
 }

src/common-components/data/tests/reducer.test.js

@@ -1,82 +0,0 @@
-import { PENDING_STATE } from '../../../data/constants';
-import { THIRD_PARTY_AUTH_CONTEXT, THIRD_PARTY_AUTH_CONTEXT_CLEAR_ERROR_MSG } from '../actions';
-import reducer from '../reducers';
-
-describe('common components reducer', () => {
-  it('test mfe context response', () => {
-    const state = {
-      fieldDescriptions: {},
-      optionalFields: {},
-      thirdPartyAuthApiStatus: null,
-      thirdPartyAuthContext: {
-        currentProvider: null,
-        finishAuthUrl: null,
-        countryCode: null,
-        providers: [],
-        secondaryProviders: [],
-        pipelineUserDetails: null,
-        errorMessage: null,
-      },
-    };
-    const fieldDescriptions = {
-      fields: [],
-    };
-    const optionalFields = {
-      fields: [],
-      extended_profile: {},
-    };
-    const thirdPartyAuthContext = { ...state.thirdPartyAuthContext };
-    const action = {
-      type: THIRD_PARTY_AUTH_CONTEXT.SUCCESS,
-      payload: { fieldDescriptions, optionalFields, thirdPartyAuthContext },
-    };
-
-    expect(
-      reducer(state, action),
-    ).toEqual(
-      {
-        ...state,
-        fieldDescriptions: [],
-        optionalFields: {
-          fields: [],
-          extended_profile: {},
-        },
-        thirdPartyAuthApiStatus: 'complete',
-      },
-    );
-  });
-
-  it('should clear tpa context error message', () => {
-    const state = {
-      fieldDescriptions: {},
-      optionalFields: {},
-      thirdPartyAuthApiStatus: null,
-      thirdPartyAuthContext: {
-        currentProvider: null,
-        finishAuthUrl: null,
-        countryCode: null,
-        providers: [],
-        secondaryProviders: [],
-        pipelineUserDetails: null,
-        errorMessage: 'An error occured',
-      },
-    };
-
-    const action = {
-      type: THIRD_PARTY_AUTH_CONTEXT_CLEAR_ERROR_MSG,
-    };
-
-    expect(
-      reducer(state, action),
-    ).toEqual(
-      {
-        ...state,
-        thirdPartyAuthApiStatus: PENDING_STATE,
-        thirdPartyAuthContext: {
-          ...state.thirdPartyAuthContext,
-          errorMessage: null,
-        },
-      },
-    );
-  });
-});

src/common-components/index.jsx

@@ -11,4 +11,4 @@ export { default as saga } from './data/sagas';
 export { storeName } from './data/selectors';
 export { default as FormGroup } from './FormGroup';
 export { default as PasswordField } from './PasswordField';
-export { default as Zendesk } from './Zendesk';
+export { default as Logistration } from './Logistration';

src/common-components/messages.jsx

@@ -1,13 +1,29 @@
 import { defineMessages } from '@edx/frontend-platform/i18n';
 
 const messages = defineMessages({
-  // institution login strings
   'institution.login.page.sub.heading': {
     id: 'institution.login.page.sub.heading',
     defaultMessage: 'Choose your institution from the list below',
     description: 'Heading of the institutions list',
   },
-  // logistration strings
+  // Confirmation Alert Message
+  'forgot.password.confirmation.title': {
+    id: 'forgot.password.confirmation.title',
+    defaultMessage: 'Check your email',
+    description: 'Forgot password confirmation message title',
+  },
+  'forgot.password.confirmation.support.link': {
+    id: 'forgot.password.confirmation.support.link',
+    defaultMessage: 'contact technical support',
+    description: 'Technical support link text',
+  },
+  'forgot.password.confirmation.info': {
+    id: 'forgot.password.confirmation.info',
+    defaultMessage: 'If you do not receive a password reset message after 1 minute, verify that you entered the correct '
+                    + 'email address, or check your spam folder.',
+    description: 'Part of message that appears after user requests password change',
+  },
+  // Logistration strinsg
   'logistration.sign.in': {
     id: 'logistration.sign.in',
     defaultMessage: 'Sign in',
@@ -18,12 +34,27 @@ const messages = defineMessages({
     defaultMessage: 'Register',
     description: 'Text that appears on the tab to switch between login and register',
   },
+  'internal.server.error.message': {
+    id: 'internal.server.error.message',
+    defaultMessage: 'An error has occurred. Try refreshing the page, or check your internet connection.',
+    description: 'Error message that appears when server responds with 500 error code',
+  },
+  'server.ratelimit.error.message': {
+    id: 'server.ratelimit.error.message',
+    defaultMessage: 'An error has occurred because of too many requests. Please try again after some time.',
+    description: 'Error message that appears when server responds with 429 error code',
+  },
   // enterprise sso strings
   'enterprisetpa.title.heading': {
     id: 'enterprisetpa.title.heading',
     defaultMessage: 'Would you like to sign in using your {providerName} credentials?',
     description: 'Header text used in enterprise third party authentication',
   },
+  'enterprisetpa.sso.button.title': {
+    id: 'enterprisetpa.sso.button.title',
+    defaultMessage: 'Sign in using {providerName}',
+    description: 'Text for third party auth provider buttons',
+  },
   'enterprisetpa.login.button.text': {
     id: 'enterprisetpa.login.button.text',
     defaultMessage: 'Show me other ways to sign in or register',
@@ -97,21 +128,6 @@ const messages = defineMessages({
     description: 'Message that appears on register page if user has successfully authenticated with TPA '
                   + 'but no associated platform account exists',
   },
-  'registration.using.tpa.form.heading': {
-    id: 'registration.using.tpa.form.heading',
-    defaultMessage: 'Finish creating your account',
-    description: 'Heading that appears above form when user is trying to create account using social auth',
-  },
-  supportTitle: {
-    id: 'zendesk.supportTitle',
-    description: 'Title for the support button',
-    defaultMessage: 'edX Support',
-  },
-  selectTicketForm: {
-    id: 'zendesk.selectTicketForm',
-    description: 'Select ticket form',
-    defaultMessage: 'Please choose your request type:',
-  },
 });
 
 export default messages;

src/common-components/tests/Logistration.test.jsx

@@ -2,23 +2,20 @@ import React from 'react';
 import { Provider } from 'react-redux';
 
 import { getConfig, mergeConfig } from '@edx/frontend-platform';
-import { sendPageEvent, sendTrackEvent } from '@edx/frontend-platform/analytics';
+import * as analytics from '@edx/frontend-platform/analytics';
+import * as auth from '@edx/frontend-platform/auth';
 import { configure, injectIntl, IntlProvider } from '@edx/frontend-platform/i18n';
 import { mount } from 'enzyme';
 import { MemoryRouter } from 'react-router-dom';
 import configureStore from 'redux-mock-store';
 
-import Logistration from './Logistration';
-import { clearThirdPartyAuthContextErrorMessage } from '../common-components/data/actions';
-import { RenderInstitutionButton } from '../common-components/InstitutionLogistration';
-import { COMPLETE_STATE, LOGIN_PAGE } from '../data/constants';
-import { backupRegistrationForm } from '../register/data/actions';
+import { COMPLETE_STATE, LOGIN_PAGE } from '../../data/constants';
+import { RenderInstitutionButton } from '../InstitutionLogistration';
+import Logistration from '../Logistration';
 
-jest.mock('@edx/frontend-platform/analytics', () => ({
-  sendPageEvent: jest.fn(),
-  sendTrackEvent: jest.fn(),
-}));
+jest.mock('@edx/frontend-platform/analytics');
 jest.mock('@edx/frontend-platform/auth');
+analytics.sendPageEvent = jest.fn();
 
 const mockStore = configureStore();
 const IntlLogistration = injectIntl(Logistration);
@@ -42,13 +39,9 @@ describe('Logistration', () => {
   );
 
   beforeEach(() => {
-    jest.mock('@edx/frontend-platform/auth', () => ({
-      getAuthenticatedUser: jest.fn(() => ({
-        userId: 3,
-        username: 'test-user',
-      })),
-    }));
-
+    auth.getAuthenticatedUser = jest.fn(() => ({ userId: 3, username: 'edX' }));
+  });
+  it('should render registration page', () => {
     configure({
       loggingService: { logError: jest.fn() },
       config: {
@@ -57,9 +50,7 @@ describe('Logistration', () => {
       },
       messages: { 'es-419': {}, de: {}, 'en-us': {} },
     });
-  });
 
-  it('should render registration page', () => {
     mergeConfig({
       ALLOW_PUBLIC_ACCOUNT_CREATION: true,
     });
@@ -69,10 +60,7 @@ describe('Logistration', () => {
         registrationError: {},
       },
       commonComponents: {
-        thirdPartyAuthContext: {
-          providers: [],
-          secondaryProviders: [],
-        },
+        thirdPartyAuthApiStatus: null,
       },
     });
     const logistration = mount(reduxWrapper(<IntlLogistration />));
@@ -86,10 +74,7 @@ describe('Logistration', () => {
         loginResult: { success: false, redirectUrl: '' },
       },
       commonComponents: {
-        thirdPartyAuthContext: {
-          providers: [],
-          secondaryProviders: [],
-        },
+        thirdPartyAuthApiStatus: null,
       },
     });
 
@@ -189,8 +174,8 @@ describe('Logistration', () => {
     const logistration = mount(reduxWrapper(<IntlLogistration {...props} />));
     logistration.find(RenderInstitutionButton).simulate('click', { institutionLogin: true });
 
-    expect(sendTrackEvent).toHaveBeenCalledWith('edx.bi.institution_login_form.toggled', { category: 'user-engagement' });
-    expect(sendPageEvent).toHaveBeenCalledWith('login_and_registration', 'institution_login');
+    expect(analytics.sendTrackEvent).toHaveBeenCalledWith('edx.bi.institution_login_form.toggled', { category: 'user-engagement' });
+    expect(analytics.sendPageEvent).toHaveBeenCalledWith('login_and_registration', 'institution_login');
 
     mergeConfig({
       DISABLE_ENTERPRISE_LOGIN: '',
@@ -229,50 +214,4 @@ describe('Logistration', () => {
       DISABLE_ENTERPRISE_LOGIN: '',
     });
   });
-
-  it('should fire action to backup registration form on tab click', () => {
-    store = mockStore({
-      login: {
-        loginResult: { success: false, redirectUrl: '' },
-      },
-      register: {
-        registrationResult: { success: false, redirectUrl: '' },
-        registrationError: {},
-      },
-      commonComponents: {
-        thirdPartyAuthContext: {
-          providers: [],
-          secondaryProviders: [],
-        },
-      },
-    });
-
-    store.dispatch = jest.fn(store.dispatch);
-    const logistration = mount(reduxWrapper(<IntlLogistration />));
-    logistration.find('a[data-rb-event-key="/login"]').simulate('click');
-    expect(store.dispatch).toHaveBeenCalledWith(backupRegistrationForm());
-  });
-
-  it('should clear tpa context errorMessage tab click', () => {
-    store = mockStore({
-      login: {
-        loginResult: { success: false, redirectUrl: '' },
-      },
-      register: {
-        registrationResult: { success: false, redirectUrl: '' },
-        registrationError: {},
-      },
-      commonComponents: {
-        thirdPartyAuthContext: {
-          providers: [],
-          secondaryProviders: [],
-        },
-      },
-    });
-
-    store.dispatch = jest.fn(store.dispatch);
-    const logistration = mount(reduxWrapper(<IntlLogistration />));
-    logistration.find('a[data-rb-event-key="/login"]').simulate('click');
-    expect(store.dispatch).toHaveBeenCalledWith(clearThirdPartyAuthContextErrorMessage());
-  });
 });

src/common-components/tests/UnAuthOnlyRoute.test.jsx

@@ -1,20 +1,13 @@
-/* eslint-disable import/no-import-module-exports */
-/* eslint-disable react/function-component-definition */
 import React from 'react';
 
-import { fetchAuthenticatedUser, getAuthenticatedUser } from '@edx/frontend-platform/auth';
+import * as auth from '@edx/frontend-platform/auth';
 import { mount } from 'enzyme';
-import { act } from 'react-dom/test-utils';
+import { MemoryRouter, BrowserRouter as Router, Switch } from 'react-router-dom';
 
 import { UnAuthOnlyRoute } from '..';
 import { LOGIN_PAGE } from '../../data/constants';
 
-import { MemoryRouter, BrowserRouter as Router, Switch } from 'react-router-dom';
-
-jest.mock('@edx/frontend-platform/auth', () => ({
-  getAuthenticatedUser: jest.fn(),
-  fetchAuthenticatedUser: jest.fn(),
-}));
+jest.mock('@edx/frontend-platform/auth');
 
 const RRD = require('react-router-dom');
 // Just render plain div with its children
@@ -43,30 +36,25 @@ describe('UnAuthOnlyRoute', () => {
     jest.clearAllMocks();
   });
 
-  it('should have called with forceRefresh true', async () => {
+  it('should have called with forceRefresh true', () => {
     const user = {
       username: 'gonzo',
       other: 'data',
     };
+    auth.getAuthenticatedUser = jest.fn(() => user);
+    auth.fetchAuthenticatedUser = jest.fn(() => ({ then: () => auth.getAuthenticatedUser() }));
 
-    getAuthenticatedUser.mockReturnValue(user);
-    fetchAuthenticatedUser.mockReturnValueOnce(Promise.resolve(user));
+    mount(routerWrapper());
 
-    await act(async () => {
-      await mount(routerWrapper());
-    });
-
-    expect(fetchAuthenticatedUser).toBeCalledWith({ forceRefresh: true });
+    expect(auth.fetchAuthenticatedUser).toBeCalledWith({ forceRefresh: true });
   });
 
-  it('should have called with forceRefresh false', async () => {
-    getAuthenticatedUser.mockReturnValue(null);
-    fetchAuthenticatedUser.mockReturnValueOnce(Promise.resolve(null));
+  it('should have called with forceRefresh false', () => {
+    auth.getAuthenticatedUser = jest.fn(() => null);
+    auth.fetchAuthenticatedUser = jest.fn(() => ({ then: () => auth.getAuthenticatedUser() }));
 
-    await act(async () => {
-      await mount(routerWrapper());
-    });
+    mount(routerWrapper());
 
-    expect(fetchAuthenticatedUser).toBeCalledWith({ forceRefresh: false });
+    expect(auth.fetchAuthenticatedUser).toBeCalledWith({ forceRefresh: false });
   });
 });

src/common-components/tests/Zendesk.test.jsx

@@ -1,17 +0,0 @@
-import { IntlProvider } from '@edx/frontend-platform/i18n';
-import renderer from 'react-test-renderer';
-
-import Zendesk from '../Zendesk';
-
-jest.mock('react-zendesk', () => 'Zendesk');
-
-describe('Zendesk Help', () => {
-  it('should match login page third party auth alert message snapshot', () => {
-    const tree = renderer.create(
-      <IntlProvider locale="en">
-        <Zendesk />
-      </IntlProvider>,
-    ).toJSON();
-    expect(tree).toMatchSnapshot();
-  });
-});

src/common-components/tests/__snapshots__/SocialAuthProviders.test.jsx.snap

@@ -10,27 +10,25 @@ exports[`SocialAuthProviders should match social auth provider with default icon
 >
   <div
     aria-hidden="true"
-    className="btn-tpa__font-container"
+    className="font-container"
   >
-    <span
-      className="pgn__icon h-75"
+    <svg
+      aria-hidden="true"
+      className="svg-inline--fa fa-right-to-bracket "
+      data-icon="right-to-bracket"
+      data-prefix="fas"
+      focusable="false"
+      role="img"
+      style={Object {}}
+      viewBox="0 0 512 512"
+      xmlns="http://www.w3.org/2000/svg"
     >
-      <svg
-        aria-hidden={true}
-        fill="none"
-        focusable={false}
-        height={24}
-        role="img"
-        viewBox="0 0 24 24"
-        width={24}
-        xmlns="http://www.w3.org/2000/svg"
-      >
-        <path
-          d="M11 7L9.6 8.4l2.6 2.6H2v2h10.2l-2.6 2.6L11 17l5-5-5-5zm9 12h-8v2h10V3H12v2h8v14z"
-          fill="currentColor"
-        />
-      </svg>
-    </span>
+      <path
+        d="M352 96h64c17.7 0 32 14.3 32 32V384c0 17.7-14.3 32-32 32H352c-17.7 0-32 14.3-32 32s14.3 32 32 32h64c53 0 96-43 96-96V128c0-53-43-96-96-96H352c-17.7 0-32 14.3-32 32s14.3 32 32 32zm-7.5 177.4c4.8-4.5 7.5-10.8 7.5-17.4s-2.7-12.9-7.5-17.4l-144-136c-7-6.6-17.2-8.4-26-4.6s-14.5 12.5-14.5 22v72H32c-17.7 0-32 14.3-32 32v64c0 17.7 14.3 32 32 32H160v72c0 9.6 5.7 18.2 14.5 22s19 2 26-4.6l144-136z"
+        fill="currentColor"
+        style={Object {}}
+      />
+    </svg>
   </div>
   <span
     aria-hidden="true"
@@ -57,7 +55,7 @@ exports[`SocialAuthProviders should match social auth provider with iconClass sn
 >
   <div
     aria-hidden="true"
-    className="btn-tpa__font-container"
+    className="font-container"
   >
     <svg
       aria-hidden="true"
@@ -106,7 +104,7 @@ Array [
     >
       <img
         alt="icon Apple"
-        className="btn-tpa__image-icon"
+        className="icon-image"
         src="https://edx.devstack.lms/logo.png"
       />
     </div>
@@ -135,7 +133,7 @@ Array [
     >
       <img
         alt="icon Facebook"
-        className="btn-tpa__image-icon"
+        className="icon-image"
         src="https://edx.devstack.lms/facebook-logo.png"
       />
     </div>

src/common-components/tests/__snapshots__/ThirdPartyAuthAlert.test.jsx.snap

@@ -2,7 +2,7 @@
 
 exports[`ThirdPartyAuthAlert should match login page third party auth alert message snapshot 1`] = `
 <div
-  className="fade alert-content alert-warning mt-n2 mb-5 alert show"
+  className="fade alert-content alert-warning mt-n2 alert show"
   id="tpa-alert"
   role="alert"
 >
@@ -21,33 +21,26 @@ exports[`ThirdPartyAuthAlert should match login page third party auth alert mess
 `;
 
 exports[`ThirdPartyAuthAlert should match register page third party auth alert message snapshot 1`] = `
-Array [
+<div
+  className="fade alert-content alert-success mt-n2 alert show"
+  id="tpa-alert"
+  role="alert"
+>
   <div
-    className="fade alert-content alert-success mt-n2 mb-5 alert show"
-    id="tpa-alert"
-    role="alert"
+    className="pgn__alert-message-wrapper"
   >
     <div
-      className="pgn__alert-message-wrapper"
+      className="alert-message-content"
     >
       <div
-        className="alert-message-content"
+        className="alert-heading h4"
       >
-        <div
-          className="alert-heading h4"
-        >
-          Almost done!
-        </div>
-        <p>
-          You've successfully signed into Google! We just need a little more information before you start learning with Your Platform Name Here.
-        </p>
+        Almost done!
       </div>
+      <p>
+        You've successfully signed into Google! We just need a little more information before you start learning with Your Platform Name Here.
+      </p>
     </div>
-  </div>,
-  <h4
-    className="mt-4 mb-4"
-  >
-    Finish creating your account
-  </h4>,
-]
+  </div>
+</div>
 `;

src/common-components/tests/__snapshots__/Zendesk.test.jsx.snap

@@ -1,65 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`Zendesk Help should match login page third party auth alert message snapshot 1`] = `
-<Zendesk
-  cookies={true}
-  defer={true}
-  webWidget={
-    Object {
-      "answerBot": Object {
-        "avatar": Object {
-          "name": Object {
-            "*": "edX Support",
-          },
-          "url": undefined,
-        },
-        "contactOnlyAfterQuery": true,
-        "suppress": false,
-        "title": Object {
-          "*": "edX Support",
-        },
-      },
-      "chat": Object {
-        "departments": Object {
-          "enabled": Array [
-            "account settings",
-            "billing and payments",
-            "certificates",
-            "deadlines",
-            "errors and technical issues",
-            "other",
-            "proctoring",
-          ],
-        },
-        "suppress": false,
-      },
-      "contactForm": Object {
-        "attachments": true,
-        "selectTicketForm": Object {
-          "*": "Please choose your request type:",
-        },
-        "ticketForms": Array [
-          Object {
-            "fields": Array [
-              Object {
-                "id": "description",
-                "prefill": Object {
-                  "*": "",
-                },
-              },
-            ],
-            "id": 360003368814,
-            "subject": false,
-          },
-        ],
-      },
-      "contactOptions": Object {
-        "enabled": false,
-      },
-      "helpCenter": Object {
-        "originalArticleButton": true,
-      },
-    }
-  }
-/>
-`;

src/config/index.js

@@ -1,28 +0,0 @@
-const configuration = {
-  // Cookies related configs
-  SESSION_COOKIE_DOMAIN: process.env.SESSION_COOKIE_DOMAIN,
-  REGISTER_CONVERSION_COOKIE_NAME: process.env.REGISTER_CONVERSION_COOKIE_NAME || null,
-  USER_SURVEY_COOKIE_NAME: process.env.USER_SURVEY_COOKIE_NAME || null,
-  // Features
-  DISABLE_ENTERPRISE_LOGIN: process.env.DISABLE_ENTERPRISE_LOGIN || '',
-  ENABLE_DYNAMIC_REGISTRATION_FIELDS: process.env.ENABLE_DYNAMIC_REGISTRATION_FIELDS || false,
-  ENABLE_PROGRESSIVE_PROFILING_ON_AUTHN: process.env.ENABLE_PROGRESSIVE_PROFILING_ON_AUTHN || false,
-  ENABLE_PERSONALIZED_RECOMMENDATIONS: process.env.ENABLE_PERSONALIZED_RECOMMENDATIONS || false,
-  MARKETING_EMAILS_OPT_IN: process.env.MARKETING_EMAILS_OPT_IN || '',
-  SHOW_CONFIGURABLE_EDX_FIELDS: process.env.SHOW_CONFIGURABLE_EDX_FIELDS || false,
-  // Links
-  ACTIVATION_EMAIL_SUPPORT_LINK: process.env.ACTIVATION_EMAIL_SUPPORT_LINK || null,
-  AUTHN_PROGRESSIVE_PROFILING_SUPPORT_LINK: process.env.AUTHN_PROGRESSIVE_PROFILING_SUPPORT_LINK || null,
-  LOGIN_ISSUE_SUPPORT_LINK: process.env.LOGIN_ISSUE_SUPPORT_LINK || null,
-  PASSWORD_RESET_SUPPORT_LINK: process.env.PASSWORD_RESET_SUPPORT_LINK || null,
-  PRIVACY_POLICY: process.env.PRIVACY_POLICY || null,
-  TOS_AND_HONOR_CODE: process.env.TOS_AND_HONOR_CODE || null,
-  TOS_LINK: process.env.TOS_LINK || null,
-  // Miscellaneous
-  GENERAL_RECOMMENDATIONS: process.env.GENERAL_RECOMMENDATIONS || '[]',
-  INFO_EMAIL: process.env.INFO_EMAIL || '',
-  ZENDESK_KEY: process.env.ZENDESK_KEY,
-  ZENDESK_LOGO_URL: process.env.ZENDESK_LOGO_URL,
-};
-
-export default configuration;

src/data/constants.js

@@ -2,9 +2,8 @@
 export const LOGIN_PAGE = '/login';
 export const REGISTER_PAGE = '/register';
 export const RESET_PAGE = '/reset';
-export const AUTHN_PROGRESSIVE_PROFILING = '/welcome';
+export const WELCOME_PAGE = '/welcome';
 export const DEFAULT_REDIRECT_URL = '/dashboard';
-export const RECOMMENDATIONS = '/recommendations';
 export const PASSWORD_RESET_CONFIRM = '/password_reset_confirm/:token/';
 export const PAGE_NOT_FOUND = '/notfound';
 export const ENTERPRISE_LOGIN_URL = '/enterprise/login';
@@ -31,8 +30,8 @@ export const VALID_EMAIL_REGEX = '(^[-!#$%&\'*+/=?^_`{}|~0-9A-Z]+(\\.[-!#$%&\'*+
                                  + '|\\[(25[0-5]|2[0-4]\\d|[0-1]?\\d?\\d)(\\.(25[0-5]|2[0-4]\\d|[0-1]?\\d?\\d)){3}\\]$';
 export const LETTER_REGEX = /[a-zA-Z]/;
 export const NUMBER_REGEX = /\d/;
-export const INVALID_NAME_REGEX = /[-a-zA-Z0-9@:%._\+~#=]{1,256}\.[a-zA-Z0-9()]{1,6}\b([-a-zA-Z0-9()@:%_\+.~#?&//=]*)?/gi; // eslint-disable-line no-useless-escape
+export const VALID_NAME_REGEX = /[-a-zA-Z0-9@:%._\+~#=]{1,256}\.[a-zA-Z0-9()]{1,6}\b([-a-zA-Z0-9()@:%_\+.~#?&//=]*)?/gi; // eslint-disable-line no-useless-escape
 
 // Query string parameters that can be passed to LMS to manage
 // things like auto-enrollment upon login and registration.
-export const AUTH_PARAMS = ['course_id', 'enrollment_action', 'course_mode', 'email_opt_in', 'purchase_workflow', 'next', 'save_for_later', 'register_for_free', 'track', 'is_account_recovery'];
+export const AUTH_PARAMS = ['course_id', 'enrollment_action', 'course_mode', 'email_opt_in', 'purchase_workflow', 'next', 'save_for_later', 'register_for_free'];

src/data/optimizely.js

@@ -1,17 +0,0 @@
-import {
-  createInstance,
-} from '@optimizely/react-sdk';
-
-const OPTIMIZELY_SDK_KEY = process.env.OPTIMIZELY_FULL_STACK_SDK_KEY;
-
-const getOptimizelyInstance = () => {
-  if (OPTIMIZELY_SDK_KEY) {
-    return createInstance({
-      sdkKey: OPTIMIZELY_SDK_KEY,
-    });
-  }
-
-  return null;
-};
-
-export default getOptimizelyInstance();

src/data/reducers.js

@@ -12,10 +12,6 @@ import {
   reducer as loginReducer,
   storeName as loginStoreName,
 } from '../login';
-import {
-  reducer as authnProgressiveProfilingReducers,
-  storeName as authnProgressiveProfilingStoreName,
-} from '../progressive-profiling';
 import {
   reducer as registerReducer,
   storeName as registerStoreName,
@@ -24,6 +20,10 @@ import {
   reducer as resetPasswordReducer,
   storeName as resetPasswordStoreName,
 } from '../reset-password';
+import {
+  reducer as welcomePageReducers,
+  storeName as welcomePageStoreName,
+} from '../welcome';
 
 const createRootReducer = () => combineReducers({
   [loginStoreName]: loginReducer,
@@ -31,6 +31,6 @@ const createRootReducer = () => combineReducers({
   [commonComponentsStoreName]: commonComponentsReducer,
   [forgotPasswordStoreName]: forgotPasswordReducer,
   [resetPasswordStoreName]: resetPasswordReducer,
-  [authnProgressiveProfilingStoreName]: authnProgressiveProfilingReducers,
+  [welcomePageStoreName]: welcomePageReducers,
 });
 export default createRootReducer;

src/data/sagas.js

@@ -3,9 +3,9 @@ import { all } from 'redux-saga/effects';
 import { saga as commonComponentsSaga } from '../common-components';
 import { saga as forgotPasswordSaga } from '../forgot-password';
 import { saga as loginSaga } from '../login';
-import { saga as authnProgressiveProfilingSaga } from '../progressive-profiling';
 import { saga as registrationSaga } from '../register';
 import { saga as resetPasswordSaga } from '../reset-password';
+import { saga as welcomePageSaga } from '../welcome';
 
 export default function* rootSaga() {
   yield all([
@@ -14,6 +14,6 @@ export default function* rootSaga() {
     commonComponentsSaga(),
     forgotPasswordSaga(),
     resetPasswordSaga(),
-    authnProgressiveProfilingSaga(),
+    welcomePageSaga(),
   ]);
 }

src/data/utils/cookies.js

@@ -3,7 +3,7 @@ import Cookies from 'universal-cookie';
 
 export function setCookie(cookieName, cookieValue, cookieExpiry) {
   const cookies = new Cookies();
-  const options = { domain: getConfig().SESSION_COOKIE_DOMAIN, path: '/' };
+  const options = { domain: getConfig().COOKIE_DOMAIN, path: '/' };
   if (cookieExpiry) {
     options.expires = cookieExpiry;
   }

src/data/utils/dataUtils.js

@@ -49,8 +49,8 @@ export const updatePathWithQueryParams = (path) => {
   return `${path}${queryParams}`;
 };
 
-export const getAllPossibleQueryParams = (locationURl = null) => {
-  const urlParams = locationURl ? QueryString.parseUrl(locationURl).query : QueryString.parse(window.location.search);
+export const getAllPossibleQueryParam = () => {
+  const urlParams = QueryString.parse(window.location.search);
   const params = {};
   Object.entries(urlParams).forEach(([key, value]) => {
     if (AUTH_PARAMS.indexOf(key) > -1) {

src/data/utils/dataUtils.test.js

@@ -1,5 +1,5 @@
-import { updatePathWithQueryParams } from './dataUtils';
 import { LOGIN_PAGE } from '../constants';
+import { updatePathWithQueryParams } from './dataUtils';
 
 describe('updatePathWithQueryParams', () => {
   it('should append query params into the path', () => {

src/data/utils/index.js

@@ -2,7 +2,7 @@ export {
   getTpaProvider,
   getTpaHint,
   updatePathWithQueryParams,
-  getAllPossibleQueryParams,
+  getAllPossibleQueryParam,
   getActivationStatus,
   windowScrollTo,
 } from './dataUtils';

src/field-renderer/FieldRenderer.jsx

@@ -7,7 +7,7 @@ import PropTypes from 'prop-types';
 const FormFieldRenderer = (props) => {
   let formField = null;
   const {
-    className, errorMessage, fieldData, onChangeHandler, isRequired, value,
+    errorMessage, fieldData, onChangeHandler, isRequired, value,
   } = props;
 
   const handleFocus = (e) => {
@@ -26,7 +26,6 @@ const FormFieldRenderer = (props) => {
       formField = (
         <Form.Group controlId={fieldData.name} isInvalid={!!(isRequired && errorMessage)}>
           <Form.Control
-            className={className}
             as="select"
             name={fieldData.name}
             value={value}
@@ -55,7 +54,6 @@ const FormFieldRenderer = (props) => {
       formField = (
         <Form.Group controlId={fieldData.name} isInvalid={!!(isRequired && errorMessage)}>
           <Form.Control
-            className={className}
             as="textarea"
             name={fieldData.name}
             value={value}
@@ -78,7 +76,6 @@ const FormFieldRenderer = (props) => {
       formField = (
         <Form.Group controlId={fieldData.name} isInvalid={!!(isRequired && errorMessage)}>
           <Form.Control
-            className={className}
             name={fieldData.name}
             value={value}
             aria-invalid={isRequired && Boolean(errorMessage)}
@@ -100,7 +97,6 @@ const FormFieldRenderer = (props) => {
       formField = (
         <Form.Group isInvalid={!!(isRequired && errorMessage)}>
           <Form.Checkbox
-            className={className}
             id={fieldData.name}
             checked={!!value}
             name={fieldData.name}
@@ -128,7 +124,6 @@ const FormFieldRenderer = (props) => {
   return formField;
 };
 FormFieldRenderer.defaultProps = {
-  className: '',
   value: '',
   handleBlur: null,
   handleFocus: null,
@@ -137,22 +132,17 @@ FormFieldRenderer.defaultProps = {
 };
 
 FormFieldRenderer.propTypes = {
-  className: PropTypes.string,
   fieldData: PropTypes.shape({
     type: PropTypes.string,
     label: PropTypes.string,
     name: PropTypes.string,
-    options: PropTypes.arrayOf(PropTypes.arrayOf(PropTypes.string)),
   }).isRequired,
   onChangeHandler: PropTypes.func.isRequired,
   handleBlur: PropTypes.func,
   handleFocus: PropTypes.func,
   errorMessage: PropTypes.string,
   isRequired: PropTypes.bool,
-  value: PropTypes.oneOfType([
-    PropTypes.string,
-    PropTypes.bool,
-  ]),
+  value: PropTypes.string,
 };
 
 export default FormFieldRenderer;

src/field-renderer/index.jsx

@@ -1,2 +1 @@
-/* eslint-disable import/prefer-default-export */
-export { default as FormFieldRenderer } from './FieldRenderer';
+export { default } from './FieldRenderer';

src/field-renderer/tests/FieldRenderer.test.jsx

@@ -1,6 +1,5 @@
 import React from 'react';
 
-import { getConfig } from '@edx/frontend-platform';
 import { mount } from 'enzyme';
 
 import FieldRenderer from '../FieldRenderer';
@@ -25,7 +24,7 @@ describe('FieldRendererTests', () => {
       type: 'select',
       label: 'Year of Birth',
       name: 'yob-field',
-      options: [['1997', '1997'], ['1998', '1998']],
+      options: [['1997', 1997], ['1998', 1998]],
     };
 
     const fieldRenderer = mount(<FieldRenderer value={value} fieldData={fieldData} onChangeHandler={changeHandler} />);
@@ -83,7 +82,7 @@ describe('FieldRendererTests', () => {
   it('should render checkbox field', () => {
     const fieldData = {
       type: 'checkbox',
-      label: `I agree that ${getConfig().SITE_NAME} may send me marketing messages.`,
+      label: 'I agree that edX may send me marketing messages.',
       name: 'marketing-emails-opt-in-field',
     };
 
@@ -92,7 +91,7 @@ describe('FieldRendererTests', () => {
     field.simulate('change', { target: { checked: true, type: 'checkbox' } });
 
     expect(field.prop('type')).toEqual('checkbox');
-    expect(fieldRenderer.find('label').text()).toEqual(fieldData.label);
+    expect(fieldRenderer.find('label').text()).toEqual('I agree that edX may send me marketing messages.');
     expect(value).toEqual(true);
   });
 

src/forgot-password/ForgotPasswordAlert.jsx

@@ -1,22 +1,21 @@
 import React from 'react';
 
 import { getConfig } from '@edx/frontend-platform';
-import { FormattedMessage, useIntl } from '@edx/frontend-platform/i18n';
+import { FormattedMessage, injectIntl, intlShape } from '@edx/frontend-platform/i18n';
 import { Alert } from '@edx/paragon';
 import { CheckCircle, Error } from '@edx/paragon/icons';
 import PropTypes from 'prop-types';
 
-import messages from './messages';
 import {
   COMPLETE_STATE, FORBIDDEN_STATE, FORM_SUBMISSION_ERROR, INTERNAL_SERVER_ERROR,
 } from '../data/constants';
 import { PASSWORD_RESET } from '../reset-password/data/constants';
+import messages from './messages';
 
 const ForgotPasswordAlert = (props) => {
-  const { formatMessage } = useIntl();
-  const { email, emailError } = props;
+  const { email, emailError, intl } = props;
   let message = '';
-  let heading = formatMessage(messages['forgot.password.error.alert.title']);
+  let heading = intl.formatMessage(messages['forgot.password.error.alert.title']);
   let { status } = props;
 
   if (emailError) {
@@ -25,7 +24,7 @@ const ForgotPasswordAlert = (props) => {
 
   switch (status) {
     case COMPLETE_STATE:
-      heading = formatMessage(messages['confirmation.message.title']);
+      heading = intl.formatMessage(messages['confirmation.message.title']);
       message = (
         <FormattedMessage
           id="forgot.password.confirmation.message"
@@ -37,7 +36,7 @@ const ForgotPasswordAlert = (props) => {
             email: <span className="data-hj-suppress">{email}</span>,
             supportLink: (
               <Alert.Link href={getConfig().PASSWORD_RESET_SUPPORT_LINK} target="_blank">
-                {formatMessage(messages['confirmation.support.link'])}
+                {intl.formatMessage(messages['confirmation.support.link'])}
               </Alert.Link>
             ),
           }}
@@ -45,26 +44,26 @@ const ForgotPasswordAlert = (props) => {
       );
      break;
     case INTERNAL_SERVER_ERROR:
-      message = formatMessage(messages['internal.server.error']);
+      message = intl.formatMessage(messages['internal.server.error']);
       break;
     case FORBIDDEN_STATE:
-      heading = formatMessage(messages['forgot.password.error.message.title']);
-      message = formatMessage(messages['forgot.password.request.in.progress.message']);
+      heading = intl.formatMessage(messages['forgot.password.error.message.title']);
+      message = intl.formatMessage(messages['forgot.password.request.in.progress.message']);
       break;
     case FORM_SUBMISSION_ERROR:
-      message = formatMessage(messages['extend.field.errors'], { emailError });
+      message = intl.formatMessage(messages['extend.field.errors'], { emailError });
       break;
     case PASSWORD_RESET.INVALID_TOKEN:
-      heading = formatMessage(messages['invalid.token.heading']);
-      message = formatMessage(messages['invalid.token.error.message']);
+      heading = intl.formatMessage(messages['invalid.token.heading']);
+      message = intl.formatMessage(messages['invalid.token.error.message']);
       break;
     case PASSWORD_RESET.FORBIDDEN_REQUEST:
-      heading = formatMessage(messages['token.validation.rate.limit.error.heading']);
-      message = formatMessage(messages['token.validation.rate.limit.error']);
+      heading = intl.formatMessage(messages['token.validation.rate.limit.error.heading']);
+      message = intl.formatMessage(messages['token.validation.rate.limit.error']);
       break;
     case PASSWORD_RESET.INTERNAL_SERVER_ERROR:
-      heading = formatMessage(messages['token.validation.internal.sever.error.heading']);
-      message = formatMessage(messages['token.validation.internal.sever.error']);
+      heading = intl.formatMessage(messages['token.validation.internal.sever.error.heading']);
+      message = intl.formatMessage(messages['token.validation.internal.sever.error']);
       break;
     default:
       break;
@@ -94,7 +93,8 @@ ForgotPasswordAlert.defaultProps = {
 ForgotPasswordAlert.propTypes = {
   status: PropTypes.string.isRequired,
   email: PropTypes.string,
+  intl: intlShape.isRequired,
   emailError: PropTypes.string,
 };
 
-export default ForgotPasswordAlert;
+export default injectIntl(ForgotPasswordAlert);

src/forgot-password/ForgotPasswordPage.jsx

@@ -3,7 +3,7 @@ import { connect } from 'react-redux';
 
 import { getConfig } from '@edx/frontend-platform';
 import { sendPageEvent, sendTrackEvent } from '@edx/frontend-platform/analytics';
-import { useIntl } from '@edx/frontend-platform/i18n';
+import { injectIntl, intlShape } from '@edx/frontend-platform/i18n';
 import {
   Form,
   Hyperlink,
@@ -17,23 +17,22 @@ import PropTypes from 'prop-types';
 import { Helmet } from 'react-helmet';
 import { Redirect } from 'react-router-dom';
 
+import BaseComponent from '../base-component';
+import { FormGroup } from '../common-components';
+import { DEFAULT_STATE, LOGIN_PAGE, VALID_EMAIL_REGEX } from '../data/constants';
+import { updatePathWithQueryParams, windowScrollTo } from '../data/utils';
 import { forgotPassword, setForgotPasswordFormData } from './data/actions';
 import { forgotPasswordResultSelector } from './data/selectors';
 import ForgotPasswordAlert from './ForgotPasswordAlert';
 import messages from './messages';
-import { BaseComponent } from '../base-component';
-import { FormGroup } from '../common-components';
-import { DEFAULT_STATE, LOGIN_PAGE, VALID_EMAIL_REGEX } from '../data/constants';
-import { updatePathWithQueryParams, windowScrollTo } from '../data/utils';
 
 const ForgotPasswordPage = (props) => {
   const platformName = getConfig().SITE_NAME;
   const emailRegex = new RegExp(VALID_EMAIL_REGEX, 'i');
   const {
-    status, submitState, emailValidationError,
+    intl, status, submitState, emailValidationError,
   } = props;
 
-  const { formatMessage } = useIntl();
   const [email, setEmail] = useState(props.email);
   const [bannerEmail, setBannerEmail] = useState('');
   const [formErrors, setFormErrors] = useState('');
@@ -59,9 +58,9 @@ const ForgotPasswordPage = (props) => {
     let error = '';
 
     if (value === '') {
-      error = formatMessage(messages['forgot.password.empty.email.field.error']);
+      error = intl.formatMessage(messages['forgot.password.empty.email.field.error']);
     } else if (!emailRegex.test(value)) {
-      error = formatMessage(messages['forgot.password.page.invalid.email.message']);
+      error = intl.formatMessage(messages['forgot.password.page.invalid.email.message']);
     }
 
     return error;
@@ -90,14 +89,14 @@ const ForgotPasswordPage = (props) => {
   const tabTitle = (
     <div className="d-inline-flex flex-wrap align-items-center">
       <Icon src={ChevronLeft} />
-      <span className="ml-2">{formatMessage(messages['sign.in.text'])}</span>
+      <span className="ml-2">{intl.formatMessage(messages['sign.in.text'])}</span>
     </div>
   );
 
   return (
     <BaseComponent>
       <Helmet>
-        <title>{formatMessage(messages['forgot.password.page.title'],
+        <title>{intl.formatMessage(messages['forgot.password.page.title'],
           { siteName: getConfig().SITE_NAME })}
         </title>
       </Helmet>
@@ -112,13 +111,13 @@ const ForgotPasswordPage = (props) => {
           <Form id="forget-password-form" name="forget-password-form" className="mw-xs">
             <ForgotPasswordAlert email={bannerEmail} emailError={formErrors} status={status} />
             <h2 className="h4">
-              {formatMessage(messages['forgot.password.page.heading'])}
+              {intl.formatMessage(messages['forgot.password.page.heading'])}
             </h2>
             <p className="mb-4">
-              {formatMessage(messages['forgot.password.page.instructions'])}
+              {intl.formatMessage(messages['forgot.password.page.instructions'])}
             </p>
             <FormGroup
-              floatingLabel={formatMessage(messages['forgot.password.page.email.field.label'])}
+              floatingLabel={intl.formatMessage(messages['forgot.password.page.email.field.label'])}
               name="email"
               value={email}
               autoComplete="on"
@@ -126,17 +125,17 @@ const ForgotPasswordPage = (props) => {
               handleChange={(e) => setEmail(e.target.value)}
               handleBlur={handleBlur}
               handleFocus={handleFocus}
-              helpText={[formatMessage(messages['forgot.password.email.help.text'], { platformName })]}
+              helpText={[intl.formatMessage(messages['forgot.password.email.help.text'], { platformName })]}
             />
             <StatefulButton
               id="submit-forget-password"
               name="submit-forget-password"
               type="submit"
               variant="brand"
-              className="forgot-password--button"
+              className="forgot-password-button-width"
               state={submitState}
               labels={{
-                default: formatMessage(messages['forgot.password.page.submit.button']),
+                default: intl.formatMessage(messages['forgot.password.page.submit.button']),
                 pending: '',
               }}
               onClick={handleSubmit}
@@ -151,11 +150,11 @@ const ForgotPasswordPage = (props) => {
                 target="_blank"
                 showLaunchIcon={false}
               >
-                {formatMessage(messages['need.help.sign.in.text'])}
+                {intl.formatMessage(messages['need.help.sign.in.text'])}
               </Hyperlink>
             )}
             <p className="mt-5.5 small text-gray-700">
-              {formatMessage(messages['additional.help.text'], { platformName })}
+              {intl.formatMessage(messages['additional.help.text'], { platformName })}
               <span>
                 <Hyperlink isInline destination={`mailto:${getConfig().INFO_EMAIL}`}>{getConfig().INFO_EMAIL}</Hyperlink>
               </span>
@@ -171,6 +170,7 @@ ForgotPasswordPage.propTypes = {
   email: PropTypes.string,
   emailValidationError: PropTypes.string,
   forgotPassword: PropTypes.func.isRequired,
+  intl: intlShape.isRequired,
   setForgotPasswordFormData: PropTypes.func.isRequired,
   status: PropTypes.string,
   submitState: PropTypes.string,
@@ -189,4 +189,4 @@ export default connect(
     forgotPassword,
     setForgotPasswordFormData,
   },
-)(ForgotPasswordPage);
+)(injectIntl(ForgotPasswordPage));

src/forgot-password/data/reducers.js

@@ -1,6 +1,6 @@
-import { FORGOT_PASSWORD, FORGOT_PASSWORD_PERSIST_FORM_DATA } from './actions';
 import { INTERNAL_SERVER_ERROR, PENDING_STATE } from '../../data/constants';
 import { PASSWORD_RESET_FAILURE } from '../../reset-password/data/actions';
+import { FORGOT_PASSWORD, FORGOT_PASSWORD_PERSIST_FORM_DATA } from './actions';
 
 export const defaultState = {
   status: '',

src/forgot-password/index.js

@@ -1,4 +1,4 @@
-export { default as ForgotPasswordPage } from './ForgotPasswordPage';
+export { default } from './ForgotPasswordPage';
 export { default as reducer } from './data/reducers';
 export { FORGOT_PASSWORD } from './data/actions';
 export { default as saga } from './data/sagas';

src/forgot-password/messages.js

@@ -51,6 +51,11 @@ const messages = defineMessages({
     defaultMessage: 'Enter your email',
     description: 'Error message that appears when user tries to submit empty email field',
   },
+  'forgot.password.invalid.email.message': {
+    id: 'forgot.password.invalid.email.message',
+    defaultMessage: "The email address you've provided isn't formatted correctly.",
+    description: 'message for invalid email',
+  },
   'forgot.password.email.help.text': {
     id: 'forgot.password.email.help.text',
     defaultMessage: 'The email address you used to register with {platformName}',
@@ -124,5 +129,10 @@ const messages = defineMessages({
     defaultMessage: 'An error has occurred. Try refreshing the page, or check your internet connection.',
     description: 'Error message that appears when server responds with 500 error code',
   },
+  'rate.limit.error': {
+    id: 'rate.limit.error',
+    defaultMessage: 'An error has occurred because of too many requests. Please try again after some time.',
+    description: 'Error message that appears when server responds with 429 error code',
+  },
 });
 export default messages;

src/forgot-password/tests/ForgotPasswordPage.test.jsx

@@ -1,7 +1,10 @@
 import React from 'react';
 import { Provider } from 'react-redux';
 
+import CookiePolicyBanner from '@edx/frontend-component-cookie-policy-banner';
 import { mergeConfig } from '@edx/frontend-platform';
+import * as analytics from '@edx/frontend-platform/analytics';
+import * as auth from '@edx/frontend-platform/auth';
 import { configure, injectIntl, IntlProvider } from '@edx/frontend-platform/i18n';
 import { mount } from 'enzyme';
 import { createMemoryHistory } from 'history';
@@ -14,12 +17,11 @@ import { PASSWORD_RESET } from '../../reset-password/data/constants';
 import { setForgotPasswordFormData } from '../data/actions';
 import ForgotPasswordPage from '../ForgotPasswordPage';
 
-jest.mock('@edx/frontend-platform/analytics', () => ({
-  sendPageEvent: jest.fn(),
-  sendTrackEvent: jest.fn(),
-}));
+jest.mock('@edx/frontend-platform/analytics');
 jest.mock('@edx/frontend-platform/auth');
 
+analytics.sendPageEvent = jest.fn();
+
 const IntlForgotPasswordPage = injectIntl(ForgotPasswordPage);
 const mockStore = configureStore();
 const history = createMemoryHistory();
@@ -49,12 +51,7 @@ describe('ForgotPasswordPage', () => {
 
   beforeEach(() => {
     store = mockStore(initialState);
-    jest.mock('@edx/frontend-platform/auth', () => ({
-      getAuthenticatedUser: jest.fn(() => ({
-        userId: 3,
-        username: 'test-user',
-      })),
-    }));
+    auth.getAuthenticatedUser = jest.fn(() => ({ userId: 3, username: 'edX' }));
     configure({
       loggingService: { logError: jest.fn() },
       config: {
@@ -194,6 +191,11 @@ describe('ForgotPasswordPage', () => {
     expect(forgotPasswordPage.find('#email-invalid-feedback').exists()).toEqual(false);
   });
 
+  it('check cookie rendered', () => {
+    const forgotPage = mount(reduxWrapper(<IntlForgotPasswordPage {...props} />));
+    expect(forgotPage.find(<CookiePolicyBanner />)).toBeTruthy();
+  });
+
   it('should display success message after email is sent', () => {
     store = mockStore({
       ...initialState,

src/i18n/index.jsx

@@ -1,39 +1,41 @@
-import { messages as paragonMessages } from '@edx/paragon';
-
 import arMessages from './messages/ar.json';
-import deMessages from './messages/de.json';
-import dedeCAMessages from './messages/de_DE.json';
+import caMessages from './messages/ca.json';
+// no need to import en messages-- they are in the defaultMessage field
+import dedeMessages from './messages/de_DE.json';
 import es419Messages from './messages/es_419.json';
 import frMessages from './messages/fr.json';
-import frCAMessages from './messages/fr_CA.json';
+import heMessages from './messages/he.json';
 import hiMessages from './messages/hi.json';
-import itMessages from './messages/it.json';
-import ititCAMessages from './messages/it_IT.json';
-import ptMessages from './messages/pt.json';
-import ptptCAMessages from './messages/pt_PT.json';
+import idMessages from './messages/id.json';
+import ititMessages from './messages/it_IT.json';
+import kokrMessages from './messages/ko_kr.json';
+import plMessages from './messages/pl.json';
+import ptbrMessages from './messages/pt_br.json';
+import ptptMessages from './messages/pt_PT.json';
 import ruMessages from './messages/ru.json';
+import thMessages from './messages/th.json';
 import ukMessages from './messages/uk.json';
 import zhcnMessages from './messages/zh_CN.json';
-// no need to import en messages-- they are in the defaultMessage field
 
-const appMessages = {
+const messages = {
   ar: arMessages,
+  es: es419Messages, // Prospectus uses es language code for spanish, added `es` option and pointed to es-419 strings.
   'es-419': es419Messages,
   fr: frMessages,
   'zh-cn': zhcnMessages,
-  pt: ptMessages,
-  it: itMessages,
-  de: deMessages,
-  hi: hiMessages,
-  'fr-ca': frCAMessages,
+  'it-it': ititMessages,
+  'pt-pt': ptptMessages,
+  'de-de': dedeMessages,
+  ca: caMessages,
+  he: heMessages,
+  id: idMessages,
+  'ko-kr': kokrMessages,
+  pl: plMessages,
+  'pt-br': ptbrMessages,
   ru: ruMessages,
+  th: thMessages,
   uk: ukMessages,
-  'de-de': dedeCAMessages,
-  'it-it': ititCAMessages,
-  'pt-pt': ptptCAMessages,
+  hi: hiMessages,
 };
 
-export default [
-  paragonMessages,
-  appMessages,
-];
+export default messages;

src/i18n/messages/ar.json

@@ -5,11 +5,16 @@
   "complete.your.profile.2": "ملفك الشخصي",
   "welcome.to.platform": "أهلا بك {username} في {siteName}",
   "institution.login.page.sub.heading": "اختر مؤسستك من القائمة أدناه",
+  "forgot.password.confirmation.title": "تفقّد بريدك الإلكتروني",
+  "forgot.password.confirmation.support.link": "اتصل بالدعم الفني",
+  "forgot.password.confirmation.info": "إن لم تستلم رسالة إعادة تعيين كلمة المرور بعد دقيقة واحدة، فتحقق من أنك أدخلت عنوان البريد الإلكتروني الصحيح، أو تفقّد مجلد الرسائل غير المرغوب فيها في بريدك الإلكتروني.",
   "logistration.sign.in": "تسجيل الدخول",
   "logistration.register": "التسجيل",
+  "internal.server.error.message": "حدث خطأ ما. جرّب تحديث الصفحة أو تحقق من اتصالك بالانترنت.",
+  "server.ratelimit.error.message": "حدث خطأ بسبب كثرة الطلبات. رجاءً حاول مرة أخرى بعد مضي بعض الوقت.",
   "enterprisetpa.title.heading": "هل ترغب في تسجيل الدخول باستخدام بيانات {providerName} الخاصة بك؟",
+  "enterprisetpa.sso.button.title": "تسجيل الدخول باستخدام {providerName}",
   "enterprisetpa.login.button.text": "أرِني وسائل أخرى لتسجيل الدخول أو للتسجيل",
-  "enterprisetpa.login.button.text.public.account.creation.disabled": "أرني طرقًا أخرى لتسجيل الدخول",
   "sso.sign.in.with": "تسجيل الدخول باستخدام {providerName}",
   "sso.create.account.using": "إنشاء حساب باستخدام {providerName}",
   "show.password": "إظهار كلمة المرور",
@@ -21,9 +26,6 @@
   "tpa.alert.heading": "انتهينا تقريبا!",
   "login.third.party.auth.account.not.linked": "لقد نجحت في تسجيل الدخول إلى {currentProvider}، لكن حسابك على {currentProvider} غير موصول بأي حساب على {platformName}. لوصل حساباتك، سجّل الدخول الآن باستخدام كلمة مرورك على {platformName}.",
   "register.third.party.auth.account.not.linked": "لقد سجلت دخولك بنجاح إلى {currentProvider}! نحتاج فقط قليلاً بعدُ من المعلومات قبل أن تبدأ التعلم مع {platformName}.",
-  "registration.using.tpa.form.heading": "إتمام إنشاء حسابك",
-  "zendesk.supportTitle": "edX Support",
-  "zendesk.selectTicketForm": "الرجاء اختيار نوع الطلب الخاص بك:",
   "error.notfound.message": "الصفحة التي تبحث عنها غير متوفرة أو هناك خطأ في العنوان. رجاءً تحقق من العنوان و حاول مجددًا.",
   "forgot.password.confirmation.message": "لقد أرسلنا بريدًا إلكترونيًا إلى {email} به إرشادات لإعادة ضبط كلمة المرور الخاصة بك. إن لم تستلم رسالة إعادة ضبط كلمة المرور بعد دقيقة واحدة، فتحقق من إدخال عنوان البريد الإلكتروني الصحيح، أو تفقد مجلد الرسائل غير المرغوب فيها. إن احتجت مزيدًا من المساعدة، {supportLink}.",
   "forgot.password.page.title": "نسيت كلمة المرور | {siteName}",
@@ -36,6 +38,7 @@
   "forgot.password.error.message.title": "حدث خطأ ما.",
   "forgot.password.request.in.progress.message": "طلبك السابق قيد التنفيذ، يرجى المحاولة مرة أخرى بعد لحظات قليلة.",
   "forgot.password.empty.email.field.error": "أدخل بريدك الإلكتروني",
+  "forgot.password.invalid.email.message": "صيغة عنوان البريد الإلكتروني الذي أدخلته غير صحيحة",
   "forgot.password.email.help.text": "عنوان البريد الإلكتروني الذي استخدمته للتسجيل في {platformName}",
   "confirmation.message.title": "تفقّد بريدك الإلكتروني",
   "confirmation.support.link": "اتصل بالدعم الفني",
@@ -50,6 +53,7 @@
   "token.validation.internal.sever.error.heading": "فشل في التحقق من صحة الشارة",
   "token.validation.internal.sever.error": "حدث خطأ ما. جرب تحديث الصفحة أو تحقق من اتصالك بالإنترنت.",
   "internal.server.error": "حدث خطأ ما. جرب تحديث الصفحة أو تحقق من اتصالك بالإنترنت.",
+  "rate.limit.error": "حدث خطأ بسبب كثرة الطلبات. رجاءً حاول مرة أخرى بعد مضي بعض الوقت.",
   "account.activation.error.message": "شي ما لم يسر على ما يرام، يرجى {supportLink} لحل هذه المشكلة.",
   "login.inactive.user.error": "أنت بحاجة لتفعيل حسابك من أجل تسجيل الدخول{lineBreak}\n{lineBreak}لقد أرسلنا للتو رابطًا للتفعيل إلى {email}. إن لم تتلقّ بريدًا إلكترونيا، تفقّد مجلدات الرسائل غير المرغوب فيها أو {supportLink}.",
   "allowed.domain.login.error": "كونك مستخدمًا على {allowedDomain}، فإن عليك تسجيل الدخول باستخدام {tpaLink} الخاص بـ {allowedDomain} .",
@@ -61,32 +65,45 @@
   "login.user.identity.label": "اسم المستخدم أو البريد الإلكتروني",
   "login.password.label": "كلمة المرور",
   "sign.in.button": "تسجيل الدخول",
+  "sign.in.btn.pending.state": "التحميل جارٍ",
+  "need.help.signing.in.collapsible.menu": "هل تحتاج مساعدة في تسجيل الدخول؟",
+  "forgot.password.link": "نسيت كلمة مروري",
   "forgot.password": "نسيت كلمة المرور",
+  "other.sign.in.issues": "مشاكل أخرى عند تسجيل الدخول",
+  "need.other.help.signing.in.collapsible.menu": "هل تحتاج مساعدة أخرى في تسجيل الدخول؟",
   "institution.login.button": "بيانات المؤسسة / الجامعة",
   "institution.login.page.title": "تسجيل الدخول باستخدام بيانات المؤسسة / الجامعة",
+  "institution.login.page.back.button": "العودة إلى تسجيل الدخول",
+  "create.an.account": " أنشئ حساباً جديداً.",
   "login.other.options.heading": "أو قم بتسجيل الدخول باستخدام:",
   "non.compliant.password.title": "لقد غيرنا متطلبات أمان كلمة المرور مؤخرًا",
   "non.compliant.password.message": "كلمة مرورك الحالية لا تستسجيب لمتطلبات الأمان الجديدة. لقد أرسلنا للتو رسالة لإعادة ضبط كلمة المرور إلى عنوان البريد الإلكتروني المرتبط بهذا الحساب. شكرًا لك على مساعدتنا في الحفاظ على سلامة بياناتك.",
   "account.locked.out.message.1": "لحماية حسابك، تم إقفاله مؤقتًا. حاول مرة أخرى بعد 30 دقيقة.",
+  "first.time.here": "أول مرة لك هنا؟",
+  "email.help.message": "عنوان البريد الإلكتروني الذي استخدمته للتسجيل في edX.",
   "enterprise.login.btn.text": "بيانات الشركة أو المدرسة",
+  "email.format.validation.message": "صيغة عنوان البريد الإلكتروني الذي أدخلته غير صحيحة",
   "username.or.email.format.validation.less.chars.message": "يجب أن يحتوي اسم المستخدم أو البريد الإلكتروني على 3 أحرف على الأقل.",
   "email.validation.message": "أدخل اسم المستخدم أو البريد الإلكتروني الخاص بك",
   "password.validation.message": "لم يتم استيفاء معايير كلمة المرور",
+  "register.link": " أنشئ حساباً",
+  "sign.in.heading": "تسجيل الدخول",
   "account.activation.success.message.title": "نجح الأمر! لقد قمت بتفعيل حسابك.",
   "account.activation.success.message": "ستصلك الآن تحديثات وتنبيهات عبر البريد الإلكتروني منا تتعلق بالمساقات التي قمت بالتسجيل فيها. قم بتسجيل الدخول للمتابعة.",
   "account.activation.info.message": "هذا الحساب مفعَّل من قبل.",
   "account.activation.error.message.title": "لا يمكن تفعيل حسابك",
   "account.activation.support.link": "الاتصال بالدعم",
+  "tpa.account.link": "حساب {provider}",
   "account.confirmation.success.message.title": "نجحت العملية! لقد أكدت بريدك الإلكتروني.",
   "account.confirmation.success.message": "سجل دخولك للمتابعة.",
   "account.confirmation.info.message": "هذا البريد الإلكتروني مؤكد من قبل.",
   "account.confirmation.error.message.title": "لا يمكن تأكيد بريدك الإلكتروني",
-  "tpa.account.link": "حساب {provider}",
-  "internal.server.error.message": "حدث خطأ ما. جرّب تحديث الصفحة أو تحقق من اتصالك بالانترنت.",
   "login.rate.limit.reached.message": "كثرت محاولات تسجيل الدخول الفاشلة. رجاءً أعد المحاولة لاحقًا.",
   "login.failure.header.title": "لم نتمكّن من تسجيل دخولك.",
   "contact.support.link": "اتصل بدعم {platformName}",
   "login.incorrect.credentials.error": "اسم المستخدم أو البريد الإلكتروني أو كلمة المرور التي أدخلتها غير صحيحة. حاول مرة اخرى.",
+  "login.failed.attempt.error": "لديك {remainingAttempts, plural,\none {محاولة واحدة}\ntwo {محاولتان}\nfew {# محاولات}\nmany {# محاولة}\nother {# محاولة}\n} أخرى لتسجيل الدخول قبل أن يتم إقفال حسابك مؤقتًا.",
+  "login.locked.out.error.message": "لحماية حسابك، تم إقفاله مؤقتًا. حاول مرة أخرى بعد {lockedOutPeriod, plural,\n  one {دقيقة واحدة}\n  two {دقيقتين}\n  few {# دقائق}\n  many {# دقيقة}\n  other {# دقيقة}\n}.",
   "login.form.invalid.error.message": "رجاءً املأ الحقول أدناه.",
   "login.incorrect.credentials.error.reset.link.text": "إعادة ضبط كلمه المرور",
   "login.incorrect.credentials.error.before.account.blocked.text": "انقر هنا لإعادة ضبطها.",
@@ -96,21 +113,20 @@
   "password.security.block.body": "اكتشف نظامنا أن كلمة مرورك صعيفة. غيّر كلمة مرورك حتى يظل حسابك آمنًا.",
   "password.security.close.button": "إغلاق",
   "password.security.redirect.to.reset.password.button": "إعادة ضبط كلمة المرور",
-  "login.tpa.authentication.failure": "عذرًا ، غير مصرح لك بالوصول إلى {platform_name} عبر هذه القناة. يرجى الاتصال بمسؤول التعلم أو المدير من أجل الوصول إلى {platform_name}. {lineBreak} {lineBreak} تفاصيل الخطأ: {lineBreak} {errorMessage}",
-  "progressive.profiling.page.title": "مرحبا بكم | {siteName}",
+  "progressive.profiling.page.title": "الحقول الاختيارية | {siteName}",
   "progressive.profiling.page.heading": "بعض الأسئلة الموجهة لك ستساعدنا كي نزداد ذكاءً.",
   "optional.fields.information.link": "معرفة المزيد عن كيفية استخدامنا لهذه المعلومات.",
   "optional.fields.submit.button": "إرسال",
   "optional.fields.skip.button": "التخطي مؤقتا",
-  "optional.fields.next.button": "التالي",
+  "optional.fields.next.button": "Next",
   "continue.to.platform": "المواصلة إلى {platformName}",
   "modal.title": "شكرا لإعلامنا.",
   "modal.description": "إن غيرت رأيك، قيمكنك إكمال ملفك الشخصي ضمن الإعدادات في أي وقت.",
   "welcome.page.error.heading": "لم نتمكن من تحديث ملفك الشخصي",
   "welcome.page.error.message": "حدث خطأ ما. يمكنك إكمال ملفك الشخصي ضمن الإعدادات في أي وقت.",
-  "recommendation.page.title": "التوصيات | {siteName}",
-  "recommendation.page.heading": "لدينا بعض التوصيات لكي تبدأ.",
-  "recommendation.skip.button": "التخطي مؤقتا",
+  "recommendation.page.title": "Recommendations| {siteName}",
+  "recommendation.page.heading": "We have a few recommendations to get you started.",
+  "recommendation.skip.button": "Skip for now",
   "register.page.title": "التسجيل | {siteName}",
   "registration.fullname.label": "الاسم الكامل",
   "registration.email.label": "البريد الإلكتروني",
@@ -123,34 +139,51 @@
   "help.text.username.2": "لا يمكن تغيير هذا لاحقًا.",
   "help.text.email": "لتفعيل الحساب و التحديثات الهامة",
   "create.account.for.free.button": "إنشاء حساب مجانا",
+  "create.an.account.btn.pending.state": "التحميل جارٍ",
   "registration.other.options.heading": "أو سجل باستخدام:",
   "register.institution.login.button": "بيانات المؤسسة / الجامعة",
   "register.institution.login.page.title": "التسجيل باستخدام بيانات المؤسسة / الجامعة",
   "empty.name.field.error": "أدخل اسمك الكامل",
   "empty.email.field.error": "أدخل بريدك الإلكتروني",
+  "email.do.not.match": "عناوين البريد الإلكتروني غير متطابقة.",
   "empty.username.field.error": "يجب أن يتكون اسم المستخدم من 2 إلى 30 حرفًا",
   "empty.password.field.error": "لم يتم استيفاء معايير كلمة المرور",
   "empty.country.field.error": "حدد بلدك أو منطقة إقامتك",
-  "email.do.not.match": "عناوين البريد الإلكتروني غير متطابقة.",
   "email.invalid.format.error": "أدخل بريدا إلكترونيا صحيحا",
+  "email.ratelimit.less.chars.validation.message": "يجب أن يتكون البريد الإلكتروني من 3 أحرف على الأقل.",
   "username.validation.message": "يجب أن يتكون اسم المستخدم من 2 إلى 30 حرفًا",
   "name.validation.message": "أدخل اسمًا صحيحا",
   "username.format.validation.message": "يمكن أن تحتوي أسماء المستخدمين فقط على أحرف (A-Z، a-z)، و أرقام (0-9)، و أسطر سفلية (_)، و واصلات (-). لا يمكن أن تحتوي أسماء المستخدمين على مسافات",
+  "support.education.research": "دعم الأبحاث التربوية من خلال توفير معلومات إضافية. (اختياري)",
   "registration.request.failure.header": "لم نتمكّن من إنشاء حسابك.",
   "registration.empty.form.submission.error": "رجاءً تحقّق من أجوبتك و حاول مجددا.",
   "registration.request.server.error": "حدث خطأ ما. جرب تحديث الصفحة أو تحقق من اتصالك بالإنترنت.",
   "registration.rate.limit.error": "كثرت محاولات التسجيل الفاشلة. أعد المحاولة لاحقًا.",
   "registration.tpa.session.expired": "نفد وقت التسجيل باستخدام {provider}.",
-  "registration.tpa.authentication.failure": "عذرًا، غير مصرح لك بالوصول إلى {platform_name} عبر هذه القناة. يرجى الاتصال بمسؤول التعلم أو المدير من أجل الوصول إلى {platform_name}. {lineBreak} {lineBreak} تفاصيل الخطأ: {lineBreak} {errorMessage}",
   "terms.of.service.and.honor.code": "شروط الخدمة وميثاق الشرف الأكاديمي",
   "privacy.policy": "سياسة الخصوصية",
   "honor.code": "ميثاق الشرف الأكاديمي",
   "terms.of.service": "شروط الخدمة",
+  "registration.year.of.birth.label": "سنة الميلاد (اختياري)",
+  "registration.field.gender.options.label": "الجنس (اختياري)",
+  "registration.goals.label": "أخبرنا عن سبب اهتمامك بـ edX (اختياري)",
+  "registration.field.gender.options.f": "أنثى",
+  "registration.field.gender.options.m": "ذكر",
+  "registration.field.gender.options.o": "آخر / أفضل عدم التصريح",
+  "registration.field.education.levels.label": "أعلى مستوى تعليمي مكتمل (اختياري)",
+  "registration.field.education.levels.p": "دكتوراه",
+  "registration.field.education.levels.m": "ماجستير / ماستر أو شهادة مهنيّة",
+  "registration.field.education.levels.b": "بكالوريوس / ليسانس",
+  "registration.field.education.levels.a": "درجة الزمالة / دبلوم الدراسات الجامعية",
+  "registration.field.education.levels.hs": "الثانوية العامة / البكالوريا",
+  "registration.field.education.levels.jhs": "المدرسة الإعدادية / المتوسطة",
+  "registration.field.education.levels.el": "المدرسة الابتدائية / الأساسية",
+  "registration.field.education.levels.none": "دون تعليم رسمي",
+  "registration.field.education.levels.other": "نوع آخر من التعليم",
   "registration.username.suggestion.label": "مقترح:",
+  "registration.using.tpa.form.heading": "إتمام إنشاء حسابك",
   "did.you.mean.alert.text": "هل تقصد",
-  "register.page.terms.of.service.and.honor.code": "بإنشاءك حسابًا، فإنك توافق على {tosAndHonorCode} و تقر بأن {platformName} و كل عضو يعالج بياناتك الشخصية وفقًا لـ{privacyPolicy}.",
-  "register.page.honor.code": "اوافق على شروط {platformName} {tosAndHonorCode}",
-  "register.page.terms.of.service": "اوافق على {platformName} {termsOfService}",
+  "register.page.terms.of.service": "أوافق على {termsOfService} الخاصة بـ{platformName} ",
   "sign.in": "تسجيل الدخول",
   "reset.password.page.title": "إعادة ضبط كلمة المرور | {siteName}",
   "reset.password": "إعادة ضبط كلمة المرور",
@@ -159,10 +192,40 @@
   "confirm.password.label": "تأكيد كلمة المرور",
   "passwords.do.not.match": "كلمتا المرور غير متطابقتين",
   "confirm.your.password": "تأكيد كلمة مرورك",
+  "forgot.password.confirmation.sign.in.link": "تسجيل الدخول",
+  "reset.password.request.forgot.password.text": "نسيت كلمة المرور",
+  "reset.password.request.invalid.token.header": "رابط إعادة ضبط كلمة المرور غير صالح",
+  "reset.password.empty.new.password.field.error": "رجاءً أدخل كلمة مرورك الجديدة.",
   "reset.password.failure.heading": "لم نتمكن من إعادة ضبط كلمة مرورك.",
   "reset.password.form.submission.error": "رجاءً تحقق من أجوبتك وحاول مجددًا.",
+  "reset.password.request.server.error": "فشلت إعادة ضبط كلمة المرور",
+  "reset.password.token.validation.sever.error": "فشل التحقق من صحة الشارة",
   "reset.server.rate.limit.error": "طلبات أكثر مما ينبغي.",
   "reset.password.success.heading": "تمت إعادة ضبط كلمة المرور.",
   "reset.password.success": "تمت إعادة ضبط كلمة مرورك. سجل الدخول إلى حسابك.",
-  "rate.limit.error": "حدث خطأ بسبب كثرة الطلبات. رجاءً حاول مرة أخرى بعد مضي بعض الوقت."
+  "progressive.profiling.page.title": "الحقول الاختيارية | {siteName}",
+  "progressive.profiling.page.heading": "بعض الأسئلة الموجهة لك ستساعدنا كي نزداد ذكاءً.",
+  "gender.options.label": "الجنس (اختياري)",
+  "gender.options.f": "أنثى",
+  "gender.options.m": "ذكر",
+  "gender.options.o": "آخر / أفضل عدم التصريح",
+  "education.levels.label": "أعلى مستوى تعليمي مكتمل (اختياري)",
+  "education.levels.p": "دكتوراه",
+  "education.levels.m": "ماجستير / ماستر أو شهادة مهنيّة",
+  "education.levels.b": "بكالوريوس / ليسانس",
+  "education.levels.a": "درجة الزمالة / دبلوم الدراسات الجامعية",
+  "education.levels.hs": "الثانوية العامة / البكالوريا",
+  "education.levels.jhs": "المدرسة الإعدادية / المتوسطة",
+  "education.levels.el": "المدرسة الابتدائية / الأساسية",
+  "education.levels.none": "دون تعليم رسمي",
+  "education.levels.other": "نوع آخر من التعليم",
+  "year.of.birth.label": "سنة الميلاد (اختياري)",
+  "optional.fields.information.link": "معرفة المزيد عن كيفية استخدامنا لهذه المعلومات.",
+  "optional.fields.submit.button": "إرسال",
+  "optional.fields.skip.button": "التخطي مؤقتا",
+  "continue.to.platform": "المواصلة إلى {platformName}",
+  "modal.title": "شكرا لإعلامنا.",
+  "modal.description": "إن غيرت رأيك، قيمكنك إكمال ملفك الشخصي ضمن الإعدادات في أي وقت.",
+  "welcome.page.error.heading": "لم نتمكن من تحديث ملفك الشخصي",
+  "welcome.page.error.message": "حدث خطأ ما. يمكنك إكمال ملفك الشخصي ضمن الإعدادات في أي وقت."
 }

src/i18n/messages/de.json

@@ -1,168 +0,0 @@
-{
-  "start.learning": "Start learning",
-  "with.site.name": "with {siteName}",
-  "complete.your.profile.1": "Complete",
-  "complete.your.profile.2": "your profile",
-  "welcome.to.platform": "Welcome to {siteName}, {username}!",
-  "institution.login.page.sub.heading": "Choose your institution from the list below",
-  "logistration.sign.in": "Sign in",
-  "logistration.register": "Register",
-  "enterprisetpa.title.heading": "Would you like to sign in using your {providerName} credentials?",
-  "enterprisetpa.login.button.text": "Show me other ways to sign in or register",
-  "enterprisetpa.login.button.text.public.account.creation.disabled": "Show me other ways to sign in",
-  "sso.sign.in.with": "Sign in with {providerName}",
-  "sso.create.account.using": "Create account using {providerName}",
-  "show.password": "Show password",
-  "hide.password": "Hide password",
-  "one.letter": "1 letter",
-  "one.number": "1 number",
-  "eight.characters": "8 characters",
-  "password.sr.only.helping.text": "Password must contain at least 8 characters, at least one letter, and at least one number",
-  "tpa.alert.heading": "Almost done!",
-  "login.third.party.auth.account.not.linked": "You have successfully signed into {currentProvider}, but your {currentProvider} account does not have a linked {platformName} account. To link your accounts, sign in now using your {platformName} password.",
-  "register.third.party.auth.account.not.linked": "You've successfully signed into {currentProvider}! We just need a little more information before you start learning with {platformName}.",
-  "registration.using.tpa.form.heading": "Finish creating your account",
-  "zendesk.supportTitle": "edX Support",
-  "zendesk.selectTicketForm": "Please choose your request type:",
-  "error.notfound.message": "The page you're looking for is unavailable or there's an error in the URL. Please check the URL and try again.",
-  "forgot.password.confirmation.message": "We sent an email to {email} with instructions to reset your password.\n          If you do not receive a password reset message after 1 minute, verify that you entered\n          the correct email address, or check your spam folder. If you need further assistance, {supportLink}.",
-  "forgot.password.page.title": "Forgot Password | {siteName}",
-  "forgot.password.page.heading": "Reset password",
-  "forgot.password.page.instructions": "Please enter your email address below and we will send you an email with instructions on how to reset your password.",
-  "forgot.password.page.invalid.email.message": "Enter a valid email address",
-  "forgot.password.page.email.field.label": "Email",
-  "forgot.password.page.submit.button": "Submit",
-  "forgot.password.error.alert.title.": "We were unable to contact you.",
-  "forgot.password.error.message.title": "An error occurred.",
-  "forgot.password.request.in.progress.message": "Your previous request is in progress, please try again in a few moments.",
-  "forgot.password.empty.email.field.error": "Enter your email",
-  "forgot.password.email.help.text": "The email address you used to register with {platformName}",
-  "confirmation.message.title": "Check your email",
-  "confirmation.support.link": "contact technical support",
-  "need.help.sign.in.text": "Need help signing in?",
-  "additional.help.text": "For additional help, contact {platformName} support at ",
-  "sign.in.text": "Sign in",
-  "extend.field.errors": "{emailError} below.",
-  "invalid.token.heading": "Invalid password reset link",
-  "invalid.token.error.message": "This password reset link is invalid. It may have been used already. Enter your email below to receive a new link.",
-  "token.validation.rate.limit.error.heading": "Too many requests",
-  "token.validation.rate.limit.error": "An error has occurred because of too many requests. Please try again after some time.",
-  "token.validation.internal.sever.error.heading": "Token validation failure",
-  "token.validation.internal.sever.error": "An error has occurred. Try refreshing the page, or check your internet connection.",
-  "internal.server.error": "An error has occurred. Try refreshing the page, or check your internet connection.",
-  "account.activation.error.message": "Something went wrong, please {supportLink} to resolve this issue.",
-  "login.inactive.user.error": "In order to sign in, you need to activate your account.{lineBreak}\n            {lineBreak}We just sent an activation link to {email}. If you do not receive an email,\n            check your spam folders or {supportLink}.",
-  "allowed.domain.login.error": "As {allowedDomain} user, You must login with your {allowedDomain} {tpaLink}.",
-  "login.incorrect.credentials.error.attempts.text.1": "The username, email or password you entered is incorrect. You have {remainingAttempts} more sign in\n                attempts before your account is temporarily locked.",
-  "login.incorrect.credentials.error.attempts.text.2": "If you've forgotten your password, {resetLink}",
-  "account.locked.out.message.2": "To be on the safe side, you can {resetLink} before trying again.",
-  "login.incorrect.credentials.error.with.reset.link": "The username, email, or password you entered is incorrect. Please try again or {resetLink}.",
-  "login.page.title": "Login | {siteName}",
-  "login.user.identity.label": "Username or email",
-  "login.password.label": "Password",
-  "sign.in.button": "Sign in",
-  "forgot.password": "Forgot password",
-  "institution.login.button": "Institution/campus credentials",
-  "institution.login.page.title": "Sign in with institution/campus credentials",
-  "login.other.options.heading": "Or sign in with:",
-  "non.compliant.password.title": "We recently changed our password requirements",
-  "non.compliant.password.message": "Your current password does not meet the new security requirements. We just sent a password-reset message to the email address associated with this account. Thank you for helping us keep your data safe.",
-  "account.locked.out.message.1": "To protect your account, it's been temporarily locked. Try again in 30 minutes.",
-  "enterprise.login.btn.text": "Company or school credentials",
-  "username.or.email.format.validation.less.chars.message": "Username or email must have at least 3 characters.",
-  "email.validation.message": "Enter your username or email",
-  "password.validation.message": "Password criteria has not been met",
-  "account.activation.success.message.title": "Success! You have activated your account.",
-  "account.activation.success.message": "You will now receive email updates and alerts from us related to the courses you are enrolled in. Sign in to continue.",
-  "account.activation.info.message": "This account has already been activated.",
-  "account.activation.error.message.title": "Your account could not be activated",
-  "account.activation.support.link": "contact support",
-  "account.confirmation.success.message.title": "Success! You have confirmed your email.",
-  "account.confirmation.success.message": "Sign in to continue.",
-  "account.confirmation.info.message": "This email has already been confirmed.",
-  "account.confirmation.error.message.title": "Your email could not be confirmed",
-  "tpa.account.link": "{provider} account",
-  "internal.server.error.message": "An error has occurred. Try refreshing the page, or check your internet connection.",
-  "login.rate.limit.reached.message": "Too many failed login attempts. Try again later.",
-  "login.failure.header.title": "We couldn't sign you in.",
-  "contact.support.link": "contact {platformName} support",
-  "login.incorrect.credentials.error": "The username, email, or password you entered is incorrect. Please try again.",
-  "login.form.invalid.error.message": "Please fill in the fields below.",
-  "login.incorrect.credentials.error.reset.link.text": "reset your password",
-  "login.incorrect.credentials.error.before.account.blocked.text": "click here to reset it.",
-  "password.security.nudge.title": "Password security",
-  "password.security.block.title": "Password change required",
-  "password.security.nudge.body": "Our system detected that your password is vulnerable. We recommend you change it so that your account stays secure.",
-  "password.security.block.body": "Our system detected that your password is vulnerable. Change your password so that your account stays secure.",
-  "password.security.close.button": "Close",
-  "password.security.redirect.to.reset.password.button": "Reset your password",
-  "login.tpa.authentication.failure": "We are sorry, you are not authorized to access {platform_name} via this channel. Please contact your learning administrator or manager in order to access {platform_name}.{lineBreak}{lineBreak}Error Details:{lineBreak}{errorMessage}",
-  "progressive.profiling.page.title": "Welcome | {siteName}",
-  "progressive.profiling.page.heading": "A few questions for you will help us get smarter.",
-  "optional.fields.information.link": "Learn more about how we use this information.",
-  "optional.fields.submit.button": "Submit",
-  "optional.fields.skip.button": "Skip for now",
-  "optional.fields.next.button": "Next",
-  "continue.to.platform": "Continue to {platformName}",
-  "modal.title": "Thanks for letting us know.",
-  "modal.description": "You can complete your profile in settings at any time if you change your mind.",
-  "welcome.page.error.heading": "We couldn't update your profile",
-  "welcome.page.error.message": "An error occurred. You can complete your profile in settings at any time.",
-  "recommendation.page.title": "Recommendations | {siteName}",
-  "recommendation.page.heading": "We have a few recommendations to get you started.",
-  "recommendation.skip.button": "Skip for now",
-  "register.page.title": "Register | {siteName}",
-  "registration.fullname.label": "Full name",
-  "registration.email.label": "Email",
-  "registration.username.label": "Public username",
-  "registration.password.label": "Password",
-  "registration.country.label": "Country/Region",
-  "registration.opt.in.label": "I agree that {siteName} may send me marketing messages.",
-  "help.text.name": "This name will be used by any certificates that you earn.",
-  "help.text.username.1": "The name that will identify you in your courses.",
-  "help.text.username.2": "This can not be changed later.",
-  "help.text.email": "For account activation and important updates",
-  "create.account.for.free.button": "Create an account for free",
-  "registration.other.options.heading": "Or register with:",
-  "register.institution.login.button": "Institution/campus credentials",
-  "register.institution.login.page.title": "Register with institution/campus credentials",
-  "empty.name.field.error": "Enter your full name",
-  "empty.email.field.error": "Enter your email",
-  "empty.username.field.error": "Username must be between 2 and 30 characters",
-  "empty.password.field.error": "Password criteria has not been met",
-  "empty.country.field.error": "Select your country or region of residence",
-  "email.do.not.match": "The email addresses do not match.",
-  "email.invalid.format.error": "Enter a valid email address",
-  "username.validation.message": "Username must be between 2 and 30 characters",
-  "name.validation.message": "Enter a valid name",
-  "username.format.validation.message": "Usernames can only contain letters (A-Z, a-z), numerals (0-9), underscores (_), and hyphens (-). Usernames cannot contain spaces",
-  "registration.request.failure.header": "We couldn't create your account.",
-  "registration.empty.form.submission.error": "Please check your responses and try again.",
-  "registration.request.server.error": "An error has occurred. Try refreshing the page, or check your internet connection.",
-  "registration.rate.limit.error": "Too many failed registration attempts. Try again later.",
-  "registration.tpa.session.expired": "Registration using {provider} has timed out.",
-  "registration.tpa.authentication.failure": "We are sorry, you are not authorized to access {platform_name} via this channel. Please contact your learning administrator or manager in order to access {platform_name}.{lineBreak}{lineBreak}Error Details:{lineBreak}{errorMessage}",
-  "terms.of.service.and.honor.code": "Terms of Service and Honor Code",
-  "privacy.policy": "Privacy Policy",
-  "honor.code": "Honor Code",
-  "terms.of.service": "Terms of Service",
-  "registration.username.suggestion.label": "Suggested:",
-  "did.you.mean.alert.text": "Did you mean",
-  "register.page.terms.of.service.and.honor.code": "By creating an account, you agree to the {tosAndHonorCode} and you acknowledge that {platformName} and each\n                Member process your personal data in accordance with the {privacyPolicy}.",
-  "register.page.honor.code": "I agree to the {platformName} {tosAndHonorCode}",
-  "register.page.terms.of.service": "I agree to the {platformName} {termsOfService}",
-  "sign.in": "Sign in",
-  "reset.password.page.title": "Reset Password | {siteName}",
-  "reset.password": "Reset password",
-  "reset.password.page.instructions": "Enter and confirm your new password.",
-  "new.password.label": "New password",
-  "confirm.password.label": "Confirm password",
-  "passwords.do.not.match": "Passwords do not match",
-  "confirm.your.password": "Confirm your password",
-  "reset.password.failure.heading": "We couldn't reset your password.",
-  "reset.password.form.submission.error": "Please check your responses and try again.",
-  "reset.server.rate.limit.error": "Too many requests.",
-  "reset.password.success.heading": "Password reset complete.",
-  "reset.password.success": "Your password has been reset. Sign in to your account.",
-  "rate.limit.error": "An error has occurred because of too many requests. Please try again after some time."
-}

src/i18n/messages/de_DE.json

@@ -9,7 +9,6 @@
   "logistration.register": "Registrieren",
   "enterprisetpa.title.heading": "Möchten Sie sich mit Ihren {providerName}-Anmeldedaten anmelden?",
   "enterprisetpa.login.button.text": "Andere Möglichkeiten für die Anmeldung oder Registrierung",
-  "enterprisetpa.login.button.text.public.account.creation.disabled": "Show me other ways to sign in",
   "sso.sign.in.with": "Melden Sie sich mit {providerName} an",
   "sso.create.account.using": "Erstellen Sie ein Konto mit {providerName}",
   "show.password": "Passwort anzeigen",
@@ -22,8 +21,6 @@
   "login.third.party.auth.account.not.linked": "Sie haben sich erfolgreich bei {currentProvider} angemeldet, aber Ihr {currentProvider}-Konto hat kein verknüpftes {platformName}-Konto. Um Ihre Konten zu verknüpfen, melden Sie sich jetzt mit Ihrem {platformName}-Passwort an.",
   "register.third.party.auth.account.not.linked": "Sie haben sich erfolgreich bei {currentProvider} angemeldet! Wir brauchen nur ein paar mehr Informationen, bevor Sie anfangen, mit {platformName} zu lernen.",
   "registration.using.tpa.form.heading": "Beenden Sie die Erstellung Ihres Kontos",
-  "zendesk.supportTitle": "edX Support",
-  "zendesk.selectTicketForm": "Please choose your request type:",
   "error.notfound.message": "Die gesuchte Seite ist nicht verfügbar oder es liegt ein Fehler in der URL vor. Bitte überprüfen Sie die URL und versuchen Sie es erneut.",
   "forgot.password.confirmation.message": "Wir haben eine E-Mail mit Anweisungen zum Zurücksetzen Ihres Passworts an {email} gesendet. Wenn Sie nach 1 Minute keine Nachricht zum Zurücksetzen des Passworts erhalten, überprüfen Sie, ob Sie die richtige E-Mail-Adresse eingegeben haben, oder überprüfen Sie Ihren Spam-Ordner. Wenn Sie weitere Hilfe benötigen, {supportLink}.",
   "forgot.password.page.title": "Passwort vergessen | {siteName}",
@@ -96,21 +93,20 @@
   "password.security.block.body": "Unser System hat festgestellt, dass Ihr Passwort angreifbar ist. Ändern Sie Ihr Passwort, damit Ihr Konto sicher bleibt.",
   "password.security.close.button": "Schließen",
   "password.security.redirect.to.reset.password.button": "Setzen Sie Ihr Passwort zurück",
-  "login.tpa.authentication.failure": "We are sorry, you are not authorized to access {platform_name} via this channel. Please contact your learning administrator or manager in order to access {platform_name}.{lineBreak}{lineBreak}Error Details:{lineBreak}{errorMessage}",
-  "progressive.profiling.page.title": "Welcome | {siteName}",
+  "progressive.profiling.page.title": "Optionale Felder | {siteName}",
   "progressive.profiling.page.heading": "Ein paar Fragen an Sie helfen uns, schlauer zu werden.",
   "optional.fields.information.link": "Erfahren Sie mehr darüber, wie wir diese Informationen verwenden.",
   "optional.fields.submit.button": "Einreichen",
   "optional.fields.skip.button": "Überspringen",
-  "optional.fields.next.button": "Weiter",
+  "optional.fields.next.button": "Next",
   "continue.to.platform": "Weiter zu {platformName}",
   "modal.title": "Danke, dass Sie uns das mitteilen.",
   "modal.description": "Sie können Ihr Profil jederzeit in den Einstellungen vervollständigen, wenn Sie Ihre Meinung ändern.",
   "welcome.page.error.heading": "Wir konnten Ihr Profil nicht aktualisieren",
   "welcome.page.error.message": "Ein Fehler ist aufgetreten. Sie können Ihr Profil jederzeit in den Einstellungen vervollständigen.",
-  "recommendation.page.title": "Empfehlungen | {siteName}",
-  "recommendation.page.heading": "Wir haben ein paar Empfehlungen für den Einstieg.",
-  "recommendation.skip.button": "Überspringen",
+  "recommendation.page.title": "Recommendations| {siteName}",
+  "recommendation.page.heading": "We have a few recommendations to get you started.",
+  "recommendation.skip.button": "Skip for now",
   "register.page.title": "Registrieren | {siteName}",
   "registration.fullname.label": "Vollständiger Name",
   "registration.email.label": "E-Mail-Adresse",
@@ -141,7 +137,6 @@
   "registration.request.server.error": "Ein Fehler ist aufgetreten. Versuchen Sie, die Seite zu aktualisieren, oder überprüfen Sie Ihre Internetverbindung.",
   "registration.rate.limit.error": "Zu viele fehlgeschlagene Registrierungsversuche. Versuchen Sie es später noch einmal.",
   "registration.tpa.session.expired": "Die Registrierung mit {provider} ist abgelaufen.",
-  "registration.tpa.authentication.failure": "We are sorry, you are not authorized to access {platform_name} via this channel. Please contact your learning administrator or manager in order to access {platform_name}.{lineBreak}{lineBreak}Error Details:{lineBreak}{errorMessage}",
   "terms.of.service.and.honor.code": "Nutzungsbedingungen und Verhaltenskodex",
   "privacy.policy": "Datenschutzbestimmungen",
   "honor.code": "Verhaltenskodex",

src/i18n/messages/es_419.json

@@ -5,11 +5,16 @@
   "complete.your.profile.2": "tu perfil ",
   "welcome.to.platform": "¡Bienvenido a {siteName}, {username}!",
   "institution.login.page.sub.heading": "Selecciona tu institución de la lista siguiente",
+  "forgot.password.confirmation.title": "Verifica tu correo electrónico",
+  "forgot.password.confirmation.support.link": "contacta con el equipo de soporte técnico",
+  "forgot.password.confirmation.info": "Si no recibes un mensaje de recuperación de tu contraseña en un minuto, verifica que introduciste la dirección de correo electrónico correcta, o verifica tu carpeta de correo no deseado.",
   "logistration.sign.in": "Iniciar sesión",
   "logistration.register": "Registrarse",
+  "internal.server.error.message": "Se ha producido un error. Intenta actualizar la página o comprueba tu conexión a Internet.",
+  "server.ratelimit.error.message": "Se ha producido un error debido a demasiadas solicitudes. Por favor, inténtalo de nuevo después de algún tiempo.",
   "enterprisetpa.title.heading": "¿Deseas iniciar sesión con tus credenciales de {providerName}?",
+  "enterprisetpa.sso.button.title": "Inicio de sesión con {providerName}",
   "enterprisetpa.login.button.text": "Mostrar otras formas de iniciar sesión o de registrarme",
-  "enterprisetpa.login.button.text.public.account.creation.disabled": "Show me other ways to sign in",
   "sso.sign.in.with": "Inicio de sesión con {providerName}",
   "sso.create.account.using": "Crear una cuenta con {providerName}",
   "show.password": "Mostrar contraseña",
@@ -21,9 +26,6 @@
   "tpa.alert.heading": "¡Ya casi has terminado!",
   "login.third.party.auth.account.not.linked": "Te has registrado correctamente en {currentProvider}, pero tu cuenta de {currentProvider} no tiene una cuenta de {platformName} asociada. Para asociar tus cuentas, inicia sesión ahora usando tu contraseña de {platformName}.",
   "register.third.party.auth.account.not.linked": "¡Has iniciado sesión con éxito en {currentProvider}! Sólo necesitamos un poco más de información antes de que empieces a aprender con {platformName}.",
-  "registration.using.tpa.form.heading": "Termina de crear tu cuenta",
-  "zendesk.supportTitle": "edX Support",
-  "zendesk.selectTicketForm": "Please choose your request type:",
   "error.notfound.message": "La página que estas buscando no está disponible o hay un error en la URL. Por favor, verifica la URL y vuelve a intentarlo.",
   "forgot.password.confirmation.message": "Hemos enviado un correo electrónico a {email} con instrucciones para restablecer tu contraseña.\n          Si no recibes un mensaje de restablecimiento de contraseña después de 1 minuto, verifica que has introducido\n          la dirección de correo electrónico correcta, o comprueba tu carpeta de correo no deseado. Si necesitas más ayuda, {supportLink}.",
   "forgot.password.page.title": "Olvidé la contraseña | {siteName}",
@@ -36,6 +38,7 @@
   "forgot.password.error.message.title": "Ha ocurrido un error.",
   "forgot.password.request.in.progress.message": "Su solicitud anterior está en progreso, por favor inténtalo de nuevo en unos minutos.",
   "forgot.password.empty.email.field.error": "Introduce tu email",
+  "forgot.password.invalid.email.message": "La dirección de correo que has ingresado no está en el formato correcto.",
   "forgot.password.email.help.text": "El correo electrónico que utilizaste para registrarte en {platformName}",
   "confirmation.message.title": "Verifica tu correo electrónico",
   "confirmation.support.link": "entra en contacto con el equipo de soporte técnico",
@@ -50,6 +53,7 @@
   "token.validation.internal.sever.error.heading": "Fallo de validación del token",
   "token.validation.internal.sever.error": "Se ha producido un error. Intenta actualizar la página o verifica tu conexión a Internet.",
   "internal.server.error": "Se ha producido un error. Intenta actualizar la página o verifica tu conexión a Internet.",
+  "rate.limit.error": "Se ha producido un error debido a demasiadas solicitudes. Por favor, inténtalo de nuevo después de algún tiempo.",
   "account.activation.error.message": "Algo no funcionó correctamente, por favor {supportLink} para resolver este problema.",
   "login.inactive.user.error": "Para iniciar sesión, debes activar tu cuenta..{lineBreak}\n            {lineBreak} Acabamos de enviar un enlace de activación a {email}. Si no recibes un correo electrónico,\n            revisa tus carpetas de spam o {supportLink}.",
   "allowed.domain.login.error": "Como usuario {allowedDomain}, debe iniciar sesión con su {allowedDomain} {tpaLink}.",
@@ -61,32 +65,45 @@
   "login.user.identity.label": "Nombre de usuario o correo electrónico",
   "login.password.label": "Contraseña",
   "sign.in.button": "Iniciar sesión",
+  "sign.in.btn.pending.state": "Cargando",
+  "need.help.signing.in.collapsible.menu": "¿Necesitas ayuda para iniciar sesión?",
+  "forgot.password.link": "Olvidé mi contraseña",
   "forgot.password": "Olvidé mi contraseña",
+  "other.sign.in.issues": "Otros problemas de inicio de sesión ",
+  "need.other.help.signing.in.collapsible.menu": "¿Necesitas más ayuda para iniciar sesión?",
   "institution.login.button": "Credenciales de la institución/campus",
   "institution.login.page.title": "Iniciar sesión con las credenciales de la institución/campus",
+  "institution.login.page.back.button": "Volver al inicio",
+  "create.an.account": "Crear una cuenta",
   "login.other.options.heading": "O bien, inicia sesión con:",
   "non.compliant.password.title": "Recientemente hemos cambiado los requisitos de las contraseñas",
   "non.compliant.password.message": "Tu contraseña actual no cumple con los nuevos requisitos de seguridad. Acabamos de enviar un mensaje de restablecimiento de contraseña a la dirección de correo electrónico asociada a esta cuenta. Gracias por ayudarnos a mantener tus datos seguros.",
   "account.locked.out.message.1": "Para proteger tu cuenta, se ha bloqueado temporalmente. Inténtalo de nuevo en 30 minutos.",
+  "first.time.here": "Primera vez aquí?",
+  "email.help.message": "La dirección de correo electrónico que usaste para registrarte en edX.",
   "enterprise.login.btn.text": "Credenciales de la empresa o de la institución ",
+  "email.format.validation.message": "La dirección de correo que has ingresado no está en el formato correcto.",
   "username.or.email.format.validation.less.chars.message": "El nombre de usuario o el correo electrónico deben tener al menos 3 caracteres.",
   "email.validation.message": "Introduce tu nombre de usuario o correo electrónico",
   "password.validation.message": "No se han cumplido los criterios de la contraseña",
+  "register.link": "Crear una cuenta",
+  "sign.in.heading": "Iniciar sesión",
   "account.activation.success.message.title": "Ha sido un éxito. Has activado tu cuenta.",
   "account.activation.success.message": "Ahora recibirás por correo electrónico actualizaciones y alertas relacionadas con los cursos en los que estás inscrito. Inicia sesión para continuar.",
   "account.activation.info.message": "La cuenta ya ha sido activada.",
   "account.activation.error.message.title": "Tu cuenta no ha podido ser activada",
   "account.activation.support.link": "contacta al equipo de soporte de edX",
+  "tpa.account.link": "{provider} cuenta",
   "account.confirmation.success.message.title": "¡Éxito! Has confirmado tu correo electrónico.",
   "account.confirmation.success.message": "Inicia sesión para continuar.",
   "account.confirmation.info.message": "Este correo electrónico ya ha sido confirmado.",
   "account.confirmation.error.message.title": "Tu correo electrónico no pudo ser confirmado",
-  "tpa.account.link": "{provider} cuenta",
-  "internal.server.error.message": "Se ha producido un error. Intenta actualizar la página o comprueba tu conexión a Internet.",
   "login.rate.limit.reached.message": "Demasiados intentos fallidos de inicio de sesión. Inténtelo de nuevo más tarde.",
   "login.failure.header.title": "No se ha podido iniciar tu sesión.",
   "contact.support.link": "entrar en contacto con el soporte de {platformName}",
   "login.incorrect.credentials.error": "El nombre de usuario, el correo electrónico o la contraseña que has introducido son incorrectos. Por favor, inténtalo de nuevo.",
+  "login.failed.attempt.error": "Tienes {remainAttempts} más intentos de inicio de sesión antes de que tu cuenta se bloquee temporalmente.",
+  "login.locked.out.error.message": "Para proteger tu cuenta, se ha bloqueado temporalmente. Inténtalo de nuevo en {lockedOutPeriod} minutos.",
   "login.form.invalid.error.message": "Por favor, complete los siguientes campos.",
   "login.incorrect.credentials.error.reset.link.text": "restablecer la contraseña",
   "login.incorrect.credentials.error.before.account.blocked.text": "Pulse aquí para restablecerla.",
@@ -96,21 +113,20 @@
   "password.security.block.body": "Nuestro sistema detectó que su contraseña es vulnerable. Cambie su contraseña para que su cuenta permanezca segura.",
   "password.security.close.button": "Cerrar",
   "password.security.redirect.to.reset.password.button": "Restablece tu contraseña",
-  "login.tpa.authentication.failure": "We are sorry, you are not authorized to access {platform_name} via this channel. Please contact your learning administrator or manager in order to access {platform_name}.{lineBreak}{lineBreak}Error Details:{lineBreak}{errorMessage}",
-  "progressive.profiling.page.title": "Welcome | {siteName}",
+  "progressive.profiling.page.title": "Campos opcionales | {siteName}",
   "progressive.profiling.page.heading": "Unas cuantas preguntas para ti nos ayudarán a mejorar.",
   "optional.fields.information.link": "Aprende más sobre cómo usamos esta información.",
   "optional.fields.submit.button": "Enviar",
   "optional.fields.skip.button": "Saltar por ahora ",
-  "optional.fields.next.button": "Siguiente",
+  "optional.fields.next.button": "Next",
   "continue.to.platform": "Continuar a {platformName}",
   "modal.title": "Gracias por informarnos.",
   "modal.description": "Puedes completar tu perfil en los ajustes en cualquier momento si cambias de opinión.",
   "welcome.page.error.heading": "No hemos podido actualizar tu perfil",
   "welcome.page.error.message": "Se ha producido un error. Puedes completar tu perfil en los ajustes en cualquier momento.",
-  "recommendation.page.title": "Recomendaciones | {siteName}",
-  "recommendation.page.heading": "Tenemos algunas recomendaciones para empezar.",
-  "recommendation.skip.button": "Saltar por ahora ",
+  "recommendation.page.title": "Recommendations| {siteName}",
+  "recommendation.page.heading": "We have a few recommendations to get you started.",
+  "recommendation.skip.button": "Skip for now",
   "register.page.title": "Register | {siteName}",
   "registration.fullname.label": "Nombre completo",
   "registration.email.label": "Correo electrónico",
@@ -123,34 +139,51 @@
   "help.text.username.2": "Esto no puede modificarse posteriormente.",
   "help.text.email": "Para la activación de la cuenta y las actualizaciones importantes",
   "create.account.for.free.button": "Crea una cuenta gratis",
+  "create.an.account.btn.pending.state": "Cargando",
   "registration.other.options.heading": "O regístrese con:",
   "register.institution.login.button": "Credenciales de la institución/campus",
   "register.institution.login.page.title": "Registro con credenciales de la institución/campus",
   "empty.name.field.error": "Introduce tu nombre completo",
   "empty.email.field.error": "Introduce tu email",
+  "email.do.not.match": "Los correos electrónicos no son iguales.",
   "empty.username.field.error": "El nombre de usuario debe tener entre 2 y 30 caracteres",
   "empty.password.field.error": "No se han cumplido los criterios de la contraseña",
   "empty.country.field.error": "Selecciona tu país o región de residencia",
-  "email.do.not.match": "Los correos electrónicos no son iguales.",
   "email.invalid.format.error": "Introduce una dirección de correo electrónico válida",
+  "email.ratelimit.less.chars.validation.message": "El correo electrónico debe tener 3 caracteres.",
   "username.validation.message": "El nombre de usuario debe tener entre 2 y 30 caracteres",
   "name.validation.message": "Introduce un nombre válido",
   "username.format.validation.message": "Los nombres de usuario solo pueden contener letras (A-Z, a-z), números (0-9), guiones bajos (_) y guiones (-). Los nombres de usuario no pueden contener espacios",
+  "support.education.research": "Apoya la investigación sobre educación proporcionando información adicional. (Opcional)",
   "registration.request.failure.header": "No pudimos crear tu cuenta.",
   "registration.empty.form.submission.error": "Por favor, verifica tus respuestas y vuelve a intentarlo.",
   "registration.request.server.error": "Se ha producido un error. Intenta actualizar la página o comprueba tu conexión a Internet.",
   "registration.rate.limit.error": "Demasiados intentos de registro fallidos. Vuelve a intentarlo más tarde.",
   "registration.tpa.session.expired": "Inscripción usando {provider} ha expirado.",
-  "registration.tpa.authentication.failure": "We are sorry, you are not authorized to access {platform_name} via this channel. Please contact your learning administrator or manager in order to access {platform_name}.{lineBreak}{lineBreak}Error Details:{lineBreak}{errorMessage}",
   "terms.of.service.and.honor.code": "Condiciones de servicio y código de honor",
   "privacy.policy": "Política de privacidad ",
   "honor.code": "Código de Honor",
   "terms.of.service": "Términos de servicio",
+  "registration.year.of.birth.label": "Año de nacimiento (opcional)",
+  "registration.field.gender.options.label": "Género (opcional)",
+  "registration.goals.label": "Díganos por qué estás interesado en edX (opcional)",
+  "registration.field.gender.options.f": "Femenino ",
+  "registration.field.gender.options.m": "Masculino",
+  "registration.field.gender.options.o": "Otro/Prefiero no decir",
+  "registration.field.education.levels.label": "Nivel más alto de educación completado (opcional)",
+  "registration.field.education.levels.p": "Doctorado",
+  "registration.field.education.levels.m": "Maestría o magíster",
+  "registration.field.education.levels.b": "Pregrado o Licenciatura",
+  "registration.field.education.levels.a": "Grado técnico - tecnológico",
+  "registration.field.education.levels.hs": "Enseñanza secundaria",
+  "registration.field.education.levels.jhs": "Formación media",
+  "registration.field.education.levels.el": "Enseñanza primaria",
+  "registration.field.education.levels.none": "Ninguna educación formal",
+  "registration.field.education.levels.other": "Otra educación",
   "registration.username.suggestion.label": "Se recomienda:",
+  "registration.using.tpa.form.heading": "Termina de crear tu cuenta",
   "did.you.mean.alert.text": "¿Quieres decir",
-  "register.page.terms.of.service.and.honor.code": "Al crear una cuenta, aceptas el {tosAndHonorCode} y reconoces que {platformName} y cada\n                Miembro procesa tus datos personales de acuerdo con la {privacyPolicy}.",
-  "register.page.honor.code": "Acepto las {platformName} {tosAndHonorCode}",
-  "register.page.terms.of.service": "Acepto las {platformName} {termsOfService}",
+  "register.page.terms.of.service": "Acepto lo siguiente: {platformName} {termsOfService}",
   "sign.in": "Iniciar sesión",
   "reset.password.page.title": "Restablecer contraseña | {siteName}",
   "reset.password": "Restablecer mi contraseña",
@@ -159,10 +192,40 @@
   "confirm.password.label": "Confirmar contraseña",
   "passwords.do.not.match": "Las contraseñas no coinciden",
   "confirm.your.password": "Confirma tu contraseña",
+  "forgot.password.confirmation.sign.in.link": "iniciar sesión",
+  "reset.password.request.forgot.password.text": "Olvidé mi contraseña",
+  "reset.password.request.invalid.token.header": "Enlace de restablecimiento de contraseña inválido",
+  "reset.password.empty.new.password.field.error": "Por favor, introduce tu nueva contraseña.",
   "reset.password.failure.heading": "No hemos podido restablecer tu contraseña.",
   "reset.password.form.submission.error": "Por favor, verifica tus respuestas y vuelve a intentarlo.",
+  "reset.password.request.server.error": "No se ha podido restablecer la contraseña",
+  "reset.password.token.validation.sever.error": "Fallo de validación del token",
   "reset.server.rate.limit.error": "Demasiadas solicitudes.",
   "reset.password.success.heading": "Restablecimiento de la contraseña completado.",
   "reset.password.success": "Tu contraseña ha sido restablecida. Acceda a tu cuenta.",
-  "rate.limit.error": "Se ha producido un error debido a demasiadas solicitudes. Por favor, inténtalo de nuevo después de algún tiempo."
+  "progressive.profiling.page.title": "Campos opcionales | {siteName}",
+  "progressive.profiling.page.heading": "Unas cuantas preguntas para ti nos ayudarán a mejorar.",
+  "gender.options.label": "Género (opcional)",
+  "gender.options.f": "Femenino ",
+  "gender.options.m": "Masculino",
+  "gender.options.o": "Otro/Prefiero no decir",
+  "education.levels.label": "Nivel más alto de educación completado (opcional)",
+  "education.levels.p": "Doctorado",
+  "education.levels.m": "Maestría o magíster",
+  "education.levels.b": "Pregrado o Licenciatura",
+  "education.levels.a": "Grado técnico - tecnológico",
+  "education.levels.hs": "Enseñanza secundaria",
+  "education.levels.jhs": "Formación media",
+  "education.levels.el": "Enseñanza primaria",
+  "education.levels.none": "Ninguna educación formal",
+  "education.levels.other": "Otra educación",
+  "year.of.birth.label": "Año de nacimiento (opcional)",
+  "optional.fields.information.link": "Aprende más sobre cómo usamos esta información.",
+  "optional.fields.submit.button": "Enviar",
+  "optional.fields.skip.button": "Saltar por ahora ",
+  "continue.to.platform": "Continuar a {platformName}",
+  "modal.title": "Gracias por informarnos.",
+  "modal.description": "Puedes completar tu perfil en los ajustes en cualquier momento si cambias de opinión.",
+  "welcome.page.error.heading": "No hemos podido actualizar tu perfil",
+  "welcome.page.error.message": "Se ha producido un error. Puedes completar tu perfil en los ajustes en cualquier momento."
 }

src/i18n/messages/fr.json

@@ -5,11 +5,16 @@
   "complete.your.profile.2": "votre profil",
   "welcome.to.platform": "Bienvenue sur {siteName}, {username}!",
   "institution.login.page.sub.heading": "Sélectionner votre institution dans la liste ci-dessous",
+  "forgot.password.confirmation.title": "Vérifiez votre email",
+  "forgot.password.confirmation.support.link": "contacter le support technique",
+  "forgot.password.confirmation.info": "Si vous ne recevez pas de message de réinitialisation de mot de passe après 1 minute, vérifiez que vous avez entré la bonne adresse courriel ou vérifiez votre dossier de pourriels.",
   "logistration.sign.in": "Connectez-vous",
   "logistration.register": "S'inscrire",
+  "internal.server.error.message": "Une erreur est survenue. Essayer de rafraîchir la page, ou vérifier votre connexion Internet.",
+  "server.ratelimit.error.message": "Une erreur s'est produite en raison d'un trop grand nombre de demandes. Veuillez réessayer après un certain temps.",
   "enterprisetpa.title.heading": "Souhaitez-vous vous connecter à l'aide de vos identifiants {providerName} ?",
+  "enterprisetpa.sso.button.title": "Connectez-vous avec {providerName}",
   "enterprisetpa.login.button.text": "Montrez-moi d'autres méthodes pour me connecter ou m'inscrire",
-  "enterprisetpa.login.button.text.public.account.creation.disabled": "Show me other ways to sign in",
   "sso.sign.in.with": "Connectez-vous avec {providerName}",
   "sso.create.account.using": "Créer un compte avec {providerName}",
   "show.password": "Afficher le mot de passe",
@@ -21,9 +26,6 @@
   "tpa.alert.heading": "Presque fini !",
   "login.third.party.auth.account.not.linked": "Vous vous êtes connecté avec succès à {currentProvider}, mais votre compte {currentProvider} n'a pas de compte relié à {platformName}. Pour lier vos comptes, connectez-vous en utilisant votre mot de passe {platformName}.",
   "register.third.party.auth.account.not.linked": "Vous vous êtes connecté avec succès à {currentProvider} ! Nous avons juste besoin d'un peu plus d'informations avant que vous commenciez à apprendre avec {platformName}.",
-  "registration.using.tpa.form.heading": "Terminer la création de votre compte",
-  "zendesk.supportTitle": "edX Support",
-  "zendesk.selectTicketForm": "Please choose your request type:",
   "error.notfound.message": "La page que vous recherchez n'est pas disponible ou il y a une erreur dans l'URL. Veuillez vérifier l'URL et réessayer.",
   "forgot.password.confirmation.message": "Nous avons envoyé un courriel à {email} avec des instructions pour réinitialiser votre mot de passe.\n          Si vous ne recevez pas de message de réinitialisation de mot de passe après 1 minute, vérifiez que vous avez saisi\nl'adresse courriel correctement, ou vérifiez votre dossier de courriel indésirable. Si vous avez besoin d'aide supplémentaire, {supportLink}.",
   "forgot.password.page.title": " Mot de passe oublié | {siteName}",
@@ -36,6 +38,7 @@
   "forgot.password.error.message.title": "Une erreur est survenue.",
   "forgot.password.request.in.progress.message": "Your previous request is in progress, please try again in a few moments.",
   "forgot.password.empty.email.field.error": "Saisissez votre courriel",
+  "forgot.password.invalid.email.message": "L'adresse email que vous avez fournie est incorrecte.",
   "forgot.password.email.help.text": "L'adresse courriel que vous avez utilisée pour vous inscrire sur  {platformName}",
   "confirmation.message.title": "Vérifiez votre email",
   "confirmation.support.link": "contacter le support technique",
@@ -50,6 +53,7 @@
   "token.validation.internal.sever.error.heading": "Échec de la validation du jeton",
   "token.validation.internal.sever.error": "Une erreur est survenue. Essayer de rafraîchir la page, ou vérifier votre connexion Internet.",
   "internal.server.error": "Une erreur est survenue. Essayer de rafraîchir la page, ou vérifier votre connexion Internet.",
+  "rate.limit.error": "Une erreur s'est produite en raison d'un trop grand nombre de demandes. Veuillez réessayer après un certain temps.",
   "account.activation.error.message": "Une erreur s'est produite, veuillez {supportLink} pour résoudre ce problème.",
   "login.inactive.user.error": "Pour vous connecter, vous devez activer votre compte.{lineBreak}\n            {lineBreak}Nous venons d'envoyer un lien d'activation à {email}. Si vous ne recevez pas de courriel,\n            vérifiez vos dossiers de spam ou {supportLink}.",
   "allowed.domain.login.error": "As {allowedDomain} user, You must login with your {allowedDomain} {tpaLink}.",
@@ -61,32 +65,45 @@
   "login.user.identity.label": "Nom d'utilisateur ou courriel",
   "login.password.label": "Mot de passe",
   "sign.in.button": "Connectez-vous",
+  "sign.in.btn.pending.state": "Chargement en cours",
+  "need.help.signing.in.collapsible.menu": "Besoin d'aide pour vous enregistrer?",
+  "forgot.password.link": "J'ai oublié mon mot de passe",
   "forgot.password": "Mot de passe oublié",
+  "other.sign.in.issues": "Autres problèmes de connexion",
+  "need.other.help.signing.in.collapsible.menu": "Encore besoin d'aide pour vous enregistrer?",
   "institution.login.button": "Identifiants de l'établissement/du campus",
   "institution.login.page.title": "Connectez vous avec les crédentiels d'institution ou de campus",
+  "institution.login.page.back.button": "Retour à la connexion",
+  "create.an.account": "Créer un compte",
   "login.other.options.heading": "Ou se connecter avec :",
   "non.compliant.password.title": "Nous avons récemment modifié nos exigences en matière de mot de passe",
   "non.compliant.password.message": "Votre mot de passe actuel ne répond pas aux nouvelles exigences de sécurité. Nous venons d'envoyer un message de réinitialisation de mot de passe à l'adresse courriel associée à ce compte. Merci de nous aider à protéger vos données.",
   "account.locked.out.message.1": "Pour protéger votre compte, il a été temporairement verrouillé. Réessayez dans 30 minutes.",
+  "first.time.here": "C'est votre première visite ?",
+  "email.help.message": "L'adresse électronique que vous avez utilisée pour vous inscrire à edX.",
   "enterprise.login.btn.text": "Identifiants de la compagnie ou de l'école",
+  "email.format.validation.message": "L'adresse email que vous avez fournie est incorrecte.",
   "username.or.email.format.validation.less.chars.message": "Le nom d'utilisateur ou l'adresse courriel doit comporter au moins 3 caractères.",
   "email.validation.message": "Entrez votre nom d'utilisateur ou votre adresse courriel",
   "password.validation.message": "Les critères de mot de passe n'ont pas été remplis",
+  "register.link": "Créer un compte",
+  "sign.in.heading": "Connectez-vous",
   "account.activation.success.message.title": "Succès! Vous avez activé votre compte.",
   "account.activation.success.message": "Vous recevrez maintenant des mises à jour par courriel et des alertes de notre part concernant les cours auxquels vous êtes inscrit. Connectez-vous pour continuer.",
   "account.activation.info.message": "Ce compte a déjà été activé.",
   "account.activation.error.message.title": "Votre compte n'a pas pu être activé",
   "account.activation.support.link": "contacter le support",
+  "tpa.account.link": "{provider} account",
   "account.confirmation.success.message.title": "Succès ! Vous avez confirmé votre courriel.",
   "account.confirmation.success.message": "Se connecter pour continuer.",
   "account.confirmation.info.message": "Ce courriel a déjà été confirmé.",
   "account.confirmation.error.message.title": "Votre courriel ne peut pas être confirmé.",
-  "tpa.account.link": "{provider} account",
-  "internal.server.error.message": "Une erreur est survenue. Essayer de rafraîchir la page, ou vérifier votre connexion Internet.",
   "login.rate.limit.reached.message": "Trop de tentatives de connexion échouées. Réessayez plus tard.",
   "login.failure.header.title": "Nous n'avons pas pu vous connecter.",
   "contact.support.link": "veuillez contacter le support {platformName}",
   "login.incorrect.credentials.error": "Le nom d'utilisateur, l'adresse courriel ou le mot de passe que vous avez saisis sont incorrects. Veuillez réessayer.",
+  "login.failed.attempt.error": "Il vous reste {remainingAttempts} tentatives de connexion supplémentaires avant que votre compte ne soit temporairement verrouillé.",
+  "login.locked.out.error.message": "Pour protéger votre compte, il a été temporairement verrouillé. Réessayez dans {lockedOutPeriod} minutes.",
   "login.form.invalid.error.message": "Veuillez remplir les champs ci-dessous.",
   "login.incorrect.credentials.error.reset.link.text": "réinitialiser votre mot de passe",
   "login.incorrect.credentials.error.before.account.blocked.text": "cliquez ici pour le réinitialiser.",
@@ -96,8 +113,7 @@
   "password.security.block.body": "Notre système a détecté que votre mot de passe est vulnérable. Changez votre mot de passe afin que votre compte reste sécurisé.",
   "password.security.close.button": "Fermer",
   "password.security.redirect.to.reset.password.button": "Réinitialiser votre mot de passe",
-  "login.tpa.authentication.failure": "We are sorry, you are not authorized to access {platform_name} via this channel. Please contact your learning administrator or manager in order to access {platform_name}.{lineBreak}{lineBreak}Error Details:{lineBreak}{errorMessage}",
-  "progressive.profiling.page.title": "Welcome | {siteName}",
+  "progressive.profiling.page.title": "Champs optionnels | {siteName}",
   "progressive.profiling.page.heading": "Quelques questions pour vous nous aideront à devenir plus intelligents.",
   "optional.fields.information.link": "En savoir plus sur la façon dont nous utilisons ces informations.",
   "optional.fields.submit.button": "Envoyez",
@@ -108,7 +124,7 @@
   "modal.description": "Vous pouvez compléter votre profil dans les paramètres à tout moment si vous changez d'avis.",
   "welcome.page.error.heading": "Nous n'avons pas pu mettre à jour votre profil",
   "welcome.page.error.message": "Une erreur s'est produite. Vous pouvez compléter votre profil dans les paramètres à tout moment.",
-  "recommendation.page.title": "Recommendations | {siteName}",
+  "recommendation.page.title": "Recommendations| {siteName}",
   "recommendation.page.heading": "We have a few recommendations to get you started.",
   "recommendation.skip.button": "Skip for now",
   "register.page.title": "S'inscrire | {siteName}",
@@ -123,34 +139,51 @@
   "help.text.username.2": "Cela ne peut pas être modifié ultérieurement.",
   "help.text.email": "Pour l'activation du compte et les mises à jour importantes",
   "create.account.for.free.button": "Créer un compte gratuitement",
+  "create.an.account.btn.pending.state": "Chargement en cours",
   "registration.other.options.heading": "Ou inscrivez-vous avec :",
   "register.institution.login.button": "Identifiants de l'établissement/du campus",
   "register.institution.login.page.title": "Inscription avec les crédentiels d'institution ou de campus",
   "empty.name.field.error": "Saisissez votre nom complet",
   "empty.email.field.error": "Saisissez votre courriel",
+  "email.do.not.match": "The email addresses do not match.",
   "empty.username.field.error": "Le nom d'utilisateur doit comporter entre 2 et 30 caractères",
   "empty.password.field.error": "Les critères de mot de passe n'ont pas été remplis",
   "empty.country.field.error": "Sélectionnez votre pays ou région de résidence",
-  "email.do.not.match": "The email addresses do not match.",
   "email.invalid.format.error": "Enter a valid email address",
+  "email.ratelimit.less.chars.validation.message": "Le courriel doit comporter 3 caractères.",
   "username.validation.message": "Le nom d'utilisateur doit comporter entre 2 et 30 caractères",
   "name.validation.message": "Enter a valid name",
   "username.format.validation.message": "Usernames can only contain letters (A-Z, a-z), numerals (0-9), underscores (_), and hyphens (-). Usernames cannot contain spaces",
+  "support.education.research": "Soutenez la recherche en éducation en fournissant des informations additionnelles. (Optionel)",
   "registration.request.failure.header": "Nous n'avons pas pu créer votre compte.",
   "registration.empty.form.submission.error": "Veuillez vérifier vos réponses et réessayer.",
   "registration.request.server.error": "Une erreur est survenue. Essayer de rafraîchir la page, ou vérifier votre connexion Internet.",
   "registration.rate.limit.error": "Trop de tentatives d'inscriptions ont échoué. Réessayez plus tard.",
   "registration.tpa.session.expired": "L'inscription avec {provider} a échouée.",
-  "registration.tpa.authentication.failure": "We are sorry, you are not authorized to access {platform_name} via this channel. Please contact your learning administrator or manager in order to access {platform_name}.{lineBreak}{lineBreak}Error Details:{lineBreak}{errorMessage}",
   "terms.of.service.and.honor.code": "Conditions d'utilisation et Code d'honneur",
   "privacy.policy": "Politique de confidentialité",
   "honor.code": "Code d'honneur",
   "terms.of.service": " Conditions d'utilisation",
+  "registration.year.of.birth.label": "Année de naissance (facultatif)",
+  "registration.field.gender.options.label": "Sexe (facultatif)",
+  "registration.goals.label": "Dites-nous pourquoi vous êtes intéressé par edX (facultatif)",
+  "registration.field.gender.options.f": "Femme",
+  "registration.field.gender.options.m": "Homme",
+  "registration.field.gender.options.o": "Autre / Préfère ne pas répondre",
+  "registration.field.education.levels.label": "Plus haut niveau de scolarité atteint (facultatif)",
+  "registration.field.education.levels.p": "Doctorat",
+  "registration.field.education.levels.m": "Master ou diplôme professionnel",
+  "registration.field.education.levels.b": "Diplôme de premier cycle supérieur",
+  "registration.field.education.levels.a": "Grade de l'associé",
+  "registration.field.education.levels.hs": "Lycée / enseignement secondaire",
+  "registration.field.education.levels.jhs": "Collège / enseignement secondaire inférieur",
+  "registration.field.education.levels.el": "Enseignement primaire",
+  "registration.field.education.levels.none": "Sans diplôme",
+  "registration.field.education.levels.other": "Autre niveau d'étude",
   "registration.username.suggestion.label": "Suggéré :",
+  "registration.using.tpa.form.heading": "Terminer la création de votre compte",
   "did.you.mean.alert.text": "Vouliez-vous dire",
-  "register.page.terms.of.service.and.honor.code": "En créant un compte, vous acceptez le {tosAndHonorCode} et vous reconnaissez que {platformName} et chaque\n                membre peut traiter vos données personnelles conformément à la {privacyPolicy}.",
-  "register.page.honor.code": "I agree to the {platformName} {tosAndHonorCode}",
-  "register.page.terms.of.service": "I agree to the {platformName} {termsOfService}",
+  "register.page.terms.of.service": "J'accepte les {termsOfService} {platformName}",
   "sign.in": "Connectez-vous",
   "reset.password.page.title": "Réinitialiser le mot de passe | {siteName}",
   "reset.password": "Réinitialiser le mot de passe",
@@ -159,10 +192,40 @@
   "confirm.password.label": "Confirmer le mot de passe",
   "passwords.do.not.match": "Les mots de passe ne correspondent pas",
   "confirm.your.password": "Confirmer votre mot de passe",
+  "forgot.password.confirmation.sign.in.link": "connexion",
+  "reset.password.request.forgot.password.text": "Mot de passe oublié",
+  "reset.password.request.invalid.token.header": "Lien de réinitialisation du mot de passe non valide",
+  "reset.password.empty.new.password.field.error": "Veuillez entrer votre nouveau mot de passe.",
   "reset.password.failure.heading": "Nous n'avons pas pu réinitialiser votre mot de passe.",
   "reset.password.form.submission.error": "Veuillez vérifier vos réponses et réessayer.",
+  "reset.password.request.server.error": "Échec de la réinitialisation du mot de passe",
+  "reset.password.token.validation.sever.error": "Échec de la validation du jeton",
   "reset.server.rate.limit.error": "Trop de demandes.",
   "reset.password.success.heading": "Réinitialisation du mot de passe complétée.",
   "reset.password.success": "Votre mot de passe a été réinitialisé. Connectez-vous à votre compte.",
-  "rate.limit.error": "Une erreur s'est produite en raison d'un trop grand nombre de demandes. Veuillez réessayer après un certain temps."
+  "progressive.profiling.page.title": "Champs optionnels | {siteName}",
+  "progressive.profiling.page.heading": "Quelques questions pour vous nous aideront à devenir plus intelligents.",
+  "gender.options.label": "Sexe (facultatif)",
+  "gender.options.f": "Femme",
+  "gender.options.m": "Homme",
+  "gender.options.o": "Autre / Préfère ne pas répondre",
+  "education.levels.label": "Plus haut niveau de scolarité atteint (facultatif)",
+  "education.levels.p": "Doctorat",
+  "education.levels.m": "Master ou diplôme professionnel",
+  "education.levels.b": "Diplôme de premier cycle supérieur",
+  "education.levels.a": "Grade de l'associé",
+  "education.levels.hs": "Lycée / enseignement secondaire",
+  "education.levels.jhs": "Collège / enseignement secondaire inférieur",
+  "education.levels.el": "Enseignement primaire",
+  "education.levels.none": "Sans diplôme",
+  "education.levels.other": "Autre niveau d'étude",
+  "year.of.birth.label": "Année de naissance (facultatif)",
+  "optional.fields.information.link": "En savoir plus sur la façon dont nous utilisons ces informations.",
+  "optional.fields.submit.button": "Envoyez",
+  "optional.fields.skip.button": "Ignorer pour l'instant",
+  "continue.to.platform": "Continuer vers {platformName}",
+  "modal.title": "Merci de nous en informer.",
+  "modal.description": "Vous pouvez compléter votre profil dans les paramètres à tout moment si vous changez d'avis.",
+  "welcome.page.error.heading": "Nous n'avons pas pu mettre à jour votre profil",
+  "welcome.page.error.message": "Une erreur s'est produite. Vous pouvez compléter votre profil dans les paramètres à tout moment."
 }

src/i18n/messages/fr_CA.json

@@ -1,168 +0,0 @@
-{
-  "start.learning": "Démarrer l'apprentissage",
-  "with.site.name": "avec {siteName}",
-  "complete.your.profile.1": "Complet",
-  "complete.your.profile.2": "votre profil",
-  "welcome.to.platform": "Bienvenue sur {siteName}, {username}!",
-  "institution.login.page.sub.heading": "Sélectionner votre institution dans la liste ci-dessous",
-  "logistration.sign.in": "Connexion",
-  "logistration.register": "Inscription",
-  "enterprisetpa.title.heading": "Souhaitez-vous vous connecter à l'aide de vos identifiants {providerName}?",
-  "enterprisetpa.login.button.text": "Affichez moi d'autres façons de se connecter ou de s'inscrire",
-  "enterprisetpa.login.button.text.public.account.creation.disabled": "Montrez-moi d'autres façons de me connecter",
-  "sso.sign.in.with": "Connectez-vous avec {providerName}",
-  "sso.create.account.using": "Créer un compte avec {providerName}",
-  "show.password": "Afficher le mot de passe",
-  "hide.password": "Cacher le mot de passe",
-  "one.letter": "1 lettre",
-  "one.number": "1 numéro",
-  "eight.characters": "8 caractères",
-  "password.sr.only.helping.text": "Le mot de passe doit contenir au moins 8 caractères, au moins une lettre et au moins un chiffre",
-  "tpa.alert.heading": "Presque terminé!",
-  "login.third.party.auth.account.not.linked": "Vous vous êtes connecté avec succès à {currentProvider}, mais votre compte {currentProvider} n'a pas de compte relié à {platformName}. Pour lier vos comptes, connectez-vous en utilisant votre mot de passe {platformName}.",
-  "register.third.party.auth.account.not.linked": "Vous vous êtes connecté avec succès à {currentProvider}! Nous avons juste besoin d'un peu plus d'informations avant que vous commenciez à apprendre avec {platformName}.",
-  "registration.using.tpa.form.heading": "Terminer la création de votre compte",
-  "zendesk.supportTitle": "Prise en charge d'edX",
-  "zendesk.selectTicketForm": "Veuillez choisir votre type de demande :",
-  "error.notfound.message": "La page que vous recherchez n'est pas disponible ou il y a une erreur dans l'URL. Veuillez vérifier l'URL et réessayer.",
-  "forgot.password.confirmation.message": "Nous avons envoyé un courriel à {email} avec des instructions pour réinitialiser votre mot de passe.\n          Si vous ne recevez pas de message de réinitialisation de mot de passe après 1 minute, vérifiez que vous avez saisi\nl'adresse courriel correctement, ou vérifiez votre dossier de pourriels. Si vous avez besoin d'aide supplémentaire, {supportLink}.",
-  "forgot.password.page.title": "Mot de passe oublié | {siteName}",
-  "forgot.password.page.heading": "Réinitialiser le mot de passe",
-  "forgot.password.page.instructions": "Veuillez entrer votre adresse courriel ci-dessous et nous vous enverrons un courriel avec les instructions pour réinitialiser votre mot de passe.",
-  "forgot.password.page.invalid.email.message": "Entrez une adresse de courriel valide",
-  "forgot.password.page.email.field.label": "Courriel",
-  "forgot.password.page.submit.button": "Soumettre",
-  "forgot.password.error.alert.title.": "Nous n'avons pas pu vous contacter.",
-  "forgot.password.error.message.title": "Une erreur est survenue.",
-  "forgot.password.request.in.progress.message": "Votre demande précédente est en cours, veuillez réessayer dans quelques instants.",
-  "forgot.password.empty.email.field.error": "Saisissez votre courriel",
-  "forgot.password.email.help.text": "L'adresse courriel que vous avez utilisée pour vous inscrire sur {platformName}",
-  "confirmation.message.title": "Vérifiez votre courriel",
-  "confirmation.support.link": "contacter le support technique",
-  "need.help.sign.in.text": "Besoin d'aide pour vous connecter?",
-  "additional.help.text": "Pour obtenir une aide supplémentaire, contactez l'assistance {platformName} à l'adresse",
-  "sign.in.text": "Connexion",
-  "extend.field.errors": "{emailError} ci-dessous.",
-  "invalid.token.heading": "Lien de réinitialisation du mot de passe non valide",
-  "invalid.token.error.message": "Ce lien de réinitialisation de mot de passe n'est pas valide. Il a peut-être déjà été utilisé. Entrez votre courriel ci-dessous pour recevoir un nouveau lien.",
-  "token.validation.rate.limit.error.heading": "Trop de demandes",
-  "token.validation.rate.limit.error": "Une erreur s'est produite en raison d'un trop grand nombre de demandes. Veuillez réessayer après un certain temps.",
-  "token.validation.internal.sever.error.heading": "Échec de la validation du jeton",
-  "token.validation.internal.sever.error": "Une erreur est survenue. Essayer de rafraîchir la page, ou vérifier votre connexion Internet.",
-  "internal.server.error": "Une erreur est survenue. Essayer de rafraîchir la page, ou vérifier votre connexion Internet.",
-  "account.activation.error.message": "Une erreur s'est produite, veuillez {supportLink} pour résoudre ce problème.",
-  "login.inactive.user.error": "Pour vous connecter, vous devez activer votre compte.{lineBreak}\n            {lineBreak}Nous venons d'envoyer un lien d'activation à {email}. Si vous ne recevez pas de courriel,\n            vérifiez vos dossiers de pourriels ou {supportLink}.",
-  "allowed.domain.login.error": "En tant qu'utilisateur {allowedDomain}, vous devez vous connecter avec votre {allowedDomain} {tpaLink}.",
-  "login.incorrect.credentials.error.attempts.text.1": "Le nom d'utilisateur, le courriel ou le mot de passe que vous avez entré sont incorrects. Vous avez {remainingAttempts} tentatives\n                de connexion avant que votre compte soit temporairement verrouillé.",
-  "login.incorrect.credentials.error.attempts.text.2": "Si vous avez oublié votre mot de passe, {resetLink}",
-  "account.locked.out.message.2": "Par mesure de sécurité, vous pouvez {resetLink} avant de réessayer.",
-  "login.incorrect.credentials.error.with.reset.link": "Le nom d'utilisateur, l'adresse courriel ou le mot de passe que vous avez saisis sont incorrects. Veuillez réessayer ou {resetLink}.",
-  "login.page.title": "Connexion | {siteName}",
-  "login.user.identity.label": "Nom d'utilisateur ou courriel",
-  "login.password.label": "Mot de passe",
-  "sign.in.button": "Connexion",
-  "forgot.password": "Mot de passe oublié",
-  "institution.login.button": "Identifiants de l'établissement/du campus",
-  "institution.login.page.title": "Connectez vous avec les crédentiels d'institution ou de campus",
-  "login.other.options.heading": "Ou se connecter avec :",
-  "non.compliant.password.title": "Nous avons récemment modifié nos exigences en matière de mot de passe",
-  "non.compliant.password.message": "Votre mot de passe actuel ne répond pas aux nouvelles exigences de sécurité. Nous venons d'envoyer un message de réinitialisation de mot de passe à l'adresse courriel associée à ce compte. Merci de nous aider à protéger vos données.",
-  "account.locked.out.message.1": "Pour protéger votre compte, il a été temporairement verrouillé. Réessayez dans 30 minutes.",
-  "enterprise.login.btn.text": "Identifiants de la compagnie ou de l'école",
-  "username.or.email.format.validation.less.chars.message": "Le nom d'utilisateur ou l'adresse courriel doit comporter au moins 3 caractères.",
-  "email.validation.message": "Entrez votre nom d'utilisateur ou votre adresse courriel",
-  "password.validation.message": "Les critères de mot de passe n'ont pas été remplis",
-  "account.activation.success.message.title": "Succès! Vous avez activé votre compte.",
-  "account.activation.success.message": "Vous recevrez maintenant des mises à jour par courriel et des alertes de notre part concernant les cours auxquels vous êtes inscrit. Connectez-vous pour continuer.",
-  "account.activation.info.message": "Ce compte a déjà été activé.",
-  "account.activation.error.message.title": "Votre compte n'a pas pu être activé",
-  "account.activation.support.link": "contacter le support",
-  "account.confirmation.success.message.title": "Bravo! Vous avez confirmé votre courriel.",
-  "account.confirmation.success.message": "Se connecter pour continuer.",
-  "account.confirmation.info.message": "Ce courriel a déjà été confirmé.",
-  "account.confirmation.error.message.title": "Votre courriel ne peut pas être confirmé",
-  "tpa.account.link": "compte {provider}",
-  "internal.server.error.message": "Une erreur est survenue. Essayer de rafraîchir la page, ou vérifier votre connexion Internet.",
-  "login.rate.limit.reached.message": "Trop de tentatives d'accès refusées. Essayer plus tard.",
-  "login.failure.header.title": "Nous n'avons pas pu vous connecter.",
-  "contact.support.link": "veuillez contacter le support {platformName}",
-  "login.incorrect.credentials.error": "Le nom d'utilisateur, l'adresse courriel ou le mot de passe que vous avez saisis sont incorrects. Veuillez réessayer.",
-  "login.form.invalid.error.message": "Veuillez remplir les champs ci-dessous.",
-  "login.incorrect.credentials.error.reset.link.text": "réinitialiser votre mot de passe",
-  "login.incorrect.credentials.error.before.account.blocked.text": "cliquez ici pour le réinitialiser.",
-  "password.security.nudge.title": "Sécurité du mot de passe",
-  "password.security.block.title": "Changement de mot de passe requis",
-  "password.security.nudge.body": "Notre système a détecté que votre mot de passe est vulnérable. Nous vous recommandons de le modifier afin que votre compte reste sécurisé.",
-  "password.security.block.body": "Notre système a détecté que votre mot de passe est vulnérable. Changez votre mot de passe afin que votre compte reste sécurisé.",
-  "password.security.close.button": "Fermer",
-  "password.security.redirect.to.reset.password.button": "Réinitialiser votre mot de passe",
-  "login.tpa.authentication.failure": "Nous sommes désolés, vous n'êtes pas autorisé à accéder à {platform_name} via ce canal. Veuillez contacter votre administrateur ou responsable de formation pour accéder à {platform_name}.{lineBreak}{lineBreak}Détails de l'erreur :{lineBreak}{errorMessage}",
-  "progressive.profiling.page.title": "Bienvenue | {siteName}",
-  "progressive.profiling.page.heading": "Quelques questions pour vous nous aideront à devenir plus intelligents.",
-  "optional.fields.information.link": "En savoir plus sur la façon dont nous utilisons ces informations.",
-  "optional.fields.submit.button": "Soumettre",
-  "optional.fields.skip.button": "Ignorer pour l'instant",
-  "optional.fields.next.button": "Suivant",
-  "continue.to.platform": "Continuer vers {platformName}",
-  "modal.title": "Merci de nous en informer.",
-  "modal.description": "Vous pouvez compléter votre profil dans les paramètres à tout moment si vous changez d'avis.",
-  "welcome.page.error.heading": "Nous n'avons pas pu mettre à jour votre profil",
-  "welcome.page.error.message": "Une erreur s'est produite. Vous pouvez compléter votre profil dans les paramètres à tout moment.",
-  "recommendation.page.title": "Recommandations | {siteName}",
-  "recommendation.page.heading": "Nous avons quelques recommandations pour vous aider à démarrer.",
-  "recommendation.skip.button": "Ignorer pour l'instant",
-  "register.page.title": "S'inscrire | {siteName}",
-  "registration.fullname.label": "Nom complet",
-  "registration.email.label": "Courriel",
-  "registration.username.label": "Nom d'utilisateur",
-  "registration.password.label": "Mot de passe",
-  "registration.country.label": "Pays/Région",
-  "registration.opt.in.label": "{siteName} peux m'envoyer des messages de marketing.",
-  "help.text.name": "Ce nom sera utilisé pour toutes les attestations que vous obtiendrez.",
-  "help.text.username.1": "Le nom qui vous identifiera dans vos cours.",
-  "help.text.username.2": "Cela ne peut pas être modifié ultérieurement.",
-  "help.text.email": "Pour l'activation du compte et les mises à jour importantes",
-  "create.account.for.free.button": "Créer un compte gratuitement",
-  "registration.other.options.heading": "Ou inscrivez-vous avec :",
-  "register.institution.login.button": "Identifiants de l'établissement/du campus",
-  "register.institution.login.page.title": "Inscription avec les crédentiels d'institution ou de campus",
-  "empty.name.field.error": "Saisissez votre nom complet",
-  "empty.email.field.error": "Saisissez votre courriel",
-  "empty.username.field.error": "Le nom d'utilisateur doit comporter entre 2 et 30 caractères",
-  "empty.password.field.error": "Les critères de mot de passe n'ont pas été remplis",
-  "empty.country.field.error": "Sélectionnez votre pays ou région de résidence",
-  "email.do.not.match": "Les adresses courriel ne correspondent pas.",
-  "email.invalid.format.error": "Entrez une adresse de courriel valide",
-  "username.validation.message": "Le nom d'utilisateur doit comporter entre 2 et 30 caractères",
-  "name.validation.message": "Entrez un nom valide",
-  "username.format.validation.message": "Les noms d'utilisateur ne peuvent contenir que des lettres (AZ, az), des chiffres (0-9), des traits de soulignement (_) et des traits d'union (-). Les noms d'utilisateur ne peuvent pas contenir d'espaces",
-  "registration.request.failure.header": "Nous n'avons pas pu créer votre compte.",
-  "registration.empty.form.submission.error": "Veuillez vérifier vos réponses et réessayer.",
-  "registration.request.server.error": "Une erreur est survenue. Essayer de rafraîchir la page, ou vérifier votre connexion Internet.",
-  "registration.rate.limit.error": "Trop de tentatives d'inscriptions ont échoué. Réessayez plus tard.",
-  "registration.tpa.session.expired": "L'inscription à l'aide de {provider} a expiré.",
-  "registration.tpa.authentication.failure": "Nous sommes désolés, vous n'êtes pas autorisé à accéder à {platform_name} via ce canal. Veuillez contacter votre administrateur ou responsable de formation pour accéder à {platform_name}.{lineBreak}{lineBreak}Détails de l'erreur :{lineBreak}{errorMessage}",
-  "terms.of.service.and.honor.code": "Conditions générales du service et code d'honneur",
-  "privacy.policy": "Politique de confidentialité",
-  "honor.code": "Code d'honneur",
-  "terms.of.service": "Conditions générales du service",
-  "registration.username.suggestion.label": "Suggéré :",
-  "did.you.mean.alert.text": "Vouliez-vous dire",
-  "register.page.terms.of.service.and.honor.code": "En créant un compte, vous acceptez le {tosAndHonorCode} et vous reconnaissez que {platformName} et chaque\n                membre peut traiter vos données personnelles conformément à la {privacyPolicy}.",
-  "register.page.honor.code": "J'accepte le {tosAndHonorCode} {platformName}",
-  "register.page.terms.of.service": "J'accepte les {termsOfService} {platformName}",
-  "sign.in": "Connexion",
-  "reset.password.page.title": "Réinitialiser le mot de passe | {siteName}",
-  "reset.password": "Réinitialiser le mot de passe",
-  "reset.password.page.instructions": "Saisir et confirmer votre nouveau mot de passe.",
-  "new.password.label": "Nouveau mot de passe",
-  "confirm.password.label": "Confirmer le mot de passe",
-  "passwords.do.not.match": "Les mots de passe ne correspondent pas",
-  "confirm.your.password": "Confirmer votre mot de passe",
-  "reset.password.failure.heading": "Nous n'avons pas pu réinitialiser votre mot de passe.",
-  "reset.password.form.submission.error": "Veuillez vérifier vos réponses et réessayer.",
-  "reset.server.rate.limit.error": "Trop de demandes.",
-  "reset.password.success.heading": "Réinitialisation du mot de passe complétée.",
-  "reset.password.success": "Votre mot de passe a été réinitialisé. Connectez-vous à votre compte.",
-  "rate.limit.error": "Une erreur s'est produite en raison d'un trop grand nombre de demandes. Veuillez réessayer après un certain temps."
-}

src/i18n/messages/hi.json

@@ -5,11 +5,16 @@
   "complete.your.profile.2": "your profile",
   "welcome.to.platform": "Welcome to {siteName}, {username}!",
   "institution.login.page.sub.heading": "Choose your institution from the list below",
+  "forgot.password.confirmation.title": "Check your email",
+  "forgot.password.confirmation.support.link": "contact technical support",
+  "forgot.password.confirmation.info": "If you do not receive a password reset message after 1 minute, verify that you entered the correct email address, or check your spam folder.",
   "logistration.sign.in": "Sign in",
   "logistration.register": "Register",
+  "internal.server.error.message": "An error has occurred. Try refreshing the page, or check your internet connection.",
+  "server.ratelimit.error.message": "An error has occurred because of too many requests. Please try again after some time.",
   "enterprisetpa.title.heading": "Would you like to sign in using your {providerName} credentials?",
+  "enterprisetpa.sso.button.title": "Sign in using {providerName}",
   "enterprisetpa.login.button.text": "Show me other ways to sign in or register",
-  "enterprisetpa.login.button.text.public.account.creation.disabled": "Show me other ways to sign in",
   "sso.sign.in.with": "Sign in with {providerName}",
   "sso.create.account.using": "Create account using {providerName}",
   "show.password": "Show password",
@@ -21,9 +26,6 @@
   "tpa.alert.heading": "Almost done!",
   "login.third.party.auth.account.not.linked": "You have successfully signed into {currentProvider}, but your {currentProvider} account does not have a linked {platformName} account. To link your accounts, sign in now using your {platformName} password.",
   "register.third.party.auth.account.not.linked": "You've successfully signed into {currentProvider}! We just need a little more information before you start learning with {platformName}.",
-  "registration.using.tpa.form.heading": "Finish creating your account",
-  "zendesk.supportTitle": "edX Support",
-  "zendesk.selectTicketForm": "Please choose your request type:",
   "error.notfound.message": "The page you're looking for is unavailable or there's an error in the URL. Please check the URL and try again.",
   "forgot.password.confirmation.message": "We sent an email to {email} with instructions to reset your password.\n          If you do not receive a password reset message after 1 minute, verify that you entered\n          the correct email address, or check your spam folder. If you need further assistance, {supportLink}.",
   "forgot.password.page.title": "Forgot Password | {siteName}",
@@ -36,6 +38,7 @@
   "forgot.password.error.message.title": "An error occurred.",
   "forgot.password.request.in.progress.message": "Your previous request is in progress, please try again in a few moments.",
   "forgot.password.empty.email.field.error": "Enter your email",
+  "forgot.password.invalid.email.message": "The email address you've provided isn't formatted correctly.",
   "forgot.password.email.help.text": "The email address you used to register with {platformName}",
   "confirmation.message.title": "Check your email",
   "confirmation.support.link": "contact technical support",
@@ -50,6 +53,7 @@
   "token.validation.internal.sever.error.heading": "Token validation failure",
   "token.validation.internal.sever.error": "An error has occurred. Try refreshing the page, or check your internet connection.",
   "internal.server.error": "An error has occurred. Try refreshing the page, or check your internet connection.",
+  "rate.limit.error": "An error has occurred because of too many requests. Please try again after some time.",
   "account.activation.error.message": "Something went wrong, please {supportLink} to resolve this issue.",
   "login.inactive.user.error": "In order to sign in, you need to activate your account.{lineBreak}\n            {lineBreak}We just sent an activation link to {email}. If you do not receive an email,\n            check your spam folders or {supportLink}.",
   "allowed.domain.login.error": "As {allowedDomain} user, You must login with your {allowedDomain} {tpaLink}.",
@@ -61,32 +65,45 @@
   "login.user.identity.label": "Username or email",
   "login.password.label": "Password",
   "sign.in.button": "Sign in",
+  "sign.in.btn.pending.state": "Loading",
+  "need.help.signing.in.collapsible.menu": "Need help signing in?",
+  "forgot.password.link": "Forgot my password",
   "forgot.password": "Forgot password",
+  "other.sign.in.issues": "Other sign in issues",
+  "need.other.help.signing.in.collapsible.menu": "Need other help signing in?",
   "institution.login.button": "Institution/campus credentials",
   "institution.login.page.title": "Sign in with institution/campus credentials",
+  "institution.login.page.back.button": "Back to sign in",
+  "create.an.account": "Create an account",
   "login.other.options.heading": "Or sign in with:",
   "non.compliant.password.title": "We recently changed our password requirements",
   "non.compliant.password.message": "Your current password does not meet the new security requirements. We just sent a password-reset message to the email address associated with this account. Thank you for helping us keep your data safe.",
   "account.locked.out.message.1": "To protect your account, it's been temporarily locked. Try again in 30 minutes.",
+  "first.time.here": "First time here?",
+  "email.help.message": "The email address you used to register with edX.",
   "enterprise.login.btn.text": "Company or school credentials",
+  "email.format.validation.message": "The email address you've provided isn't formatted correctly.",
   "username.or.email.format.validation.less.chars.message": "Username or email must have at least 3 characters.",
   "email.validation.message": "Enter your username or email",
   "password.validation.message": "Password criteria has not been met",
+  "register.link": "Create an account",
+  "sign.in.heading": "Sign in",
   "account.activation.success.message.title": "Success! You have activated your account.",
   "account.activation.success.message": "You will now receive email updates and alerts from us related to the courses you are enrolled in. Sign in to continue.",
   "account.activation.info.message": "This account has already been activated.",
   "account.activation.error.message.title": "Your account could not be activated",
   "account.activation.support.link": "contact support",
+  "tpa.account.link": "{provider} account",
   "account.confirmation.success.message.title": "Success! You have confirmed your email.",
   "account.confirmation.success.message": "Sign in to continue.",
   "account.confirmation.info.message": "This email has already been confirmed.",
   "account.confirmation.error.message.title": "Your email could not be confirmed",
-  "tpa.account.link": "{provider} account",
-  "internal.server.error.message": "An error has occurred. Try refreshing the page, or check your internet connection.",
   "login.rate.limit.reached.message": "Too many failed login attempts. Try again later.",
   "login.failure.header.title": "We couldn't sign you in.",
   "contact.support.link": "contact {platformName} support",
   "login.incorrect.credentials.error": "The username, email, or password you entered is incorrect. Please try again.",
+  "login.failed.attempt.error": "You have {remainingAttempts} more sign in attempts before your account is temporarily locked.",
+  "login.locked.out.error.message": "To protect your account, it’s been temporarily locked. Try again in {lockedOutPeriod} minutes.",
   "login.form.invalid.error.message": "Please fill in the fields below.",
   "login.incorrect.credentials.error.reset.link.text": "reset your password",
   "login.incorrect.credentials.error.before.account.blocked.text": "click here to reset it.",
@@ -96,8 +113,7 @@
   "password.security.block.body": "Our system detected that your password is vulnerable. Change your password so that your account stays secure.",
   "password.security.close.button": "Close",
   "password.security.redirect.to.reset.password.button": "Reset your password",
-  "login.tpa.authentication.failure": "We are sorry, you are not authorized to access {platform_name} via this channel. Please contact your learning administrator or manager in order to access {platform_name}.{lineBreak}{lineBreak}Error Details:{lineBreak}{errorMessage}",
-  "progressive.profiling.page.title": "Welcome | {siteName}",
+  "progressive.profiling.page.title": "Optional Fields | {siteName}",
   "progressive.profiling.page.heading": "A few questions for you will help us get smarter.",
   "optional.fields.information.link": "Learn more about how we use this information.",
   "optional.fields.submit.button": "Submit",
@@ -108,7 +124,7 @@
   "modal.description": "You can complete your profile in settings at any time if you change your mind.",
   "welcome.page.error.heading": "We couldn't update your profile",
   "welcome.page.error.message": "An error occurred. You can complete your profile in settings at any time.",
-  "recommendation.page.title": "Recommendations | {siteName}",
+  "recommendation.page.title": "Recommendations| {siteName}",
   "recommendation.page.heading": "We have a few recommendations to get you started.",
   "recommendation.skip.button": "Skip for now",
   "register.page.title": "Register | {siteName}",
@@ -123,34 +139,51 @@
   "help.text.username.2": "This can not be changed later.",
   "help.text.email": "For account activation and important updates",
   "create.account.for.free.button": "Create an account for free",
+  "create.an.account.btn.pending.state": "Loading",
   "registration.other.options.heading": "Or register with:",
   "register.institution.login.button": "Institution/campus credentials",
   "register.institution.login.page.title": "Register with institution/campus credentials",
   "empty.name.field.error": "Enter your full name",
   "empty.email.field.error": "Enter your email",
+  "email.do.not.match": "The email addresses do not match.",
   "empty.username.field.error": "Username must be between 2 and 30 characters",
   "empty.password.field.error": "Password criteria has not been met",
   "empty.country.field.error": "Select your country or region of residence",
-  "email.do.not.match": "The email addresses do not match.",
   "email.invalid.format.error": "Enter a valid email address",
+  "email.ratelimit.less.chars.validation.message": "Email must have 3 characters.",
   "username.validation.message": "Username must be between 2 and 30 characters",
   "name.validation.message": "Enter a valid name",
   "username.format.validation.message": "Usernames can only contain letters (A-Z, a-z), numerals (0-9), underscores (_), and hyphens (-). Usernames cannot contain spaces",
+  "support.education.research": "Support education research by providing additional information. (Optional)",
   "registration.request.failure.header": "We couldn't create your account.",
   "registration.empty.form.submission.error": "Please check your responses and try again.",
   "registration.request.server.error": "An error has occurred. Try refreshing the page, or check your internet connection.",
   "registration.rate.limit.error": "Too many failed registration attempts. Try again later.",
   "registration.tpa.session.expired": "Registration using {provider} has timed out.",
-  "registration.tpa.authentication.failure": "We are sorry, you are not authorized to access {platform_name} via this channel. Please contact your learning administrator or manager in order to access {platform_name}.{lineBreak}{lineBreak}Error Details:{lineBreak}{errorMessage}",
   "terms.of.service.and.honor.code": "Terms of Service and Honor Code",
   "privacy.policy": "Privacy Policy",
   "honor.code": "Honor Code",
   "terms.of.service": "Terms of Service",
+  "registration.year.of.birth.label": "Year of birth (optional)",
+  "registration.field.gender.options.label": "Gender (optional)",
+  "registration.goals.label": "Tell us why you're interested in edX (optional)",
+  "registration.field.gender.options.f": "Female",
+  "registration.field.gender.options.m": "Male",
+  "registration.field.gender.options.o": "Other/Prefer not to say",
+  "registration.field.education.levels.label": "Highest level of education completed (optional)",
+  "registration.field.education.levels.p": "Doctorate",
+  "registration.field.education.levels.m": "Master's or professional degree",
+  "registration.field.education.levels.b": "Bachelor's degree",
+  "registration.field.education.levels.a": "Associate's degree",
+  "registration.field.education.levels.hs": "Secondary/high school",
+  "registration.field.education.levels.jhs": "Junior secondary/junior high/middle school",
+  "registration.field.education.levels.el": "Elementary/primary school",
+  "registration.field.education.levels.none": "No formal education",
+  "registration.field.education.levels.other": "Other education",
   "registration.username.suggestion.label": "Suggested:",
+  "registration.using.tpa.form.heading": "Finish creating your account",
   "did.you.mean.alert.text": "Did you mean",
-  "register.page.terms.of.service.and.honor.code": "By creating an account, you agree to the {tosAndHonorCode} and you acknowledge that {platformName} and each\n                Member process your personal data in accordance with the {privacyPolicy}.",
-  "register.page.honor.code": "I agree to the {platformName} {tosAndHonorCode}",
-  "register.page.terms.of.service": "I agree to the {platformName} {termsOfService}",
+  "register.page.terms.of.service": "I agree to the {platformName} {termsOfService}",
   "sign.in": "Sign in",
   "reset.password.page.title": "Reset Password | {siteName}",
   "reset.password": "Reset password",
@@ -159,10 +192,40 @@
   "confirm.password.label": "Confirm password",
   "passwords.do.not.match": "Passwords do not match",
   "confirm.your.password": "Confirm your password",
+  "forgot.password.confirmation.sign.in.link": "sign in",
+  "reset.password.request.forgot.password.text": "Forgot password",
+  "reset.password.request.invalid.token.header": "Invalid password reset link",
+  "reset.password.empty.new.password.field.error": "Please enter your new password.",
   "reset.password.failure.heading": "We couldn't reset your password.",
   "reset.password.form.submission.error": "Please check your responses and try again.",
+  "reset.password.request.server.error": "Failed to reset password",
+  "reset.password.token.validation.sever.error": "Token validation failure",
   "reset.server.rate.limit.error": "Too many requests.",
   "reset.password.success.heading": "Password reset complete.",
   "reset.password.success": "Your password has been reset. Sign in to your account.",
-  "rate.limit.error": "An error has occurred because of too many requests. Please try again after some time."
+  "progressive.profiling.page.title": "Optional Fields | {siteName}",
+  "progressive.profiling.page.heading": "A few questions for you will help us get smarter.",
+  "gender.options.label": "Gender (optional)",
+  "gender.options.f": "Female",
+  "gender.options.m": "Male",
+  "gender.options.o": "Other/Prefer not to say",
+  "education.levels.label": "Highest level of education completed (optional)",
+  "education.levels.p": "Doctorate",
+  "education.levels.m": "Master's or professional degree",
+  "education.levels.b": "Bachelor's degree",
+  "education.levels.a": "Associate's degree",
+  "education.levels.hs": "Secondary/high school",
+  "education.levels.jhs": "Junior secondary/junior high/middle school",
+  "education.levels.el": "Elementary/primary school",
+  "education.levels.none": "No formal education",
+  "education.levels.other": "Other education",
+  "year.of.birth.label": "Year of birth (optional)",
+  "optional.fields.information.link": "Learn more about how we use this information.",
+  "optional.fields.submit.button": "Submit",
+  "optional.fields.skip.button": "Skip for now",
+  "continue.to.platform": "Continue to {platformName}",
+  "modal.title": "Thanks for letting us know.",
+  "modal.description": "You can complete your profile in settings at any time if you change your mind.",
+  "welcome.page.error.heading": "We couldn't update your profile",
+  "welcome.page.error.message": "An error occurred. You can complete your profile in settings at any time."
 }

src/i18n/messages/it.json

@@ -1,168 +0,0 @@
-{
-  "start.learning": "Start learning",
-  "with.site.name": "with {siteName}",
-  "complete.your.profile.1": "Complete",
-  "complete.your.profile.2": "your profile",
-  "welcome.to.platform": "Welcome to {siteName}, {username}!",
-  "institution.login.page.sub.heading": "Choose your institution from the list below",
-  "logistration.sign.in": "Sign in",
-  "logistration.register": "Register",
-  "enterprisetpa.title.heading": "Would you like to sign in using your {providerName} credentials?",
-  "enterprisetpa.login.button.text": "Show me other ways to sign in or register",
-  "enterprisetpa.login.button.text.public.account.creation.disabled": "Show me other ways to sign in",
-  "sso.sign.in.with": "Sign in with {providerName}",
-  "sso.create.account.using": "Create account using {providerName}",
-  "show.password": "Show password",
-  "hide.password": "Hide password",
-  "one.letter": "1 letter",
-  "one.number": "1 number",
-  "eight.characters": "8 characters",
-  "password.sr.only.helping.text": "Password must contain at least 8 characters, at least one letter, and at least one number",
-  "tpa.alert.heading": "Almost done!",
-  "login.third.party.auth.account.not.linked": "You have successfully signed into {currentProvider}, but your {currentProvider} account does not have a linked {platformName} account. To link your accounts, sign in now using your {platformName} password.",
-  "register.third.party.auth.account.not.linked": "You've successfully signed into {currentProvider}! We just need a little more information before you start learning with {platformName}.",
-  "registration.using.tpa.form.heading": "Finish creating your account",
-  "zendesk.supportTitle": "edX Support",
-  "zendesk.selectTicketForm": "Please choose your request type:",
-  "error.notfound.message": "The page you're looking for is unavailable or there's an error in the URL. Please check the URL and try again.",
-  "forgot.password.confirmation.message": "We sent an email to {email} with instructions to reset your password.\n          If you do not receive a password reset message after 1 minute, verify that you entered\n          the correct email address, or check your spam folder. If you need further assistance, {supportLink}.",
-  "forgot.password.page.title": "Forgot Password | {siteName}",
-  "forgot.password.page.heading": "Reset password",
-  "forgot.password.page.instructions": "Please enter your email address below and we will send you an email with instructions on how to reset your password.",
-  "forgot.password.page.invalid.email.message": "Enter a valid email address",
-  "forgot.password.page.email.field.label": "Email",
-  "forgot.password.page.submit.button": "Submit",
-  "forgot.password.error.alert.title.": "We were unable to contact you.",
-  "forgot.password.error.message.title": "An error occurred.",
-  "forgot.password.request.in.progress.message": "Your previous request is in progress, please try again in a few moments.",
-  "forgot.password.empty.email.field.error": "Enter your email",
-  "forgot.password.email.help.text": "The email address you used to register with {platformName}",
-  "confirmation.message.title": "Check your email",
-  "confirmation.support.link": "contact technical support",
-  "need.help.sign.in.text": "Need help signing in?",
-  "additional.help.text": "For additional help, contact {platformName} support at ",
-  "sign.in.text": "Sign in",
-  "extend.field.errors": "{emailError} below.",
-  "invalid.token.heading": "Invalid password reset link",
-  "invalid.token.error.message": "This password reset link is invalid. It may have been used already. Enter your email below to receive a new link.",
-  "token.validation.rate.limit.error.heading": "Too many requests",
-  "token.validation.rate.limit.error": "An error has occurred because of too many requests. Please try again after some time.",
-  "token.validation.internal.sever.error.heading": "Token validation failure",
-  "token.validation.internal.sever.error": "An error has occurred. Try refreshing the page, or check your internet connection.",
-  "internal.server.error": "An error has occurred. Try refreshing the page, or check your internet connection.",
-  "account.activation.error.message": "Something went wrong, please {supportLink} to resolve this issue.",
-  "login.inactive.user.error": "In order to sign in, you need to activate your account.{lineBreak}\n            {lineBreak}We just sent an activation link to {email}. If you do not receive an email,\n            check your spam folders or {supportLink}.",
-  "allowed.domain.login.error": "As {allowedDomain} user, You must login with your {allowedDomain} {tpaLink}.",
-  "login.incorrect.credentials.error.attempts.text.1": "The username, email or password you entered is incorrect. You have {remainingAttempts} more sign in\n                attempts before your account is temporarily locked.",
-  "login.incorrect.credentials.error.attempts.text.2": "If you've forgotten your password, {resetLink}",
-  "account.locked.out.message.2": "To be on the safe side, you can {resetLink} before trying again.",
-  "login.incorrect.credentials.error.with.reset.link": "The username, email, or password you entered is incorrect. Please try again or {resetLink}.",
-  "login.page.title": "Login | {siteName}",
-  "login.user.identity.label": "Username or email",
-  "login.password.label": "Password",
-  "sign.in.button": "Sign in",
-  "forgot.password": "Forgot password",
-  "institution.login.button": "Institution/campus credentials",
-  "institution.login.page.title": "Sign in with institution/campus credentials",
-  "login.other.options.heading": "Or sign in with:",
-  "non.compliant.password.title": "We recently changed our password requirements",
-  "non.compliant.password.message": "Your current password does not meet the new security requirements. We just sent a password-reset message to the email address associated with this account. Thank you for helping us keep your data safe.",
-  "account.locked.out.message.1": "To protect your account, it's been temporarily locked. Try again in 30 minutes.",
-  "enterprise.login.btn.text": "Company or school credentials",
-  "username.or.email.format.validation.less.chars.message": "Username or email must have at least 3 characters.",
-  "email.validation.message": "Enter your username or email",
-  "password.validation.message": "Password criteria has not been met",
-  "account.activation.success.message.title": "Success! You have activated your account.",
-  "account.activation.success.message": "You will now receive email updates and alerts from us related to the courses you are enrolled in. Sign in to continue.",
-  "account.activation.info.message": "This account has already been activated.",
-  "account.activation.error.message.title": "Your account could not be activated",
-  "account.activation.support.link": "contact support",
-  "account.confirmation.success.message.title": "Success! You have confirmed your email.",
-  "account.confirmation.success.message": "Sign in to continue.",
-  "account.confirmation.info.message": "This email has already been confirmed.",
-  "account.confirmation.error.message.title": "Your email could not be confirmed",
-  "tpa.account.link": "{provider} account",
-  "internal.server.error.message": "An error has occurred. Try refreshing the page, or check your internet connection.",
-  "login.rate.limit.reached.message": "Too many failed login attempts. Try again later.",
-  "login.failure.header.title": "We couldn't sign you in.",
-  "contact.support.link": "contact {platformName} support",
-  "login.incorrect.credentials.error": "The username, email, or password you entered is incorrect. Please try again.",
-  "login.form.invalid.error.message": "Please fill in the fields below.",
-  "login.incorrect.credentials.error.reset.link.text": "reset your password",
-  "login.incorrect.credentials.error.before.account.blocked.text": "click here to reset it.",
-  "password.security.nudge.title": "Password security",
-  "password.security.block.title": "Password change required",
-  "password.security.nudge.body": "Our system detected that your password is vulnerable. We recommend you change it so that your account stays secure.",
-  "password.security.block.body": "Our system detected that your password is vulnerable. Change your password so that your account stays secure.",
-  "password.security.close.button": "Close",
-  "password.security.redirect.to.reset.password.button": "Reset your password",
-  "login.tpa.authentication.failure": "We are sorry, you are not authorized to access {platform_name} via this channel. Please contact your learning administrator or manager in order to access {platform_name}.{lineBreak}{lineBreak}Error Details:{lineBreak}{errorMessage}",
-  "progressive.profiling.page.title": "Welcome | {siteName}",
-  "progressive.profiling.page.heading": "A few questions for you will help us get smarter.",
-  "optional.fields.information.link": "Learn more about how we use this information.",
-  "optional.fields.submit.button": "Submit",
-  "optional.fields.skip.button": "Skip for now",
-  "optional.fields.next.button": "Next",
-  "continue.to.platform": "Continue to {platformName}",
-  "modal.title": "Thanks for letting us know.",
-  "modal.description": "You can complete your profile in settings at any time if you change your mind.",
-  "welcome.page.error.heading": "We couldn't update your profile",
-  "welcome.page.error.message": "An error occurred. You can complete your profile in settings at any time.",
-  "recommendation.page.title": "Recommendations | {siteName}",
-  "recommendation.page.heading": "We have a few recommendations to get you started.",
-  "recommendation.skip.button": "Skip for now",
-  "register.page.title": "Register | {siteName}",
-  "registration.fullname.label": "Full name",
-  "registration.email.label": "Email",
-  "registration.username.label": "Public username",
-  "registration.password.label": "Password",
-  "registration.country.label": "Country/Region",
-  "registration.opt.in.label": "I agree that {siteName} may send me marketing messages.",
-  "help.text.name": "This name will be used by any certificates that you earn.",
-  "help.text.username.1": "The name that will identify you in your courses.",
-  "help.text.username.2": "This can not be changed later.",
-  "help.text.email": "For account activation and important updates",
-  "create.account.for.free.button": "Create an account for free",
-  "registration.other.options.heading": "Or register with:",
-  "register.institution.login.button": "Institution/campus credentials",
-  "register.institution.login.page.title": "Register with institution/campus credentials",
-  "empty.name.field.error": "Enter your full name",
-  "empty.email.field.error": "Enter your email",
-  "empty.username.field.error": "Username must be between 2 and 30 characters",
-  "empty.password.field.error": "Password criteria has not been met",
-  "empty.country.field.error": "Select your country or region of residence",
-  "email.do.not.match": "The email addresses do not match.",
-  "email.invalid.format.error": "Enter a valid email address",
-  "username.validation.message": "Username must be between 2 and 30 characters",
-  "name.validation.message": "Enter a valid name",
-  "username.format.validation.message": "Usernames can only contain letters (A-Z, a-z), numerals (0-9), underscores (_), and hyphens (-). Usernames cannot contain spaces",
-  "registration.request.failure.header": "We couldn't create your account.",
-  "registration.empty.form.submission.error": "Please check your responses and try again.",
-  "registration.request.server.error": "An error has occurred. Try refreshing the page, or check your internet connection.",
-  "registration.rate.limit.error": "Too many failed registration attempts. Try again later.",
-  "registration.tpa.session.expired": "Registration using {provider} has timed out.",
-  "registration.tpa.authentication.failure": "We are sorry, you are not authorized to access {platform_name} via this channel. Please contact your learning administrator or manager in order to access {platform_name}.{lineBreak}{lineBreak}Error Details:{lineBreak}{errorMessage}",
-  "terms.of.service.and.honor.code": "Terms of Service and Honor Code",
-  "privacy.policy": "Privacy Policy",
-  "honor.code": "Honor Code",
-  "terms.of.service": "Terms of Service",
-  "registration.username.suggestion.label": "Suggested:",
-  "did.you.mean.alert.text": "Did you mean",
-  "register.page.terms.of.service.and.honor.code": "By creating an account, you agree to the {tosAndHonorCode} and you acknowledge that {platformName} and each\n                Member process your personal data in accordance with the {privacyPolicy}.",
-  "register.page.honor.code": "I agree to the {platformName} {tosAndHonorCode}",
-  "register.page.terms.of.service": "I agree to the {platformName} {termsOfService}",
-  "sign.in": "Sign in",
-  "reset.password.page.title": "Reset Password | {siteName}",
-  "reset.password": "Reset password",
-  "reset.password.page.instructions": "Enter and confirm your new password.",
-  "new.password.label": "New password",
-  "confirm.password.label": "Confirm password",
-  "passwords.do.not.match": "Passwords do not match",
-  "confirm.your.password": "Confirm your password",
-  "reset.password.failure.heading": "We couldn't reset your password.",
-  "reset.password.form.submission.error": "Please check your responses and try again.",
-  "reset.server.rate.limit.error": "Too many requests.",
-  "reset.password.success.heading": "Password reset complete.",
-  "reset.password.success": "Your password has been reset. Sign in to your account.",
-  "rate.limit.error": "An error has occurred because of too many requests. Please try again after some time."
-}

src/i18n/messages/it_IT.json

@@ -5,11 +5,16 @@
   "complete.your.profile.2": "Il tuo profilo",
   "welcome.to.platform": "Benvenuto in {siteName}, {username}!",
   "institution.login.page.sub.heading": "Scegli il tuo istituto dall'elenco sottostante",
+  "forgot.password.confirmation.title": "Controlla la tua casella di posta",
+  "forgot.password.confirmation.support.link": "contatta il supporto tecnico",
+  "forgot.password.confirmation.info": "Se non ricevi un messaggio di reimpostazione della password entro 1 minuto, verifica di aver inserito l'indirizzo e-mail corretto o controlla la cartella della posta indesiderata.",
   "logistration.sign.in": "Accedi",
   "logistration.register": "Registrazione",
+  "internal.server.error.message": "Si è verificato un errore. Prova ad aggiornare la pagina oppure verifica la connessione internet.",
+  "server.ratelimit.error.message": "Si è verificato un errore dovuto alle troppe richieste. Prova di nuovo più tardi.",
   "enterprisetpa.title.heading": "Vuoi accedere utilizzando le credenziali {providerName}?",
+  "enterprisetpa.sso.button.title": "Accedi utilizzando {providerName}",
   "enterprisetpa.login.button.text": "Mostrami altre modalità di accesso o registrazione",
-  "enterprisetpa.login.button.text.public.account.creation.disabled": "Show me other ways to sign in",
   "sso.sign.in.with": "Accedi con {providerName}",
   "sso.create.account.using": "Crea un account utilizzando {providerName}",
   "show.password": "Mostra password",
@@ -21,9 +26,6 @@
   "tpa.alert.heading": "Quasi fatto!",
   "login.third.party.auth.account.not.linked": "Hai correttamente effettuato l'accesso in {currentProvider}, ma il tuo account {currentProvider} non ha un account {platformName} ad esso abbinato. Per collegare i tuoi account accesi utilizzando la password {platformName}. ",
   "register.third.party.auth.account.not.linked": "Hai eseguito correttamente l'accesso a {a03f0f8cfb85cz0}! Abbiamo solo bisogno di un po' più di informazioni prima di iniziare a imparare con {platformName}.",
-  "registration.using.tpa.form.heading": "Completa la creazione del tuo account",
-  "zendesk.supportTitle": "edX Support",
-  "zendesk.selectTicketForm": "Please choose your request type:",
   "error.notfound.message": "La pagina che stai cercando non è disponibile o si è verificato un errore nell'URL. Controlla l'URL e riprova. ",
   "forgot.password.confirmation.message": "Abbiamo inviato un'email a {email} con le istruzioni per reimpostare la password. Se non ricevi un messaggio di reimpostazione della password dopo 1 minuto, verifica di aver inserito l'indirizzo e-mail corretto o controlla la cartella spam. Se hai bisogno di ulteriore assistenza, {supportLink}.",
   "forgot.password.page.title": "Dimenticato la password | {siteName}",
@@ -36,6 +38,7 @@
   "forgot.password.error.message.title": "Si è verificato un errore. ",
   "forgot.password.request.in.progress.message": "La tua richiesta precedente è in corso di elaborazione, riprova tra qualche istante. ",
   "forgot.password.empty.email.field.error": "Inserisci il tuo indirizzo email",
+  "forgot.password.invalid.email.message": "L'indirizzo email che hai fornito non è formattato correttamente. ",
   "forgot.password.email.help.text": "L'indirizzo email che hai utilizzato per registrarti con {platformName}",
   "confirmation.message.title": "Controlla la tua casella di posta",
   "confirmation.support.link": "contatta il supporto tecnico",
@@ -50,6 +53,7 @@
   "token.validation.internal.sever.error.heading": "Errore di convalida del token",
   "token.validation.internal.sever.error": "Si è verificato un errore. Prova ad aggiornare la pagina oppure verifica la connessione internet.",
   "internal.server.error": "Si è verificato un errore. Prova ad aggiornare la pagina oppure verifica la connessione internet.",
+  "rate.limit.error": "Si è verificato un errore dovuto alle troppe richieste. Prova di nuovo più tardi.",
   "account.activation.error.message": "Si è verificato un errore, seleziona {supportLink} per risolvere il problema. ",
   "login.inactive.user.error": "Per accedere, devi attivare il tuo account.{lineBreak} {lineBreak}Abbiamo appena inviato un link di attivazione a {email}. Se non ricevi un'email, controlla la cartella della posta indesiderata oppure seleziona {supportLink}.",
   "allowed.domain.login.error": "As {allowedDomain} user, You must login with your {allowedDomain} {tpaLink}.",
@@ -61,32 +65,45 @@
   "login.user.identity.label": "Nome utente o email ",
   "login.password.label": "Password",
   "sign.in.button": "Accedi",
+  "sign.in.btn.pending.state": "Caricamento",
+  "need.help.signing.in.collapsible.menu": "Hai bisogno di aiuto per l'accesso?",
+  "forgot.password.link": "Ho dimenticato la mia password",
   "forgot.password": "Password dimenticata",
+  "other.sign.in.issues": "Altri problemi legati all'accesso",
+  "need.other.help.signing.in.collapsible.menu": "Hai bisogno di ulteriore aiuto per l'accesso?",
   "institution.login.button": "Credenziali dell'istituto/campus",
   "institution.login.page.title": "Accedi con le credenziali dell'istituzione/campus",
+  "institution.login.page.back.button": "Torna all'accesso",
+  "create.an.account": "Crea un account",
   "login.other.options.heading": "Oppure accedi con:",
   "non.compliant.password.title": "Abbiamo di recente modificato i requisiti per la password ",
   "non.compliant.password.message": "La tua password attuale non soddisfa i nuovi requisiti di sicurezza. Abbiamo appena inviato un messaggio di reimpostazione della password all'indirizzo e-mail associato a questo account. Grazie per averci aiutato a mantenere i tuoi dati al sicuro.",
   "account.locked.out.message.1": "Per proteggere il tuo account, è stato temporaneamente bloccato. Riprova tra 30 minuti.",
+  "first.time.here": "È la prima volta che ci visiti?",
+  "email.help.message": "L'indirizzo email che hai utilizzato per registrarti con edX.",
   "enterprise.login.btn.text": "Credenziali aziendali o scolastiche",
+  "email.format.validation.message": "L'indirizzo email che hai fornito non è formattato correttamente. ",
   "username.or.email.format.validation.less.chars.message": "Il nome utente o l'e-mail deve contenere almeno 3 caratteri.",
   "email.validation.message": "Inserisci il tuo nome utente o e-mail",
   "password.validation.message": "I criteri della password non sono stati soddisfatti",
+  "register.link": "Crea un account",
+  "sign.in.heading": "Accedi",
   "account.activation.success.message.title": "Completato correttamente! Hai attivato il tuo account. ",
   "account.activation.success.message": "A breve ti invieremo avvisi e aggiornamenti via email relativi al corso a cui ti sei iscritto. Accedi per proseguire.",
   "account.activation.info.message": "Questo account è già stato attivato.",
   "account.activation.error.message.title": "Impossibile attivare il tuo account.",
   "account.activation.support.link": "contatta il supporto",
+  "tpa.account.link": "{provider} account",
   "account.confirmation.success.message.title": "Successo! Hai confermato la tua email.",
   "account.confirmation.success.message": "Accedi per continuare.",
   "account.confirmation.info.message": "Questa email è già stata confermata.",
   "account.confirmation.error.message.title": "Impossibile confermare la tua email",
-  "tpa.account.link": "{provider} account",
-  "internal.server.error.message": "Si è verificato un errore. Prova ad aggiornare la pagina oppure verifica la connessione internet.",
   "login.rate.limit.reached.message": "Troppi tentativi di login falliti. Riprova più tardi.",
   "login.failure.header.title": "Impossibile autorizzare il tuo accesso.",
   "contact.support.link": "contatta il supporto {platformName} ",
   "login.incorrect.credentials.error": "Il nome utente, l'e-mail o la password inseriti non sono corretti. Per favore riprova.",
+  "login.failed.attempt.error": "Hai a disposizione altri {remainingAttempts} tentativi di accesso prima che il tuo account venga temporaneamente bloccato.",
+  "login.locked.out.error.message": "Il tuo account è stato temporaneamente bloccato per motivi di sicurezza. Riprova tra {lockedOutPeriod} minuti.",
   "login.form.invalid.error.message": "Si prega di compilare i campi sottostanti.",
   "login.incorrect.credentials.error.reset.link.text": "reimposta la tua password",
   "login.incorrect.credentials.error.before.account.blocked.text": "clicca qui per ripristinarlo.",
@@ -96,8 +113,7 @@
   "password.security.block.body": "Il nostro sistema ha rilevato che la tua password è vulnerabile. Cambia la tua password in modo che il tuo account rimanga sicuro.",
   "password.security.close.button": "Chiudi",
   "password.security.redirect.to.reset.password.button": "Ripristina la tua password",
-  "login.tpa.authentication.failure": "We are sorry, you are not authorized to access {platform_name} via this channel. Please contact your learning administrator or manager in order to access {platform_name}.{lineBreak}{lineBreak}Error Details:{lineBreak}{errorMessage}",
-  "progressive.profiling.page.title": "Welcome | {siteName}",
+  "progressive.profiling.page.title": "Campi facoltativi | {siteName}",
   "progressive.profiling.page.heading": "Alcune domande per te ci aiuteranno a diventare più intelligenti.",
   "optional.fields.information.link": "Ulteriori informazioni su come utilizziamo queste informazioni.",
   "optional.fields.submit.button": "Invia",
@@ -108,7 +124,7 @@
   "modal.description": "Puoi completare il tuo profilo nelle impostazioni in qualsiasi momento se cambi idea.",
   "welcome.page.error.heading": "Impossibile aggiornare il tuo profilo",
   "welcome.page.error.message": "Si è verificato un errore. Puoi completare il tuo profilo nelle impostazioni in qualsiasi momento.",
-  "recommendation.page.title": "Recommendations | {siteName}",
+  "recommendation.page.title": "Recommendations| {siteName}",
   "recommendation.page.heading": "We have a few recommendations to get you started.",
   "recommendation.skip.button": "Skip for now",
   "register.page.title": "Registrazione | {siteName}",
@@ -123,34 +139,51 @@
   "help.text.username.2": "Questo non può essere modificato in seguito.",
   "help.text.email": "Per l'attivazione dell'account e aggiornamenti importanti",
   "create.account.for.free.button": "Crea un account gratis",
+  "create.an.account.btn.pending.state": "Caricamento",
   "registration.other.options.heading": "Oppure registrati con:",
   "register.institution.login.button": "Credenziali dell'istituto/campus",
   "register.institution.login.page.title": "Registrati con le credenziali dell'istituzione/campus",
   "empty.name.field.error": "Inserisci il tuo nome e cognome",
   "empty.email.field.error": "Inserisci il tuo indirizzo email",
+  "email.do.not.match": "Gli indirizzi email non corrispondono.",
   "empty.username.field.error": "Il nome utente deve essere compreso tra 2 e 30 caratteri",
   "empty.password.field.error": "I criteri della password non sono stati soddisfatti",
   "empty.country.field.error": "Seleziona il tuo paese o regione di residenza",
-  "email.do.not.match": "Gli indirizzi email non corrispondono.",
   "email.invalid.format.error": "Inserisci un indirizzo email valido",
+  "email.ratelimit.less.chars.validation.message": "Email deve avere 3 caratteri.",
   "username.validation.message": "Il nome utente deve essere compreso tra 2 e 30 caratteri",
   "name.validation.message": "Inserisci un nome valido",
   "username.format.validation.message": "I nomi utente possono contenere solo lettere (AZ, az), numeri (0-9), trattini bassi (_) e trattini (-). I nomi utente non possono contenere spazi",
+  "support.education.research": "Supportare la ricerca del livello di istruzione fornendo informazioni aggiuntive. (Facoltativo)",
   "registration.request.failure.header": "Impossibile creare il tuo account.",
   "registration.empty.form.submission.error": "Controlla le tue risposte e riprova.",
   "registration.request.server.error": "Si è verificato un errore. Prova ad aggiornare la pagina oppure verifica la connessione internet.",
   "registration.rate.limit.error": "Troppi tentativi di registrazione non riusciti. Prova di nuovo più tardi.",
   "registration.tpa.session.expired": "La registrazione mediante {provider} è andata in timeout.",
-  "registration.tpa.authentication.failure": "We are sorry, you are not authorized to access {platform_name} via this channel. Please contact your learning administrator or manager in order to access {platform_name}.{lineBreak}{lineBreak}Error Details:{lineBreak}{errorMessage}",
   "terms.of.service.and.honor.code": "Termini e Condizioni del Servizio",
   "privacy.policy": "Informativa sulla privacy",
   "honor.code": "Codice d'Onore",
   "terms.of.service": "Termini di Servizio",
+  "registration.year.of.birth.label": "Anno di nascita (facoltativo)",
+  "registration.field.gender.options.label": "Genere (facoltativo)",
+  "registration.goals.label": "Dicci perché sei interessato a edX (facoltativo)",
+  "registration.field.gender.options.f": "Femmina",
+  "registration.field.gender.options.m": "Maschio",
+  "registration.field.gender.options.o": "Altro/Preferisco non dire",
+  "registration.field.education.levels.label": "Livello di istruzione più elevato raggiunto (opzionale) ",
+  "registration.field.education.levels.p": "Dottorato",
+  "registration.field.education.levels.m": "Laurea magistrale o titolo accademico professionale",
+  "registration.field.education.levels.b": "Laurea di primo livello ",
+  "registration.field.education.levels.a": "Diploma Professionale",
+  "registration.field.education.levels.hs": "Scuola Superiore/Liceo",
+  "registration.field.education.levels.jhs": "Scuola Media",
+  "registration.field.education.levels.el": "Scuola Primaria/Elementare",
+  "registration.field.education.levels.none": "Nessun livello educativo formale",
+  "registration.field.education.levels.other": "Altro tipo di formazione",
   "registration.username.suggestion.label": "Suggerito:",
+  "registration.using.tpa.form.heading": "Completa la creazione del tuo account",
   "did.you.mean.alert.text": "Intendevi",
-  "register.page.terms.of.service.and.honor.code": "Creando un account, accetti il {tosAndHonorCode} e riconosci che {platformName} e ciascun Membro trattano i tuoi dati personali in conformità con l' {privacyPolicy}.",
-  "register.page.honor.code": "Accetto {platformName} {tosAndHonorCode}",
-  "register.page.terms.of.service": "Accetto {platformName} {termsOfService}",
+  "register.page.terms.of.service": "Accetto il {platformName} {termsOfService}",
   "sign.in": "Accedi",
   "reset.password.page.title": "Ripristina password | {siteName}",
   "reset.password": "Resetta la password",
@@ -159,10 +192,40 @@
   "confirm.password.label": "Conferma password",
   "passwords.do.not.match": "le passwords non corrispondono",
   "confirm.your.password": "Conferma la tua password",
+  "forgot.password.confirmation.sign.in.link": "accedi",
+  "reset.password.request.forgot.password.text": "Dimenticato la password",
+  "reset.password.request.invalid.token.header": "Link di ripristino della password non valido",
+  "reset.password.empty.new.password.field.error": "Immetti la nuova password.",
   "reset.password.failure.heading": "Impossibile ripristinare la tua password.",
   "reset.password.form.submission.error": "Controlla le tue risposte e riprova.",
+  "reset.password.request.server.error": "Ripristino della password non riuscito",
+  "reset.password.token.validation.sever.error": "Errore di convalida del token",
   "reset.server.rate.limit.error": "Troppe richieste.",
   "reset.password.success.heading": "Ripristino della password completato.",
   "reset.password.success": "La tua password è stata resettata. Accedi al tuo account.",
-  "rate.limit.error": "Si è verificato un errore dovuto alle troppe richieste. Prova di nuovo più tardi."
+  "progressive.profiling.page.title": "Campi facoltativi | {siteName}",
+  "progressive.profiling.page.heading": "Alcune domande per te ci aiuteranno a diventare più intelligenti.",
+  "gender.options.label": "Genere (facoltativo)",
+  "gender.options.f": "Femmina",
+  "gender.options.m": "Maschio",
+  "gender.options.o": "Altro/Preferisco non dire",
+  "education.levels.label": "Livello di istruzione più elevato raggiunto (opzionale) ",
+  "education.levels.p": "Dottorato",
+  "education.levels.m": "Laurea magistrale o titolo accademico professionale",
+  "education.levels.b": "Laurea di primo livello ",
+  "education.levels.a": "Diploma Professionale",
+  "education.levels.hs": "Scuola Superiore/Liceo",
+  "education.levels.jhs": "Scuola Media",
+  "education.levels.el": "Scuola Primaria/Elementare",
+  "education.levels.none": "Nessun livello educativo formale",
+  "education.levels.other": "Altro livello educativo",
+  "year.of.birth.label": "Anno di nascita (facoltativo)",
+  "optional.fields.information.link": "Ulteriori informazioni su come utilizziamo queste informazioni.",
+  "optional.fields.submit.button": "Invia",
+  "optional.fields.skip.button": "Salta per ora",
+  "continue.to.platform": "Continua con {platformName}",
+  "modal.title": "Grazie per averci fatto sapere.",
+  "modal.description": "Puoi completare il tuo profilo nelle impostazioni in qualsiasi momento se cambi idea.",
+  "welcome.page.error.heading": "Impossibile aggiornare il tuo profilo",
+  "welcome.page.error.message": "Si è verificato un errore. Puoi completare il tuo profilo nelle impostazioni in qualsiasi momento."
 }

src/i18n/messages/pt.json

@@ -1,168 +0,0 @@
-{
-  "start.learning": "Start learning",
-  "with.site.name": "with {siteName}",
-  "complete.your.profile.1": "Complete",
-  "complete.your.profile.2": "your profile",
-  "welcome.to.platform": "Welcome to {siteName}, {username}!",
-  "institution.login.page.sub.heading": "Choose your institution from the list below",
-  "logistration.sign.in": "Sign in",
-  "logistration.register": "Register",
-  "enterprisetpa.title.heading": "Would you like to sign in using your {providerName} credentials?",
-  "enterprisetpa.login.button.text": "Show me other ways to sign in or register",
-  "enterprisetpa.login.button.text.public.account.creation.disabled": "Show me other ways to sign in",
-  "sso.sign.in.with": "Sign in with {providerName}",
-  "sso.create.account.using": "Create account using {providerName}",
-  "show.password": "Show password",
-  "hide.password": "Hide password",
-  "one.letter": "1 letter",
-  "one.number": "1 number",
-  "eight.characters": "8 characters",
-  "password.sr.only.helping.text": "Password must contain at least 8 characters, at least one letter, and at least one number",
-  "tpa.alert.heading": "Almost done!",
-  "login.third.party.auth.account.not.linked": "You have successfully signed into {currentProvider}, but your {currentProvider} account does not have a linked {platformName} account. To link your accounts, sign in now using your {platformName} password.",
-  "register.third.party.auth.account.not.linked": "You've successfully signed into {currentProvider}! We just need a little more information before you start learning with {platformName}.",
-  "registration.using.tpa.form.heading": "Finish creating your account",
-  "zendesk.supportTitle": "edX Support",
-  "zendesk.selectTicketForm": "Please choose your request type:",
-  "error.notfound.message": "The page you're looking for is unavailable or there's an error in the URL. Please check the URL and try again.",
-  "forgot.password.confirmation.message": "We sent an email to {email} with instructions to reset your password.\n          If you do not receive a password reset message after 1 minute, verify that you entered\n          the correct email address, or check your spam folder. If you need further assistance, {supportLink}.",
-  "forgot.password.page.title": "Forgot Password | {siteName}",
-  "forgot.password.page.heading": "Reset password",
-  "forgot.password.page.instructions": "Please enter your email address below and we will send you an email with instructions on how to reset your password.",
-  "forgot.password.page.invalid.email.message": "Enter a valid email address",
-  "forgot.password.page.email.field.label": "Email",
-  "forgot.password.page.submit.button": "Submit",
-  "forgot.password.error.alert.title.": "We were unable to contact you.",
-  "forgot.password.error.message.title": "An error occurred.",
-  "forgot.password.request.in.progress.message": "Your previous request is in progress, please try again in a few moments.",
-  "forgot.password.empty.email.field.error": "Enter your email",
-  "forgot.password.email.help.text": "The email address you used to register with {platformName}",
-  "confirmation.message.title": "Check your email",
-  "confirmation.support.link": "contact technical support",
-  "need.help.sign.in.text": "Need help signing in?",
-  "additional.help.text": "For additional help, contact {platformName} support at ",
-  "sign.in.text": "Sign in",
-  "extend.field.errors": "{emailError} below.",
-  "invalid.token.heading": "Invalid password reset link",
-  "invalid.token.error.message": "This password reset link is invalid. It may have been used already. Enter your email below to receive a new link.",
-  "token.validation.rate.limit.error.heading": "Too many requests",
-  "token.validation.rate.limit.error": "An error has occurred because of too many requests. Please try again after some time.",
-  "token.validation.internal.sever.error.heading": "Token validation failure",
-  "token.validation.internal.sever.error": "An error has occurred. Try refreshing the page, or check your internet connection.",
-  "internal.server.error": "An error has occurred. Try refreshing the page, or check your internet connection.",
-  "account.activation.error.message": "Something went wrong, please {supportLink} to resolve this issue.",
-  "login.inactive.user.error": "In order to sign in, you need to activate your account.{lineBreak}\n            {lineBreak}We just sent an activation link to {email}. If you do not receive an email,\n            check your spam folders or {supportLink}.",
-  "allowed.domain.login.error": "As {allowedDomain} user, You must login with your {allowedDomain} {tpaLink}.",
-  "login.incorrect.credentials.error.attempts.text.1": "The username, email or password you entered is incorrect. You have {remainingAttempts} more sign in\n                attempts before your account is temporarily locked.",
-  "login.incorrect.credentials.error.attempts.text.2": "If you've forgotten your password, {resetLink}",
-  "account.locked.out.message.2": "To be on the safe side, you can {resetLink} before trying again.",
-  "login.incorrect.credentials.error.with.reset.link": "The username, email, or password you entered is incorrect. Please try again or {resetLink}.",
-  "login.page.title": "Login | {siteName}",
-  "login.user.identity.label": "Username or email",
-  "login.password.label": "Password",
-  "sign.in.button": "Sign in",
-  "forgot.password": "Forgot password",
-  "institution.login.button": "Institution/campus credentials",
-  "institution.login.page.title": "Sign in with institution/campus credentials",
-  "login.other.options.heading": "Or sign in with:",
-  "non.compliant.password.title": "We recently changed our password requirements",
-  "non.compliant.password.message": "Your current password does not meet the new security requirements. We just sent a password-reset message to the email address associated with this account. Thank you for helping us keep your data safe.",
-  "account.locked.out.message.1": "To protect your account, it's been temporarily locked. Try again in 30 minutes.",
-  "enterprise.login.btn.text": "Company or school credentials",
-  "username.or.email.format.validation.less.chars.message": "Username or email must have at least 3 characters.",
-  "email.validation.message": "Enter your username or email",
-  "password.validation.message": "Password criteria has not been met",
-  "account.activation.success.message.title": "Success! You have activated your account.",
-  "account.activation.success.message": "You will now receive email updates and alerts from us related to the courses you are enrolled in. Sign in to continue.",
-  "account.activation.info.message": "This account has already been activated.",
-  "account.activation.error.message.title": "Your account could not be activated",
-  "account.activation.support.link": "contact support",
-  "account.confirmation.success.message.title": "Success! You have confirmed your email.",
-  "account.confirmation.success.message": "Sign in to continue.",
-  "account.confirmation.info.message": "This email has already been confirmed.",
-  "account.confirmation.error.message.title": "Your email could not be confirmed",
-  "tpa.account.link": "{provider} account",
-  "internal.server.error.message": "An error has occurred. Try refreshing the page, or check your internet connection.",
-  "login.rate.limit.reached.message": "Too many failed login attempts. Try again later.",
-  "login.failure.header.title": "We couldn't sign you in.",
-  "contact.support.link": "contact {platformName} support",
-  "login.incorrect.credentials.error": "The username, email, or password you entered is incorrect. Please try again.",
-  "login.form.invalid.error.message": "Please fill in the fields below.",
-  "login.incorrect.credentials.error.reset.link.text": "reset your password",
-  "login.incorrect.credentials.error.before.account.blocked.text": "click here to reset it.",
-  "password.security.nudge.title": "Password security",
-  "password.security.block.title": "Password change required",
-  "password.security.nudge.body": "Our system detected that your password is vulnerable. We recommend you change it so that your account stays secure.",
-  "password.security.block.body": "Our system detected that your password is vulnerable. Change your password so that your account stays secure.",
-  "password.security.close.button": "Close",
-  "password.security.redirect.to.reset.password.button": "Reset your password",
-  "login.tpa.authentication.failure": "We are sorry, you are not authorized to access {platform_name} via this channel. Please contact your learning administrator or manager in order to access {platform_name}.{lineBreak}{lineBreak}Error Details:{lineBreak}{errorMessage}",
-  "progressive.profiling.page.title": "Welcome | {siteName}",
-  "progressive.profiling.page.heading": "A few questions for you will help us get smarter.",
-  "optional.fields.information.link": "Learn more about how we use this information.",
-  "optional.fields.submit.button": "Submit",
-  "optional.fields.skip.button": "Skip for now",
-  "optional.fields.next.button": "Next",
-  "continue.to.platform": "Continue to {platformName}",
-  "modal.title": "Thanks for letting us know.",
-  "modal.description": "You can complete your profile in settings at any time if you change your mind.",
-  "welcome.page.error.heading": "We couldn't update your profile",
-  "welcome.page.error.message": "An error occurred. You can complete your profile in settings at any time.",
-  "recommendation.page.title": "Recommendations | {siteName}",
-  "recommendation.page.heading": "We have a few recommendations to get you started.",
-  "recommendation.skip.button": "Skip for now",
-  "register.page.title": "Register | {siteName}",
-  "registration.fullname.label": "Full name",
-  "registration.email.label": "Email",
-  "registration.username.label": "Public username",
-  "registration.password.label": "Password",
-  "registration.country.label": "Country/Region",
-  "registration.opt.in.label": "I agree that {siteName} may send me marketing messages.",
-  "help.text.name": "This name will be used by any certificates that you earn.",
-  "help.text.username.1": "The name that will identify you in your courses.",
-  "help.text.username.2": "This can not be changed later.",
-  "help.text.email": "For account activation and important updates",
-  "create.account.for.free.button": "Create an account for free",
-  "registration.other.options.heading": "Or register with:",
-  "register.institution.login.button": "Institution/campus credentials",
-  "register.institution.login.page.title": "Register with institution/campus credentials",
-  "empty.name.field.error": "Enter your full name",
-  "empty.email.field.error": "Enter your email",
-  "empty.username.field.error": "Username must be between 2 and 30 characters",
-  "empty.password.field.error": "Password criteria has not been met",
-  "empty.country.field.error": "Select your country or region of residence",
-  "email.do.not.match": "The email addresses do not match.",
-  "email.invalid.format.error": "Enter a valid email address",
-  "username.validation.message": "Username must be between 2 and 30 characters",
-  "name.validation.message": "Enter a valid name",
-  "username.format.validation.message": "Usernames can only contain letters (A-Z, a-z), numerals (0-9), underscores (_), and hyphens (-). Usernames cannot contain spaces",
-  "registration.request.failure.header": "We couldn't create your account.",
-  "registration.empty.form.submission.error": "Please check your responses and try again.",
-  "registration.request.server.error": "An error has occurred. Try refreshing the page, or check your internet connection.",
-  "registration.rate.limit.error": "Too many failed registration attempts. Try again later.",
-  "registration.tpa.session.expired": "Registration using {provider} has timed out.",
-  "registration.tpa.authentication.failure": "We are sorry, you are not authorized to access {platform_name} via this channel. Please contact your learning administrator or manager in order to access {platform_name}.{lineBreak}{lineBreak}Error Details:{lineBreak}{errorMessage}",
-  "terms.of.service.and.honor.code": "Terms of Service and Honor Code",
-  "privacy.policy": "Privacy Policy",
-  "honor.code": "Honor Code",
-  "terms.of.service": "Terms of Service",
-  "registration.username.suggestion.label": "Suggested:",
-  "did.you.mean.alert.text": "Did you mean",
-  "register.page.terms.of.service.and.honor.code": "By creating an account, you agree to the {tosAndHonorCode} and you acknowledge that {platformName} and each\n                Member process your personal data in accordance with the {privacyPolicy}.",
-  "register.page.honor.code": "I agree to the {platformName} {tosAndHonorCode}",
-  "register.page.terms.of.service": "I agree to the {platformName} {termsOfService}",
-  "sign.in": "Sign in",
-  "reset.password.page.title": "Reset Password | {siteName}",
-  "reset.password": "Reset password",
-  "reset.password.page.instructions": "Enter and confirm your new password.",
-  "new.password.label": "New password",
-  "confirm.password.label": "Confirm password",
-  "passwords.do.not.match": "Passwords do not match",
-  "confirm.your.password": "Confirm your password",
-  "reset.password.failure.heading": "We couldn't reset your password.",
-  "reset.password.form.submission.error": "Please check your responses and try again.",
-  "reset.server.rate.limit.error": "Too many requests.",
-  "reset.password.success.heading": "Password reset complete.",
-  "reset.password.success": "Your password has been reset. Sign in to your account.",
-  "rate.limit.error": "An error has occurred because of too many requests. Please try again after some time."
-}

src/i18n/messages/pt_PT.json

@@ -1,168 +1,231 @@
 {
   "start.learning": "Começar a aprender",
-  "with.site.name": "com {siteName}",
+  "with.site.name": "with {siteName}",
   "complete.your.profile.1": "Concluído",
   "complete.your.profile.2": "o seu perfil",
   "welcome.to.platform": "Bem vindo a {siteName}, {username}!",
-  "institution.login.page.sub.heading": "Escolha a sua instituição a partir da lista abaixo",
+  "institution.login.page.sub.heading": "Choose your institution from the list below",
+  "forgot.password.confirmation.title": "Verifique o seu email",
+  "forgot.password.confirmation.support.link": "contacto o suporte técnico",
+  "forgot.password.confirmation.info": "Se não receber uma mensagem para alterar a palavra-passe após 1 minuto, verifique se introduziu o endereço de correio electrónico correcto, ou verifique a sua pasta de spam.",
   "logistration.sign.in": "Iniciar sessão",
   "logistration.register": "Registe-se",
+  "internal.server.error.message": "Ocorreu um erro. Tente actualizar a página, ou verifique a sua ligação à Internet.",
+  "server.ratelimit.error.message": "Ocorreu um erro devido a demasiados pedidos. Por favor, tente novamente após algum tempo.",
   "enterprisetpa.title.heading": "Gostaria de iniciar sessão usando as suas {providerName} credenciais?",
+  "enterprisetpa.sso.button.title": "Inicie a sessão utilizando {providerName}",
   "enterprisetpa.login.button.text": "Mostre-me outras formas de iniciar sessão ou registar-se",
-  "enterprisetpa.login.button.text.public.account.creation.disabled": "Mostre-me outras formas de iniciar sessão",
   "sso.sign.in.with": "Inicie sessão com {providerName}",
   "sso.create.account.using": "Criar conta usando {providerName}",
-  "show.password": "Mostrar palavra-passe",
-  "hide.password": "Ocultar palavra-passe",
-  "one.letter": "1 letra",
-  "one.number": "1 número",
-  "eight.characters": "8 caracteres",
-  "password.sr.only.helping.text": "A palavra-passe deve conter pelo menos 8 carateres, pelo menos uma letra, e pelo menos um número",
-  "tpa.alert.heading": "Quase pronto!",
+  "show.password": "Show password",
+  "hide.password": "Hide password",
+  "one.letter": "1 letter",
+  "one.number": "1 number",
+  "eight.characters": "8 characters",
+  "password.sr.only.helping.text": "Password must contain at least 8 characters, at least one letter, and at least one number",
+  "tpa.alert.heading": "Almost done!",
   "login.third.party.auth.account.not.linked": "Iniciou sessão com sucesso em {currentProvider}, mas a sua conta {currentProvider} não está vinculada a uma conta {platformName}. Para vincular as suas contas, inicie sessão através da sua palavra-passe em {platformName}.",
-  "register.third.party.auth.account.not.linked": "Entrou com sucesso em {currentProvider}! Só precisamos de um pouco mais de informação antes de começar a aprender com {platformName}.",
-  "registration.using.tpa.form.heading": "Acabe de criar a sua conta",
-  "zendesk.supportTitle": "Apoio edX",
-  "zendesk.selectTicketForm": "Por favor, escolha o seu tipo de pedido:",
+  "register.third.party.auth.account.not.linked": "You've successfully signed into {currentProvider}! We just need a little more information before you start learning with {platformName}.",
   "error.notfound.message": "A página que procura não está disponível ou há um erro no URL. Por favor, verifique o URL e tente novamente.",
-  "forgot.password.confirmation.message": "Enviámos um email para {email} com instruções para redefinir a sua palavra-passe.\n          Se não receber uma mensagem de redefinição de palavra-passe após 1 minuto, verifique se introduziu\n          o endereço de correio electrónico correto, ou verifique a sua pasta de spam. Se precisar de mais assistência, {supportLink}.",
+  "forgot.password.confirmation.message": "We sent an email to {email} with instructions to reset your password.\n          If you do not receive a password reset message after 1 minute, verify that you entered\n          the correct email address, or check your spam folder. If you need further assistance, {supportLink}.",
   "forgot.password.page.title": "Esqueceu a Senha | {siteName}",
-  "forgot.password.page.heading": "Redefinir palavra-passe",
-  "forgot.password.page.instructions": "Por favor introduza o seu endereço de email abaixo e enviar-lhe-emos um email com instruções sobre como redefinir a sua palavra-passe.",
+  "forgot.password.page.heading": "Reset password",
+  "forgot.password.page.instructions": "Please enter your email address below and we will send you an email with instructions on how to reset your password.",
   "forgot.password.page.invalid.email.message": "Introduzir um endereço de correio electrónico válido",
   "forgot.password.page.email.field.label": "Email",
   "forgot.password.page.submit.button": "Submeter",
-  "forgot.password.error.alert.title.": "Não nos foi possível contactá-lo.",
+  "forgot.password.error.alert.title.": "We were unable to contact you.",
   "forgot.password.error.message.title": "Ocorreu um erro.",
   "forgot.password.request.in.progress.message": "O seu pedido anterior está a ser processado, por favor tente novamente dentro de momentos.",
-  "forgot.password.empty.email.field.error": "Digite o seu email",
+  "forgot.password.empty.email.field.error": "Enter your email",
+  "forgot.password.invalid.email.message": "O endereço de email fornecido não está formatado correctamente.",
   "forgot.password.email.help.text": "O endereço de e-mail que usou para se registar em {platformName}",
   "confirmation.message.title": "Verifique o seu email",
-  "confirmation.support.link": "contacto o suporte técnico",
-  "need.help.sign.in.text": "Precisa de ajuda para entrar?",
-  "additional.help.text": "Para ajuda adicional, contacte o apoio {platformName} em",
-  "sign.in.text": "Iniciar sessão",
-  "extend.field.errors": "{emailError} abaixo.",
-  "invalid.token.heading": "Link para Redefinir Palavra-passe inválido",
-  "invalid.token.error.message": "Este link de redefinição de palavra-passe é inválido. Pode já ter sido utilizada. Introduza o seu email abaixo para receber um novo link.",
-  "token.validation.rate.limit.error.heading": "Demasiados pedidos",
-  "token.validation.rate.limit.error": "Ocorreu um erro devido a demasiados pedidos. Por favor, tente novamente após algum tempo.",
-  "token.validation.internal.sever.error.heading": "Falha na validação do Token",
-  "token.validation.internal.sever.error": "Ocorreu um erro. Tente actualizar a página, ou verifique a sua ligação à Internet.",
-  "internal.server.error": "Ocorreu um erro. Tente actualizar a página, ou verifique a sua ligação à Internet.",
+  "confirmation.support.link": "contact technical support",
+  "need.help.sign.in.text": "Need help signing in?",
+  "additional.help.text": "For additional help, contact {platformName} support at ",
+  "sign.in.text": "Sign in",
+  "extend.field.errors": "{emailError} below.",
+  "invalid.token.heading": "Invalid password reset link",
+  "invalid.token.error.message": "This password reset link is invalid. It may have been used already. Enter your email below to receive a new link.",
+  "token.validation.rate.limit.error.heading": "Too many requests",
+  "token.validation.rate.limit.error": "An error has occurred because of too many requests. Please try again after some time.",
+  "token.validation.internal.sever.error.heading": "Token validation failure",
+  "token.validation.internal.sever.error": "An error has occurred. Try refreshing the page, or check your internet connection.",
+  "internal.server.error": "An error has occurred. Try refreshing the page, or check your internet connection.",
+  "rate.limit.error": "An error has occurred because of too many requests. Please try again after some time.",
   "account.activation.error.message": "Alguma coisa correu mal, siga {supportLink} para resolver esta questão.",
   "login.inactive.user.error": "Para iniciar sessão, precisa ativar a sua conta. {lineBreak}\n            {lineBreak} Acabámos de enviar um link de ativação para {email}. Se não receber um e-mail,\n            verifique as suas pastas de spam ou {supportLink}.",
-  "allowed.domain.login.error": "Como utilizador do {allowedDomain}, deve iniciar sessão com o seu {allowedDomain} {tpaLink}.",
-  "login.incorrect.credentials.error.attempts.text.1": "O nome de utilizador, email ou palavra-passe que introduziu está incorreto. Tem {remainingAttempts} mais tentativas\n                de login antes da sua conta ser temporariamente bloqueada.",
-  "login.incorrect.credentials.error.attempts.text.2": "Se esqueceu a sua palavra-passe, {resetLink}",
-  "account.locked.out.message.2": "Por precaução, pode {resetLink} antes de tentar novamente.",
-  "login.incorrect.credentials.error.with.reset.link": "O nome de utilizador, email ou senha que introduziu está incorreto. Por favor, tente novamente ou {resetLink}.",
+  "allowed.domain.login.error": "As {allowedDomain} user, You must login with your {allowedDomain} {tpaLink}.",
+  "login.incorrect.credentials.error.attempts.text.1": "The username, email or password you entered is incorrect. You have {remainingAttempts} more sign in\n                attempts before your account is temporarily locked.",
+  "login.incorrect.credentials.error.attempts.text.2": "If you've forgotten your password, {resetLink}",
+  "account.locked.out.message.2": "To be on the safe side, you can {resetLink} before trying again.",
+  "login.incorrect.credentials.error.with.reset.link": "The username, email, or password you entered is incorrect. Please try again or {resetLink}.",
   "login.page.title": "Iniciar sessão | {siteName}",
-  "login.user.identity.label": "Nome de utilizador ou e-mail",
-  "login.password.label": "Palavra-passe",
+  "login.user.identity.label": "Username or email",
+  "login.password.label": "Password",
   "sign.in.button": "Iniciar Sessão",
-  "forgot.password": "Esqueci-me da palavra-passe",
-  "institution.login.button": "Credenciais da instituição/campus",
+  "sign.in.btn.pending.state": "Loading",
+  "need.help.signing.in.collapsible.menu": "Precisa de ajuda para entrar?",
+  "forgot.password.link": "Esqueci-me da minha palavra-passe",
+  "forgot.password": "Forgot password",
+  "other.sign.in.issues": "Outros problemas de inicio de sessão",
+  "need.other.help.signing.in.collapsible.menu": "Precisa de outra ajuda para entrar?",
+  "institution.login.button": "Institution/campus credentials",
   "institution.login.page.title": "Inicie sessão com credenciais de instituição/campus",
-  "login.other.options.heading": "Ou faça login com:",
+  "institution.login.page.back.button": "Voltar para iniciar sessão",
+  "create.an.account": "Criar uma conta",
+  "login.other.options.heading": "Or sign in with:",
   "non.compliant.password.title": "Recentemente mudámos os nossos requisitos de palavra-passe",
-  "non.compliant.password.message": "A sua palavra-passe atual não satisfaz os novos requisitos de segurança. Acabámos de enviar uma mensagem de redefinição da palavra-passe para o endereço de email associado a esta conta. Obrigado por nos ajudar a manter os seus dados em segurança.",
-  "account.locked.out.message.1": "Para proteger sua conta, esta foi temporariamente bloqueada. Tente novamente dentro de 30 minutos.",
-  "enterprise.login.btn.text": "Credenciais da empresa ou escola",
-  "username.or.email.format.validation.less.chars.message": "O nome de utilizador ou email deve ter pelo menos 3 carateres.",
-  "email.validation.message": "Insira o seu nome de utilizador ou email",
-  "password.validation.message": "Os critérios de palavra-passe não foram cumpridos",
+  "non.compliant.password.message": "Your current password does not meet the new security requirements. We just sent a password-reset message to the email address associated with this account. Thank you for helping us keep your data safe.",
+  "account.locked.out.message.1": "To protect your account, it's been temporarily locked. Try again in 30 minutes.",
+  "first.time.here": "Está a entrar pela primeira vez?",
+  "email.help.message": "O endereço de e-mail que usou para se registrar no edX.",
+  "enterprise.login.btn.text": "Company or school credentials",
+  "email.format.validation.message": "O endereço de e-mail fornecido não está formatado correctamente.",
+  "username.or.email.format.validation.less.chars.message": "Username or email must have at least 3 characters.",
+  "email.validation.message": "Enter your username or email",
+  "password.validation.message": "Password criteria has not been met",
+  "register.link": "Criar uma conta",
+  "sign.in.heading": "Iniciar Sessão",
   "account.activation.success.message.title": "Sucesso! Você ativou a sua conta.",
   "account.activation.success.message": "Receberá agora actualizações por e-mail e alertas nossos relacionados com os cursos em que está inscrito. Inicie a sessão para continuar.",
-  "account.activation.info.message": "Esta conta já foi ativada.",
+  "account.activation.info.message": "This account has already been activated.",
   "account.activation.error.message.title": "A sua conta não pôde ser ativada",
   "account.activation.support.link": "contato de suporte",
-  "account.confirmation.success.message.title": "Sucesso! Confirmou o seu email.",
-  "account.confirmation.success.message": "Inicie sessão para continuar.",
-  "account.confirmation.info.message": "Este email já foi confirmado.",
-  "account.confirmation.error.message.title": "Não foi possível confirmar o seu email",
-  "tpa.account.link": "Conta {provider}",
-  "internal.server.error.message": "Ocorreu um erro. Tente actualizar a página, ou verifique a sua ligação à Internet.",
+  "tpa.account.link": "{provider} account",
+  "account.confirmation.success.message.title": "Success! You have confirmed your email.",
+  "account.confirmation.success.message": "Sign in to continue.",
+  "account.confirmation.info.message": "This email has already been confirmed.",
+  "account.confirmation.error.message.title": "Your email could not be confirmed",
   "login.rate.limit.reached.message": "Muitas tentativas de login sem sucesso. Tente novamente mais tarde.",
   "login.failure.header.title": "O seu acesso não foi possível.",
   "contact.support.link": "contactar o suporte {platformName}",
-  "login.incorrect.credentials.error": "O nome de utilizador, email, ou palavra-passe que introduziu está incorreto. Por favor, tente novamente.",
-  "login.form.invalid.error.message": "Por favor, preencha os campos abaixo.",
-  "login.incorrect.credentials.error.reset.link.text": "redefinir a sua palavra-passe",
-  "login.incorrect.credentials.error.before.account.blocked.text": "clique aqui para a redefinir.",
-  "password.security.nudge.title": "Segurança da palavra-passe",
-  "password.security.block.title": "Alteração de palavra-passe necessária",
-  "password.security.nudge.body": "O nosso sistema detectou que a sua palavra-passe é vulnerável. Recomendamos que a altere para que a sua conta permaneça segura.",
-  "password.security.block.body": "O nosso sistema detectou que a sua palavra-passe é vulnerável. Altere a sua palavra-passe para que a sua conta permaneça segura.",
-  "password.security.close.button": "Fechar",
-  "password.security.redirect.to.reset.password.button": "Redefinir a sua palavra-passe",
-  "login.tpa.authentication.failure": "Lamentamos, mas não tem autorização para aceder à plataforma {platform_name} através deste canal. Pedimos-lhe que entre em contacto com o administrador ou gestor do curso para aceder à plataforma {platform_name}. {line_break}{line_break}Detalhes do erro: {line_break}{error_message}",
-  "progressive.profiling.page.title": "Welcome | {siteName}",
-  "progressive.profiling.page.heading": "Algumas perguntas para si vão ajudar a tornar-nos mais espertos.",
-  "optional.fields.information.link": "Saiba mais sobre a forma como utilizamos esta informação.",
-  "optional.fields.submit.button": "Submeter",
-  "optional.fields.skip.button": "Saltar por enquanto",
-  "optional.fields.next.button": "Seguinte",
-  "continue.to.platform": "Continue para {platformName}",
-  "modal.title": "Obrigado por nos informar.",
-  "modal.description": "Pode completar o seu perfil nas configurações em qualquer altura se mudar de ideias.",
-  "welcome.page.error.heading": "Não foi possível atualizar o seu perfil",
-  "welcome.page.error.message": "Ocorreu um erro. Pode completar o seu perfil nas configurações em qualquer altura.",
-  "recommendation.page.title": "Recomendações | {siteName}",
-  "recommendation.page.heading": "Temos algumas recomendações para o ajudar a começar.",
-  "recommendation.skip.button": "Saltar por enquanto",
+  "login.incorrect.credentials.error": "The username, email, or password you entered is incorrect. Please try again.",
+  "login.failed.attempt.error": "Tem mais {remainingAttempts} tentativas de inicio sessão antes que a sua conta seja temporariamente bloqueada.",
+  "login.locked.out.error.message": "Para proteger a sua conta, esta foi temporariamente bloqueada. Tente novamente em {lockedOutPeriod} minutos.",
+  "login.form.invalid.error.message": "Please fill in the fields below.",
+  "login.incorrect.credentials.error.reset.link.text": "reset your password",
+  "login.incorrect.credentials.error.before.account.blocked.text": "click here to reset it.",
+  "password.security.nudge.title": "Password security",
+  "password.security.block.title": "Password change required",
+  "password.security.nudge.body": "Our system detected that your password is vulnerable. We recommend you change it so that your account stays secure.",
+  "password.security.block.body": "Our system detected that your password is vulnerable. Change your password so that your account stays secure.",
+  "password.security.close.button": "Close",
+  "password.security.redirect.to.reset.password.button": "Reset your password",
+  "progressive.profiling.page.title": "Optional Fields | {siteName}",
+  "progressive.profiling.page.heading": "A few questions for you will help us get smarter.",
+  "optional.fields.information.link": "Learn more about how we use this information.",
+  "optional.fields.submit.button": "Submit",
+  "optional.fields.skip.button": "Skip for now",
+  "optional.fields.next.button": "Next",
+  "continue.to.platform": "Continue to {platformName}",
+  "modal.title": "Thanks for letting us know.",
+  "modal.description": "You can complete your profile in settings at any time if you change your mind.",
+  "welcome.page.error.heading": "We couldn't update your profile",
+  "welcome.page.error.message": "An error occurred. You can complete your profile in settings at any time.",
+  "recommendation.page.title": "Recommendations| {siteName}",
+  "recommendation.page.heading": "We have a few recommendations to get you started.",
+  "recommendation.skip.button": "Skip for now",
   "register.page.title": "Registar | {siteName}",
-  "registration.fullname.label": "Nome completo",
-  "registration.email.label": "E-mail",
-  "registration.username.label": "Nome de utilizador público",
-  "registration.password.label": "Palavra-passe",
-  "registration.country.label": "País/Região",
-  "registration.opt.in.label": "Concordo que {siteName} pode enviar-me mensagens de marketing.",
-  "help.text.name": "Este nome será usado por quaisquer certificados que conseguir obter.",
-  "help.text.username.1": "O nome que o irá identificar nos seus cursos.",
-  "help.text.username.2": "Isto não pode ser alterado mais tarde.",
-  "help.text.email": "Para ativação de contas e atualizações importantes",
-  "create.account.for.free.button": "Criar uma conta gratuitamente",
-  "registration.other.options.heading": "Ou registe-se com:",
-  "register.institution.login.button": "Credenciais da instituição/campus",
+  "registration.fullname.label": "Full name",
+  "registration.email.label": "Email",
+  "registration.username.label": "Public username",
+  "registration.password.label": "Password",
+  "registration.country.label": "Country/Region",
+  "registration.opt.in.label": "I agree that {siteName} may send me marketing messages.",
+  "help.text.name": "This name will be used by any certificates that you earn.",
+  "help.text.username.1": "The name that will identify you in your courses.",
+  "help.text.username.2": "This can not be changed later.",
+  "help.text.email": "For account activation and important updates",
+  "create.account.for.free.button": "Create an account for free",
+  "create.an.account.btn.pending.state": "Loading",
+  "registration.other.options.heading": "Or register with:",
+  "register.institution.login.button": "Institution/campus credentials",
   "register.institution.login.page.title": "Registo com credenciais da instituição/campus",
-  "empty.name.field.error": "Insira o seu nome completo",
-  "empty.email.field.error": "Insira o seu email",
-  "empty.username.field.error": "O nome de utilizador deve ter entre 2 e 30 carateres",
-  "empty.password.field.error": "Os critérios de palavra-passe não foram cumpridos",
-  "empty.country.field.error": "Selecione o seu país ou região de residência",
-  "email.do.not.match": "Os endereços de email não correspondem.",
-  "email.invalid.format.error": "Introduzir um endereço de correio electrónico válido",
-  "username.validation.message": "O nome de utilizador deve ter entre 2 e 30 carateres",
-  "name.validation.message": "Introduza um nome válido",
-  "username.format.validation.message": "Os nomes de utilizador só podem conter letras (A-Z, a-z), numerais (0-9), sublinhados (_), e hífenes (-). Os nomes de utilizador não podem conter espaços",
+  "empty.name.field.error": "Enter your full name",
+  "empty.email.field.error": "Enter your email",
+  "email.do.not.match": "The email addresses do not match.",
+  "empty.username.field.error": "Username must be between 2 and 30 characters",
+  "empty.password.field.error": "Password criteria has not been met",
+  "empty.country.field.error": "Select your country or region of residence",
+  "email.invalid.format.error": "Enter a valid email address",
+  "email.ratelimit.less.chars.validation.message": "O e-mail deve ter 3 carateres.",
+  "username.validation.message": "Username must be between 2 and 30 characters",
+  "name.validation.message": "Enter a valid name",
+  "username.format.validation.message": "Usernames can only contain letters (A-Z, a-z), numerals (0-9), underscores (_), and hyphens (-). Usernames cannot contain spaces",
+  "support.education.research": "Apoie a pesquisa em educação fornecendo informações adicionais. (Opcional)",
   "registration.request.failure.header": "Não foi possível criar a sua conta.",
-  "registration.empty.form.submission.error": "Verifique as suas respostas e tente novamente.",
+  "registration.empty.form.submission.error": "Please check your responses and try again.",
   "registration.request.server.error": "Ocorreu um erro. Tente actualizar a página, ou verifique a sua ligação à Internet.",
-  "registration.rate.limit.error": "Demasiadas tentativas de registo falhadas. Tente novamente mais tarde.",
-  "registration.tpa.session.expired": "O tempo para registo utilizando {provider} expirou.",
-  "registration.tpa.authentication.failure": "Lamentamos, mas não tem autorização para aceder à plataforma {platform_name} através deste canal. Pedimos-lhe que entre em contacto com o administrador ou gestor do curso para aceder à plataforma {platform_name}. {line_break}{line_break}Detalhes do erro: {line_break}{error_message}",
+  "registration.rate.limit.error": "Too many failed registration attempts. Try again later.",
+  "registration.tpa.session.expired": "Registration using {provider} has timed out.",
   "terms.of.service.and.honor.code": "Termos de Serviço e Código de Honra",
   "privacy.policy": "Política de Privacidade",
-  "honor.code": "Código de Honra",
-  "terms.of.service": "Termos do Serviço",
-  "registration.username.suggestion.label": "Sugerido:",
-  "did.you.mean.alert.text": "Quis dizer",
-  "register.page.terms.of.service.and.honor.code": "Ao criar uma conta, concorda com o {tosAndHonorCode} e reconhece que {platformName} e cada\n                Membro processa os seus dados pessoais em conformidade com a {privacyPolicy}.",
-  "register.page.honor.code": "Concordo com a {tosAndHonorCode} {platformName}",
-  "register.page.terms.of.service": "Concordo com os {termsOfService} {platformName}",
-  "sign.in": "Iniciar sessão",
+  "honor.code": "Honor Code",
+  "terms.of.service": "Terms of Service",
+  "registration.year.of.birth.label": "Ano de Nascimento (opcional)",
+  "registration.field.gender.options.label": "Género (opcional)",
+  "registration.goals.label": "Diga-nos porque está interessado no edX (opcional)",
+  "registration.field.gender.options.f": "Feminino",
+  "registration.field.gender.options.m": "Masculino",
+  "registration.field.gender.options.o": "Outros/Prefere não dizer",
+  "registration.field.education.levels.label": "Nível mais elevado de escolaridade concluído (opcional)",
+  "registration.field.education.levels.p": "Doutoramento",
+  "registration.field.education.levels.m": "Mestrado ou Grau Profissional",
+  "registration.field.education.levels.b": "Licenciatura",
+  "registration.field.education.levels.a": "Pós-graduação",
+  "registration.field.education.levels.hs": "Secundário",
+  "registration.field.education.levels.jhs": "2ªciclo/3ºciclo",
+  "registration.field.education.levels.el": "Primária",
+  "registration.field.education.levels.none": "Sem estudos",
+  "registration.field.education.levels.other": "Outra educação",
+  "registration.username.suggestion.label": "Suggested:",
+  "registration.using.tpa.form.heading": "Finish creating your account",
+  "did.you.mean.alert.text": "Did you mean",
+  "register.page.terms.of.service": "I agree to the {platformName} {termsOfService}",
+  "sign.in": "Sign in",
   "reset.password.page.title": "Redefinir Palavra-passe | {siteName}",
-  "reset.password": "Redefinir palavra-passe",
+  "reset.password": "Reset password",
   "reset.password.page.instructions": "Insira e confirme a sua nova palavra-passe.",
-  "new.password.label": "Nova palavra-passe",
-  "confirm.password.label": "Confirmar palavra-passe",
-  "passwords.do.not.match": "As palavras-passe não coincidem",
-  "confirm.your.password": "Confirme a sua palavra-passe",
-  "reset.password.failure.heading": "Não conseguimos redefinir sua palavra-passe.",
-  "reset.password.form.submission.error": "Por favor, verifique as suas respostas e tente novamente.",
-  "reset.server.rate.limit.error": "Demasiados pedidos.",
-  "reset.password.success.heading": "Redefinição de palavra-passe concluída",
-  "reset.password.success": "A sua palavra-passe foi redefinida. Inicie sessão na sua conta.",
-  "rate.limit.error": "Ocorreu um erro devido a demasiados pedidos. Por favor, tente novamente após algum tempo."
+  "new.password.label": "New password",
+  "confirm.password.label": "Confirm password",
+  "passwords.do.not.match": "Passwords do not match",
+  "confirm.your.password": "Confirm your password",
+  "forgot.password.confirmation.sign.in.link": "inicie a sessão",
+  "reset.password.request.forgot.password.text": "Esqueci-me da palavra-passe",
+  "reset.password.request.invalid.token.header": "Link para Redefinir Palavra-passe inválido",
+  "reset.password.empty.new.password.field.error": "Por favor, introduza a sua nova palavra-passe.",
+  "reset.password.failure.heading": "We couldn't reset your password.",
+  "reset.password.form.submission.error": "Please check your responses and try again.",
+  "reset.password.request.server.error": "Falha na redefinição da palavra-passe",
+  "reset.password.token.validation.sever.error": "Falha na validação do Token",
+  "reset.server.rate.limit.error": "Too many requests.",
+  "reset.password.success.heading": "Password reset complete.",
+  "reset.password.success": "Your password has been reset. Sign in to your account.",
+  "progressive.profiling.page.title": "Optional Fields | {siteName}",
+  "progressive.profiling.page.heading": "A few questions for you will help us get smarter.",
+  "gender.options.label": "Gender (optional)",
+  "gender.options.f": "Female",
+  "gender.options.m": "Male",
+  "gender.options.o": "Other/Prefer not to say",
+  "education.levels.label": "Highest level of education completed (optional)",
+  "education.levels.p": "Doctorate",
+  "education.levels.m": "Master's or professional degree",
+  "education.levels.b": "Bachelor's degree",
+  "education.levels.a": "Associate's degree",
+  "education.levels.hs": "Secondary/high school",
+  "education.levels.jhs": "Junior secondary/junior high/middle school",
+  "education.levels.el": "Elementary/primary school",
+  "education.levels.none": "No formal education",
+  "education.levels.other": "Other education",
+  "year.of.birth.label": "Year of birth (optional)",
+  "optional.fields.information.link": "Learn more about how we use this information.",
+  "optional.fields.submit.button": "Submit",
+  "optional.fields.skip.button": "Skip for now",
+  "continue.to.platform": "Continue to {platformName}",
+  "modal.title": "Thanks for letting us know.",
+  "modal.description": "You can complete your profile in settings at any time if you change your mind.",
+  "welcome.page.error.heading": "We couldn't update your profile",
+  "welcome.page.error.message": "An error occurred. You can complete your profile in settings at any time."
 }

src/i18n/messages/ru.json

@@ -5,11 +5,16 @@
   "complete.your.profile.2": "your profile",
   "welcome.to.platform": "Welcome to {siteName}, {username}!",
   "institution.login.page.sub.heading": "Choose your institution from the list below",
+  "forgot.password.confirmation.title": "Check your email",
+  "forgot.password.confirmation.support.link": "contact technical support",
+  "forgot.password.confirmation.info": "If you do not receive a password reset message after 1 minute, verify that you entered the correct email address, or check your spam folder.",
   "logistration.sign.in": "Sign in",
   "logistration.register": "Register",
+  "internal.server.error.message": "An error has occurred. Try refreshing the page, or check your internet connection.",
+  "server.ratelimit.error.message": "An error has occurred because of too many requests. Please try again after some time.",
   "enterprisetpa.title.heading": "Would you like to sign in using your {providerName} credentials?",
+  "enterprisetpa.sso.button.title": "Sign in using {providerName}",
   "enterprisetpa.login.button.text": "Show me other ways to sign in or register",
-  "enterprisetpa.login.button.text.public.account.creation.disabled": "Show me other ways to sign in",
   "sso.sign.in.with": "Sign in with {providerName}",
   "sso.create.account.using": "Create account using {providerName}",
   "show.password": "Show password",
@@ -21,9 +26,6 @@
   "tpa.alert.heading": "Almost done!",
   "login.third.party.auth.account.not.linked": "You have successfully signed into {currentProvider}, but your {currentProvider} account does not have a linked {platformName} account. To link your accounts, sign in now using your {platformName} password.",
   "register.third.party.auth.account.not.linked": "You've successfully signed into {currentProvider}! We just need a little more information before you start learning with {platformName}.",
-  "registration.using.tpa.form.heading": "Finish creating your account",
-  "zendesk.supportTitle": "edX Support",
-  "zendesk.selectTicketForm": "Please choose your request type:",
   "error.notfound.message": "The page you're looking for is unavailable or there's an error in the URL. Please check the URL and try again.",
   "forgot.password.confirmation.message": "We sent an email to {email} with instructions to reset your password.\n          If you do not receive a password reset message after 1 minute, verify that you entered\n          the correct email address, or check your spam folder. If you need further assistance, {supportLink}.",
   "forgot.password.page.title": "Forgot Password | {siteName}",
@@ -36,6 +38,7 @@
   "forgot.password.error.message.title": "An error occurred.",
   "forgot.password.request.in.progress.message": "Your previous request is in progress, please try again in a few moments.",
   "forgot.password.empty.email.field.error": "Enter your email",
+  "forgot.password.invalid.email.message": "The email address you've provided isn't formatted correctly.",
   "forgot.password.email.help.text": "The email address you used to register with {platformName}",
   "confirmation.message.title": "Check your email",
   "confirmation.support.link": "contact technical support",
@@ -50,6 +53,7 @@
   "token.validation.internal.sever.error.heading": "Token validation failure",
   "token.validation.internal.sever.error": "An error has occurred. Try refreshing the page, or check your internet connection.",
   "internal.server.error": "An error has occurred. Try refreshing the page, or check your internet connection.",
+  "rate.limit.error": "An error has occurred because of too many requests. Please try again after some time.",
   "account.activation.error.message": "Something went wrong, please {supportLink} to resolve this issue.",
   "login.inactive.user.error": "In order to sign in, you need to activate your account.{lineBreak}\n            {lineBreak}We just sent an activation link to {email}. If you do not receive an email,\n            check your spam folders or {supportLink}.",
   "allowed.domain.login.error": "As {allowedDomain} user, You must login with your {allowedDomain} {tpaLink}.",
@@ -61,32 +65,45 @@
   "login.user.identity.label": "Username or email",
   "login.password.label": "Password",
   "sign.in.button": "Sign in",
+  "sign.in.btn.pending.state": "Loading",
+  "need.help.signing.in.collapsible.menu": "Need help signing in?",
+  "forgot.password.link": "Forgot my password",
   "forgot.password": "Forgot password",
+  "other.sign.in.issues": "Other sign in issues",
+  "need.other.help.signing.in.collapsible.menu": "Need other help signing in?",
   "institution.login.button": "Institution/campus credentials",
   "institution.login.page.title": "Sign in with institution/campus credentials",
+  "institution.login.page.back.button": "Back to sign in",
+  "create.an.account": "Create an account",
   "login.other.options.heading": "Or sign in with:",
   "non.compliant.password.title": "We recently changed our password requirements",
   "non.compliant.password.message": "Your current password does not meet the new security requirements. We just sent a password-reset message to the email address associated with this account. Thank you for helping us keep your data safe.",
   "account.locked.out.message.1": "To protect your account, it's been temporarily locked. Try again in 30 minutes.",
+  "first.time.here": "First time here?",
+  "email.help.message": "The email address you used to register with edX.",
   "enterprise.login.btn.text": "Company or school credentials",
+  "email.format.validation.message": "The email address you've provided isn't formatted correctly.",
   "username.or.email.format.validation.less.chars.message": "Username or email must have at least 3 characters.",
   "email.validation.message": "Enter your username or email",
   "password.validation.message": "Password criteria has not been met",
+  "register.link": "Create an account",
+  "sign.in.heading": "Sign in",
   "account.activation.success.message.title": "Success! You have activated your account.",
   "account.activation.success.message": "You will now receive email updates and alerts from us related to the courses you are enrolled in. Sign in to continue.",
   "account.activation.info.message": "This account has already been activated.",
   "account.activation.error.message.title": "Your account could not be activated",
   "account.activation.support.link": "contact support",
+  "tpa.account.link": "{provider} account",
   "account.confirmation.success.message.title": "Success! You have confirmed your email.",
   "account.confirmation.success.message": "Sign in to continue.",
   "account.confirmation.info.message": "This email has already been confirmed.",
   "account.confirmation.error.message.title": "Your email could not be confirmed",
-  "tpa.account.link": "{provider} account",
-  "internal.server.error.message": "An error has occurred. Try refreshing the page, or check your internet connection.",
   "login.rate.limit.reached.message": "Too many failed login attempts. Try again later.",
   "login.failure.header.title": "We couldn't sign you in.",
   "contact.support.link": "contact {platformName} support",
   "login.incorrect.credentials.error": "The username, email, or password you entered is incorrect. Please try again.",
+  "login.failed.attempt.error": "You have {remainingAttempts} more sign in attempts before your account is temporarily locked.",
+  "login.locked.out.error.message": "To protect your account, it’s been temporarily locked. Try again in {lockedOutPeriod} minutes.",
   "login.form.invalid.error.message": "Please fill in the fields below.",
   "login.incorrect.credentials.error.reset.link.text": "reset your password",
   "login.incorrect.credentials.error.before.account.blocked.text": "click here to reset it.",
@@ -96,8 +113,7 @@
   "password.security.block.body": "Our system detected that your password is vulnerable. Change your password so that your account stays secure.",
   "password.security.close.button": "Close",
   "password.security.redirect.to.reset.password.button": "Reset your password",
-  "login.tpa.authentication.failure": "We are sorry, you are not authorized to access {platform_name} via this channel. Please contact your learning administrator or manager in order to access {platform_name}.{lineBreak}{lineBreak}Error Details:{lineBreak}{errorMessage}",
-  "progressive.profiling.page.title": "Welcome | {siteName}",
+  "progressive.profiling.page.title": "Optional Fields | {siteName}",
   "progressive.profiling.page.heading": "A few questions for you will help us get smarter.",
   "optional.fields.information.link": "Learn more about how we use this information.",
   "optional.fields.submit.button": "Submit",
@@ -108,7 +124,7 @@
   "modal.description": "You can complete your profile in settings at any time if you change your mind.",
   "welcome.page.error.heading": "We couldn't update your profile",
   "welcome.page.error.message": "An error occurred. You can complete your profile in settings at any time.",
-  "recommendation.page.title": "Recommendations | {siteName}",
+  "recommendation.page.title": "Recommendations| {siteName}",
   "recommendation.page.heading": "We have a few recommendations to get you started.",
   "recommendation.skip.button": "Skip for now",
   "register.page.title": "Register | {siteName}",
@@ -123,34 +139,51 @@
   "help.text.username.2": "This can not be changed later.",
   "help.text.email": "For account activation and important updates",
   "create.account.for.free.button": "Create an account for free",
+  "create.an.account.btn.pending.state": "Loading",
   "registration.other.options.heading": "Or register with:",
   "register.institution.login.button": "Institution/campus credentials",
   "register.institution.login.page.title": "Register with institution/campus credentials",
   "empty.name.field.error": "Enter your full name",
   "empty.email.field.error": "Enter your email",
+  "email.do.not.match": "The email addresses do not match.",
   "empty.username.field.error": "Username must be between 2 and 30 characters",
   "empty.password.field.error": "Password criteria has not been met",
   "empty.country.field.error": "Select your country or region of residence",
-  "email.do.not.match": "The email addresses do not match.",
   "email.invalid.format.error": "Enter a valid email address",
+  "email.ratelimit.less.chars.validation.message": "Email must have 3 characters.",
   "username.validation.message": "Username must be between 2 and 30 characters",
   "name.validation.message": "Enter a valid name",
   "username.format.validation.message": "Usernames can only contain letters (A-Z, a-z), numerals (0-9), underscores (_), and hyphens (-). Usernames cannot contain spaces",
+  "support.education.research": "Support education research by providing additional information. (Optional)",
   "registration.request.failure.header": "We couldn't create your account.",
   "registration.empty.form.submission.error": "Please check your responses and try again.",
   "registration.request.server.error": "An error has occurred. Try refreshing the page, or check your internet connection.",
   "registration.rate.limit.error": "Too many failed registration attempts. Try again later.",
   "registration.tpa.session.expired": "Registration using {provider} has timed out.",
-  "registration.tpa.authentication.failure": "We are sorry, you are not authorized to access {platform_name} via this channel. Please contact your learning administrator or manager in order to access {platform_name}.{lineBreak}{lineBreak}Error Details:{lineBreak}{errorMessage}",
   "terms.of.service.and.honor.code": "Terms of Service and Honor Code",
   "privacy.policy": "Privacy Policy",
   "honor.code": "Honor Code",
   "terms.of.service": "Terms of Service",
+  "registration.year.of.birth.label": "Year of birth (optional)",
+  "registration.field.gender.options.label": "Gender (optional)",
+  "registration.goals.label": "Tell us why you're interested in edX (optional)",
+  "registration.field.gender.options.f": "Female",
+  "registration.field.gender.options.m": "Male",
+  "registration.field.gender.options.o": "Other/Prefer not to say",
+  "registration.field.education.levels.label": "Highest level of education completed (optional)",
+  "registration.field.education.levels.p": "Doctorate",
+  "registration.field.education.levels.m": "Master's or professional degree",
+  "registration.field.education.levels.b": "Bachelor's degree",
+  "registration.field.education.levels.a": "Associate's degree",
+  "registration.field.education.levels.hs": "Secondary/high school",
+  "registration.field.education.levels.jhs": "Junior secondary/junior high/middle school",
+  "registration.field.education.levels.el": "Elementary/primary school",
+  "registration.field.education.levels.none": "No formal education",
+  "registration.field.education.levels.other": "Other education",
   "registration.username.suggestion.label": "Suggested:",
+  "registration.using.tpa.form.heading": "Finish creating your account",
   "did.you.mean.alert.text": "Did you mean",
-  "register.page.terms.of.service.and.honor.code": "By creating an account, you agree to the {tosAndHonorCode} and you acknowledge that {platformName} and each\n                Member process your personal data in accordance with the {privacyPolicy}.",
-  "register.page.honor.code": "I agree to the {platformName} {tosAndHonorCode}",
-  "register.page.terms.of.service": "I agree to the {platformName} {termsOfService}",
+  "register.page.terms.of.service": "I agree to the {platformName} {termsOfService}",
   "sign.in": "Sign in",
   "reset.password.page.title": "Reset Password | {siteName}",
   "reset.password": "Reset password",
@@ -159,10 +192,40 @@
   "confirm.password.label": "Confirm password",
   "passwords.do.not.match": "Passwords do not match",
   "confirm.your.password": "Confirm your password",
+  "forgot.password.confirmation.sign.in.link": "sign in",
+  "reset.password.request.forgot.password.text": "Forgot password",
+  "reset.password.request.invalid.token.header": "Invalid password reset link",
+  "reset.password.empty.new.password.field.error": "Please enter your new password.",
   "reset.password.failure.heading": "We couldn't reset your password.",
   "reset.password.form.submission.error": "Please check your responses and try again.",
+  "reset.password.request.server.error": "Failed to reset password",
+  "reset.password.token.validation.sever.error": "Token validation failure",
   "reset.server.rate.limit.error": "Too many requests.",
   "reset.password.success.heading": "Password reset complete.",
   "reset.password.success": "Your password has been reset. Sign in to your account.",
-  "rate.limit.error": "An error has occurred because of too many requests. Please try again after some time."
+  "progressive.profiling.page.title": "Optional Fields | {siteName}",
+  "progressive.profiling.page.heading": "A few questions for you will help us get smarter.",
+  "gender.options.label": "Gender (optional)",
+  "gender.options.f": "Female",
+  "gender.options.m": "Male",
+  "gender.options.o": "Other/Prefer not to say",
+  "education.levels.label": "Highest level of education completed (optional)",
+  "education.levels.p": "Doctorate",
+  "education.levels.m": "Master's or professional degree",
+  "education.levels.b": "Bachelor's degree",
+  "education.levels.a": "Associate's degree",
+  "education.levels.hs": "Secondary/high school",
+  "education.levels.jhs": "Junior secondary/junior high/middle school",
+  "education.levels.el": "Elementary/primary school",
+  "education.levels.none": "No formal education",
+  "education.levels.other": "Other education",
+  "year.of.birth.label": "Year of birth (optional)",
+  "optional.fields.information.link": "Learn more about how we use this information.",
+  "optional.fields.submit.button": "Submit",
+  "optional.fields.skip.button": "Skip for now",
+  "continue.to.platform": "Continue to {platformName}",
+  "modal.title": "Thanks for letting us know.",
+  "modal.description": "You can complete your profile in settings at any time if you change your mind.",
+  "welcome.page.error.heading": "We couldn't update your profile",
+  "welcome.page.error.message": "An error occurred. You can complete your profile in settings at any time."
 }

src/i18n/messages/uk.json

@@ -5,11 +5,16 @@
   "complete.your.profile.2": "your profile",
   "welcome.to.platform": "Welcome to {siteName}, {username}!",
   "institution.login.page.sub.heading": "Choose your institution from the list below",
+  "forgot.password.confirmation.title": "Check your email",
+  "forgot.password.confirmation.support.link": "contact technical support",
+  "forgot.password.confirmation.info": "If you do not receive a password reset message after 1 minute, verify that you entered the correct email address, or check your spam folder.",
   "logistration.sign.in": "Sign in",
   "logistration.register": "Register",
+  "internal.server.error.message": "An error has occurred. Try refreshing the page, or check your internet connection.",
+  "server.ratelimit.error.message": "An error has occurred because of too many requests. Please try again after some time.",
   "enterprisetpa.title.heading": "Would you like to sign in using your {providerName} credentials?",
+  "enterprisetpa.sso.button.title": "Sign in using {providerName}",
   "enterprisetpa.login.button.text": "Show me other ways to sign in or register",
-  "enterprisetpa.login.button.text.public.account.creation.disabled": "Show me other ways to sign in",
   "sso.sign.in.with": "Sign in with {providerName}",
   "sso.create.account.using": "Create account using {providerName}",
   "show.password": "Show password",
@@ -21,9 +26,6 @@
   "tpa.alert.heading": "Almost done!",
   "login.third.party.auth.account.not.linked": "You have successfully signed into {currentProvider}, but your {currentProvider} account does not have a linked {platformName} account. To link your accounts, sign in now using your {platformName} password.",
   "register.third.party.auth.account.not.linked": "You've successfully signed into {currentProvider}! We just need a little more information before you start learning with {platformName}.",
-  "registration.using.tpa.form.heading": "Finish creating your account",
-  "zendesk.supportTitle": "edX Support",
-  "zendesk.selectTicketForm": "Please choose your request type:",
   "error.notfound.message": "The page you're looking for is unavailable or there's an error in the URL. Please check the URL and try again.",
   "forgot.password.confirmation.message": "We sent an email to {email} with instructions to reset your password.\n          If you do not receive a password reset message after 1 minute, verify that you entered\n          the correct email address, or check your spam folder. If you need further assistance, {supportLink}.",
   "forgot.password.page.title": "Forgot Password | {siteName}",
@@ -36,6 +38,7 @@
   "forgot.password.error.message.title": "An error occurred.",
   "forgot.password.request.in.progress.message": "Your previous request is in progress, please try again in a few moments.",
   "forgot.password.empty.email.field.error": "Enter your email",
+  "forgot.password.invalid.email.message": "The email address you've provided isn't formatted correctly.",
   "forgot.password.email.help.text": "The email address you used to register with {platformName}",
   "confirmation.message.title": "Check your email",
   "confirmation.support.link": "contact technical support",
@@ -50,6 +53,7 @@
   "token.validation.internal.sever.error.heading": "Token validation failure",
   "token.validation.internal.sever.error": "An error has occurred. Try refreshing the page, or check your internet connection.",
   "internal.server.error": "An error has occurred. Try refreshing the page, or check your internet connection.",
+  "rate.limit.error": "An error has occurred because of too many requests. Please try again after some time.",
   "account.activation.error.message": "Something went wrong, please {supportLink} to resolve this issue.",
   "login.inactive.user.error": "In order to sign in, you need to activate your account.{lineBreak}\n            {lineBreak}We just sent an activation link to {email}. If you do not receive an email,\n            check your spam folders or {supportLink}.",
   "allowed.domain.login.error": "As {allowedDomain} user, You must login with your {allowedDomain} {tpaLink}.",
@@ -61,32 +65,45 @@
   "login.user.identity.label": "Username or email",
   "login.password.label": "Password",
   "sign.in.button": "Sign in",
+  "sign.in.btn.pending.state": "Loading",
+  "need.help.signing.in.collapsible.menu": "Need help signing in?",
+  "forgot.password.link": "Forgot my password",
   "forgot.password": "Forgot password",
+  "other.sign.in.issues": "Other sign in issues",
+  "need.other.help.signing.in.collapsible.menu": "Need other help signing in?",
   "institution.login.button": "Institution/campus credentials",
   "institution.login.page.title": "Sign in with institution/campus credentials",
+  "institution.login.page.back.button": "Back to sign in",
+  "create.an.account": "Create an account",
   "login.other.options.heading": "Or sign in with:",
   "non.compliant.password.title": "We recently changed our password requirements",
   "non.compliant.password.message": "Your current password does not meet the new security requirements. We just sent a password-reset message to the email address associated with this account. Thank you for helping us keep your data safe.",
   "account.locked.out.message.1": "To protect your account, it's been temporarily locked. Try again in 30 minutes.",
+  "first.time.here": "First time here?",
+  "email.help.message": "The email address you used to register with edX.",
   "enterprise.login.btn.text": "Company or school credentials",
+  "email.format.validation.message": "The email address you've provided isn't formatted correctly.",
   "username.or.email.format.validation.less.chars.message": "Username or email must have at least 3 characters.",
   "email.validation.message": "Enter your username or email",
   "password.validation.message": "Password criteria has not been met",
+  "register.link": "Create an account",
+  "sign.in.heading": "Sign in",
   "account.activation.success.message.title": "Success! You have activated your account.",
   "account.activation.success.message": "You will now receive email updates and alerts from us related to the courses you are enrolled in. Sign in to continue.",
   "account.activation.info.message": "This account has already been activated.",
   "account.activation.error.message.title": "Your account could not be activated",
   "account.activation.support.link": "contact support",
+  "tpa.account.link": "{provider} account",
   "account.confirmation.success.message.title": "Success! You have confirmed your email.",
   "account.confirmation.success.message": "Sign in to continue.",
   "account.confirmation.info.message": "This email has already been confirmed.",
   "account.confirmation.error.message.title": "Your email could not be confirmed",
-  "tpa.account.link": "{provider} account",
-  "internal.server.error.message": "An error has occurred. Try refreshing the page, or check your internet connection.",
   "login.rate.limit.reached.message": "Too many failed login attempts. Try again later.",
   "login.failure.header.title": "We couldn't sign you in.",
   "contact.support.link": "contact {platformName} support",
   "login.incorrect.credentials.error": "The username, email, or password you entered is incorrect. Please try again.",
+  "login.failed.attempt.error": "You have {remainingAttempts} more sign in attempts before your account is temporarily locked.",
+  "login.locked.out.error.message": "To protect your account, it’s been temporarily locked. Try again in {lockedOutPeriod} minutes.",
   "login.form.invalid.error.message": "Please fill in the fields below.",
   "login.incorrect.credentials.error.reset.link.text": "reset your password",
   "login.incorrect.credentials.error.before.account.blocked.text": "click here to reset it.",
@@ -96,8 +113,7 @@
   "password.security.block.body": "Our system detected that your password is vulnerable. Change your password so that your account stays secure.",
   "password.security.close.button": "Close",
   "password.security.redirect.to.reset.password.button": "Reset your password",
-  "login.tpa.authentication.failure": "We are sorry, you are not authorized to access {platform_name} via this channel. Please contact your learning administrator or manager in order to access {platform_name}.{lineBreak}{lineBreak}Error Details:{lineBreak}{errorMessage}",
-  "progressive.profiling.page.title": "Welcome | {siteName}",
+  "progressive.profiling.page.title": "Optional Fields | {siteName}",
   "progressive.profiling.page.heading": "A few questions for you will help us get smarter.",
   "optional.fields.information.link": "Learn more about how we use this information.",
   "optional.fields.submit.button": "Submit",
@@ -108,7 +124,7 @@
   "modal.description": "You can complete your profile in settings at any time if you change your mind.",
   "welcome.page.error.heading": "We couldn't update your profile",
   "welcome.page.error.message": "An error occurred. You can complete your profile in settings at any time.",
-  "recommendation.page.title": "Recommendations | {siteName}",
+  "recommendation.page.title": "Recommendations| {siteName}",
   "recommendation.page.heading": "We have a few recommendations to get you started.",
   "recommendation.skip.button": "Skip for now",
   "register.page.title": "Register | {siteName}",
@@ -123,34 +139,51 @@
   "help.text.username.2": "This can not be changed later.",
   "help.text.email": "For account activation and important updates",
   "create.account.for.free.button": "Create an account for free",
+  "create.an.account.btn.pending.state": "Loading",
   "registration.other.options.heading": "Or register with:",
   "register.institution.login.button": "Institution/campus credentials",
   "register.institution.login.page.title": "Register with institution/campus credentials",
   "empty.name.field.error": "Enter your full name",
   "empty.email.field.error": "Enter your email",
+  "email.do.not.match": "The email addresses do not match.",
   "empty.username.field.error": "Username must be between 2 and 30 characters",
   "empty.password.field.error": "Password criteria has not been met",
   "empty.country.field.error": "Select your country or region of residence",
-  "email.do.not.match": "The email addresses do not match.",
   "email.invalid.format.error": "Enter a valid email address",
+  "email.ratelimit.less.chars.validation.message": "Email must have 3 characters.",
   "username.validation.message": "Username must be between 2 and 30 characters",
   "name.validation.message": "Enter a valid name",
   "username.format.validation.message": "Usernames can only contain letters (A-Z, a-z), numerals (0-9), underscores (_), and hyphens (-). Usernames cannot contain spaces",
+  "support.education.research": "Support education research by providing additional information. (Optional)",
   "registration.request.failure.header": "We couldn't create your account.",
   "registration.empty.form.submission.error": "Please check your responses and try again.",
   "registration.request.server.error": "An error has occurred. Try refreshing the page, or check your internet connection.",
   "registration.rate.limit.error": "Too many failed registration attempts. Try again later.",
   "registration.tpa.session.expired": "Registration using {provider} has timed out.",
-  "registration.tpa.authentication.failure": "We are sorry, you are not authorized to access {platform_name} via this channel. Please contact your learning administrator or manager in order to access {platform_name}.{lineBreak}{lineBreak}Error Details:{lineBreak}{errorMessage}",
   "terms.of.service.and.honor.code": "Terms of Service and Honor Code",
   "privacy.policy": "Privacy Policy",
   "honor.code": "Honor Code",
   "terms.of.service": "Terms of Service",
+  "registration.year.of.birth.label": "Year of birth (optional)",
+  "registration.field.gender.options.label": "Gender (optional)",
+  "registration.goals.label": "Tell us why you're interested in edX (optional)",
+  "registration.field.gender.options.f": "Female",
+  "registration.field.gender.options.m": "Male",
+  "registration.field.gender.options.o": "Other/Prefer not to say",
+  "registration.field.education.levels.label": "Highest level of education completed (optional)",
+  "registration.field.education.levels.p": "Doctorate",
+  "registration.field.education.levels.m": "Master's or professional degree",
+  "registration.field.education.levels.b": "Bachelor's degree",
+  "registration.field.education.levels.a": "Associate's degree",
+  "registration.field.education.levels.hs": "Secondary/high school",
+  "registration.field.education.levels.jhs": "Junior secondary/junior high/middle school",
+  "registration.field.education.levels.el": "Elementary/primary school",
+  "registration.field.education.levels.none": "No formal education",
+  "registration.field.education.levels.other": "Other education",
   "registration.username.suggestion.label": "Suggested:",
+  "registration.using.tpa.form.heading": "Finish creating your account",
   "did.you.mean.alert.text": "Did you mean",
-  "register.page.terms.of.service.and.honor.code": "By creating an account, you agree to the {tosAndHonorCode} and you acknowledge that {platformName} and each\n                Member process your personal data in accordance with the {privacyPolicy}.",
-  "register.page.honor.code": "I agree to the {platformName} {tosAndHonorCode}",
-  "register.page.terms.of.service": "I agree to the {platformName} {termsOfService}",
+  "register.page.terms.of.service": "I agree to the {platformName} {termsOfService}",
   "sign.in": "Sign in",
   "reset.password.page.title": "Reset Password | {siteName}",
   "reset.password": "Reset password",
@@ -159,10 +192,40 @@
   "confirm.password.label": "Confirm password",
   "passwords.do.not.match": "Passwords do not match",
   "confirm.your.password": "Confirm your password",
+  "forgot.password.confirmation.sign.in.link": "sign in",
+  "reset.password.request.forgot.password.text": "Forgot password",
+  "reset.password.request.invalid.token.header": "Invalid password reset link",
+  "reset.password.empty.new.password.field.error": "Please enter your new password.",
   "reset.password.failure.heading": "We couldn't reset your password.",
   "reset.password.form.submission.error": "Please check your responses and try again.",
+  "reset.password.request.server.error": "Failed to reset password",
+  "reset.password.token.validation.sever.error": "Token validation failure",
   "reset.server.rate.limit.error": "Too many requests.",
   "reset.password.success.heading": "Password reset complete.",
   "reset.password.success": "Your password has been reset. Sign in to your account.",
-  "rate.limit.error": "An error has occurred because of too many requests. Please try again after some time."
+  "progressive.profiling.page.title": "Optional Fields | {siteName}",
+  "progressive.profiling.page.heading": "A few questions for you will help us get smarter.",
+  "gender.options.label": "Gender (optional)",
+  "gender.options.f": "Female",
+  "gender.options.m": "Male",
+  "gender.options.o": "Other/Prefer not to say",
+  "education.levels.label": "Highest level of education completed (optional)",
+  "education.levels.p": "Doctorate",
+  "education.levels.m": "Master's or professional degree",
+  "education.levels.b": "Bachelor's degree",
+  "education.levels.a": "Associate's degree",
+  "education.levels.hs": "Secondary/high school",
+  "education.levels.jhs": "Junior secondary/junior high/middle school",
+  "education.levels.el": "Elementary/primary school",
+  "education.levels.none": "No formal education",
+  "education.levels.other": "Other education",
+  "year.of.birth.label": "Year of birth (optional)",
+  "optional.fields.information.link": "Learn more about how we use this information.",
+  "optional.fields.submit.button": "Submit",
+  "optional.fields.skip.button": "Skip for now",
+  "continue.to.platform": "Continue to {platformName}",
+  "modal.title": "Thanks for letting us know.",
+  "modal.description": "You can complete your profile in settings at any time if you change your mind.",
+  "welcome.page.error.heading": "We couldn't update your profile",
+  "welcome.page.error.message": "An error occurred. You can complete your profile in settings at any time."
 }

src/i18n/messages/zh_CN.json

@@ -5,11 +5,16 @@
   "complete.your.profile.2": "your profile",
   "welcome.to.platform": "Welcome to {siteName}, {username}!",
   "institution.login.page.sub.heading": "Choose your institution from the list below",
+  "forgot.password.confirmation.title": "Check your email",
+  "forgot.password.confirmation.support.link": "contact technical support",
+  "forgot.password.confirmation.info": "If you do not receive a password reset message after 1 minute, verify that you entered the correct email address, or check your spam folder.",
   "logistration.sign.in": "Sign in",
   "logistration.register": "Register",
+  "internal.server.error.message": "An error has occurred. Try refreshing the page, or check your internet connection.",
+  "server.ratelimit.error.message": "An error has occurred because of too many requests. Please try again after some time.",
   "enterprisetpa.title.heading": "Would you like to sign in using your {providerName} credentials?",
+  "enterprisetpa.sso.button.title": "Sign in using {providerName}",
   "enterprisetpa.login.button.text": "Show me other ways to sign in or register",
-  "enterprisetpa.login.button.text.public.account.creation.disabled": "Show me other ways to sign in",
   "sso.sign.in.with": "Sign in with {providerName}",
   "sso.create.account.using": "Create account using {providerName}",
   "show.password": "Show password",
@@ -21,9 +26,6 @@
   "tpa.alert.heading": "Almost done!",
   "login.third.party.auth.account.not.linked": "You have successfully signed into {currentProvider}, but your {currentProvider} account does not have a linked {platformName} account. To link your accounts, sign in now using your {platformName} password.",
   "register.third.party.auth.account.not.linked": "You've successfully signed into {currentProvider}! We just need a little more information before you start learning with {platformName}.",
-  "registration.using.tpa.form.heading": "Finish creating your account",
-  "zendesk.supportTitle": "edX Support",
-  "zendesk.selectTicketForm": "Please choose your request type:",
   "error.notfound.message": "The page you're looking for is unavailable or there's an error in the URL. Please check the URL and try again.",
   "forgot.password.confirmation.message": "We sent an email to {email} with instructions to reset your password.\n          If you do not receive a password reset message after 1 minute, verify that you entered\n          the correct email address, or check your spam folder. If you need further assistance, {supportLink}.",
   "forgot.password.page.title": "Forgot Password | {siteName}",
@@ -36,6 +38,7 @@
   "forgot.password.error.message.title": "An error occurred.",
   "forgot.password.request.in.progress.message": "Your previous request is in progress, please try again in a few moments.",
   "forgot.password.empty.email.field.error": "Enter your email",
+  "forgot.password.invalid.email.message": "The email address you've provided isn't formatted correctly.",
   "forgot.password.email.help.text": "The email address you used to register with {platformName}",
   "confirmation.message.title": "Check your email",
   "confirmation.support.link": "contact technical support",
@@ -50,6 +53,7 @@
   "token.validation.internal.sever.error.heading": "Token validation failure",
   "token.validation.internal.sever.error": "An error has occurred. Try refreshing the page, or check your internet connection.",
   "internal.server.error": "An error has occurred. Try refreshing the page, or check your internet connection.",
+  "rate.limit.error": "An error has occurred because of too many requests. Please try again after some time.",
   "account.activation.error.message": "Something went wrong, please {supportLink} to resolve this issue.",
   "login.inactive.user.error": "In order to sign in, you need to activate your account.{lineBreak}\n            {lineBreak}We just sent an activation link to {email}. If you do not receive an email,\n            check your spam folders or {supportLink}.",
   "allowed.domain.login.error": "As {allowedDomain} user, You must login with your {allowedDomain} {tpaLink}.",
@@ -61,32 +65,45 @@
   "login.user.identity.label": "Username or email",
   "login.password.label": "Password",
   "sign.in.button": "Sign in",
+  "sign.in.btn.pending.state": "Loading",
+  "need.help.signing.in.collapsible.menu": "Need help signing in?",
+  "forgot.password.link": "Forgot my password",
   "forgot.password": "Forgot password",
+  "other.sign.in.issues": "Other sign in issues",
+  "need.other.help.signing.in.collapsible.menu": "Need other help signing in?",
   "institution.login.button": "Institution/campus credentials",
   "institution.login.page.title": "Sign in with institution/campus credentials",
+  "institution.login.page.back.button": "Back to sign in",
+  "create.an.account": "Create an account",
   "login.other.options.heading": "Or sign in with:",
   "non.compliant.password.title": "We recently changed our password requirements",
   "non.compliant.password.message": "Your current password does not meet the new security requirements. We just sent a password-reset message to the email address associated with this account. Thank you for helping us keep your data safe.",
   "account.locked.out.message.1": "To protect your account, it's been temporarily locked. Try again in 30 minutes.",
+  "first.time.here": "First time here?",
+  "email.help.message": "The email address you used to register with edX.",
   "enterprise.login.btn.text": "Company or school credentials",
+  "email.format.validation.message": "The email address you've provided isn't formatted correctly.",
   "username.or.email.format.validation.less.chars.message": "Username or email must have at least 3 characters.",
   "email.validation.message": "Enter your username or email",
   "password.validation.message": "Password criteria has not been met",
+  "register.link": "Create an account",
+  "sign.in.heading": "Sign in",
   "account.activation.success.message.title": "Success! You have activated your account.",
   "account.activation.success.message": "You will now receive email updates and alerts from us related to the courses you are enrolled in. Sign in to continue.",
   "account.activation.info.message": "This account has already been activated.",
   "account.activation.error.message.title": "Your account could not be activated",
   "account.activation.support.link": "contact support",
+  "tpa.account.link": "{provider} account",
   "account.confirmation.success.message.title": "Success! You have confirmed your email.",
   "account.confirmation.success.message": "Sign in to continue.",
   "account.confirmation.info.message": "This email has already been confirmed.",
   "account.confirmation.error.message.title": "Your email could not be confirmed",
-  "tpa.account.link": "{provider} account",
-  "internal.server.error.message": "An error has occurred. Try refreshing the page, or check your internet connection.",
   "login.rate.limit.reached.message": "Too many failed login attempts. Try again later.",
   "login.failure.header.title": "We couldn't sign you in.",
   "contact.support.link": "contact {platformName} support",
   "login.incorrect.credentials.error": "The username, email, or password you entered is incorrect. Please try again.",
+  "login.failed.attempt.error": "You have {remainingAttempts} more sign in attempts before your account is temporarily locked.",
+  "login.locked.out.error.message": "To protect your account, it’s been temporarily locked. Try again in {lockedOutPeriod} minutes.",
   "login.form.invalid.error.message": "Please fill in the fields below.",
   "login.incorrect.credentials.error.reset.link.text": "reset your password",
   "login.incorrect.credentials.error.before.account.blocked.text": "click here to reset it.",
@@ -96,8 +113,7 @@
   "password.security.block.body": "Our system detected that your password is vulnerable. Change your password so that your account stays secure.",
   "password.security.close.button": "Close",
   "password.security.redirect.to.reset.password.button": "Reset your password",
-  "login.tpa.authentication.failure": "We are sorry, you are not authorized to access {platform_name} via this channel. Please contact your learning administrator or manager in order to access {platform_name}.{lineBreak}{lineBreak}Error Details:{lineBreak}{errorMessage}",
-  "progressive.profiling.page.title": "Welcome | {siteName}",
+  "progressive.profiling.page.title": "Optional Fields | {siteName}",
   "progressive.profiling.page.heading": "A few questions for you will help us get smarter.",
   "optional.fields.information.link": "Learn more about how we use this information.",
   "optional.fields.submit.button": "Submit",
@@ -108,7 +124,7 @@
   "modal.description": "You can complete your profile in settings at any time if you change your mind.",
   "welcome.page.error.heading": "We couldn't update your profile",
   "welcome.page.error.message": "An error occurred. You can complete your profile in settings at any time.",
-  "recommendation.page.title": "Recommendations | {siteName}",
+  "recommendation.page.title": "Recommendations| {siteName}",
   "recommendation.page.heading": "We have a few recommendations to get you started.",
   "recommendation.skip.button": "Skip for now",
   "register.page.title": "Register | {siteName}",
@@ -123,34 +139,51 @@
   "help.text.username.2": "This can not be changed later.",
   "help.text.email": "For account activation and important updates",
   "create.account.for.free.button": "Create an account for free",
+  "create.an.account.btn.pending.state": "Loading",
   "registration.other.options.heading": "Or register with:",
   "register.institution.login.button": "Institution/campus credentials",
   "register.institution.login.page.title": "Register with institution/campus credentials",
   "empty.name.field.error": "Enter your full name",
   "empty.email.field.error": "Enter your email",
+  "email.do.not.match": "The email addresses do not match.",
   "empty.username.field.error": "Username must be between 2 and 30 characters",
   "empty.password.field.error": "Password criteria has not been met",
   "empty.country.field.error": "Select your country or region of residence",
-  "email.do.not.match": "The email addresses do not match.",
   "email.invalid.format.error": "Enter a valid email address",
+  "email.ratelimit.less.chars.validation.message": "Email must have 3 characters.",
   "username.validation.message": "Username must be between 2 and 30 characters",
   "name.validation.message": "Enter a valid name",
   "username.format.validation.message": "Usernames can only contain letters (A-Z, a-z), numerals (0-9), underscores (_), and hyphens (-). Usernames cannot contain spaces",
+  "support.education.research": "Support education research by providing additional information. (Optional)",
   "registration.request.failure.header": "We couldn't create your account.",
   "registration.empty.form.submission.error": "Please check your responses and try again.",
   "registration.request.server.error": "An error has occurred. Try refreshing the page, or check your internet connection.",
   "registration.rate.limit.error": "Too many failed registration attempts. Try again later.",
   "registration.tpa.session.expired": "Registration using {provider} has timed out.",
-  "registration.tpa.authentication.failure": "We are sorry, you are not authorized to access {platform_name} via this channel. Please contact your learning administrator or manager in order to access {platform_name}.{lineBreak}{lineBreak}Error Details:{lineBreak}{errorMessage}",
   "terms.of.service.and.honor.code": "Terms of Service and Honor Code",
   "privacy.policy": "Privacy Policy",
   "honor.code": "Honor Code",
   "terms.of.service": "Terms of Service",
+  "registration.year.of.birth.label": "Year of birth (optional)",
+  "registration.field.gender.options.label": "Gender (optional)",
+  "registration.goals.label": "Tell us why you're interested in edX (optional)",
+  "registration.field.gender.options.f": "Female",
+  "registration.field.gender.options.m": "Male",
+  "registration.field.gender.options.o": "Other/Prefer not to say",
+  "registration.field.education.levels.label": "Highest level of education completed (optional)",
+  "registration.field.education.levels.p": "Doctorate",
+  "registration.field.education.levels.m": "Master's or professional degree",
+  "registration.field.education.levels.b": "Bachelor's degree",
+  "registration.field.education.levels.a": "Associate's degree",
+  "registration.field.education.levels.hs": "Secondary/high school",
+  "registration.field.education.levels.jhs": "Junior secondary/junior high/middle school",
+  "registration.field.education.levels.el": "Elementary/primary school",
+  "registration.field.education.levels.none": "No formal education",
+  "registration.field.education.levels.other": "Other education",
   "registration.username.suggestion.label": "Suggested:",
+  "registration.using.tpa.form.heading": "Finish creating your account",
   "did.you.mean.alert.text": "Did you mean",
-  "register.page.terms.of.service.and.honor.code": "By creating an account, you agree to the {tosAndHonorCode} and you acknowledge that {platformName} and each\n                Member process your personal data in accordance with the {privacyPolicy}.",
-  "register.page.honor.code": "I agree to the {platformName} {tosAndHonorCode}",
-  "register.page.terms.of.service": "I agree to the {platformName} {termsOfService}",
+  "register.page.terms.of.service": "I agree to the {platformName} {termsOfService}",
   "sign.in": "Sign in",
   "reset.password.page.title": "Reset Password | {siteName}",
   "reset.password": "Reset password",
@@ -159,10 +192,40 @@
   "confirm.password.label": "Confirm password",
   "passwords.do.not.match": "Passwords do not match",
   "confirm.your.password": "Confirm your password",
+  "forgot.password.confirmation.sign.in.link": "sign in",
+  "reset.password.request.forgot.password.text": "Forgot password",
+  "reset.password.request.invalid.token.header": "Invalid password reset link",
+  "reset.password.empty.new.password.field.error": "Please enter your new password.",
   "reset.password.failure.heading": "We couldn't reset your password.",
   "reset.password.form.submission.error": "Please check your responses and try again.",
+  "reset.password.request.server.error": "Failed to reset password",
+  "reset.password.token.validation.sever.error": "Token validation failure",
   "reset.server.rate.limit.error": "Too many requests.",
   "reset.password.success.heading": "Password reset complete.",
   "reset.password.success": "Your password has been reset. Sign in to your account.",
-  "rate.limit.error": "An error has occurred because of too many requests. Please try again after some time."
+  "progressive.profiling.page.title": "Optional Fields | {siteName}",
+  "progressive.profiling.page.heading": "A few questions for you will help us get smarter.",
+  "gender.options.label": "Gender (optional)",
+  "gender.options.f": "Female",
+  "gender.options.m": "Male",
+  "gender.options.o": "Other/Prefer not to say",
+  "education.levels.label": "Highest level of education completed (optional)",
+  "education.levels.p": "Doctorate",
+  "education.levels.m": "Master's or professional degree",
+  "education.levels.b": "Bachelor's degree",
+  "education.levels.a": "Associate's degree",
+  "education.levels.hs": "Secondary/high school",
+  "education.levels.jhs": "Junior secondary/junior high/middle school",
+  "education.levels.el": "Elementary/primary school",
+  "education.levels.none": "No formal education",
+  "education.levels.other": "Other education",
+  "year.of.birth.label": "Year of birth (optional)",
+  "optional.fields.information.link": "Learn more about how we use this information.",
+  "optional.fields.submit.button": "Submit",
+  "optional.fields.skip.button": "Skip for now",
+  "continue.to.platform": "Continue to {platformName}",
+  "modal.title": "Thanks for letting us know.",
+  "modal.description": "You can complete your profile in settings at any time if you change your mind.",
+  "welcome.page.error.heading": "We couldn't update your profile",
+  "welcome.page.error.message": "An error occurred. You can complete your profile in settings at any time."
 }

src/index.jsx

@@ -8,9 +8,9 @@ import {
   APP_INIT_ERROR, APP_READY, initialize, mergeConfig, subscribe,
 } from '@edx/frontend-platform';
 import { ErrorPage } from '@edx/frontend-platform/react';
+import { messages as paragonMessages } from '@edx/paragon';
 
-import configuration from './config';
-import messages from './i18n';
+import appMessages from './i18n';
 import MainApp from './MainApp';
 
 subscribe(APP_READY, () => {
@@ -27,8 +27,29 @@ subscribe(APP_INIT_ERROR, (error) => {
 initialize({
   handlers: {
     config: () => {
-      mergeConfig(configuration);
+      mergeConfig({
+        LOGIN_ISSUE_SUPPORT_LINK: process.env.LOGIN_ISSUE_SUPPORT_LINK || null,
+        ACTIVATION_EMAIL_SUPPORT_LINK: process.env.ACTIVATION_EMAIL_SUPPORT_LINK || null,
+        PASSWORD_RESET_SUPPORT_LINK: process.env.PASSWORD_RESET_SUPPORT_LINK || null,
+        TOS_AND_HONOR_CODE: process.env.TOS_AND_HONOR_CODE || null,
+        TOS_LINK: process.env.TOS_LINK || null,
+        PRIVACY_POLICY: process.env.PRIVACY_POLICY || null,
+        USER_SURVEY_COOKIE_NAME: process.env.USER_SURVEY_COOKIE_NAME || null,
+        COOKIE_DOMAIN: process.env.COOKIE_DOMAIN,
+        WELCOME_PAGE_SUPPORT_LINK: process.env.WELCOME_PAGE_SUPPORT_LINK || null,
+        DISABLE_ENTERPRISE_LOGIN: process.env.DISABLE_ENTERPRISE_LOGIN || '',
+        INFO_EMAIL: process.env.INFO_EMAIL || '',
+        REGISTER_CONVERSION_COOKIE_NAME: process.env.REGISTER_CONVERSION_COOKIE_NAME || null,
+        ENABLE_PROGRESSIVE_PROFILING: process.env.ENABLE_PROGRESSIVE_PROFILING || false,
+        MARKETING_EMAILS_OPT_IN: process.env.MARKETING_EMAILS_OPT_IN || '',
+        ENABLE_COPPA_COMPLIANCE: process.env.ENABLE_COPPA_COMPLIANCE || '',
+        ENABLE_DYNAMIC_REGISTRATION_FIELDS: process.env.ENABLE_DYNAMIC_REGISTRATION_FIELDS || false,
+        ENABLE_COOKIE_POLICY_BANNER: process.env.ENABLE_COOKIE_POLICY_BANNER || false,
+      });
     },
   },
-  messages,
+  messages: [
+    appMessages,
+    paragonMessages,
+  ],
 });

src/index.scss

@@ -3,4 +3,5 @@
 @import "~@edx/paragon/scss/core/core";
 @import "~@edx/brand/paragon/overrides";
 
+@import "@edx/frontend-component-cookie-policy-banner/build/_cookie-policy-banner";
 @import "sass/style";

src/login/AccountActivationMessage.jsx

@@ -1,7 +1,7 @@
 import React from 'react';
 
 import { getConfig } from '@edx/frontend-platform';
-import { FormattedMessage, useIntl } from '@edx/frontend-platform/i18n';
+import { FormattedMessage, injectIntl, intlShape } from '@edx/frontend-platform/i18n';
 import { Alert } from '@edx/paragon';
 import { CheckCircle, Error } from '@edx/paragon/icons';
 import PropTypes from 'prop-types';
@@ -10,8 +10,7 @@ import { ACCOUNT_ACTIVATION_MESSAGE } from './data/constants';
 import messages from './messages';
 
 const AccountActivationMessage = (props) => {
-  const { formatMessage } = useIntl();
-  const { messageType } = props;
+  const { intl, messageType } = props;
   const variant = messageType === ACCOUNT_ACTIVATION_MESSAGE.ERROR ? 'danger' : messageType;
 
   const activationOrVerification = getConfig().MARKETING_EMAILS_OPT_IN ? 'confirmation' : 'activation';
@@ -26,22 +25,22 @@ const AccountActivationMessage = (props) => {
 
   switch (messageType) {
     case ACCOUNT_ACTIVATION_MESSAGE.SUCCESS: {
-      heading = formatMessage(messages[`account.${activationOrVerification}.success.message.title`]);
-      activationMessage = <span>{formatMessage(messages[`account.${activationOrVerification}.success.message`])}</span>;
+      heading = intl.formatMessage(messages[`account.${activationOrVerification}.success.message.title`]);
+      activationMessage = <span>{intl.formatMessage(messages[`account.${activationOrVerification}.success.message`])}</span>;
       break;
     }
     case ACCOUNT_ACTIVATION_MESSAGE.INFO: {
-      activationMessage = formatMessage(messages[`account.${activationOrVerification}.info.message`]);
+      activationMessage = intl.formatMessage(messages[`account.${activationOrVerification}.info.message`]);
       break;
     }
     case ACCOUNT_ACTIVATION_MESSAGE.ERROR: {
       const supportLink = (
         <Alert.Link href={getConfig().ACTIVATION_EMAIL_SUPPORT_LINK}>
-          {formatMessage(messages['account.activation.support.link'])}
+          {intl.formatMessage(messages['account.activation.support.link'])}
         </Alert.Link>
       );
 
-      heading = formatMessage(messages[`account.${activationOrVerification}.error.message.title`]);
+      heading = intl.formatMessage(messages[`account.${activationOrVerification}.error.message.title`]);
       activationMessage = (
         <FormattedMessage
           id="account.activation.error.message"
@@ -71,6 +70,7 @@ const AccountActivationMessage = (props) => {
 
 AccountActivationMessage.propTypes = {
   messageType: PropTypes.string.isRequired,
+  intl: intlShape.isRequired,
 };
 
-export default AccountActivationMessage;
+export default injectIntl(AccountActivationMessage);

src/login/ChangePasswordPrompt.jsx

@@ -1,7 +1,7 @@
 import React, { useState } from 'react';
 
 import { getConfig } from '@edx/frontend-platform';
-import { useIntl } from '@edx/frontend-platform/i18n';
+import { injectIntl, intlShape } from '@edx/frontend-platform/i18n';
 import {
   ActionRow, ModalDialog, useToggle,
 } from '@edx/paragon';
@@ -9,12 +9,12 @@ import classNames from 'classnames';
 import PropTypes from 'prop-types';
 import { Link, Redirect } from 'react-router-dom';
 
-import messages from './messages';
 import { DEFAULT_REDIRECT_URL, RESET_PAGE } from '../data/constants';
 import { updatePathWithQueryParams } from '../data/utils';
 import useMobileResponsive from '../data/utils/useMobileResponsive';
+import messages from './messages';
 
-const ChangePasswordPrompt = ({ variant, redirectUrl }) => {
+const ChangePasswordPrompt = ({ intl, variant, redirectUrl }) => {
   const isMobileView = useMobileResponsive();
   const [redirectToResetPasswordPage, setRedirectToResetPasswordPage] = useState(false);
   const handlers = {
@@ -28,7 +28,6 @@ const ChangePasswordPrompt = ({ variant, redirectUrl }) => {
   };
   // eslint-disable-next-line no-unused-vars
   const [isOpen, open, close] = useToggle(true, handlers);
-  const { formatMessage } = useIntl();
 
   if (redirectToResetPasswordPage) {
     return <Redirect to={updatePathWithQueryParams(RESET_PAGE)} />;
@@ -43,11 +42,11 @@ const ChangePasswordPrompt = ({ variant, redirectUrl }) => {
     >
       <ModalDialog.Header>
         <ModalDialog.Title>
-          {formatMessage(messages[`password.security.${variant}.title`])}
+          {intl.formatMessage(messages[`password.security.${variant}.title`])}
         </ModalDialog.Title>
       </ModalDialog.Header>
       <ModalDialog.Body>
-        {formatMessage(messages[`password.security.${variant}.body`])}
+        {intl.formatMessage(messages[`password.security.${variant}.body`])}
       </ModalDialog.Body>
       <ModalDialog.Footer>
         <ActionRow className={classNames(
@@ -56,7 +55,7 @@ const ChangePasswordPrompt = ({ variant, redirectUrl }) => {
         >
           {variant === 'nudge' ? (
             <ModalDialog.CloseButton id="password-security-close" variant="tertiary">
-              {formatMessage(messages['password.security.close.button'])}
+              {intl.formatMessage(messages['password.security.close.button'])}
             </ModalDialog.CloseButton>
           ) : null}
           <Link
@@ -67,7 +66,7 @@ const ChangePasswordPrompt = ({ variant, redirectUrl }) => {
             )}
             to={updatePathWithQueryParams(RESET_PAGE)}
           >
-            {formatMessage(messages['password.security.redirect.to.reset.password.button'])}
+            {intl.formatMessage(messages['password.security.redirect.to.reset.password.button'])}
           </Link>
         </ActionRow>
       </ModalDialog.Footer>
@@ -81,8 +80,9 @@ ChangePasswordPrompt.defaultProps = {
 };
 
 ChangePasswordPrompt.propTypes = {
+  intl: intlShape.isRequired,
   variant: PropTypes.oneOf(['nudge', 'block']),
   redirectUrl: PropTypes.string,
 };
 
-export default ChangePasswordPrompt;
+export default injectIntl(ChangePasswordPrompt);

src/login/LoginFailure.jsx

@@ -2,7 +2,7 @@ import React from 'react';
 
 import { getConfig } from '@edx/frontend-platform';
 import { getAuthService } from '@edx/frontend-platform/auth';
-import { FormattedMessage, useIntl } from '@edx/frontend-platform/i18n';
+import { FormattedMessage, injectIntl, intlShape } from '@edx/frontend-platform/i18n';
 import { Alert, Hyperlink } from '@edx/paragon';
 import { Error } from '@edx/paragon/icons';
 import PropTypes from 'prop-types';
@@ -20,19 +20,17 @@ import {
   NON_COMPLIANT_PASSWORD_EXCEPTION,
   NUDGE_PASSWORD_CHANGE,
   REQUIRE_PASSWORD_CHANGE,
-  TPA_AUTHENTICATION_FAILURE,
 } from './data/constants';
 import messages from './messages';
 
 const LoginFailureMessage = (props) => {
-  const { formatMessage } = useIntl();
+  const { intl } = props;
   const { context, errorCode } = props.loginError;
-
   const authService = getAuthService();
   let errorList;
   let resetLink = (
     <Hyperlink destination="reset" isInline>
-      {formatMessage(messages['login.incorrect.credentials.error.reset.link.text'])}
+      {intl.formatMessage(messages['login.incorrect.credentials.error.reset.link.text'])}
     </Hyperlink>
   );
 
@@ -40,19 +38,19 @@ const LoginFailureMessage = (props) => {
     case NON_COMPLIANT_PASSWORD_EXCEPTION: {
       errorList = (
         <>
-          <strong>{formatMessage(messages['non.compliant.password.title'])}</strong>
-          <p>{formatMessage(messages['non.compliant.password.message'])}</p>
+          <strong>{intl.formatMessage(messages['non.compliant.password.title'])}</strong>
+          <p>{intl.formatMessage(messages['non.compliant.password.message'])}</p>
         </>
       );
       break;
     }
     case FORBIDDEN_REQUEST:
-      errorList = <p>{formatMessage(messages['login.rate.limit.reached.message'])}</p>;
+      errorList = <p>{intl.formatMessage(messages['login.rate.limit.reached.message'])}</p>;
       break;
     case INACTIVE_USER: {
       const supportLink = (
         <a href={context.supportLink}>
-          {formatMessage(messages['contact.support.link'], { platformName: context.platformName })}
+          {intl.formatMessage(messages['contact.support.link'], { platformName: context.platformName })}
         </a>
       );
       errorList = (
@@ -76,7 +74,7 @@ const LoginFailureMessage = (props) => {
       const url = `${getConfig().LMS_BASE_URL}/dashboard/?tpa_hint=${context.tpaHint}`;
       const tpaLink = (
         <a href={url}>
-          {formatMessage(messages['tpa.account.link'], { provider: context.provider })}
+          {intl.formatMessage(messages['tpa.account.link'], { provider: context.provider })}
         </a>
       );
       errorList = (
@@ -92,12 +90,12 @@ const LoginFailureMessage = (props) => {
       break;
     }
     case INVALID_FORM:
-      errorList = <p>{formatMessage(messages['login.form.invalid.error.message'])}</p>;
+      errorList = <p>{intl.formatMessage(messages['login.form.invalid.error.message'])}</p>;
       break;
     case FAILED_LOGIN_ATTEMPT: {
       resetLink = (
         <Hyperlink destination="reset" isInline>
-          {formatMessage(messages['login.incorrect.credentials.error.before.account.blocked.text'])}
+          {intl.formatMessage(messages['login.incorrect.credentials.error.before.account.blocked.text'])}
         </Hyperlink>
       );
       errorList = (
@@ -126,7 +124,7 @@ const LoginFailureMessage = (props) => {
     case ACCOUNT_LOCKED_OUT: {
       errorList = (
         <>
-          <p>{formatMessage(messages['account.locked.out.message.1'])}</p>
+          <p>{intl.formatMessage(messages['account.locked.out.message.1'])}</p>
           <p>
             <FormattedMessage
               id="account.locked.out.message.2"
@@ -141,7 +139,7 @@ const LoginFailureMessage = (props) => {
     }
     case INCORRECT_EMAIL_PASSWORD:
       if (context.failureCount <= 1) {
-        errorList = <p>{formatMessage(messages['login.incorrect.credentials.error'])}</p>;
+        errorList = <p>{intl.formatMessage(messages['login.incorrect.credentials.error'])}</p>;
       } else if (context.failureCount === 2) {
         errorList = (
           <p>
@@ -167,25 +165,15 @@ const LoginFailureMessage = (props) => {
       );
     case REQUIRE_PASSWORD_CHANGE:
       return <ChangePasswordPrompt />;
-    case TPA_AUTHENTICATION_FAILURE:
-      errorList = (
-        <p>{formatMessage(messages['login.tpa.authentication.failure'], {
-          platform_name: getConfig().SITE_NAME,
-          lineBreak: <br />,
-          errorMessage: context.errorMessage,
-        })}
-        </p>
-      );
-      break;
     case INTERNAL_SERVER_ERROR:
     default:
-      errorList = <p>{formatMessage(messages['internal.server.error.message'])}</p>;
+      errorList = <p>{intl.formatMessage(messages['internal.server.error.message'])}</p>;
       break;
   }
 
   return (
     <Alert id="login-failure-alert" className="mb-5" variant="danger" icon={Error}>
-      <Alert.Heading>{formatMessage(messages['login.failure.header.title'])}</Alert.Heading>
+      <Alert.Heading>{intl.formatMessage(messages['login.failure.header.title'])}</Alert.Heading>
       { errorList }
     </Alert>
   );
@@ -195,26 +183,17 @@ LoginFailureMessage.defaultProps = {
   loginError: {
     redirectUrl: null,
     errorCode: null,
-    errorMessage: null,
   },
 };
 
 LoginFailureMessage.propTypes = {
   loginError: PropTypes.shape({
-    context: PropTypes.shape({
-      supportLink: PropTypes.string,
-      platformName: PropTypes.string,
-      tpaHint: PropTypes.string,
-      provider: PropTypes.string,
-      allowedDomain: PropTypes.string,
-      remainingAttempts: PropTypes.number,
-      failureCount: PropTypes.number,
-      errorMessage: PropTypes.string,
-    }),
+    context: PropTypes.object,
     email: PropTypes.string,
     errorCode: PropTypes.string,
     redirectUrl: PropTypes.string,
   }),
+  intl: intlShape.isRequired,
 };
 
-export default LoginFailureMessage;
+export default injectIntl(LoginFailureMessage);

src/login/LoginPage.jsx

@@ -3,7 +3,7 @@ import { connect } from 'react-redux';
 
 import { getConfig } from '@edx/frontend-platform';
 import { sendPageEvent, sendTrackEvent } from '@edx/frontend-platform/analytics';
-import { injectIntl } from '@edx/frontend-platform/i18n';
+import { injectIntl, intlShape } from '@edx/frontend-platform/i18n';
 import {
   Form, Hyperlink, Icon, StatefulButton,
 } from '@edx/paragon';
@@ -13,14 +13,6 @@ import { Helmet } from 'react-helmet';
 import Skeleton from 'react-loading-skeleton';
 import { Link } from 'react-router-dom';
 
-import AccountActivationMessage from './AccountActivationMessage';
-import {
-  loginRemovePasswordResetBanner, loginRequest, loginRequestFailure, loginRequestReset, setLoginFormData,
-} from './data/actions';
-import { INVALID_FORM, TPA_AUTHENTICATION_FAILURE } from './data/constants';
-import { loginErrorSelector, loginFormDataSelector, loginRequestSelector } from './data/selectors';
-import LoginFailureMessage from './LoginFailure';
-import messages from './messages';
 import {
   FormGroup, InstitutionLogistration, PasswordField, RedirectLogistration,
   RenderInstitutionButton, SocialAuthProviders, ThirdPartyAuthAlert,
@@ -33,7 +25,7 @@ import {
 } from '../data/constants';
 import {
   getActivationStatus,
-  getAllPossibleQueryParams,
+  getAllPossibleQueryParam,
   getTpaHint,
   getTpaProvider,
   setSurveyCookie,
@@ -41,6 +33,14 @@ import {
   windowScrollTo,
 } from '../data/utils';
 import ResetPasswordSuccess from '../reset-password/ResetPasswordSuccess';
+import AccountActivationMessage from './AccountActivationMessage';
+import {
+  loginRemovePasswordResetBanner, loginRequest, loginRequestFailure, loginRequestReset, setLoginFormData,
+} from './data/actions';
+import { INVALID_FORM } from './data/constants';
+import { loginErrorSelector, loginFormDataSelector, loginRequestSelector } from './data/selectors';
+import LoginFailureMessage from './LoginFailure';
+import messages from './messages';
 
 class LoginPage extends React.Component {
   constructor(props, context) {
@@ -54,7 +54,7 @@ class LoginPage extends React.Component {
       },
       isSubmitted: false,
     };
-    this.queryParams = getAllPossibleQueryParams();
+    this.queryParams = getAllPossibleQueryParam();
     this.tpaHint = getTpaHint();
   }
 
@@ -122,7 +122,7 @@ class LoginPage extends React.Component {
       email_or_username: emailOrUsername, password, ...this.queryParams,
     };
     this.props.loginRequest(payload);
-  };
+  }
 
   handleOnFocus = (e) => {
     const { errors } = this.state;
@@ -130,14 +130,14 @@ class LoginPage extends React.Component {
     this.props.setLoginFormData({
       errors,
     });
-  };
+  }
 
   handleOnBlur = (e) => {
     const payload = {
       [e.target.name]: e.target.value,
     };
     this.props.setLoginFormData(payload);
-  };
+  }
 
   handleForgotPasswordLinkClickEvent = () => {
     sendTrackEvent('edx.bi.password-reset_form.toggled', { category: 'user-engagement' });
@@ -223,17 +223,16 @@ class LoginPage extends React.Component {
         />
       );
     }
-    const tpaAuthenticationError = {};
-    if (thirdPartyAuthContext.errorMessage) {
-      tpaAuthenticationError.context = {
-        errorMessage: thirdPartyAuthContext.errorMessage,
-      };
-      tpaAuthenticationError.errorCode = TPA_AUTHENTICATION_FAILURE;
-    }
+
     if (this.props.loginResult.success) {
-      window.parent.postMessage({ loggedin: true, redirectUrl: this.props.loginResult.redirectUrl }, 'https://discover.edx.org/social-reg');
       setSurveyCookie('login');
-      return null;
+
+      // Fire optimizely events
+      window.optimizely = window.optimizely || [];
+      window.optimizely.push({
+        type: 'event',
+        eventName: 'authn-login-coversion',
+      });
     }
 
     return (
@@ -243,18 +242,20 @@ class LoginPage extends React.Component {
             { siteName: getConfig().SITE_NAME })}
           </title>
         </Helmet>
-        {/*<RedirectLogistration*/}
-        {/*  success={this.props.loginResult.success}*/}
-        {/*  redirectUrl={this.props.loginResult.redirectUrl}*/}
-        {/*  finishAuthUrl={thirdPartyAuthContext.finishAuthUrl}*/}
-        {/*/>*/}
+        <RedirectLogistration
+          success={this.props.loginResult.success}
+          redirectUrl={this.props.loginResult.redirectUrl}
+          finishAuthUrl={thirdPartyAuthContext.finishAuthUrl}
+        />
         <div className="mw-xs mt-3">
-          <ThirdPartyAuthAlert
-            currentProvider={thirdPartyAuthContext.currentProvider}
-            platformName={thirdPartyAuthContext.platformName}
-          />
+          {thirdPartyAuthContext.currentProvider
+          && (
+            <ThirdPartyAuthAlert
+              currentProvider={thirdPartyAuthContext.currentProvider}
+              platformName={thirdPartyAuthContext.platformName}
+            />
+          )}
           {this.props.loginError ? <LoginFailureMessage loginError={this.props.loginError} /> : null}
-          {thirdPartyAuthContext.errorMessage ? <LoginFailureMessage loginError={tpaAuthenticationError} /> : null}
           {submitState === DEFAULT_STATE && this.state.isSubmitted ? windowScrollTo({ left: 0, top: 0, behavior: 'smooth' }) : null}
           {activationMsgType && <AccountActivationMessage messageType={activationMsgType} />}
           {this.props.resetPassword && !this.props.loginError ? <ResetPasswordSuccess /> : null}
@@ -294,16 +295,16 @@ class LoginPage extends React.Component {
               onClick={this.handleSubmit}
               onMouseDown={(e) => e.preventDefault()}
             />
-            {/*<Link*/}
-            {/*  id="forgot-password"*/}
-            {/*  name="forgot-password"*/}
-            {/*  className="btn btn-link font-weight-500 text-body"*/}
-            {/*  to={updatePathWithQueryParams(RESET_PAGE)}*/}
-            {/*  onClick={this.handleForgotPasswordLinkClickEvent}*/}
-            {/*>*/}
-            {/*  {intl.formatMessage(messages['forgot.password'])}*/}
-            {/*</Link>*/}
-            {/*{this.renderThirdPartyAuth(providers, secondaryProviders, currentProvider, thirdPartyAuthApiStatus, intl)}*/}
+            <Link
+              id="forgot-password"
+              name="forgot-password"
+              className="btn btn-link font-weight-500 text-body"
+              to={updatePathWithQueryParams(RESET_PAGE)}
+              onClick={this.handleForgotPasswordLinkClickEvent}
+            >
+              {intl.formatMessage(messages['forgot.password'])}
+            </Link>
+            {this.renderThirdPartyAuth(providers, secondaryProviders, currentProvider, thirdPartyAuthApiStatus, intl)}
           </Form>
         </div>
       </>
@@ -363,7 +364,6 @@ LoginPage.defaultProps = {
   thirdPartyAuthApiStatus: 'pending',
   thirdPartyAuthContext: {
     currentProvider: null,
-    errorMessage: null,
     finishAuthUrl: null,
     providers: [],
     secondaryProviders: [],
@@ -372,10 +372,8 @@ LoginPage.defaultProps = {
 
 LoginPage.propTypes = {
   getThirdPartyAuthContext: PropTypes.func.isRequired,
-  intl: PropTypes.shape({
-    formatMessage: PropTypes.func,
-  }).isRequired,
-  loginError: PropTypes.shape({}),
+  intl: intlShape.isRequired,
+  loginError: PropTypes.objectOf(PropTypes.any),
   loginRequest: PropTypes.func.isRequired,
   loginRequestFailure: PropTypes.func.isRequired,
   loginRequestReset: PropTypes.func.isRequired,
@@ -398,10 +396,9 @@ LoginPage.propTypes = {
   thirdPartyAuthApiStatus: PropTypes.string,
   thirdPartyAuthContext: PropTypes.shape({
     currentProvider: PropTypes.string,
-    errorMessage: PropTypes.string,
     platformName: PropTypes.string,
-    providers: PropTypes.arrayOf(PropTypes.shape({})),
-    secondaryProviders: PropTypes.arrayOf(PropTypes.shape({})),
+    providers: PropTypes.array,
+    secondaryProviders: PropTypes.array,
     finishAuthUrl: PropTypes.string,
   }),
   institutionLogin: PropTypes.bool.isRequired,

src/login/data/constants.js

@@ -10,7 +10,6 @@ export const INCORRECT_EMAIL_PASSWORD = 'incorrect-email-or-password';
 export const NUDGE_PASSWORD_CHANGE = 'nudge-password-change';
 export const REQUIRE_PASSWORD_CHANGE = 'require-password-change';
 export const ALLOWED_DOMAIN_LOGIN_ERROR = 'allowed-domain-login-error';
-export const TPA_AUTHENTICATION_FAILURE = 'tpa-authentication-failure';
 
 // Account Activation Message
 export const ACCOUNT_ACTIVATION_MESSAGE = {

src/login/data/reducers.js

@@ -1,6 +1,6 @@
-import { LOGIN_PERSIST_FORM_DATA, LOGIN_REMOVE_PASSWORD_RESET_BANNER, LOGIN_REQUEST } from './actions';
 import { DEFAULT_STATE, PENDING_STATE } from '../../data/constants';
 import { RESET_PASSWORD } from '../../reset-password';
+import { LOGIN_PERSIST_FORM_DATA, LOGIN_REMOVE_PASSWORD_RESET_BANNER, LOGIN_REQUEST } from './actions';
 
 export const defaultState = {
   loginError: null,
@@ -16,7 +16,7 @@ export const defaultState = {
   },
 };
 
-const reducer = (state = defaultState, action = {}) => {
+const reducer = (state = defaultState, action) => {
   switch (action.type) {
     case LOGIN_REQUEST.BEGIN:
       return {