diff --git a/package.json b/package.json index 1fd48de99..255df001d 100644 --- a/package.json +++ b/package.json @@ -241,4 +241,4 @@ ] } } -} +} \ No newline at end of file diff --git a/public/locales/fr/modules/weather.json b/public/locales/fr/modules/weather.json index 13ecb8367..4a6ab639a 100644 --- a/public/locales/fr/modules/weather.json +++ b/public/locales/fr/modules/weather.json @@ -40,4 +40,4 @@ } }, "error": "Une erreur s'est produite" -} +} \ No newline at end of file diff --git a/public/locales/hu/modules/weather.json b/public/locales/hu/modules/weather.json index 334619c16..21f4781b3 100644 --- a/public/locales/hu/modules/weather.json +++ b/public/locales/hu/modules/weather.json @@ -40,4 +40,4 @@ } }, "error": "Hiba történt" -} +} \ No newline at end of file diff --git a/public/locales/it/modules/weather.json b/public/locales/it/modules/weather.json index 35affd9d5..a677bb782 100644 --- a/public/locales/it/modules/weather.json +++ b/public/locales/it/modules/weather.json @@ -40,4 +40,4 @@ } }, "error": "Si è verificato un errore" -} +} \ No newline at end of file diff --git a/public/locales/lv/modules/weather.json b/public/locales/lv/modules/weather.json index 250996a34..96690ae63 100644 --- a/public/locales/lv/modules/weather.json +++ b/public/locales/lv/modules/weather.json @@ -40,4 +40,4 @@ } }, "error": "Radās kļūda" -} +} \ No newline at end of file diff --git a/public/locales/nl/modules/weather.json b/public/locales/nl/modules/weather.json index db73c565c..026b97b26 100644 --- a/public/locales/nl/modules/weather.json +++ b/public/locales/nl/modules/weather.json @@ -40,4 +40,4 @@ } }, "error": "Er is een fout opgetreden" -} +} \ No newline at end of file diff --git a/public/locales/no/modules/weather.json b/public/locales/no/modules/weather.json index 172ef645c..45f7b9d9d 100644 --- a/public/locales/no/modules/weather.json +++ b/public/locales/no/modules/weather.json @@ -40,4 +40,4 @@ } }, "error": "En feil oppstod" -} +} \ No newline at end of file diff --git a/public/locales/pt/modules/weather.json b/public/locales/pt/modules/weather.json index f2c3294dc..df8d043f1 100644 --- a/public/locales/pt/modules/weather.json +++ b/public/locales/pt/modules/weather.json @@ -40,4 +40,4 @@ } }, "error": "Ocorreu um erro" -} +} \ No newline at end of file diff --git a/public/locales/ru/modules/health-monitoring.json b/public/locales/ru/modules/health-monitoring.json index 244eda9ec..720834f33 100644 --- 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 index b82d593f7..cb86dcaee 100644 --- a/public/locales/sk/modules/weather.json +++ b/public/locales/sk/modules/weather.json @@ -40,4 +40,4 @@ } }, "error": "Vyskytla sa chyba" -} +} \ No newline at end of file diff --git a/public/locales/sv/modules/weather.json b/public/locales/sv/modules/weather.json index a22143aa8..4929a6ed0 100644 --- a/public/locales/sv/modules/weather.json +++ b/public/locales/sv/modules/weather.json @@ -40,4 +40,4 @@ } }, "error": "Ett fel uppstod" -} +} \ No newline at end of file diff --git a/public/locales/tw/modules/weather.json b/public/locales/tw/modules/weather.json index a4995b69f..a14c25360 100644 --- a/public/locales/tw/modules/weather.json +++ b/public/locales/tw/modules/weather.json @@ -40,4 +40,4 @@ } }, "error": "出現錯誤" -} +} \ No newline at end of file diff --git a/src/server/api/routers/health-monitoring/openmediavault.ts b/src/server/api/routers/health-monitoring/openmediavault.ts index 3a3991171..dbfb8f87a 100644 --- 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]; }