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

CHANGELOG.md

@@ -14,4 +14,5 @@ All notable, unreleased changes to this project will be documented in this file.
 - Fix plugins page translations - #141 by @benekex2
 - Add attributes to column picker - #136 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

src/components/Locale/Locale.tsx

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