fix: should not import moment while useless, close: #8013

This commit is contained in:
Benjy Cui 2017-10-26 10:50:18 +08:00
parent e641638c33
commit e5699aff68
8 changed files with 61 additions and 65 deletions

View File

@ -0,0 +1,45 @@
import Pagination from 'rc-pagination/lib/locale/en_US';
import DatePicker from '../date-picker/locale/en_US';
import TimePicker from '../time-picker/locale/en_US';
import Calendar from '../calendar/locale/en_US';
export default {
locale: 'en',
Pagination,
DatePicker,
TimePicker,
Calendar,
Table: {
filterTitle: 'Filter menu',
filterConfirm: 'OK',
filterReset: 'Reset',
emptyText: 'No data',
selectAll: 'Select current page',
selectInvert: 'Invert current page',
},
Modal: {
okText: 'OK',
cancelText: 'Cancel',
justOkText: 'OK',
},
Popconfirm: {
okText: 'OK',
cancelText: 'Cancel',
},
Transfer: {
titles: ['', ''],
notFoundContent: 'Not Found',
searchPlaceholder: 'Search here',
itemUnit: 'item',
itemsUnit: 'items',
},
Select: {
notFoundContent: 'Not Found',
},
Upload: {
uploading: 'Uploading...',
removeFile: 'Remove file',
uploadError: 'Upload error',
previewFile: 'Preview file',
},
};

View File

@ -1,48 +1,5 @@
import defaultLocale from './default';
import moment from 'moment';
moment.locale('en');
import Pagination from 'rc-pagination/lib/locale/en_US';
import DatePicker from '../date-picker/locale/en_US';
import TimePicker from '../time-picker/locale/en_US';
import Calendar from '../calendar/locale/en_US';
export default {
locale: 'en',
Pagination,
DatePicker,
TimePicker,
Calendar,
Table: {
filterTitle: 'Filter menu',
filterConfirm: 'OK',
filterReset: 'Reset',
emptyText: 'No data',
selectAll: 'Select current page',
selectInvert: 'Invert current page',
},
Modal: {
okText: 'OK',
cancelText: 'Cancel',
justOkText: 'OK',
},
Popconfirm: {
okText: 'OK',
cancelText: 'Cancel',
},
Transfer: {
titles: ['', ''],
notFoundContent: 'Not Found',
searchPlaceholder: 'Search here',
itemUnit: 'item',
itemsUnit: 'items',
},
Select: {
notFoundContent: 'Not Found',
},
Upload: {
uploading: 'Uploading...',
removeFile: 'Remove file',
uploadError: 'Upload error',
previewFile: 'Preview file',
},
};
export default defaultLocale;

View File

@ -1,4 +1,4 @@
import enUS from '../locale-provider/en_US';
import defaultLocale from '../locale-provider/default';
export interface ModalLocale {
okText: string;
@ -6,10 +6,8 @@ export interface ModalLocale {
justOkText: string;
}
const defaultLocale: ModalLocale = enUS.Modal;
let runtimeLocale: ModalLocale = {
...defaultLocale,
...defaultLocale.Modal,
};
export function changeConfirmLocale(newLocale?: ModalLocale) {
@ -20,7 +18,7 @@ export function changeConfirmLocale(newLocale?: ModalLocale) {
};
} else {
runtimeLocale = {
...defaultLocale,
...defaultLocale.Modal,
};
}
}

View File

@ -4,7 +4,7 @@ import Icon from '../icon';
import Button from '../button';
import { ButtonType } from '../button/button';
import LocaleReceiver from '../locale-provider/LocaleReceiver';
import enUS from '../locale-provider/en_US';
import defaultLocale from '../locale-provider/default';
export interface PopconfirmProps extends AbstractTooltipProps {
title: React.ReactNode;
@ -110,7 +110,7 @@ export default class Popconfirm extends React.Component<PopconfirmProps, any> {
const overlay = (
<LocaleReceiver
componentName="Popconfirm"
defaultLocale={enUS.Popconfirm}
defaultLocale={defaultLocale.Popconfirm}
>
{this.renderOverlay}
</LocaleReceiver>

View File

@ -3,7 +3,7 @@ import PropTypes from 'prop-types';
import RcSelect, { Option, OptGroup } from 'rc-select';
import classNames from 'classnames';
import LocaleReceiver from '../locale-provider/LocaleReceiver';
import enUS from '../locale-provider/en_US';
import defaultLocale from '../locale-provider/default';
import warning from '../_util/warning';
export interface AbstractSelectProps {
@ -151,7 +151,7 @@ export default class Select extends React.Component<SelectProps, any> {
return (
<LocaleReceiver
componentName="Select"
defaultLocale={enUS.Select}
defaultLocale={defaultLocale.Select}
>
{this.renderSelect}
</LocaleReceiver>

View File

@ -7,7 +7,7 @@ import Pagination, { PaginationProps } from '../pagination';
import Icon from '../icon';
import Spin, { SpinProps } from '../spin';
import LocaleReceiver from '../locale-provider/LocaleReceiver';
import enUS from '../locale-provider/en_US';
import defaultLocale from '../locale-provider/default';
import warning from '../_util/warning';
import FilterDropdown from './filterDropdown';
import createStore, { Store } from './createStore';
@ -27,8 +27,6 @@ function stopPropagation(e) {
}
}
const defaultLocale = enUS.Table;
const defaultPagination = {
onChange: noop,
onShowSizeChange: noop,
@ -938,7 +936,7 @@ export default class Table<T> extends React.Component<TableProps<T>, any> {
const table = (
<LocaleReceiver
componentName="Table"
defaultLocale={defaultLocale}
defaultLocale={defaultLocale.Table}
>
{this.renderTable}
</LocaleReceiver>

View File

@ -5,7 +5,7 @@ import List, { TransferListProps } from './list';
import Operation from './operation';
import Search from './search';
import LocaleReceiver from '../locale-provider/LocaleReceiver';
import enUS from '../locale-provider/en_US';
import defaultLocale from '../locale-provider/default';
export { TransferListProps } from './list';
export { TransferOperationProps } from './operation';
@ -390,7 +390,7 @@ export default class Transfer extends React.Component<TransferProps, any> {
return (
<LocaleReceiver
componentName="Transfer"
defaultLocale={enUS.Transfer}
defaultLocale={defaultLocale.Transfer}
>
{this.renderTransfer}
</LocaleReceiver>

View File

@ -2,14 +2,12 @@ import React from 'react';
import RcUpload from 'rc-upload';
import classNames from 'classnames';
import LocaleReceiver from '../locale-provider/LocaleReceiver';
import enUS from '../locale-provider/en_US';
import defaultLocale from '../locale-provider/default';
import Dragger from './Dragger';
import UploadList from './UploadList';
import { UploadProps, UploadLocale } from './interface';
import { UploadProps } from './interface';
import { T, fileToObject, genPercentAdd, getFileItem, removeFileItem } from './utils';
const defaultLocale: UploadLocale = enUS.Upload;
export { UploadProps };
export default class Upload extends React.Component<UploadProps, any> {
@ -254,7 +252,7 @@ export default class Upload extends React.Component<UploadProps, any> {
const uploadList = showUploadList ? (
<LocaleReceiver
componentName="Upload"
defaultLocale={defaultLocale}
defaultLocale={defaultLocale.Upload}
>
{this.renderUploadList}
</LocaleReceiver>