From fbb3fad64bf8fab1a27393d896a5f4c07d82586c Mon Sep 17 00:00:00 2001 From: 3d-gussner <3d.gussner@gmail.com> Date: Mon, 25 Jan 2021 16:54:26 +0100 Subject: [PATCH] Remove duplicate string `Last print` using `MSG_LAST_PRINT` --- Firmware/messages.c | 1 + Firmware/messages.h | 1 + Firmware/ultralcd.cpp | 8 ++++---- lang/lang_en.txt | 2 +- lang/lang_en_cz.txt | 2 +- lang/lang_en_de.txt | 2 +- lang/lang_en_es.txt | 2 +- lang/lang_en_fr.txt | 2 +- lang/lang_en_it.txt | 2 +- lang/lang_en_pl.txt | 2 +- 10 files changed, 13 insertions(+), 11 deletions(-) diff --git a/Firmware/messages.c b/Firmware/messages.c index 2fa3796c7..7cb304fc8 100644 --- a/Firmware/messages.c +++ b/Firmware/messages.c @@ -46,6 +46,7 @@ const char MSG_HEATING_COMPLETE[] PROGMEM_I1 = ISTR("Heating done."); ////c=20 const char MSG_HOMEYZ[] PROGMEM_I1 = ISTR("Calibrate Z"); //// const char MSG_CHOOSE_EXTRUDER[] PROGMEM_I1 = ISTR("Choose extruder:"); ////c=20 r=1 const char MSG_CHOOSE_FILAMENT[] PROGMEM_I1 = ISTR("Choose filament:"); ////c=20 r=1 +const char MSG_LAST_PRINT[] PROGMEM_I1 = ISTR("Last print"); ////c=18 const char MSG_LOAD_FILAMENT[] PROGMEM_I1 = ISTR("Load filament"); //// Number 1 to 5 is added behind text e.g. "Load filament 1" c=16 const char MSG_LOADING_FILAMENT[] PROGMEM_I1 = ISTR("Loading filament"); ////c=20 const char MSG_EJECT_FILAMENT[] PROGMEM_I1 = ISTR("Eject filament"); //// Number 1 to 5 is added behind text e.g. "Eject filament 1" c=16 diff --git a/Firmware/messages.h b/Firmware/messages.h index f544c6073..4a363ba40 100644 --- a/Firmware/messages.h +++ b/Firmware/messages.h @@ -47,6 +47,7 @@ extern const char MSG_HEATING_COMPLETE[]; extern const char MSG_HOMEYZ[]; extern const char MSG_CHOOSE_EXTRUDER[]; extern const char MSG_CHOOSE_FILAMENT[]; +extern const char MSG_LAST_PRINT[]; extern const char MSG_LOAD_FILAMENT[]; extern const char MSG_LOADING_FILAMENT[]; extern const char MSG_M117_V2_CALIBRATION[]; diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 26cb63bfd..7d2e26d48 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -1638,7 +1638,7 @@ void lcd_menu_extruder_info() // NOT static due to using ins //! @code{.unparsed} //! |01234567890123456789| //! | Main | c=18 r=1 -//! | Last print | c=18 r=1 +//! | Last print | MSG_LAST_PRINT c=18 //! | Total | c=18 r=1 //! | | //! ---------------------- @@ -1647,7 +1647,7 @@ static void lcd_menu_fails_stats_mmu() { MENU_BEGIN(); MENU_ITEM_BACK_P(_T(MSG_MAIN)); - MENU_ITEM_SUBMENU_P(_i("Last print"), lcd_menu_fails_stats_mmu_print); ////c=18 r=1 + MENU_ITEM_SUBMENU_P(_T(MSG_LAST_PRINT), lcd_menu_fails_stats_mmu_print); MENU_ITEM_SUBMENU_P(_i("Total"), lcd_menu_fails_stats_mmu_total); ////c=18 r=1 MENU_END(); } @@ -1780,7 +1780,7 @@ static void lcd_menu_fails_stats_print() //! @code{.unparsed} //! |01234567890123456789| //! | Main | c=18 r=1 -//! | Last print | c=18 r=1 +//! | Last print | MSG_LAST_PRINT c=18 //! | Total | c=18 r=1 //! | | //! ---------------------- @@ -1790,7 +1790,7 @@ static void lcd_menu_fails_stats() { MENU_BEGIN(); MENU_ITEM_BACK_P(_T(MSG_MAIN)); - MENU_ITEM_SUBMENU_P(_i("Last print"), lcd_menu_fails_stats_print); ////c=18 r=1 + MENU_ITEM_SUBMENU_P(_T(MSG_LAST_PRINT), lcd_menu_fails_stats_print); ////c=18 r=1 MENU_ITEM_SUBMENU_P(_i("Total"), lcd_menu_fails_stats_total); ////c=18 r=1 MENU_END(); } diff --git a/lang/lang_en.txt b/lang/lang_en.txt index 89996f85d..c10879ca2 100644 --- a/lang/lang_en.txt +++ b/lang/lang_en.txt @@ -385,7 +385,7 @@ # "If you have additional steel sheets, calibrate their presets in Settings - HW Setup - Steel sheets." -# +#MSG_LAST_PRINT c=18 "Last print" #MSG_SELFTEST_EXTRUDER_FAN c=20 diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt index a06822541..28d78c441 100644 --- a/lang/lang_en_cz.txt +++ b/lang/lang_en_cz.txt @@ -514,7 +514,7 @@ "If you have additional steel sheets, calibrate their presets in Settings - HW Setup - Steel sheets." "Mate-li vice tiskovych platu, kalibrujte je v menu Nastaveni - HW nastaveni - Tiskove platy" -# +#MSG_LAST_PRINT c=18 "Last print" "Posledni tisk" diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt index 7df5e9ecb..893363ac4 100644 --- a/lang/lang_en_de.txt +++ b/lang/lang_en_de.txt @@ -514,7 +514,7 @@ "If you have additional steel sheets, calibrate their presets in Settings - HW Setup - Steel sheets." "Wenn Sie zusaetzliche Stahlbleche haben, kalibrieren Sie deren Voreinstellungen unter Einstellungen - HW Setup - Stahlbleche." -# +#MSG_LAST_PRINT c=18 "Last print" "Letzter Druck" diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt index 02cd82a0b..9c860f27d 100644 --- a/lang/lang_en_es.txt +++ b/lang/lang_en_es.txt @@ -514,7 +514,7 @@ "If you have additional steel sheets, calibrate their presets in Settings - HW Setup - Steel sheets." "Si tienes planchas de acero adicionales, calibra sus ajustes en Ajustes - Ajustes HW - Planchas acero." -# +#MSG_LAST_PRINT c=18 "Last print" "Ultima impresion" diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt index a117bb6be..43b810685 100644 --- a/lang/lang_en_fr.txt +++ b/lang/lang_en_fr.txt @@ -514,7 +514,7 @@ "If you have additional steel sheets, calibrate their presets in Settings - HW Setup - Steel sheets." "Si vous avez d'autres feuilles d'acier, calibrez leurs pre-reglages dans Reglages - Config HW - Plaque en acier." -# +#MSG_LAST_PRINT c=18 "Last print" "Derniere impres." diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt index 256e2ecff..0043c6d09 100644 --- a/lang/lang_en_it.txt +++ b/lang/lang_en_it.txt @@ -514,7 +514,7 @@ "If you have additional steel sheets, calibrate their presets in Settings - HW Setup - Steel sheets." "Se hai piastre d'acciaio aggiuntive, calibra i preset in Impostazioni - Setup HW - Piastre in Acciaio." -# +#MSG_LAST_PRINT c=18 "Last print" "Ultima stampa" diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt index 4659053ef..b3f6893bd 100644 --- a/lang/lang_en_pl.txt +++ b/lang/lang_en_pl.txt @@ -514,7 +514,7 @@ "If you have additional steel sheets, calibrate their presets in Settings - HW Setup - Steel sheets." "Jesli masz dodatkowe plyty stalowe, to skalibruj ich ustawienia w menu Ustawienia - Ustawienia HW - Plyty stalowe." -# +#MSG_LAST_PRINT c=18 "Last print" "Ost. wydruk"