diff --git a/Translations/TranslationEditor.html b/Translations/TranslationEditor.html index d6c7cf8d..ecb85365 100644 --- a/Translations/TranslationEditor.html +++ b/Translations/TranslationEditor.html @@ -3,7 +3,7 @@ - TS100 Translation Editor + IronOS Translation Editor @@ -191,11 +191,49 @@ delim = " and "; } return str; + }, + + validateWholeScreenMessage: function(valMap, id) { + var d = defMap[id]; + if (this.isSmall(valMap[id])) { + if (valMap[id][0].length === 0) { + return "invalid"; + } else if (Math.max(valMap[id][0].length, valMap[id][1].length) > 16) { + return "invalid"; + } + } else { + if (valMap[id].length > 8) { + return "invalid"; + } + } + }, + + constraintWholeScreenMessage: function(v) { + if (this.isSmall(v)) { + return "len <= 16"; + } else { + return "len <= 8"; + } + }, + + isSmall: function(v) { + return v instanceof Array; + }, + + convertToLarge: function(valMap, id) { + var message = valMap[id][0] + (valMap[id][1] !== "" ? " " + valMap[id][1] : ""); + valMap[id] = message; + }, + + convertToSmall: function(valMap, id) { + var message = valMap[id] + valMap[id] = [ message, "" ]; } } }); app.def = def; copyArrayToMap(app.def.messages, defMap); + copyArrayToMap(app.def.messagesWarn, defMap); copyArrayToMap(app.def.characters, defMap); copyArrayToMap(app.def.menuGroups, defMap); copyArrayToMap(app.def.menuOptions, defMap); @@ -208,7 +246,7 @@
-

TS100 Translation Editor - {{ current.languageLocalName }} [{{current.languageCode}}]

+

IronOS Translation Editor - {{ current.languageLocalName }} [{{current.languageCode}}]

@@ -273,6 +311,27 @@
Referent Language
+

Warning Messages

+ + + + + +
{{message.id}}
 +
{{constraintWholeScreenMessage(current.messagesWarn[message.id])}}
+
{{referent.messagesWarn[message.id]}}
+
{{message.note}}
+
+ + + +
+
+ + +
+
+

Characters

@@ -326,4 +385,4 @@ - \ No newline at end of file + diff --git a/Translations/make_translation.py b/Translations/make_translation.py index 7b4e7a8a..e8944bb0 100755 --- a/Translations/make_translation.py +++ b/Translations/make_translation.py @@ -127,6 +127,15 @@ def get_letter_counts(defs: dict, lang: dict) -> List[str]: else: text_list.append(obj[eid]) + obj = lang["messagesWarn"] + for mod in defs["messagesWarn"]: + eid = mod["id"] + if isinstance(obj[eid], list): + text_list.append(obj[eid][0]) + text_list.append(obj[eid][1]) + else: + text_list.append(obj[eid]) + obj = lang["characters"] for mod in defs["characters"]: @@ -403,6 +412,23 @@ def write_language(lang: dict, defs: dict, f: TextIO) -> None: f.write("\n") + obj = lang["messagesWarn"] + + for mod in defs["messagesWarn"]: + eid = mod["id"] + if isinstance(obj[eid], list): + if not obj[eid][1]: + source_text = obj[eid][0] + else: + source_text = obj[eid][0] + "\n" + obj[eid][1] + else: + source_text = "\n" + obj[eid] + translated_text = convert_string(symbol_conversion_table, source_text) + source_text = source_text.replace("\n", "_") + f.write(f'const char* {eid} = "{translated_text}";//{source_text} \n') + + f.write("\n") + # ----- Writing Characters obj = lang["characters"] diff --git a/Translations/translation_BG.json b/Translations/translation_BG.json index b85eb44e..39e77a7d 100644 --- a/Translations/translation_BG.json +++ b/Translations/translation_BG.json @@ -23,13 +23,18 @@ "OffString": "Изкл.", "ResetOKMessage": "Нулиране завършено", "YourGainMessage": "Усилване:", - "SettingsResetMessage": "Настройките бяха\nнулирани!", "NoAccelerometerMessage": "No accelerometer\ndetected!", "NoPowerDeliveryMessage": "No USB-PD IC\ndetected!", "LockingKeysString": " LOCKED", "UnlockingKeysString": "UNLOCKED", "WarningKeysLockedString": "!LOCKED!" }, + "messagesWarn": { + "SettingsResetMessage": [ + "Настройките бяха", + "нулирани!" + ] + }, "characters": { "SettingRightChar": "R", "SettingLeftChar": "L", @@ -37,7 +42,7 @@ "SettingFastChar": "F", "SettingSlowChar": "S", "SettingMediumChar": "M", - "SettingOffChar":"O", + "SettingOffChar": "O", "SettingStartSolderingChar": "T", "SettingStartSleepChar": "S", "SettingStartSleepOffChar": "O", diff --git a/Translations/translation_CS.json b/Translations/translation_CS.json index 7c5b9202..bade6a37 100644 --- a/Translations/translation_CS.json +++ b/Translations/translation_CS.json @@ -23,13 +23,18 @@ "OffString": "Vyp", "ResetOKMessage": "Reset OK", "YourGainMessage": "Zisk:", - "SettingsResetMessage": "Tov. nas. obnov.", "NoAccelerometerMessage": "No accelerometer\ndetected!", "NoPowerDeliveryMessage": "No USB-PD IC\ndetected!", "LockingKeysString": " LOCKED", "UnlockingKeysString": "UNLOCKED", "WarningKeysLockedString": "!LOCKED!" }, + "messagesWarn": { + "SettingsResetMessage": [ + "Tov. nas. obnov.", + "" + ] + }, "characters": { "SettingRightChar": "P", "SettingLeftChar": "L", @@ -37,7 +42,7 @@ "SettingFastChar": "R", "SettingSlowChar": "P", "SettingMediumChar": "M", - "SettingOffChar":"O", + "SettingOffChar": "O", "SettingStartSolderingChar": "T", "SettingStartSleepChar": "S", "SettingStartSleepOffChar": "O", diff --git a/Translations/translation_DA.json b/Translations/translation_DA.json index aaabb17b..266c5e69 100644 --- a/Translations/translation_DA.json +++ b/Translations/translation_DA.json @@ -23,13 +23,18 @@ "OffString": "Off", "ResetOKMessage": "Reset OK", "YourGainMessage": "Your gain:", - "SettingsResetMessage": "Settings were\nreset!", "NoAccelerometerMessage": "No accelerometer\ndetected!", "NoPowerDeliveryMessage": "No USB-PD IC\ndetected!", "LockingKeysString": " LOCKED", "UnlockingKeysString": "UNLOCKED", "WarningKeysLockedString": "!LOCKED!" }, + "messagesWarn": { + "SettingsResetMessage": [ + "Settings were", + "reset!" + ] + }, "characters": { "SettingRightChar": "H", "SettingLeftChar": "V", @@ -37,7 +42,7 @@ "SettingFastChar": "F", "SettingSlowChar": "S", "SettingMediumChar": "M", - "SettingOffChar":"O", + "SettingOffChar": "O", "SettingStartSolderingChar": "L", "SettingStartSleepChar": "D", "SettingStartSleepOffChar": "O", diff --git a/Translations/translation_DE.json b/Translations/translation_DE.json index f1caf983..c1f78508 100644 --- a/Translations/translation_DE.json +++ b/Translations/translation_DE.json @@ -26,11 +26,16 @@ "NoPowerDeliveryMessage": "Kein USB-PD IC\nerkannt!", "ResetOKMessage": "Reset OK", "YourGainMessage": "Dein Faktor:", - "SettingsResetMessage": "Einstellungen\nzurückgesetzt!", "LockingKeysString": "GESPERRT", "UnlockingKeysString": "ENTSPERRT", "WarningKeysLockedString": "!GESPERRT!" }, + "messagesWarn": { + "SettingsResetMessage": [ + "Einstellungen", + "zurückgesetzt!" + ] + }, "characters": { "SettingRightChar": "R", "SettingLeftChar": "L", diff --git a/Translations/translation_EN.json b/Translations/translation_EN.json index 4c22d999..0ab345c0 100644 --- a/Translations/translation_EN.json +++ b/Translations/translation_EN.json @@ -24,13 +24,18 @@ "OffString": "Off", "ResetOKMessage": "Reset OK", "YourGainMessage": "Your gain:", - "SettingsResetMessage": "Settings were\nreset!", "NoAccelerometerMessage": "No accelerometer\ndetected!", "NoPowerDeliveryMessage": "No USB-PD IC\ndetected!", "LockingKeysString": "LOCKED", "UnlockingKeysString": "UNLOCKED", "WarningKeysLockedString": "!LOCKED!" }, + "messagesWarn": { + "SettingsResetMessage": [ + "Settings were", + "reset!" + ] + }, "characters": { "SettingRightChar": "R", "SettingLeftChar": "L", @@ -38,7 +43,7 @@ "SettingFastChar": "F", "SettingSlowChar": "S", "SettingMediumChar": "M", - "SettingOffChar":"O", + "SettingOffChar": "O", "SettingStartSolderingChar": "S", "SettingStartSleepChar": "Z", "SettingStartSleepOffChar": "R", diff --git a/Translations/translation_ES.json b/Translations/translation_ES.json index 9dfd17f4..39acef47 100644 --- a/Translations/translation_ES.json +++ b/Translations/translation_ES.json @@ -30,6 +30,12 @@ "UnlockingKeysString": "UNLOCKED", "WarningKeysLockedString": "!LOCKED!" }, + "messagesWarn": { + "SettingsResetMessage": [ + "Settings were", + "reset!" + ] + }, "characters": { "SettingRightChar": "D", "SettingLeftChar": "I", @@ -37,7 +43,7 @@ "SettingFastChar": "R", "SettingSlowChar": "L", "SettingMediumChar": "M", - "SettingOffChar":"O", + "SettingOffChar": "O", "SettingStartSolderingChar": "S", "SettingStartSleepChar": "R", "SettingStartSleepOffChar": "F", diff --git a/Translations/translation_FI.json b/Translations/translation_FI.json index 0949389b..2fa1322c 100644 --- a/Translations/translation_FI.json +++ b/Translations/translation_FI.json @@ -23,13 +23,18 @@ "OffString": "OFF", "ResetOKMessage": "Reset OK", "YourGainMessage": "Your gain:", - "SettingsResetMessage": "Settings were\nreset!", "NoAccelerometerMessage": "No accelerometer\ndetected!", "NoPowerDeliveryMessage": "No USB-PD IC\ndetected!", "LockingKeysString": " LOCKED", "UnlockingKeysString": "UNLOCKED", "WarningKeysLockedString": "!LOCKED!" }, + "messagesWarn": { + "SettingsResetMessage": [ + "Settings were", + "reset!" + ] + }, "characters": { "SettingRightChar": "O", "SettingLeftChar": "V", @@ -37,7 +42,7 @@ "SettingFastChar": "N", "SettingSlowChar": "H", "SettingMediumChar": "M", - "SettingOffChar":"O", + "SettingOffChar": "O", "SettingStartSolderingChar": "T", "SettingStartSleepChar": "S", "SettingStartSleepOffChar": "O", diff --git a/Translations/translation_FR.json b/Translations/translation_FR.json index 9a388e26..7e833919 100644 --- a/Translations/translation_FR.json +++ b/Translations/translation_FR.json @@ -23,13 +23,18 @@ "OffString": "Off", "ResetOKMessage": "Reset OK", "YourGainMessage": "Gain : ", - "SettingsResetMessage": "Réglage réinit. !", "NoAccelerometerMessage": "Accéléromètre\nnon détecté !", "NoPowerDeliveryMessage": "Pas d'USB-PD\ndétecté !", "LockingKeysString": "VERROUIL", "UnlockingKeysString": "DEVERROU", "WarningKeysLockedString": "! VERR. !" }, + "messagesWarn": { + "SettingsResetMessage": [ + "Réglage", + "réinit. !" + ] + }, "characters": { "SettingRightChar": "D", "SettingLeftChar": "G", @@ -37,7 +42,7 @@ "SettingFastChar": "R", "SettingSlowChar": "L", "SettingMediumChar": "M", - "SettingOffChar":"D", + "SettingOffChar": "D", "SettingStartSolderingChar": "A", "SettingStartSleepChar": "V", "SettingStartSleepOffChar": "O", diff --git a/Translations/translation_HR.json b/Translations/translation_HR.json index f1e82a41..586a4fe9 100644 --- a/Translations/translation_HR.json +++ b/Translations/translation_HR.json @@ -23,13 +23,18 @@ "OffString": "Off", "ResetOKMessage": "Reset OK", "YourGainMessage": "Your gain:", - "SettingsResetMessage": "Settings were\nreset!", "NoAccelerometerMessage": "No accelerometer\ndetected!", "NoPowerDeliveryMessage": "No USB-PD IC\ndetected!", "LockingKeysString": " LOCKED", "UnlockingKeysString": "UNLOCKED", "WarningKeysLockedString": "!LOCKED!" }, + "messagesWarn": { + "SettingsResetMessage": [ + "Settings were", + "reset!" + ] + }, "characters": { "SettingRightChar": "D", "SettingLeftChar": "L", diff --git a/Translations/translation_HU.json b/Translations/translation_HU.json index d0048e19..4b50b5fe 100644 --- a/Translations/translation_HU.json +++ b/Translations/translation_HU.json @@ -23,13 +23,18 @@ "OffString": "Ki", "ResetOKMessage": "Törlés OK", "YourGainMessage": "Erősítés:", - "SettingsResetMessage": "Beállítások\ntörölve!", "NoAccelerometerMessage": "Nincs gyorsulásmérő!", "NoPowerDeliveryMessage": "Nincs USB-PD IC!", "LockingKeysString": "LEZÁRVA", "UnlockingKeysString": "FELOLDVA", "WarningKeysLockedString": "!LEZÁRVA!" }, + "messagesWarn": { + "SettingsResetMessage": [ + "Beállítások", + "törölve!" + ] + }, "characters": { "SettingRightChar": "J", "SettingLeftChar": "B", @@ -37,7 +42,7 @@ "SettingFastChar": "G", "SettingSlowChar": "L", "SettingMediumChar": "M", - "SettingOffChar":"0", + "SettingOffChar": "0", "SettingStartSolderingChar": "F", "SettingStartSleepChar": "Z", "SettingStartSleepOffChar": "S", diff --git a/Translations/translation_IT.json b/Translations/translation_IT.json index 403f56bd..fb561b48 100644 --- a/Translations/translation_IT.json +++ b/Translations/translation_IT.json @@ -23,13 +23,18 @@ "OffString": "OFF", "ResetOKMessage": "Reset OK", "YourGainMessage": "Guad.: ", - "SettingsResetMessage": "Reset effettuato", "NoAccelerometerMessage": "Accelerometro\nnon rilevato", "NoPowerDeliveryMessage": "USB-PD non\ndisponibile", "LockingKeysString": "Blocc.", "UnlockingKeysString": "Sblocc.", "WarningKeysLockedString": "BLOCCATO" }, + "messagesWarn": { + "SettingsResetMessage": [ + "Reset effettuato", + "" + ] + }, "characters": { "SettingRightChar": "D", "SettingLeftChar": "S", @@ -37,7 +42,7 @@ "SettingFastChar": "V", "SettingSlowChar": "L", "SettingMediumChar": "M", - "SettingOffChar":"O", + "SettingOffChar": "O", "SettingStartSolderingChar": "S", "SettingStartSleepChar": "R", "SettingStartSleepOffChar": "A", diff --git a/Translations/translation_LT.json b/Translations/translation_LT.json index b19e8656..5e73d8c9 100644 --- a/Translations/translation_LT.json +++ b/Translations/translation_LT.json @@ -23,13 +23,18 @@ "OffString": "Išj", "ResetOKMessage": "Atstatytas OK", "YourGainMessage": "Greitis:", - "SettingsResetMessage": "Nust. atstatyti!", "NoAccelerometerMessage": "Nerastas\nakselerometras!", "NoPowerDeliveryMessage": "Nerastas\nUSB-PD IC !", "LockingKeysString": " UŽRAKIN", "UnlockingKeysString": "ATRAKIN", "WarningKeysLockedString": "!UŽRAK!" }, + "messagesWarn": { + "SettingsResetMessage": [ + "Nust. atstatyti!", + "" + ] + }, "characters": { "SettingRightChar": "D", "SettingLeftChar": "K", @@ -37,7 +42,7 @@ "SettingFastChar": "G", "SettingSlowChar": "L", "SettingMediumChar": "M", - "SettingOffChar":"I", + "SettingOffChar": "I", "SettingStartSolderingChar": "T", "SettingStartSleepChar": "M", "SettingStartSleepOffChar": "K", diff --git a/Translations/translation_NL.json b/Translations/translation_NL.json index 768e81b2..b7aaccb0 100644 --- a/Translations/translation_NL.json +++ b/Translations/translation_NL.json @@ -23,13 +23,18 @@ "OffString": "Uit", "ResetOKMessage": "Reset OK", "YourGainMessage": "Niveau:", - "SettingsResetMessage": "Instellingen zijn\ngereset!", "NoAccelerometerMessage": "No accelerometer\ndetected!", "NoPowerDeliveryMessage": "No USB-PD IC\ndetected!", "LockingKeysString": " GEBLOKKEERD", "UnlockingKeysString": "GEDEBLOKKEERD", "WarningKeysLockedString": "!GEBLOKKEERD!" }, + "messagesWarn": { + "SettingsResetMessage": [ + "Instellingen", + "zijn gereset!" + ] + }, "characters": { "SettingRightChar": "R", "SettingLeftChar": "L", @@ -37,7 +42,7 @@ "SettingFastChar": "F", "SettingSlowChar": "S", "SettingMediumChar": "M", - "SettingOffChar":"O", + "SettingOffChar": "O", "SettingStartSolderingChar": "T", "SettingStartSleepChar": "S", "SettingStartSleepOffChar": "O", diff --git a/Translations/translation_NL_BE.json b/Translations/translation_NL_BE.json index debd456c..86bfeea8 100644 --- a/Translations/translation_NL_BE.json +++ b/Translations/translation_NL_BE.json @@ -23,13 +23,18 @@ "OffString": "Uit", "ResetOKMessage": "Reset OK", "YourGainMessage": "Your gain:", - "SettingsResetMessage": "Settings were\nreset!", "NoAccelerometerMessage": "No accelerometer\ndetected!", "NoPowerDeliveryMessage": "No USB-PD IC\ndetected!", "LockingKeysString": " LOCKED", "UnlockingKeysString": "UNLOCKED", "WarningKeysLockedString": "!LOCKED!" }, + "messagesWarn": { + "SettingsResetMessage": [ + "Settings were", + "reset!" + ] + }, "characters": { "SettingRightChar": "R", "SettingLeftChar": "L", @@ -37,7 +42,7 @@ "SettingFastChar": "S", "SettingSlowChar": "T", "SettingMediumChar": "M", - "SettingOffChar":"O", + "SettingOffChar": "O", "SettingStartSolderingChar": "T", "SettingStartSleepChar": "S", "SettingStartSleepOffChar": "O", diff --git a/Translations/translation_NO.json b/Translations/translation_NO.json index 987aa49f..e89c1f95 100644 --- a/Translations/translation_NO.json +++ b/Translations/translation_NO.json @@ -23,13 +23,18 @@ "OffString": "Av", "ResetOKMessage": "Reset OK", "YourGainMessage": "Your gain:", - "SettingsResetMessage": "Settings were\nreset!", "NoAccelerometerMessage": "No accelerometer\ndetected!", "NoPowerDeliveryMessage": "No USB-PD IC\ndetected!", "LockingKeysString": " LOCKED", "UnlockingKeysString": "UNLOCKED", "WarningKeysLockedString": "!LOCKED!" }, + "messagesWarn": { + "SettingsResetMessage": [ + "Settings were", + "reset!" + ] + }, "characters": { "SettingRightChar": "H", "SettingLeftChar": "V", diff --git a/Translations/translation_PL.json b/Translations/translation_PL.json index 90e998d9..34af3833 100644 --- a/Translations/translation_PL.json +++ b/Translations/translation_PL.json @@ -24,13 +24,18 @@ "OffString": "Wył", "ResetOKMessage": "Reset OK", "YourGainMessage": "Us.zysk:", - "SettingsResetMessage": "Ust. zresetowane", "NoAccelerometerMessage": "No accelerometer\ndetected!", "NoPowerDeliveryMessage": "No USB-PD IC\ndetected!", "LockingKeysString": " ZABLOK.", "UnlockingKeysString": "ODBLOK.", "WarningKeysLockedString": "!ZABLOK!" }, + "messagesWarn": { + "SettingsResetMessage": [ + "Ust. zresetowane", + "" + ] + }, "characters": { "SettingRightChar": "P", "SettingLeftChar": "L", @@ -38,7 +43,7 @@ "SettingFastChar": "S", "SettingSlowChar": "W", "SettingMediumChar": "M", - "SettingOffChar":"O", + "SettingOffChar": "O", "SettingStartSolderingChar": "T", "SettingStartSleepChar": "Z", "SettingStartSleepOffChar": "O", diff --git a/Translations/translation_PT.json b/Translations/translation_PT.json index 776b0ad7..a9294c60 100644 --- a/Translations/translation_PT.json +++ b/Translations/translation_PT.json @@ -23,13 +23,18 @@ "OffString": "Off", "ResetOKMessage": "Reset OK", "YourGainMessage": "Your gain:", - "SettingsResetMessage": "Settings were\nreset!", "NoAccelerometerMessage": "No accelerometer\ndetected!", "NoPowerDeliveryMessage": "No USB-PD IC\ndetected!", "LockingKeysString": " LOCKED", "UnlockingKeysString": "UNLOCKED", "WarningKeysLockedString": "!LOCKED!" }, + "messagesWarn": { + "SettingsResetMessage": [ + "Settings were", + "reset!" + ] + }, "characters": { "SettingRightChar": "D", "SettingLeftChar": "C", @@ -37,7 +42,7 @@ "SettingFastChar": "R", "SettingSlowChar": "L", "SettingMediumChar": "M", - "SettingOffChar":"O", + "SettingOffChar": "O", "SettingStartSolderingChar": "T", "SettingStartSleepChar": "S", "SettingStartSleepOffChar": "O", diff --git a/Translations/translation_RU.json b/Translations/translation_RU.json index 2125d675..e2e8f1e6 100644 --- a/Translations/translation_RU.json +++ b/Translations/translation_RU.json @@ -23,13 +23,18 @@ "OffString": "Выкл.", "ResetOKMessage": "Сброс OK", "YourGainMessage": "Прирост:", - "SettingsResetMessage": "Настройки\nсброшены!", "NoAccelerometerMessage": "Не определен\nакселерометр!", "NoPowerDeliveryMessage": "No USB-PD IC\ndetected!", "LockingKeysString": " LOCKED", "UnlockingKeysString": "UNLOCKED", "WarningKeysLockedString": "!LOCKED!" }, + "messagesWarn": { + "SettingsResetMessage": [ + "Настройки", + "сброшены!" + ] + }, "characters": { "SettingRightChar": "П", "SettingLeftChar": "Л", @@ -37,7 +42,7 @@ "SettingFastChar": "Б", "SettingSlowChar": "М", "SettingMediumChar": "M", - "SettingOffChar":"O", + "SettingOffChar": "O", "SettingStartSolderingChar": "П", "SettingStartSleepChar": "О", "SettingStartSleepOffChar": "К", diff --git a/Translations/translation_SK.json b/Translations/translation_SK.json index 0e0bd154..58b13827 100644 --- a/Translations/translation_SK.json +++ b/Translations/translation_SK.json @@ -23,13 +23,18 @@ "OffString": "Vyp", "ResetOKMessage": "Reset OK", "YourGainMessage": "Zisk:", - "SettingsResetMessage": "Tov. nas. obnov.", "NoAccelerometerMessage": "Bez pohyb. senz.", "NoPowerDeliveryMessage": "Chýba čip USB-PD", "LockingKeysString": " ZABLOK.", "UnlockingKeysString": "ODBLOK.", "WarningKeysLockedString": "!ZABLOK!" }, + "messagesWarn": { + "SettingsResetMessage": [ + "Tov. nas. obnov.", + "" + ] + }, "characters": { "SettingRightChar": "P", "SettingLeftChar": "L", @@ -37,7 +42,7 @@ "SettingFastChar": "R", "SettingSlowChar": "P", "SettingMediumChar": "M", - "SettingOffChar":"Z", + "SettingOffChar": "Z", "SettingStartSolderingChar": "S", "SettingStartSleepChar": "K", "SettingStartSleepOffChar": "O", diff --git a/Translations/translation_SL.json b/Translations/translation_SL.json index f066680c..7d978208 100644 --- a/Translations/translation_SL.json +++ b/Translations/translation_SL.json @@ -23,13 +23,18 @@ "OffString": "Off", "ResetOKMessage": "Reset OK", "YourGainMessage": "Ojačenje", - "SettingsResetMessage": "Nastavitve OK!", "NoAccelerometerMessage": "Ni pospeševalnik", "NoPowerDeliveryMessage": "Ni USB-PD čipa!", "LockingKeysString": "ZAKLENJ.", "UnlockingKeysString": "ODKLENJ.", "WarningKeysLockedString": "ZAKLENJ." }, + "messagesWarn": { + "SettingsResetMessage": [ + "Nastavitve OK!", + "" + ] + }, "characters": { "SettingRightChar": "D", "SettingLeftChar": "L", @@ -37,7 +42,7 @@ "SettingFastChar": "H", "SettingSlowChar": "P", "SettingMediumChar": "M", - "SettingOffChar":"U", + "SettingOffChar": "U", "SettingStartSolderingChar": "S", "SettingStartSleepChar": "Z", "SettingStartSleepOffChar": "V", diff --git a/Translations/translation_SR_CYRL.json b/Translations/translation_SR_CYRL.json index 1b722432..8c2cda41 100644 --- a/Translations/translation_SR_CYRL.json +++ b/Translations/translation_SR_CYRL.json @@ -23,13 +23,18 @@ "OffString": "Иск", "ResetOKMessage": "Reset OK", "YourGainMessage": "Your gain:", - "SettingsResetMessage": "Settings were\nreset!", "NoAccelerometerMessage": "No accelerometer\ndetected!", "NoPowerDeliveryMessage": "No USB-PD IC\ndetected!", "LockingKeysString": " LOCKED", "UnlockingKeysString": "UNLOCKED", "WarningKeysLockedString": "!LOCKED!" }, + "messagesWarn": { + "SettingsResetMessage": [ + "Settings were", + "reset!" + ] + }, "characters": { "SettingRightChar": "Д", "SettingLeftChar": "Л", @@ -37,7 +42,7 @@ "SettingFastChar": "Б", "SettingSlowChar": "С", "SettingMediumChar": "M", - "SettingOffChar":"O", + "SettingOffChar": "O", "SettingStartSolderingChar": "T", "SettingStartSleepChar": "S", "SettingStartSleepOffChar": "O", diff --git a/Translations/translation_SR_LATN.json b/Translations/translation_SR_LATN.json index 80404d47..504a2f27 100644 --- a/Translations/translation_SR_LATN.json +++ b/Translations/translation_SR_LATN.json @@ -23,13 +23,18 @@ "OffString": "Isk", "ResetOKMessage": "Reset OK", "YourGainMessage": "Your gain:", - "SettingsResetMessage": "Settings were\nreset!", "NoAccelerometerMessage": "No accelerometer\ndetected!", "NoPowerDeliveryMessage": "No USB-PD IC\ndetected!", "LockingKeysString": " LOCKED", "UnlockingKeysString": "UNLOCKED", "WarningKeysLockedString": "!LOCKED!" }, + "messagesWarn": { + "SettingsResetMessage": [ + "Settings were", + "reset!" + ] + }, "characters": { "SettingRightChar": "D", "SettingLeftChar": "L", @@ -37,7 +42,7 @@ "SettingFastChar": "B", "SettingSlowChar": "S", "SettingMediumChar": "M", - "SettingOffChar":"O", + "SettingOffChar": "O", "SettingStartSolderingChar": "T", "SettingStartSleepChar": "S", "SettingStartSleepOffChar": "O", diff --git a/Translations/translation_SV.json b/Translations/translation_SV.json index a4cdf960..02d2dc78 100644 --- a/Translations/translation_SV.json +++ b/Translations/translation_SV.json @@ -23,13 +23,18 @@ "OffString": "Av", "ResetOKMessage": "Reset OK", "YourGainMessage": "Your gain:", - "SettingsResetMessage": "Settings were\nreset!", "NoAccelerometerMessage": "No accelerometer\ndetected!", "NoPowerDeliveryMessage": "No USB-PD IC\ndetected!", "LockingKeysString": " LOCKED", "UnlockingKeysString": "UNLOCKED", "WarningKeysLockedString": "!LOCKED!" }, + "messagesWarn": { + "SettingsResetMessage": [ + "Settings were", + "reset!" + ] + }, "characters": { "SettingRightChar": "H", "SettingLeftChar": "V", @@ -37,7 +42,7 @@ "SettingFastChar": "S", "SettingSlowChar": "L", "SettingMediumChar": "M", - "SettingOffChar":"O", + "SettingOffChar": "O", "SettingStartSolderingChar": "T", "SettingStartSleepChar": "S", "SettingStartSleepOffChar": "O", diff --git a/Translations/translation_TR.json b/Translations/translation_TR.json index 422ced48..49b7fea1 100644 --- a/Translations/translation_TR.json +++ b/Translations/translation_TR.json @@ -23,10 +23,15 @@ "OffString": "Kapalı", "ResetOKMessage": "Sıfırlama Tamam", "YourGainMessage": "Kazancınız:", - "SettingsResetMessage": "Ayarlar Sıfırlandı", "NoAccelerometerMessage": "No accelerometer\ndetected!", "NoPowerDeliveryMessage": "No USB-PD IC\ndetected!" }, + "messagesWarn": { + "SettingsResetMessage": [ + "Ayarlar", + "Sıfırlandı" + ] + }, "characters": { "SettingRightChar": "R", "SettingLeftChar": "L", @@ -34,7 +39,7 @@ "SettingFastChar": "F", "SettingSlowChar": "S", "SettingMediumChar": "M", - "SettingOffChar":"O", + "SettingOffChar": "O", "SettingStartSolderingChar": "T", "SettingStartSleepChar": "S", "SettingStartSleepOffChar": "O", diff --git a/Translations/translation_UK.json b/Translations/translation_UK.json index a110fec8..259985e0 100644 --- a/Translations/translation_UK.json +++ b/Translations/translation_UK.json @@ -23,13 +23,18 @@ "OffString": "Вимк", "ResetOKMessage": "Скид. OK", "YourGainMessage": "Приріст:", - "SettingsResetMessage": "Налаштування\nскинуті!", "NoAccelerometerMessage": "Акселерометр\nне виявлено!", "NoPowerDeliveryMessage": "USB-PD IC\nне виявлено!", "LockingKeysString": " ЗАБЛОК.", "UnlockingKeysString": "РОЗБЛОК.", "WarningKeysLockedString": "!ЗАБЛОК!" }, + "messagesWarn": { + "SettingsResetMessage": [ + "Налаштування", + "скинуті!" + ] + }, "characters": { "SettingRightChar": "П", "SettingLeftChar": "Л", @@ -37,7 +42,7 @@ "SettingFastChar": "Ш", "SettingSlowChar": "П", "SettingMediumChar": "M", - "SettingOffChar":"B", + "SettingOffChar": "B", "SettingStartSolderingChar": "П", "SettingStartSleepChar": "О", "SettingStartSleepOffChar": "К", diff --git a/Translations/translation_YUE_HK.json b/Translations/translation_YUE_HK.json index 6cb3c7c5..737a8b61 100644 --- a/Translations/translation_YUE_HK.json +++ b/Translations/translation_YUE_HK.json @@ -24,13 +24,15 @@ "OffString": "關", "ResetOKMessage": "已重設！", "YourGainMessage": "Your gain:", - "SettingsResetMessage": "\n設定已被重設！", "NoAccelerometerMessage": "No accelerometer\ndetected!", "NoPowerDeliveryMessage": "No USB-PD IC\ndetected!", "LockingKeysString": "已鎖定", "UnlockingKeysString": "已解除鎖定", "WarningKeysLockedString": "!撳掣鎖定!" }, + "messagesWarn": { + "SettingsResetMessage": "設定已被重設！" + }, "characters": { "SettingRightChar": "右", "SettingLeftChar": "左", @@ -38,7 +40,7 @@ "SettingFastChar": "快", "SettingSlowChar": "慢", "SettingMediumChar": "中", - "SettingOffChar":"關", + "SettingOffChar": "關", "SettingStartSolderingChar": "焊", "SettingStartSleepChar": "待", "SettingStartSleepOffChar": "室", diff --git a/Translations/translation_ZH_TW.json b/Translations/translation_ZH_TW.json index 875d2f18..b957882e 100644 --- a/Translations/translation_ZH_TW.json +++ b/Translations/translation_ZH_TW.json @@ -24,13 +24,15 @@ "OffString": "關", "ResetOKMessage": "已重設！", "YourGainMessage": "Your gain:", - "SettingsResetMessage": "\n設定已被重設！", "NoAccelerometerMessage": "No accelerometer\ndetected!", "NoPowerDeliveryMessage": "No USB-PD IC\ndetected!", "LockingKeysString": "已鎖定", "UnlockingKeysString": "已解除鎖定", "WarningKeysLockedString": "!按鍵鎖定!" }, + "messagesWarn": { + "SettingsResetMessage": "設定已被重設！" + }, "characters": { "SettingRightChar": "右", "SettingLeftChar": "左", @@ -38,7 +40,7 @@ "SettingFastChar": "快", "SettingSlowChar": "慢", "SettingMediumChar": "中", - "SettingOffChar":"關", + "SettingOffChar": "關", "SettingStartSolderingChar": "焊", "SettingStartSleepChar": "待", "SettingStartSleepOffChar": "室", diff --git a/Translations/translations_def.js b/Translations/translations_def.js index b8d4aa5d..229d9b95 100644 --- a/Translations/translations_def.js +++ b/Translations/translations_def.js @@ -90,11 +90,6 @@ var def = "maxLen": 8, "default": "Your Gain" }, - { - "id": "SettingsResetMessage", - "maxLen": 16, - "default": "Settings were\nreset!" - }, { "id": "NoAccelerometerMessage", "maxLen": 16, @@ -121,6 +116,11 @@ var def = "default": "LOCKED!" } ], + "messagesWarn": [ + { + "id": "SettingsResetMessage" + } + ], "characters": [ { "id": "SettingRightChar", diff --git a/source/Core/Inc/Translation.h b/source/Core/Inc/Translation.h index 31354a12..43446a3f 100644 --- a/source/Core/Inc/Translation.h +++ b/source/Core/Inc/Translation.h @@ -37,13 +37,14 @@ extern const char *SolderingAdvancedPowerPrompt; extern const char *OffString; extern const char *ResetOKMessage; extern const char *YourGainMessage; -extern const char *SettingsResetMessage; extern const char *NoAccelerometerMessage; extern const char *NoPowerDeliveryMessage; extern const char *LockingKeysString; extern const char *UnlockingKeysString; extern const char *WarningKeysLockedString; +extern const char *SettingsResetMessage; + extern const char *SettingRightChar; extern const char *SettingLeftChar; extern const char *SettingAutoChar; diff --git a/source/Makefile b/source/Makefile index 5a5c3070..008c05ed 100644 --- a/source/Makefile +++ b/source/Makefile @@ -316,7 +316,7 @@ $(OUT_OBJS_S): $(OUTPUT_DIR)/%.o: %.S Makefile @echo 'Building file: $<' @$(AS) -c $(AFLAGS) $< -o $@ -Core/Gen/Translation.%.cpp: ../Translations/translation_%.json Makefile ../Translations/make_translation.py ../Translations/translations_commons.js ../Translations/font_tables.py ../Translations/wqy-bitmapsong/wenquanyi_9pt.bdf +Core/Gen/Translation.%.cpp: ../Translations/translation_%.json Makefile ../Translations/make_translation.py ../Translations/translations_def.js ../Translations/font_tables.py ../Translations/wqy-bitmapsong/wenquanyi_9pt.bdf @test -d $(@D) || mkdir -p $(@D) @echo 'Generating translations for language $*' @python3 ../Translations/make_translation.py -o $(PWD)/$@ $*