From b33739d49334327c65545760aadde6e94c79109b Mon Sep 17 00:00:00 2001 From: Tannoo Date: Wed, 16 Aug 2017 08:49:04 -0600 Subject: [PATCH] UBL_Language_Update (#7520) * UBL_Language_Update Translatable strings * Use slightly better wording... * Use slightly better wording... --- Marlin/language_en.h | 9 +++++++++ Marlin/ultralcd.cpp | 8 ++++---- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/Marlin/language_en.h b/Marlin/language_en.h index 52d9aa49e..05509fb9c 100644 --- a/Marlin/language_en.h +++ b/Marlin/language_en.h @@ -328,6 +328,15 @@ #ifndef MSG_UBL_SAVE_MESH #define MSG_UBL_SAVE_MESH _UxGT("Save Bed Mesh") #endif +#ifndef MSG_MESH_LOADED + #define MSG_MESH_LOADED _UxGT("Mesh %i loaded") +#endif +#ifndef MSG_MESH_SAVED + #define MSG_MESH_SAVED _UxGT("Mesh %i saved") +#endif +#ifndef MSG_NO_STORAGE + #define MSG_NO_STORAGE _UxGT("No storage") +#endif #ifndef MSG_UBL_SAVE_ERROR #define MSG_UBL_SAVE_ERROR _UxGT("Err: UBL Save") #endif diff --git a/Marlin/ultralcd.cpp b/Marlin/ultralcd.cpp index c29c661a3..352d68aa4 100644 --- a/Marlin/ultralcd.cpp +++ b/Marlin/ultralcd.cpp @@ -2121,7 +2121,7 @@ void kill_screen(const char* lcd_msg) { char UBL_LCD_GCODE[25]; sprintf_P(UBL_LCD_GCODE, PSTR("G29 L%i"), ubl_storage_slot); enqueue_and_echo_command(UBL_LCD_GCODE); - sprintf_P(UBL_LCD_GCODE, PSTR("M117 Map %i loaded."), ubl_storage_slot); + sprintf_P(UBL_LCD_GCODE, PSTR("M117 " MSG_MESH_LOADED "."), ubl_storage_slot); enqueue_and_echo_command(UBL_LCD_GCODE); } @@ -2132,7 +2132,7 @@ void kill_screen(const char* lcd_msg) { char UBL_LCD_GCODE[25]; sprintf_P(UBL_LCD_GCODE, PSTR("G29 S%i"), ubl_storage_slot); enqueue_and_echo_command(UBL_LCD_GCODE); - sprintf_P(UBL_LCD_GCODE, PSTR("M117 Map %i saved."), ubl_storage_slot); + sprintf_P(UBL_LCD_GCODE, PSTR("M117 " MSG_MESH_SAVED "."), ubl_storage_slot); enqueue_and_echo_command(UBL_LCD_GCODE); } @@ -2149,8 +2149,8 @@ void kill_screen(const char* lcd_msg) { START_MENU(); MENU_BACK(MSG_UBL_LEVEL_BED); if (!WITHIN(ubl_storage_slot, 0, a - 1)) { - STATIC_ITEM("No storage"); - STATIC_ITEM("Initialize EEPROM"); + STATIC_ITEM(MSG_NO_STORAGE); + STATIC_ITEM(MSG_INIT_EEPROM); } else { MENU_ITEM_EDIT(int3, MSG_UBL_STORAGE_SLOT, &ubl_storage_slot, 0, a - 1);