Merge remote-tracking branch 'origin/develop' into develop

mainsail-crew · Aug 27, 2024 · b8a9fbf · b8a9fbf
2 parents e044745 + cc584c0
commit b8a9fbf
Show file tree

Hide file tree

Showing 11 changed files with 34 additions and 14 deletions.
diff --git a/.prettierrc b/.prettierrc
@@ -18,6 +18,14 @@
             "options": {
                 "tabWidth": 2
             }
+        },
+        {
+            "files": "src/locales/*.json",
+            "options": {
+                "plugins": ["prettier-plugin-sort-json"],
+                "jsonRecursiveSort": true,
+                "jsonSortOrder": "{ \"placeThisFirst\": null, \"/^[a-zA-Z0-9]/\": \"caseInsensitiveNumeric\"  }"
+            }
         }
     ]
 }
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -90,7 +90,8 @@
         "eslint-plugin-vue": "^9.0.0",
         "postcss": "^8.4.31",
         "postcss-nesting": "^12.0.1",
-        "prettier": "^3.0.0",
+        "prettier": "^3.3.3",
+        "prettier-plugin-sort-json": "^4.0.0",
         "sass": "~1.32",
         "start-server-and-test": "^2.0.5",
         "typescript": "^4.5.5",

diff --git a/src/components/panels/Status/ExcludeObjectDialogMap.vue b/src/components/panels/Status/ExcludeObjectDialogMap.vue
@@ -62,8 +62,8 @@
                         hoverName === object.name
                             ? primaryColor
                             : excluded_objects.includes(object.name)
-                            ? '#6668'
-                            : '#bbb'
+                              ? '#6668'
+                              : '#bbb'
                     "
                     @mouseover="showObjectTooltip(object.name)"
                     @mouseout="hideObjectTooltip"

diff --git a/src/locales/da.json b/src/locales/da.json
@@ -990,7 +990,6 @@
             "DbHistoryTotals": "Totalhistorik",
             "DbMaintenance": "Vedligeholdelse",
             "DbNavigation": "Navigation",
-            "DBNavigation": "Navigation",
             "DbTimelapseSettings": "Timelapse indstillinger",
             "DbView": "Vis indstillinger",
             "EstimateValues": {

diff --git a/src/locales/es.json b/src/locales/es.json
@@ -1001,7 +1001,6 @@
             "DbHistoryTotals": "Historial Totales",
             "DbMaintenance": "Mantenimiento",
             "DbNavigation": "Navegación",
-            "DBNavigation": "Navegación",
             "DbTimelapseSettings": "Ajustes de Timelapse",
             "DbView": "Ajustes de Vista",
             "DbWebcams": "Cámaras web",

diff --git a/src/locales/fr.json b/src/locales/fr.json
@@ -931,7 +931,7 @@
             "DbConsoleHistory": "Historique de la console",
             "DbHistoryJobs": "Historique des travaux",
             "DbHistoryTotals": "Historique Totaux",
-            "DBNavigation": "Navigation",
+            "DbNavigation": "Navigation",
             "DbTimelapseSettings": "Réglages Timelapse",
             "DbView": "Voir les paramètres",
             "EstimateValues": {

diff --git a/src/locales/it.json b/src/locales/it.json
@@ -922,7 +922,7 @@
             "DbConsoleHistory": "Cronologia Console",
             "DbHistoryJobs": "Cronologia Lavori",
             "DbHistoryTotals": "Cronologia Totali",
-            "DBNavigation": "Navigazione",
+            "DbNavigation": "Navigazione",
             "DbTimelapseSettings": "Impostazioni Timelapse",
             "DbView": "Vedi Impostazioni ",
             "EstimateValues": {

diff --git a/src/locales/pl.json b/src/locales/pl.json
@@ -906,7 +906,7 @@
             "DbConsoleHistory": "Historia Konsoli",
             "DbHistoryJobs": "Historia wydruków",
             "DbHistoryTotals": "Łączna historia",
-            "DBNavigation": "Nawigacja",
+            "DbNavigation": "Nawigacja",
             "DbTimelapseSettings": "Ustawienia timelapse",
             "DbView": "Ustawienia",
             "EstimateValues": {

diff --git a/src/locales/ru.json b/src/locales/ru.json
@@ -944,7 +944,7 @@
             "DbConsoleHistory": "История консоли",
             "DbHistoryJobs": "История заданий",
             "DbHistoryTotals": "Всего заданий",
-            "DBNavigation": "Навигация",
+            "DbNavigation": "Навигация",
             "DbTimelapseSettings": "Настройки таймлапса",
             "DbView": "Настройки отображения",
             "EstimateValues": {

diff --git a/src/locales/se.json b/src/locales/se.json
@@ -922,7 +922,7 @@
             "DbConsoleHistory": "Konsolhistorik",
             "DbHistoryJobs": "Jobbhistorik",
             "DbHistoryTotals": "Historik totalt",
-            "DBNavigation": "Navigering",
+            "DbNavigation": "Navigering",
             "DbTimelapseSettings": "Timelapse inställningar",
             "DbView": "Visa inställningar",
             "EstimateValues": {