Add custom local support in pagination component.

ant-design · Jun 27, 2018 · babbbdd4e5c33ca050f8ee08969185c8d3269b4c · babbbdd
1 parent 009ed08
commit babbbdd4e5c33ca050f8ee08969185c8d3269b4c
Unified Split

Showing with 3 additions and 2 deletions.

+3 −2 components/pagination/Pagination.tsx
diff --git a/components/pagination/Pagination.tsx b/components/pagination/Pagination.tsx
@@ -41,8 +41,9 @@ export default class Pagination extends React.Component<PaginationProps, {}> {
     selectPrefixCls: 'ant-select',
   };
 
-  renderPagination = (locale: PaginationLocale) => {
-    const { className, size, ...restProps } = this.props;
+  renderPagination = (contextLocale: PaginationLocale) => {
+    const { className, size, locale: customLocale,  ...restProps } = this.props;
+    const locale = { ...contextLocale, ...customLocale };
     const isSmall = size === 'small';
     return (
       <RcPagination