3DPrinting/Prusa-Firmware
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix missing first two characters in multi-lang mode

Browse source
This commit is contained in:
leptun 2019-08-10 09:16:23 +03:00
parent 29dcb1cad3
commit 7ce2fedac7
11 changed files with 17 additions and 21 deletions

2
Firmware/Marlin_main.cpp
View file

@ -6131,7 +6131,7 @@ Sigma_Exit:
WRITE(PS_ON_PIN, PS_ON_ASLEEP);
#endif
powersupply = false;
LCD_MESSAGERPGM(CAT4(CUSTOM_MENDEL_NAME,PSTR(" "),MSG_OFF,PSTR(".")));
LCD_MESSAGERPGM(CAT4(CUSTOM_MENDEL_NAME,PSTR(" "),_i("Off"),PSTR(".")));
lcd_update(0);
break;

2
Firmware/messages.c
View file

@ -104,8 +104,6 @@ const char MSG_WIZARD_QUIT[] PROGMEM_I1 = ISTR("You can always resume the Wizard
const char MSG_YES[] PROGMEM_I1 = ISTR("Yes"); ////
const char MSG_V2_CALIBRATION[] PROGMEM_I1 = ISTR("First layer cal."); ////c=17 r=1
const char WELCOME_MSG[] PROGMEM_I1 = ISTR(CUSTOM_MENDEL_NAME " OK."); ////c=20
const char MSG_OFF[] PROGMEM_I1 = "Off"; ////c=3 r=1
const char MSG_ON[] PROGMEM_I1 = "On"; ////c=2 r=1
//not internationalized messages
const char MSG_SD_WORKDIR_FAIL[] PROGMEM_N1 = "workDir open failed"; ////
const char MSG_BROWNOUT_RESET[] PROGMEM_N1 = " Brown out Reset"; ////

2
Firmware/messages.h
View file

@ -104,8 +104,6 @@ extern const char MSG_WIZARD_QUIT[];
extern const char MSG_YES[];
extern const char MSG_V2_CALIBRATION[];
extern const char WELCOME_MSG[];
extern const char MSG_OFF[];
extern const char MSG_ON[];
//not internationalized messages
extern const char MSG_BROWNOUT_RESET[];
extern const char MSG_EXTERNAL_RESET[];

4
Firmware/ultralcd.cpp
View file

@ -5569,7 +5569,7 @@ static void lcd_settings_menu()
SETTINGS_CUTTER;
MENU_ITEM_TOGGLE_P(_i("Fans check"), fans_check_enabled ? _T(MSG_ON) : _T(MSG_OFF), lcd_set_fan_check);
MENU_ITEM_TOGGLE_P(_i("Fans check"), fans_check_enabled ? _i("On") : _i("Off"), lcd_set_fan_check);
SETTINGS_SILENT_MODE;
@ -6878,7 +6878,7 @@ static void lcd_tune_menu()
if(farm_mode)
{
MENU_ITEM_TOGGLE_P(_i("Fans check"), fans_check_enabled ? _T(MSG_ON) : _T(MSG_OFF), lcd_set_fan_check);
MENU_ITEM_TOGGLE_P(_i("Fans check"), fans_check_enabled ? _i("On") : _i("Off"), lcd_set_fan_check);
}
#ifdef TMC2130

4
lang/lang_en.txt
View file

@ -925,8 +925,8 @@
#
"Y-correct:"
#MSG_OFF
#
"Off"
#MSG_ON
#
"On"

4
lang/lang_en_cz.txt
View file

@ -1234,10 +1234,10 @@
"Y-correct:"
"Korekce Y:"
#MSG_OFF
#
"Off"
"Vyp"
#MSG_ON
#
"On"
"Zap"

4
lang/lang_en_de.txt
View file

@ -1235,10 +1235,10 @@
"Y-correct:"
"Y-Korrektur:"
#MSG_OFF
#
"Off"
"Aus"
#MSG_ON
#
"On"
"An"

4
lang/lang_en_es.txt
View file

@ -1234,10 +1234,10 @@
"Y-correct:"
"Y-correcion:"
#MSG_OFF
#
"Off"
"Ina"
#MSG_ON
#
"On"
"Act"

4
lang/lang_en_fr.txt
View file

@ -1234,10 +1234,10 @@
"Y-correct:"
"Correct-Y:"
#MSG_OFF
#
"Off"
"\x00"
#MSG_ON
#
"On"
"\x00"

4
lang/lang_en_it.txt
View file

@ -1234,10 +1234,10 @@
"Y-correct:"
"Correzione-Y:"
#MSG_OFF
#
"Off"
"\x00"
#MSG_ON
#
"On"
"\x00"

4
lang/lang_en_pl.txt
View file

@ -1234,10 +1234,10 @@
"Y-correct:"
"Korekcja Y:"
#MSG_OFF
#
"Off"
"Wyl"
#MSG_ON
#
"On"
"Wl"