fixed rebase issues

common-voice · Jun 9, 2020 · 7d3f7ab · 7d3f7ab
1 parent 2858c9e
commit 7d3f7ab
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 34 deletions.
diff --git a/web/src/components/app.tsx b/web/src/components/app.tsx
@@ -35,7 +35,7 @@ import StateTree from '../stores/tree';
 import { Uploads } from '../stores/uploads';
 import { User } from '../stores/user';
 import Layout from './layout/layout';
-import DemoLayout from './layout/demo_layout';
+import DemoLayout from './layout/demo-layout';
 import NotificationBanner from './notification-banner/notification-banner';
 import NotificationPill from './notification-pill/notification-pill';
 import { Spinner } from './ui/ui';
@@ -219,7 +219,7 @@ let LocalizedPage: any = class extends React.Component<
 
   render() {
     const { locale, notifications, toLocaleRoute, location } = this.props;
-    const { bundleGenerator, uploadPercentage } = this.state;
+    const { l10n, uploadPercentage } = this.state;
 
     if (!l10n) return null;
 

diff --git a/web/src/components/layout/demo-layout.tsx b/web/src/components/layout/demo-layout.tsx
@@ -4,7 +4,7 @@ import { Switch, Route, withRouter, Redirect } from 'react-router';
 import { useLocale } from '../locale-helpers';
 import { Spinner } from '../ui/ui';
 import URLS from '../../urls';
-import Intro from '../demo-pages/Intro/intro';
+import Intro from '../demo-pages/intro/intro';
 
 const Kiosk = React.lazy(() => import('../demo-pages/kiosk/kiosk'));
 

diff --git a/web/src/components/layout/demo_layout.tsx b/web/src/components/layout/demo_layout.tsx
diff --git a/web/src/components/pages/datasets/dataset-info.tsx b/web/src/components/pages/datasets/dataset-info.tsx
@@ -27,6 +27,7 @@ import CircleStats from './circle-stats';
 import stats from './stats';
 import { DPropsFromState } from './types';
 import './dataset-info.css';
+import URLS from '../../../urls';
 
 const languages = Object.keys(stats.locales).length;
 const globalStats = {
@@ -90,7 +91,7 @@ export const Splits = ({
   );
 };
 
-type Props = LocalePropsFromState & LocalizationProps & DPropsFromState;
+type Props = LocalePropsFromState & WithLocalizationProps & DPropsFromState;
 
 type State = {
   bundleLocale: string;