Merge branch 'master' of github.com:kromitgmbh/titra

kromitgmbh · Mar 18, 2024 · a096d37 · a096d37
2 parents 80befe8 + bacbde6
commit a096d37
Show file tree

Hide file tree

Showing 10 changed files with 482 additions and 1 deletion.
diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
@@ -15,8 +15,9 @@ jobs:
       - name: autotag
         id: autotag
         uses: butlerlogic/action-autotag@1.1.4
-        with:
+        env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
           strategy: package
           tag_message: ${{ github.event.head_commit.message }}
       - name: create_release

diff --git a/imports/ui/pages/settings.html b/imports/ui/pages/settings.html
@@ -117,6 +117,7 @@
             <option value="fr">{{t "settings.fr"}}</option>
             <option value="zh">{{t "settings.zh"}}</option>
             <option value="uk">{{t "settings.ukr"}}</option>
+			<option value="es">{{t "settings.es"}}</option>
         </select>
         <label class="form-label" for="theme">{{t "settings.language"}}</label>   
         </div> 

diff --git a/imports/ui/translations/de.json b/imports/ui/translations/de.json
@@ -140,6 +140,7 @@
     "zh": "Chinesisch",
     "ru": "Russisch",
     "ukr": "Ukrainisch",
+	"es": "Spanisch",
     "user_interface": "Benutzeroberfläche",
     "theme": "Thema",
     "auto_detect": "Automatisch",

diff --git a/imports/ui/translations/en.json b/imports/ui/translations/en.json
@@ -140,6 +140,7 @@
     "zh": "Chinese",
     "ru": "Russian",
     "ukr": "Ukrainian",
+	"es": "Spanish",
     "user_interface": "User interface",
     "theme": "Theme",
     "auto_detect": "Auto detect",

diff --git a/imports/ui/translations/es.json b/imports/ui/translations/es.json
diff --git a/imports/ui/translations/fr.json b/imports/ui/translations/fr.json
@@ -132,6 +132,7 @@
     "zh": "Chinois",
     "ru": "Russe",
     "ukr": "Ukrainien",
+	"es": "Espagnol",
     "user_interface": "Interface utilisateur",
     "theme": "Thème",
     "auto_detect": "Détection automatique",

diff --git a/imports/ui/translations/ru.json b/imports/ui/translations/ru.json
@@ -140,6 +140,7 @@
     "zh": "Китайский",
     "ru": "Русский",
     "ukr": "Украинский",
+	"es": "Испанский",
     "user_interface": "Пользовательский интерфейс",
     "theme": "Тема",
     "auto_detect": "Автоопределение",

diff --git a/imports/ui/translations/ukr.json b/imports/ui/translations/ukr.json
@@ -140,6 +140,7 @@
       "zh": "Китайська",
       "ru": "Російська",
       "ukr": "Українська",
+	  "es": "Іспанська",
       "user_interface": "Інтерфейс користувача",
       "theme": "Тема",
       "auto_detect": "Автоматичне визначення",

diff --git a/imports/ui/translations/zh.json b/imports/ui/translations/zh.json
@@ -124,6 +124,7 @@
     "zh": "中文",
     "ru": "俄语",
     "ukr": "乌克兰语",
+	"es": "西班牙语",
     "user_interface": "用户界面",
     "theme": "主题",
     "auto_detect": "自动探测",

diff --git a/imports/utils/i18n.js b/imports/utils/i18n.js
@@ -52,6 +52,8 @@ const loadLanguage = (language, i18nextDebugMode) => {
     import('dayjs/locale/ru')
     import('../ui/translations/uk.json')
     import('dayjs/locale/uk')
+	import('../ui/translations/es.json')
+    import('dayjs/locale/es')
   }
   import(`/imports/ui/translations/${language}.json`).then((lang) => {
     i18nReady.set(false)