fixed #2534 fixes #2495 paginator has i18n issues