Merge remote-tracking branch 'origin/master' into fix/security-issues

EyeSeeTea · Aug 1, 2024 · 6ecd18a · 6ecd18a
2 parents 54fcc22 + d4f89fd
commit 6ecd18a
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 5 deletions.
diff --git a/i18n/en.pot b/i18n/en.pot
@@ -5,8 +5,8 @@ msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
-"POT-Creation-Date: 2023-09-18T13:40:05.079Z\n"
-"PO-Revision-Date: 2023-09-18T13:40:05.079Z\n"
+"POT-Creation-Date: 2024-06-26T10:58:19.149Z\n"
+"PO-Revision-Date: 2024-06-26T10:58:19.149Z\n"
 
 msgid "Add"
 msgstr ""
@@ -25,3 +25,6 @@ msgstr ""
 
 msgid "Detail page"
 msgstr ""
+
+msgid "Section"
+msgstr ""
diff --git a/i18n/es.po b/i18n/es.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: i18next-conv\n"
-"POT-Creation-Date: 2023-09-18T10:19:02.458Z\n"
+"POT-Creation-Date: 2024-06-26T10:58:19.149Z\n"
 "PO-Revision-Date: 2018-10-25T09:02:35.143Z\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -25,3 +25,6 @@ msgstr "Hola {{name}}"
 
 msgid "Detail page"
 msgstr ""
+
+msgid "Section"
+msgstr "Sección"
diff --git a/package.json b/package.json
@@ -104,7 +104,7 @@
         "build": "VITE_DHIS2_BASE_URL='' VITE_DHIS2_AUTH='' yarn build-folder && rm -f $npm_package_name.zip && cd build && zip --quiet -r ../$npm_package_name.zip *",
         "prettify": "prettier \"./**/*.{js,jsx,json,css,ts,tsx}\" --write",
         "extract-pot": "yarn d2-i18n-extract -p src/ -o i18n/",
-        "localize": "yarn update-po && d2-i18n-generate -n dhis2-skeleton-app -p ./i18n/ -o ./src/locales/",
+        "localize": "yarn update-po && d2-i18n-generate -n dhis2-app-skeleton -p ./i18n/ -o ./src/locales/",
         "update-po": "yarn extract-pot && find i18n/ -name '*.po' -exec msgmerge --backup=off -U {} i18n/en.pot \\;",
         "prepare": "husky install",
         "script-example": "npx ts-node src/scripts/example.ts"

diff --git a/src/webapp/pages/landing/LandingPage.tsx b/src/webapp/pages/landing/LandingPage.tsx
@@ -3,14 +3,15 @@ import React from "react";
 import { useHistory } from "react-router-dom";
 import { Card, CardGrid } from "$/webapp/components/card-grid/CardGrid";
 import { useAppContext } from "$/webapp/contexts/app-context";
+import i18n from "$/utils/i18n";
 
 export const LandingPage: React.FC = React.memo(() => {
     const history = useHistory();
     const { currentUser } = useAppContext();
 
     const cards: Card[] = [
         {
-            title: "Section",
+            title: i18n.t("Section"),
             key: "main",
             children: [
                 {