From 288e8ff4943a27f66fa2e951964f09416ae5495d Mon Sep 17 00:00:00 2001
From: David Pace <dev@davidpace.de>
Date: Sun, 31 Dec 2023 12:56:04 +0100
Subject: [PATCH] [boschshc] Fix options for channels with Switch items
 (#16161)

* [boschshc] Fix options for channels with Switch items

Previously, the option values partially contained Bosch-specific states
instead of the openHAB-specific states ON and OFF.

The option values were fixed and the descriptions were
enhanced/shortened since the UI only provides little space for the state
descriptions.

Signed-off-by: David Pace <dev@davidpace.de>
---
 .../main/resources/OH-INF/i18n/boschshc.properties   | 12 ++++++------
 .../src/main/resources/OH-INF/thing/thing-types.xml  | 12 ++++++------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/bundles/org.openhab.binding.boschshc/src/main/resources/OH-INF/i18n/boschshc.properties b/bundles/org.openhab.binding.boschshc/src/main/resources/OH-INF/i18n/boschshc.properties
index e4f04b265a..4734e7eaaa 100644
--- a/bundles/org.openhab.binding.boschshc/src/main/resources/OH-INF/i18n/boschshc.properties
+++ b/bundles/org.openhab.binding.boschshc/src/main/resources/OH-INF/i18n/boschshc.properties
@@ -77,8 +77,8 @@ channel-type.boschshc.bypass-state.state.option.OFF = Device is currently not by
 channel-type.boschshc.bypass-state.state.option.ON = Device is currently bypassed
 channel-type.boschshc.camera-notification.label = Camera Notifications
 channel-type.boschshc.camera-notification.description = Enables or disables notifications for the camera.
-channel-type.boschshc.camera-notification.state.option.ENABLED = Enable notifications
-channel-type.boschshc.camera-notification.state.option.DISABLED = Disable notifications
+channel-type.boschshc.camera-notification.state.option.ON = Enabled
+channel-type.boschshc.camera-notification.state.option.OFF = Disabled
 channel-type.boschshc.child-lock.label = Child Lock
 channel-type.boschshc.child-lock.description = Enables or disables the child lock on the device.
 channel-type.boschshc.combined-rating.label = Combined Rating
@@ -111,8 +111,8 @@ channel-type.boschshc.power-consumption.label = Power consumption (W)
 channel-type.boschshc.power-consumption.description = Current power consumption of the device.
 channel-type.boschshc.privacy-mode.label = Privacy Mode
 channel-type.boschshc.privacy-mode.description = If privacy mode is enabled, the camera is disabled and vice versa.
-channel-type.boschshc.privacy-mode.state.option.ENABLED = Privacy mode enabled (camera disabled)
-channel-type.boschshc.privacy-mode.state.option.DISABLED = Privacy mode disabled (camera enabled)
+channel-type.boschshc.privacy-mode.state.option.ON = Enabled (camera disabled)
+channel-type.boschshc.privacy-mode.state.option.OFF = Disabled (camera enabled)
 channel-type.boschshc.purity-rating.label = Purity Rating
 channel-type.boschshc.purity-rating.description = Rating of the air purity.
 channel-type.boschshc.purity.label = Purity
@@ -123,8 +123,8 @@ channel-type.boschshc.setpoint-temperature.label = Setpoint Temperature
 channel-type.boschshc.setpoint-temperature.description = Desired temperature.
 channel-type.boschshc.silent-mode.label = Silent Mode
 channel-type.boschshc.silent-mode.description = Enables or disables silent mode on thermostats. When enabled, the battery usage is higher.
-channel-type.boschshc.silent-mode.state.option.MODE_NORMAL = Silent mode disabled (lower battery usage)
-channel-type.boschshc.silent-mode.state.option.MODE_SILENT = Silent mode enabled (higher battery usage)
+channel-type.boschshc.silent-mode.state.option.OFF = Disabled (lower battery usage)
+channel-type.boschshc.silent-mode.state.option.ON = Enabled (higher battery usage)
 channel-type.boschshc.smoke-check.label = Smoke Check State
 channel-type.boschshc.smoke-check.description = State of last smoke detector check.
 channel-type.boschshc.smoke-check.state.option.NONE = None
diff --git a/bundles/org.openhab.binding.boschshc/src/main/resources/OH-INF/thing/thing-types.xml b/bundles/org.openhab.binding.boschshc/src/main/resources/OH-INF/thing/thing-types.xml
index 93b2b3fe39..f7460859dd 100644
--- a/bundles/org.openhab.binding.boschshc/src/main/resources/OH-INF/thing/thing-types.xml
+++ b/bundles/org.openhab.binding.boschshc/src/main/resources/OH-INF/thing/thing-types.xml
@@ -396,8 +396,8 @@
 		<description>If privacy mode is enabled, the camera is disabled and vice versa.</description>
 		<state>
 			<options>
-				<option value="ENABLED">Privacy mode enabled (camera disabled)</option>
-				<option value="DISABLED">Privacy mode disabled (camera enabled)</option>
+				<option value="ON">Enabled (camera disabled)</option>
+				<option value="OFF">Disabled (camera enabled)</option>
 			</options>
 		</state>
 	</channel-type>
@@ -408,8 +408,8 @@
 		<description>Enables or disables notifications for the camera.</description>
 		<state>
 			<options>
-				<option value="ENABLED">Enable notifications</option>
-				<option value="DISABLED">Disable notifications</option>
+				<option value="ON">Enabled</option>
+				<option value="OFF">Disabled</option>
 			</options>
 		</state>
 	</channel-type>
@@ -570,8 +570,8 @@
 		<description>Enables or disables silent mode on thermostats. When enabled, the battery usage is higher.</description>
 		<state>
 			<options>
-				<option value="MODE_NORMAL">Silent mode disabled (lower battery usage)</option>
-				<option value="MODE_SILENT">Silent mode enabled (higher battery usage)</option>
+				<option value="OFF">Disabled (lower battery usage)</option>
+				<option value="ON">Enabled (higher battery usage)</option>
 			</options>
 		</state>
 	</channel-type>
-- 
2.47.3