Merge branch 'main' into parent-location-sync

sysadminsmedia · Nov 3, 2024 · daf07d4 · daf07d4
2 parents ae76538 + 744d8d6
commit daf07d4
Show file tree

Hide file tree

Showing 6 changed files with 89 additions and 10 deletions.
diff --git a/docs/.vitepress/config.mts b/docs/.vitepress/config.mts
@@ -41,7 +41,7 @@ export default defineConfig({
     },
     // https://vitepress.dev/reference/default-theme-config
     nav: [
-      { text: 'API', link: 'https://redocly.github.io/redoc/?url=https://raw.githubusercontent.com/sysadminsmedia/homebox/main/docs/docs/api/openapi-2.0.json' },
+      { text: 'API Docs', link: '/en/api' },
       { text: 'Demo', link: 'https://demo.homebox.software' },
     ],
 

diff --git a/docs/en/api.md b/docs/en/api.md
@@ -0,0 +1,37 @@
+---
+layout: page
+sidebar: false
+---
+
+<script setup lang="ts">
+import { useData } from 'vitepress';
+
+const elementScript = document.createElement('script');
+elementScript.src = 'https://unpkg.com/@stoplight/elements/web-components.min.js';
+document.head.appendChild(elementScript);
+
+const elementStyle = document.createElement('link');
+elementStyle.rel = 'stylesheet';
+elementStyle.href = 'https://unpkg.com/@stoplight/elements/styles.min.css';
+document.head.appendChild(elementStyle);
+
+const { isDark } = useData();
+let theme = 'light';
+if (isDark.value) {
+  theme = 'dark';
+}
+</script>
+
+<style>
+.TryItPanel {
+   display: none;
+}
+</style>
+
+<elements-api
+apiDescriptionUrl="https://cdn.jsdelivr.net/gh/sysadminsmedia/homebox@main/docs/docs/api/openapi-2.0.json"
+router="hash"
+layout="responsive"
+hideSchemas="true"
+:data-theme="theme"
+/>
diff --git a/frontend/locales/en.json b/frontend/locales/en.json
@@ -225,6 +225,10 @@
         "zh-MO": "Chinese (Macau)",
         "zh-TW": "Chinese (Traditional)"
     },
+    "languages.da-DK": "Danish",
+    "languages.fi.FI": "Finnish",
+    "languages.ro-RO": "Romanian",
+    "languages.sk-SK": "Slovak",
     "locations": {
         "child_locations": "Child Locations",
         "collapse_tree": "Collapse Tree",

diff --git a/frontend/locales/fr.json b/frontend/locales/fr.json
@@ -9,6 +9,30 @@
             }
         },
         "global": {
+            "date_time": {
+                "ago": "Il y a {0}",
+                "days": "jours",
+                "hour": "heure",
+                "hours": "heures",
+                "in": "autour de {0}",
+                "just-now": "juste maintenant",
+                "last-month": "Le mois précédent",
+                "last-week": "la semaine dernière",
+                "last-year": "l'année dernière",
+                "minute": "minute",
+                "minutes": "minutes",
+                "months": "mois",
+                "next-month": "Le mois prochain",
+                "next-week": "la semaine prochaine",
+                "next-year": "l'année prochaine",
+                "second": "seconde",
+                "seconds": "secondes",
+                "tomorrow": "demain",
+                "week": "semaine",
+                "weeks": "semaines",
+                "years": "années",
+                "yesterday": "hier"
+            },
             "page_qr_code": {
                 "page_url": "URL de la page"
             },
@@ -18,6 +42,8 @@
         },
         "item": {
             "create_modal": {
+                "item_description": "Description de l'article",
+                "item_name": "Nom de l'article",
                 "photo_button": "Photo 📷",
                 "title": "Créer un article"
             },
@@ -27,25 +53,36 @@
                     "items": "Articles",
                     "no_items": "Pas d'articles à afficher",
                     "table": "Tableau"
+                },
+                "table": {
+                    "page": "Page",
+                    "rows_per_page": "Lignes par page"
                 }
             }
         },
         "label": {
             "create_modal": {
+                "label_description": "Description de l'étiquette",
+                "label_name": "Nom de l'étiquette",
                 "title": "Créer une étiquette"
             }
         },
         "location": {
             "create_modal": {
+                "location_description": "Description de l'emplacement",
+                "location_name": "Nom de l'emplacement",
                 "title": "Créer un emplacement"
             },
+            "selector": {
+                "parent_location": "Emplacement parent"
+            },
             "tree": {
-                "no_locations": "Aucun emplacement disponible. Ajoutez votre premiers emplacements avec\nle bouton `<`span class=\"link-primary\"`>`Créer`<`/span`>` dans la barre de navigation."
+                "no_locations": "Aucun emplacement disponible. Ajoutez votre premier emplacement avec\nle bouton `<`span class=\"link-primary\"`>`Créer`<`/span`>` dans la barre de navigation."
             }
         }
     },
     "global": {
-        "build": "Assemblage : { build }",
+        "build": "Version : { build }",
         "confirm": "Confirmer",
         "create": "Créer",
         "create_and_add": "Créer et en ajouter un autre",

diff --git a/frontend/locales/nl.json b/frontend/locales/nl.json
@@ -70,7 +70,7 @@
         "location": {
             "create_modal": {
                 "location_description": "Locatie omschrijving",
-                "location_name": "Locatie",
+                "location_name": "Locatie Naam",
                 "title": "Maak locatie"
             },
             "selector": {
@@ -289,7 +289,7 @@
         "example": "Voorbeeld",
         "gen_invite": "Genereer Uitnodigingslink",
         "group_settings": "Groeps Instellingen",
-        "group_settings_sub": "Gedeelde groepsinstellingen. Het kan zijn dat je je browser moet verversen om alle instellingen te zien werken.",
+        "group_settings_sub": "Gedeelde groepsinstellingen. Het kan zijn dat je de browser moet verversen om alle instellingen te zien werken.",
         "inactive": "Inactief",
         "language": "Taal",
         "new_password": "Nieuw Wachtwoord",
@@ -299,7 +299,7 @@
         "notifiers_sub": "Krijg notificaties voor opkomende onderhouds herinneringen",
         "test": "Test",
         "theme_settings": "Theme instellingen",
-        "theme_settings_sub": "Thema-instellingen worden opgeslagen in de lokale opslag van uw browser. Je kan deze wijzigen op elk moment. \nAls je problemen hebt met de instellingen kun je je browser verversen.",
+        "theme_settings_sub": "Thema-instellingen worden opgeslagen in de lokale opslag van uw browser. Je kan deze wijzigen op elk moment. \nAls je problemen hebt met de instellingen kun je de browser verversen.",
         "update_group": "Groep bijwerken",
         "update_language": "Taal bijwerken",
         "url": "URL",

diff --git a/frontend/pages/tools.vue b/frontend/pages/tools.vue
@@ -40,7 +40,7 @@
           <DetailAction @action="modals.import = true">
             <template #title> {{ $t("tools.import_export_set.import") }} </template>
             <!-- eslint-disable-next-line vue/no-v-html -->
-            <div v-html="$t('tools.import_export_set.import_sub')"></div>
+            <div v-html="DOMPurify.sanitize($t('tools.import_export_set.import_sub'))"></div>
             <template #button> {{ $t("tools.import_export_set.import_button") }} </template>
           </DetailAction>
           <DetailAction @action="getExportCSV()">
@@ -57,7 +57,7 @@
             <span> {{ $t("tools.actions") }} </span>
             <template #description>
               <!-- eslint-disable-next-line vue/no-v-html -->
-              <div v-html="$t('tools.actions_sub')"></div>
+              <div v-html="DOMPurify.sanitize($t('tools.actions_sub'))"></div>
             </template>
           </BaseSectionHeader>
         </template>
@@ -75,13 +75,13 @@
           <DetailAction @action="resetItemDateTimes">
             <template #title> {{ $t("tools.actions_set.zero_datetimes") }} </template>
             <!-- eslint-disable-next-line vue/no-v-html -->
-            <div v-html="$t('tools.actions_set.zero_datetimes_sub')"></div>
+            <div v-html="DOMPurify.sanitize($t('tools.actions_set.zero_datetimes_sub'))"></div>
             <template #button> {{ $t("tools.actions_set.zero_datetimes_button") }} </template>
           </DetailAction>
           <DetailAction @action="setPrimaryPhotos">
             <template #title> {{ $t("tools.actions_set.set_primary_photo") }} </template>
             <!-- eslint-disable-next-line vue/no-v-html -->
-            <div v-html="$t('tools.actions_set.set_primary_photo_sub')"></div>
+            <div v-html="DOMPurify.sanitize($t('tools.actions_set.set_primary_photo_sub'))"></div>
             <template #button> {{ $t("tools.actions_set.set_primary_photo_button") }} </template>
           </DetailAction>
         </div>
@@ -91,6 +91,7 @@
 </template>
 
 <script setup lang="ts">
+  import DOMPurify from "dompurify";
   import MdiFileChart from "~icons/mdi/file-chart";
   import MdiArrowRight from "~icons/mdi/arrow-right";
   import MdiDatabase from "~icons/mdi/database";