Merge f2ef83e into 0a0e650

Author: muffinresearch

src/core/i18n/utils.js

@@ -1,4 +1,4 @@
-/* global Intl */
+/* global Intl, window */
 /* @flow */
 import config from 'config';
 import Jed from 'jed';
@@ -246,7 +246,7 @@ export function makeI18n(
   i18nData: I18nConfig,
   lang: string,
   _Jed: Jed = Jed,
-  { _Intl = Intl }: makeI18nOptions = {}
+  { _Intl = typeof window !== 'undefined' ? window.Intl : Intl }: makeI18nOptions = {}
 ) {
   const i18n = new _Jed(i18nData);
   i18n.lang = lang;