sv/IronOS
1
0
Fork 0
forked from me/IronOS
Code Pull Requests Activity

Croatian Language: Double-line menus + some minor translation corrections (#186)

Browse Source 
* Croatian: Double-line Menus + minor corrections

* Updated main.css - externalizing string

Externalized strings:
"Undervoltage"
"Input V: "
"DC LOW" (Using previously unused ULOWarningString)
"Tip Temp: " (At temperature warning)
"Tip:" (At sleeping advanced)
"Tip:" (At idle screen)
" Set:" (At idle screen)
"BAD TIP"
"Tip Disconnected!" (changed to "TIP DISCONNECTED" due to <=16 limit)

* Update Translation.c - Externalized strings

Externalized strings:
"Undervoltage"
"Input V: "
"DC LOW" (Using previously unused ULOWarningString)
"Tip Temp: " (At temperature warning)
"Tip:" (At sleeping advanced)
"Tip:" (At idle screen)
" Set:" (At idle screen)
"BAD TIP"
"Tip Disconnected!" (changed to "TIP DISCONNECTED" due to <=16 limit)

Max string length corrected from 17 to 16.

* Update Translation.h - Externalized strings

Externalized strings:
"Undervoltage"
"Input V: "
"DC LOW" (Using previously unused ULOWarningString)
"Tip Temp: " (At temperature warning)
"Tip:" (At sleeping advanced)
"Tip:" (At idle screen)
" Set:" (At idle screen)
"BAD TIP"
"Tip Disconnected!" (changed to "TIP DISCONNECTED" due to <=16 limit)
This commit is contained in:
jonnieZG
2018-01-08 12:28:13 +01:00
committed by Ben V. Brown
parent 84305ce0a9
commit 7ba3818cdb
3 changed files with 175 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
workspace/TS100/src/main.cpp
View File

@@ -197,9 +197,9 @@ static bool checkVoltageForExit() {
lcd.setCursor(0, 0);
if (systemSettings.detailedSoldering) {
lcd.setFont(1);
lcd.print("Undervoltage");
lcd.print(UndervoltageString);
lcd.setCursor(0, 8);
lcd.print("Input V: ");
lcd.print(InputVoltageString);
lcd.printNumber(getInputVoltageX10(systemSettings.voltageDiv) / 10, 2);
lcd.drawChar('.');
lcd.printNumber(getInputVoltageX10(systemSettings.voltageDiv) % 10, 1);
@@ -207,7 +207,7 @@ static bool checkVoltageForExit() {
} else {
lcd.setFont(0);
lcd.print("DC LOW");
lcd.print(UVLOWarningString);
}
lcd.refresh();
@@ -387,7 +387,7 @@ static int gui_showTipTempWarning() {
lcd.setFont(1);
lcd.print(WarningAdvancedString);
lcd.setCursor(0, 8);
lcd.print("Tip Temp: ");
lcd.print(WarningTipTempString);
if (systemSettings.temperatureInF) {
lcd.printNumber(tipMeasurementToF(getTipRawTemp(0)), 3);
@@ -462,7 +462,7 @@ static int gui_SolderingSleepingMode() {
lcd.setFont(1);
lcd.print(SleepingAdvancedString);
lcd.setCursor(0, 8);
lcd.print("Tip:");
lcd.print(SleepingTipAdvancedString);
lcd.printNumber(tipTemp, 3);
if (systemSettings.temperatureInF)
lcd.print("F");
@@ -552,7 +552,7 @@ static void gui_solderingMode() {
lcd.clearScreen();
lcd.setFont(0);
if (tipTemp > 16300) {
lcd.print("BAD TIP");
lcd.print(BadTipString);
lcd.refresh();
currentlyActiveTemperatureTarget = 0;
waitForButtonPress();
@@ -766,19 +766,18 @@ void startGUITask(void const *argument) {
if (systemSettings.detailedIDLE) {
lcd.setFont(1);
if (tipTemp > 470) {
lcd.print("Tip Disconnected!");
lcd.print(TipDisconnectedString);
} else {
lcd.print("Tip:");
lcd.print(IdleTipString);
if (systemSettings.temperatureInF)
lcd.printNumber(tipMeasurementToF(getTipRawTemp(0)), 3);
else
lcd.printNumber(tipMeasurementToC(getTipRawTemp(0)), 3);
lcd.print(" ");
lcd.print("Set:");
lcd.print(IdleSetString);
lcd.printNumber(systemSettings.SolderingTemp, 3);
}
lcd.setCursor(0, 8);
lcd.print("Input V: ");
lcd.print(InputVoltageString);
lcd.printNumber(getInputVoltageX10(systemSettings.voltageDiv) / 10, 2);
lcd.drawChar('.');
lcd.printNumber(getInputVoltageX10(systemSettings.voltageDiv) % 10, 1);