Merge branch 'master' into dev

Meierschlumpf · Meierschlumpf · commit 0a08b8fb9bb5 · 2024-05-07T20:04:46.000+02:00
diff --git a/package.json b/package.json
@@ -241,4 +241,4 @@
       ]
     }
   }
-}
+}
diff --git a/public/locales/fr/modules/weather.json b/public/locales/fr/modules/weather.json
@@ -40,4 +40,4 @@
     }
   },
   "error": "Une erreur s'est produite"
-}
+}
diff --git a/public/locales/hu/modules/weather.json b/public/locales/hu/modules/weather.json
@@ -40,4 +40,4 @@
     }
   },
   "error": "Hiba történt"
-}
+}
diff --git a/public/locales/it/modules/weather.json b/public/locales/it/modules/weather.json
@@ -40,4 +40,4 @@
     }
   },
   "error": "Si è verificato un errore"
-}
+}
diff --git a/public/locales/lv/modules/weather.json b/public/locales/lv/modules/weather.json
@@ -40,4 +40,4 @@
     }
   },
   "error": "Radās kļūda"
-}
+}
diff --git a/public/locales/nl/modules/weather.json b/public/locales/nl/modules/weather.json
@@ -40,4 +40,4 @@
     }
   },
   "error": "Er is een fout opgetreden"
-}
+}
diff --git a/public/locales/no/modules/weather.json b/public/locales/no/modules/weather.json
@@ -40,4 +40,4 @@
     }
   },
   "error": "En feil oppstod"
-}
+}
diff --git a/public/locales/pt/modules/weather.json b/public/locales/pt/modules/weather.json
@@ -40,4 +40,4 @@
     }
   },
   "error": "Ocorreu um erro"
-}
+}
diff --git a/public/locales/ru/modules/health-monitoring.json b/public/locales/ru/modules/health-monitoring.json
@@ -1,11 +1,11 @@
 {
   "descriptor": {
     "name": "Мониторинг состояния системы",
-    "description": "",
+    "description": "Информация о вашем NAS",
     "settings": {
       "title": "",
       "fahrenheit": {
-        "label": ""
+        "label": "По Фаренгейту"
       },
       "cpu": {
         "label": "",
@@ -87,13 +87,13 @@
   "info": {
     "uptime": "Время работы",
     "uptimeFormat": "",
-    "updates": "",
+    "updates": "Обновления",
     "reboot": "Перезагрузка"
   },
   "errors": {
     "general": {
-      "title": "",
-      "text": ""
+      "title": "Не удалось найти ваш NAS",
+      "text": "Проблема с подключением к вашему NAS. Пожалуйста, проверьте свою конфигурацию/интеграцию."
     }
   },
   "headings": {
diff --git a/public/locales/sk/modules/weather.json b/public/locales/sk/modules/weather.json
@@ -40,4 +40,4 @@
     }
   },
   "error": "Vyskytla sa chyba"
-}
+}
diff --git a/public/locales/sv/modules/weather.json b/public/locales/sv/modules/weather.json
@@ -40,4 +40,4 @@
     }
   },
   "error": "Ett fel uppstod"
-}
+}
diff --git a/public/locales/tw/modules/weather.json b/public/locales/tw/modules/weather.json
@@ -40,4 +40,4 @@
     }
   },
   "error": "出現錯誤"
-}
+}
diff --git a/src/server/api/routers/health-monitoring/openmediavault.ts b/src/server/api/routers/health-monitoring/openmediavault.ts
@@ -67,11 +67,18 @@ export async function makeOpenMediaVaultCalls(app: ConfigAppType, input: any) {
     } else {
       const cookies = authResponse.headers['set-cookie'] || [];
       sessionId = cookies
-        .find((cookie: any) => cookie.includes('X-OPENMEDIAVAULT-SESSIONID'))
+        .find(
+          (cookie: any) =>
+            cookie.includes('X-OPENMEDIAVAULT-SESSIONID') ||
+            cookie.includes('OPENMEDIAVAULT-SESSIONID')
+        )
         ?.split(';')[0];
 
       loginToken = cookies
-        .find((cookie: any) => cookie.includes('X-OPENMEDIAVAULT-LOGIN'))
+        .find(
+          (cookie: any) =>
+            cookie.includes('X-OPENMEDIAVAULT-LOGIN') || cookie.includes('OPENMEDIAVAULT-LOGIN')
+        )
         ?.split(';')[0];
     }
 

Original file line number	Diff line number	Diff line change
`@@ -241,4 +241,4 @@`
`241`	`241`	`]`
`242`	`242`	`}`
`243`	`243`	`}`
`244`		`-}`
	`244`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -40,4 +40,4 @@`
`40`	`40`	`}`
`41`	`41`	`},`
`42`	`42`	`"error": "Une erreur s'est produite"`
`43`		`-}`
	`43`	`+}`