djkato/saleor-dashboard
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into fix/product-type-variants

Browse source
This commit is contained in:
Marcin Gębala 2019-09-04 16:16:53 +02:00 committed by GitHub
commit f90f9b8a51
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -14,4 +14,5 @@ All notable, unreleased changes to this project will be documented in this file.
- Fix plugins page translations - #141 by @benekex2 - Fix plugins page translations - #141 by @benekex2
- Add attributes to column picker - #136 by @dominik-zeglen - Add attributes to column picker - #136 by @dominik-zeglen
- Fix table cell padding - #143 by @dominik-zeglen - Fix table cell padding - #143 by @dominik-zeglen
- Add fallback locale - #153 by @dominik-zeglen
- Replace checkbox with switch component in "product type has variants" - #152 by @dominik-zeglen - Replace checkbox with switch component in "product type has variants" - #152 by @dominik-zeglen

4
src/components/Locale/Locale.tsx
View file

@ -151,10 +151,12 @@ function getMatchingLocale(): Locale {
} }
} }
} }
return undefined;
} }
const LocaleProvider: React.FC = ({ children }) => { const LocaleProvider: React.FC = ({ children }) => {
const [locale] = React.useState(getMatchingLocale()); const [locale] = React.useState(getMatchingLocale() || defaultLocale);
return ( return (
<IntlProvider <IntlProvider