diff --git a/packages/strapi-admin/files/public/app/components/LeftMenuLink/index.js b/packages/strapi-admin/files/public/app/components/LeftMenuLink/index.js index cde3ffd4b8..501183a5c1 100644 --- a/packages/strapi-admin/files/public/app/components/LeftMenuLink/index.js +++ b/packages/strapi-admin/files/public/app/components/LeftMenuLink/index.js @@ -4,10 +4,12 @@ * */ -import React from 'react'; -import styles from './styles.scss'; -import { Link } from 'react-router'; import _ from 'lodash'; +import React from 'react'; +import { FormattedMessage } from 'react-intl'; +import { Link } from 'react-router'; + +import styles from './styles.scss'; class LeftMenuLink extends React.Component { // eslint-disable-line react/prefer-stateless-function render() { @@ -15,11 +17,15 @@ class LeftMenuLink extends React.Component { // eslint-disable-line react/prefer // because of the two levels router. const isLinkActive = _.startsWith(window.location.pathname.replace('/admin', ''), this.props.destination); + // const label = this.props.label.id + // ? + // : {this.props.label}; + return (
  • - {this.props.label} +
  • ); diff --git a/packages/strapi-admin/files/public/app/components/LeftMenuLinkContainer/index.js b/packages/strapi-admin/files/public/app/components/LeftMenuLinkContainer/index.js index d9a06963fd..97d034daf4 100644 --- a/packages/strapi-admin/files/public/app/components/LeftMenuLinkContainer/index.js +++ b/packages/strapi-admin/files/public/app/components/LeftMenuLinkContainer/index.js @@ -5,8 +5,11 @@ */ import React from 'react'; +import { FormattedMessage } from 'react-intl'; import LeftMenuLink from 'components/LeftMenuLink'; + import styles from './styles.scss'; +import messages from './messages.json'; class LeftMenuLinkContainer extends React.Component { // eslint-disable-line react/prefer-stateless-function render() { @@ -53,27 +56,27 @@ class LeftMenuLinkContainer extends React.Component { // eslint-disable-line rea
    {linkSections}
    -

    Plugins

    +

      {pluginsLinks}
    -

    General

    +

    diff --git a/packages/strapi-admin/files/public/app/components/LeftMenuLinkContainer/messages.json b/packages/strapi-admin/files/public/app/components/LeftMenuLinkContainer/messages.json new file mode 100644 index 0000000000..36384918e5 --- /dev/null +++ b/packages/strapi-admin/files/public/app/components/LeftMenuLinkContainer/messages.json @@ -0,0 +1,22 @@ +{ + "listPlugins": { + "id": "app.components.LeftMenuLinkContainer.listPlugins", + "defaultMessage": "List plugins" + }, + "installNewPlugin": { + "id": "app.components.LeftMenuLinkContainer.installNewPlugin", + "defaultMessage": "Install new plugin" + }, + "configuration": { + "id": "app.components.LeftMenuLinkContainer.configuration", + "defaultMessage": "Configuration" + }, + "plugins": { + "id": "app.components.LeftMenuLinkContainer.plugins", + "defaultMessage": "Plugins" + }, + "general": { + "id": "app.components.LeftMenuLinkContainer.general", + "defaultMessage": "General" + } +} diff --git a/packages/strapi-admin/files/public/app/containers/ComingSoonPage/index.js b/packages/strapi-admin/files/public/app/containers/ComingSoonPage/index.js index cde05682b1..2e768f9f3a 100644 --- a/packages/strapi-admin/files/public/app/containers/ComingSoonPage/index.js +++ b/packages/strapi-admin/files/public/app/containers/ComingSoonPage/index.js @@ -8,7 +8,7 @@ import React from 'react'; import { connect } from 'react-redux'; import Helmet from 'react-helmet'; import { FormattedMessage } from 'react-intl'; -import messages from './messages'; +import messages from './messages.json'; import styles from './styles.scss'; export class ComingSoonPage extends React.Component { // eslint-disable-line react/prefer-stateless-function @@ -18,7 +18,7 @@ export class ComingSoonPage extends React.Component { // eslint-disable-line rea -

    +

    .

    ); } diff --git a/packages/strapi-admin/files/public/app/containers/ComingSoonPage/messages.js b/packages/strapi-admin/files/public/app/containers/ComingSoonPage/messages.js deleted file mode 100644 index f1207aee8c..0000000000 --- a/packages/strapi-admin/files/public/app/containers/ComingSoonPage/messages.js +++ /dev/null @@ -1,13 +0,0 @@ -/* - * ComingSoonPage Messages - * - * This contains all the text for the ComingSoonPage component. - */ -import { defineMessages } from 'react-intl'; - -export default defineMessages({ - header: { - id: 'app.containers.ComingSoonPage.header', - defaultMessage: 'Coming soon.', - }, -}); diff --git a/packages/strapi-admin/files/public/app/containers/ComingSoonPage/messages.json b/packages/strapi-admin/files/public/app/containers/ComingSoonPage/messages.json new file mode 100644 index 0000000000..0eebee7355 --- /dev/null +++ b/packages/strapi-admin/files/public/app/containers/ComingSoonPage/messages.json @@ -0,0 +1,6 @@ +{ + "comingSoon": { + "id": "app.components.ComingSoonPage.comingSoon", + "defaultMessage": "Coming soon" + } +} diff --git a/packages/strapi-admin/files/public/app/translations/en.json b/packages/strapi-admin/files/public/app/translations/en.json index b818de931d..b60f304c24 100644 --- a/packages/strapi-admin/files/public/app/translations/en.json +++ b/packages/strapi-admin/files/public/app/translations/en.json @@ -1,4 +1,10 @@ { - "app.components.LeftMenuFooter.poweredBy": "", + "app.components.ComingSoonPage.comingSoon": "Coming soon", + "app.components.LeftMenuFooter.poweredBy": "Proudly powered by", + "app.components.LeftMenuLinkContainer.configuration": "Configuration", + "app.components.LeftMenuLinkContainer.general": "General", + "app.components.LeftMenuLinkContainer.installNewPlugin": "Install new plugin", + "app.components.LeftMenuLinkContainer.listPlugins": "List plugins", + "app.components.LeftMenuLinkContainer.plugins": "Plugins", "app.components.NotFoundPage.description": "" -} \ No newline at end of file +} diff --git a/packages/strapi-admin/files/public/app/translations/fr.json b/packages/strapi-admin/files/public/app/translations/fr.json index 6799e05ab3..7cae710ab0 100644 --- a/packages/strapi-admin/files/public/app/translations/fr.json +++ b/packages/strapi-admin/files/public/app/translations/fr.json @@ -1,4 +1,10 @@ { + "app.components.ComingSoonPage.comingSoon": "Bientôt disponible", "app.components.LeftMenuFooter.poweredBy": "Propulsé par", + "app.components.LeftMenuLinkContainer.configuration": "Configuration", + "app.components.LeftMenuLinkContainer.general": "Général", + "app.components.LeftMenuLinkContainer.installNewPlugin": "Installer un nouveau plugin", + "app.components.LeftMenuLinkContainer.listPlugins": "Liste des plugins", + "app.components.LeftMenuLinkContainer.plugins": "Plugins", "app.components.NotFoundPage.description": "Page introuvable" -} \ No newline at end of file +}