fix: Missed favicon in Safari (#1079)

Co-authored-by: Stanislav Lunyachek <lunyachek@MacBook-Pro-M1.local>

.env

@@ -15,28 +15,22 @@ SEGMENT_KEY=''
 SITE_NAME=null
 INFO_EMAIL=''
 # ***** Cookies *****
-USER_RETENTION_COOKIE_NAME=null
+REGISTER_CONVERSION_COOKIE_NAME=null
+USER_SURVEY_COOKIE_NAME=null
 # ***** Links *****
 LOGIN_ISSUE_SUPPORT_LINK=''
 AUTHN_PROGRESSIVE_PROFILING_SUPPORT_LINK=null
-POST_REGISTRATION_REDIRECT_URL=''
-SEARCH_CATALOG_URL=''
 # ***** Features flags *****
 DISABLE_ENTERPRISE_LOGIN=''
+ENABLE_COOKIE_POLICY_BANNER=''
 ENABLE_DYNAMIC_REGISTRATION_FIELDS=''
 ENABLE_PROGRESSIVE_PROFILING_ON_AUTHN=''
-ENABLE_POST_REGISTRATION_RECOMMENDATIONS=''
+ENABLE_PERSONALIZED_RECOMMENDATIONS=''
 MARKETING_EMAILS_OPT_IN=''
 SHOW_CONFIGURABLE_EDX_FIELDS=''
-ENABLE_IMAGE_LAYOUT=''
 # ***** Zendesk related keys *****
 ZENDESK_KEY=''
 ZENDESK_LOGO_URL=''
-# ***** Base Container Images *****
-BANNER_IMAGE_LARGE=''
-BANNER_IMAGE_MEDIUM=''
-BANNER_IMAGE_SMALL=''
-BANNER_IMAGE_EXTRA_SMALL=''
 # ***** Miscellaneous *****
 APP_ID=''
 MFE_CONFIG_API_URL=''

.env.development

@@ -19,23 +19,17 @@ REFRESH_ACCESS_TOKEN_ENDPOINT='http://localhost:18000/login_refresh'
 SEGMENT_KEY=''
 SITE_NAME='Your Platform Name Here'
 INFO_EMAIL='info@example.com'
-# ***** Features *****
-ENABLE_DYNAMIC_REGISTRATION_FIELDS='true'
-ENABLE_PROGRESSIVE_PROFILING_ON_AUTHN='true'
 # ***** 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'
 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'
-# ***** Base Container Images *****
-BANNER_IMAGE_LARGE=''
-BANNER_IMAGE_MEDIUM=''
-BANNER_IMAGE_SMALL=''
-BANNER_IMAGE_EXTRA_SMALL=''
 # ***** Miscellaneous *****
 APP_ID=''
 MFE_CONFIG_API_URL=''

.env.private.example

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

.env.test

@@ -16,5 +16,7 @@ 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_SURVEY_COOKIE_NAME='openedx-user-survey-type'
+REGISTER_CONVERSION_COOKIE_NAME='openedx-user-register-conversion'
 APP_ID=''
 MFE_CONFIG_API_URL=''

.eslintrc.js

@@ -1,12 +1,12 @@
 // eslint-disable-next-line import/no-extraneous-dependencies
-const { createConfig } = require('@openedx/frontend-build');
+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
-    // @openedx/frontend-build from v3 to v5:
+    // @edx/frontend-build from v3 to v5:
     // - TypeError: Cannot read property 'range' of null
     indent: [
       'error',
@@ -48,5 +48,7 @@ module.exports = createConfig('eslint', {
       },
     ],
     'function-paren-newline': 'off',
+    'no-import-assign': 'off',
+    'react/no-unstable-nested-components': 'off',
   },
 });

.github/workflows/autoupdate.yml

@@ -3,18 +3,14 @@ on:
   push:
     branches:
       - master
-  pull_request:
-    types: [ labeled ]  
-    branches:
-      - master  
 jobs:
   autoupdate:
     name: autoupdate
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
       - uses: docker://chinthakagodawita/autoupdate-action:v1
         env:
-          GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
+          GITHUB_TOKEN: "${{ secrets.CC_GITHUB_TOKEN }}"
           DRY_RUN: "false"
           PR_FILTER: "labelled"
           PR_LABELS: "autoupdate"

.github/workflows/lockfileversion-check.yml

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

Makefile

@@ -1,20 +1,19 @@
 export TRANSIFEX_RESOURCE = frontend-app-authn
-transifex_langs = "ar,de,de_DE,es_419,fa_IR,fr,fr_CA,hi,it,it_IT,pt,pt_PT,ru,uk,zh_CN"
+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
 
 # This directory must match .babelrc .
-transifex_temp = ./temp/babel-plugin-formatjs
+transifex_temp = ./temp/babel-plugin-react-intl
 
 precommit:
 	npm run lint
 	npm audit
 
 requirements:
-	npm ci
+	npm install
 
 i18n.extract:
 	# Pulling display strings from .jsx files into .json files...
@@ -43,38 +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 $(ATLAS_OPTIONS) \
-	           translations/paragon/src/i18n/messages:paragon \
-	           translations/frontend-platform/src/i18n/messages:frontend-platform \
-	           translations/frontend-app-authn/src/i18n/messages:frontend-app-authn
 
-	$(intl_imports) paragon frontend-platform 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

@@ -1,12 +1,12 @@
-##################
-frontend-app-authn
-##################
-
 |Build Status| |ci-badge| |Codecov| |semantic-release|
 
-********
-Purpose
-********
+frontend-app-authn
+====================
+
+Please tag **@openedx/vanguards** on any PRs or issues.  Thanks!
+
+Introduction
+------------
 
 This is a micro-frontend application responsible for the login, registration and password reset functionality.
 
@@ -22,12 +22,9 @@ This is a micro-frontend application responsible for the login, registration and
 
 - Progressive profiling page
 
-***************
-Getting Started
-***************
 
 Installation
-============
+------------
 
 This MFE is bundled with `Devstack <https://github.com/openedx/devstack>`_, see the `Getting Started <https://github.com/openedx/devstack#getting-started>`_ section for setup instructions.
 
@@ -49,7 +46,7 @@ This MFE is bundled with `Devstack <https://github.com/openedx/devstack>`_, see
    **Note:** Follow `Enable social auth locally <docs/how_tos/enable_social_auth.rst>`_ for enabling Social Sign-on Buttons (SSO) locally
 
 Environment Variables/Setup Notes
-=================================
+---------------------------------
 
 This MFE is configured via environment variables supplied at build time.  All micro-frontends have a shared set of required environment variables, as documented in the Open edX Developer Guide under `Required Environment Variables <https://edx.readthedocs.io/projects/edx-developer-docs/en/latest/developers_guide/micro_frontends_in_open_edx.html#required-environment-variables>`__.
 
@@ -115,13 +112,12 @@ The authentication micro-frontend also requires the following additional variabl
      - 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`` | ``''``
 
-   * - ``ENABLE_IMAGE_LAYOUT``
-     - Enables the image layout feature within the authn. When set to True, this feature allows the inclusion of images in the base container layout. For more details on configuring this feature, please refer to the `Modifying base container <docs/how_tos/modifying_base_container.rst>`_.
-     - ``true`` | ``''`` (empty strings are falsy)
-
+   * - ``ENABLE_COOKIE_POLICY_BANNER``
+     - Enables support for displaying the cookies acceptance banner.
+     - ``true`` | ``''`` (empty strings are falsy)     
 
 edX-specific Environment Variables
-==================================
+**********************************
 
 Furthermore, there are several edX-specific environment variables that enable integrations with closed-source services private to the edX organization, and might be unsupported in Open edX.
 
@@ -145,8 +141,7 @@ 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>`_.
 
@@ -157,58 +152,34 @@ can find it it at `PULL_REQUEST_TEMPLATE.md <https://github.com/openedx/frontend
 
 This project is currently accepting all types of contributions, bug fixes and security fixes.
 
-Getting Help
-============
-
-If you're having trouble, we have discussion forums at
-https://discuss.openedx.org where you can connect with others in the community.
-
-Our real-time conversations are on Slack. You can request a `Slack
-invitation`_, then join our `community Slack workspace`_.  Because this is a
-frontend repository, the best place to discuss it would be in the `#wg-frontend
-channel`_.
-
-For anything non-trivial, the best path is to open an issue in this repository
-with as many details about the issue you are facing as you can provide.
-
-https://github.com/openedx/frontend-app-authn/issues
-
-For more information about these options, see the `Getting Help`_ page.
-
-.. _Slack invitation: https://openedx.org/slack
-.. _community Slack workspace: https://openedx.slack.com/
-.. _#wg-frontend channel: https://openedx.slack.com/archives/C04BM6YC7A6
-.. _Getting Help: https://openedx.org/community/connect
-
-The Open edX Code of Conduct
-============================
+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@openedx.org.
+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.
 
-
 ==============================
 
 .. |Build Status| image:: https://api.travis-ci.com/edx/frontend-app-authn.svg?branch=master

docs/how_tos/modifying_base_container.rst

@@ -1,39 +0,0 @@
-========================================
-Modifying the Base Container in Authn
-========================================
-
-The base container in Authn serves as the fundamental layout structure for rendering different components based on configurations. This document outlines the process for modifying the base container to accommodate changes or customize layouts as needed.
-
-Understanding Base Container Versions
---------------------------------------
-
-The base container supports two main versions:
-
-- **Default Layout:** The default layout is the standard layout used when specific configurations do not dictate otherwise.
-.. image:: ../images/default_layout.png
-- **Image Layout:** The image layout is an alternative layout option that can be enabled based on configurations.
-.. image:: ../images/image_layout.png
-
-Enabling the Image Layout
----------------------------
-
-To activate the image layout feature, navigate to your .env file and update the configurations:
-
-**Update Configuration**
-
-Locate the ``ENABLE_IMAGE_LAYOUT`` parameter and set its value to  ``true``. Additionally, ensure that the Image configuration settings are provided. Your overall configurations should resemble the following:
-
-
-   .. code-block::
-
-      # ***** Image Layout Configuration *****
-      ENABLE_IMAGE_LAYOUT = True  # Set to True to enable image layout feature
-
-      # ***** Base Container Images *****
-      BANNER_IMAGE_LARGE='' # Path to the large banner image
-      BANNER_IMAGE_MEDIUM='' # Path to the medium-sized banner image
-      BANNER_IMAGE_SMALL=''  # Path to the small banner image
-      BANNER_IMAGE_EXTRA_SMALL=''  # Path to the extra-small banner image
-
-
-This allows for the customization and adaptation of the base container layout according to specific requirements.

jest.config.js

@@ -1,4 +1,4 @@
-const { createConfig } = require('@openedx/frontend-build');
+const { createConfig } = require('@edx/frontend-build');
 
 module.exports = createConfig('jest', {
   setupFiles: [

package.json

@@ -11,7 +11,7 @@
   ],
   "scripts": {
     "build": "fedx-scripts webpack",
-    "i18n_extract": "fedx-scripts formatjs extract",
+    "i18n_extract": "BABEL_ENV=i18n fedx-scripts babel src --quiet > /dev/null",
     "lint": "fedx-scripts eslint --ext .js --ext .jsx .",
     "snapshot": "fedx-scripts jest --updateSnapshot",
     "start": "fedx-scripts webpack-dev-server --progress",
@@ -32,54 +32,60 @@
     "url": "https://github.com/openedx/frontend-app-authn/issues"
   },
   "dependencies": {
-    "@edx/brand": "npm:@openedx/brand-openedx@^1.2.2",
-    "@edx/frontend-platform": "7.0.1",
-    "@edx/openedx-atlas": "^0.6.0",
-    "@fortawesome/fontawesome-svg-core": "6.5.1",
-    "@fortawesome/free-brands-svg-icons": "6.5.1",
-    "@fortawesome/free-solid-svg-icons": "6.5.1",
+    "@edx/brand": "npm:@edx/brand-openedx@1.2.0",
+    "@edx/frontend-component-cookie-policy-banner": "2.2.2",
+    "@edx/frontend-platform": "4.2.0",
+    "@edx/paragon": "20.30.1",
+    "@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",
-    "@openedx/paragon": "^22.1.1",
     "@optimizely/react-sdk": "^2.9.1",
-    "@redux-devtools/extension": "3.3.0",
-    "@testing-library/react": "^12.1.5",
-    "@testing-library/react-hooks": "^8.0.1",
+    "@redux-devtools/extension": "3.2.5",
     "algoliasearch": "^4.14.3",
-    "algoliasearch-helper": "^3.14.0",
-    "classnames": "2.5.1",
-    "core-js": "3.35.1",
+    "classnames": "2.3.2",
+    "core-js": "3.30.0",
+    "extract-react-intl-messages": "4.1.1",
     "fastest-levenshtein": "1.0.16",
-    "form-urlencoded": "6.1.4",
+    "form-urlencoded": "6.1.0",
+    "lodash.camelcase": "4.3.0",
+    "lodash.snakecase": "4.1.1",
     "prop-types": "15.8.1",
-    "query-string": "7.1.3",
-    "react": "^17.0.2",
-    "react-dom": "^17.0.2",
+    "query-string": "5.1.1",
+    "react": "16.14.0",
+    "react-dom": "16.14.0",
     "react-helmet": "6.1.0",
-    "react-loading-skeleton": "3.3.1",
+    "react-loading-skeleton": "3.2.0",
+    "react-onclickoutside": "6.13.0",
     "react-redux": "7.2.9",
     "react-responsive": "8.2.0",
-    "react-router": "6.21.3",
-    "react-router-dom": "6.21.3",
+    "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.3.0",
+    "redux-saga": "1.2.3",
     "redux-thunk": "2.4.2",
-    "regenerator-runtime": "0.14.1",
-    "reselect": "4.1.8",
+    "regenerator-runtime": "0.13.11",
+    "reselect": "4.1.7",
+    "sanitize-html": "2.10.0",
+    "semver-regex": "3.1.4",
     "universal-cookie": "4.0.4"
   },
   "devDependencies": {
     "@edx/browserslist-config": "^1.1.1",
+    "@edx/frontend-build": "12.8.6",
     "@edx/reactifex": "1.1.0",
-    "@openedx/frontend-build": "13.0.28",
-    "babel-plugin-formatjs": "10.5.13",
-    "eslint-plugin-import": "2.29.1",
+    "babel-plugin-formatjs": "10.4.0",
+    "enzyme": "3.11.0",
+    "enzyme-adapter-react-16": "1.15.7",
+    "eslint-plugin-import": "2.26.0",
     "glob": "7.2.3",
     "history": "5.3.0",
     "husky": "7.0.4",
-    "jest": "29.7.0",
-    "react-test-renderer": "^17.0.2"
+    "jest": "29.5.0",
+    "react-test-renderer": "16.14.0"
   }
 }

public/index.html

@@ -4,12 +4,7 @@
       <title>Authn | <%= process.env.SITE_NAME %></title>
       <meta charset="utf-8">
       <meta name="viewport" content="width=device-width, initial-scale=1.0">
-      <link rel="shortcut icon" href="<%=htmlWebpackPlugin.options.FAVICON_URL%>" type="image/x-icon"/>
-      <script src="https://cdnjs.cloudflare.com/ajax/libs/iframe-resizer/4.3.9/iframeResizer.contentWindow.min.js"
-              integrity="sha512-mdT/HQRzoRP4laVz49Mndx6rcCGA3IhuyhP3gaY0E9sZPkwbtDk9ttQIq9o8qGCf5VvJv1Xsy3k2yTjfUoczqw=="
-              crossorigin="anonymous"
-              referrerpolicy="no-referrer">
-      </script>
+      <link rel="shortcut icon" href="<%=htmlWebpackPlugin.options.FAVICON_URL%>" type="image/x-icon" />
       <% if (process.env.OPTIMIZELY_URL) { %>
         <script
           src="<%= process.env.OPTIMIZELY_URL %>"

src/MainApp.jsx

@@ -3,10 +3,10 @@ import React from 'react';
 import { getConfig } from '@edx/frontend-platform';
 import { AppProvider } from '@edx/frontend-platform/react';
 import { Helmet } from 'react-helmet';
-import { Navigate, Route, Routes } from 'react-router-dom';
+import { Redirect, Route, Switch } from 'react-router-dom';
 
 import {
-  EmbeddedRegistrationRoute, NotFoundPage, registerIcons, UnAuthOnlyRoute, Zendesk,
+  Logistration, NotFoundPage, registerIcons, UnAuthOnlyRoute, Zendesk,
 } from './common-components';
 import configureStore from './data/configureStore';
 import {
@@ -15,18 +15,14 @@ import {
   PAGE_NOT_FOUND,
   PASSWORD_RESET_CONFIRM,
   RECOMMENDATIONS,
-  REGISTER_EMBEDDED_PAGE,
   REGISTER_PAGE,
   RESET_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 { RegistrationPage } from './register';
 import { ResetPasswordPage } from './reset-password';
-
 import './index.scss';
 
 registerIcons();
@@ -37,26 +33,21 @@ const MainApp = () => (
       <link rel="shortcut icon" href={getConfig().FAVICON_URL} type="image/x-icon" />
     </Helmet>
     {getConfig().ZENDESK_KEY && <Zendesk />}
-    <Routes>
-      <Route path="/" element={<Navigate replace to={updatePathWithQueryParams(REGISTER_PAGE)} />} />
-      <Route
-        path={REGISTER_EMBEDDED_PAGE}
-        element={<EmbeddedRegistrationRoute><RegistrationPage /></EmbeddedRegistrationRoute>}
-      />
-      <Route
-        path={LOGIN_PAGE}
-        element={
-          <UnAuthOnlyRoute><Logistration selectedPage={LOGIN_PAGE} /></UnAuthOnlyRoute>
-        }
-      />
-      <Route path={REGISTER_PAGE} element={<UnAuthOnlyRoute><Logistration /></UnAuthOnlyRoute>} />
-      <Route path={RESET_PAGE} element={<UnAuthOnlyRoute><ForgotPasswordPage /></UnAuthOnlyRoute>} />
-      <Route path={PASSWORD_RESET_CONFIRM} element={<ResetPasswordPage />} />
-      <Route path={AUTHN_PROGRESSIVE_PROFILING} element={<ProgressiveProfiling />} />
-      <Route path={RECOMMENDATIONS} element={<RecommendationsPage />} />
-      <Route path={PAGE_NOT_FOUND} element={<NotFoundPage />} />
-      <Route path="*" element={<Navigate replace to={PAGE_NOT_FOUND} />} />
-    </Routes>
+    <Switch>
+      <Route exact path="/">
+        <Redirect to={updatePathWithQueryParams(REGISTER_PAGE)} />
+      </Route>
+      <UnAuthOnlyRoute exact path={LOGIN_PAGE} render={() => <Logistration selectedPage={LOGIN_PAGE} />} />
+      <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 path={PAGE_NOT_FOUND} component={NotFoundPage} />
+      <Route path="*">
+        <Redirect to={PAGE_NOT_FOUND} />
+      </Route>
+    </Switch>
   </AppProvider>
 );
 

src/base-component/AuthLargeLayout.jsx

@@ -2,12 +2,12 @@ import React from 'react';
 
 import { getConfig } from '@edx/frontend-platform';
 import { useIntl } from '@edx/frontend-platform/i18n';
-import { Hyperlink, Image } from '@openedx/paragon';
+import { Hyperlink, Image } from '@edx/paragon';
 import PropTypes from 'prop-types';
 
 import messages from './messages';
 
-const LargeLayout = ({ fullName }) => {
+const AuthLargeLayout = ({ username }) => {
   const { formatMessage } = useIntl();
 
   return (
@@ -20,7 +20,7 @@ const LargeLayout = ({ fullName }) => {
           <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, fullName })}
+              {formatMessage(messages['welcome.to.platform'], { siteName: getConfig().SITE_NAME, username })}
             </h1>
             <h2 className="complete-your-profile">
               {formatMessage(messages['complete.your.profile.1'])}
@@ -42,8 +42,8 @@ const LargeLayout = ({ fullName }) => {
   );
 };
 
-LargeLayout.propTypes = {
-  fullName: PropTypes.string.isRequired,
+AuthLargeLayout.propTypes = {
+  username: PropTypes.string.isRequired,
 };
 
-export default LargeLayout;
+export default AuthLargeLayout;

src/base-component/AuthMediumLayout.jsx

@@ -2,12 +2,12 @@ import React from 'react';
 
 import { getConfig } from '@edx/frontend-platform';
 import { useIntl } from '@edx/frontend-platform/i18n';
-import { Hyperlink, Image } from '@openedx/paragon';
+import { Hyperlink, Image } from '@edx/paragon';
 import PropTypes from 'prop-types';
 
 import messages from './messages';
 
-const MediumLayout = ({ fullName }) => {
+const AuthMediumLayout = ({ username }) => {
   const { formatMessage } = useIntl();
 
   return (
@@ -22,7 +22,7 @@ const MediumLayout = ({ fullName }) => {
             <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, fullName })}
+                {formatMessage(messages['welcome.to.platform'], { siteName: getConfig().SITE_NAME, username })}
               </h1>
               <h2 className="display-1">
                 {formatMessage(messages['complete.your.profile.1'])}
@@ -45,8 +45,8 @@ const MediumLayout = ({ fullName }) => {
   );
 };
 
-MediumLayout.propTypes = {
-  fullName: PropTypes.string.isRequired,
+AuthMediumLayout.propTypes = {
+  username: PropTypes.string.isRequired,
 };
 
-export default MediumLayout;
+export default AuthMediumLayout;

src/base-component/AuthSmallLayout.jsx

@@ -2,12 +2,12 @@ import React from 'react';
 
 import { getConfig } from '@edx/frontend-platform';
 import { useIntl } from '@edx/frontend-platform/i18n';
-import { Hyperlink, Image } from '@openedx/paragon';
+import { Hyperlink, Image } from '@edx/paragon';
 import PropTypes from 'prop-types';
 
 import messages from './messages';
 
-const SmallLayout = ({ fullName }) => {
+const AuthSmallLayout = ({ username }) => {
   const { formatMessage } = useIntl();
 
   return (
@@ -20,7 +20,7 @@ const SmallLayout = ({ fullName }) => {
         <div className="small-yellow-line mt-4.5" />
         <div>
           <h1 className="h5 data-hj-suppress">
-            {formatMessage(messages['welcome.to.platform'], { siteName: getConfig().SITE_NAME, fullName })}
+            {formatMessage(messages['welcome.to.platform'], { siteName: getConfig().SITE_NAME, username })}
           </h1>
           <h2 className="h1">
             {formatMessage(messages['complete.your.profile.1'])}
@@ -34,8 +34,8 @@ const SmallLayout = ({ fullName }) => {
   );
 };
 
-SmallLayout.propTypes = {
-  fullName: PropTypes.string.isRequired,
+AuthSmallLayout.propTypes = {
+  username: PropTypes.string.isRequired,
 };
 
-export default SmallLayout;
+export default AuthSmallLayout;

src/base-component/BaseComponent.jsx

@@ -0,0 +1,55 @@
+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';
+import MediaQuery from 'react-responsive';
+
+import AuthLargeLayout from './AuthLargeLayout';
+import AuthMediumLayout from './AuthMediumLayout';
+import AuthSmallLayout from './AuthSmallLayout';
+import LargeLayout from './LargeLayout';
+import MediumLayout from './MediumLayout';
+import SmallLayout from './SmallLayout';
+
+const BaseComponent = ({ children, showWelcomeBanner }) => {
+  const authenticatedUser = showWelcomeBanner ? getAuthenticatedUser() : null;
+  const username = authenticatedUser ? authenticatedUser.username : null;
+
+  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}>
+          {authenticatedUser ? <AuthSmallLayout username={username} /> : <SmallLayout />}
+        </MediaQuery>
+        <MediaQuery minWidth={breakpoints.medium.minWidth} maxWidth={breakpoints.large.maxWidth - 1}>
+          {authenticatedUser ? <AuthMediumLayout username={username} /> : <MediumLayout />}
+        </MediaQuery>
+        <MediaQuery minWidth={breakpoints.extraLarge.minWidth} maxWidth={breakpoints.extraExtraLarge.maxWidth}>
+          {authenticatedUser ? <AuthLargeLayout username={username} /> : <LargeLayout />}
+        </MediaQuery>
+
+        <div className={classNames('content', { 'align-items-center mt-0': authenticatedUser })}>
+          {children}
+        </div>
+      </div>
+    </>
+  );
+};
+
+BaseComponent.defaultProps = {
+  showWelcomeBanner: false,
+};
+
+BaseComponent.propTypes = {
+  children: PropTypes.node.isRequired,
+  showWelcomeBanner: PropTypes.bool,
+};
+
+export default BaseComponent;

src/base-component/LargeLayout.jsx

@@ -2,7 +2,7 @@ import React from 'react';
 
 import { getConfig } from '@edx/frontend-platform';
 import { useIntl } from '@edx/frontend-platform/i18n';
-import { Hyperlink, Image } from '@openedx/paragon';
+import { Hyperlink, Image } from '@edx/paragon';
 import classNames from 'classnames';
 
 import messages from './messages';

src/base-component/MediumLayout.jsx

@@ -2,7 +2,7 @@ import React from 'react';
 
 import { getConfig } from '@edx/frontend-platform';
 import { useIntl } from '@edx/frontend-platform/i18n';
-import { Hyperlink, Image } from '@openedx/paragon';
+import { Hyperlink, Image } from '@edx/paragon';
 import classNames from 'classnames';
 
 import messages from './messages';

src/base-component/SmallLayout.jsx

@@ -2,7 +2,7 @@ import React from 'react';
 
 import { getConfig } from '@edx/frontend-platform';
 import { useIntl } from '@edx/frontend-platform/i18n';
-import { Hyperlink, Image } from '@openedx/paragon';
+import { Hyperlink, Image } from '@edx/paragon';
 import classNames from 'classnames';
 
 import messages from './messages';

src/base-component/index.jsx

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

src/base-component/messages.jsx

@@ -1,11 +1,17 @@
 import { defineMessages } from '@edx/frontend-platform/i18n';
 
 const messages = defineMessages({
-  'welcome.to.platform': {
-    id: 'welcome.to.platform',
-    defaultMessage: 'Welcome to {siteName}, {fullName}!',
-    description: 'Welcome message that appears on progressive profile page',
+  'start.learning': {
+    id: 'start.learning',
+    defaultMessage: 'Start learning',
+    description: 'Header text for logistration MFE pages',
   },
+  'with.site.name': {
+    id: 'with.site.name',
+    defaultMessage: 'with {siteName}',
+    description: 'Header text with site name for logistration MFE pages',
+  },
+  // authenticated user base component text
   'complete.your.profile.1': {
     id: 'complete.your.profile.1',
     defaultMessage: 'Complete',
@@ -16,6 +22,11 @@ const messages = defineMessages({
     defaultMessage: 'your profile',
     description: 'part of text "complete your profile"',
   },
+  'welcome.to.platform': {
+    id: 'welcome.to.platform',
+    defaultMessage: 'Welcome to {siteName}, {username}!',
+    description: 'Welcome message that appears on progressive profile page',
+  },
 });
 
 export default messages;

src/base-component/tests/BaseComponent.test.jsx

@@ -0,0 +1,52 @@
+import React from 'react';
+
+import { IntlProvider } from '@edx/frontend-platform/i18n';
+import { mount } from 'enzyme';
+
+import LargeLayout from '../LargeLayout';
+import MediumLayout from '../MediumLayout';
+import SmallLayout from '../SmallLayout';
+
+describe('ScreenLayout', () => {
+  it('should display the form, pass as a child in SmallScreenLayout', () => {
+    const smallScreen = mount(
+      <IntlProvider locale="en">
+        <div>
+          <SmallLayout />
+          <form>
+            <input type="text" />
+          </form>
+        </div>
+      </IntlProvider>,
+    );
+    expect(smallScreen.find('form').exists()).toEqual(true);
+  });
+
+  it('should display the form, pass as a child in MediumScreenLayout', () => {
+    const mediumScreen = mount(
+      <IntlProvider locale="en">
+        <div>
+          <MediumLayout />
+          <form>
+            <input type="text" />
+          </form>
+        </div>
+      </IntlProvider>,
+    );
+    expect(mediumScreen.find('form').exists()).toEqual(true);
+  });
+
+  it('should display the form, pass as a child in LargeScreenLayout', () => {
+    const largeScreen = mount(
+      <IntlProvider locale="en">
+        <div>
+          <LargeLayout />
+          <form>
+            <input type="text" />
+          </form>
+        </div>
+      </IntlProvider>,
+    );
+    expect(largeScreen.find('form').exists()).toEqual(true);
+  });
+});

src/base-container/components/default-layout/DefaultLayout.test.jsx

@@ -1,50 +0,0 @@
-import React from 'react';
-
-import { IntlProvider } from '@edx/frontend-platform/i18n';
-import { render, screen } from '@testing-library/react';
-
-import { DefaultLargeLayout, DefaultMediumLayout, DefaultSmallLayout } from './index';
-
-describe('Default Layout tests', () => {
-  it('should display the form passed as a child in SmallScreenLayout', () => {
-    render(
-      <IntlProvider locale="en">
-        <div>
-          <DefaultSmallLayout />
-          <form aria-label="form">
-            <input type="text" />
-          </form>
-        </div>
-      </IntlProvider>,
-    );
-    expect(screen.getByRole('form')).toBeDefined();
-  });
-
-  it('should display the form passed as a child in MediumScreenLayout', () => {
-    render(
-      <IntlProvider locale="en">
-        <div>
-          <DefaultMediumLayout />
-          <form aria-label="form">
-            <input type="text" />
-          </form>
-        </div>
-      </IntlProvider>,
-    );
-    expect(screen.getByRole('form')).toBeDefined();
-  });
-
-  it('should display the form passed as a child in LargeScreenLayout', () => {
-    render(
-      <IntlProvider locale="en">
-        <div>
-          <DefaultLargeLayout />
-          <form aria-label="form">
-            <input type="text" />
-          </form>
-        </div>
-      </IntlProvider>,
-    );
-    expect(screen.getByRole('form')).toBeDefined();
-  });
-});

src/base-container/components/default-layout/index.jsx

@@ -1,3 +0,0 @@
-export { default as DefaultLargeLayout } from './LargeLayout';
-export { default as DefaultMediumLayout } from './MediumLayout';
-export { default as DefaultSmallLayout } from './SmallLayout';

src/base-container/components/default-layout/messages.js

@@ -1,16 +0,0 @@
-import { defineMessages } from '@edx/frontend-platform/i18n';
-
-const messages = defineMessages({
-  'start.learning': {
-    id: 'start.learning',
-    defaultMessage: 'Start learning',
-    description: 'Header text for logistration MFE pages',
-  },
-  'with.site.name': {
-    id: 'with.site.name',
-    defaultMessage: 'with {siteName}',
-    description: 'Header text with site name for logistration MFE pages',
-  },
-});
-
-export default messages;

src/base-container/components/image-layout/ExtraSmallLayout.jsx

@@ -1,34 +0,0 @@
-import React from 'react';
-
-import { getConfig } from '@edx/frontend-platform';
-import { useIntl } from '@edx/frontend-platform/i18n';
-import { Hyperlink, Image } from '@openedx/paragon';
-
-import messages from './messages';
-
-const ExtraSmallLayout = () => {
-  const { formatMessage } = useIntl();
-
-  return (
-    <span
-      className="w-100 bg-primary-500 banner__image extra-small-layout"
-      style={{ backgroundImage: `url(${getConfig().BANNER_IMAGE_EXTRA_SMALL})` }}
-    >
-      <Hyperlink destination={getConfig().MARKETING_SITE_BASE_URL}>
-        <Image className="company-logo" alt={getConfig().SITE_NAME} src={getConfig().LOGO_WHITE_URL} />
-      </Hyperlink>
-      <div className="ml-4.5 mr-1 pb-3.5 pt-3.5">
-        <h1 className="banner__heading">
-          <span className="text-light-500">
-            {formatMessage(messages['your.career.turning.point'])}{' '}
-          </span>
-          <span className="text-warning-300">
-            {formatMessage(messages['is.here'])}
-          </span>
-        </h1>
-      </div>
-    </span>
-  );
-};
-
-export default ExtraSmallLayout;

src/base-container/components/image-layout/LargeLayout.jsx

@@ -1,35 +0,0 @@
-import React from 'react';
-
-import { getConfig } from '@edx/frontend-platform';
-import { useIntl } from '@edx/frontend-platform/i18n';
-import { Hyperlink, Image } from '@openedx/paragon';
-
-import './index.scss';
-import messages from './messages';
-
-const LargeLayout = () => {
-  const { formatMessage } = useIntl();
-
-  return (
-    <div
-      className="w-50 bg-primary-500 banner__image large-layout"
-      style={{ backgroundImage: `url(${getConfig().BANNER_IMAGE_LARGE})` }}
-    >
-      <Hyperlink destination={getConfig().MARKETING_SITE_BASE_URL}>
-        <Image className="company-logo position-absolute" alt={getConfig().SITE_NAME} src={getConfig().LOGO_WHITE_URL} />
-      </Hyperlink>
-      <div className="min-vh-100 p-5 d-flex align-items-end">
-        <h1 className="display-2 mw-sm mb-3 d-flex flex-column flex-shrink-0 justify-content-center">
-          <span className="text-light-500">
-            {formatMessage(messages['your.career.turning.point'])}
-          </span>
-          <span className="text-warning-300">
-            {formatMessage(messages['is.here'])}
-          </span>
-        </h1>
-      </div>
-    </div>
-  );
-};
-
-export default LargeLayout;

src/base-container/components/image-layout/MediumLayout.jsx

@@ -1,35 +0,0 @@
-import React from 'react';
-
-import { getConfig } from '@edx/frontend-platform';
-import { useIntl } from '@edx/frontend-platform/i18n';
-import { Hyperlink, Image } from '@openedx/paragon';
-
-import './index.scss';
-import messages from './messages';
-
-const MediumLayout = () => {
-  const { formatMessage } = useIntl();
-
-  return (
-    <div
-      className="w-100 mb-3 bg-primary-500 banner__image medium-layout"
-      style={{ backgroundImage: `url(${getConfig().BANNER_IMAGE_MEDIUM})` }}
-    >
-      <Hyperlink destination={getConfig().MARKETING_SITE_BASE_URL}>
-        <Image className="company-logo" alt={getConfig().SITE_NAME} src={getConfig().LOGO_WHITE_URL} />
-      </Hyperlink>
-      <div className="ml-5 pb-4 pt-4">
-        <h1 className="display-2 banner__heading">
-          <span className="text-light-500">
-            {formatMessage(messages['your.career.turning.point'])}{' '}
-          </span>
-          <span className="text-warning-300 d-inline-block">
-            {formatMessage(messages['is.here'])}
-          </span>
-        </h1>
-      </div>
-    </div>
-  );
-};
-
-export default MediumLayout;

src/base-container/components/image-layout/SmallLayout.jsx

@@ -1,34 +0,0 @@
-import React from 'react';
-
-import { getConfig } from '@edx/frontend-platform';
-import { useIntl } from '@edx/frontend-platform/i18n';
-import { Hyperlink, Image } from '@openedx/paragon';
-
-import messages from './messages';
-
-const SmallLayout = () => {
-  const { formatMessage } = useIntl();
-
-  return (
-    <span
-      className="w-100 bg-primary-500 banner__image small-layout"
-      style={{ backgroundImage: `url(${getConfig().BANNER_IMAGE_SMALL})` }}
-    >
-      <Hyperlink destination={getConfig().MARKETING_SITE_BASE_URL}>
-        <Image className="company-logo" alt={getConfig().SITE_NAME} src={getConfig().LOGO_WHITE_URL} />
-      </Hyperlink>
-      <div className="ml-5 mr-1 pb-3.5 pt-3.5">
-        <h1 className="display-2">
-          <span className="text-light-500">
-            {formatMessage(messages['your.career.turning.point'])}{' '}
-          </span>
-          <span className="text-warning-300">
-            {formatMessage(messages['is.here'])}
-          </span>
-        </h1>
-      </div>
-    </span>
-  );
-};
-
-export default SmallLayout;

src/base-container/components/image-layout/index.jsx

@@ -1,4 +0,0 @@
-export { default as ImageLargeLayout } from './LargeLayout';
-export { default as ImageMediumLayout } from './MediumLayout';
-export { default as ImageSmallLayout } from './SmallLayout';
-export { default as ImageExtraSmallLayout } from './ExtraSmallLayout';

src/base-container/components/image-layout/index.scss

@@ -1,37 +0,0 @@
-.company-logo {
-  width: 71px;
-  margin-top: 2rem;
-  margin-left: 1.5rem;
-}
-
-@media (max-width: 576px) {
-  .company-logo {
-    width: 44.67px;
-    margin-top: 1.25rem;
-    margin-left: 1.5rem;
-  }
-}
-
-.banner__image {
-  background-size: cover;
-  background-repeat: no-repeat;
-  border:none;
-}
-
-@media (min-width: 464px) and (max-width: 575.98px) {
-  .banner__heading {
-    font-size: 60px;
-    font-weight: 700;
-    line-height: 60px;
-    letter-spacing: -1.2px;
-  }
-}
-
-@media (min-width: 768px) and (max-width: 800px) {
-  .banner__heading {
-    font-size: 60px !important;
-    font-weight: 700 !important;
-    line-height: 60px !important;
-    letter-spacing: -2px !important;
-  }
-}

src/base-container/components/image-layout/messages.js

@@ -1,16 +0,0 @@
-import { defineMessages } from '@edx/frontend-platform/i18n';
-
-const messages = defineMessages({
-  'your.career.turning.point': {
-    id: 'your.career.turning.point',
-    defaultMessage: 'Your career turning point',
-    description: 'Part of the heading "Your career turning point is here." shown on Authn MFE',
-  },
-  'is.here': {
-    id: 'is.here',
-    defaultMessage: 'is here.',
-    description: 'Part of the heading "Your career turning point is here." shown on Authn MFE',
-  },
-});
-
-export default messages;

src/base-container/components/welcome-page-layout/index.jsx

@@ -1,3 +0,0 @@
-export { default as AuthLargeLayout } from './LargeLayout';
-export { default as AuthMediumLayout } from './MediumLayout';
-export { default as AuthSmallLayout } from './SmallLayout';

src/base-container/data/constants.js

@@ -1,4 +0,0 @@
-const IMAGE_LAYOUT = 'image-layout';
-const DEFAULT_LAYOUT = 'default-layout';
-
-export { DEFAULT_LAYOUT, IMAGE_LAYOUT };

src/base-container/index.jsx

@@ -1,89 +0,0 @@
-import React, { useEffect, useState } from 'react';
-
-import { getConfig } from '@edx/frontend-platform';
-import { breakpoints } from '@openedx/paragon';
-import classNames from 'classnames';
-import PropTypes from 'prop-types';
-import MediaQuery from 'react-responsive';
-
-import { DefaultLargeLayout, DefaultMediumLayout, DefaultSmallLayout } from './components/default-layout';
-import {
-  ImageExtraSmallLayout, ImageLargeLayout, ImageMediumLayout, ImageSmallLayout,
-} from './components/image-layout';
-import { AuthLargeLayout, AuthMediumLayout, AuthSmallLayout } from './components/welcome-page-layout';
-import { DEFAULT_LAYOUT, IMAGE_LAYOUT } from './data/constants';
-
-const BaseContainer = ({ children, showWelcomeBanner, fullName }) => {
-  const [baseContainerVersion, setBaseContainerVersion] = useState(DEFAULT_LAYOUT);
-  const enableImageLayout = getConfig().ENABLE_IMAGE_LAYOUT;
-
-  useEffect(() => {
-    const initRebrandExperiment = () => {
-      if (window.experiments?.rebrandExperiment) {
-        setBaseContainerVersion(window.experiments?.rebrandExperiment?.variation);
-      } else {
-        window.experiments = window.experiments || {};
-        window.experiments.rebrandExperiment = {};
-        window.experiments.rebrandExperiment.handleLoaded = () => {
-          setBaseContainerVersion(window.experiments?.rebrandExperiment?.variation);
-        };
-      }
-    };
-    initRebrandExperiment();
-  }, []);
-
-  if (baseContainerVersion === IMAGE_LAYOUT || enableImageLayout) {
-    return (
-      <div className="layout">
-        <MediaQuery maxWidth={breakpoints.extraSmall.maxWidth - 1}>
-          {showWelcomeBanner ? <AuthSmallLayout fullName={fullName} /> : <ImageExtraSmallLayout />}
-        </MediaQuery>
-        <MediaQuery minWidth={breakpoints.small.minWidth} maxWidth={breakpoints.small.maxWidth - 1}>
-          {showWelcomeBanner ? <AuthSmallLayout fullName={fullName} /> : <ImageSmallLayout />}
-        </MediaQuery>
-        <MediaQuery minWidth={breakpoints.medium.minWidth} maxWidth={breakpoints.large.maxWidth - 1}>
-          {showWelcomeBanner ? <AuthMediumLayout fullName={fullName} /> : <ImageMediumLayout />}
-        </MediaQuery>
-        <MediaQuery minWidth={breakpoints.extraLarge.minWidth}>
-          {showWelcomeBanner ? <AuthLargeLayout fullName={fullName} /> : <ImageLargeLayout />}
-        </MediaQuery>
-        <div className={classNames('content', { 'align-items-center mt-0': showWelcomeBanner })}>
-          {children}
-        </div>
-      </div>
-    );
-  }
-
-  return (
-    <>
-      <div className="col-md-12 extra-large-screen-top-stripe" />
-      <div className="layout">
-        <MediaQuery maxWidth={breakpoints.small.maxWidth - 1}>
-          {showWelcomeBanner ? <AuthSmallLayout fullName={fullName} /> : <DefaultSmallLayout />}
-        </MediaQuery>
-        <MediaQuery minWidth={breakpoints.medium.minWidth} maxWidth={breakpoints.large.maxWidth - 1}>
-          {showWelcomeBanner ? <AuthMediumLayout fullName={fullName} /> : <DefaultMediumLayout />}
-        </MediaQuery>
-        <MediaQuery minWidth={breakpoints.extraLarge.minWidth}>
-          {showWelcomeBanner ? <AuthLargeLayout fullName={fullName} /> : <DefaultLargeLayout />}
-        </MediaQuery>
-        <div className={classNames('content', { 'align-items-center mt-0': showWelcomeBanner })}>
-          {children}
-        </div>
-      </div>
-    </>
-  );
-};
-
-BaseContainer.defaultProps = {
-  showWelcomeBanner: false,
-  fullName: null,
-};
-
-BaseContainer.propTypes = {
-  children: PropTypes.node.isRequired,
-  showWelcomeBanner: PropTypes.bool,
-  fullName: PropTypes.string,
-};
-
-export default BaseContainer;

src/base-container/tests/BaseContainer.test.jsx

@@ -1,59 +0,0 @@
-import React from 'react';
-
-import { mergeConfig } from '@edx/frontend-platform';
-import { IntlProvider } from '@edx/frontend-platform/i18n';
-import { render } from '@testing-library/react';
-import { Context as ResponsiveContext } from 'react-responsive';
-
-import BaseContainer from '../index';
-
-const LargeScreen = {
-  wrappingComponent: ResponsiveContext.Provider,
-  wrappingComponentProps: { value: { width: 1200 } },
-};
-
-describe('Base component tests', () => {
-  it('should show default layout', () => {
-    const { container } = render(
-      <IntlProvider locale="en">
-        <BaseContainer />
-      </IntlProvider>,
-      LargeScreen,
-    );
-
-    expect(container.querySelector('.banner__image')).toBeNull();
-    expect(container.querySelector('.large-screen-svg-primary')).toBeDefined();
-  });
-
-  it('[experiment] should show image layout for treatment group', () => {
-    window.experiments = {
-      rebrandExperiment: {
-        variation: 'image-layout',
-      },
-    };
-
-    const { container } = render(
-      <IntlProvider locale="en">
-        <BaseContainer />
-      </IntlProvider>,
-      LargeScreen,
-    );
-
-    expect(container.querySelector('.banner__image')).toBeDefined();
-  });
-
-  it('renders Image layout when ENABLE_IMAGE_LAYOUT configuration is enabled', () => {
-    mergeConfig({
-      ENABLE_IMAGE_LAYOUT: true,
-    });
-
-    const { container } = render(
-      <IntlProvider locale="en">
-        <BaseContainer showWelcomeBanner={false} />
-      </IntlProvider>,
-      LargeScreen,
-    );
-
-    expect(container.querySelector('.banner__image')).toBeDefined();
-  });
-});

src/common-components/EmbeddedRegistrationRoute.jsx

@@ -1,28 +0,0 @@
-import React from 'react';
-
-import PropTypes from 'prop-types';
-import { Navigate } from 'react-router-dom';
-
-import { PAGE_NOT_FOUND } from '../data/constants';
-import { isHostAvailableInQueryParams } from '../data/utils';
-
-/**
- * This wrapper redirects the requester to embedded register page only if host
- * query param is present.
- */
-const EmbeddedRegistrationRoute = ({ children }) => {
-  const registrationEmbedded = isHostAvailableInQueryParams();
-
-  // Show registration page for embedded experience even if the user is authenticated
-  if (registrationEmbedded) {
-    return children;
-  }
-
-  return <Navigate to={PAGE_NOT_FOUND} replace />;
-};
-
-EmbeddedRegistrationRoute.propTypes = {
-  children: PropTypes.node.isRequired,
-};
-
-export default EmbeddedRegistrationRoute;

src/common-components/EnterpriseSSO.jsx

@@ -2,16 +2,15 @@ import React from 'react';
 
 import { getConfig } from '@edx/frontend-platform';
 import { useIntl } from '@edx/frontend-platform/i18n';
-import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
 import {
   Button, Form,
-  Icon,
-} from '@openedx/paragon';
-import { Login } from '@openedx/paragon/icons';
+} from '@edx/paragon';
+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
@@ -19,8 +18,7 @@ import { LOGIN_PAGE, SUPPORTED_ICON_CLASSES } from '../data/constants';
 const EnterpriseSSO = (props) => {
   const { formatMessage } = useIntl();
   const tpaProvider = props.provider;
-  const hideRegistrationLink = getConfig().ALLOW_PUBLIC_ACCOUNT_CREATION === false
-    || getConfig().SHOW_REGISTRATION_LINKS === false;
+  const disablePublicAccountCreation = getConfig().ALLOW_PUBLIC_ACCOUNT_CREATION === false;
 
   const handleSubmit = (e, url) => {
     e.preventDefault();
@@ -49,18 +47,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,7 +71,7 @@ const EnterpriseSSO = (props) => {
                 className="w-100"
                 onClick={(e) => handleClick(e)}
               >
-                {hideRegistrationLink
+                {disablePublicAccountCreation
                   ? formatMessage(messages['enterprisetpa.login.button.text.public.account.creation.disabled'])
                   : formatMessage(messages['enterprisetpa.login.button.text'])}
               </Button>

src/common-components/FormGroup.jsx

@@ -2,7 +2,7 @@ import React, { useState } from 'react';
 
 import {
   Form, TransitionReplace,
-} from '@openedx/paragon';
+} from '@edx/paragon';
 import PropTypes from 'prop-types';
 
 const FormGroup = (props) => {
@@ -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}

src/common-components/InstitutionLogistration.jsx

@@ -2,8 +2,8 @@ import React from 'react';
 
 import { getConfig } from '@edx/frontend-platform';
 import { useIntl } from '@edx/frontend-platform/i18n';
-import { Button, Hyperlink, Icon } from '@openedx/paragon';
-import { Institution } from '@openedx/paragon/icons';
+import { Button, Hyperlink, Icon } from '@edx/paragon';
+import { Institution } from '@edx/paragon/icons';
 import PropTypes from 'prop-types';
 
 import messages from './messages';
@@ -42,7 +42,7 @@ 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">
@@ -57,7 +57,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}

src/common-components/Logistration.jsx

@@ -9,25 +9,22 @@ import {
   Icon,
   Tab,
   Tabs,
-} from '@openedx/paragon';
-import { ChevronLeft } from '@openedx/paragon/icons';
+} from '@edx/paragon';
+import { ChevronLeft } from '@edx/paragon/icons';
 import PropTypes from 'prop-types';
-import { Navigate, useNavigate } from 'react-router-dom';
+import { Redirect } from 'react-router-dom';
 
-import BaseContainer from '../base-container';
-import { clearThirdPartyAuthContextErrorMessage } from '../common-components/data/actions';
-import {
-  tpaProvidersSelector,
-} from '../common-components/data/selectors';
-import messages from '../common-components/messages';
+import { BaseComponent } from '../base-component';
 import { LOGIN_PAGE, REGISTER_PAGE } from '../data/constants';
-import {
-  getTpaHint, getTpaProvider, updatePathWithQueryParams,
-} from '../data/utils';
+import { getTpaHint, getTpaProvider, updatePathWithQueryParams } from '../data/utils';
 import { LoginPage } from '../login';
-import { backupLoginForm } from '../login/data/actions';
 import { RegistrationPage } from '../register';
 import { backupRegistrationForm } from '../register/data/actions';
+import { clearThirdPartyAuthContextErrorMessage } from './data/actions';
+import {
+  tpaProvidersSelector,
+} from './data/selectors';
+import messages from './messages';
 
 const Logistration = (props) => {
   const { selectedPage, tpaProviders } = props;
@@ -38,9 +35,7 @@ const Logistration = (props) => {
   const { formatMessage } = useIntl();
   const [institutionLogin, setInstitutionLogin] = useState(false);
   const [key, setKey] = useState('');
-  const navigate = useNavigate();
   const disablePublicAccountCreation = getConfig().ALLOW_PUBLIC_ACCOUNT_CREATION === false;
-  const hideRegistrationLink = getConfig().SHOW_REGISTRATION_LINKS === false;
 
   useEffect(() => {
     const authService = getAuthService();
@@ -49,12 +44,6 @@ const Logistration = (props) => {
     }
   });
 
-  useEffect(() => {
-    if (disablePublicAccountCreation) {
-      navigate(updatePathWithQueryParams(LOGIN_PAGE));
-    }
-  }, [navigate, disablePublicAccountCreation]);
-
   const handleInstitutionLogin = (e) => {
     sendTrackEvent('edx.bi.institution_login_form.toggled', { category: 'user-engagement' });
     if (typeof e === 'string') {
@@ -71,8 +60,6 @@ const Logistration = (props) => {
     props.clearThirdPartyAuthContextErrorMessage();
     if (tabKey === LOGIN_PAGE) {
       props.backupRegistrationForm();
-    } else if (tabKey === REGISTER_PAGE) {
-      props.backupLoginForm();
     }
     setKey(tabKey);
   };
@@ -94,11 +81,12 @@ const Logistration = (props) => {
   };
 
   return (
-    <BaseContainer>
+    <BaseComponent>
       <div>
         {disablePublicAccountCreation
           ? (
             <>
+              <Redirect to={updatePathWithQueryParams(LOGIN_PAGE)} />
               {institutionLogin && (
                 <Tabs defaultActiveKey="" id="controlled-tab" onSelect={handleInstitutionLogin}>
                   <Tab title={tabTitle} eventKey={LOGIN_PAGE} />
@@ -120,21 +108,16 @@ const Logistration = (props) => {
                     <Tab title={tabTitle} eventKey={selectedPage === LOGIN_PAGE ? LOGIN_PAGE : REGISTER_PAGE} />
                   </Tabs>
                 )
-                : (!isValidTpaHint() && !hideRegistrationLink && (
+                : (!isValidTpaHint() && (
                   <Tabs defaultActiveKey={selectedPage} id="controlled-tab" onSelect={handleOnSelect}>
                     <Tab title={formatMessage(messages['logistration.register'])} eventKey={REGISTER_PAGE} />
                     <Tab title={formatMessage(messages['logistration.sign.in'])} eventKey={LOGIN_PAGE} />
                   </Tabs>
                 ))}
               { key && (
-                <Navigate to={updatePathWithQueryParams(key)} replace />
+                <Redirect to={updatePathWithQueryParams(key)} />
               )}
               <div id="main-content" className="main-content">
-                {!institutionLogin && !isValidTpaHint() && hideRegistrationLink && (
-                  <h3 className="mb-4.5">
-                    {formatMessage(messages[selectedPage === LOGIN_PAGE ? 'logistration.sign.in' : 'logistration.register'])}
-                  </h3>
-                )}
                 {selectedPage === LOGIN_PAGE
                   ? <LoginPage institutionLogin={institutionLogin} handleInstitutionLogin={handleInstitutionLogin} />
                   : (
@@ -147,13 +130,12 @@ const Logistration = (props) => {
             </div>
           )}
       </div>
-    </BaseContainer>
+    </BaseComponent>
   );
 };
 
 Logistration.propTypes = {
   selectedPage: PropTypes.string,
-  backupLoginForm: PropTypes.func.isRequired,
   backupRegistrationForm: PropTypes.func.isRequired,
   clearThirdPartyAuthContextErrorMessage: PropTypes.func.isRequired,
   tpaProviders: PropTypes.shape({
@@ -180,7 +162,6 @@ const mapStateToProps = state => ({
 export default connect(
   mapStateToProps,
   {
-    backupLoginForm,
     backupRegistrationForm,
     clearThirdPartyAuthContextErrorMessage,
   },

src/common-components/PasswordField.jsx

@@ -1,103 +1,41 @@
 import React, { useState } from 'react';
-import { useDispatch, useSelector } from 'react-redux';
 
 import { useIntl } from '@edx/frontend-platform/i18n';
 import {
   Form, Icon, IconButton, OverlayTrigger, Tooltip, useToggle,
-} from '@openedx/paragon';
+} from '@edx/paragon';
 import {
   Check, Remove, Visibility, VisibilityOff,
-} from '@openedx/paragon/icons';
+} from '@edx/paragon/icons';
 import PropTypes from 'prop-types';
 
-import messages from './messages';
 import { LETTER_REGEX, NUMBER_REGEX } from '../data/constants';
-import { clearRegistrationBackendError, fetchRealtimeValidations } from '../register/data/actions';
-import { validatePasswordField } from '../register/data/utils';
+import messages from './messages';
 
 const PasswordField = (props) => {
   const { formatMessage } = useIntl();
-  const dispatch = useDispatch();
-
-  const validationApiRateLimited = useSelector(state => state.register.validationApiRateLimited);
   const [isPasswordHidden, setHiddenTrue, setHiddenFalse] = useToggle(true);
   const [showTooltip, setShowTooltip] = useState(false);
 
   const handleBlur = (e) => {
-    const { name, value } = e.target;
-    if (name === props.name && e.relatedTarget?.name === 'passwordIcon') {
-      return; // Do not run validations on password icon click
-    }
-
-    let passwordValue = value;
-    if (name === 'passwordIcon') {
-      // To validate actual password value when onBlur is triggered by focusing out the password icon
-      passwordValue = props.value;
-    }
-
-    if (props.handleBlur) {
-      props.handleBlur({
-        target: {
-          name: props.name,
-          value: passwordValue,
-        },
-      });
-    }
-
+    if (props.handleBlur) { props.handleBlur(e); }
     setShowTooltip(props.showRequirements && false);
-    if (props.handleErrorChange) { // If rendering from register page
-      const fieldError = validatePasswordField(passwordValue, formatMessage);
-      if (fieldError) {
-        props.handleErrorChange('password', fieldError);
-      } else if (!validationApiRateLimited) {
-        dispatch(fetchRealtimeValidations({ password: passwordValue }));
-      }
-    }
   };
 
   const handleFocus = (e) => {
-    if (e.target?.name === 'passwordIcon') {
-      return; // Do not clear error on password icon focus
-    }
-
     if (props.handleFocus) {
       props.handleFocus(e);
     }
-    if (props.handleErrorChange) {
-      props.handleErrorChange('password', '');
-      dispatch(clearRegistrationBackendError('password'));
-    }
     setTimeout(() => setShowTooltip(props.showRequirements && true), 150);
   };
 
   const HideButton = (
-    <IconButton
-      onFocus={handleFocus}
-      onBlur={handleBlur}
-      name="passwordIcon"
-      src={VisibilityOff}
-      iconAs={Icon}
-      onClick={setHiddenTrue}
-      size="sm"
-      variant="secondary"
-      alt={formatMessage(messages['hide.password'])}
-    />
+    <IconButton onFocus={handleFocus} onBlur={handleBlur} name="password" src={VisibilityOff} iconAs={Icon} onClick={setHiddenTrue} size="sm" variant="secondary" alt={formatMessage(messages['hide.password'])} />
   );
 
   const ShowButton = (
-    <IconButton
-      onFocus={handleFocus}
-      onBlur={handleBlur}
-      name="passwordIcon"
-      src={Visibility}
-      iconAs={Icon}
-      onClick={setHiddenFalse}
-      size="sm"
-      variant="secondary"
-      alt={formatMessage(messages['show.password'])}
-    />
+    <IconButton onFocus={handleFocus} onBlur={handleBlur} name="password" src={Visibility} iconAs={Icon} onClick={setHiddenFalse} size="sm" variant="secondary" alt={formatMessage(messages['show.password'])} />
   );
-
   const placement = window.innerWidth < 768 ? 'top' : 'left';
   const tooltip = (
     <Tooltip id={`password-requirement-${placement}`}>
@@ -121,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}
@@ -138,7 +76,7 @@ const PasswordField = (props) => {
       {props.errorMessage !== '' && (
         <Form.Control.Feedback key="error" className="form-text-size" hasIcon={false} feedback-for={props.name} type="invalid">
           {props.errorMessage}
-          {props.showScreenReaderText && <span className="sr-only">{formatMessage(messages['password.sr.only.helping.text'])}</span>}
+          <span className="sr-only">{formatMessage(messages['password.sr.only.helping.text'])}</span>
         </Form.Control.Feedback>
       )}
     </Form.Group>
@@ -151,9 +89,7 @@ PasswordField.defaultProps = {
   handleBlur: null,
   handleFocus: null,
   handleChange: () => {},
-  handleErrorChange: null,
   showRequirements: true,
-  showScreenReaderText: true,
   autoComplete: null,
 };
 
@@ -164,12 +100,10 @@ PasswordField.propTypes = {
   handleBlur: PropTypes.func,
   handleFocus: PropTypes.func,
   handleChange: PropTypes.func,
-  handleErrorChange: PropTypes.func,
   name: PropTypes.string.isRequired,
   showRequirements: PropTypes.bool,
   value: PropTypes.string.isRequired,
   autoComplete: PropTypes.string,
-  showScreenReaderText: PropTypes.bool,
 };
 
 export default PasswordField;

src/common-components/RedirectLogistration.jsx

@@ -1,15 +1,14 @@
+import React from 'react';
+
 import { getConfig } from '@edx/frontend-platform';
 import PropTypes from 'prop-types';
-import { Navigate } from 'react-router-dom';
+import { Redirect } from 'react-router-dom';
 
-import {
-  AUTHN_PROGRESSIVE_PROFILING, RECOMMENDATIONS, REDIRECT,
-} from '../data/constants';
+import { AUTHN_PROGRESSIVE_PROFILING, RECOMMENDATIONS } from '../data/constants';
 import { setCookie } from '../data/utils';
 
 const RedirectLogistration = (props) => {
   const {
-    authenticatedUser,
     finishAuthUrl,
     redirectUrl,
     redirectToProgressiveProfilingPage,
@@ -18,8 +17,6 @@ const RedirectLogistration = (props) => {
     redirectToRecommendationsPage,
     educationLevel,
     userId,
-    registrationEmbedded,
-    host,
   } = props;
   let finalRedirectUrl = '';
 
@@ -38,24 +35,15 @@ const RedirectLogistration = (props) => {
     if (redirectToProgressiveProfilingPage) {
       // TODO: Do we still need this cookie?
       setCookie('van-504-returning-user', true);
-
-      if (registrationEmbedded) {
-        window.parent.postMessage({
-          action: REDIRECT,
-          redirectUrl: getConfig().POST_REGISTRATION_REDIRECT_URL,
-        }, host);
-        return null;
-      }
       const registrationResult = { redirectUrl: finalRedirectUrl, success };
       return (
-        <Navigate
-          to={AUTHN_PROGRESSIVE_PROFILING}
-          state={{
+        <Redirect to={{
+          pathname: AUTHN_PROGRESSIVE_PROFILING,
+          state: {
             registrationResult,
             optionalFields,
-            authenticatedUser,
-          }}
-          replace
+          },
+        }}
         />
       );
     }
@@ -64,14 +52,14 @@ const RedirectLogistration = (props) => {
     if (redirectToRecommendationsPage) {
       const registrationResult = { redirectUrl: finalRedirectUrl, success };
       return (
-        <Navigate
-          to={RECOMMENDATIONS}
-          state={{
+        <Redirect to={{
+          pathname: RECOMMENDATIONS,
+          state: {
             registrationResult,
             educationLevel,
             userId,
-          }}
-          replace
+          },
+        }}
         />
       );
     }
@@ -83,7 +71,6 @@ const RedirectLogistration = (props) => {
 };
 
 RedirectLogistration.defaultProps = {
-  authenticatedUser: {},
   educationLevel: null,
   finishAuthUrl: null,
   success: false,
@@ -92,12 +79,9 @@ RedirectLogistration.defaultProps = {
   optionalFields: {},
   redirectToRecommendationsPage: false,
   userId: null,
-  registrationEmbedded: false,
-  host: '',
 };
 
 RedirectLogistration.propTypes = {
-  authenticatedUser: PropTypes.shape({}),
   educationLevel: PropTypes.string,
   finishAuthUrl: PropTypes.string,
   success: PropTypes.bool,
@@ -106,8 +90,6 @@ RedirectLogistration.propTypes = {
   optionalFields: PropTypes.shape({}),
   redirectToRecommendationsPage: PropTypes.bool,
   userId: PropTypes.number,
-  registrationEmbedded: PropTypes.bool,
-  host: PropTypes.string,
 };
 
 export default RedirectLogistration;

src/common-components/SocialAuthProviders.jsx

@@ -2,13 +2,12 @@ import React from 'react';
 
 import { getConfig } from '@edx/frontend-platform';
 import { useIntl } from '@edx/frontend-platform/i18n';
+import { faSignInAlt } from '@fortawesome/free-solid-svg-icons';
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
-import { Icon } from '@openedx/paragon';
-import { Login } from '@openedx/paragon/icons';
 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();
@@ -32,16 +31,14 @@ 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 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>

src/common-components/ThirdPartyAuthAlert.jsx

@@ -2,11 +2,11 @@ import React from 'react';
 
 import { getConfig } from '@edx/frontend-platform';
 import { useIntl } from '@edx/frontend-platform/i18n';
-import { Alert } from '@openedx/paragon';
+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();

src/common-components/UnAuthOnlyRoute.jsx

@@ -1,18 +1,16 @@
-import { useEffect, useState } from 'react';
+import React, { useEffect, useState } from 'react';
 
 import { getConfig } from '@edx/frontend-platform';
 import { fetchAuthenticatedUser, getAuthenticatedUser } from '@edx/frontend-platform/auth';
-import PropTypes from 'prop-types';
+import { Route } from 'react-router-dom';
 
-import {
-  DEFAULT_REDIRECT_URL,
-} from '../data/constants';
+import { DEFAULT_REDIRECT_URL } from '../data/constants';
 
 /**
  * This wrapper redirects the requester to our default redirect url if they are
  * already authenticated.
  */
-const UnAuthOnlyRoute = ({ children }) => {
+const UnAuthOnlyRoute = (props) => {
   const [authUser, setAuthUser] = useState({});
   const [isReady, setIsReady] = useState(false);
 
@@ -29,14 +27,10 @@ const UnAuthOnlyRoute = ({ children }) => {
       return null;
     }
 
-    return children;
+    return <Route {...props} />;
   }
 
   return null;
 };
 
-UnAuthOnlyRoute.propTypes = {
-  children: PropTypes.node.isRequired,
-};
-
 export default UnAuthOnlyRoute;

src/common-components/Zendesk.jsx

@@ -5,7 +5,6 @@ import { useIntl } from '@edx/frontend-platform/i18n';
 import Zendesk from 'react-zendesk';
 
 import messages from './messages';
-import { REGISTER_EMBEDDED_PAGE } from '../data/constants';
 
 const ZendeskHelp = () => {
   const { formatMessage } = useIntl();
@@ -17,9 +16,6 @@ const ZendeskHelp = () => {
       },
       chat: {
         suppress: false,
-        departments: {
-          enabled: ['account settings', 'billing and payments', 'certificates', 'deadlines', 'errors and technical issues', 'other', 'proctoring'],
-        },
       },
       contactForm: {
         ticketForms: [
@@ -49,10 +45,6 @@ const ZendeskHelp = () => {
     },
   };
 
-  if (window.location.pathname === REGISTER_EMBEDDED_PAGE) {
-    return null;
-  }
-
   return (
     <Zendesk defer zendeskKey={getConfig().ZENDESK_KEY} {...setting} />
   );

src/common-components/data/reducers.js

@@ -1,15 +1,11 @@
+import { COMPLETE_STATE, PENDING_STATE } from '../../data/constants';
 import { THIRD_PARTY_AUTH_CONTEXT, THIRD_PARTY_AUTH_CONTEXT_CLEAR_ERROR_MSG } from './actions';
-import { COMPLETE_STATE, FAILURE_STATE, PENDING_STATE } from '../../data/constants';
 
 export const defaultState = {
   fieldDescriptions: {},
-  optionalFields: {
-    fields: {},
-    extended_profile: [],
-  },
+  optionalFields: {},
   thirdPartyAuthApiStatus: null,
   thirdPartyAuthContext: {
-    autoSubmitRegForm: false,
     currentProvider: null,
     finishAuthUrl: null,
     countryCode: null,
@@ -17,7 +13,6 @@ export const defaultState = {
     secondaryProviders: [],
     pipelineUserDetails: null,
     errorMessage: null,
-    welcomePageRedirectUrl: null,
   },
 };
 
@@ -31,7 +26,7 @@ const reducer = (state = defaultState, action = {}) => {
     case THIRD_PARTY_AUTH_CONTEXT.SUCCESS: {
       return {
         ...state,
-        fieldDescriptions: action.payload.fieldDescriptions?.fields,
+        fieldDescriptions: action.payload.fieldDescriptions.fields,
         optionalFields: action.payload.optionalFields,
         thirdPartyAuthContext: action.payload.thirdPartyAuthContext,
         thirdPartyAuthApiStatus: COMPLETE_STATE,
@@ -40,11 +35,7 @@ const reducer = (state = defaultState, action = {}) => {
     case THIRD_PARTY_AUTH_CONTEXT.FAILURE:
       return {
         ...state,
-        thirdPartyAuthApiStatus: FAILURE_STATE,
-        thirdPartyAuthContext: {
-          ...state.thirdPartyAuthContext,
-          errorMessage: null,
-        },
+        thirdPartyAuthApiStatus: COMPLETE_STATE,
       };
     case THIRD_PARTY_AUTH_CONTEXT_CLEAR_ERROR_MSG:
       return {

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,7 +11,6 @@ import {
 import {
   getThirdPartyAuthContext,
 } from './service';
-import { setCountryFromThirdPartyAuthContext } from '../../register/data/actions';
 
 export function* fetchThirdPartyAuthContext(action) {
   try {

src/common-components/data/service.js

@@ -18,8 +18,8 @@ export async function getThirdPartyAuthContext(urlParams) {
       throw (e);
     });
   return {
-    fieldDescriptions: data.registrationFields || {},
-    optionalFields: data.optionalFields || {},
-    thirdPartyAuthContext: data.contextData || {},
+    fieldDescriptions: data.registrationFields || data.registration_fields,
+    optionalFields: data.optionalFields || data.optional_fields,
+    thirdPartyAuthContext: data.contextData || data.context_data,
   };
 }

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

@@ -58,7 +58,7 @@ describe('common components reducer', () => {
         providers: [],
         secondaryProviders: [],
         pipelineUserDetails: null,
-        errorMessage: 'An error occurred',
+        errorMessage: 'An error occured',
       },
     };
 

src/common-components/index.jsx

@@ -1,6 +1,5 @@
 export { default as RedirectLogistration } from './RedirectLogistration';
 export { default as registerIcons } from './RegisterFaIcons';
-export { default as EmbeddedRegistrationRoute } from './EmbeddedRegistrationRoute';
 export { default as UnAuthOnlyRoute } from './UnAuthOnlyRoute';
 export { default as NotFoundPage } from './NotFoundPage';
 export { default as SocialAuthProviders } from './SocialAuthProviders';
@@ -12,4 +11,5 @@ 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 Logistration } from './Logistration';
 export { default as Zendesk } from './Zendesk';

src/common-components/messages.jsx

@@ -112,26 +112,6 @@ const messages = defineMessages({
     description: 'Select ticket form',
     defaultMessage: 'Please choose your request type:',
   },
-  'registration.other.options.heading': {
-    id: 'registration.other.options.heading',
-    defaultMessage: 'Or register with:',
-    description: 'A message that appears above third party auth providers i.e saml, google, facebook etc',
-  },
-  'institution.login.button': {
-    id: 'institution.login.button',
-    defaultMessage: 'Institution/campus credentials',
-    description: 'shows institutions list',
-  },
-  'login.other.options.heading': {
-    id: 'login.other.options.heading',
-    defaultMessage: 'Or sign in with:',
-    description: 'Text that appears above other sign in options like social auth buttons',
-  },
-  'enterprise.login.btn.text': {
-    id: 'enterprise.login.btn.text',
-    defaultMessage: 'Company or school credentials',
-    description: 'Company or school login link text.',
-  },
 });
 
 export default messages;

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

@@ -1,78 +0,0 @@
-/* eslint-disable import/no-import-module-exports */
-/* eslint-disable react/function-component-definition */
-import React from 'react';
-
-import { getConfig } from '@edx/frontend-platform';
-import { render } from '@testing-library/react';
-import { act } from 'react-dom/test-utils';
-
-import { REGISTER_EMBEDDED_PAGE } from '../../data/constants';
-import EmbeddedRegistrationRoute from '../EmbeddedRegistrationRoute';
-
-import {
-  MemoryRouter, Route, BrowserRouter as Router, Routes,
-} from 'react-router-dom';
-
-const RRD = require('react-router-dom');
-// Just render plain div with its children
-// eslint-disable-next-line react/prop-types
-RRD.BrowserRouter = ({ children }) => <div>{ children }</div>;
-module.exports = RRD;
-
-const TestApp = () => (
-  <Router>
-    <div>
-      <Routes>
-        <Route
-          path={REGISTER_EMBEDDED_PAGE}
-          element={<EmbeddedRegistrationRoute><span>Embedded Register Page</span></EmbeddedRegistrationRoute>}
-        />
-      </Routes>
-    </div>
-  </Router>
-);
-
-describe('EmbeddedRegistrationRoute', () => {
-  const routerWrapper = () => (
-    <MemoryRouter initialEntries={[REGISTER_EMBEDDED_PAGE]}>
-      <TestApp />
-    </MemoryRouter>
-  );
-
-  afterEach(() => {
-    jest.clearAllMocks();
-  });
-
-  it('should not render embedded register page if host query param is not available in the url', async () => {
-    let embeddedRegistrationPage = null;
-
-    await act(async () => {
-      const { container } = await render(routerWrapper());
-      embeddedRegistrationPage = container;
-    });
-
-    const spanElement = embeddedRegistrationPage.querySelector('span');
-
-    expect(spanElement).toBeNull();
-  });
-
-  it('should render embedded register page if host query param is available in the url (embedded)', async () => {
-    delete window.location;
-    window.location = {
-      href: getConfig().BASE_URL.concat(REGISTER_EMBEDDED_PAGE),
-      search: '?host=http://localhost/host-websit',
-    };
-
-    let embeddedRegistrationPage = null;
-
-    await act(async () => {
-      const { container } = await render(routerWrapper());
-      embeddedRegistrationPage = container;
-    });
-
-    const spanElement = embeddedRegistrationPage.querySelector('span');
-
-    expect(spanElement).toBeTruthy();
-    expect(spanElement.textContent).toBe('Embedded Register Page');
-  });
-});

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

@@ -1,13 +1,9 @@
 import React from 'react';
-import { Provider } from 'react-redux';
 
 import { injectIntl, IntlProvider } from '@edx/frontend-platform/i18n';
-import { fireEvent, render } from '@testing-library/react';
+import { mount } from 'enzyme';
 import { act } from 'react-dom/test-utils';
-import { MemoryRouter } from 'react-router-dom';
-import configureStore from 'redux-mock-store';
 
-import { fetchRealtimeValidations } from '../../register/data/actions';
 import FormGroup from '../FormGroup';
 import PasswordField from '../PasswordField';
 
@@ -21,42 +17,19 @@ describe('FormGroup', () => {
   };
 
   it('should show help text on field focus', () => {
-    const { queryByText, getByLabelText } = render(<FormGroup {...props} />);
-    const emailInput = getByLabelText('Email');
+    const formGroup = mount(<FormGroup {...props} />);
+    expect(formGroup.find('.pgn-transition-replace-group').find('div#email-1').exists()).toBeFalsy();
 
-    expect(queryByText('Email field help text')).toBeNull();
-
-    fireEvent.focus(emailInput);
-
-    const helpText = queryByText('Email field help text');
-
-    expect(helpText).toBeTruthy();
-    expect(helpText.textContent).toEqual('Email field help text');
+    formGroup.find('input#email').simulate('focus');
+    expect(formGroup.find('.pgn-transition-replace-group').find('div#email-1').text()).toEqual('Email field help text');
   });
 });
 
 describe('PasswordField', () => {
-  const mockStore = configureStore();
   const IntlPasswordField = injectIntl(PasswordField);
   let props = {};
-  let store = {};
-
-  const reduxWrapper = children => (
-    <IntlProvider locale="en">
-      <MemoryRouter>
-        <Provider store={store}>{children}</Provider>
-      </MemoryRouter>
-    </IntlProvider>
-  );
-
-  const initialState = {
-    register: {
-      validationApiRateLimited: false,
-    },
-  };
 
   beforeEach(() => {
-    store = mockStore(initialState);
     props = {
       floatingLabel: 'Password',
       name: 'password',
@@ -66,29 +39,25 @@ describe('PasswordField', () => {
   });
 
   it('should show/hide password on icon click', () => {
-    const { getByLabelText } = render(reduxWrapper(<IntlPasswordField {...props} />));
-    const passwordInput = getByLabelText('Password');
+    const passwordField = mount(<IntlProvider locale="en"><IntlPasswordField {...props} /></IntlProvider>);
 
-    const showPasswordButton = getByLabelText('Show password');
-    fireEvent.click(showPasswordButton);
-    expect(passwordInput.type).toBe('text');
+    passwordField.find('button[aria-label="Show password"]').simulate('click');
+    expect(passwordField.find('input').prop('type')).toEqual('text');
 
-    const hidePasswordButton = getByLabelText('Hide password');
-    fireEvent.click(hidePasswordButton);
-    expect(passwordInput.type).toBe('password');
+    passwordField.find('button[aria-label="Hide password"]').simulate('click');
+    expect(passwordField.find('input').prop('type')).toEqual('password');
   });
 
   it('should show password requirement tooltip on focus', async () => {
-    const { getByLabelText } = render(reduxWrapper(<IntlPasswordField {...props} />));
-    const passwordInput = getByLabelText('Password');
+    const passwordField = mount(<IntlProvider locale="en"><IntlPasswordField {...props} /></IntlProvider>);
     jest.useFakeTimers();
     await act(async () => {
-      fireEvent.focus(passwordInput);
+      passwordField.find('input').simulate('focus');
       jest.runAllTimers();
     });
-    const passwordRequirementTooltip = document.querySelector('#password-requirement-left');
+    passwordField.update();
 
-    expect(passwordRequirementTooltip).toBeTruthy();
+    expect(passwordField.find('#password-requirement-left').exists()).toBeTruthy();
   });
 
   it('should show all password requirement checks as failed', async () => {
@@ -96,195 +65,31 @@ describe('PasswordField', () => {
       ...props,
       value: '',
     };
-    const { getByLabelText } = render(reduxWrapper(<IntlPasswordField {...props} />));
-    const passwordInput = getByLabelText('Password');
+
     jest.useFakeTimers();
+    const passwordField = mount(<IntlProvider locale="en"><IntlPasswordField {...props} /></IntlProvider>);
     await act(async () => {
-      fireEvent.focus(passwordInput);
+      passwordField.find('input').simulate('focus');
       jest.runAllTimers();
     });
+    passwordField.update();
 
-    const letterCheckIcon = document.querySelector('#letter-check span');
-    const numberCheckIcon = document.querySelector('#number-check span');
-    const charactersCheckIcon = document.querySelector('#characters-check span');
-
-    expect(letterCheckIcon).toBeTruthy();
-    expect(letterCheckIcon.className).toContain('pgn__icon mr-1 text-light-700');
-
-    expect(numberCheckIcon).toBeTruthy();
-    expect(numberCheckIcon.className).toContain('pgn__icon mr-1 text-light-700');
-
-    expect(charactersCheckIcon).toBeTruthy();
-    expect(charactersCheckIcon.className).toContain('pgn__icon mr-1 text-light-700');
+    expect(passwordField.find('#letter-check span').prop('className')).toEqual('pgn__icon mr-1 text-light-700');
+    expect(passwordField.find('#number-check span').prop('className')).toEqual('pgn__icon mr-1 text-light-700');
+    expect(passwordField.find('#characters-check span').prop('className')).toEqual('pgn__icon mr-1 text-light-700');
   });
 
   it('should update password requirement checks', async () => {
-    const { getByLabelText } = render(reduxWrapper(<IntlPasswordField {...props} />));
-    const passwordInput = getByLabelText('Password');
+    const passwordField = mount(<IntlProvider locale="en"><IntlPasswordField {...props} /></IntlProvider>);
     jest.useFakeTimers();
     await act(async () => {
-      fireEvent.focus(passwordInput);
+      passwordField.find('input').simulate('focus');
       jest.runAllTimers();
     });
+    passwordField.update();
 
-    const letterCheckIcon = document.querySelector('#letter-check span');
-    const numberCheckIcon = document.querySelector('#number-check span');
-    const charactersCheckIcon = document.querySelector('#characters-check span');
-
-    expect(letterCheckIcon).toBeTruthy();
-    expect(letterCheckIcon.className).toContain('pgn__icon text-success mr-1');
-
-    expect(numberCheckIcon).toBeTruthy();
-    expect(numberCheckIcon.className).toContain('pgn__icon text-success mr-1');
-
-    expect(charactersCheckIcon).toBeTruthy();
-    expect(charactersCheckIcon.className).toContain('pgn__icon text-success mr-1');
-  });
-
-  it('should not run validations when blur is fired on password icon click', () => {
-    const { container, getByLabelText } = render(reduxWrapper(<IntlPasswordField {...props} />));
-    const passwordInput = container.querySelector('input[name="password"]');
-
-    const passwordIcon = getByLabelText('Show password');
-
-    fireEvent.blur(passwordInput, {
-      target: {
-        name: 'password',
-        value: 'invalid',
-      },
-      relatedTarget: passwordIcon,
-    });
-
-    expect(container.querySelector('div[feedback-for="password"]')).toBeNull();
-  });
-
-  it('should call props handle blur if available', () => {
-    props = {
-      ...props,
-      handleBlur: jest.fn(),
-    };
-    const { container } = render(reduxWrapper(<IntlPasswordField {...props} />));
-    const passwordInput = container.querySelector('input[name="password"]');
-
-    fireEvent.blur(passwordInput, {
-      target: {
-        name: 'password',
-        value: '',
-      },
-    });
-
-    expect(props.handleBlur).toHaveBeenCalledTimes(1);
-  });
-
-  it('should run validations on blur event when rendered from register page', () => {
-    props = {
-      ...props,
-      handleErrorChange: jest.fn(),
-    };
-    const { container } = render(reduxWrapper(<IntlPasswordField {...props} />));
-    const passwordInput = container.querySelector('input[name="password"]');
-
-    fireEvent.blur(passwordInput, {
-      target: {
-        name: 'password',
-        value: '',
-      },
-    });
-
-    expect(props.handleErrorChange).toHaveBeenCalledTimes(1);
-    expect(props.handleErrorChange).toHaveBeenCalledWith(
-      'password',
-      'Password criteria has not been met',
-    );
-  });
-
-  it('should not clear error when focus is fired on password icon click when rendered from register page', () => {
-    props = {
-      ...props,
-      handleErrorChange: jest.fn(),
-    };
-
-    const { getByLabelText } = render(reduxWrapper(<IntlPasswordField {...props} />));
-
-    const passwordIcon = getByLabelText('Show password');
-
-    fireEvent.focus(passwordIcon, {
-      target: {
-        name: 'passwordIcon',
-        value: '',
-      },
-    });
-
-    expect(props.handleErrorChange).toHaveBeenCalledTimes(0);
-  });
-
-  it('should clear error when focus is fired on password icon click when rendered from register page', () => {
-    props = {
-      ...props,
-      handleErrorChange: jest.fn(),
-    };
-
-    const { getByLabelText } = render(reduxWrapper(<IntlPasswordField {...props} />));
-
-    const passwordIcon = getByLabelText('Show password');
-
-    fireEvent.focus(passwordIcon, {
-      target: {
-        name: 'password',
-        value: 'invalid',
-      },
-    });
-
-    expect(props.handleErrorChange).toHaveBeenCalledTimes(1);
-    expect(props.handleErrorChange).toHaveBeenCalledWith(
-      'password',
-      '',
-    );
-  });
-
-  it('should run backend validations when frontend validations pass on blur when rendered from register page', () => {
-    store.dispatch = jest.fn(store.dispatch);
-    props = {
-      ...props,
-      handleErrorChange: jest.fn(),
-    };
-    const { getByLabelText } = render(reduxWrapper(<IntlPasswordField {...props} />));
-    const passwordField = getByLabelText('Password');
-    fireEvent.blur(passwordField, {
-      target: {
-        name: 'password',
-        value: 'password123',
-      },
-    });
-
-    expect(store.dispatch).toHaveBeenCalledWith(fetchRealtimeValidations({ password: 'password123' }));
-  });
-
-  it('should use password value from prop when password icon is focused out (blur due to icon)', () => {
-    store.dispatch = jest.fn(store.dispatch);
-    props = {
-      ...props,
-      value: 'testPassword',
-      handleErrorChange: jest.fn(),
-      handleBlur: jest.fn(),
-    };
-    const { getByLabelText } = render(reduxWrapper(<IntlPasswordField {...props} />));
-
-    const passwordIcon = getByLabelText('Show password');
-
-    fireEvent.blur(passwordIcon, {
-      target: {
-        name: 'passwordIcon',
-        value: undefined,
-      },
-    });
-
-    expect(props.handleBlur).toHaveBeenCalledTimes(1);
-    expect(props.handleBlur).toHaveBeenCalledWith({
-      target: {
-        name: 'password',
-        value: 'testPassword',
-      },
-    });
+    expect(passwordField.find('#letter-check span').prop('className')).toEqual('pgn__icon text-success mr-1');
+    expect(passwordField.find('#number-check span').prop('className')).toEqual('pgn__icon text-success mr-1');
+    expect(passwordField.find('#characters-check span').prop('className')).toEqual('pgn__icon text-success mr-1');
   });
 });

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

@@ -0,0 +1,271 @@
+import React from 'react';
+import { Provider } from 'react-redux';
+
+import { getConfig, 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 { MemoryRouter } from 'react-router-dom';
+import configureStore from 'redux-mock-store';
+
+import { COMPLETE_STATE, LOGIN_PAGE } from '../../data/constants';
+import { backupRegistrationForm } from '../../register/data/actions';
+import { clearThirdPartyAuthContextErrorMessage } from '../data/actions';
+import { RenderInstitutionButton } from '../InstitutionLogistration';
+import Logistration from '../Logistration';
+
+jest.mock('@edx/frontend-platform/analytics');
+jest.mock('@edx/frontend-platform/auth');
+analytics.sendPageEvent = jest.fn();
+
+const mockStore = configureStore();
+const IntlLogistration = injectIntl(Logistration);
+
+describe('Logistration', () => {
+  let store = {};
+
+  const secondaryProviders = {
+    id: 'saml-test',
+    name: 'Test University',
+    loginUrl: '/dummy-auth',
+    registerUrl: '/dummy_auth',
+  };
+
+  const reduxWrapper = children => (
+    <IntlProvider locale="en">
+      <MemoryRouter>
+        <Provider store={store}>{children}</Provider>
+      </MemoryRouter>
+    </IntlProvider>
+  );
+
+  beforeEach(() => {
+    auth.getAuthenticatedUser = jest.fn(() => ({ userId: 3, username: 'test-user' }));
+    configure({
+      loggingService: { logError: jest.fn() },
+      config: {
+        ENVIRONMENT: 'production',
+        LANGUAGE_PREFERENCE_COOKIE_NAME: 'yum',
+      },
+      messages: { 'es-419': {}, de: {}, 'en-us': {} },
+    });
+  });
+
+  it('should render registration page', () => {
+    mergeConfig({
+      ALLOW_PUBLIC_ACCOUNT_CREATION: true,
+    });
+    store = mockStore({
+      register: {
+        registrationResult: { success: false, redirectUrl: '' },
+        registrationError: {},
+      },
+      commonComponents: {
+        thirdPartyAuthContext: {
+          providers: [],
+          secondaryProviders: [],
+        },
+      },
+    });
+    const logistration = mount(reduxWrapper(<IntlLogistration />));
+
+    expect(logistration.find('#main-content').find('RegistrationPage').exists()).toBeTruthy();
+  });
+
+  it('should render login page', () => {
+    store = mockStore({
+      login: {
+        loginResult: { success: false, redirectUrl: '' },
+      },
+      commonComponents: {
+        thirdPartyAuthContext: {
+          providers: [],
+          secondaryProviders: [],
+        },
+      },
+    });
+
+    const props = { selectedPage: LOGIN_PAGE };
+    const logistration = mount(reduxWrapper(<IntlLogistration {...props} />));
+
+    expect(logistration.find('#main-content').find('LoginPage').exists()).toBeTruthy();
+  });
+
+  it('should render only login page when public account creation is disabled', () => {
+    mergeConfig({
+      ALLOW_PUBLIC_ACCOUNT_CREATION: false,
+      DISABLE_ENTERPRISE_LOGIN: 'true',
+    });
+
+    store = mockStore({
+      login: {
+        loginResult: { success: false, redirectUrl: '' },
+      },
+      commonComponents: {
+        thirdPartyAuthContext: {
+          currentProvider: null,
+          finishAuthUrl: null,
+          providers: [],
+          secondaryProviders: [secondaryProviders],
+        },
+        thirdPartyAuthApiStatus: COMPLETE_STATE,
+      },
+    });
+
+    const props = { selectedPage: LOGIN_PAGE };
+    const logistration = mount(reduxWrapper(<IntlLogistration {...props} />));
+
+    // verifying sign in heading for institution login false
+    expect(logistration.find('#main-content').find('h3').text()).toEqual('Sign in');
+
+    // verifying tabs heading for institution login true
+    logistration.find(RenderInstitutionButton).simulate('click', { institutionLogin: true });
+    expect(logistration.find('#controlled-tab').exists()).toBeTruthy();
+  });
+
+  it('should display institution login option when secondary providers are present', () => {
+    mergeConfig({
+      DISABLE_ENTERPRISE_LOGIN: 'true',
+      ALLOW_PUBLIC_ACCOUNT_CREATION: 'true',
+    });
+
+    store = mockStore({
+      login: {
+        loginResult: { success: false, redirectUrl: '' },
+      },
+      commonComponents: {
+        thirdPartyAuthContext: {
+          currentProvider: null,
+          finishAuthUrl: null,
+          providers: [],
+          secondaryProviders: [secondaryProviders],
+        },
+        thirdPartyAuthApiStatus: COMPLETE_STATE,
+      },
+    });
+
+    const props = { selectedPage: LOGIN_PAGE };
+    const logistration = mount(reduxWrapper(<IntlLogistration {...props} />));
+    expect(logistration.text().includes('Institution/campus credentials')).toBe(true);
+
+    // on clicking "Institution/campus credentials" button, it should display institution login page
+    logistration.find(RenderInstitutionButton).simulate('click', { institutionLogin: true });
+    expect(logistration.text().includes('Test University')).toBe(true);
+
+    mergeConfig({
+      DISABLE_ENTERPRISE_LOGIN: '',
+    });
+  });
+
+  it('send tracking and page events when institutional login button is clicked', () => {
+    mergeConfig({
+      DISABLE_ENTERPRISE_LOGIN: 'true',
+    });
+
+    store = mockStore({
+      login: {
+        loginResult: { success: false, redirectUrl: '' },
+      },
+      commonComponents: {
+        thirdPartyAuthContext: {
+          currentProvider: null,
+          finishAuthUrl: null,
+          providers: [],
+          secondaryProviders: [secondaryProviders],
+        },
+        thirdPartyAuthApiStatus: COMPLETE_STATE,
+      },
+    });
+
+    const props = { selectedPage: LOGIN_PAGE };
+    const logistration = mount(reduxWrapper(<IntlLogistration {...props} />));
+    logistration.find(RenderInstitutionButton).simulate('click', { institutionLogin: true });
+
+    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: '',
+    });
+  });
+
+  it('should not display institution register button', () => {
+    mergeConfig({
+      DISABLE_ENTERPRISE_LOGIN: 'true',
+    });
+
+    store = mockStore({
+      register: {
+        registrationResult: { success: false, redirectUrl: '' },
+        registrationError: {},
+      },
+      commonComponents: {
+        thirdPartyAuthContext: {
+          currentProvider: null,
+          finishAuthUrl: null,
+          providers: [],
+          secondaryProviders: [secondaryProviders],
+        },
+        thirdPartyAuthApiStatus: COMPLETE_STATE,
+      },
+    });
+
+    delete window.location;
+    window.location = { hostname: getConfig().SITE_NAME, href: getConfig().BASE_URL };
+
+    const root = mount(reduxWrapper(<IntlLogistration />));
+    root.find(RenderInstitutionButton).simulate('click', { institutionLogin: true });
+    expect(root.text().includes('Test University')).toBe(true);
+
+    mergeConfig({
+      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

@@ -2,21 +2,15 @@
 /* eslint-disable react/function-component-definition */
 import React from 'react';
 
-import { fetchAuthenticatedUser, getAuthenticatedUser } from '@edx/frontend-platform/auth';
-import { render } from '@testing-library/react';
-import { act } from 'react-dom/test-utils';
+import * as auth from '@edx/frontend-platform/auth';
+import { mount } from 'enzyme';
 
 import { UnAuthOnlyRoute } from '..';
-import { REGISTER_PAGE } from '../../data/constants';
+import { LOGIN_PAGE } from '../../data/constants';
 
-import {
-  MemoryRouter, Route, BrowserRouter as Router, Routes,
-} from 'react-router-dom';
+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
@@ -27,16 +21,16 @@ module.exports = RRD;
 const TestApp = () => (
   <Router>
     <div>
-      <Routes>
-        <Route path={REGISTER_PAGE} element={<UnAuthOnlyRoute><span>Register Page</span></UnAuthOnlyRoute>} />
-      </Routes>
+      <Switch>
+        <UnAuthOnlyRoute path={LOGIN_PAGE} render={() => (<span>Login Page</span>)} />
+      </Switch>
     </div>
   </Router>
 );
 
 describe('UnAuthOnlyRoute', () => {
   const routerWrapper = () => (
-    <MemoryRouter initialEntries={[REGISTER_PAGE]}>
+    <MemoryRouter initialEntries={[LOGIN_PAGE]}>
       <TestApp />
     </MemoryRouter>
   );
@@ -45,30 +39,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 render(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 render(routerWrapper());
-    });
+    mount(routerWrapper());
 
-    expect(fetchAuthenticatedUser).toBeCalledWith({ forceRefresh: false });
+    expect(auth.fetchAuthenticatedUser).toBeCalledWith({ forceRefresh: false });
   });
 });

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 7 9.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__/Zendesk.test.jsx.snap

@@ -20,17 +20,6 @@ exports[`Zendesk Help should match login page third party auth alert message sna
         },
       },
       "chat": Object {
-        "departments": Object {
-          "enabled": Array [
-            "account settings",
-            "billing and payments",
-            "certificates",
-            "deadlines",
-            "errors and technical issues",
-            "other",
-            "proctoring",
-          ],
-        },
         "suppress": false,
       },
       "contactForm": Object {

src/config/index.js

@@ -1,39 +1,29 @@
 const configuration = {
   // Cookies related configs
   SESSION_COOKIE_DOMAIN: process.env.SESSION_COOKIE_DOMAIN,
-  USER_RETENTION_COOKIE_NAME: process.env.USER_RETENTION_COOKIE_NAME || '',
+  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_COOKIE_POLICY_BANNER: process.env.ENABLE_COOKIE_POLICY_BANNER || false,
   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_POST_REGISTRATION_RECOMMENDATIONS: process.env.ENABLE_POST_REGISTRATION_RECOMMENDATIONS || 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,
-  SHOW_REGISTRATION_LINKS: process.env.SHOW_REGISTRATION_LINKS !== 'false',
-  ENABLE_IMAGE_LAYOUT: process.env.ENABLE_IMAGE_LAYOUT || 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,
-  POST_REGISTRATION_REDIRECT_URL: process.env.POST_REGISTRATION_REDIRECT_URL || '',
   PRIVACY_POLICY: process.env.PRIVACY_POLICY || null,
-  SEARCH_CATALOG_URL: process.env.SEARCH_CATALOG_URL || null,
   TOS_AND_HONOR_CODE: process.env.TOS_AND_HONOR_CODE || null,
   TOS_LINK: process.env.TOS_LINK || null,
-  // Base container images
-  BANNER_IMAGE_LARGE: process.env.BANNER_IMAGE_LARGE || '',
-  BANNER_IMAGE_MEDIUM: process.env.BANNER_IMAGE_MEDIUM || '',
-  BANNER_IMAGE_SMALL: process.env.BANNER_IMAGE_SMALL || '',
-  BANNER_IMAGE_EXTRA_SMALL: process.env.BANNER_IMAGE_EXTRA_SMALL || '',
-  // Recommendation constants
-  GENERAL_RECOMMENDATIONS: process.env.GENERAL_RECOMMENDATIONS || '[]',
   // 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,
-  ALGOLIA_APP_ID: process.env.ALGOLIA_APP_ID || '',
-  ALGOLIA_SEARCH_API_KEY: process.env.ALGOLIA_SEARCH_API_KEY || '',
 };
 
 export default configuration;

src/data/algolia.js

@@ -1,20 +0,0 @@
-import { getConfig } from '@edx/frontend-platform';
-import algoliasearch from 'algoliasearch';
-
-// initialize Algolia workers
-const initializeSearchClient = () => algoliasearch(
-  getConfig().ALGOLIA_APP_ID,
-  getConfig().ALGOLIA_SEARCH_API_KEY,
-);
-
-const getLocationRestrictionFilter = (userCountry) => {
-  if (userCountry) {
-    return `NOT blocked_in:"${userCountry}" AND (allowed_in:"null" OR allowed_in:"${userCountry}")`;
-  }
-  return '';
-};
-
-export {
-  initializeSearchClient,
-  getLocationRestrictionFilter,
-};

src/data/constants.js

@@ -1,7 +1,6 @@
 // URL Paths
 export const LOGIN_PAGE = '/login';
 export const REGISTER_PAGE = '/register';
-export const REGISTER_EMBEDDED_PAGE = '/register-embedded';
 export const RESET_PAGE = '/reset';
 export const AUTHN_PROGRESSIVE_PROFILING = '/welcome';
 export const DEFAULT_REDIRECT_URL = '/dashboard';
@@ -24,16 +23,16 @@ export const PENDING_STATE = 'pending';
 export const COMPLETE_STATE = 'complete';
 export const FAILURE_STATE = 'failure';
 export const FORBIDDEN_STATE = 'forbidden';
-export const EMBEDDED = 'embedded';
 
-export const LETTER_REGEX = /[a-zA-Z]/;
-export const NUMBER_REGEX = /\d/;
+// Regex
 export const VALID_EMAIL_REGEX = '(^[-!#$%&\'*+/=?^_`{}|~0-9A-Z]+(\\.[-!#$%&\'*+/=?^_`{}|~0-9A-Z]+)*'
                                  + '|^"([\\001-\\010\\013\\014\\016-\\037!#-\\[\\]-\\177]|\\\\[\\001-\\011\\013\\014\\016-\\177])*"'
                                  + ')@((?:[A-Z0-9](?:[A-Z0-9-]{0,61}[A-Z0-9])?\\.)+)(?:[A-Z0-9-]{2,63})'
                                  + '|\\[(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
 
 // 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', 'register_for_free', 'track', 'is_account_recovery', 'variant', 'host', 'cta'];
-export const REDIRECT = 'redirect';
+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'];

src/data/oneTrust.js

@@ -1,3 +0,0 @@
-const isOneTrustFunctionalCookieEnabled = () => !!window?.OnetrustActiveGroups?.includes('C0003');
-
-export default isOneTrustFunctionalCookieEnabled;

src/data/optimizely.js

@@ -4,14 +4,8 @@ import {
 
 const OPTIMIZELY_SDK_KEY = process.env.OPTIMIZELY_FULL_STACK_SDK_KEY;
 
-const getOptimizelyInstance = () => {
-  if (OPTIMIZELY_SDK_KEY) {
-    return createInstance({
-      sdkKey: OPTIMIZELY_SDK_KEY,
-    });
-  }
+const optimizely = createInstance({
+  sdkKey: OPTIMIZELY_SDK_KEY,
+});
 
-  return null;
-};
-
-export default getOptimizelyInstance();
+export default optimizely;

src/data/tests/algolia.test.js

@@ -1,16 +0,0 @@
-import { getLocationRestrictionFilter } from '../algolia';
-
-describe('algoliaUtilsTests', () => {
-  it('test getLocationRestrictionFilter returns filter if country is passed', () => {
-    const countryCode = 'PK';
-    const filter = getLocationRestrictionFilter(countryCode);
-    const expectedFilter = `NOT blocked_in:"${countryCode}" AND (allowed_in:"null" OR allowed_in:"${countryCode}")`;
-    expect(filter).toEqual(expectedFilter);
-  });
-  it('test getLocationRestrictionFilter returns empty string if country is not passed', () => {
-    const countryCode = '';
-    const filter = getLocationRestrictionFilter(countryCode);
-    const expectedFilter = '';
-    expect(filter).toEqual(expectedFilter);
-  });
-});

src/data/tests/cookies.test.js

@@ -1,52 +0,0 @@
-import { getConfig } from '@edx/frontend-platform';
-import Cookies from 'universal-cookie';
-
-import { setCookie } from '../utils';
-
-// Mock getConfig function
-jest.mock('@edx/frontend-platform', () => ({
-  getConfig: jest.fn(),
-}));
-
-// Mock Cookies class
-jest.mock('universal-cookie');
-
-describe('setCookie function', () => {
-  beforeEach(() => {
-    jest.clearAllMocks();
-  });
-
-  it('should set a cookie with default options', () => {
-    getConfig.mockReturnValue({ SESSION_COOKIE_DOMAIN: 'example.com' });
-
-    setCookie('testCookie', 'testValue');
-
-    expect(Cookies).toHaveBeenCalled();
-    expect(Cookies).toHaveBeenCalledWith();
-    expect(Cookies.prototype.set).toHaveBeenCalledWith('testCookie', 'testValue', {
-      domain: 'example.com',
-      path: '/',
-    });
-  });
-
-  it('should set a cookie with specified expiry', () => {
-    getConfig.mockReturnValue({ SESSION_COOKIE_DOMAIN: 'example.com' });
-
-    const expiry = new Date('2023-12-31');
-    setCookie('testCookie', 'testValue', expiry);
-
-    expect(Cookies).toHaveBeenCalled();
-    expect(Cookies).toHaveBeenCalledWith();
-    expect(Cookies.prototype.set).toHaveBeenCalledWith('testCookie', 'testValue', {
-      domain: 'example.com',
-      path: '/',
-      expires: expiry,
-    });
-  });
-
-  it('should not set a cookie if cookieName is undefined', () => {
-    setCookie(undefined, 'testValue');
-
-    expect(Cookies).not.toHaveBeenCalled();
-  });
-});

src/data/utils/cookies.js

@@ -1,13 +1,21 @@
 import { getConfig } from '@edx/frontend-platform';
 import Cookies from 'universal-cookie';
 
-export default function setCookie(cookieName, cookieValue, cookieExpiry) {
-  if (cookieName) { // To avoid setting getting exception when setting cookie with undefined names.
-    const cookies = new Cookies();
-    const options = { domain: getConfig().SESSION_COOKIE_DOMAIN, path: '/' };
-    if (cookieExpiry) {
-      options.expires = cookieExpiry;
-    }
-    cookies.set(cookieName, cookieValue, options);
+export function setCookie(cookieName, cookieValue, cookieExpiry) {
+  const cookies = new Cookies();
+  const options = { domain: getConfig().SESSION_COOKIE_DOMAIN, path: '/' };
+  if (cookieExpiry) {
+    options.expires = cookieExpiry;
+  }
+  cookies.set(cookieName, cookieValue, options);
+}
+
+export default function setSurveyCookie(surveyType) {
+  const cookieName = getConfig().USER_SURVEY_COOKIE_NAME;
+  if (cookieName) {
+    const signupTimestamp = (new Date()).getTime();
+    // set expiry to exactly 24 hours from now
+    const cookieExpiry = new Date(signupTimestamp + 1 * 864e5);
+    setCookie(cookieName, surveyType, cookieExpiry);
   }
 }

src/data/utils/dataUtils.js

@@ -76,8 +76,3 @@ export const windowScrollTo = (options) => {
 
   return window.scrollTo(options.top, options.left);
 };
-
-export const isHostAvailableInQueryParams = () => {
-  const queryParams = getAllPossibleQueryParams();
-  return 'host' in queryParams;
-};

src/data/utils/dataUtils.test.js

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

src/data/utils/index.js

@@ -1,11 +1,10 @@
 export {
   getTpaProvider,
   getTpaHint,
+  updatePathWithQueryParams,
   getAllPossibleQueryParams,
   getActivationStatus,
-  isHostAvailableInQueryParams,
-  updatePathWithQueryParams,
   windowScrollTo,
 } from './dataUtils';
 export { default as AsyncActionType } from './reduxUtils';
-export { default as setCookie } from './cookies';
+export { default as setSurveyCookie, setCookie } from './cookies';

src/data/utils/reduxUtils.test.js

@@ -1,4 +1,4 @@
-import AsyncActionType from '../utils/reduxUtils';
+import AsyncActionType from './reduxUtils';
 
 describe('AsyncActionType', () => {
   it('should return well formatted action strings', () => {

src/data/utils/useMobileResponsive.js

@@ -1,6 +1,6 @@
 import { useEffect, useState } from 'react';
 
-import { breakpoints } from '@openedx/paragon';
+import { breakpoints } from '@edx/paragon';
 
 /**
  * A react hook used to determine if the current window is mobile or not.

src/field-renderer/FieldRenderer.jsx

@@ -1,7 +1,7 @@
 import React from 'react';
 
-import { Form, Icon } from '@openedx/paragon';
-import { ExpandMore } from '@openedx/paragon/icons';
+import { Form, Icon } from '@edx/paragon';
+import { ExpandMore } from '@edx/paragon/icons';
 import PropTypes from 'prop-types';
 
 const FormFieldRenderer = (props) => {

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

@@ -1,7 +1,7 @@
 import React from 'react';
 
 import { getConfig } from '@edx/frontend-platform';
-import { fireEvent, render } from '@testing-library/react';
+import { mount } from 'enzyme';
 
 import FieldRenderer from '../FieldRenderer';
 
@@ -25,17 +25,16 @@ describe('FieldRendererTests', () => {
       type: 'select',
       label: 'Year of Birth',
       name: 'yob-field',
-      options: [['1997', '1997'], ['1998', '1998']],
+      options: [['1997', 1997], ['1998', 1998]],
     };
 
-    const { container } = render(<FieldRenderer value={value} fieldData={fieldData} onChangeHandler={changeHandler} />);
-    const input = container.querySelector('select#yob-field');
-    const label = container.querySelector('label');
-    fireEvent.change(input, { target: { value: 1997 } });
+    const fieldRenderer = mount(<FieldRenderer value={value} fieldData={fieldData} onChangeHandler={changeHandler} />);
+    const field = fieldRenderer.find('select#yob-field');
+    field.simulate('change', { target: { value: 1997 } });
 
-    expect(input.type).toEqual('select-one');
-    expect(label.textContent).toContain(fieldData.label);
-    expect(value).toEqual('1997');
+    expect(field.type()).toEqual('select');
+    expect(fieldRenderer.find('label').text()).toEqual('Year of Birth');
+    expect(value).toEqual(1997);
   });
 
   it('should return null if no options are provided for select field', () => {
@@ -45,8 +44,8 @@ describe('FieldRendererTests', () => {
       name: 'yob-field',
     };
 
-    const { container } = render(<FieldRenderer fieldData={fieldData} onChangeHandler={() => {}} />);
-    expect(container.innerHTML).toEqual('');
+    const fieldRenderer = mount(<FieldRenderer fieldData={fieldData} onChangeHandler={() => {}} />);
+    expect(fieldRenderer.html()).toBeNull();
   });
 
   it('should render textarea field', () => {
@@ -56,13 +55,12 @@ describe('FieldRendererTests', () => {
       name: 'goals-field',
     };
 
-    const { container } = render(<FieldRenderer value={value} fieldData={fieldData} onChangeHandler={changeHandler} />);
-    const input = container.querySelector('#goals-field');
-    const label = container.querySelector('label');
-    fireEvent.change(input, { target: { value: 'These are my goals.' } });
+    const fieldRenderer = mount(<FieldRenderer value={value} fieldData={fieldData} onChangeHandler={changeHandler} />);
+    const field = fieldRenderer.find('#goals-field').last();
+    field.simulate('change', { target: { value: 'These are my goals.' } });
 
-    expect(input.type).toEqual(fieldData.type);
-    expect(label.textContent).toContain('Why do you want to join this platform?');
+    expect(field.type()).toEqual('textarea');
+    expect(fieldRenderer.find('label').text()).toEqual('Why do you want to join this platform?');
     expect(value).toEqual('These are my goals.');
   });
 
@@ -73,13 +71,12 @@ describe('FieldRendererTests', () => {
       name: 'company-field',
     };
 
-    const { container } = render(<FieldRenderer value={value} fieldData={fieldData} onChangeHandler={changeHandler} />);
-    const input = container.querySelector('input#company-field');
-    const label = container.querySelector('label');
-    fireEvent.change(input, { target: { value: 'ABC' } });
+    const fieldRenderer = mount(<FieldRenderer value={value} fieldData={fieldData} onChangeHandler={changeHandler} />);
+    const field = fieldRenderer.find('#company-field').last();
+    field.simulate('change', { target: { value: 'ABC' } });
 
-    expect(input.type).toEqual(fieldData.type);
-    expect(label.textContent).toContain(fieldData.label);
+    expect(field.type()).toEqual('input');
+    expect(fieldRenderer.find('label').text()).toEqual('Company');
     expect(value).toEqual('ABC');
   });
 
@@ -90,13 +87,12 @@ describe('FieldRendererTests', () => {
       name: 'marketing-emails-opt-in-field',
     };
 
-    const { container } = render(<FieldRenderer value={value} fieldData={fieldData} onChangeHandler={changeHandler} />);
-    const input = container.querySelector('input#marketing-emails-opt-in-field');
-    const label = container.querySelector('label');
-    fireEvent.click(input);
+    const fieldRenderer = mount(<FieldRenderer value={value} fieldData={fieldData} onChangeHandler={changeHandler} />);
+    const field = fieldRenderer.find('input#marketing-emails-opt-in-field');
+    field.simulate('change', { target: { checked: true, type: 'checkbox' } });
 
-    expect(input.type).toEqual(fieldData.type);
-    expect(label.textContent).toContain(fieldData.label);
+    expect(field.prop('type')).toEqual('checkbox');
+    expect(fieldRenderer.find('label').text()).toEqual(fieldData.label);
     expect(value).toEqual(true);
   });
 
@@ -105,8 +101,8 @@ describe('FieldRendererTests', () => {
       type: 'unknown',
     };
 
-    const { container } = render(<FieldRenderer fieldData={fieldData} onChangeHandler={() => {}} />);
-    expect(container.innerHTML).toContain('');
+    const fieldRenderer = mount(<FieldRenderer fieldData={fieldData} onChangeHandler={() => {}} />);
+    expect(fieldRenderer.html()).toBeNull();
   });
 
   it('should run onBlur and onFocus functions for a field if given', () => {
@@ -121,7 +117,7 @@ describe('FieldRendererTests', () => {
       functionValue = `${e.target.name} focussed`;
     };
 
-    const { container } = render(
+    const fieldRenderer = mount(
       <FieldRenderer
         handleFocus={onFocus}
         handleBlur={onBlur}
@@ -130,19 +126,19 @@ describe('FieldRendererTests', () => {
         onChangeHandler={changeHandler}
       />,
     );
-    const input = container.querySelector('#test-field');
+    const field = fieldRenderer.find('#test-field').last();
 
-    fireEvent.focus(input);
+    field.simulate('focus');
     expect(functionValue).toEqual('test-field focussed');
 
-    fireEvent.blur(input);
+    field.simulate('blur');
     expect(functionValue).toEqual('test-field blurred');
   });
 
   it('should render error message for required text fields', () => {
     const fieldData = { type: 'text', label: 'First Name', name: 'first-name-field' };
 
-    const { container } = render(
+    const fieldRenderer = mount(
       <FieldRenderer
         isRequired
         fieldData={fieldData}
@@ -151,7 +147,7 @@ describe('FieldRendererTests', () => {
       />,
     );
 
-    expect(container.querySelector(`#${fieldData.name}-error`).textContent).toEqual('Enter your first name');
+    expect(fieldRenderer.find('.form-text-size').last().text()).toEqual('Enter your first name');
   });
 
   it('should render error message for required select fields', () => {
@@ -159,7 +155,7 @@ describe('FieldRendererTests', () => {
       type: 'select', label: 'Preference', name: 'preference-field', options: [['a', 'Opt 1'], ['b', 'Opt 2']],
     };
 
-    const { container } = render(
+    const fieldRenderer = mount(
       <FieldRenderer
         isRequired
         fieldData={fieldData}
@@ -168,13 +164,13 @@ describe('FieldRendererTests', () => {
       />,
     );
 
-    expect(container.querySelector(`#${fieldData.name}-error`).textContent).toEqual('Select your preference');
+    expect(fieldRenderer.find('.form-text-size').last().text()).toEqual('Select your preference');
   });
 
   it('should render error message for required textarea fields', () => {
     const fieldData = { type: 'textarea', label: 'Goals', name: 'goals-field' };
 
-    const { container } = render(
+    const fieldRenderer = mount(
       <FieldRenderer
         isRequired
         fieldData={fieldData}
@@ -183,13 +179,13 @@ describe('FieldRendererTests', () => {
       />,
     );
 
-    expect(container.querySelector(`#${fieldData.name}-error`).textContent).toEqual('Tell us your goals');
+    expect(fieldRenderer.find('.form-text-size').last().text()).toEqual('Tell us your goals');
   });
 
   it('should render error message for required checkbox fields', () => {
     const fieldData = { type: 'checkbox', label: 'Honor Code', name: 'honor-code-field' };
 
-    const { container } = render(
+    const fieldRenderer = mount(
       <FieldRenderer
         isRequired
         fieldData={fieldData}
@@ -198,6 +194,6 @@ describe('FieldRendererTests', () => {
       />,
     );
 
-    expect(container.querySelector(`#${fieldData.name}-error`).textContent).toEqual('You must agree to our Honor Code');
+    expect(fieldRenderer.find('.form-text-size').last().text()).toEqual('You must agree to our Honor Code');
   });
 });

src/forgot-password/ForgotPasswordAlert.jsx

@@ -2,15 +2,15 @@ import React from 'react';
 
 import { getConfig } from '@edx/frontend-platform';
 import { FormattedMessage, useIntl } from '@edx/frontend-platform/i18n';
-import { Alert } from '@openedx/paragon';
-import { CheckCircle, Error } from '@openedx/paragon/icons';
+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();

src/forgot-password/ForgotPasswordPage.jsx

@@ -11,20 +11,20 @@ import {
   StatefulButton,
   Tab,
   Tabs,
-} from '@openedx/paragon';
-import { ChevronLeft } from '@openedx/paragon/icons';
+} from '@edx/paragon';
+import { ChevronLeft } from '@edx/paragon/icons';
 import PropTypes from 'prop-types';
 import { Helmet } from 'react-helmet';
-import { useNavigate } from 'react-router-dom';
+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 BaseContainer from '../base-container';
-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;
@@ -38,7 +38,7 @@ const ForgotPasswordPage = (props) => {
   const [bannerEmail, setBannerEmail] = useState('');
   const [formErrors, setFormErrors] = useState('');
   const [validationError, setValidationError] = useState(emailValidationError);
-  const navigate = useNavigate();
+  const [key, setKey] = useState('');
 
   useEffect(() => {
     sendPageEvent('login_and_registration', 'reset');
@@ -95,16 +95,19 @@ const ForgotPasswordPage = (props) => {
   );
 
   return (
-    <BaseContainer>
+    <BaseComponent>
       <Helmet>
         <title>{formatMessage(messages['forgot.password.page.title'],
           { siteName: getConfig().SITE_NAME })}
         </title>
       </Helmet>
       <div>
-        <Tabs activeKey="" id="controlled-tab" onSelect={(key) => navigate(updatePathWithQueryParams(key))}>
+        <Tabs activeKey="" id="controlled-tab" onSelect={(k) => setKey(k)}>
           <Tab title={tabTitle} eventKey={LOGIN_PAGE} />
         </Tabs>
+        { key && (
+          <Redirect to={updatePathWithQueryParams(key)} />
+        )}
         <div id="main-content" className="main-content">
           <Form id="forget-password-form" name="forget-password-form" className="mw-xs">
             <ForgotPasswordAlert email={bannerEmail} emailError={formErrors} status={status} />
@@ -130,7 +133,7 @@ const ForgotPasswordPage = (props) => {
               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']),
@@ -160,7 +163,7 @@ const ForgotPasswordPage = (props) => {
           </Form>
         </div>
       </div>
-    </BaseContainer>
+    </BaseComponent>
   );
 };
 

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/tests/ForgotPasswordPage.test.jsx

@@ -1,12 +1,15 @@
 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 {
-  fireEvent, render, screen,
-} from '@testing-library/react';
-import { MemoryRouter } from 'react-router-dom';
+import { mount } from 'enzyme';
+import { createMemoryHistory } from 'history';
+import { act } from 'react-dom/test-utils';
+import { MemoryRouter, Router } from 'react-router-dom';
 import configureStore from 'redux-mock-store';
 
 import { INTERNAL_SERVER_ERROR, LOGIN_PAGE } from '../../data/constants';
@@ -14,20 +17,14 @@ import { PASSWORD_RESET } from '../../reset-password/data/constants';
 import { setForgotPasswordFormData } from '../data/actions';
 import ForgotPasswordPage from '../ForgotPasswordPage';
 
-const mockedNavigator = jest.fn();
-
-jest.mock('@edx/frontend-platform/analytics', () => ({
-  sendPageEvent: jest.fn(),
-  sendTrackEvent: jest.fn(),
-}));
+jest.mock('@edx/frontend-platform/analytics');
 jest.mock('@edx/frontend-platform/auth');
-jest.mock('react-router-dom', () => ({
-  ...(jest.requireActual('react-router-dom')),
-  useNavigate: () => mockedNavigator,
-}));
+
+analytics.sendPageEvent = jest.fn();
 
 const IntlForgotPasswordPage = injectIntl(ForgotPasswordPage);
 const mockStore = configureStore();
+const history = createMemoryHistory();
 
 const initialState = {
   forgotPassword: {
@@ -54,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: 'test-user' }));
     configure({
       loggingService: { logError: jest.fn() },
       config: {
@@ -73,39 +65,31 @@ describe('ForgotPasswordPage', () => {
       status: null,
     };
   });
-  const findByTextContent = (container, text) => Array.from(container.querySelectorAll('*')).find(
-    element => element.textContent === text,
-  );
 
   it('not should display need other help signing in button', () => {
-    const { queryByTestId } = render(reduxWrapper(<IntlForgotPasswordPage {...props} />));
-    const forgotPasswordButton = queryByTestId('forgot-password');
-    expect(forgotPasswordButton).toBeNull();
+    const wrapper = mount(reduxWrapper(<IntlForgotPasswordPage {...props} />));
+    expect(wrapper.find('#forgot-password').exists()).toBeFalsy();
   });
 
   it('should display need other help signing in button', () => {
     mergeConfig({
       LOGIN_ISSUE_SUPPORT_LINK: '/support',
     });
-    render(reduxWrapper(<IntlForgotPasswordPage {...props} />));
-    const forgotPasswordButton = screen.findByText('Need help signing in?');
-    expect(forgotPasswordButton).toBeDefined();
+    const wrapper = mount(reduxWrapper(<IntlForgotPasswordPage {...props} />));
+    expect(wrapper.find('#forgot-password').first().text()).toEqual('Need help signing in?');
   });
 
   it('should display email validation error message', async () => {
     const validationMessage = 'We were unable to contact you.Enter a valid email address below.';
-    const { container } = render(reduxWrapper(<IntlForgotPasswordPage {...props} />));
+    const wrapper = mount(reduxWrapper(<IntlForgotPasswordPage {...props} />));
 
-    const emailInput = screen.getByLabelText('Email');
+    wrapper.find('input#email').simulate(
+      'change', { target: { value: 'invalid-email', name: 'email' } },
+    );
+    await act(async () => { await wrapper.find('button.btn-brand').simulate('click'); });
+    wrapper.update();
 
-    fireEvent.change(emailInput, { target: { value: 'invalid-email' } });
-
-    const submitButton = screen.getByText('Submit');
-    fireEvent.click(submitButton);
-
-    const alertElements = container.querySelectorAll('.alert-danger');
-    const validationErrors = alertElements[0].textContent;
-    expect(validationErrors).toBe(validationMessage);
+    expect(wrapper.find('.alert-danger').text()).toEqual(validationMessage);
   });
 
   it('should show alert on server error', () => {
@@ -114,25 +98,19 @@ describe('ForgotPasswordPage', () => {
     });
     const expectedMessage = 'We were unable to contact you.'
                             + 'An error has occurred. Try refreshing the page, or check your internet connection.';
+    const wrapper = mount(reduxWrapper(<IntlForgotPasswordPage {...props} />));
 
-    const { container } = render(reduxWrapper(<IntlForgotPasswordPage {...props} />));
-
-    const alertElements = container.querySelectorAll('.alert-danger');
-    const validationErrors = alertElements[0].textContent;
-    expect(validationErrors).toBe(expectedMessage);
+    expect(wrapper.find('#validation-errors').first().text()).toEqual(expectedMessage);
   });
 
   it('should display empty email validation message', async () => {
     const validationMessage = 'We were unable to contact you.Enter your email below.';
-    const { container } = render(reduxWrapper(<IntlForgotPasswordPage {...props} />));
+    const forgotPasswordPage = mount(reduxWrapper(<IntlForgotPasswordPage {...props} />));
 
-    const submitButton = screen.getByText('Submit');
-    fireEvent.click(submitButton);
+    await act(async () => { await forgotPasswordPage.find('button.btn-brand').simulate('click'); });
 
-    const alertElements = container.querySelectorAll('.alert-danger');
-    const validationErrors = alertElements[0].textContent;
-
-    expect(validationErrors).toBe(validationMessage);
+    forgotPasswordPage.update();
+    expect(forgotPasswordPage.find('.alert-danger').text()).toEqual(validationMessage);
   });
 
   it('should display request in progress error message', () => {
@@ -141,22 +119,18 @@ describe('ForgotPasswordPage', () => {
       forgotPassword: { status: 'forbidden' },
     });
 
-    const { container } = render(reduxWrapper(<IntlForgotPasswordPage {...props} />));
-
-    const alertElements = container.querySelectorAll('.alert-danger');
-    const validationErrors = alertElements[0].textContent;
-    expect(validationErrors).toBe(rateLimitMessage);
+    const forgotPasswordPage = mount(reduxWrapper(<IntlForgotPasswordPage {...props} />));
+    expect(forgotPasswordPage.find('.alert-danger').text()).toEqual(rateLimitMessage);
   });
 
   it('should not display any error message on change event', () => {
-    render(reduxWrapper(<IntlForgotPasswordPage {...props} />));
+    const forgotPasswordPage = mount(reduxWrapper(<IntlForgotPasswordPage {...props} />));
 
-    const emailInput = screen.getByLabelText('Email');
+    const emailInput = forgotPasswordPage.find('input#email');
+    emailInput.simulate('change', { target: { value: 'invalid-email', name: 'email' } });
+    forgotPasswordPage.update();
 
-    fireEvent.change(emailInput, { target: { value: 'invalid-email' } });
-
-    const errorElement = screen.queryByTestId('email-invalid-feedback');
-    expect(errorElement).toBeNull();
+    expect(forgotPasswordPage.find('#email-invalid-feedback').exists()).toEqual(false);
   });
 
   it('should set error in redux store on onBlur', () => {
@@ -172,11 +146,8 @@ describe('ForgotPasswordPage', () => {
     };
 
     store.dispatch = jest.fn(store.dispatch);
-    render(reduxWrapper(<IntlForgotPasswordPage {...props} />));
-    const emailInput = screen.getByLabelText('Email');
-
-    fireEvent.blur(emailInput);
-
+    const forgotPasswordPage = mount(reduxWrapper(<IntlForgotPasswordPage {...props} />));
+    forgotPasswordPage.find('input#email').simulate('blur');
     expect(store.dispatch).toHaveBeenCalledWith(setForgotPasswordFormData(forgotPasswordFormData));
   });
 
@@ -187,9 +158,9 @@ describe('ForgotPasswordPage', () => {
       emailValidationError: validationMessage,
       email: '',
     };
-    const { container } = render(reduxWrapper(<IntlForgotPasswordPage {...props} />));
-    const validationElement = container.querySelector('.pgn__form-text-invalid');
-    expect(validationElement.textContent).toEqual(validationMessage);
+    const forgotPasswordPage = mount(reduxWrapper(<IntlForgotPasswordPage {...props} />));
+    forgotPasswordPage.update();
+    expect(forgotPasswordPage.find('.pgn__form-text-invalid').text()).toEqual(validationMessage);
   });
 
   it('should clear error in redux store on onFocus', () => {
@@ -204,12 +175,8 @@ describe('ForgotPasswordPage', () => {
     };
 
     store.dispatch = jest.fn(store.dispatch);
-
-    render(reduxWrapper(<IntlForgotPasswordPage {...props} />));
-    const emailInput = screen.getByLabelText('Email');
-
-    fireEvent.focus(emailInput);
-
+    const forgotPasswordPage = mount(reduxWrapper(<IntlForgotPasswordPage {...props} />));
+    forgotPasswordPage.find('input#email').simulate('focus');
     expect(store.dispatch).toHaveBeenCalledWith(setForgotPasswordFormData(forgotPasswordFormData));
   });
 
@@ -219,9 +186,14 @@ describe('ForgotPasswordPage', () => {
       emailValidationError: '',
       email: '',
     };
-    render(reduxWrapper(<IntlForgotPasswordPage {...props} />));
-    const errorElement = screen.queryByTestId('email-invalid-feedback');
-    expect(errorElement).toBeNull();
+    const forgotPasswordPage = mount(reduxWrapper(<IntlForgotPasswordPage {...props} />));
+    forgotPasswordPage.update();
+    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', () => {
@@ -231,16 +203,12 @@ describe('ForgotPasswordPage', () => {
         status: 'complete',
       },
     });
-
     const successMessage = 'Check your emailWe sent an email to  with instructions to reset your password. 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. If you need further assistance, contact technical support.';
 
-    const { container } = render(reduxWrapper(<IntlForgotPasswordPage {...props} />));
-    const successElement = findByTextContent(container, successMessage);
-
-    expect(successElement).toBeDefined();
-    expect(successElement.textContent).toEqual(successMessage);
+    const wrapper = mount(reduxWrapper(<IntlForgotPasswordPage {...props} />));
+    expect(wrapper.find('.alert-success').text()).toEqual(successMessage);
   });
 
   it('should display invalid password reset link error', () => {
@@ -254,20 +222,20 @@ describe('ForgotPasswordPage', () => {
                             + 'This password reset link is invalid. It may have been used already. '
                             + 'Enter your email below to receive a new link.';
 
-    const { container } = render(reduxWrapper(<IntlForgotPasswordPage {...props} />));
-    const successElement = findByTextContent(container, successMessage);
-
-    expect(successElement).toBeDefined();
-    expect(successElement.textContent).toEqual(successMessage);
+    const wrapper = mount(reduxWrapper(<IntlForgotPasswordPage {...props} />));
+    expect(wrapper.find('.alert-danger').text()).toEqual(successMessage);
   });
 
   it('should redirect onto login page', async () => {
-    const { container } = render(reduxWrapper(<IntlForgotPasswordPage {...props} />));
+    const forgotPasswordPage = mount(reduxWrapper(
+      <Router history={history}>
+        <IntlForgotPasswordPage {...props} />
+      </Router>,
+    ));
 
-    const navElement = container.querySelector('nav');
-    const anchorElement = navElement.querySelector('a');
-    fireEvent.click(anchorElement);
+    await act(async () => { await forgotPasswordPage.find('nav').find('a').first().simulate('click'); });
 
-    expect(mockedNavigator).toHaveBeenCalledWith(LOGIN_PAGE);
+    forgotPasswordPage.update();
+    expect(history.location.pathname).toEqual(LOGIN_PAGE);
   });
 });

src/i18n/index.jsx

@@ -1,41 +1,41 @@
-import { messages as paragonMessages } from '@openedx/paragon';
-
 import arMessages from './messages/ar.json';
-import deMessages from './messages/de.json';
-import deDEMessages from './messages/de_DE.json';
-import es419Messages from './messages/es_419.json';
-import faIRMessages from './messages/fa_IR.json';
-import frMessages from './messages/fr.json';
-import frCAMessages from './messages/fr_CA.json';
-import hiMessages from './messages/hi.json';
-import itMessages from './messages/it.json';
-import itITMessages from './messages/it_IT.json';
-import ptMessages from './messages/pt.json';
-import ptPTMessages from './messages/pt_PT.json';
-import ruMessages from './messages/ru.json';
-import ukMessages from './messages/uk.json';
-import zhCNMessages from './messages/zh_CN.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 heMessages from './messages/he.json';
+import hiMessages from './messages/hi.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';
 
-const appMessages = {
+const messages = {
   ar: arMessages,
-  de: deMessages,
-  'de-de': deDEMessages,
+  es: es419Messages, // Prospectus uses es language code for spanish, added `es` option and pointed to es-419 strings.
   'es-419': es419Messages,
-  'fa-ir': faIRMessages,
   fr: frMessages,
-  'fr-ca': frCAMessages,
-  hi: hiMessages,
-  it: itMessages,
-  'it-it': itITMessages,
-  pt: ptMessages,
-  'pt-pt': ptPTMessages,
+  'zh-cn': zhcnMessages,
+  '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,
-  'zh-cn': zhCNMessages,
+  hi: hiMessages,
 };
 
-export default [
-  paragonMessages,
-  appMessages,
-];
+export default messages;

src/i18n/messages/ar.json

@@ -1,11 +1,15 @@
 {
-  "error.notfound.message": "الصفحة التي تبحث عنها غير متوفرة أو هناك خطأ في العنوان. رجاءً تحقق من العنوان و حاول مجددًا.",
+  "start.learning": "ابدأ التعلم ",
+  "with.site.name": "مع {siteName}",
+  "complete.your.profile.1": "أكمل",
+  "complete.your.profile.2": "ملفك الشخصي",
+  "welcome.to.platform": "أهلا بك {username} في {siteName}",
   "institution.login.page.sub.heading": "اختر مؤسستك من القائمة أدناه",
   "logistration.sign.in": "تسجيل الدخول",
   "logistration.register": "التسجيل",
   "enterprisetpa.title.heading": "هل ترغب في تسجيل الدخول باستخدام بيانات {providerName} الخاصة بك؟",
   "enterprisetpa.login.button.text": "أرِني وسائل أخرى لتسجيل الدخول أو للتسجيل",
-  "enterprisetpa.login.button.text.public.account.creation.disabled": "أرني طرقًا أخرى لتسجيل الدخول",
+  "enterprisetpa.login.button.text.public.account.creation.disabled": "Show me other ways to sign in",
   "sso.sign.in.with": "تسجيل الدخول باستخدام {providerName}",
   "sso.create.account.using": "إنشاء حساب باستخدام {providerName}",
   "show.password": "إظهار كلمة المرور",
@@ -19,8 +23,9 @@
   "register.third.party.auth.account.not.linked": "لقد سجلت دخولك بنجاح إلى {currentProvider}! نحتاج فقط قليلاً بعدُ من المعلومات قبل أن تبدأ التعلم مع {platformName}.",
   "registration.using.tpa.form.heading": "إتمام إنشاء حسابك",
   "zendesk.supportTitle": "edX Support",
-  "zendesk.selectTicketForm": "الرجاء اختيار نوع الطلب الخاص بك:",
-  "forgot.password.confirmation.message": "We sent an email to {email} with instructions to reset your password. 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. If you need further assistance, {supportLink}.",
+  "zendesk.selectTicketForm": "Please choose your request type:",
+  "error.notfound.message": "الصفحة التي تبحث عنها غير متوفرة أو هناك خطأ في العنوان. رجاءً تحقق من العنوان و حاول مجددًا.",
+  "forgot.password.confirmation.message": "لقد أرسلنا بريدًا إلكترونيًا إلى {email} به إرشادات لإعادة ضبط كلمة المرور الخاصة بك. إن لم تستلم رسالة إعادة ضبط كلمة المرور بعد دقيقة واحدة، فتحقق من إدخال عنوان البريد الإلكتروني الصحيح، أو تفقد مجلد الرسائل غير المرغوب فيها. إن احتجت مزيدًا من المساعدة، {supportLink}.",
   "forgot.password.page.title": "نسيت كلمة المرور | {siteName}",
   "forgot.password.page.heading": "إعادة ضبط كلمة المرور",
   "forgot.password.page.instructions": "رجاءً أدخل عنوان بريدك الإلكتروني أدناه وسنرسل إليك بريدًا به إرشادات بخصوص كيفية إعادة ضبط كلمة مرورك.",
@@ -35,7 +40,7 @@
   "confirmation.message.title": "تفقّد بريدك الإلكتروني",
   "confirmation.support.link": "اتصل بالدعم الفني",
   "need.help.sign.in.text": "هل تحتاج مساعدة في تسجيل الدخول؟",
-  "additional.help.text": "For additional help, contact {platformName} support at",
+  "additional.help.text": "للمزيد من المساعدة، اتصل بدعم {platformName} على ",
   "sign.in.text": "تسجيل الدخول",
   "extend.field.errors": "{emailError} أدناه.",
   "invalid.token.heading": "رابط إعادة ضبط كلمة المرور غير صالح",
@@ -46,9 +51,9 @@
   "token.validation.internal.sever.error": "حدث خطأ ما. جرب تحديث الصفحة أو تحقق من اتصالك بالإنترنت.",
   "internal.server.error": "حدث خطأ ما. جرب تحديث الصفحة أو تحقق من اتصالك بالإنترنت.",
   "account.activation.error.message": "شي ما لم يسر على ما يرام، يرجى {supportLink} لحل هذه المشكلة.",
-  "login.inactive.user.error": "In order to sign in, you need to activate your account.{lineBreak} {lineBreak}We just sent an activation link to {email}. If you do not receive an email, check your spam folders or {supportLink}.",
+  "login.inactive.user.error": "أنت بحاجة لتفعيل حسابك من أجل تسجيل الدخول{lineBreak}\n{lineBreak}لقد أرسلنا للتو رابطًا للتفعيل إلى {email}. إن لم تتلقّ بريدًا إلكترونيا، تفقّد مجلدات الرسائل غير المرغوب فيها أو {supportLink}.",
   "allowed.domain.login.error": "كونك مستخدمًا على {allowedDomain}، فإن عليك تسجيل الدخول باستخدام {tpaLink} الخاص بـ {allowedDomain} .",
-  "login.incorrect.credentials.error.attempts.text.1": "The username, email or password you entered is incorrect. You have {remainingAttempts} more sign in attempts before your account is temporarily locked.",
+  "login.incorrect.credentials.error.attempts.text.1": "اسم المستخدم أو البريد الإلكتروني أو كلمة المرور التي أدخلتها غير صحيحة. لديك {remainingAttempts, plural,\n  one {محاولة  واحدة}\n  two {محاولتان}\n  few {# محاولات}\n  many {# محاولة}\n  other {# محاولة}\n} أخرى لتسجيل الدخول قبل أن يتم إقفال حسابك مؤقتًا.",
   "login.incorrect.credentials.error.attempts.text.2": "إن نسيت كلمة مرورك، {resetLink}",
   "account.locked.out.message.2": "لتكون في مأمن، يمكنك {resetLink} قبل تكرار المحاولة.",
   "login.incorrect.credentials.error.with.reset.link": "اسم المستخدم أو البريد الإلكتروني أو كلمة المرور التي أدخلتها غير صحيحة. يرجى تكرار المحاولة أو {resetLink}.",
@@ -64,7 +69,7 @@
   "non.compliant.password.message": "كلمة مرورك الحالية لا تستسجيب لمتطلبات الأمان الجديدة. لقد أرسلنا للتو رسالة لإعادة ضبط كلمة المرور إلى عنوان البريد الإلكتروني المرتبط بهذا الحساب. شكرًا لك على مساعدتنا في الحفاظ على سلامة بياناتك.",
   "account.locked.out.message.1": "لحماية حسابك، تم إقفاله مؤقتًا. حاول مرة أخرى بعد 30 دقيقة.",
   "enterprise.login.btn.text": "بيانات الشركة أو المدرسة",
-  "username.or.email.format.validation.less.chars.message": "يجب أن يحتوي اسم المستخدم أو البريد الإلكتروني على 3 أحرف على الأقل.",
+  "username.or.email.format.validation.less.chars.message": "يجب أن يحتوي اسم المستخدم أو البريد الإلكتروني على 2 أحرف على الأقل.",
   "email.validation.message": "أدخل اسم المستخدم أو البريد الإلكتروني الخاص بك",
   "password.validation.message": "لم يتم استيفاء معايير كلمة المرور",
   "account.activation.success.message.title": "نجح الأمر! لقد قمت بتفعيل حسابك.",
@@ -91,31 +96,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": "Welcome | {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.option.trending": "Trending Now",
-  "recommendation.option.popular": "Most Popular",
-  "recommendation.option.recommended.for.you": "Recommended For You",
-  "recommendation.product-card.pill-text.course": "Course",
-  "recommendation.product-card.pill-text.professional-certificate": "Professional Certificate",
-  "recommendation.product-card.pill-text.emeritus": "Offered on Emeritus",
-  "recommendation.product-card.pill-text.shorelight": "Offered through Shorelight",
-  "recommendation.product-card.footer-text.number-of-courses": "{length} {label}",
-  "recommendation.product-card.footer-text.subscription": "Subscription",
-  "recommendation.product-card.launch-icon.sr-text": "Opens a link in a new tab",
+  "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": "البريد الإلكتروني",
@@ -129,7 +123,6 @@
   "help.text.email": "لتفعيل الحساب و التحديثات الهامة",
   "create.account.for.free.button": "إنشاء حساب مجانا",
   "registration.other.options.heading": "أو سجل باستخدام:",
-  "create.account.cta.button": "{label}",
   "register.institution.login.button": "بيانات المؤسسة / الجامعة",
   "register.institution.login.page.title": "التسجيل باستخدام بيانات المؤسسة / الجامعة",
   "empty.name.field.error": "أدخل اسمك الكامل",
@@ -147,13 +140,15 @@
   "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.username.suggestion.label": "مقترح:",
   "did.you.mean.alert.text": "هل تقصد",
+  "register.page.terms.of.service.and.honor.code": "بإنشاءك حسابًا، فإنك توافق على {tosAndHonorCode} و تقر بأن {platformName} و كل عضو يعالج بياناتك الشخصية وفقًا لـ{privacyPolicy}.",
+  "register.page.honor.code": "I agree to the {platformName} {tosAndHonorCode}",
+  "register.page.terms.of.service": "I agree to the {platformName} {termsOfService}",
   "sign.in": "تسجيل الدخول",
   "reset.password.page.title": "إعادة ضبط كلمة المرور | {siteName}",
   "reset.password": "إعادة ضبط كلمة المرور",
@@ -167,15 +162,5 @@
   "reset.server.rate.limit.error": "طلبات أكثر مما ينبغي.",
   "reset.password.success.heading": "تمت إعادة ضبط كلمة المرور.",
   "reset.password.success": "تمت إعادة ضبط كلمة مرورك. سجل الدخول إلى حسابك.",
-  "rate.limit.error": "حدث خطأ بسبب كثرة الطلبات. رجاءً حاول مرة أخرى بعد مضي بعض الوقت.",
-  "start.learning": "ابدأ التعلم ",
-  "with.site.name": "مع {siteName}",
-  "your.career.turning.point": "Your career turning point",
-  "is.here": "is here.",
-  "welcome.to.platform": "أهلا بك {username} في {siteName}",
-  "complete.your.profile.1": "أكمل",
-  "complete.your.profile.2": "ملفك الشخصي",
-  "register.page.terms.of.service.and.honor.code": "By creating an account, you agree to the {tosAndHonorCode} and you acknowledge that {platformName} and each 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}"
-}
+  "rate.limit.error": "حدث خطأ بسبب كثرة الطلبات. رجاءً حاول مرة أخرى بعد مضي بعض الوقت."
+}

src/i18n/messages/de.json

@@ -1,181 +0,0 @@
-{
-  "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.",
-  "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:",
-  "forgot.password.confirmation.message": "We sent an email to {email} with instructions to reset your password. 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. 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} {lineBreak}We just sent an activation link to {email}. If you do not receive an email, 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 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",
-  "recommendation.option.trending": "Trending Now",
-  "recommendation.option.popular": "Most Popular",
-  "recommendation.option.recommended.for.you": "Recommended For You",
-  "recommendation.product-card.pill-text.course": "Course",
-  "recommendation.product-card.pill-text.professional-certificate": "Professional Certificate",
-  "recommendation.product-card.pill-text.emeritus": "Offered on Emeritus",
-  "recommendation.product-card.pill-text.shorelight": "Offered through Shorelight",
-  "recommendation.product-card.footer-text.number-of-courses": "{length} {label}",
-  "recommendation.product-card.footer-text.subscription": "Subscription",
-  "recommendation.product-card.launch-icon.sr-text": "Opens a link in a new tab",
-  "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:",
-  "create.account.cta.button": "{label}",
-  "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",
-  "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.",
-  "start.learning": "Start learning",
-  "with.site.name": "with {siteName}",
-  "your.career.turning.point": "Your career turning point",
-  "is.here": "is here.",
-  "welcome.to.platform": "Welcome to {siteName}, {username}!",
-  "complete.your.profile.1": "Complete",
-  "complete.your.profile.2": "your profile",
-  "register.page.terms.of.service.and.honor.code": "By creating an account, you agree to the {tosAndHonorCode} and you acknowledge that {platformName} and each 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}"
-}

src/i18n/messages/de_DE.json

@@ -1,5 +1,9 @@
 {
-  "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.",
+  "start.learning": "Beginne zu lernen",
+  "with.site.name": "mit {siteName}",
+  "complete.your.profile.1": "Vervollständige",
+  "complete.your.profile.2": "dein Profil",
+  "welcome.to.platform": "Willkommen bei {siteName}, {username}!",
   "institution.login.page.sub.heading": "Wählen Sie Ihre Institution aus der folgenden Liste aus",
   "logistration.sign.in": "Anmelden",
   "logistration.register": "Registrieren",
@@ -20,7 +24,8 @@
   "registration.using.tpa.form.heading": "Beenden Sie die Erstellung Ihres Kontos",
   "zendesk.supportTitle": "edX Support",
   "zendesk.selectTicketForm": "Please choose your request type:",
-  "forgot.password.confirmation.message": "We sent an email to {email} with instructions to reset your password. 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. If you need further assistance, {supportLink}.",
+  "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}",
   "forgot.password.page.heading": "Passwort zurücksetzen",
   "forgot.password.page.instructions": "Bitte geben Sie unten Ihre E-Mail-Adresse ein und wir senden Ihnen eine E-Mail mit Anweisungen zum Zurücksetzen Ihres Passworts.",
@@ -35,7 +40,7 @@
   "confirmation.message.title": "Prüfen Sie Ihr E-Mail-Postfach",
   "confirmation.support.link": "wenden Sie sich an den technischen Support",
   "need.help.sign.in.text": "Brauchen Sie Hilfe bei der Anmeldung?",
-  "additional.help.text": "For additional help, contact {platformName} support at",
+  "additional.help.text": "Wenden Sie sich für weitere Hilfe an den {platformName}-Support unter",
   "sign.in.text": "Anmelden",
   "extend.field.errors": "{emailError} unten.",
   "invalid.token.heading": "Ungültiger Link zum Zurücksetzen des Passworts",
@@ -46,9 +51,9 @@
   "token.validation.internal.sever.error": "Ein Fehler ist aufgetreten. Versuchen Sie, die Seite zu aktualisieren, oder überprüfen Sie Ihre Internetverbindung.",
   "internal.server.error": "Ein Fehler ist aufgetreten. Versuchen Sie, die Seite zu aktualisieren, oder überprüfen Sie Ihre Internetverbindung.",
   "account.activation.error.message": "Etwas ist schief gelaufen, bitte {supportLink} um dieses Problem zu lösen.",
-  "login.inactive.user.error": "In order to sign in, you need to activate your account.{lineBreak} {lineBreak}We just sent an activation link to {email}. If you do not receive an email, check your spam folders or {supportLink}.",
+  "login.inactive.user.error": "Um sich anzumelden, müssen Sie Ihr Konto aktivieren.{lineBreak} {lineBreak}Wir haben gerade einen Aktivierungslink an {email} gesendet. Wenn Sie keine E-Mail erhalten, überprüfen Sie Ihre Spam-Ordner oder {supportLink}.",
   "allowed.domain.login.error": "Als {allowedDomain}-Benutzer müssen Sie sich mit Ihrem {allowedDomain} {tpaLink} anmelden.",
-  "login.incorrect.credentials.error.attempts.text.1": "The username, email or password you entered is incorrect. You have {remainingAttempts} more sign in attempts before your account is temporarily locked.",
+  "login.incorrect.credentials.error.attempts.text.1": "Der eingegebene Benutzername, die E-Mail oder das Passwort ist falsch. Sie haben {remainingAttempts} weitere Anmeldeversuche, bevor Ihr Konto vorübergehend gesperrt wird.",
   "login.incorrect.credentials.error.attempts.text.2": "Wenn Sie Ihr Passwort vergessen haben, {resetLink}",
   "account.locked.out.message.2": "Um auf der sicheren Seite zu sein, können Sie {resetLink} tun, bevor Sie es erneut versuchen.",
   "login.incorrect.credentials.error.with.reset.link": "Der eingegebene Benutzername, die E-Mail-Adresse oder das Passwort ist falsch. Bitte versuchen Sie es erneut oder {resetLink}.",
@@ -64,7 +69,7 @@
   "non.compliant.password.message": "Ihr aktuelles Passwort entspricht nicht den neuen Sicherheitsanforderungen. Wir haben gerade eine Nachricht zum Zurücksetzen des Passworts an die mit diesem Konto verknüpfte E-Mail-Adresse gesendet. Vielen Dank, dass Sie uns helfen, Ihre Daten zu schützen.",
   "account.locked.out.message.1": "Um Ihr Konto zu schützen, wurde es vorübergehend gesperrt. Versuchen Sie es in 30 Minuten erneut.",
   "enterprise.login.btn.text": "Arbeits- oder Schulzeugnisse",
-  "username.or.email.format.validation.less.chars.message": "Benutzername oder E-Mail müssen mindestens 3 Zeichen lang sein.",
+  "username.or.email.format.validation.less.chars.message": "Benutzername oder E-Mail müssen mindestens 2 Zeichen lang sein.",
   "email.validation.message": "Geben Sie Ihren Benutzernamen oder Ihre E-Mail-Adresse ein",
   "password.validation.message": "Die Passwortkriterien wurden nicht erfüllt",
   "account.activation.success.message.title": "Super! Sie haben Ihr Konto aktiviert.",
@@ -91,7 +96,6 @@
   "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.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.",
@@ -106,16 +110,6 @@
   "recommendation.page.title": "Empfehlungen | {siteName}",
   "recommendation.page.heading": "Wir haben ein paar Empfehlungen für den Einstieg.",
   "recommendation.skip.button": "Überspringen",
-  "recommendation.option.trending": "Trending Now",
-  "recommendation.option.popular": "Most Popular",
-  "recommendation.option.recommended.for.you": "Recommended For You",
-  "recommendation.product-card.pill-text.course": "Course",
-  "recommendation.product-card.pill-text.professional-certificate": "Professional Certificate",
-  "recommendation.product-card.pill-text.emeritus": "Offered on Emeritus",
-  "recommendation.product-card.pill-text.shorelight": "Offered through Shorelight",
-  "recommendation.product-card.footer-text.number-of-courses": "{length} {label}",
-  "recommendation.product-card.footer-text.subscription": "Subscription",
-  "recommendation.product-card.launch-icon.sr-text": "Opens a link in a new tab",
   "register.page.title": "Registrieren | {siteName}",
   "registration.fullname.label": "Vollständiger Name",
   "registration.email.label": "E-Mail-Adresse",
@@ -129,7 +123,6 @@
   "help.text.email": "Für die Kontoaktivierung und wichtige Updates",
   "create.account.for.free.button": "Erstellen Sie kostenlos ein Benutzerkonto",
   "registration.other.options.heading": "Oder registrieren Sie sich bei:",
-  "create.account.cta.button": "{label}",
   "register.institution.login.button": "Zeugnisse der Institution/des Campus",
   "register.institution.login.page.title": "Registrieren Sie sich mit Institutions-/Campus-Anmeldeinformationen",
   "empty.name.field.error": "Geben Sie Ihren vollständigen Namen ein",
@@ -147,13 +140,15 @@
   "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",
   "terms.of.service": "Nutzungsbedingungen",
   "registration.username.suggestion.label": "Empfohlen:",
   "did.you.mean.alert.text": "Meinten Sie",
+  "register.page.terms.of.service.and.honor.code": "Wenn Sie ein Konto erstellen, stimmen Sie den {tosAndHonorCode} zu und erkennen an, dass {platformName} und jedes \nMitglied Ihre personenbezogenen Daten in Übereinstimmung mit den {privacyPolicy} verarbeitet.",
+  "register.page.honor.code": "Ich stimme den {platformName} {tosAndHonorCode} zu",
+  "register.page.terms.of.service": "Ich stimme den {platformName} {termsOfService} zu",
   "sign.in": "Anmelden",
   "reset.password.page.title": "Passwort zurücksetzen | {siteName}",
   "reset.password": "Passwort zurücksetzen",
@@ -167,15 +162,5 @@
   "reset.server.rate.limit.error": "Zu viele Anfragen.",
   "reset.password.success.heading": "Zurücksetzen des Passworts abgeschlossen.",
   "reset.password.success": "Ihr Passwort wurde zurückgesetzt. Melden Sie sich bei Ihrem Konto an.",
-  "rate.limit.error": "Aufgrund zu vieler Anfragen ist ein Fehler aufgetreten. Bitte versuchen Sie es nach einiger Zeit erneut.",
-  "start.learning": "Beginne zu lernen",
-  "with.site.name": "mit {siteName}",
-  "your.career.turning.point": "Your career turning point",
-  "is.here": "is here.",
-  "welcome.to.platform": "Willkommen bei {siteName}, {username}!",
-  "complete.your.profile.1": "Vervollständige",
-  "complete.your.profile.2": "dein Profil",
-  "register.page.terms.of.service.and.honor.code": "By creating an account, you agree to the {tosAndHonorCode} and you acknowledge that {platformName} and each 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}"
-}
+  "rate.limit.error": "Aufgrund zu vieler Anfragen ist ein Fehler aufgetreten. Bitte versuchen Sie es nach einiger Zeit erneut."
+}

src/i18n/messages/es_419.json

@@ -1,11 +1,15 @@
 {
-  "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.",
+  "start.learning": "Empieza a aprender",
+  "with.site.name": "con {siteName}",
+  "complete.your.profile.1": "Completado",
+  "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",
   "logistration.sign.in": "Iniciar sesión",
   "logistration.register": "Registrarse",
   "enterprisetpa.title.heading": "¿Deseas iniciar sesión con tus credenciales de {providerName}?",
   "enterprisetpa.login.button.text": "Mostrar otras formas de iniciar sesión o de registrarme",
-  "enterprisetpa.login.button.text.public.account.creation.disabled": "Mostrar otras formas de iniciar sesión",
+  "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",
@@ -18,9 +22,10 @@
   "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": "Soporte edX",
-  "zendesk.selectTicketForm": "Elegir el tipo de solicitud:",
-  "forgot.password.confirmation.message": "Enviamos un correo electrónico a {email} con instrucciones para restablecer su contraseña. Si no recibe un mensaje de restablecimiento de contraseña después de 1 minuto, verifique que ingresó la dirección de correo electrónico correcta o verifique su carpeta de correo no deseado. Si necesita más ayuda, {supportLink}.",
+  "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}",
   "forgot.password.page.heading": "Restablecer mi contraseña",
   "forgot.password.page.instructions": "Por favor, introduce tu dirección de correo electrónico y te enviaremos un correo electrónico con instrucciones sobre cómo restablecer tu contraseña.",
@@ -35,7 +40,7 @@
   "confirmation.message.title": "Verifica tu correo electrónico",
   "confirmation.support.link": "entra en contacto con el equipo de soporte técnico",
   "need.help.sign.in.text": "¿Necesitas ayuda para iniciar sesión?",
-  "additional.help.text": "Para obtener ayuda adicional, comuníquese con el soporte {platformName} en",
+  "additional.help.text": "Para obtener ayuda adicional, comuníquese con el soporte de {platformName} en",
   "sign.in.text": "Iniciar sesión",
   "extend.field.errors": "{emailError} a continuación.",
   "invalid.token.heading": "Enlace de restablecimiento de contraseña inválido",
@@ -46,9 +51,9 @@
   "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.",
   "account.activation.error.message": "Algo no funcionó correctamente, por favor {supportLink} para resolver este problema.",
-  "login.inactive.user.error": "Para iniciar sesión, debe activar su cuenta.{lineBreak} {lineBreak}Acabamos de enviar un enlace de activación a {email}. Si no recibe un correo electrónico, revise sus carpetas de spam o {supportLink}.",
+  "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}.",
-  "login.incorrect.credentials.error.attempts.text.1": "El nombre de usuario, correo electrónico o contraseña que ingresó es incorrecto. Tiene {remainingAttempts} más intentos de inicio de sesión antes de que su cuenta se bloquee temporalmente.",
+  "login.incorrect.credentials.error.attempts.text.1": "El nombre de usuario, el email o la contraseña que has introducido son incorrectos. Tienes {remainingAttempts} intentos más de inicio de sesión\n                antes de que tu cuenta se bloquee temporalmente.",
   "login.incorrect.credentials.error.attempts.text.2": "Si has olvidado tu contraseña, {resetLink}",
   "account.locked.out.message.2": "Para estar seguro, puedes {resetLink} antes de volver a intentarlo.",
   "login.incorrect.credentials.error.with.reset.link": "El nombre de usuario, el correo electrónico o la contraseña que has introducido son incorrectos. Por favor, inténtalo de nuevo o {resetLink}.",
@@ -64,7 +69,7 @@
   "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.",
   "enterprise.login.btn.text": "Credenciales de la empresa o de la institución ",
-  "username.or.email.format.validation.less.chars.message": "El nombre de usuario o el correo electrónico deben tener al menos 3 caracteres.",
+  "username.or.email.format.validation.less.chars.message": "El nombre de usuario o el correo electrónico deben tener al menos 2 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",
   "account.activation.success.message.title": "Ha sido un éxito. Has activado tu cuenta.",
@@ -91,8 +96,7 @@
   "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": "Lo sentimos, no está autorizado para acceder a {platform_name} a través de este canal. Comuníquese con su administrador o gerente de aprendizaje para acceder a {platform_name}.{lineBreak}{lineBreak}Detalles del error:{lineBreak}{errorMessage}",
-  "progressive.profiling.page.title": "Bienvenido | {siteName}",
+  "progressive.profiling.page.title": "Welcome | {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",
@@ -106,16 +110,6 @@
   "recommendation.page.title": "Recomendaciones | {siteName}",
   "recommendation.page.heading": "Tenemos algunas recomendaciones para empezar.",
   "recommendation.skip.button": "Saltar por ahora ",
-  "recommendation.option.trending": "Tendencias",
-  "recommendation.option.popular": "Más popular",
-  "recommendation.option.recommended.for.you": "Recomendado para usted",
-  "recommendation.product-card.pill-text.course": "Curso",
-  "recommendation.product-card.pill-text.professional-certificate": "Certificado profesional",
-  "recommendation.product-card.pill-text.emeritus": "Ofrecido en Emeritus",
-  "recommendation.product-card.pill-text.shorelight": "Ofrecido a través de Shorelight",
-  "recommendation.product-card.footer-text.number-of-courses": "{length} {label}",
-  "recommendation.product-card.footer-text.subscription": "Suscripción",
-  "recommendation.product-card.launch-icon.sr-text": "Abrir un enlace en una pestaña nueva",
   "register.page.title": "Register | {siteName}",
   "registration.fullname.label": "Nombre completo",
   "registration.email.label": "Correo electrónico",
@@ -129,7 +123,6 @@
   "help.text.email": "Para la activación de la cuenta y las actualizaciones importantes",
   "create.account.for.free.button": "Crea una cuenta gratis",
   "registration.other.options.heading": "O regístrese con:",
-  "create.account.cta.button": "{label}",
   "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",
@@ -147,13 +140,15 @@
   "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": "Lo sentimos, no está autorizado para acceder a {platform_name} a través de este canal. Comuníquese con su administrador o gerente de aprendizaje para acceder a {platform_name}.{lineBreak}{lineBreak}Detalles del error:{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.username.suggestion.label": "Se recomienda:",
   "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}",
   "sign.in": "Iniciar sesión",
   "reset.password.page.title": "Restablecer contraseña | {siteName}",
   "reset.password": "Restablecer mi contraseña",
@@ -167,15 +162,5 @@
   "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.",
-  "start.learning": "Empieza a aprender",
-  "with.site.name": "con {siteName}",
-  "your.career.turning.point": "El punto de inflexión de tu carrera",
-  "is.here": "es aquí.",
-  "welcome.to.platform": "¡Bienvenido a {siteName}, {username}!",
-  "complete.your.profile.1": "Completado",
-  "complete.your.profile.2": "tu perfil ",
-  "register.page.terms.of.service.and.honor.code": "Al crear una cuenta, acepta {tosAndHonorCode} y reconoce que {platformName} y cada miembro procesan sus datos personales de acuerdo con {privacyPolicy}.",
-  "register.page.honor.code": "Acepto las {platformName} {tosAndHonorCode}",
-  "register.page.terms.of.service": "Acepto las {platformName} {termsOfService}"
-}
+  "rate.limit.error": "Se ha producido un error debido a demasiadas solicitudes. Por favor, inténtalo de nuevo después de algún tiempo."
+}

src/i18n/messages/fa_IR.json

@@ -1,181 +0,0 @@
-{
-  "error.notfound.message": "صفحه مورد نظر شما در دسترس نیست یا خطایی در نشانی اینترنتی وجود دارد. لطفاً نشانی اینترنتی را بررسی کرده و دوباره تلاش کنید.",
-  "institution.login.page.sub.heading": "موسسه خود را از فهرست زیر برگزینید",
-  "logistration.sign.in": "ورود",
-  "logistration.register": "ثبت‌نام",
-  "enterprisetpa.title.heading": "آیا می‌خواهید با استفاده از اطلاعات کاربری {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": "نمایش گذرواژه",
-  "hide.password": "پنهان‌سازی گذرواژه",
-  "one.letter": "1 نامه",
-  "one.number": "1 رقم",
-  "eight.characters": "8 نویسه",
-  "password.sr.only.helping.text": "گذرواژه باید حداقل  8 نویسه، حداقل یک حرف و حداقل یک عدد داشته باشد",
-  "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",
-  "zendesk.selectTicketForm": "لطفا نوع درخواست خود را انتخاب کنید:",
-  "forgot.password.confirmation.message": "We sent an email to {email} with instructions to reset your password. 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. If you need further assistance, {supportLink}.",
-  "forgot.password.page.title": "فراموش گذرواژه | {siteName}",
-  "forgot.password.page.heading": "بازتنظیم گذرواژه",
-  "forgot.password.page.instructions": "لطفا نشانی رایانامه خود را در قسمت زیر وارد کنید و ما  رایانامه‌ای حاوی دستورالعمل نحوه بازتنظیم مجدد گذرواژه برای شما ارسال خواهیم کرد.",
-  "forgot.password.page.invalid.email.message": "نشانی رایانامه معتبری را وارد کنید",
-  "forgot.password.page.email.field.label": "رایانامه",
-  "forgot.password.page.submit.button": "ارسال",
-  "forgot.password.error.alert.title.": "ما نتوانستیم با شما تماس بگیریم.",
-  "forgot.password.error.message.title": "خطایی رخ داد.",
-  "forgot.password.request.in.progress.message": "درخواست قبلی شما در حال انجام است، لطفا چند لحظه دیگر دوباره تلاش کنید.",
-  "forgot.password.empty.email.field.error": "نشانی رایانامه خود را وارد کنید",
-  "forgot.password.email.help.text": "نشانی رایانامه‌ای که برای ثبت‌نام در {platformName} استفاده کردید",
-  "confirmation.message.title": "صندوق رایانامه خود را ببینید",
-  "confirmation.support.link": "با پشتیبانی فنی تماس بگیرید",
-  "need.help.sign.in.text": "برای ورود به سامانه نیاز به کمک دارید؟",
-  "additional.help.text": "For additional help, contact {platformName} support at",
-  "sign.in.text": "ورود",
-  "extend.field.errors": "{emailError} زیر.",
-  "invalid.token.heading": "پیوند بازتنظیم گذرواژه معتبر نیست",
-  "invalid.token.error.message": "این پیوند برای بازتنظیم گذرواژه معتبر نیست. ممکن است قبلاً استفاده شده باشد. برای دریافت پیوند جدید نشانی رایانامه خود را در زیر وارد کنید.",
-  "token.validation.rate.limit.error.heading": "تعداد زیاد درخواست",
-  "token.validation.rate.limit.error": "به دلیل درخواست‌های زیاد، خطایی روی داده است. لطفا بعد از مدتی دوباره امتحان کنید.",
-  "token.validation.internal.sever.error.heading": "اعتبارسنجی رمز انجام نشد",
-  "token.validation.internal.sever.error": "خطایی رخ داده است. صفحه را دوباره بارگیری کنید یا اتصال اینترنت خود را بررسی کنید.",
-  "internal.server.error": "خطایی رخ داده است. صفحه را دوباره بارگیری کنید یا اتصال اینترنت خود را بررسی کنید.",
-  "account.activation.error.message": "اشتباهی رخ داد، لطفاً برای حل این مساله ، به این قسمت{supportLink} مراجعه کنید.",
-  "login.inactive.user.error": "In order to sign in, you need to activate your account.{lineBreak} {lineBreak}We just sent an activation link to {email}. If you do not receive an email, check your spam folders or {supportLink}.",
-  "allowed.domain.login.error": "به عنوان کاربر {allowedDomain}، باید با {allowedDomain} {tpaLink} خود وارد شوید.",
-  "login.incorrect.credentials.error.attempts.text.1": "The username, email or password you entered is incorrect. You have {remainingAttempts} more sign in attempts before your account is temporarily locked.",
-  "login.incorrect.credentials.error.attempts.text.2": "اگر گذرواژه خود را فراموش کرده‌اید، {resetLink}",
-  "account.locked.out.message.2": "برای حفظ امنیت، می‌توانید پیش از تلاش مجدد، {resetLink} را انجام دهید.",
-  "login.incorrect.credentials.error.with.reset.link": "نام کاربری، نشانی رایانامه یا گذرواژه‌ای که وارد کردید درست نیست. لطفاً دوباره امتحان کنید یا {resetLink}.",
-  "login.page.title": "ورود به سامانه | {siteName}",
-  "login.user.identity.label": "نام کاربری یا نشانی رایانامه",
-  "login.password.label": "گذرواژه",
-  "sign.in.button": "ورود به سامانه",
-  "forgot.password": "فراموشی گذرواژه",
-  "institution.login.button": "اعتبارنامه‌های موسسه/پردیس",
-  "institution.login.page.title": "با اعتبار موسسه/پردیس وارد شوید",
-  "login.other.options.heading": "یا وارد شوید با:",
-  "non.compliant.password.title": "ما اخیراً الزامات گذرواژه خود را تغییر دادیم",
-  "non.compliant.password.message": "گذرواژه فعلی شما الزامات امنیتی جدید را برآورده نمی‌کند. ما فقط یک پیام بازتنظیم گذرواژه به نشانی رایانامه مرتبط با این حساب کاربری ارسال کردیم. از اینکه به ما کمک می‌کنید تا داده‌های شما را ایمن نگه دارید متشکریم.",
-  "account.locked.out.message.1": "حساب کاربری شما، به دلیل حفاظت، به‌طور موقت قفل شده است. 30 دقیقه دیگر دوباره امتحان کنید.",
-  "enterprise.login.btn.text": "اعتبار دانشکده یا شرکت",
-  "username.or.email.format.validation.less.chars.message": "نام کاربری یا نشانی رایانامه حداقل باید 3 نویسه داشته باشد",
-  "email.validation.message": "نام کاربری یا رایانامه خود را وارد کنید",
-  "password.validation.message": "معیارهای گذرواژه رعایت نشده است",
-  "account.activation.success.message.title": "موفق شدید! شما حساب کاربری خود را فعال کردید.",
-  "account.activation.success.message": "اکنون رایانامه‌های مربوط به روزآمدسازی‌ها و هشدارها درباره دوره‌های آموزشی را که در آن ثبت‌نام کرده‌اید از ما دریافت خواهید کرد. برای ادامه وارد شوید.",
-  "account.activation.info.message": "حساب کاربری مورد نظر شما قبلاً فعال شده است.",
-  "account.activation.error.message.title": "امکان فعالسازی حساب کاربری شما نبود",
-  "account.activation.support.link": "تماس با پشتیبانی ",
-  "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.form.invalid.error.message": "لطفا قسمت‌های زیر را پر کنید.",
-  "login.incorrect.credentials.error.reset.link.text": "گذرواژه را بازتنظیم کنید",
-  "login.incorrect.credentials.error.before.account.blocked.text": "برای بازتنظیم اینجا بزنید",
-  "password.security.nudge.title": "امنیت گذرواژه",
-  "password.security.block.title": "تغییر گذرواژه ضروری است",
-  "password.security.nudge.body": "سامانه ما تشخیص داده است که گذرواژه شما آسیب‌پذیر است. توصیه ما این است که آن را تغییر دهید تا حساب کاربری شما ایمن بماند.",
-  "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.heading": "چند سوال برای شما به ما کمک خواهد کرد تا باهوش‌تر شویم.",
-  "optional.fields.information.link": "درباره نحوه استفاده ما از این اطلاعات بیشتر بدانید.",
-  "optional.fields.submit.button": "ارسال",
-  "optional.fields.skip.button": "فعلا بگذرید",
-  "optional.fields.next.button": "بعدی",
-  "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.option.trending": "Trending Now",
-  "recommendation.option.popular": "محبوبترین",
-  "recommendation.option.recommended.for.you": "Recommended For You",
-  "recommendation.product-card.pill-text.course": "دوره آموزشی",
-  "recommendation.product-card.pill-text.professional-certificate": "گواهی حرفه‌ای",
-  "recommendation.product-card.pill-text.emeritus": "ارائه شده در Emeritus",
-  "recommendation.product-card.pill-text.shorelight": "از طریق Shorelight ارائه می شود",
-  "recommendation.product-card.footer-text.number-of-courses": "{length} {label}",
-  "recommendation.product-card.footer-text.subscription": "اشتراک",
-  "recommendation.product-card.launch-icon.sr-text": "پیوندی را در یک برگه جدید باز می کند",
-  "register.page.title": "ثبت‌نام | {siteName}",
-  "registration.fullname.label": "نام و نام خانوادگی",
-  "registration.email.label": "رایانامه",
-  "registration.username.label": "نام‌کاربری عمومی",
-  "registration.password.label": "گذرواژه",
-  "registration.country.label": "کشور/منطقه",
-  "registration.opt.in.label": "با ارسال پیام‌های بازرگانی از سوی  {siteName} موافقم.",
-  "help.text.name": "این نام در هر گواهی که بدست آورید استفاده خواهد شد.",
-  "help.text.username.1": "نامی که شما را در دوره‌های آموزشی با آن شناخته خواهید شد.",
-  "help.text.username.2": "این مورد بعدا قابل تغییر نیست.",
-  "help.text.email": "برای فعال‌سازی حساب کاربری و روزآمدسازی‌های مهم",
-  "create.account.for.free.button": "یک حساب کاربری رایگان بسازید",
-  "registration.other.options.heading": "یا ثبت‌نام کنید با:",
-  "create.account.cta.button": "{label}",
-  "register.institution.login.button": "اعتبارنامه‌های موسسه/پردیس",
-  "register.institution.login.page.title": "با اعتبارنامه موسسه/پردیس ثبت‌نام کنید",
-  "empty.name.field.error": "نام و نام خانوادگی خود را وارد کنید",
-  "empty.email.field.error": "نشانی رایانامه خود را وارد کنید",
-  "empty.username.field.error": "نام کاربری باید بین 2 تا 30 نویسه داشته باشد",
-  "empty.password.field.error": "معیارهای گذرواژه رعایت نشده است",
-  "empty.country.field.error": "کشور یا منطقه محل سکونت خود را برگزینید",
-  "email.do.not.match": "نشانی‌های رایانامه همخوانی ندارند.",
-  "email.invalid.format.error": "نشانی رایانامه معتبر وارد کنید",
-  "username.validation.message": "نام کاربری باید بین 2 تا 30 نویسه داشته باشد",
-  "name.validation.message": "نامی معتبر وارد کنید",
-  "username.format.validation.message": "نام کاربری فقط می‌تواند شامل حروف (A-Z، a-z)، اعداد (0-9)، خط زیر (_) و خط فاصله (-) باشد. نام کاربری نمی‌تواند حاوی فاصله باشد",
-  "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.username.suggestion.label": "پیشنهادشده:",
-  "did.you.mean.alert.text": "منظور شما این بود",
-  "sign.in": "ورود",
-  "reset.password.page.title": "بازتنظیم گذرواژه | {siteName}",
-  "reset.password": "بازتنظیم گذرواژه",
-  "reset.password.page.instructions": "گذرواژه جدید را مجددا وارد کنید ",
-  "new.password.label": "گذرواژه جدید",
-  "confirm.password.label": "تایید گذرواژه",
-  "passwords.do.not.match": "گذرواژه‌ها مطابقت ندارند",
-  "confirm.your.password": "تایید گذرواژه ",
-  "reset.password.failure.heading": "امکان بازتنظیم گذرواژه شما نیست.",
-  "reset.password.form.submission.error": "لطفاً پاسخ‌های خود را بررسی کرده و دوباره امتحان کنید.",
-  "reset.server.rate.limit.error": "تعداد درخواست‌ها خیلی زیاد است.",
-  "reset.password.success.heading": "بازتنظیم گذرواژه  تکمیل شد.",
-  "reset.password.success": "گذرواژه شما بازتنظیم شد. وارد حساب کاربری خود شوید",
-  "rate.limit.error": "به دلیل درخواست‌های زیاد، خطایی روی داده است. لطفا بعد از مدتی دوباره امتحان کنید.",
-  "start.learning": "آغاز یادگیری",
-  "with.site.name": "با {siteName}",
-  "your.career.turning.point": "نقطه عطف حرفه ای شما",
-  "is.here": "اینجاست.",
-  "welcome.to.platform": "خوش آمدید به {siteName}, {username}!",
-  "complete.your.profile.1": "کامل",
-  "complete.your.profile.2": "پرونده کاربری شما",
-  "register.page.terms.of.service.and.honor.code": "By creating an account, you agree to the {tosAndHonorCode} and you acknowledge that {platformName} and each 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}"
-}

src/i18n/messages/fr.json

@@ -1,5 +1,9 @@
 {
-  "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.",
+  "start.learning": "Démarrer l'apprentissage",
+  "with.site.name": "avec {siteName}",
+  "complete.your.profile.1": "Terminé",
+  "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": "Connectez-vous",
   "logistration.register": "S'inscrire",
@@ -20,7 +24,8 @@
   "registration.using.tpa.form.heading": "Terminer la création de votre compte",
   "zendesk.supportTitle": "edX Support",
   "zendesk.selectTicketForm": "Please choose your request type:",
-  "forgot.password.confirmation.message": "We sent an email to {email} with instructions to reset your password. 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. If you need further assistance, {supportLink}.",
+  "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}",
   "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.",
@@ -35,7 +40,7 @@
   "confirmation.message.title": "Vérifiez votre email",
   "confirmation.support.link": "contacter le support technique",
   "need.help.sign.in.text": "Besoin d'aide pour vous enregistrer?",
-  "additional.help.text": "For additional help, contact {platformName} support at",
+  "additional.help.text": "For additional help, contact {platformName} support at ",
   "sign.in.text": "Connectez-vous",
   "extend.field.errors": "{emailError} ci-dessous.",
   "invalid.token.heading": "Lien de réinitialisation du mot de passe non valide",
@@ -46,9 +51,9 @@
   "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": "In order to sign in, you need to activate your account.{lineBreak} {lineBreak}We just sent an activation link to {email}. If you do not receive an email, check your spam folders or {supportLink}.",
+  "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}.",
-  "login.incorrect.credentials.error.attempts.text.1": "The username, email or password you entered is incorrect. You have {remainingAttempts} more sign in attempts before your account is temporarily locked.",
+  "login.incorrect.credentials.error.attempts.text.1": "Le nom d'utilisateur, le courriel ou le mot de passe que vous avez entré est incorrect. 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}.",
@@ -64,7 +69,7 @@
   "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.",
+  "username.or.email.format.validation.less.chars.message": "Le nom d'utilisateur ou l'adresse courriel doit comporter au moins 2 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.",
@@ -91,7 +96,6 @@
   "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.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.",
@@ -106,16 +110,6 @@
   "recommendation.page.title": "Recommendations | {siteName}",
   "recommendation.page.heading": "We have a few recommendations to get you started.",
   "recommendation.skip.button": "Skip for now",
-  "recommendation.option.trending": "Trending Now",
-  "recommendation.option.popular": "Most Popular",
-  "recommendation.option.recommended.for.you": "Recommended For You",
-  "recommendation.product-card.pill-text.course": "Course",
-  "recommendation.product-card.pill-text.professional-certificate": "Professional Certificate",
-  "recommendation.product-card.pill-text.emeritus": "Offered on Emeritus",
-  "recommendation.product-card.pill-text.shorelight": "Offered through Shorelight",
-  "recommendation.product-card.footer-text.number-of-courses": "{length} {label}",
-  "recommendation.product-card.footer-text.subscription": "Subscription",
-  "recommendation.product-card.launch-icon.sr-text": "Opens a link in a new tab",
   "register.page.title": "S'inscrire | {siteName}",
   "registration.fullname.label": "Nom complet",
   "registration.email.label": "Email",
@@ -129,7 +123,6 @@
   "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 :",
-  "create.account.cta.button": "{label}",
   "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",
@@ -147,13 +140,15 @@
   "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.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": "I agree to the {platformName} {tosAndHonorCode}",
+  "register.page.terms.of.service": "I agree to the {platformName} {termsOfService}",
   "sign.in": "Connectez-vous",
   "reset.password.page.title": "Réinitialiser le mot de passe | {siteName}",
   "reset.password": "Réinitialiser le mot de passe",
@@ -167,15 +162,5 @@
   "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.",
-  "start.learning": "Démarrer l'apprentissage",
-  "with.site.name": "avec {siteName}",
-  "your.career.turning.point": "Your career turning point",
-  "is.here": "is here.",
-  "welcome.to.platform": "Bienvenue sur {siteName}, {username}!",
-  "complete.your.profile.1": "Terminé",
-  "complete.your.profile.2": "votre profil",
-  "register.page.terms.of.service.and.honor.code": "By creating an account, you agree to the {tosAndHonorCode} and you acknowledge that {platformName} and each 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}"
-}
+  "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/fr_CA.json

@@ -1,181 +0,0 @@
-{
-  "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.",
-  "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 informations d'identification {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 :",
-  "forgot.password.confirmation.message": "Nous avons envoyé un courriel à {email} avec des instructions pour réinitialiser votre mot de passe. Si vous ne recevez pas de message de réinitialisation de mot de passe après 1 minute, vérifiez que vous avez saisi l'adresse courriel correctement, ou vérifiez votre dossier de pourriels. Si vous avez besoin d'aide supplémentaire, contactez {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 de l'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}{lineBreak}Nous venons d'envoyer un lien d'activation à {email}. Si vous ne recevez pas de courriel, 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 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": "Informations d'identification de l'établissement/du campus",
-  "institution.login.page.title": "Connectez vous avec les informations d'identification 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": "Informations d'identification 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",
-  "recommendation.option.trending": "Tendances actuelles",
-  "recommendation.option.popular": "Le plus populaire",
-  "recommendation.option.recommended.for.you": "Recommandé pour vous",
-  "recommendation.product-card.pill-text.course": "Cours",
-  "recommendation.product-card.pill-text.professional-certificate": "Attestation professionnelle",
-  "recommendation.product-card.pill-text.emeritus": "Offert à titre émérite",
-  "recommendation.product-card.pill-text.shorelight": "Offert via Shorelight",
-  "recommendation.product-card.footer-text.number-of-courses": "{length} {label}",
-  "recommendation.product-card.footer-text.subscription": "Abonnement",
-  "recommendation.product-card.launch-icon.sr-text": "Ouvre un lien dans un nouvel onglet",
-  "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 :",
-  "create.account.cta.button": "{label}",
-  "register.institution.login.button": "Informations d'identification de l'établissement/du campus",
-  "register.institution.login.page.title": "Inscription avec les informations d'identification 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 (A-Z, a-z), 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",
-  "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.",
-  "start.learning": "Commencez à apprendre",
-  "with.site.name": "avec {siteName}",
-  "your.career.turning.point": "Un tournant dans votre carrière",
-  "is.here": "est là.",
-  "welcome.to.platform": "Bienvenue sur {siteName}, {username}!",
-  "complete.your.profile.1": "Complet",
-  "complete.your.profile.2": "votre profil",
-  "register.page.terms.of.service.and.honor.code": "En créant un compte, vous acceptez le {tosAndHonorCode} et vous reconnaissez que {platformName} et chaque membre traitent vos données personnelles conformément au {privacyPolicy}.",
-  "register.page.honor.code": "J'accepte le {tosAndHonorCode} {platformName}",
-  "register.page.terms.of.service": "J'accepte les {termsOfService} {platformName}"
-}

src/i18n/messages/hi.json

@@ -1,5 +1,9 @@
 {
-  "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.",
+  "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",
@@ -20,7 +24,8 @@
   "registration.using.tpa.form.heading": "Finish creating your account",
   "zendesk.supportTitle": "edX Support",
   "zendesk.selectTicketForm": "Please choose your request type:",
-  "forgot.password.confirmation.message": "We sent an email to {email} with instructions to reset your password. 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. If you need further assistance, {supportLink}.",
+  "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.",
@@ -35,7 +40,7 @@
   "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",
+  "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",
@@ -46,9 +51,9 @@
   "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} {lineBreak}We just sent an activation link to {email}. If you do not receive an email, check your spam folders or {supportLink}.",
+  "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 attempts before your account is temporarily locked.",
+  "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}.",
@@ -64,7 +69,7 @@
   "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.",
+  "username.or.email.format.validation.less.chars.message": "Username or email must have at least 2 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.",
@@ -91,7 +96,6 @@
   "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.",
@@ -106,16 +110,6 @@
   "recommendation.page.title": "Recommendations | {siteName}",
   "recommendation.page.heading": "We have a few recommendations to get you started.",
   "recommendation.skip.button": "Skip for now",
-  "recommendation.option.trending": "Trending Now",
-  "recommendation.option.popular": "Most Popular",
-  "recommendation.option.recommended.for.you": "Recommended For You",
-  "recommendation.product-card.pill-text.course": "Course",
-  "recommendation.product-card.pill-text.professional-certificate": "Professional Certificate",
-  "recommendation.product-card.pill-text.emeritus": "Offered on Emeritus",
-  "recommendation.product-card.pill-text.shorelight": "Offered through Shorelight",
-  "recommendation.product-card.footer-text.number-of-courses": "{length} {label}",
-  "recommendation.product-card.footer-text.subscription": "Subscription",
-  "recommendation.product-card.launch-icon.sr-text": "Opens a link in a new tab",
   "register.page.title": "Register | {siteName}",
   "registration.fullname.label": "Full name",
   "registration.email.label": "Email",
@@ -129,7 +123,6 @@
   "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:",
-  "create.account.cta.button": "{label}",
   "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",
@@ -147,13 +140,15 @@
   "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",
@@ -167,15 +162,5 @@
   "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.",
-  "start.learning": "Start learning",
-  "with.site.name": "with {siteName}",
-  "your.career.turning.point": "Your career turning point",
-  "is.here": "is here.",
-  "welcome.to.platform": "Welcome to {siteName}, {username}!",
-  "complete.your.profile.1": "Complete",
-  "complete.your.profile.2": "your profile",
-  "register.page.terms.of.service.and.honor.code": "By creating an account, you agree to the {tosAndHonorCode} and you acknowledge that {platformName} and each 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}"
-}
+  "rate.limit.error": "An error has occurred because of too many requests. Please try again after some time."
+}

src/i18n/messages/it.json

@@ -1,181 +0,0 @@
-{
-  "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.",
-  "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:",
-  "forgot.password.confirmation.message": "We sent an email to {email} with instructions to reset your password. 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. 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} {lineBreak}We just sent an activation link to {email}. If you do not receive an email, 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 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",
-  "recommendation.option.trending": "Trending Now",
-  "recommendation.option.popular": "Most Popular",
-  "recommendation.option.recommended.for.you": "Recommended For You",
-  "recommendation.product-card.pill-text.course": "Course",
-  "recommendation.product-card.pill-text.professional-certificate": "Professional Certificate",
-  "recommendation.product-card.pill-text.emeritus": "Offered on Emeritus",
-  "recommendation.product-card.pill-text.shorelight": "Offered through Shorelight",
-  "recommendation.product-card.footer-text.number-of-courses": "{length} {label}",
-  "recommendation.product-card.footer-text.subscription": "Subscription",
-  "recommendation.product-card.launch-icon.sr-text": "Opens a link in a new tab",
-  "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:",
-  "create.account.cta.button": "{label}",
-  "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",
-  "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.",
-  "start.learning": "Start learning",
-  "with.site.name": "with {siteName}",
-  "your.career.turning.point": "Your career turning point",
-  "is.here": "is here.",
-  "welcome.to.platform": "Welcome to {siteName}, {username}!",
-  "complete.your.profile.1": "Complete",
-  "complete.your.profile.2": "your profile",
-  "register.page.terms.of.service.and.honor.code": "By creating an account, you agree to the {tosAndHonorCode} and you acknowledge that {platformName} and each 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}"
-}

src/i18n/messages/it_IT.json

@@ -1,5 +1,9 @@
 {
-  "error.notfound.message": "La pagina che stai cercando non è disponibile o si è verificato un errore nell'URL. Controlla l'URL e riprova. ",
+  "start.learning": "Inizia a imparare",
+  "with.site.name": "con {siteName}",
+  "complete.your.profile.1": "Completata",
+  "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",
   "logistration.sign.in": "Accedi",
   "logistration.register": "Registrazione",
@@ -20,7 +24,8 @@
   "registration.using.tpa.form.heading": "Completa la creazione del tuo account",
   "zendesk.supportTitle": "edX Support",
   "zendesk.selectTicketForm": "Please choose your request type:",
-  "forgot.password.confirmation.message": "We sent an email to {email} with instructions to reset your password. 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. If you need further assistance, {supportLink}.",
+  "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}",
   "forgot.password.page.heading": "Resetta la password",
   "forgot.password.page.instructions": "Inserisci il tuo indirizzo e-mail qui sotto e ti invieremo un'e-mail con le istruzioni su come reimpostare la tua password.",
@@ -35,7 +40,7 @@
   "confirmation.message.title": "Controlla la tua casella di posta",
   "confirmation.support.link": "contatta il supporto tecnico",
   "need.help.sign.in.text": "Hai bisogno di aiuto per l'accesso? ",
-  "additional.help.text": "For additional help, contact {platformName} support at",
+  "additional.help.text": "Per ulteriore assistenza, contattare l'assistenza {platformName} all'indirizzo",
   "sign.in.text": "Accedi",
   "extend.field.errors": "{emailError} di seguito.",
   "invalid.token.heading": "Link di ripristino della password non valido",
@@ -46,9 +51,9 @@
   "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.",
   "account.activation.error.message": "Si è verificato un errore, seleziona {supportLink} per risolvere il problema. ",
-  "login.inactive.user.error": "In order to sign in, you need to activate your account.{lineBreak} {lineBreak}We just sent an activation link to {email}. If you do not receive an email, check your spam folders or {supportLink}.",
+  "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}.",
-  "login.incorrect.credentials.error.attempts.text.1": "The username, email or password you entered is incorrect. You have {remainingAttempts} more sign in attempts before your account is temporarily locked.",
+  "login.incorrect.credentials.error.attempts.text.1": "Il nome utente, l'e-mail o la password che hai inserito non sono corretti. Hai {remainingAttempts} più tentativi di accesso prima che il tuo account venga temporaneamente bloccato.",
   "login.incorrect.credentials.error.attempts.text.2": "Se hai dimenticato la password, {resetLink}",
   "account.locked.out.message.2": "Per sicurezza, puoi {resetLink} prima di riprovare.",
   "login.incorrect.credentials.error.with.reset.link": "Il nome utente, l'e-mail o la password inseriti non sono corretti. Riprova o {resetLink}.",
@@ -64,7 +69,7 @@
   "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.",
   "enterprise.login.btn.text": "Credenziali aziendali o scolastiche",
-  "username.or.email.format.validation.less.chars.message": "Il nome utente o l'e-mail deve contenere almeno 3 caratteri.",
+  "username.or.email.format.validation.less.chars.message": "Il nome utente o l'e-mail deve contenere almeno 2 caratteri.",
   "email.validation.message": "Inserisci il tuo nome utente o e-mail",
   "password.validation.message": "I criteri della password non sono stati soddisfatti",
   "account.activation.success.message.title": "Completato correttamente! Hai attivato il tuo account. ",
@@ -91,8 +96,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": "Benvenuto | {siteName}",
+  "progressive.profiling.page.title": "Welcome | {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",
@@ -106,16 +110,6 @@
   "recommendation.page.title": "Recommendations | {siteName}",
   "recommendation.page.heading": "We have a few recommendations to get you started.",
   "recommendation.skip.button": "Skip for now",
-  "recommendation.option.trending": "Trending Now",
-  "recommendation.option.popular": "Most Popular",
-  "recommendation.option.recommended.for.you": "Recommended For You",
-  "recommendation.product-card.pill-text.course": "Course",
-  "recommendation.product-card.pill-text.professional-certificate": "Professional Certificate",
-  "recommendation.product-card.pill-text.emeritus": "Offered on Emeritus",
-  "recommendation.product-card.pill-text.shorelight": "Offered through Shorelight",
-  "recommendation.product-card.footer-text.number-of-courses": "{length} {label}",
-  "recommendation.product-card.footer-text.subscription": "Subscription",
-  "recommendation.product-card.launch-icon.sr-text": "Opens a link in a new tab",
   "register.page.title": "Registrazione | {siteName}",
   "registration.fullname.label": "Nome e Cognome",
   "registration.email.label": "Email",
@@ -129,7 +123,6 @@
   "help.text.email": "Per l'attivazione dell'account e aggiornamenti importanti",
   "create.account.for.free.button": "Crea un account gratis",
   "registration.other.options.heading": "Oppure registrati con:",
-  "create.account.cta.button": "{label}",
   "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",
@@ -147,13 +140,15 @@
   "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.username.suggestion.label": "Suggerito:",
   "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}",
   "sign.in": "Accedi",
   "reset.password.page.title": "Ripristina password | {siteName}",
   "reset.password": "Resetta la password",
@@ -167,15 +162,5 @@
   "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.",
-  "start.learning": "Inizia a imparare",
-  "with.site.name": "con {siteName}",
-  "your.career.turning.point": "Your career turning point",
-  "is.here": "is here.",
-  "welcome.to.platform": "Benvenuto in {siteName}, {username}!",
-  "complete.your.profile.1": "Completata",
-  "complete.your.profile.2": "Il tuo profilo",
-  "register.page.terms.of.service.and.honor.code": "By creating an account, you agree to the {tosAndHonorCode} and you acknowledge that {platformName} and each 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}"
-}
+  "rate.limit.error": "Si è verificato un errore dovuto alle troppe richieste. Prova di nuovo più tardi."
+}

src/i18n/messages/pt.json

@@ -1,181 +0,0 @@
-{
-  "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.",
-  "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:",
-  "forgot.password.confirmation.message": "We sent an email to {email} with instructions to reset your password. 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. 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} {lineBreak}We just sent an activation link to {email}. If you do not receive an email, 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 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",
-  "recommendation.option.trending": "Trending Now",
-  "recommendation.option.popular": "Most Popular",
-  "recommendation.option.recommended.for.you": "Recommended For You",
-  "recommendation.product-card.pill-text.course": "Course",
-  "recommendation.product-card.pill-text.professional-certificate": "Professional Certificate",
-  "recommendation.product-card.pill-text.emeritus": "Offered on Emeritus",
-  "recommendation.product-card.pill-text.shorelight": "Offered through Shorelight",
-  "recommendation.product-card.footer-text.number-of-courses": "{length} {label}",
-  "recommendation.product-card.footer-text.subscription": "Subscription",
-  "recommendation.product-card.launch-icon.sr-text": "Opens a link in a new tab",
-  "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:",
-  "create.account.cta.button": "{label}",
-  "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",
-  "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.",
-  "start.learning": "Start learning",
-  "with.site.name": "with {siteName}",
-  "your.career.turning.point": "Your career turning point",
-  "is.here": "is here.",
-  "welcome.to.platform": "Welcome to {siteName}, {username}!",
-  "complete.your.profile.1": "Complete",
-  "complete.your.profile.2": "your profile",
-  "register.page.terms.of.service.and.honor.code": "By creating an account, you agree to the {tosAndHonorCode} and you acknowledge that {platformName} and each 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}"
-}

src/i18n/messages/pt_PT.json

@@ -1,181 +1,166 @@
 {
-  "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.",
-  "institution.login.page.sub.heading": "Escolha a sua instituição a partir da lista abaixo",
+  "start.learning": "Começar a aprender",
+  "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": "Choose your institution from the list below",
   "logistration.sign.in": "Iniciar sessão",
   "logistration.register": "Registe-se",
   "enterprisetpa.title.heading": "Gostaria de iniciar sessão usando as suas {providerName} credenciais?",
   "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",
+  "enterprisetpa.login.button.text.public.account.creation.disabled": "Show me other ways to sign in",
   "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:",
-  "forgot.password.confirmation.message": "We sent an email to {email} with instructions to reset your password. 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. If you need further assistance, {supportLink}.",
+  "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": "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": "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.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": "For additional help, contact {platformName} support at",
-  "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.",
   "account.activation.error.message": "Alguma coisa correu mal, siga {supportLink} para resolver esta questão.",
-  "login.inactive.user.error": "In order to sign in, you need to activate your account.{lineBreak} {lineBreak}We just sent an activation link to {email}. If you do not receive an email, check your spam folders or {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": "The username, email or password you entered is incorrect. You have {remainingAttempts} more sign in attempts before your account is temporarily locked.",
-  "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}.",
+  "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": "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",
+  "forgot.password": "Forgot password",
+  "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:",
+  "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.",
+  "enterprise.login.btn.text": "Company or school credentials",
+  "username.or.email.format.validation.less.chars.message": "Username or email must have at least 2 characters.",
+  "email.validation.message": "Enter your username or email",
+  "password.validation.message": "Password criteria has not been met",
   "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}",
+  "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": "Ocorreu um erro. Tente actualizar a página, ou verifique a sua ligação à Internet.",
   "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}",
+  "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",
   "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",
-  "recommendation.option.trending": "Trending Now",
-  "recommendation.option.popular": "Most Popular",
-  "recommendation.option.recommended.for.you": "Recommended For You",
-  "recommendation.product-card.pill-text.course": "Course",
-  "recommendation.product-card.pill-text.professional-certificate": "Professional Certificate",
-  "recommendation.product-card.pill-text.emeritus": "Offered on Emeritus",
-  "recommendation.product-card.pill-text.shorelight": "Offered through Shorelight",
-  "recommendation.product-card.footer-text.number-of-courses": "{length} {label}",
-  "recommendation.product-card.footer-text.subscription": "Subscription",
-  "recommendation.product-card.launch-icon.sr-text": "Opens a link in a new tab",
+  "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:",
-  "create.account.cta.button": "{label}",
-  "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",
+  "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",
+  "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": "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",
-  "sign.in": "Iniciar sessão",
+  "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": "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.",
-  "start.learning": "Começar a aprender",
-  "with.site.name": "com {siteName}",
-  "your.career.turning.point": "Your career turning point",
-  "is.here": "is here.",
-  "welcome.to.platform": "Bem vindo a {siteName}, {username}!",
-  "complete.your.profile.1": "Concluído",
-  "complete.your.profile.2": "o seu perfil",
-  "register.page.terms.of.service.and.honor.code": "By creating an account, you agree to the {tosAndHonorCode} and you acknowledge that {platformName} and each 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}"
-}
+  "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/ru.json

@@ -1,5 +1,9 @@
 {
-  "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.",
+  "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",
@@ -20,7 +24,8 @@
   "registration.using.tpa.form.heading": "Finish creating your account",
   "zendesk.supportTitle": "edX Support",
   "zendesk.selectTicketForm": "Please choose your request type:",
-  "forgot.password.confirmation.message": "We sent an email to {email} with instructions to reset your password. 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. If you need further assistance, {supportLink}.",
+  "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.",
@@ -35,7 +40,7 @@
   "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",
+  "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",
@@ -46,9 +51,9 @@
   "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} {lineBreak}We just sent an activation link to {email}. If you do not receive an email, check your spam folders or {supportLink}.",
+  "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 attempts before your account is temporarily locked.",
+  "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}.",
@@ -64,7 +69,7 @@
   "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.",
+  "username.or.email.format.validation.less.chars.message": "Username or email must have at least 2 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.",
@@ -91,7 +96,6 @@
   "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.",
@@ -106,16 +110,6 @@
   "recommendation.page.title": "Recommendations | {siteName}",
   "recommendation.page.heading": "We have a few recommendations to get you started.",
   "recommendation.skip.button": "Skip for now",
-  "recommendation.option.trending": "Trending Now",
-  "recommendation.option.popular": "Most Popular",
-  "recommendation.option.recommended.for.you": "Recommended For You",
-  "recommendation.product-card.pill-text.course": "Course",
-  "recommendation.product-card.pill-text.professional-certificate": "Professional Certificate",
-  "recommendation.product-card.pill-text.emeritus": "Offered on Emeritus",
-  "recommendation.product-card.pill-text.shorelight": "Offered through Shorelight",
-  "recommendation.product-card.footer-text.number-of-courses": "{length} {label}",
-  "recommendation.product-card.footer-text.subscription": "Subscription",
-  "recommendation.product-card.launch-icon.sr-text": "Opens a link in a new tab",
   "register.page.title": "Register | {siteName}",
   "registration.fullname.label": "Full name",
   "registration.email.label": "Email",
@@ -129,7 +123,6 @@
   "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:",
-  "create.account.cta.button": "{label}",
   "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",
@@ -147,13 +140,15 @@
   "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",
@@ -167,15 +162,5 @@
   "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.",
-  "start.learning": "Start learning",
-  "with.site.name": "with {siteName}",
-  "your.career.turning.point": "Your career turning point",
-  "is.here": "is here.",
-  "welcome.to.platform": "Welcome to {siteName}, {username}!",
-  "complete.your.profile.1": "Complete",
-  "complete.your.profile.2": "your profile",
-  "register.page.terms.of.service.and.honor.code": "By creating an account, you agree to the {tosAndHonorCode} and you acknowledge that {platformName} and each 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}"
-}
+  "rate.limit.error": "An error has occurred because of too many requests. Please try again after some time."
+}

src/i18n/messages/uk.json

@@ -1,5 +1,9 @@
 {
-  "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.",
+  "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",
@@ -20,7 +24,8 @@
   "registration.using.tpa.form.heading": "Finish creating your account",
   "zendesk.supportTitle": "edX Support",
   "zendesk.selectTicketForm": "Please choose your request type:",
-  "forgot.password.confirmation.message": "We sent an email to {email} with instructions to reset your password. 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. If you need further assistance, {supportLink}.",
+  "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.",
@@ -35,7 +40,7 @@
   "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",
+  "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",
@@ -46,9 +51,9 @@
   "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} {lineBreak}We just sent an activation link to {email}. If you do not receive an email, check your spam folders or {supportLink}.",
+  "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 attempts before your account is temporarily locked.",
+  "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}.",
@@ -64,7 +69,7 @@
   "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.",
+  "username.or.email.format.validation.less.chars.message": "Username or email must have at least 2 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.",
@@ -91,7 +96,6 @@
   "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.",
@@ -106,16 +110,6 @@
   "recommendation.page.title": "Recommendations | {siteName}",
   "recommendation.page.heading": "We have a few recommendations to get you started.",
   "recommendation.skip.button": "Skip for now",
-  "recommendation.option.trending": "Trending Now",
-  "recommendation.option.popular": "Most Popular",
-  "recommendation.option.recommended.for.you": "Recommended For You",
-  "recommendation.product-card.pill-text.course": "Course",
-  "recommendation.product-card.pill-text.professional-certificate": "Professional Certificate",
-  "recommendation.product-card.pill-text.emeritus": "Offered on Emeritus",
-  "recommendation.product-card.pill-text.shorelight": "Offered through Shorelight",
-  "recommendation.product-card.footer-text.number-of-courses": "{length} {label}",
-  "recommendation.product-card.footer-text.subscription": "Subscription",
-  "recommendation.product-card.launch-icon.sr-text": "Opens a link in a new tab",
   "register.page.title": "Register | {siteName}",
   "registration.fullname.label": "Full name",
   "registration.email.label": "Email",
@@ -129,7 +123,6 @@
   "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:",
-  "create.account.cta.button": "{label}",
   "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",
@@ -147,13 +140,15 @@
   "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",
@@ -167,15 +162,5 @@
   "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.",
-  "start.learning": "Start learning",
-  "with.site.name": "with {siteName}",
-  "your.career.turning.point": "Your career turning point",
-  "is.here": "is here.",
-  "welcome.to.platform": "Welcome to {siteName}, {username}!",
-  "complete.your.profile.1": "Complete",
-  "complete.your.profile.2": "your profile",
-  "register.page.terms.of.service.and.honor.code": "By creating an account, you agree to the {tosAndHonorCode} and you acknowledge that {platformName} and each 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}"
-}
+  "rate.limit.error": "An error has occurred because of too many requests. Please try again after some time."
+}

src/i18n/messages/zh_CN.json

@@ -1,181 +1,166 @@
 {
-  "error.notfound.message": "您访问的地址不存在或有误。请检查URL后重新尝试访问。",
-  "institution.login.page.sub.heading": "从下面的列表中选择您的机构",
-  "logistration.sign.in": "登录",
-  "logistration.register": "注册",
-  "enterprisetpa.title.heading": "您要使用 {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": "显示密码",
-  "hide.password": "隐藏密码",
-  "one.letter": "1 个字母",
-  "one.number": "1个数字",
-  "eight.characters": "8个字符",
-  "password.sr.only.helping.text": "密码必须包含至少 8 个字符、至少一个字母和至少一个数字",
-  "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": "完成创建您的帐户",
+  "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:",
-  "forgot.password.confirmation.message": "We sent an email to {email} with instructions to reset your password. 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. If you need further assistance, {supportLink}.",
-  "forgot.password.page.title": "忘记密码 | {siteName}",
-  "forgot.password.page.heading": "重置密码",
-  "forgot.password.page.instructions": "请在下面输入您的电子邮件地址，我们将向您发送一封电子邮件，其中包含有关如何重置密码的说明。",
-  "forgot.password.page.invalid.email.message": "输入一个有效的电子邮件地址",
-  "forgot.password.page.email.field.label": "邮箱",
-  "forgot.password.page.submit.button": "提交",
-  "forgot.password.error.alert.title.": "我们无法联系到您。",
-  "forgot.password.error.message.title": "发生了一个错误。",
-  "forgot.password.request.in.progress.message": "你的前一个请求正在处理中，请稍后再尝试。",
-  "forgot.password.empty.email.field.error": "输入你的电子邮箱",
-  "forgot.password.email.help.text": "您用于注册 {platformName} 的电子邮件地址",
-  "confirmation.message.title": "查收您的邮件",
-  "confirmation.support.link": "联系技术支持",
-  "need.help.sign.in.text": "需要帮助登录？",
-  "additional.help.text": "For additional help, contact {platformName} support at",
-  "sign.in.text": "登录",
-  "extend.field.errors": "{emailError} 如下。",
-  "invalid.token.heading": "密码重置链接无效",
-  "invalid.token.error.message": "此密码重置链接无效。它可能已经被使用过。在下面输入您的电子邮件以接收新链接。",
-  "token.validation.rate.limit.error.heading": "请求过多",
-  "token.validation.rate.limit.error": "由于请求过多而发生错误。请稍后重试。",
-  "token.validation.internal.sever.error.heading": "验证失败",
-  "token.validation.internal.sever.error": "发生了错误。尝试刷新页面，或检查您的互联网连接。",
-  "internal.server.error": "发生了错误。尝试刷新页面，或检查您的互联网连接。",
-  "account.activation.error.message": "出了点问题，请联系{supportLink}解决这个问题。",
-  "login.inactive.user.error": "In order to sign in, you need to activate your account.{lineBreak} {lineBreak}We just sent an activation link to {email}. If you do not receive an email, check your spam folders or {supportLink}.",
-  "allowed.domain.login.error": "作为 {allowedDomain} 用户，您必须使用 {allowedDomain} {tpaLink} 登录。",
-  "login.incorrect.credentials.error.attempts.text.1": "The username, email or password you entered is incorrect. You have {remainingAttempts} more sign in attempts before your account is temporarily locked.",
-  "login.incorrect.credentials.error.attempts.text.2": "如果您忘记了密码，{resetLink}",
-  "account.locked.out.message.2": "为了安全起见，您可以先{resetLink}再试一次。",
-  "login.incorrect.credentials.error.with.reset.link": "您输入的用户名、电子邮件或密码不正确。请重试或 {resetLink}。",
-  "login.page.title": "登入 | {siteName}",
-  "login.user.identity.label": "用户名或电子邮件",
-  "login.password.label": "密码",
-  "sign.in.button": "登录",
-  "forgot.password": "忘记密码",
-  "institution.login.button": "机构/校园凭证",
-  "institution.login.page.title": "使用机构/校园凭据登录",
-  "login.other.options.heading": "或登录：",
-  "non.compliant.password.title": "我们最近更改了密码要求",
-  "non.compliant.password.message": "您当前的密码不符合新的安全要求。我们刚刚向与此帐户关联的电子邮件地址发送了密码重置邮件。感谢您帮助我们保护您的数据安全。",
-  "account.locked.out.message.1": "为了保护您的帐户，它已被暂时锁定。请在 30 分钟后重试。",
-  "enterprise.login.btn.text": "单位或学校证书",
-  "username.or.email.format.validation.less.chars.message": "用户名或电子邮件必须至少包含 3 个字符。",
-  "email.validation.message": "输入您的用户名或电子邮件",
-  "password.validation.message": "未满足密码条件",
-  "account.activation.success.message.title": "成功！您已激活您的帐户。",
-  "account.activation.success.message": "您现在将收到我们发送的与您注册的课程相关的电子邮件更新和提醒。登录以继续。",
-  "account.activation.info.message": "本账号已经被激活。",
-  "account.activation.error.message.title": "您的帐户无法激活",
-  "account.activation.support.link": "请联系技术支持",
-  "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.form.invalid.error.message": "请填写以下字段。",
-  "login.incorrect.credentials.error.reset.link.text": "重置你的密码",
-  "login.incorrect.credentials.error.before.account.blocked.text": "点击此处来重置它。",
-  "password.security.nudge.title": "密码安全",
-  "password.security.block.title": "需要更改密码",
-  "password.security.nudge.body": "系统检测到您的密码存在漏洞。我们建议您更改它，以便您的帐户保持安全。",
-  "password.security.block.body": "系统检测到您的密码存在漏洞。更改您的密码，以确保您的帐户安全。",
-  "password.security.close.button": "关闭",
-  "password.security.redirect.to.reset.password.button": "重置你的密码",
-  "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": "欢迎来的 | {siteName}",
-  "progressive.profiling.page.heading": "你的问题将会帮助我们服务做的更好。",
-  "optional.fields.information.link": "详细了解我们如何使用这些信息。",
-  "optional.fields.submit.button": "提交",
-  "optional.fields.skip.button": "暂时跳过",
-  "optional.fields.next.button": "下一节",
-  "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.option.trending": "Trending Now",
-  "recommendation.option.popular": "Most Popular",
-  "recommendation.option.recommended.for.you": "Recommended For You",
-  "recommendation.product-card.pill-text.course": "课程",
-  "recommendation.product-card.pill-text.professional-certificate": "专业证书",
-  "recommendation.product-card.pill-text.emeritus": "Offered on Emeritus",
-  "recommendation.product-card.pill-text.shorelight": "Offered through Shorelight",
-  "recommendation.product-card.footer-text.number-of-courses": "{length} {label}",
-  "recommendation.product-card.footer-text.subscription": "Subscription",
-  "recommendation.product-card.launch-icon.sr-text": "Opens a link in a new tab",
-  "register.page.title": "注册 | {siteName}",
-  "registration.fullname.label": "全名",
-  "registration.email.label": "邮箱",
-  "registration.username.label": "公开用户名",
-  "registration.password.label": "密码",
-  "registration.country.label": "国家/地区",
-  "registration.opt.in.label": "我同意 {siteName} 可以向我发送课程相关推广信息。",
-  "help.text.name": "您获得的任何证书都将使用此名称。",
-  "help.text.username.1": "此名称将会用于您在课程中的身份识别。",
-  "help.text.username.2": "过后无法更改。",
-  "help.text.email": "用于帐户激活和重要更新",
-  "create.account.for.free.button": "免费创建一个帐户",
-  "registration.other.options.heading": "或注册：",
-  "create.account.cta.button": "{label}",
-  "register.institution.login.button": "机构/院系验证",
-  "register.institution.login.page.title": "使用机构/院系账户注册",
-  "empty.name.field.error": "输入您的全名",
-  "empty.email.field.error": "输入你的电子邮箱",
-  "empty.username.field.error": "用户名必须介于 2 到 30 个字符之间",
-  "empty.password.field.error": "未满足密码条件",
-  "empty.country.field.error": "选择您居住的国家或地区",
-  "email.do.not.match": "邮箱不一致。",
-  "email.invalid.format.error": "输入一个有效的电子邮件地址",
-  "username.validation.message": "用户名必须介于 2 到 30 个字符之间",
-  "name.validation.message": "输入有效名称",
-  "username.format.validation.message": "用户名只能包含字母（AZ、az）、数字（0-9）、下划线（_）和连字符（-）。用户名不能包含空格",
-  "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": "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": "服务条款和诚信准则",
-  "privacy.policy": "隐私政策",
-  "honor.code": "规则",
-  "terms.of.service": "服务条款",
-  "registration.username.suggestion.label": "建议：",
-  "did.you.mean.alert.text": "你的意思是",
-  "sign.in": "登录",
-  "reset.password.page.title": "重设密码 | {siteName}",
-  "reset.password": "重置密码",
-  "reset.password.page.instructions": "输入并确认你的新密码。",
-  "new.password.label": "新密码",
-  "confirm.password.label": "确认密码",
-  "passwords.do.not.match": "密码不匹配",
-  "confirm.your.password": "确认你的密码",
-  "reset.password.failure.heading": "我们无法重置您的密码。",
-  "reset.password.form.submission.error": "请检查您的回复并重试。",
-  "reset.server.rate.limit.error": "请求过多。",
-  "reset.password.success.heading": "密码重置完成。",
-  "reset.password.success": "您的密码已重置。登录到您的帐户。",
-  "rate.limit.error": "由于请求过多而发生错误。请稍后重试。",
-  "start.learning": "开始学习",
-  "with.site.name": "{siteName}",
-  "your.career.turning.point": "Your career turning point",
-  "is.here": "is here.",
-  "welcome.to.platform": "欢迎来到{siteName}，{username}！",
-  "complete.your.profile.1": "完成",
-  "complete.your.profile.2": "个人资料",
-  "register.page.terms.of.service.and.honor.code": "By creating an account, you agree to the {tosAndHonorCode} and you acknowledge that {platformName} and each 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}"
-}
+  "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 2 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",
+  "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.",
+  "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/index.jsx

@@ -8,9 +8,10 @@ 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, () => {
@@ -30,5 +31,8 @@ initialize({
       mergeConfig(configuration);
     },
   },
-  messages,
+  messages: [
+    appMessages,
+    paragonMessages,
+  ],
 });