All Strings converted!

.gitignore

@@ -52,3 +52,4 @@ workspace/TS100A/.metadata/
 Translation Editor/.vscode/
 Translation Editor/__pycache__/
 *.pyc
+workspace/TS100/src/Translation.cpp

Translation Editor/make_translation.py

@@ -93,6 +93,7 @@ def getConstants():
     consants.append(('SymbolVolts','V'))
     consants.append(('SymbolDC','DC'))
     consants.append(('SymbolCellCount','S'))
+    consants.append(('SymbolVersionNumber','V2.06'))
     return consants
 def getTipModelEnumTS80(): 
     constants = []
@@ -126,7 +127,10 @@ def getLetterCounts(defs, lang):
     obj = lang['messages']
     for mod in defs['messages']:
         eid = mod['id']
-        textList.append(obj[eid])
+        if eid not in obj:
+            textList.append(mod['default'])
+        else:
+            textList.append(obj[eid])
 
     obj = lang['characters']
 
@@ -302,9 +306,14 @@ def writeLanguage(languageCode, defs, f):
 
     for mod in defs['messages']:
         eid = mod['id']
-        f.write(
+        if eid not in obj:
+            f.write(
             to_unicode("const char* " + eid + " = \"" +
-                       convStr(symbolConversionTable, (obj[eid])) + "\";\n"))
+                       convStr(symbolConversionTable, (mod['default'])) + "\";\n"))
+        else:
+            f.write(
+                to_unicode("const char* " + eid + " = \"" +
+                        convStr(symbolConversionTable, (obj[eid])) + "\";\n"))
 
     f.write(to_unicode("\n"))
 

Translation Editor/translation_en.json

@@ -21,7 +21,8 @@
 		"TipDisconnectedString": "TIP DISCONNECTED",
 		"SolderingAdvancedPowerPrompt": "Power: ",
 		"OffString": "Off",
-		"ResetOKMessage":"Reset OK"
+		"ResetOKMessage":"Reset OK",
+		"YourGainMessage":"Your Gain:"
 	},
 	"characters": {
 		"SettingRightChar": "R",

Translation Editor/translations_def.js

@@ -84,6 +84,11 @@ var def =
 		{
 			"id": "ResetOKMessage",
 			"maxLen": 8
+		}, 
+		{
+			"id": "YourGainMessage",
+			"maxLen": 8,
+			"default":"Your Gain"
 		}
 	],
 	"characters": [

workspace/TS100/inc/Translation.h

@@ -42,6 +42,8 @@ extern const char* TipDisconnectedString;
 extern const char* SolderingAdvancedPowerPrompt;
 extern const char* OffString;
 extern const char* ResetOKMessage;
+extern const char* YourGainMessage;
+
 extern const char* SettingTrueChar;
 extern const char* SettingFalseChar;
 extern const char* SettingRightChar;
@@ -63,5 +65,6 @@ extern const char* SymbolWatts;
 extern const char* SymbolVolts;
 extern const char* SymbolDC;
 extern const char* SymbolCellCount;
+extern const char* SymbolVersionNumber;
 
 #endif /* TRANSLATION_H_ */

workspace/TS100/src/gui.cpp

@@ -621,9 +621,9 @@ static void setTipOffset() {
 		// cycle through the filter a fair bit to ensure we're stable.
 		OLED::clearScreen();
 		OLED::setCursor(0, 0);
-		OLED::print(".");
+		OLED::print(SymbolDot);
 		for (uint8_t x = 0; x < i / 4; x++)
-			OLED::print(".");
+			OLED::print(SymbolDot);
 		OLED::refresh();
 		osDelay(100);
 	}
@@ -636,7 +636,7 @@ static void setTipOffset() {
 	setCalibrationOffset(systemSettings.CalibrationOffset);  // store the error
 	OLED::clearScreen();
 	OLED::setCursor(0, 0);
-	OLED::print("OK");
+	OLED::drawCheckbox(true);
 	OLED::refresh();
 	osDelay(1000);
 }
@@ -671,18 +671,17 @@ static void calibration_enterSimpleCal(void) {
 		// Show this to the user
 		OLED::clearScreen();
 		OLED::setCursor(0, 0);
-		OLED::print("Your G: ");
+		OLED::print(YourGainMessage);
 		OLED::printNumber(gain, 6);
-		OLED::print("\n~= 120-140");
 		OLED::refresh();
 		osDelay(2000);
 		waitForButtonPress();
 		OLED::clearScreen();
 		OLED::setCursor(0, 0);
-		OLED::print("H: ");
+		OLED::print(SymbolPlus);
 		OLED::printNumber(RawTipHot, 8);
 		OLED::setCursor(0, 8);
-		OLED::print("C: ");
+		OLED::print(SymbolMinus);
 		OLED::printNumber(RawTipCold, 8);
 		OLED::refresh();
 		osDelay(2000);
@@ -789,10 +788,10 @@ static void settings_setCalibrateVIN(void) {
 		OLED::setCursor(0, 0);
 		OLED::printNumber(getInputVoltageX10(systemSettings.voltageDiv, 0) / 10,
 				2);
-		OLED::print(".");
+		OLED::print(SymbolDot);
 		OLED::printNumber(getInputVoltageX10(systemSettings.voltageDiv, 0) % 10,
 				1);
-		OLED::print("V");
+		OLED::print(SymbolVolts);
 
 		ButtonState buttons = getButtonState();
 		switch (buttons) {

workspace/TS100/src/main.cpp

@@ -119,9 +119,9 @@ void gui_drawTipTemp(bool symbol) {
 	OLED::printNumber(Temp, 3);  // Draw the tip temp out finally
 	if (symbol) {
 		if (systemSettings.temperatureInF)
-			OLED::print("F");
+			OLED::print(SymbolDegF);
 		else
-			OLED::print("C");
+			OLED::print(SymbolDegC);
 	}
 }
 ButtonState getButtonState() {
@@ -484,10 +484,10 @@ static void display_countdown(int sleepThres) {
 	int downCount = sleepThres - xTaskGetTickCount() + lastEventTime;
 	if (downCount > 9900) {
 		OLED::printNumber(downCount / 6000 + 1, 2);
-		OLED::print("M");
+		OLED::print(SymbolMinutes);
 	} else {
 		OLED::printNumber(downCount / 100 + 1, 2);
-		OLED::print("S");
+		OLED::print(SymbolSeconds);
 	}
 }
 
@@ -693,9 +693,9 @@ void showVersion(void) {
 		OLED::setCursor(0, 0);  // Position the cursor at the 0,0 (top left)
 		OLED::setFont(1);       // small font
 #ifdef MODEL_TS100
-		OLED::print((char *) "V2.06 TS100");  // Print version number
+		OLED::print(SymbolVersionNumber);  // Print version number
 #else
-				OLED::print((char *) "V2.06 TS80");  // Print version number
+				OLED::print(SymbolVersionNumber);  // Print version number
 #endif
 		OLED::setCursor(0, 8);  // second line
 		OLED::print(HEADERS[screen]);