shortname to wwVacations/wwHoliday to avoid conflict

emsesp · Jun 20, 2022 · bf18718 · bf18718
1 parent 0e5cb2d
commit bf18718
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 6 deletions.
diff --git a/src/devices/thermostat.cpp b/src/devices/thermostat.cpp
@@ -3554,14 +3554,14 @@ void Thermostat::register_device_values() {
                               &wwHoliday_,
                               DeviceValueType::STRING,
                               FL_(tpl_holidays),
-                              FL_(holidays),
+                              FL_(wwHolidays),
                               DeviceValueUOM::NONE,
                               MAKE_CF_CB(set_wwHoliday));
         register_device_value(DeviceValueTAG::TAG_DEVICE_DATA_WW,
                               &wwVacation_,
                               DeviceValueType::STRING,
                               FL_(tpl_holidays),
-                              FL_(vacations),
+                              FL_(wwVacations),
                               DeviceValueUOM::NONE,
                               MAKE_CF_CB(set_wwVacation));
         break;
@@ -3680,14 +3680,14 @@ void Thermostat::register_device_values() {
                               &wwHoliday_,
                               DeviceValueType::STRING,
                               FL_(tpl_holidays),
-                              FL_(holidays),
+                              FL_(wwHolidays),
                               DeviceValueUOM::NONE,
                               MAKE_CF_CB(set_wwHoliday));
         register_device_value(DeviceValueTAG::TAG_DEVICE_DATA_WW,
                               &wwVacation_,
                               DeviceValueType::STRING,
                               FL_(tpl_holidays),
-                              FL_(vacations),
+                              FL_(wwVacations),
                               DeviceValueUOM::NONE,
                               MAKE_CF_CB(set_wwVacation));
         break;
@@ -3805,14 +3805,14 @@ void Thermostat::register_device_values() {
                               &wwHoliday_,
                               DeviceValueType::STRING,
                               FL_(tpl_holidays),
-                              FL_(holidays),
+                              FL_(wwHolidays),
                               DeviceValueUOM::NONE,
                               MAKE_CF_CB(set_wwHoliday));
         register_device_value(DeviceValueTAG::TAG_DEVICE_DATA_WW,
                               &wwVacation_,
                               DeviceValueType::STRING,
                               FL_(tpl_holidays),
-                              FL_(vacations),
+                              FL_(wwVacations),
                               DeviceValueUOM::NONE,
                               MAKE_CF_CB(set_wwVacation));
         break;

diff --git a/src/locale_DE.h b/src/locale_DE.h
@@ -650,6 +650,8 @@ MAKE_PSTR_LIST(summersetmode, F("summersetmode"), F("Einstellung Sommerbetrieb")
 MAKE_PSTR_LIST(hpoperatingmode, F("hpoperatingmode"), F("Wärmepumpe Betriebsmodus"))
 MAKE_PSTR_LIST(controlmode, F("controlmode"), F("Kontrollmodus"))
 MAKE_PSTR_LIST(control, F("control"), F("Fernsteuerung"))
+MAKE_PSTR_LIST(wwHolidays, F("wwholidays"), F("holiday dates"))
+MAKE_PSTR_LIST(wwVacations, F("wwvacations"), F("vacation dates"))
 MAKE_PSTR_LIST(holidays, F("holidays"), F("holiday dates"))
 MAKE_PSTR_LIST(vacations, F("vacations"), F("vacation dates"))
 MAKE_PSTR_LIST(program, F("program"), F("Programm"))

diff --git a/src/locale_EN.h b/src/locale_EN.h
@@ -650,6 +650,8 @@ MAKE_PSTR_LIST(summersetmode, F("summersetmode"), F("set summer mode"))
 MAKE_PSTR_LIST(hpoperatingmode, F("hpoperatingmode"), F("heatpump operating mode"))
 MAKE_PSTR_LIST(controlmode, F("controlmode"), F("control mode"))
 MAKE_PSTR_LIST(control, F("control"), F("control device"))
+MAKE_PSTR_LIST(wwHolidays, F("wwholidays"), F("holiday dates"))
+MAKE_PSTR_LIST(wwVacations, F("wwvacations"), F("vacation dates"))
 MAKE_PSTR_LIST(holidays, F("holidays"), F("holiday dates"))
 MAKE_PSTR_LIST(vacations, F("vacations"), F("vacation dates"))
 MAKE_PSTR_LIST(program, F("program"), F("program"))