From 6401a9237134a56055a2323080076538ed196e63 Mon Sep 17 00:00:00 2001 From: Marcello Vitali-Rosati Date: Wed, 29 Nov 2023 18:07:11 +0100 Subject: [PATCH 1/4] traduction by --- front/src/components/Write/Versions.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/front/src/components/Write/Versions.jsx b/front/src/components/Write/Versions.jsx index f321c315a..3c9178819 100644 --- a/front/src/components/Write/Versions.jsx +++ b/front/src/components/Write/Versions.jsx @@ -84,7 +84,7 @@ function Version ({ articleId, compareTo, readOnly, selectedVersion, v }) { {!renaming &&

{v.owner && ( - by {v.owner.displayName || v.owner.username} + {t('article.by.text')} {v.owner.displayName || v.owner.username} )} From 805747cddec4b3bfebd173e6d990f36751b493f1 Mon Sep 17 00:00:00 2001 From: Marcello Vitali-Rosati Date: Wed, 29 Nov 2023 18:19:42 +0100 Subject: [PATCH 2/4] dans un span --- front/src/components/Write/Versions.jsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/front/src/components/Write/Versions.jsx b/front/src/components/Write/Versions.jsx index 3c9178819..f258cf13f 100644 --- a/front/src/components/Write/Versions.jsx +++ b/front/src/components/Write/Versions.jsx @@ -83,8 +83,8 @@ function Version ({ articleId, compareTo, readOnly, selectedVersion, v }) { {!renaming &&

{v.owner && ( - - {t('article.by.text')} {v.owner.displayName || v.owner.username} + + {t('article.by.text')} {v.owner.displayName || v.owner.username} )} From e121cfcef16b4e30c3642d34ce4eb6f3d24a1dc6 Mon Sep 17 00:00:00 2001 From: Marcello Vitali-Rosati Date: Wed, 29 Nov 2023 18:35:35 +0100 Subject: [PATCH 3/4] nouvel essai --- front/src/components/Write/Versions.jsx | 2 +- front/src/components/Write/WorkingVersion.jsx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/front/src/components/Write/Versions.jsx b/front/src/components/Write/Versions.jsx index f258cf13f..049579447 100644 --- a/front/src/components/Write/Versions.jsx +++ b/front/src/components/Write/Versions.jsx @@ -84,7 +84,7 @@ function Version ({ articleId, compareTo, readOnly, selectedVersion, v }) { {!renaming &&

{v.owner && ( - {t('article.by.text')} {v.owner.displayName || v.owner.username} + {t('article.by.text')} {v.owner.displayName || v.owner.username} )} diff --git a/front/src/components/Write/WorkingVersion.jsx b/front/src/components/Write/WorkingVersion.jsx index d2d8912fa..aa4013e1b 100644 --- a/front/src/components/Write/WorkingVersion.jsx +++ b/front/src/components/Write/WorkingVersion.jsx @@ -128,7 +128,7 @@ export default function WorkingVersion ({ articleInfos, live, selectedVersion, m

    -
  • by {articleOwnerAndContributors.join(', ')}
    • +
  • {t('article.by.text')} {articleOwnerAndContributors.join(', ')}
    • From c005c7c434dd4dabc97946192565f58e25b28b62 Mon Sep 17 00:00:00 2001 From: RochDLY Date: Thu, 30 Nov 2023 16:20:03 +0100 Subject: [PATCH 4/4] interface en-fr: try to fix errors in workingVersion.jsx and Versions.jsx - translation by/par --- front/src/components/Write/Versions.jsx | 6 +++--- front/src/components/Write/WorkingVersion.jsx | 2 +- front/src/locales/en/translation.json | 5 +++-- front/src/locales/fr/translation.json | 5 +++-- 4 files changed, 10 insertions(+), 8 deletions(-) diff --git a/front/src/components/Write/Versions.jsx b/front/src/components/Write/Versions.jsx index 049579447..cb3ac1496 100644 --- a/front/src/components/Write/Versions.jsx +++ b/front/src/components/Write/Versions.jsx @@ -83,9 +83,9 @@ function Version ({ articleId, compareTo, readOnly, selectedVersion, v }) { {!renaming &&

    {v.owner && ( - - {t('article.by.text')} {v.owner.displayName || v.owner.username} - + + {t('article.by.text', {owner: v.owner.displayName || v.owner.username})} + )} diff --git a/front/src/components/Write/WorkingVersion.jsx b/front/src/components/Write/WorkingVersion.jsx index aa4013e1b..d488e0fdb 100644 --- a/front/src/components/Write/WorkingVersion.jsx +++ b/front/src/components/Write/WorkingVersion.jsx @@ -128,7 +128,7 @@ export default function WorkingVersion ({ articleInfos, live, selectedVersion, m

      -
    • {t('article.by.text')} {articleOwnerAndContributors.join(', ')}
      • +
    • {t('workingVersion.by.text')} {articleOwnerAndContributors.join(', ')}
      • diff --git a/front/src/locales/en/translation.json b/front/src/locales/en/translation.json index 9c19d844b..2e5458887 100644 --- a/front/src/locales/en/translation.json +++ b/front/src/locales/en/translation.json @@ -35,7 +35,7 @@ "article.versions.title": "Versions", "article.workspaces.title": "Workspaces", "article.tags.title": "Tags", - "article.by.text": "by", + "article.by.text": "by {{owner}}", "article.deleteModal.title": "Delete an article", "article.deleteModal.confirmMessage": "Are you sure you want to delete this article?", "article.deleteModal.contributorsRemovalNote": "If you delete this article, contributors won't have access to this article anymore.", @@ -89,5 +89,6 @@ "workspace.createForm.descriptionField": "Description", "workspace.createForm.colorField": "Color", "workspace.createForm.buttonTitle": "Create a new workspace", - "workspace.createForm.buttonText": "Create" + "workspace.createForm.buttonText": "Create", + "workingVersion.by.text": "by" } diff --git a/front/src/locales/fr/translation.json b/front/src/locales/fr/translation.json index aa5b5bef7..7b6221d53 100644 --- a/front/src/locales/fr/translation.json +++ b/front/src/locales/fr/translation.json @@ -35,7 +35,7 @@ "article.versions.title": "Versions", "article.workspaces.title": "Espaces de travail", "article.tags.title": "Étiquettes", - "article.by.text": "par", + "article.by.text": "par {{owner}}", "article.deleteModal.title": "Supprimer un article", "article.deleteModal.confirmMessage": "Êtes-vous sûr de vouloir supprimer cet article ?", "article.deleteModal.contributorsRemovalNote": "Si vous supprimez cet article, les contributeurs ne pourront plus accéder à celui-ci.", @@ -87,5 +87,6 @@ "workspace.createForm.descriptionField": "Description", "workspace.createForm.colorField": "Couleur", "workspace.createForm.buttonTitle": "Créer un nouvel espace de travail", - "workspace.createForm.buttonText": "Créer" + "workspace.createForm.buttonText": "Créer", + "workingVersion.by.text": "par" }