Merge branch 'master' of github.com:openedx/frontend-app-profile into…

… abdullah/paragon-status-alert-deprecations
openedx · Aug 11, 2022 · ef444cf · ef444cf
2 parents 92cf4ba + 392167e
commit ef444cf
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 37 deletions.
diff --git a/.env b/.env
@@ -25,4 +25,3 @@ FAVICON_URL=''
 ENABLE_LEARNER_RECORD_MFE=''
 LEARNER_RECORD_MFE_BASE_URL=''
 COLLECT_YEAR_OF_BIRTH=true
-DISPLAY_COOKIE_BANNER=''
diff --git a/.env.development b/.env.development
@@ -26,4 +26,3 @@ FAVICON_URL=https://edx-cdn.org/v3/default/favicon.ico
 ENABLE_LEARNER_RECORD_MFE=''
 LEARNER_RECORD_MFE_BASE_URL='http://localhost:1990'
 COLLECT_YEAR_OF_BIRTH=true
-DISPLAY_COOKIE_BANNER=true
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -40,7 +40,7 @@
     "@fortawesome/free-solid-svg-icons": "5.15.4",
     "@fortawesome/react-fontawesome": "0.1.18",
     "classnames": "2.3.1",
-    "core-js": "3.23.3",
+    "core-js": "3.24.1",
     "lodash.camelcase": "4.3.0",
     "lodash.get": "4.4.2",
     "lodash.pick": "4.4.0",
@@ -49,8 +49,8 @@
     "react": "16.14.0",
     "react-dom": "16.14.0",
     "react-redux": "7.2.8",
-    "react-router": "5.2.1",
-    "react-router-dom": "5.3.0",
+    "react-router": "5.3.3",
+    "react-router-dom": "5.3.3",
     "redux": "4.1.2",
     "redux-devtools-extension": "2.13.9",
     "redux-logger": "3.0.6",

diff --git a/public/index.html b/public/index.html
@@ -1,12 +1,6 @@
 <!doctype html>
 <html lang="en-us">
   <head>
-      <%if (process.env.DISPLAY_COOKIE_BANNER) { %>
-      <!-- OneTrust Cookies Consent Notice start for edx.org -->
-      <script type="text/javascript" src="https://cdn.cookielaw.org/consent/fa169e97-be64-4cc1-bad3-9534590f9a30-test/OtAutoBlock.js" ></script>
-      <script src="https://cdn.cookielaw.org/scripttemplates/otSDKStub.js"  type="text/javascript" charset="UTF-8" data-domain-script="fa169e97-be64-4cc1-bad3-9534590f9a30-test" ></script>
-      <!-- OneTrust Cookies Consent Notice end for edx.org -->
-      <% } %>
       <title>Learner Profile | <%= process.env.SITE_NAME %></title>
       <meta charset="utf-8">
       <meta name="viewport" content="width=device-width, initial-scale=1.0">

diff --git a/src/i18n/messages/es_419.json b/src/i18n/messages/es_419.json
@@ -1,6 +1,6 @@
 {
   "profile.age.headline": "Tu perfil no puede ser compartido.",
-  "profile.age.details": "To share your profile with other {siteName} learners, you must confirm that you are over the age of 13.",
+  "profile.age.details": "Para compartir el perfil con otros {siteName} estudiantes, debe confirmar que es mayor de 13 años.",
   "profile.age.set.date": "Establece tu fecha de nacimiento",
   "profile.datejoined.member.since": "Miembro desde {year}",
   "profile.bio.empty": "Añade una breve biografía",
@@ -33,7 +33,7 @@
   "profile.formcontrols.button.saving": "Guardando",
   "profile.formcontrols.button.saved": "Guardado",
   "profile.visibility.who.just.me": "Solo yo",
-  "profile.visibility.who.everyone": "Everyone on {siteName}",
+  "profile.visibility.who.everyone": "Todos en {siteName}",
   "profile.name.full.name": "Nombre completo",
   "profile.name.details": "Este es el nombre que aparecerá en tu cuenta y en tus certificados.",
   "profile.name.empty": "Añade nombre",
@@ -48,5 +48,5 @@
   "profile.notfound.message": "La página que estas buscando no está disponible o hay un error en la URL. Por favor, comprueba la URL y vuelve a intentarlo.",
   "profile.viewMyRecords": "Ver mis registros",
   "profile.loading": "Cargando perfil...",
-  "profile.username.description": "Your profile information is only visible to you. Only your username is visible to others on {siteName}."
+  "profile.username.description": "La información del perfil solo la visualiza usted. Solo el nombre de usuario es visible para los demás en {siteName}."
 }