External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-18 06:47:41 -02:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8959 from jakemcdermott/fix-8884

Browse Source 
Default to lang in catalog when browser preference unavailable

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
This commit is contained in:
softwarefactory-project-zuul[bot]
2020-12-22 23:09:27 +00:00
committed by GitHub
parent 0b364b2918 8db88e979e
commit 2a353a809b
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
awx/ui_next/src/App.jsx
View File

@@ -30,7 +30,12 @@ const ProtectedRoute = ({ children, ...rest }) =>
function App() { function App() {
const catalogs = { en, ja }; const catalogs = { en, ja };
const language = getLanguageWithoutRegionCode(navigator); let language = getLanguageWithoutRegionCode(navigator);
if (!Object.keys(catalogs).includes(language)) {
// If there isn't a string catalog available for the browser's
// preferred language, default to one that has strings.
language = 'en';
}
const match = useRouteMatch(); const match = useRouteMatch();
const { hash, search, pathname } = useLocation(); const { hash, search, pathname } = useLocation();