@arcblock/ux 2.4.31 → 2.4.33

package/lib/Datatable/index.js

@@ -216,11 +216,11 @@ function ReDatatable(_ref2) {
     emptyEl = emptyNode;
   } else if (locale === 'zh') {
     emptyEl = /*#__PURE__*/(0, _jsxRuntime.jsx)(_Empty.default, {
-      children: emptyNode || '对不起，没有找到匹配的记录'
+      children: emptyNode || '没有找到匹配的记录'
     });
   } else {
     emptyEl = /*#__PURE__*/(0, _jsxRuntime.jsx)(_Empty.default, {
-      children: emptyNode || 'Sorry, no matching records found'
+      children: emptyNode || 'No matching records found'
     });
   }
 

package/lib/Locale/context.js

@@ -20,7 +20,7 @@ var _Util = require("../Util");
 
 var _jsxRuntime = require("react/jsx-runtime");
 
-const _excluded = ["children", "locale", "translations", "languages"];
+const _excluded = ["children", "locale", "fallbackLocale", "translations", "languages"];
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
@@ -94,6 +94,7 @@ function LocaleProvider(_ref) {
   let {
     children,
     locale,
+    fallbackLocale,
     translations,
     languages
   } = _ref,
@@ -118,6 +119,13 @@ function LocaleProvider(_ref) {
   const translate = (key, data) => {
     if (!translations[currentLocale] || !translations[currentLocale][key]) {
       console.warn("Warning: no ".concat(key, " translation of ").concat(currentLocale));
+
+      if (fallbackLocale) {
+        var _translations$fallbac;
+
+        return ((_translations$fallbac = translations[fallbackLocale]) === null || _translations$fallbac === void 0 ? void 0 : _translations$fallbac[key]) || key;
+      }
+
       return key;
     }
 
@@ -144,6 +152,8 @@ LocaleProvider.propTypes = {
   children: _propTypes.default.any.isRequired,
   translations: _propTypes.default.object.isRequired,
   locale: _propTypes.default.string,
+  // 会影响 translate(key) 的结果 - 当 key 无效时查找 fallbackLocale 对应的翻译结果
+  fallbackLocale: _propTypes.default.string,
   languages: _propTypes.default.arrayOf(_propTypes.default.shape({
     value: _propTypes.default.string,
     text: _propTypes.default.string
@@ -151,6 +161,7 @@ LocaleProvider.propTypes = {
 };
 LocaleProvider.defaultProps = {
   locale: '',
+  fallbackLocale: '',
   languages: [{
     value: 'en',
     text: 'English'

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@arcblock/ux",
-  "version": "2.4.31",
+  "version": "2.4.33",
   "description": "Common used react components for arcblock products",
   "keywords": [
     "react",
@@ -47,10 +47,10 @@
     "react": ">=18.1.0",
     "react-ga": "^2.7.0"
   },
-  "gitHead": "d0e15c170e4aa6c9a4051d5ecfbc87d9ff5e4ddf",
+  "gitHead": "d7a8cfbbcc9f926305b0da8c4507c510190a105e",
   "dependencies": {
-    "@arcblock/icons": "^2.4.31",
-    "@arcblock/react-hooks": "^2.4.31",
+    "@arcblock/icons": "^2.4.33",
+    "@arcblock/react-hooks": "^2.4.33",
     "@babel/plugin-syntax-dynamic-import": "^7.8.3",
     "@emotion/react": "^11.10.0",
     "@emotion/styled": "^11.10.0",

package/src/Datatable/index.js

@@ -171,9 +171,9 @@ function ReDatatable({
   } else if (isValidElement(emptyNode)) {
     emptyEl = emptyNode;
   } else if (locale === 'zh') {
-    emptyEl = <Empty>{emptyNode || '对不起，没有找到匹配的记录'}</Empty>;
+    emptyEl = <Empty>{emptyNode || '没有找到匹配的记录'}</Empty>;
   } else {
-    emptyEl = <Empty>{emptyNode || 'Sorry, no matching records found'}</Empty>;
+    emptyEl = <Empty>{emptyNode || 'No matching records found'}</Empty>;
   }
 
   let textLabels = {

package/src/Locale/context.js

@@ -44,7 +44,7 @@ const replace = (template, data) =>
 
 const LocaleContext = createContext();
 const { Provider, Consumer } = LocaleContext;
-function LocaleProvider({ children, locale, translations, languages, ...rest }) {
+function LocaleProvider({ children, locale, fallbackLocale, translations, languages, ...rest }) {
   const [currentLocale, setCurrentLocale] = useState(locale || getLocale(languages));
 
   const changeLocale = (newLocale) => {
@@ -63,6 +63,9 @@ function LocaleProvider({ children, locale, translations, languages, ...rest })
   const translate = (key, data) => {
     if (!translations[currentLocale] || !translations[currentLocale][key]) {
       console.warn(`Warning: no ${key} translation of ${currentLocale}`);
+      if (fallbackLocale) {
+        return translations[fallbackLocale]?.[key] || key;
+      }
       return key;
     }
 
@@ -83,11 +86,14 @@ LocaleProvider.propTypes = {
   children: PropTypes.any.isRequired,
   translations: PropTypes.object.isRequired,
   locale: PropTypes.string,
+  // 会影响 translate(key) 的结果 - 当 key 无效时查找 fallbackLocale 对应的翻译结果
+  fallbackLocale: PropTypes.string,
   languages: PropTypes.arrayOf(PropTypes.shape({ value: PropTypes.string, text: PropTypes.string })),
 };
 
 LocaleProvider.defaultProps = {
   locale: '',
+  fallbackLocale: '',
   languages: [
     { value: 'en', text: 'English' },
     { value: 'zh', text: '简体中文' },