From a470878720ae8a14b5065d16ec346b57f61514ca Mon Sep 17 00:00:00 2001 From: Aleksandr Baliunov Date: Tue, 4 May 2021 12:13:25 +0300 Subject: [PATCH 1/8] (issue-304) Translate message "Nothing to show" --- .../components/FileNavigator/FileNavigator.react.js | 1 + .../src/client/components/ListView/ListView.react.js | 8 +++++--- .../components/NoFilesFoundStub/NoFilesFoundStub.react.js | 7 ++++--- packages/client-react/src/translations.js | 4 ++++ 4 files changed, 14 insertions(+), 6 deletions(-) diff --git a/packages/client-react/src/client/components/FileNavigator/FileNavigator.react.js b/packages/client-react/src/client/components/FileNavigator/FileNavigator.react.js index 773671b05..a4a068e2f 100644 --- a/packages/client-react/src/client/components/FileNavigator/FileNavigator.react.js +++ b/packages/client-react/src/client/components/FileNavigator/FileNavigator.react.js @@ -501,6 +501,7 @@ class FileNavigator extends Component { items={resourceChildren} layout={listViewLayout} layoutOptions={viewLayoutOptions} + locale={apiOptions.locale} > {}, onSort: () => {}, onKeyDown: () => {}, - onRef: () => {} + onRef: () => {}, + locale: 'en' }; export default @@ -250,7 +252,7 @@ class ListView extends Component { rowRenderer={Row({ selection, lastSelected, loading, contextMenuId: rowContextMenuId, hasTouch: HAS_TOUCH })} - noRowsRenderer={NoFilesFoundStub} + noRowsRenderer={() => NoFilesFoundStub(this.props.locale)} onRowClick={onRowClick} onRowRightClick={onRowRightClick} onRowDoubleClick={onRowDoubleClick} diff --git a/packages/client-react/src/client/components/NoFilesFoundStub/NoFilesFoundStub.react.js b/packages/client-react/src/client/components/NoFilesFoundStub/NoFilesFoundStub.react.js index 8a582513a..e61a67eb0 100644 --- a/packages/client-react/src/client/components/NoFilesFoundStub/NoFilesFoundStub.react.js +++ b/packages/client-react/src/client/components/NoFilesFoundStub/NoFilesFoundStub.react.js @@ -1,20 +1,21 @@ import React from 'react'; import './NoFilesFoundStub.less'; import Svg from '@opuscapita/react-svg/lib/SVG'; +import getMessage from '../../../translations' const nothingToShowIcon = require('@opuscapita/svg-icons/lib/add_to_photos.svg'); // TODO Add localization -export default () => ( +export default (locale) => (
- Nothing to show + {getMessage(locale, "nothingToShow")}
- Use toolbar or context menu to perform available actions + {getMessage(locale, "useContextMenu")}
{/*
diff --git a/packages/client-react/src/translations.js b/packages/client-react/src/translations.js index b800aec43..6432070c7 100644 --- a/packages/client-react/src/translations.js +++ b/packages/client-react/src/translations.js @@ -2,10 +2,14 @@ const translations = { en: { moveForward: 'Move forward', moveBack: 'Move back', + nothingToShow: 'Nothing to show', + useContextMenu: 'Use toolbar or context menu to perform available actions' }, fr: { moveForward: 'Avancer', moveBack: 'Revenir en arrière', + nothingToShow: 'Aucun élément à afficher', + useContextMenu: 'Utilisez la barre d\'outil ou le menu contextuel pour faire une action' }, zh: { moveForward: '向前', From bfbc790e63ca75bd8858cff679d05b6a63c27852 Mon Sep 17 00:00:00 2001 From: Aleksandr Baliunov Date: Mon, 12 Jul 2021 15:10:39 +0300 Subject: [PATCH 2/8] (issue-304) Nothing to show --- .../components/ListView/ListView.react.js | 2 +- .../NoFilesFoundStub.react.js | 20 +++++++++++++++---- packages/client-react/src/translations.js | 9 +++++---- 3 files changed, 22 insertions(+), 9 deletions(-) diff --git a/packages/client-react/src/client/components/ListView/ListView.react.js b/packages/client-react/src/client/components/ListView/ListView.react.js index ed826aaf0..fca731de3 100644 --- a/packages/client-react/src/client/components/ListView/ListView.react.js +++ b/packages/client-react/src/client/components/ListView/ListView.react.js @@ -252,7 +252,7 @@ class ListView extends Component { rowRenderer={Row({ selection, lastSelected, loading, contextMenuId: rowContextMenuId, hasTouch: HAS_TOUCH })} - noRowsRenderer={() => NoFilesFoundStub(this.props.locale)} + noRowsRenderer={() => } onRowClick={onRowClick} onRowRightClick={onRowRightClick} onRowDoubleClick={onRowDoubleClick} diff --git a/packages/client-react/src/client/components/NoFilesFoundStub/NoFilesFoundStub.react.js b/packages/client-react/src/client/components/NoFilesFoundStub/NoFilesFoundStub.react.js index e61a67eb0..37ad6624b 100644 --- a/packages/client-react/src/client/components/NoFilesFoundStub/NoFilesFoundStub.react.js +++ b/packages/client-react/src/client/components/NoFilesFoundStub/NoFilesFoundStub.react.js @@ -1,11 +1,13 @@ import React from 'react'; -import './NoFilesFoundStub.less'; import Svg from '@opuscapita/react-svg/lib/SVG'; -import getMessage from '../../../translations' +import PropTypes from "prop-types"; const nothingToShowIcon = require('@opuscapita/svg-icons/lib/add_to_photos.svg'); -// TODO Add localization -export default (locale) => ( +import getMessage from '../../../translations' + +import './NoFilesFoundStub.less'; + +const NoFilesFoundStub = ({locale}) => (
( */}
); + +NoFilesFoundStub.propTypes = { + locale: PropTypes.string +}; + +NoFilesFoundStub.defaultProps = { + locale: 'en', +}; + +export default NoFilesFoundStub; diff --git a/packages/client-react/src/translations.js b/packages/client-react/src/translations.js index 4cb2661e5..ff8997304 100644 --- a/packages/client-react/src/translations.js +++ b/packages/client-react/src/translations.js @@ -2,14 +2,14 @@ const translations = { en: { 'common.Toolbar.moveForward': 'Move forward', 'common.Toolbar.moveBack': 'Move back', - nothingToShow: 'Nothing to show', - useContextMenu: 'Use toolbar or context menu to perform available actions' + 'nothingToShow': 'Nothing to show', + 'useContextMenu': 'Use toolbar or context menu to perform available actions' }, fr: { 'common.Toolbar.moveForward': 'Avancer', 'common.Toolbar.moveBack': 'Revenir en arrière', - nothingToShow: 'Aucun élément à afficher', - useContextMenu: 'Utilisez la barre d\'outil ou le menu contextuel pour faire une action' + 'nothingToShow': 'Aucun élément à afficher', + 'useContextMenu': 'Utilisez la barre d\'outil ou le menu contextuel pour faire une action' }, zh: { 'common.Toolbar.moveForward': '向前', @@ -43,6 +43,7 @@ const translations = { }; export default function getMessage(locale, key, params) { + console.log(locale, key, params); let translationExists = (translations[locale] && translations[locale][key]); let translation = translationExists ? translations[locale][key] : translations['en'][key]; if (!params) { From faff7d9e1ec57899c6160d228f9aab0b5ad04e79 Mon Sep 17 00:00:00 2001 From: Aleksandr Baliunov Date: Mon, 12 Jul 2021 15:23:42 +0300 Subject: [PATCH 3/8] (issue-304) fix eslint errors --- .../components/NoFilesFoundStub/NoFilesFoundStub.react.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/client-react/src/client/components/NoFilesFoundStub/NoFilesFoundStub.react.js b/packages/client-react/src/client/components/NoFilesFoundStub/NoFilesFoundStub.react.js index 37ad6624b..91967b95c 100644 --- a/packages/client-react/src/client/components/NoFilesFoundStub/NoFilesFoundStub.react.js +++ b/packages/client-react/src/client/components/NoFilesFoundStub/NoFilesFoundStub.react.js @@ -7,7 +7,7 @@ import getMessage from '../../../translations' import './NoFilesFoundStub.less'; -const NoFilesFoundStub = ({locale}) => ( +const NoFilesFoundStub = ({ locale }) => (
Date: Tue, 13 Jul 2021 11:06:51 +0300 Subject: [PATCH 4/8] (issue-304) Remove old code --- packages/client-react/src/translations.js | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/client-react/src/translations.js b/packages/client-react/src/translations.js index ff8997304..6ab7ca563 100644 --- a/packages/client-react/src/translations.js +++ b/packages/client-react/src/translations.js @@ -43,7 +43,6 @@ const translations = { }; export default function getMessage(locale, key, params) { - console.log(locale, key, params); let translationExists = (translations[locale] && translations[locale][key]); let translation = translationExists ? translations[locale][key] : translations['en'][key]; if (!params) { From 44006b0ad094f50262cfb16bd0bc5c9874671919 Mon Sep 17 00:00:00 2001 From: Aleksandr Baliunov Date: Tue, 13 Jul 2021 11:15:39 +0300 Subject: [PATCH 5/8] (issue-304) Refactor code --- .../FileNavigator/FileNavigator.react.js | 12 +++++++----- .../client/components/ListView/ListView.react.js | 15 +++++++++------ .../NoFilesFoundStub/NoFilesFoundStub.react.js | 2 +- 3 files changed, 17 insertions(+), 12 deletions(-) diff --git a/packages/client-react/src/client/components/FileNavigator/FileNavigator.react.js b/packages/client-react/src/client/components/FileNavigator/FileNavigator.react.js index a4a068e2f..11aa30c85 100644 --- a/packages/client-react/src/client/components/FileNavigator/FileNavigator.react.js +++ b/packages/client-react/src/client/components/FileNavigator/FileNavigator.react.js @@ -1,17 +1,19 @@ -import PropTypes from 'prop-types'; import React, { Component } from 'react'; -import './FileNavigator.less'; +import PropTypes from 'prop-types'; +import { SortDirection } from 'react-virtualized'; +import clickOutside from 'react-click-outside'; +import { find, isEqual } from 'lodash'; + import ListView from '../ListView'; import LocationBar from '../LocationBar'; import Notifications from '../Notifications'; import Toolbar from '../Toolbar'; -import { SortDirection } from 'react-virtualized'; -import { find, isEqual } from 'lodash'; -import clickOutside from 'react-click-outside'; import ContextMenu from '../ContextMenu'; import rawToReactElement from '../raw-to-react-element'; import { createHistory, pushToHistory } from '../history'; +import './FileNavigator.less'; + function hasContext(capability, context) { return capability.availableInContexts && capability.availableInContexts.indexOf(context) !== -1; } diff --git a/packages/client-react/src/client/components/ListView/ListView.react.js b/packages/client-react/src/client/components/ListView/ListView.react.js index fca731de3..41d3714a0 100644 --- a/packages/client-react/src/client/components/ListView/ListView.react.js +++ b/packages/client-react/src/client/components/ListView/ListView.react.js @@ -1,21 +1,24 @@ -import PropTypes from 'prop-types'; import React, { Component } from 'react'; -import './ListView.less'; -import 'react-virtualized/styles.css'; +import PropTypes from 'prop-types'; +import { range } from 'lodash'; +import nanoid from 'nanoid'; +import detectIt from 'detect-it'; // TBD individual imports from 'react-virtualized' to decrease bundle size? // ex. import Table from 'react-virtualized/dist/commonjs/Table' import { Table, AutoSizer, SortDirection } from 'react-virtualized'; +import 'react-virtualized/styles.css'; import { ContextMenuTrigger } from "react-contextmenu"; + import NoFilesFoundStub from '../NoFilesFoundStub'; import Row from './Row.react'; import ScrollOnMouseOut from '../ScrollOnMouseOut'; -import { range } from 'lodash'; -import nanoid from 'nanoid'; -import detectIt from 'detect-it'; import rawToReactElement from '../raw-to-react-element'; import WithSelection from './withSelectionHOC'; import { isDef } from './utils'; +import './ListView.less'; + + const ROW_HEIGHT = 38; const HEADER_HEIGHT = 38; const SCROLL_STRENGTH = 80; diff --git a/packages/client-react/src/client/components/NoFilesFoundStub/NoFilesFoundStub.react.js b/packages/client-react/src/client/components/NoFilesFoundStub/NoFilesFoundStub.react.js index 91967b95c..e425fca79 100644 --- a/packages/client-react/src/client/components/NoFilesFoundStub/NoFilesFoundStub.react.js +++ b/packages/client-react/src/client/components/NoFilesFoundStub/NoFilesFoundStub.react.js @@ -1,6 +1,6 @@ import React from 'react'; -import Svg from '@opuscapita/react-svg/lib/SVG'; import PropTypes from "prop-types"; +import Svg from '@opuscapita/react-svg/lib/SVG'; const nothingToShowIcon = require('@opuscapita/svg-icons/lib/add_to_photos.svg'); import getMessage from '../../../translations' From 4c6ea274d199a3e15d163ce1bb86fb5bf3146631 Mon Sep 17 00:00:00 2001 From: Aleksandr Baliunov Date: Tue, 13 Jul 2021 14:25:39 +0300 Subject: [PATCH 6/8] (issue-304) Fix reviewer's notices --- .../components/NoFilesFoundStub/NoFilesFoundStub.react.js | 4 ++-- packages/client-react/src/translations.js | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/packages/client-react/src/client/components/NoFilesFoundStub/NoFilesFoundStub.react.js b/packages/client-react/src/client/components/NoFilesFoundStub/NoFilesFoundStub.react.js index e425fca79..fccb97a46 100644 --- a/packages/client-react/src/client/components/NoFilesFoundStub/NoFilesFoundStub.react.js +++ b/packages/client-react/src/client/components/NoFilesFoundStub/NoFilesFoundStub.react.js @@ -14,10 +14,10 @@ const NoFilesFoundStub = ({ locale }) => ( svg={nothingToShowIcon} />
- {getMessage(locale, "nothingToShow")} + {getMessage(locale, "common.NoFilesFoundStub.nothingToShow")}
- {getMessage(locale, "useContextMenu")} + {getMessage(locale, "common.NoFilesFoundStub.useContextMenu")}
{/*
diff --git a/packages/client-react/src/translations.js b/packages/client-react/src/translations.js index 6ab7ca563..fada31fc6 100644 --- a/packages/client-react/src/translations.js +++ b/packages/client-react/src/translations.js @@ -2,14 +2,14 @@ const translations = { en: { 'common.Toolbar.moveForward': 'Move forward', 'common.Toolbar.moveBack': 'Move back', - 'nothingToShow': 'Nothing to show', - 'useContextMenu': 'Use toolbar or context menu to perform available actions' + 'common.NoFilesFoundStub.nothingToShow': 'Nothing to show', + 'common.NoFilesFoundStub.useContextMenu': 'Use toolbar or context menu to perform available actions' }, fr: { 'common.Toolbar.moveForward': 'Avancer', 'common.Toolbar.moveBack': 'Revenir en arrière', - 'nothingToShow': 'Aucun élément à afficher', - 'useContextMenu': 'Utilisez la barre d\'outil ou le menu contextuel pour faire une action' + 'common.NoFilesFoundStub.nothingToShow': 'Aucun élément à afficher', + 'common.NoFilesFoundStub.useContextMenu': 'Utilisez la barre d\'outil ou le menu contextuel pour faire une action' }, zh: { 'common.Toolbar.moveForward': '向前', From 2977b9d5786fe47d7f4b7dece8dc848cd30551c3 Mon Sep 17 00:00:00 2001 From: Egor Stambakio Date: Tue, 20 Jul 2021 11:01:54 +0300 Subject: [PATCH 7/8] Add DE translations --- packages/client-react/src/translations.js | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/packages/client-react/src/translations.js b/packages/client-react/src/translations.js index fada31fc6..2dc7d8cb2 100644 --- a/packages/client-react/src/translations.js +++ b/packages/client-react/src/translations.js @@ -2,23 +2,24 @@ const translations = { en: { 'common.Toolbar.moveForward': 'Move forward', 'common.Toolbar.moveBack': 'Move back', - 'common.NoFilesFoundStub.nothingToShow': 'Nothing to show', - 'common.NoFilesFoundStub.useContextMenu': 'Use toolbar or context menu to perform available actions' + 'common.NoFilesFoundStub.nothingToShow': 'There are no data to display.', + 'common.NoFilesFoundStub.useContextMenu': 'Use toolbar or context menu to perform available actions.' }, fr: { 'common.Toolbar.moveForward': 'Avancer', 'common.Toolbar.moveBack': 'Revenir en arrière', - 'common.NoFilesFoundStub.nothingToShow': 'Aucun élément à afficher', - 'common.NoFilesFoundStub.useContextMenu': 'Utilisez la barre d\'outil ou le menu contextuel pour faire une action' + 'common.NoFilesFoundStub.nothingToShow': 'Aucun élément à afficher.', + 'common.NoFilesFoundStub.useContextMenu': 'Utilisez la barre d\'outil ou le menu contextuel pour faire une action.' }, zh: { 'common.Toolbar.moveForward': '向前', 'common.Toolbar.moveBack': '后退', }, - de: { 'common.Toolbar.moveForward': 'Vorwärts', 'common.Toolbar.moveBack': 'Zurück', + 'common.NoFilesFoundStub.nothingToShow': 'Es gibt keine Daten, die angezeigt werden können.', + 'common.NoFilesFoundStub.useContextMenu': 'Nutzen Sie die Symbolleiste oder das Kontextmenü, um die verfügbaren Aktionen auszuführen.' }, fi: { 'common.Toolbar.moveForward': 'Siirrä eteenpäin', @@ -31,6 +32,8 @@ const translations = { ru: { 'common.Toolbar.moveForward': 'Переместить вперед', 'common.Toolbar.moveBack': 'Переместить назад', + 'common.NoFilesFoundStub.nothingToShow': 'Нет данных для отображения.', + 'common.NoFilesFoundStub.useContextMenu': 'Используйте доступные действия на панели инструментов или в контекстном меню.' }, no: { 'common.Toolbar.moveForward': 'Flytt fremover', From 9f780ee69bb6176f39183ee86546debf5e3cbff4 Mon Sep 17 00:00:00 2001 From: Egor Stambakio Date: Tue, 20 Jul 2021 11:12:06 +0300 Subject: [PATCH 8/8] Remove trailing dots in NoFileStub translations --- packages/client-react/src/translations.js | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/packages/client-react/src/translations.js b/packages/client-react/src/translations.js index 2dc7d8cb2..c0f3b84b8 100644 --- a/packages/client-react/src/translations.js +++ b/packages/client-react/src/translations.js @@ -2,14 +2,14 @@ const translations = { en: { 'common.Toolbar.moveForward': 'Move forward', 'common.Toolbar.moveBack': 'Move back', - 'common.NoFilesFoundStub.nothingToShow': 'There are no data to display.', - 'common.NoFilesFoundStub.useContextMenu': 'Use toolbar or context menu to perform available actions.' + 'common.NoFilesFoundStub.nothingToShow': 'There are no data to display', + 'common.NoFilesFoundStub.useContextMenu': 'Use toolbar or context menu to perform available actions' }, fr: { 'common.Toolbar.moveForward': 'Avancer', 'common.Toolbar.moveBack': 'Revenir en arrière', - 'common.NoFilesFoundStub.nothingToShow': 'Aucun élément à afficher.', - 'common.NoFilesFoundStub.useContextMenu': 'Utilisez la barre d\'outil ou le menu contextuel pour faire une action.' + 'common.NoFilesFoundStub.nothingToShow': 'Aucun élément à afficher', + 'common.NoFilesFoundStub.useContextMenu': 'Utilisez la barre d\'outil ou le menu contextuel pour faire une action' }, zh: { 'common.Toolbar.moveForward': '向前', @@ -18,8 +18,8 @@ const translations = { de: { 'common.Toolbar.moveForward': 'Vorwärts', 'common.Toolbar.moveBack': 'Zurück', - 'common.NoFilesFoundStub.nothingToShow': 'Es gibt keine Daten, die angezeigt werden können.', - 'common.NoFilesFoundStub.useContextMenu': 'Nutzen Sie die Symbolleiste oder das Kontextmenü, um die verfügbaren Aktionen auszuführen.' + 'common.NoFilesFoundStub.nothingToShow': 'Es gibt keine Daten, die angezeigt werden können', + 'common.NoFilesFoundStub.useContextMenu': 'Nutzen Sie die Symbolleiste oder das Kontextmenü, um die verfügbaren Aktionen auszuführen' }, fi: { 'common.Toolbar.moveForward': 'Siirrä eteenpäin', @@ -32,8 +32,8 @@ const translations = { ru: { 'common.Toolbar.moveForward': 'Переместить вперед', 'common.Toolbar.moveBack': 'Переместить назад', - 'common.NoFilesFoundStub.nothingToShow': 'Нет данных для отображения.', - 'common.NoFilesFoundStub.useContextMenu': 'Используйте доступные действия на панели инструментов или в контекстном меню.' + 'common.NoFilesFoundStub.nothingToShow': 'Нет данных для отображения', + 'common.NoFilesFoundStub.useContextMenu': 'Используйте доступные действия на панели инструментов или в контекстном меню' }, no: { 'common.Toolbar.moveForward': 'Flytt fremover',