diff --git a/package.json b/package.json index 70f20f7a..09001178 100644 --- a/package.json +++ b/package.json @@ -35,7 +35,7 @@ "@apollo/client": "^3.8.4", "@apollo/react-components": "^4.0.0", "@apollo/react-hoc": "^4.0.0", - "@jahia/data-helper": "^1.1.4", + "@jahia/data-helper": "^1.1.6", "@jahia/design-system-kit": "^1.1.12", "@jahia/icons": "^1.1.2", "@jahia/moonstone": "^2.5.1", diff --git a/src/javascript/components/Context/VanityUrl.context.jsx b/src/javascript/components/Context/VanityUrl.context.jsx index 31e00059..c1a6de15 100644 --- a/src/javascript/components/Context/VanityUrl.context.jsx +++ b/src/javascript/components/Context/VanityUrl.context.jsx @@ -6,7 +6,11 @@ export const VanityUrlContext = React.createContext({}); export const useVanityUrlContext = () => useContext(VanityUrlContext); export const VanityUrlContextProvider = ({siteKey, children}) => { - const {data, loading, error} = useSiteInfo({siteKey: siteKey, displayLanguage: window.contextJsParameters.lang}); + const {data, loading, error} = useSiteInfo({ + siteKey: siteKey, + displayLanguage: window.contextJsParameters.lang, + uiLanguage: window.contextJsParameters.uilang + }); if (error) { return <>{error.message}; diff --git a/src/javascript/components/LanguageMenu.jsx b/src/javascript/components/LanguageMenu.jsx index 489274c3..5711184a 100644 --- a/src/javascript/components/LanguageMenu.jsx +++ b/src/javascript/components/LanguageMenu.jsx @@ -14,7 +14,7 @@ export const LanguageMenu = ({languageCode, onLanguageSelected, isDisabled}) => isDisabled={isDisabled} size="small" data-sel-role="vanity-language-menu" - data={languages.map(lang => ({label: `${lang.displayName} (${lang.language})`, value: lang.language, attributes: {'data-sel-value': lang.language}}))} + data={languages.map(lang => ({label: `${lang.uiLanguageDisplayName} (${lang.language})`, value: lang.language, attributes: {'data-sel-value': lang.language}}))} onChange={(e, item) => onLanguageSelected(item.value)} /> ); diff --git a/src/javascript/components/LanguageSelector/LanguageSelector.jsx b/src/javascript/components/LanguageSelector/LanguageSelector.jsx index cdb87138..57c36d26 100644 --- a/src/javascript/components/LanguageSelector/LanguageSelector.jsx +++ b/src/javascript/components/LanguageSelector/LanguageSelector.jsx @@ -45,7 +45,7 @@ class LanguageSelector extends React.Component { return this.props.t('label.languageSelector.allLanguages'); } - let selectedLanguageNames = selectedLanguageCodes.map(selectedLanguageCode => this.props.languages.find(language => language.language === selectedLanguageCode)?.displayName); + let selectedLanguageNames = selectedLanguageCodes.map(selectedLanguageCode => this.props.languages.find(language => language.language === selectedLanguageCode)?.uiLanguageDisplayName); selectedLanguageNames = getNotNullLanguages(selectedLanguageNames).sort(); if (selectedLanguageNames.length > MAX_SELECTED_LANGUAGE_NAMES_DISPLAYED) { // (Too) many languages selected: will display a part of them, plus "N more languages". @@ -115,7 +115,7 @@ class LanguageSelector extends React.Component { classes={{selected: scssStyles.selected}} > - + ); })} diff --git a/yarn.lock b/yarn.lock index 0a612c68..6729c261 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1245,10 +1245,10 @@ resolved "https://registry.yarnpkg.com/@graphql-typed-document-node/core/-/core-3.2.0.tgz#5f3d96ec6b2354ad6d8a28bf216a1d97b5426861" integrity sha512-mB9oAsNCm9aM3/SOv4YtBMqZbYj10R7dkq8byBqxGY/ncFwhf2oQzMV+LCRlWoDSEBJ3COiR1yeDvMtsoOsuFQ== -"@jahia/data-helper@^1.1.4": - version "1.1.4" - resolved "https://registry.yarnpkg.com/@jahia/data-helper/-/data-helper-1.1.4.tgz#06bffb42160c775065f7ac36c9227181031a0a14" - integrity sha512-k2HFD/ZhORzBuZvkt8XHcVQg2vy2Rn1n+VTBBZ6ghmUgiOSrUAaxl/3Iv23hrl1BnIygF49aTSVMqlyoDM46kg== +"@jahia/data-helper@^1.1.6": + version "1.1.6" + resolved "https://registry.yarnpkg.com/@jahia/data-helper/-/data-helper-1.1.6.tgz#fe8e976cc75b0473c6e395d7db2998baf46bfc15" + integrity sha512-Tzu9S7y7vC/ZHyxzWGEU0Ck+ZzSS7LH7Zi6Sg7cEgz1FYLsotb1Son35NNRFFXC6mnH7qGAgSMf4Y/HtpYfIWg== dependencies: "@apollo/client" "^3.7.14" "@apollo/react-components" "^4.0.0"