translations: refactor cli

inveniosoftware · Jul 6, 2021 · 4302281 · 4302281
1 parent 7003810
commit 4302281
Show file tree

Hide file tree

Showing 23 changed files with 262 additions and 161 deletions.
diff --git a/.tx/config b/.tx/config
@@ -6,27 +6,30 @@
 # React-Invenio-Deposit is free software; you can redistribute it and/or modify it
 # under the terms of the MIT License; see LICENSE file for more details.
 
-# 
-# 1) Extract translation keys/values,
-#    $ npm run i18n-scan
-# 2) Update .pot file, this file is pushed to transifex
-#    $ npm run i18n-conv-json
-# 3) Convert/update .json from .po
-#    $ npm run i18n-conv-po-all
-# 4) Install the transifex-client
+#
+# 1) Add a new language
+#    npm run init_catalog lang <lang>
+# 2) Extract translation keys/values
+#    $ npm run extract_messages
+# 3) Install the transifex-client
 #    $ pip install transifex-client
-# 5) Push source (.pot) and translations (.po) to Transifex
+# 4) Push source (.pot) and translations (.po) to Transifex
 #    $ tx push -s -t
-# 6) Pull translations for a single language from Transifex
+# 5) Pull translations for a single language from Transifex
 #    $ tx pull -l <lang>
-# 7) Pull translations for all languages from Transifex
+# 6) Pull translations for all languages from Transifex
 #    $ tx pull -a
+# 7) Compile .po files for all languages
+#    $ npm run compile_catalog
+# 8) Convert .po file for a single language
+#    $ npm run compile_catalog lang <lang>
+
 
 [main]
 host = https://www.transifex.com
 
 [invenio.react-invenio-deposit-messages]
-file_filter = src/lib/translations/<lang>/messages.po
+file_filter = src/lib/translations/messages/<lang>/messages.po
 source_file = src/lib/translations/translations.pot
 source_lang = en
 type = PO
diff --git a/getTextConverter.js b/getTextConverter.js
diff --git a/i18next-scanner.config.js b/i18next-scanner.config.js
@@ -4,66 +4,54 @@
 // React-Invenio-Deposit is free software; you can redistribute it and/or modify it
 // under the terms of the MIT License; see LICENSE file for more details.
 
-const fs = require('fs');
-const chalk = require('chalk');
 const { languages } = require('./package').config;
 
-// list of func used to 
+// list of func used to
 // mark the strings for translation
-const funcList = ['i18next.t', 'i18n.t', 't'];
+const funcList = ['t'];
 
 module.exports = {
-    options: {
-        debug: true,
-        browserLanguageDetection: true,
-        func: {
-            list: funcList,
-            extensions: ['.js', '.jsx']
-        },
-        trans: false, // Enable for using Trans component
-        lngs: languages,
-        ns: [
-            // file name (.json)
-            'translations',
-        ],
-        defaultLng: 'en',
-        defaultNs: 'translations',
-        resource: {
-            // The path where resources get loaded from. Relative to current working directory. 
-            loadPath: 'src/lib/translations/{{lng}}/{{ns}}.json',
-
-            // The path to store resources.
-            savePath: 'src/lib/translations/{{lng}}/{{ns}}.json',
-
-            jsonIndent: 2,
-            lineEnding: '\n'
-        },
-        nsSeparator: false, // namespace separator
-
-        //Set to false to disable key separator
-        // if you prefer having keys as the fallback for translation (e.g. gettext). 
-        keySeparator: false,
+  options: {
+    debug: true,
+    removeUnusedKeys: true,
+    browserLanguageDetection: true,
+    func: {
+      list: funcList,
+      extensions: ['.js', '.jsx'],
     },
+    // trans: false, // Enable for using Trans component
+    lngs: languages,
+    ns: [
+      // file name (.json)
+      'translations',
+    ],
+    defaultLng: 'en',
+    defaultNs: 'translations',
+    // @param {string} lng The language currently used.
+    // @param {string} ns The namespace currently used.
+    // @param {string} key The translation key.
+    // @return {string} Returns a default value for the translation key.
+    defaultValue: function (lng, ns, key) {
+      if (lng === 'en') {
+        // Return key as the default value for English language
+        return key;
+      }
+      return '';
+    },
+    resource: {
+      // The path where resources get loaded from. Relative to current working directory.
+      loadPath: 'src/lib/translations/messages/{{lng}}/{{ns}}.json',
 
-    // func is provided
-    // (if needed)for more custom extractions.
-    transform: function customTransform(file, enc, done) {
-        "use strict";
-        const parser = this.parser;
-        const content = fs.readFileSync(file.path, enc);
-        let count = 0;
+      // The path to store resources.
+      savePath: 'src/lib/translations/messages/{{lng}}/{{ns}}.json',
 
-        parser.parseFuncFromString(content, { list: funcList }, (key, options) => {
-            parser.set(key, Object.assign({}, options, {
-                nsSeparator: false,
-                keySeparator: false
-            }));
-            ++count;
-        });
+      jsonIndent: 2,
+      lineEnding: '\n',
+    },
+    nsSeparator: false, // namespace separator
 
-        if (count > 0) {
-            console.log(`i18next-scanner: count=${chalk.cyan(count)}, file=${chalk.yellow(JSON.stringify(file.relative))}`);
-        }
-        done();
-    }
+    //Set to false to disable key separator
+    // if you prefer having keys as the fallback for translation (e.g. gettext).
+    keySeparator: false,
+  },
 };
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -12,7 +12,8 @@
     "languages": [
       "en",
       "de",
-      "tr"
+      "tr",
+      "el"
     ]
   },
   "scripts": {
@@ -24,17 +25,19 @@
     "postlink-dist": "cd dist && rm -rf node_modules",
     "unlink-dist": "cd dist && npm unlink && rm package*",
     "watch": "NODE_ENV=development rollup --watch -c",
-    "i18n-scan": "i18next-scanner --config i18next-scanner.config.js src/**/*.{js,jsx}",
-    "i18n-conv-json": "i18next-conv -l en -s ./src/lib/translations/en/translations.json -t ./src/lib/translations/translations.pot",
-    "i18n-conv-po": "i18next-conv -l $npm_config_lang -s ./src/lib/translations/$npm_config_lang/messages.po -t ./src/lib/translations/$npm_config_lang/translations.json",
-    "i18n-conv-po-all": "node ./getTextConverter.js",
+    "extract_messages": "i18next-scanner --config i18next-scanner.config.js 'src/**/*.{js,jsx}'",
+    "postextract_messages": "i18next-conv -l en -s ./src/lib/translations/messages/en/translations.json -t ./src/lib/translations/translations.pot",
+    "compile_catalog": "node ./src/lib/translations/scripts/compileCatalog.js",
+    "init_catalog": "node ./src/lib/translations/scripts/initCatalog",
     "test": "react-scripts test",
     "eject": "react-scripts eject",
     "lint": "eslint src/**/*.js",
     "format": "prettier --config ./.prettierrc --ignore-path ./.prettierignore --write \"src/**/*.js\""
   },
   "dependencies": {},
   "peerDependencies": {
+    "@ckeditor/ckeditor5-build-classic": "^16.0.0",
+    "@ckeditor/ckeditor5-react": "^2.1.0",
     "axios": "^0.21.1",
     "formik": "^2.1.4",
     "react": "^16.13.1",

diff --git a/src/lib/components/DepositFormTitle.js b/src/lib/components/DepositFormTitle.js
@@ -8,15 +8,15 @@
 import React, { Component } from 'react';
 import { connect } from 'react-redux';
 import { Header } from 'semantic-ui-react';
-import i18next from '../i18next';
+import { t } from '../i18next';
 
 class DepositFormTitleComponent extends Component {
   render() {
     let content = '';
     if (!this.props.isPublished) {
-      content = this.props.isVersion ? i18next.t('New version') : i18next.t('New upload');
+      content = this.props.isVersion ? t('New version') : t('New upload');
     } else {
-      content = i18next.t('Edit upload');
+      content = t('Edit upload');
     }
     return <Header as="h1" icon="upload" content={content} />;
   }

diff --git a/src/lib/components/FileUploader/FileUploaderToolbar.js b/src/lib/components/FileUploader/FileUploaderToolbar.js
@@ -9,7 +9,7 @@ import { useFormikContext } from 'formik';
 import React from 'react';
 import { Checkbox, Grid, Icon, Label, List, Popup } from 'semantic-ui-react';
 import { humanReadableBytes } from './utils';
-import i18next from '../../i18next';
+import { t } from '../../i18next';
 
 // NOTE: This component has to be a function component to allow
 //       the `useFormikContext` hook.
@@ -30,7 +30,7 @@ export const FileUploaderToolbar = ({
             <List.Item>
               <Checkbox
                 label={'Metadata-only record'}
-                onChange={() => setFieldValue("files.enabled", !filesEnabled)}
+                onChange={() => setFieldValue('files.enabled', !filesEnabled)}
                 disabled={filesList.length > 0}
                 checked={!filesEnabled}
               />
@@ -50,7 +50,7 @@ export const FileUploaderToolbar = ({
       {filesEnabled && (
         <Grid.Column width={10}>
           <List horizontal floated="right">
-            <List.Item>{i18next.t('Storage available')}</List.Item>
+            <List.Item>{t('Storage available')}</List.Item>
             <List.Item>
               <Label
                 {...(filesList.length === quota.maxFiles

diff --git a/src/lib/components/Identifiers/IdentifiersField.js b/src/lib/components/Identifiers/IdentifiersField.js
@@ -15,6 +15,7 @@ import {
   TextField,
 } from 'react-invenio-forms';
 import { Button, Form } from 'semantic-ui-react';
+import { t } from '../../i18next';
 import { emptyIdentifier } from '../../record';
 
 /** Identifiers array component */
@@ -24,7 +25,7 @@ export class IdentifiersField extends Component {
     return (
       <>
         <ArrayField
-          addButtonLabel={'Add identifier'}
+          addButtonLabel={t('Add identifier')}
           defaultNewValue={emptyIdentifier}
           fieldPath={fieldPath}
           label={