Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/webui/rega/www/esp/controls/weather_sensor.fn
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ function ::CreateWeatherSensor() {
if (bErrorWindNorth) {
WriteLine("<br/><span "#errorWindNorth#">${stringTableWeatherWindDir}: </span><img src='/ise/img/help.png' alt='help' style='cursor: pointer; width:18px; height:18px; vertical-align:middle;' onclick=alert(translateKey('stringTableErrorWindNorthTrue'));> ");
} else {
WriteLine("<br/><span "#errorWindNorth#">${stringTableWeatherWindDir}: </span><span class='CLASS02535A' style='color:white'>"#sValueh#" "#oActualWindDirection.Value().ToString(0)#oActualWindDirection.ValueUnit()#"</span>");
WriteLine("<br/><span "#errorWindNorth#">${stringTableWeatherWindDir}: </span><span class='CLASS02535A j_translate' style='color:white'>${"#sValueh#"} "#oActualWindDirection.Value().ToString(0)#oActualWindDirection.ValueUnit()#"</span>");
}
}

Expand Down
54 changes: 26 additions & 28 deletions src/webui/rega/www/esp/datapointconfigurator.fn
Original file line number Diff line number Diff line change
Expand Up @@ -1722,16 +1722,20 @@ function ::CreateUnknown()
tbWrite = false;
}

WriteLine( '<span class="CLASS02535" style="color:white">' );
WriteLine( '<span class="CLASS02535 j_translate" style="color:white">' );

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
{
Expand Down Expand Up @@ -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;
Expand Down
15 changes: 12 additions & 3 deletions src/webui/www/webui/js/lang/de/translate.lang.extension.js
Original file line number Diff line number Diff line change
Expand Up @@ -249,7 +249,7 @@ jQuery.extend(true,langJSON, {
"replaceDeviceDlgConfirmContentRow1b" : ":",
"replaceDeviceDlgConfirmContentRow1c" : "<br/><br/>",
"replaceDeviceDlgConfirmContentRow2a" : "Die Ger%E4tetypen sind identisch und k%F6nnen problemlos getauscht werden.",
"replaceDeviceDlgConfirmContentRow2b" : "Die Ger%E4tetypen sind <b>nicht<b/> identisch, k%F6nnen aber problemlos getauscht werden.<br/><br/>",
"replaceDeviceDlgConfirmContentRow2b" : "Die Ger%E4tetypen sind <b>nicht</b> identisch, k%F6nnen aber problemlos getauscht werden.<br/><br/>",
"replaceDeviceDlgConfirmContentRow3a" : "Das Ger%E4t mit der Adresse:",
"replaceDeviceDlgConfirmContentRow3b" : " wird aus dem System gel%F6scht.",
"replaceDeviceDlgConfirmFooter" : "<br/><br/>M%F6chten Sie die Ger%E4te tauschen?",
Expand Down Expand Up @@ -342,6 +342,15 @@ jQuery.extend(true,langJSON, {
"actionStatusControlLocked" : "Ver-<br/>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<br/>unbestimmt",
"infoStatusControlCalculateFillingLevel" : "F&uuml;llmenge wird berechnet...",
"infoStatusControlFillingLevel" : "F&uuml;llmenge:",
Expand Down Expand Up @@ -871,7 +880,7 @@ jQuery.extend(true,langJSON, {
"<li>Vollzugriff: Remote und lokaler Zugriff erlaubt</li>" +
"<li>Eingeschr%E4nkt: Nur lokaler Zugriff erlaubt</li>" +
"<li>Kein Zugriff: Zugriff nicht gestattet</li>" +
"<ul>",
"</ul>",
"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!",
Expand Down Expand Up @@ -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 &ldquo;Ger%E4te anlernen&rdquo; 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",
Expand Down
8 changes: 4 additions & 4 deletions src/webui/www/webui/js/lang/de/translate.lang.label.js
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ jQuery.extend(true,langJSON, {
"lblGeneralSettingsConditionNumber" : "Zustandszahl",
"lblGeneralSettingsCurrent" : "Strom",
"lblGeneralSettingsGas" : "Gas",
"lblGeneralSettingsHeatingValue" : "Brennwert kWh/m<sup>3",
"lblGeneralSettingsHeatingValue" : "Brennwert kWh/m<sup>3</sup>",
"lblGenericLinkPartner" : "Verkn%FCpfungspartner",
"lblGenericUnit" : "Einheit",
"lblGetEnergyCounterToday" : "Bezug heute:",
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -354,4 +354,4 @@ jQuery.extend(true,langJSON, {

"noMOreKeys" : ""
}
});
});
13 changes: 11 additions & 2 deletions src/webui/www/webui/js/lang/en/translate.lang.extension.js
Original file line number Diff line number Diff line change
Expand Up @@ -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:",
Expand Down Expand Up @@ -387,7 +396,7 @@ jQuery.extend(true, langJSON, {
"dialogSettingsSecurityMessageSysBackupFWUpdateNecessaryContentB" : "<br>\nThis is a later version than the current version installed on the CCU. ",
"dialogSettingsSecurityMessageSysBackupFWUpdateNecessaryContentC" : ".<br>\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",
Expand Down Expand Up @@ -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",
Expand Down
8 changes: 4 additions & 4 deletions src/webui/www/webui/js/lang/en/translate.lang.label.js
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -354,4 +354,4 @@ jQuery.extend(true,langJSON, {

"noMOreKeys" : ""
}
});
});