(EPROC-20881) Fixed translations prefix usage.

OpusCapita · Nov 15, 2021 · c131cf3 · c131cf3
1 parent 137589e
commit c131cf3
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 11 deletions.
diff --git a/src/components/EditHeading/index.js b/src/components/EditHeading/index.js
@@ -7,7 +7,7 @@ import Row from 'react-bootstrap/lib/Row';
 import ButtonGroup from 'react-bootstrap/lib/ButtonGroup';
 import Button from 'react-bootstrap/lib/Button';
 import Glyphicon from 'react-bootstrap/lib/Glyphicon';
-import { getModelMessage, getTabLabel } from '../lib';
+import { getKeyWithPrefix, getModelMessage, getTabLabel } from '../lib';
 import { VIEW_CREATE } from '../../crudeditor-lib/common/constants';
 import ConfirmUnsavedChanges from '../ConfirmDialog/ConfirmUnsavedChanges';
 
@@ -58,7 +58,7 @@ export default class EditHeading extends PureComponent {
 
     const { i18n } = this.context;
 
-    const modelName = getModelMessage({ i18n, key: 'model.name' });
+    const modelName = getModelMessage({ i18n, key: getKeyWithPrefix(i18n, 'model.name') });
 
     const title = exitView ?
       (

diff --git a/src/components/SearchMain/index.js b/src/components/SearchMain/index.js
@@ -6,7 +6,7 @@ import Row from 'react-bootstrap/lib/Row';
 import Col from 'react-bootstrap/lib/Col';
 import Form from '../SearchForm';
 import Result from '../SearchResult';
-import { getModelMessage } from '../lib';
+import { getModelMessage, getKeyWithPrefix } from '../lib';
 import './SearchMain.less';
 
 export default class SearchMain extends PureComponent {
@@ -51,7 +51,7 @@ export default class SearchMain extends PureComponent {
           <Row>
             <Col xs={8}>
 
-              {getModelMessage({ i18n, key: 'model.name' })}
+              {getModelMessage({ i18n, key: getKeyWithPrefix(i18n, 'model.name') })}
 
               <Button
                 bsStyle="link"

diff --git a/src/components/lib.js b/src/components/lib.js
@@ -20,11 +20,14 @@ export const titleCase = str => typeof str === 'string' ?
   str.charAt(0).toUpperCase() + str.slice(1).replace(/[^A-Z](?=[A-Z])/g, '$& ') :
   str;
 
+export const getKeyWithPrefix = (i18n, key) =>
+  i18n.hasOwnProperty('getKeyWithPrefix') ? i18n.getKeyWithPrefix(key) : key;
+
 export const getModelMessage = request => {
   const { i18n, key, args, defaultMessage } = request;
 
   // If i18n doesn't find a message by key, it returns the key itself.
-  // Optinal 'defaultMessage' defines default message for such a case.
+  // Optional 'defaultMessage' defines default message for such a case.
   const message = i18n.getMessage(key, args);
 
   return message.slice(-key.length) === key && request.hasOwnProperty('defaultMessage') ?
@@ -57,20 +60,20 @@ export const getFieldErrorMessage = ({ error, i18n, fieldName }) => {
   // try to find a translation defined by model
   return getModelMessage({
     i18n,
-    key: `model.field.${fieldName}.error.${id}`,
+    key: getKeyWithPrefix(i18n, `model.field.${fieldName}.error.${id}`),
     args,
     defaultMessage: message || id
   })
 }
 
 export const getTabLabel = ({ i18n, name }) => getModelMessage({
   i18n,
-  key: `model.tab.${name}.label`,
+  key: getKeyWithPrefix(i18n, `model.tab.${name}.label`),
   defaultMessage: titleCase(name)
 });
 
 export const getFieldLabel = ({ i18n, name }) => getModelMessage({
   i18n,
-  key: `model.field.${name}.label`,
+  key: getKeyWithPrefix(i18n, `model.field.${name}.label`),
   defaultMessage: titleCase(name)
 })
diff --git a/src/crudeditor-lib/index.js b/src/crudeditor-lib/index.js
@@ -135,19 +135,22 @@ export default baseModelDefinition => {
       // modelDefinition also needs to be accessed outside of constructor scope, therefore pin it to 'this'
       this.modelDefinition = modelDefinition;
 
-      let prefix = modelDefinition.model.translationsKeyPrefix
-      let translations = modelDefinition.model.translations
+      const configuredPrefix = modelDefinition.model.translationsKeyPrefix;
+      let translations = modelDefinition.model.translations;
+      let prefix = null;
 
-      if (!prefix) {
+      if (!configuredPrefix) {
         // Since "object-hash" package does not support async functions, remove them from modelDefinition.
         // For more details see
         // https://github.com/puleos/object-hash/issues/67
         prefix = `${appName}.${hash(JSON.parse(JSON.stringify(modelDefinition)))}`;
 
         // model translations
+        // add generated prefix manually to translations
         const prefixedTranslations = getPrefixedTranslations(translations, prefix);
         this.context.i18n.register(prefix, prefixedTranslations);
       } else {
+        prefix = configuredPrefix;
         this.context.i18n.register(prefix, translations);
       }
 
@@ -172,7 +175,20 @@ export default baseModelDefinition => {
               args
             );
           }
+        },
+
+        getKeyWithPrefix: {
+          get() {
+            return (key) => {
+              if (configuredPrefix) {
+                return `${configuredPrefix}.${key}`;
+              } else {
+                return key;
+              }
+            }
+          }
         }
+
       });
 
       this.adjustedContext = {