Skip to content

Commit

Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into experimentEnv
Browse files Browse the repository at this point in the history
deborahgu authored Oct 30, 2023
2 parents 126ae2a + c44db75 commit f7238ba
Showing 12 changed files with 1,233 additions and 1,110 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -10,7 +10,7 @@ i18n = ./src/i18n
transifex_input = $(i18n)/transifex_input.json

# This directory must match .babelrc .
transifex_temp = ./temp/babel-plugin-react-intl
transifex_temp = ./temp/babel-plugin-formatjs

NPM_TESTS=build i18n_extract lint test

2,313 changes: 1,217 additions & 1,096 deletions package-lock.json

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
@@ -8,7 +8,7 @@
},
"scripts": {
"build": "fedx-scripts webpack",
"i18n_extract": "BABEL_ENV=i18n fedx-scripts babel src --quiet > /dev/null",
"i18n_extract": "fedx-scripts formatjs extract",
"lint": "fedx-scripts eslint --ext .jsx,.js src/",
"lint-fix": "fedx-scripts eslint --fix --ext .jsx,.js src/",
"semantic-release": "semantic-release",
@@ -26,11 +26,11 @@
"access": "public"
},
"dependencies": {
"@edx/brand": "npm:@edx/brand-edx.org@^2.0.3",
"@edx/brand": "npm:@openedx/brand-openedx@^1.2.2",
"@edx/browserslist-config": "^1.1.0",
"@edx/frontend-component-footer": "^12.2.1",
"@edx/frontend-enterprise-hotjar": "^2.0.0",
"@edx/frontend-platform": "^5.1.0",
"@edx/frontend-platform": "^5.5.4",
"@edx/paragon": "^20.44.0",
"@edx/react-unit-test-utils": "^1.7.0",
"@fortawesome/fontawesome-svg-core": "^1.2.36",
@@ -80,7 +80,7 @@
"whatwg-fetch": "^3.6.2"
},
"devDependencies": {
"@edx/frontend-build": "12.8.27",
"@edx/frontend-build": "13.0.1",
"@edx/reactifex": "^2.1.1",
"@testing-library/jest-dom": "^5.14.1",
"@testing-library/react": "^12.1.0",
1 change: 1 addition & 0 deletions src/config/index.js
Original file line number Diff line number Diff line change
@@ -16,6 +16,7 @@ const configuration = {
SUPPORT_URL: process.env.SUPPORT_URL || null,
ENABLE_NOTICES: process.env.ENABLE_NOTICES || null,
CAREER_LINK_URL: process.env.CAREER_LINK_URL || null,
LOGO_URL: process.env.LOGO_URL,
};

const features = {};
3 changes: 2 additions & 1 deletion src/containers/LearnerDashboardHeader/BrandLogo.jsx
Original file line number Diff line number Diff line change
@@ -3,6 +3,7 @@ import React from 'react';
import { useIntl } from '@edx/frontend-platform/i18n';

import { reduxHooks } from 'hooks';
import { configuration } from '../../config';

import messages from './messages';

@@ -14,7 +15,7 @@ export const BrandLogo = () => {
<a href={dashboard?.url || '/'} className="mx-auto">
<img
className="logo py-3"
src="https://edx-cdn.org/v3/prod/logo.svg"
src={configuration.LOGO_URL}
alt={formatMessage(messages.logoAltText)}
/>
</a>
Original file line number Diff line number Diff line change
@@ -8,7 +8,7 @@ exports[`BrandLogo dashboard defined 1`] = `
<img
alt="edX, Inc. Dashboard"
className="logo py-3"
src="https://edx-cdn.org/v3/prod/logo.svg"
src="https://edx-cdn.org/v3/default/logo.svg"
/>
</a>
`;
@@ -21,7 +21,7 @@ exports[`BrandLogo dashboard undefined 1`] = `
<img
alt="edX, Inc. Dashboard"
className="logo py-3"
src="https://edx-cdn.org/v3/prod/logo.svg"
src="https://edx-cdn.org/v3/default/logo.svg"
/>
</a>
`;
2 changes: 1 addition & 1 deletion src/i18n/messages/ar.json
Original file line number Diff line number Diff line change
@@ -19,7 +19,7 @@
"learnerVariantDashboard.menu.profile.label": "الملف الشخصي",
"learnerVariantDashboard.menu.viewPrograms.label": "عرض البرامج",
"learnerVariantDashboard.menu.account.label": "الحساب",
"learnerVariantDashboard.menu.ordersAndSubscriptions.label": "Orders & Subscriptions",
"learnerVariantDashboard.menu.orderHistory.label": "Order History",
"learnerVariantDashboard.menu.signOut.label": "تسجيل الخروج",
"learnerVariantDashboard.course": "المساقات",
"learnerVariantDashboard.program": "البرامج",
2 changes: 1 addition & 1 deletion src/i18n/messages/es_419.json
Original file line number Diff line number Diff line change
@@ -19,7 +19,7 @@
"learnerVariantDashboard.menu.profile.label": "Perfil",
"learnerVariantDashboard.menu.viewPrograms.label": "Ver programas",
"learnerVariantDashboard.menu.account.label": "Cuenta",
"learnerVariantDashboard.menu.ordersAndSubscriptions.label": "Pedidos y Subscripciones",
"learnerVariantDashboard.menu.orderHistory.label": "Historial de órdenes",
"learnerVariantDashboard.menu.signOut.label": "Cerrar sesión",
"learnerVariantDashboard.course": "cursos",
"learnerVariantDashboard.program": "Programas",
2 changes: 1 addition & 1 deletion src/i18n/messages/fr.json
Original file line number Diff line number Diff line change
@@ -19,7 +19,7 @@
"learnerVariantDashboard.menu.profile.label": "Profil",
"learnerVariantDashboard.menu.viewPrograms.label": "Voir les programmes",
"learnerVariantDashboard.menu.account.label": "Compte",
"learnerVariantDashboard.menu.ordersAndSubscriptions.label": "Orders & Subscriptions",
"learnerVariantDashboard.menu.orderHistory.label": "Order History",
"learnerVariantDashboard.menu.signOut.label": "Se déconnecter",
"learnerVariantDashboard.course": "Cours",
"learnerVariantDashboard.program": "Programmes",
2 changes: 1 addition & 1 deletion src/i18n/messages/fr_CA.json
Original file line number Diff line number Diff line change
@@ -19,7 +19,7 @@
"learnerVariantDashboard.menu.profile.label": "Profil",
"learnerVariantDashboard.menu.viewPrograms.label": "Voir les programmes",
"learnerVariantDashboard.menu.account.label": "Compte",
"learnerVariantDashboard.menu.ordersAndSubscriptions.label": "Commandes et abonnements",
"learnerVariantDashboard.menu.orderHistory.label": "Historique des commandes",
"learnerVariantDashboard.menu.signOut.label": "Se déconnecter",
"learnerVariantDashboard.course": "Cours",
"learnerVariantDashboard.program": "Programmes",
2 changes: 1 addition & 1 deletion src/i18n/messages/pt_BR.json
Original file line number Diff line number Diff line change
@@ -19,7 +19,7 @@
"learnerVariantDashboard.menu.profile.label": "Perfil",
"learnerVariantDashboard.menu.viewPrograms.label": "View Programs",
"learnerVariantDashboard.menu.account.label": "Conta",
"learnerVariantDashboard.menu.ordersAndSubscriptions.label": "Orders & Subscriptions",
"learnerVariantDashboard.menu.orderHistory.label": "Order History",
"learnerVariantDashboard.menu.signOut.label": "Sair",
"learnerVariantDashboard.course": "Cursos",
"learnerVariantDashboard.program": "Programas",
2 changes: 1 addition & 1 deletion src/i18n/messages/zh_CN.json
Original file line number Diff line number Diff line change
@@ -19,7 +19,7 @@
"learnerVariantDashboard.menu.profile.label": "Profile",
"learnerVariantDashboard.menu.viewPrograms.label": "View Programs",
"learnerVariantDashboard.menu.account.label": "Account",
"learnerVariantDashboard.menu.ordersAndSubscriptions.label": "Orders & Subscriptions",
"learnerVariantDashboard.menu.orderHistory.label": "Order History",
"learnerVariantDashboard.menu.signOut.label": "Sign Out",
"learnerVariantDashboard.course": "Courses",
"learnerVariantDashboard.program": "Programs",

0 comments on commit f7238ba

Please sign in to comment.