fix storybook (#3292)

diff --git a/package.json b/package.json
index 995ad60945bb76294e0f6099e507eaf2ae84af38..51136223a3852e998bbcf7fabd864b5eab8061b3 100644 (file)
--- a/package.json
+++ b/package.json
@@ -7,7 +7,7 @@
     "build:production": "NODE_ENV=production yarn webpack -- --config config/webpack/production.js",
     "manage:translations": "node ./config/webpack/translationRunner.js",
     "start": "rimraf ./tmp/streaming && babel ./streaming/index.js --out-dir ./tmp && node ./tmp/streaming/index.js",
-    "storybook": "start-storybook -p 9001 -c storybook",
+    "storybook": "NODE_ENV=test start-storybook -p 9001 -c storybook",
     "test": "npm run test:lint && npm run test:mocha",
     "test:lint": "eslint -c .eslintrc.yml --ext=js app/javascript/ config/webpack/ storyboard/ streaming/",
     "test:mocha": "NODE_ENV=test mocha --require ./spec/javascript/setup.js --compilers js:babel-register ./spec/javascript/components/*.test.jsx",

diff --git a/storybook/stories/loading_indicator.story.js b/storybook/stories/loading_indicator.story.js
index f3e67e89cc00695456e32a6520bde2bf6ef9f712..84d722d698995f65cfbbfd0cb623a88e1f56d7fc 100644 (file)
--- a/storybook/stories/loading_indicator.story.js
+++ b/storybook/stories/loading_indicator.story.js
@@ -1,12 +1,12 @@
 import React from 'react';
 import { IntlProvider } from 'react-intl';
 import { storiesOf } from '@kadira/storybook';
-import getMessagesForLocale from 'mastodon/locales';
+import en from 'mastodon/locales/en.json';
 import LoadingIndicator from 'mastodon/components/loading_indicator';
 
 storiesOf('LoadingIndicator', module)
   .add('default state', () => (
-    <IntlProvider locale='en' messages={getMessagesForLocale('en')}>
+    <IntlProvider locale='en' messages={en}>
       <LoadingIndicator />
     </IntlProvider>
   ));