From 3c0d9fc5998af530b30944a2be87a41fb3af8580 Mon Sep 17 00:00:00 2001 From: th33xitus Date: Sat, 8 Oct 2022 23:43:35 +0200 Subject: [PATCH 1/7] refactor: disable 'save webcam' button if field 'name' is empty Signed-off-by: Dominik Willner --- src/components/settings/SettingsWebcamsTab.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/settings/SettingsWebcamsTab.vue b/src/components/settings/SettingsWebcamsTab.vue index 51dfbf611..2b8e82374 100644 --- a/src/components/settings/SettingsWebcamsTab.vue +++ b/src/components/settings/SettingsWebcamsTab.vue @@ -193,7 +193,7 @@ {{ $t('Settings.Cancel') }} - + {{ form.id === null ? $t('Settings.WebcamsTab.SaveWebcam') From 2197caf094fb45752246ab77415cb1732d8b1926 Mon Sep 17 00:00:00 2001 From: th33xitus Date: Sun, 9 Oct 2022 00:40:09 +0200 Subject: [PATCH 2/7] refactor: improve layout Signed-off-by: Dominik Willner --- .../settings/SettingsWebcamsTab.vue | 21 ++++++++++++------- src/locales/en.json | 5 +++-- 2 files changed, 16 insertions(+), 10 deletions(-) diff --git a/src/components/settings/SettingsWebcamsTab.vue b/src/components/settings/SettingsWebcamsTab.vue index 2b8e82374..6fceacbc1 100644 --- a/src/components/settings/SettingsWebcamsTab.vue +++ b/src/components/settings/SettingsWebcamsTab.vue @@ -150,21 +150,26 @@ - + +
+ {{ $t('Settings.WebcamsTab.FlipWebcam') }} +
+ + + + + hide-details + :label="$t('Settings.WebcamsTab.Horizontally')" /> - - - + + hide-details + :label="$t('Settings.WebcamsTab.Vertically')" /> diff --git a/src/locales/en.json b/src/locales/en.json index 5e12033a4..61244fa07 100644 --- a/src/locales/en.json +++ b/src/locales/en.json @@ -959,8 +959,9 @@ "CreateWebcam": "Create Webcam", "EditCrowsnestConf": "Edit crowsnest.conf", "EditWebcam": "Edit Webcam", - "FlipHorizontally": "Flip webcam horizontally", - "FlipVertically": "Flip webcam vertically", + "FlipWebcam": "Flip webcam image:", + "Horizontally": "horizontally", + "Vertically": "vertically", "IconBed": "Bed", "IconCam": "Cam", "IconDoor": "Door", From c8b9bd3cfe2f8600a36452c716af1859ff2ede8f Mon Sep 17 00:00:00 2001 From: th33xitus Date: Sun, 9 Oct 2022 00:40:59 +0200 Subject: [PATCH 3/7] locales: translate new keys the majority of the keys were translated with the help of online translators Signed-off-by: Dominik Willner --- src/locales/da.json | 5 +++-- src/locales/de.json | 5 +++-- src/locales/es.json | 5 +++-- src/locales/fr.json | 5 +++-- src/locales/hu.json | 5 +++-- src/locales/it.json | 5 +++-- src/locales/ja.json | 2 -- src/locales/ko.json | 2 -- src/locales/nl.json | 5 +++-- src/locales/pl.json | 5 +++-- src/locales/ru.json | 5 +++-- src/locales/sv.json | 5 +++-- src/locales/tr.json | 5 +++-- src/locales/uk.json | 5 +++-- src/locales/zh.json | 2 -- src/locales/zh_TW.json | 2 -- 16 files changed, 36 insertions(+), 32 deletions(-) diff --git a/src/locales/da.json b/src/locales/da.json index cc5256b83..ce648508b 100644 --- a/src/locales/da.json +++ b/src/locales/da.json @@ -947,8 +947,9 @@ "AddWebcam": "Tilføj webcam", "CreateWebcam": "Nyt Webcam", "EditWebcam": "Rediger Webcam", - "FlipHorizontally": "Vend webcam horisontalt", - "FlipVertically": "Vend webcam vertikalt", + "FlipWebcam": "Vend webcam-billedet:", + "Horizontally": "horisontalt", + "Vertically": "vertikalt", "IconBed": "Bed", "IconCam": "Kamera", "IconDoor": "Dør", diff --git a/src/locales/de.json b/src/locales/de.json index 38d436213..4f5536c36 100644 --- a/src/locales/de.json +++ b/src/locales/de.json @@ -959,8 +959,9 @@ "CreateWebcam": "Erstelle Webcam", "EditCrowsnestConf": "crowsnest.conf bearbeiten", "EditWebcam": "Webcam bearbeiten", - "FlipHorizontally": "Webcam waagerecht spiegeln", - "FlipVertically": "Webcam vertikal spiegeln", + "FlipWebcam": "Webcam-Bild spiegeln:", + "Horizontally": "horizontal", + "Vertically": "vertikal", "IconBed": "Bett", "IconCam": "Kamera", "IconDoor": "Tür", diff --git a/src/locales/es.json b/src/locales/es.json index 6be1eb4d1..7e98e3bd4 100644 --- a/src/locales/es.json +++ b/src/locales/es.json @@ -928,8 +928,9 @@ "AddWebcam": "Agregar cámara web", "CreateWebcam": "Crear cámara web", "EditWebcam": "Editar cámara web", - "FlipHorizontally": "Voltear horizontalmente", - "FlipVertically": "Voltear verticalmente", + "FlipWebcam": "Voltear la imagen de la cámara web:", + "Horizontally": "horizontalmente", + "Vertically": "verticalmente", "IconBed": "Cama", "IconCam": "Cámara", "IconDoor": "Puerta", diff --git a/src/locales/fr.json b/src/locales/fr.json index 40c497494..9ad230235 100644 --- a/src/locales/fr.json +++ b/src/locales/fr.json @@ -952,8 +952,9 @@ "CreateWebcam": "Nouvelle caméra", "EditCrowsnestConf": "Edition de crowsnest.conf", "EditWebcam": "Editer caméra", - "FlipHorizontally": "Miroir horizontal", - "FlipVertically": "Miroir vertical", + "FlipWebcam": "Miroir l'image de la webcam:", + "Horizontally": "horizontal", + "Vertically": "vertical", "IconBed": "Plateau", "IconCam": "Caméra", "IconDoor": "Porte", diff --git a/src/locales/hu.json b/src/locales/hu.json index c6b76368a..268d717fa 100644 --- a/src/locales/hu.json +++ b/src/locales/hu.json @@ -928,8 +928,9 @@ "AddWebcam": "Webkamera hozzáadása", "CreateWebcam": "Webkamera létrehozása", "EditWebcam": "Webkamera szerkesztése", - "FlipHorizontally": "Webkamera vízszintes tükrözése", - "FlipVertically": "Webkamera függőleges tükrözése", + "FlipWebcam": "Webkamera tükrözése:", + "Horizontally": "vízszintes", + "Vertically": "függőleges", "IconBed": "Asztal", "IconCam": "Kamera", "IconDoor": "Ajtó", diff --git a/src/locales/it.json b/src/locales/it.json index 292cd134e..4564b2e9c 100644 --- a/src/locales/it.json +++ b/src/locales/it.json @@ -795,8 +795,9 @@ "AddWebcam": "aggiungi webcam", "CreateWebcam": "Crea Webcam", "EditWebcam": "Modifica Webcam", - "FlipHorizontally": "Gira webcam orizzontalmente", - "FlipVertically": "Gira webcam verticalmente", + "FlipWebcam": "Specchio dell'immagine della webcam:", + "Horizontally": "orizzontalmente", + "Vertically": "verticalmente", "IconBed": "Letto", "IconCam": "Cam", "IconDoor": "Porta", diff --git a/src/locales/ja.json b/src/locales/ja.json index 0fb81d127..67d795bca 100644 --- a/src/locales/ja.json +++ b/src/locales/ja.json @@ -951,8 +951,6 @@ "CreateWebcam": "カメラ作成", "EditCrowsnestConf": "crowsnest.confを編集", "EditWebcam": "カメラ編集", - "FlipHorizontally": "カメラ画像を水平反転", - "FlipVertically": "カメラ画像を垂直反転", "IconBed": "ベッド", "IconCam": "カメラ", "IconDoor": "ドア", diff --git a/src/locales/ko.json b/src/locales/ko.json index 03ef9ff9d..406a70e4d 100644 --- a/src/locales/ko.json +++ b/src/locales/ko.json @@ -930,8 +930,6 @@ "AddWebcam": "웹캠 추가", "CreateWebcam": "웹캠 장치 정보 입력", "EditWebcam": "웹캠 장치 정보 수정", - "FlipHorizontally": "화면 수평 반전", - "FlipVertically": "화면 수직 반전", "IconBed": "베드", "IconCam": "캠", "IconDoor": "도어", diff --git a/src/locales/nl.json b/src/locales/nl.json index 1abcd85ac..ed754db67 100644 --- a/src/locales/nl.json +++ b/src/locales/nl.json @@ -951,8 +951,9 @@ "CreateWebcam": "Nieuwe Webcam", "EditCrowsnestConf": "Bewerk crowsnest.conf", "EditWebcam": "Bewerk Webcam", - "FlipHorizontally": "Flip webcam horizontaal", - "FlipVertically": "Flip webcam verticaal", + "FlipWebcam": "Flip webcam beeld:", + "Horizontally": "horizontaal", + "Vertically": "verticaal", "IconBed": "Bed", "IconCam": "Camera", "IconDoor": "Deur", diff --git a/src/locales/pl.json b/src/locales/pl.json index ebb98718f..f9f3cf9a4 100644 --- a/src/locales/pl.json +++ b/src/locales/pl.json @@ -929,8 +929,9 @@ "AddWebcam": "Dodaj kamerę", "CreateWebcam": "Stwórz kamerę", "EditWebcam": "Edytuj kamerę", - "FlipHorizontally": "Odwróć widok kamery w poziomie", - "FlipVertically": "Odwróć widok kamery w pionie", + "FlipWebcam": "Odwróć widok kamery:", + "Horizontally": "poziomo", + "Vertically": "pionowo", "IconBed": "Stół", "IconCam": "Kamera", "IconDoor": "Drzwi", diff --git a/src/locales/ru.json b/src/locales/ru.json index 1a7725469..dfd1a9002 100644 --- a/src/locales/ru.json +++ b/src/locales/ru.json @@ -929,8 +929,9 @@ "AddWebcam": "Добавить веб-камеру", "CreateWebcam": "Создать веб-камеру", "EditWebcam": "Редактирование веб-камеры", - "FlipHorizontally": "Зеркальное отображение веб-камеры по горизонтали", - "FlipVertically": "Зеркальная веб-камера в вертикальном положении", + "FlipWebcam": "Зеркальное отображение веб-камеры:", + "Horizontally": "горизонтально", + "Vertically": "вертикально", "IconBed": "Кровать", "IconCam": "Камера", "IconDoor": "Дверь", diff --git a/src/locales/sv.json b/src/locales/sv.json index f5522ac7d..83ede93fa 100644 --- a/src/locales/sv.json +++ b/src/locales/sv.json @@ -823,8 +823,9 @@ "AddWebcam": "lägg till webbkamera", "CreateWebcam": "Skapa webbkamera", "EditWebcam": "Redigera webbkamera", - "FlipHorizontally": "Vänd webbkameran horisontellt", - "FlipVertically": "Vänd webbkameran vertikalt", + "FlipWebcam": "Vänd webbkamerabilden", + "Horizontally": "horisontellt", + "Vertically": "vertikalt", "IconBed": "Bädd", "IconCam": "Kamera", "IconDoor": "Dörr", diff --git a/src/locales/tr.json b/src/locales/tr.json index 9b62dce79..dece8e2a3 100644 --- a/src/locales/tr.json +++ b/src/locales/tr.json @@ -950,8 +950,9 @@ "CreateWebcam": "Web Kamerası Oluştur", "EditCrowsnestConf": "crowsnest.conf'u düzenle", "EditWebcam": "Web Kamerası Düzenle", - "FlipHorizontally": "Web kamerasını yatay olarak çevirin", - "FlipVertically": "Web kamerasını dikey olarak çevirin", + "FlipWebcam": "Web kamerasını çevirin:", + "Horizontally": "yatay olarak", + "Vertically": "dikey olarak", "IconBed": "Yatak", "IconCam": "Kamera", "IconDoor": "Kapı", diff --git a/src/locales/uk.json b/src/locales/uk.json index 1e4b6d095..60ca9ee54 100644 --- a/src/locales/uk.json +++ b/src/locales/uk.json @@ -951,8 +951,9 @@ "CreateWebcam": "Створити веб-камеру", "EditCrowsnestConf": "Редагувати crowsnest.conf", "EditWebcam": "Редагувати веб-камеру", - "FlipHorizontally": "Повернути веб-камеру горизонтально", - "FlipVertically": "Повернути веб-камеру вертикально", + "FlipWebcam": "Повернути веб-камеру:", + "Horizontally": "горизонтально", + "Vertically": "вертикально", "IconBed": "Ліжко", "IconCam": "Cam", "IconDoor": "Двері", diff --git a/src/locales/zh.json b/src/locales/zh.json index 0bc73dcd1..0e33beeca 100644 --- a/src/locales/zh.json +++ b/src/locales/zh.json @@ -953,8 +953,6 @@ "CreateWebcam": "添加摄像头", "EditCrowsnestConf": "编辑 crowsnest.conf", "EditWebcam": "编辑摄像头", - "FlipHorizontally": "水平翻转摄像头", - "FlipVertically": "垂直翻转摄像头", "IconBed": "热床", "IconCam": "摄像头", "IconDoor": "门", diff --git a/src/locales/zh_TW.json b/src/locales/zh_TW.json index c8392b4b4..09f4b5278 100644 --- a/src/locales/zh_TW.json +++ b/src/locales/zh_TW.json @@ -731,8 +731,6 @@ "AddWebcam": "新增攝影機", "CreateWebcam": "建立攝影機", "EditWebcam": "編輯攝影機", - "FlipHorizontally": "水平翻轉網絡攝影機", - "FlipVertically": "垂直翻轉網絡攝影機", "IconBed": "床", "IconCam": "攝影機", "IconDoor": "門", From 7f1fc8545764e3249ea7a41881c3b016e5b1d987 Mon Sep 17 00:00:00 2001 From: Stefan Dej Date: Sun, 9 Oct 2022 01:23:40 +0200 Subject: [PATCH 4/7] fix: add margin bottom fix of fail details of name field Signed-off-by: Stefan Dej --- src/components/settings/SettingsWebcamsTab.vue | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/components/settings/SettingsWebcamsTab.vue b/src/components/settings/SettingsWebcamsTab.vue index 6fceacbc1..859a5a557 100644 --- a/src/components/settings/SettingsWebcamsTab.vue +++ b/src/components/settings/SettingsWebcamsTab.vue @@ -89,6 +89,7 @@ hide-details="auto" outlined :rules="[rules.required, rules.unique]" + class="_webcam-settings-name-field" dense> @@ -454,3 +455,8 @@ export default class SettingsWebcamsTab extends Mixins(BaseMixin, WebcamMixin) { } } + From 7f7ad542345d47cca1c971e2d23428432eaaf632 Mon Sep 17 00:00:00 2001 From: th33xitus Date: Sun, 9 Oct 2022 10:25:28 +0200 Subject: [PATCH 5/7] chore: revert usage of singleton tags to match code style Signed-off-by: Dominik Willner --- src/components/settings/SettingsWebcamsTab.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/settings/SettingsWebcamsTab.vue b/src/components/settings/SettingsWebcamsTab.vue index 859a5a557..a4617f2f4 100644 --- a/src/components/settings/SettingsWebcamsTab.vue +++ b/src/components/settings/SettingsWebcamsTab.vue @@ -163,14 +163,14 @@ v-model="form.flipX" class="mt-1" hide-details - :label="$t('Settings.WebcamsTab.Horizontally')" /> + :label="$t('Settings.WebcamsTab.Horizontally')"> + :label="$t('Settings.WebcamsTab.Vertically')"> From 103cd88f57ddccd4f9838b0df435c389f5dd04dd Mon Sep 17 00:00:00 2001 From: th33xitus Date: Sun, 9 Oct 2022 18:04:16 +0200 Subject: [PATCH 6/7] refactor: use scoped style and vue deep selector Signed-off-by: Dominik Willner --- src/components/settings/SettingsWebcamsTab.vue | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/components/settings/SettingsWebcamsTab.vue b/src/components/settings/SettingsWebcamsTab.vue index a4617f2f4..26407aab9 100644 --- a/src/components/settings/SettingsWebcamsTab.vue +++ b/src/components/settings/SettingsWebcamsTab.vue @@ -455,8 +455,9 @@ export default class SettingsWebcamsTab extends Mixins(BaseMixin, WebcamMixin) { } } - From f42b920ca5ed5fcec0f390f047dd656ce0b05f0f Mon Sep 17 00:00:00 2001 From: th33xitus Date: Sun, 9 Oct 2022 18:08:22 +0200 Subject: [PATCH 7/7] refactor: use deep selector for scss Signed-off-by: Dominik Willner --- src/components/settings/SettingsWebcamsTab.vue | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/components/settings/SettingsWebcamsTab.vue b/src/components/settings/SettingsWebcamsTab.vue index 26407aab9..100eeeedc 100644 --- a/src/components/settings/SettingsWebcamsTab.vue +++ b/src/components/settings/SettingsWebcamsTab.vue @@ -454,10 +454,8 @@ export default class SettingsWebcamsTab extends Mixins(BaseMixin, WebcamMixin) { border: 2px solid var(--color-primary) !important; } } - -