Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Renew typescript typings #11649

Merged
merged 1 commit into from Aug 7, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 6 additions & 4 deletions components/date-picker/locale/th_TH.tsx
@@ -1,14 +1,16 @@
import CalendarLocale from 'rc-calendar/lib/locale/th_TH';
import TimePickerLocale from '../../time-picker/locale/th_TH';
import assign from 'object-assign';

// Merge into a locale object
const locale = {
lang: assign({
lang: {
placeholder: 'เลือกวันที่',
rangePlaceholder: ['วันเริ่มต้น', 'วันสิ้นสุด'],
}, CalendarLocale),
timePickerLocale: assign({}, TimePickerLocale),
...CalendarLocale,
},
timePickerLocale: {
...TimePickerLocale,
},
};

// All settings at:
Expand Down
1 change: 1 addition & 0 deletions package.json
Expand Up @@ -94,6 +94,7 @@
"@types/prop-types": "^15.5.4",
"@types/react": "^16.0.0",
"@types/react-dom": "^16.0.0",
"@types/react-slick": "^0.23.2",
"@yesmeck/offline-plugin": "^5.0.5",
"ansi-styles": "^3.2.0",
"ant-design-palettes": "^1.0.0",
Expand Down
4 changes: 0 additions & 4 deletions typings/custom-typings.d.ts
Expand Up @@ -6,8 +6,6 @@ declare module 'rc-time-picker*';

declare module 'rc-pagination*';

declare module "object-assign";

declare module "omit.js";

declare module 'rc-animate';
Expand All @@ -22,8 +20,6 @@ declare module 'css-animation';

declare module 'rc-select';

declare module 'react-slick';

declare module 'rc-cascader';

declare module 'array-tree-filter';
Expand Down