diff --git a/src/webui/rega/www/esp/controls/weather_sensor.fn b/src/webui/rega/www/esp/controls/weather_sensor.fn index e049fdff..7e915756 100644 --- a/src/webui/rega/www/esp/controls/weather_sensor.fn +++ b/src/webui/rega/www/esp/controls/weather_sensor.fn @@ -98,7 +98,7 @@ function ::CreateWeatherSensor() { if (bErrorWindNorth) { WriteLine("
${stringTableWeatherWindDir}: help "); } else { - WriteLine("
${stringTableWeatherWindDir}: "#sValueh#" "#oActualWindDirection.Value().ToString(0)#oActualWindDirection.ValueUnit()#""); + WriteLine("
${stringTableWeatherWindDir}: ${"#sValueh#"} "#oActualWindDirection.Value().ToString(0)#oActualWindDirection.ValueUnit()#""); } } diff --git a/src/webui/rega/www/esp/datapointconfigurator.fn b/src/webui/rega/www/esp/datapointconfigurator.fn index acd00b22..f5e2abc3 100644 --- a/src/webui/rega/www/esp/datapointconfigurator.fn +++ b/src/webui/rega/www/esp/datapointconfigurator.fn @@ -1722,16 +1722,20 @@ function ::CreateUnknown() tbWrite = false; } - WriteLine( '' ); + WriteLine( '' ); if( !tbWrite ) { - string sValueh = ""; if (oDP.HssType() == "WIND_DIRECTION") { + string sValueh = ""; Call("/esp/datapointconfigurator.fn::ConvWindDir()"); + WriteLine("${"#sValueh#"} "#sValue#sSpace#sValueUnit ); + } + else + { + WriteLine(sValue#sSpace#sValueUnit ); } - WriteLine(sValueh#" "#sValue#sSpace#sValueUnit ); } else { @@ -1810,47 +1814,41 @@ function ::ConvWindDir() { integer iValue = sValue.ToInteger() ; - sValueh = "no value"; - if ( (iValue >= 346) || (iValue <= 15) ) { - sValueh = "N"; - return; + sValueh = "windDirectionAbbrevNorth"; } - if ( (iValue >= 16) && (iValue <= 75) ) + elseif ( (iValue >= 16) && (iValue <= 75) ) { - sValueh = "NO"; - return; + sValueh = "windDirectionAbbrevNorthEast"; } - if ( (iValue >= 76) && (iValue <= 105) ) + elseif ( (iValue >= 76) && (iValue <= 105) ) { - sValueh = "O"; - return; + sValueh = "windDirectionAbbrevEast"; } - if ( (iValue >= 106) && (iValue <= 165) ) + elseif ( (iValue >= 106) && (iValue <= 165) ) { - sValueh = "SO"; - return; + sValueh = "windDirectionAbbrevSouthEast"; } - if ( (iValue >= 166) && (iValue <= 195) ) + elseif ( (iValue >= 166) && (iValue <= 195) ) { - sValueh = "S"; - return; + sValueh = "windDirectionAbbrevSouth"; } - if ( (iValue >= 196) && (iValue <= 255) ) + elseif ( (iValue >= 196) && (iValue <= 255) ) { - sValueh = "SW"; - return; + sValueh = "windDirectionAbbrevSouthWest"; } - if ( (iValue >= 256) && (iValue <= 285) ) + elseif ( (iValue >= 256) && (iValue <= 285) ) { - sValueh = "W"; - return; + sValueh = "windDirectionAbbrevWest"; } - if ( (iValue >= 286) && (iValue <= 345) ) + elseif ( (iValue >= 286) && (iValue <= 345) ) { - sValueh = "NW"; - return; + sValueh = "windDirectionAbbrevNorthWest"; + } + else + { + sValueh = "windDirectionNoValue"; } return; diff --git a/src/webui/www/webui/js/lang/de/translate.lang.extension.js b/src/webui/www/webui/js/lang/de/translate.lang.extension.js index 42b1e890..1fc2f2be 100644 --- a/src/webui/www/webui/js/lang/de/translate.lang.extension.js +++ b/src/webui/www/webui/js/lang/de/translate.lang.extension.js @@ -249,7 +249,7 @@ jQuery.extend(true,langJSON, { "replaceDeviceDlgConfirmContentRow1b" : ":", "replaceDeviceDlgConfirmContentRow1c" : "

", "replaceDeviceDlgConfirmContentRow2a" : "Die Ger%E4tetypen sind identisch und k%F6nnen problemlos getauscht werden.", - "replaceDeviceDlgConfirmContentRow2b" : "Die Ger%E4tetypen sind nicht identisch, k%F6nnen aber problemlos getauscht werden.

", + "replaceDeviceDlgConfirmContentRow2b" : "Die Ger%E4tetypen sind nicht identisch, k%F6nnen aber problemlos getauscht werden.

", "replaceDeviceDlgConfirmContentRow3a" : "Das Ger%E4t mit der Adresse:", "replaceDeviceDlgConfirmContentRow3b" : " wird aus dem System gel%F6scht.", "replaceDeviceDlgConfirmFooter" : "

M%F6chten Sie die Ger%E4te tauschen?", @@ -342,6 +342,15 @@ jQuery.extend(true,langJSON, { "actionStatusControlLocked" : "Ver-
riegelt", "actionStatusControlLockedA" : "Verriegelt", "actionStatusControlLockedB" : "Geschlossen", + "windDirectionNoValue" : "Kein Wert", + "windDirectionAbbrevNorth" : "N", + "windDirectionAbbrevNorthEast" : "NO", + "windDirectionAbbrevEast" : "O", + "windDirectionAbbrevSouthEast" : "SO", + "windDirectionAbbrevSouth" : "S", + "windDirectionAbbrevSouthWest" : "SW", + "windDirectionAbbrevWest" : "W", + "windDirectionAbbrevNorthWest" : "NW", "infoStatusControlStateUnknown" : "Zustand
unbestimmt", "infoStatusControlCalculateFillingLevel" : "Füllmenge wird berechnet...", "infoStatusControlFillingLevel" : "Füllmenge:", @@ -871,7 +880,7 @@ jQuery.extend(true,langJSON, { "
  • Vollzugriff: Remote und lokaler Zugriff erlaubt
    • " + "
  • Eingeschr%E4nkt: Nur lokaler Zugriff erlaubt
    • " + "
  • Kein Zugriff: Zugriff nicht gestattet
    • " + - "
      ", + "
    ", "dialogSettingsFirewallLblHintIPAddresses" : "Sie k%F6nnen den Zugriff f%FCr einzelne IP-Adressen oder ganze Adressbereiche sowohl f%FCr IPv4 als auch f%FCr IPv6 freigeben. Geben Sie die Adressen durch ein ';' getrennt ein.", "dialogSettingsFirewallLblHintIPAddressesWithoutIPv6" : "Sie k%F6nnen den Zugriff f%FCr einzelne IP-Adressen (z. B. 192.168.0.1) oder ganze Adressbereiche (z. B. 192.168.0.0/16) f%FCr IPv4 freigeben. Geben Sie die Adressen durch ein ';' getrennt ein.", "dglUserNewFwSettingsTitle" : "Bitte beachten!", @@ -981,7 +990,7 @@ jQuery.extend(true,langJSON, { "apMigrationErrorOrTimeout" : "Bei dem Firmware-Update ist ein Fehler aufgetreten. Bitte aktualisieren Sie die Ansicht und versuchen Sie es erneut.", "apMigrationUpdateSuccessfulAddition" : "Sie k%F6nnen den Access Point jetzt %FCber “Ger%E4te anlernen” anlernen.", "apMigrationUpdateSuccessfulAdditionMigrationMode" : "Der Access Point befindet sich jetzt im Posteingang.", - "hintDeviceDoesNotSupportAction" : "Die aktuell installierte Geräte-Firmware unterstützt diese Funktion nicht.", + "hintDeviceDoesNotSupportAction" : "Die aktuell installierte Ger%E4te-Firmware unterst%FCtzt diese Funktion nicht.", "noUpdateNeeded" : "Kein Update erforderlich.", "notCompatible" : "Nicht kompatibel", "aqiGood" : "Gut", diff --git a/src/webui/www/webui/js/lang/de/translate.lang.label.js b/src/webui/www/webui/js/lang/de/translate.lang.label.js index d97c0b44..4c2c4666 100644 --- a/src/webui/www/webui/js/lang/de/translate.lang.label.js +++ b/src/webui/www/webui/js/lang/de/translate.lang.label.js @@ -117,7 +117,7 @@ jQuery.extend(true,langJSON, { "lblGeneralSettingsConditionNumber" : "Zustandszahl", "lblGeneralSettingsCurrent" : "Strom", "lblGeneralSettingsGas" : "Gas", - "lblGeneralSettingsHeatingValue" : "Brennwert kWh/m3", + "lblGeneralSettingsHeatingValue" : "Brennwert kWh/m3", "lblGenericLinkPartner" : "Verkn%FCpfungspartner", "lblGenericUnit" : "Einheit", "lblGetEnergyCounterToday" : "Bezug heute:", @@ -150,8 +150,8 @@ jQuery.extend(true,langJSON, { "lblInfoLevelReal" : "Realer Wert", "lblInfoLevelRealBrightness" : "Reale Helligkeit", "lblInfoStatusControlCurrent" : "Strom", - "lblInfoStatusControlDevice" : "Energie-Z%E4hler Ger%E4t", - "lblInfoStatusControlEnergyCounter" : "Energie-Z%E4hler " + HMIdentifier.de.CCUShortName, + "lblInfoStatusControlDevice" : "Energie-Z%E4hler - Ger%E4t", + "lblInfoStatusControlEnergyCounter" : "Energie-Z%E4hler - Zentrale", "lblInfoStatusControlFrequency" : "Netzfrequenz", "lblInfoStatusControlGas" : "Verbrauch", "lblInfoStatusControlGasFlow" : "Gasdurchfluss", @@ -354,4 +354,4 @@ jQuery.extend(true,langJSON, { "noMOreKeys" : "" } -}); \ No newline at end of file +}); diff --git a/src/webui/www/webui/js/lang/en/translate.lang.extension.js b/src/webui/www/webui/js/lang/en/translate.lang.extension.js index b05a850e..eb022a29 100644 --- a/src/webui/www/webui/js/lang/en/translate.lang.extension.js +++ b/src/webui/www/webui/js/lang/en/translate.lang.extension.js @@ -342,6 +342,15 @@ jQuery.extend(true, langJSON, { "actionStatusControlLocked" : "Locked", "actionStatusControlLockedA" : "Locked", "actionStatusControlLockedB" : "Closed", + "windDirectionNoValue" : "No Value", + "windDirectionAbbrevNorth" : "N", + "windDirectionAbbrevNorthEast" : "NE", + "windDirectionAbbrevEast" : "E", + "windDirectionAbbrevSouthEast" : "SE", + "windDirectionAbbrevSouth" : "S", + "windDirectionAbbrevSouthWest" : "SW", + "windDirectionAbbrevWest" : "W", + "windDirectionAbbrevNorthWest" : "NW", "infoStatusControlStateUnknown" : "Status unknown", "infoStatusControlCalculateFillingLevel" : "Filling level is being calculated", "infoStatusControlFillingLevel" : "Filling level:", @@ -387,7 +396,7 @@ jQuery.extend(true, langJSON, { "dialogSettingsSecurityMessageSysBackupFWUpdateNecessaryContentB" : "
    \nThis is a later version than the current version installed on the CCU. ", "dialogSettingsSecurityMessageSysBackupFWUpdateNecessaryContentC" : ".
    \nPlease perform an update of your CCU firmware first. Then, please start to import the system backup.", "errorOpenFavorite" : "Favourites can not be opened!", - "errorWrongPassword" : "Password incorret", + "errorWrongPassword" : "Password incorrect", "dialogSettingsCreateProfileTemplateTitle" : "Profile template will be created...", "dialogSettingsDeleteProfileTemplateTitle" : "Profile template will be deleted...", "actionStatusControlHandleLock" : "e-handle lock operation", @@ -703,7 +712,7 @@ jQuery.extend(true, langJSON, { "btnSysConfCoupling" : "Connections", "couplingDialogTitle" : "Dialogue connections", "enterIPAddress" : "Manual IP input", - "invalidIP" : "Invalid IP adress", + "invalidIP" : "Invalid IP address", "invalidNetMask" : "Invalid Subnet mask", "btnScanGateway" : "Search gateway", "btnScanDevices" : "Search devices", diff --git a/src/webui/www/webui/js/lang/en/translate.lang.label.js b/src/webui/www/webui/js/lang/en/translate.lang.label.js index 4181a372..01dbad78 100644 --- a/src/webui/www/webui/js/lang/en/translate.lang.label.js +++ b/src/webui/www/webui/js/lang/en/translate.lang.label.js @@ -63,7 +63,7 @@ jQuery.extend(true,langJSON, { "lblCurrentFirmwareVersionNotKnown": "unknown", "lblCurrentOperatingVoltage": "Actual operating voltage", "lblCurrentPowerConsumption": "Actual current consumption", - "lblCyanLong" : "Cyan short", + "lblCyanLong" : "Cyan long", "lblCyanShort" : "Cyan short", "lblDataInputPropertie" : "Data input settings", "lblDelayExternalArming" : "External alarm activated with delay", @@ -150,8 +150,8 @@ jQuery.extend(true,langJSON, { "lblInfoLevelReal" : "Actual value", "lblInfoLevelRealBrightness" : "Actual brightness", "lblInfoStatusControlCurrent" : "Current", - "lblInfoStatusControlDevice" : "Energy counter device", - "lblInfoStatusControlEnergyCounter" : "Energy counter " + HMIdentifier.en.CCUShortName, + "lblInfoStatusControlDevice" : "Energy counter - Device", + "lblInfoStatusControlEnergyCounter" : "Energy counter - Central", "lblInfoStatusControlFrequency" : "Frequency", "lblInfoStatusControlGas" : "Consumption", "lblInfoStatusControlGasFlow" : "Gas flow", @@ -354,4 +354,4 @@ jQuery.extend(true,langJSON, { "noMOreKeys" : "" } -}); \ No newline at end of file +});