update translation

celluloid-camp · Oct 23, 2023 · 3c01fe6 · 3c01fe6
1 parent b9aaaa1
commit 3c01fe6
Show file tree

Hide file tree

Showing 8 changed files with 44 additions and 28 deletions.
diff --git a/apps/frontend/src/components/Footer.tsx b/apps/frontend/src/components/Footer.tsx
@@ -80,9 +80,14 @@ export const Footer: React.FC<FooterProps> = (props) => (
               color="white"
               textAlign={{ lg: "left", sm: "center" }}
             >
-              <Trans i18nKey={"footer.copyright"} />{" "}
-              {!import.meta.env.VITE_VERSION ??
-                `version: ${import.meta.env.VITE_VERSION}`}
+              <Trans i18nKey={"footer.copyright"}>
+                <Link
+                  href="https://creativecommons.org/licenses/by-nc/2.0/fr/"
+                  target="_blank"
+                  rel="noreferrer"
+                  sx={{ color: "white" }}
+                />
+              </Trans>
             </Typography>
           </Box>
         </Grid>

diff --git a/apps/frontend/src/locales/en/common.json b/apps/frontend/src/locales/en/common.json
diff --git a/apps/frontend/src/locales/fr/common.json b/apps/frontend/src/locales/fr/common.json
diff --git a/apps/frontend/src/pages/about.tsx b/apps/frontend/src/pages/about.tsx
@@ -1,4 +1,4 @@
-import { Box, Grid, Typography } from "@mui/material";
+import { Box, Grid, Link, Typography } from "@mui/material";
 import * as React from "react";
 import { Trans, useTranslation } from "react-i18next";
 
@@ -25,15 +25,31 @@ export const About: React.FC = () => {
         {t("about.title")}
       </Typography>
       <Typography variant="subtitle1" gutterBottom={true}>
-        {t("about.intro.prefix")}
-        <b>Celluloid</b>
-        {t("about.intro.suffix")}
+        <Trans i18nKey={"about.intro"}>
+          <b></b>
+          <Link
+            href="https://www.huma-num.fr/les-consortiums-hn/"
+            target="_blank"
+            rel="noreferrer"
+          />
+        </Trans>
       </Typography>
       <Typography variant="subtitle1" gutterBottom={true}>
         {t("about.support")}
       </Typography>
       <Typography variant="subtitle1" gutterBottom={true} pt={1}>
-        {t("about.opensource.prefix")}
+        <Trans i18nKey={"about.opensource.prefix"}>
+          <Link
+            href="https://canevas.hypotheses.org/a-propos"
+            target="_blank"
+            rel="noreferrer"
+          />
+          <Link
+            href="https://www.mshparisnord.fr/programmes/consortium-humanum-cannevas/"
+            target="_blank"
+            rel="noreferrer"
+          />
+        </Trans>
       </Typography>
 
       <Trans i18nKey="about.opensource.github" pt={2}>

diff --git a/apps/frontend/src/pages/home.tsx b/apps/frontend/src/pages/home.tsx
@@ -15,10 +15,8 @@ import * as React from "react";
 import { Suspense } from "react";
 import { ErrorBoundary } from "react-error-boundary";
 import { Trans, useTranslation } from "react-i18next";
-import { useDispatch } from "react-redux";
 import { useLocation, useNavigate } from "react-router-dom";
 
-import { openStudentSignup } from "~actions/Signin";
 import { ProjectGrid } from "~components/home/ProjectGrid";
 import { LogoSign } from "~components/LogoSign";
 import { StudentsIcon } from "~components/StudentsIcon";
@@ -79,7 +77,13 @@ export const HomePage: React.FC = () => {
                     {t("home.tutoriel.title")}
                   </Typography>
                   <Typography variant="subtitle1" gutterBottom={true}>
-                    {t("home.tutoriel.description")}
+                    <Trans i18nKey={"home.tutoriel.description"}>
+                      <Link
+                        href="https://joinpeertube.org/fr_FR"
+                        target="_blank"
+                        rel="noreferrer"
+                      />
+                    </Trans>
                   </Typography>
                   <Typography
                     variant="h6"
@@ -91,14 +95,11 @@ export const HomePage: React.FC = () => {
 
                   <Typography variant="subtitle1" gutterBottom={true}>
                     <Trans i18nKey={"home.tutoriel.link"}>
-                      default
                       <Link
                         href="https://canevas.hypotheses.org/560"
                         target="_blank"
                         rel="noreferrer"
-                      >
-                        https://canevas.hypotheses.org/560
-                      </Link>
+                      />
                     </Trans>
                   </Typography>
                 </Box>

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -12,8 +12,8 @@ services:
   postgres:
     image: postgres:13
     environment:
-      POSTGRES_USER: ${POSTGRES_USER}
-      POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
+      POSTGRES_USER: postgres
+      POSTGRES_PASSWORD: root
       POSTGRES_MULTIPLE_DATABASES: celluloid, keycloak
     volumes:
       - ./.data:/var/lib/postgresql/data
@@ -33,8 +33,8 @@ services:
     environment:
       - DUMPPREFIX=PG
       - POSTGRES_HOST=postgres
-      - POSTGRES_USER=${POSTGRES_USER}
-      - POSTGRES_PASS=${POSTGRES_PASSWORD}
+      - POSTGRES_USER=POSTGRES_USER
+      - POSTGRES_PASS=root
       - POSTGRES_PORT=5432
       - DBLIST=celluloid
       - ARCHIVE_FILENAME=latest

diff --git a/package.json b/package.json
@@ -14,7 +14,7 @@
     "dev": "dotenv -- turbo run dev --parallel",
     "clean": "for package in $(ls packages); do (cd packages/${package} && yarn clean); done",
     "build": "turbo run build --no-cache",
-    "i18n:sync": "yarn workspace translations sync",
+    "i18n:sync": "yarn workspace @celluloid/i18n sync",
     "database:migrate": "./scripts/docker-bootstrap.sh admin",
     "eslint": "eslint --ext .js,.jsx,.ts,.tsx",
     "prepare": "husky install",

diff --git a/sample.env b/sample.env
@@ -19,12 +19,6 @@ SMTP_TLS=false
 # Port number for the SMTP server
 SMTP_PORT=465
 
-# Postgres database settings
-# User for the Postgres database
-POSTGRES_USER=postgres
-# Password for the Postgres database
-POSTGRES_PASSWORD=root
-
 # URLs for services
 # Connection URL for the Postgres database
 DATABASE_URL=