bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

Do not implicitly concatenate localized strings (#15383)

Browse Source
This commit is contained in:
Marcio Teixeira
2019-09-27 03:38:43 -06:00
committed by Scott Lahteine
parent 62e4e05a19
commit a18d16fb8b
7 changed files with 62 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Marlin/src/module/endstops.cpp
View File

@ -373,7 +373,7 @@ void Endstops::event_handler() {
SERIAL_EOL();
#if HAS_SPI_LCD
ui.status_printf_P(0, PSTR(MSG_LCD_ENDSTOPS " %c %c %c %c"), chrX, chrY, chrZ, chrP);
ui.status_printf_P(0, PSTR(S_FMT " %c %c %c %c"), PSTR(MSG_LCD_ENDSTOPS), chrX, chrY, chrZ, chrP);
#endif
#if BOTH(SD_ABORT_ON_ENDSTOP_HIT, SDSUPPORT)

13
Marlin/src/module/temperature.cpp
View File

@ -2933,11 +2933,14 @@ void Temperature::isr() {
#if HOTENDS && HAS_DISPLAY
void Temperature::set_heating_message(const uint8_t e) {
const bool heating = isHeatingHotend(e);
#if HOTENDS > 1
ui.status_printf_P(0, heating ? PSTR("E%c " MSG_HEATING) : PSTR("E%c " MSG_COOLING), '1' + e);
#else
ui.set_status_P(heating ? PSTR("E " MSG_HEATING) : PSTR("E " MSG_COOLING));
#endif
ui.status_printf_P(0,
#if HOTENDS > 1
PSTR("E%c " S_FMT), '1' + e
#else
PSTR("E " S_FMT)
#endif
, heating ? PSTR(MSG_HEATING) : PSTR(MSG_COOLING)
);
}
#endif