Skip to content

Commit

Permalink
🚸 Fix homing_needed_error language
Browse files Browse the repository at this point in the history
  • Loading branch information
@thinkyhead @Andy-Big
thinkyhead authored and Andy-Big committed Jul 9, 2023
1 parent ed61e6c commit 234677e
Show file tree
Hide file tree
Showing 24 changed files with 31 additions and 26 deletions.
2 changes: 1 addition & 1 deletion Marlin/src/lcd/language/language_ca.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ namespace Language_ca {
LSTR MSG_CHANGE_MEDIA = _UxGT("Canvia SD");
LSTR MSG_ZPROBE_OUT = _UxGT("Sonda Z fora");
LSTR MSG_BLTOUCH_RESET = _UxGT("Reinicia BLTouch");
LSTR MSG_HOME_FIRST = _UxGT("Home %s%s%s primer");
LSTR MSG_HOME_FIRST = _UxGT("Home %s primer");
LSTR MSG_ZPROBE_ZOFFSET = _UxGT("Decalatge Z");
LSTR MSG_BABYSTEP_X = _UxGT("Micropas X");
LSTR MSG_BABYSTEP_Y = _UxGT("Micropas Y");
Expand Down
2 changes: 1 addition & 1 deletion Marlin/src/lcd/language/language_cz.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -395,7 +395,7 @@ namespace Language_cz {
LSTR MSG_MANUAL_DEPLOY_TOUCHMI = _UxGT("vysunout TouchMI");
LSTR MSG_MANUAL_DEPLOY = _UxGT("Vysunout Z-sondu");
LSTR MSG_MANUAL_STOW = _UxGT("Zasunout Z-sondu");
LSTR MSG_HOME_FIRST = _UxGT("Domů %s%s%s první");
LSTR MSG_HOME_FIRST = _UxGT("Domů %s první");
LSTR MSG_ZPROBE_ZOFFSET = _UxGT("Z ofset");
LSTR MSG_BABYSTEP_X = _UxGT("Babystep X");
LSTR MSG_BABYSTEP_Y = _UxGT("Babystep Y");
Expand Down
2 changes: 1 addition & 1 deletion Marlin/src/lcd/language/language_da.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ namespace Language_da {
LSTR MSG_CHANGE_MEDIA = _UxGT("Skift SD kort");
LSTR MSG_ZPROBE_OUT = _UxGT("Probe udenfor plade");
LSTR MSG_BLTOUCH_SELFTEST = _UxGT("BLTouch Selv-Test");
LSTR MSG_HOME_FIRST = _UxGT("Home %s%s%s først");
LSTR MSG_HOME_FIRST = _UxGT("Home %s først");
LSTR MSG_HEATING_FAILED_LCD = _UxGT("Opvarmning fejlet");
LSTR MSG_ERR_REDUNDANT_TEMP = _UxGT("Fejl: reserve temp");
LSTR MSG_THERMAL_RUNAWAY = _UxGT("Temp løber løbsk");
Expand Down
2 changes: 1 addition & 1 deletion Marlin/src/lcd/language/language_de.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -539,7 +539,7 @@ namespace Language_de {
LSTR MSG_MANUAL_DEPLOY_TOUCHMI = _UxGT("TouchMI ausfahren");
LSTR MSG_MANUAL_DEPLOY = _UxGT("Z-Sonde ausfahren");
LSTR MSG_MANUAL_STOW = _UxGT("Z-Sonde einfahren");
LSTR MSG_HOME_FIRST = _UxGT("Vorher %s%s%s homen");
LSTR MSG_HOME_FIRST = _UxGT("Vorher %s homen");
LSTR MSG_ZPROBE_SETTINGS = _UxGT("Sondeneinstellungen");
LSTR MSG_ZPROBE_OFFSETS = _UxGT("Sondenversatz");
LSTR MSG_ZPROBE_XOFFSET = _UxGT("Sondenversatz X");
Expand Down
2 changes: 1 addition & 1 deletion Marlin/src/lcd/language/language_en.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -599,7 +599,7 @@ namespace Language_en {
LSTR MSG_MANUAL_DEPLOY_TOUCHMI = _UxGT("Deploy TouchMI");
LSTR MSG_MANUAL_DEPLOY = _UxGT("Deploy Z-Probe");
LSTR MSG_MANUAL_STOW = _UxGT("Stow Z-Probe");
LSTR MSG_HOME_FIRST = _UxGT("Home %s%s%s First");
LSTR MSG_HOME_FIRST = _UxGT("Home %s First");
LSTR MSG_ZPROBE_SETTINGS = _UxGT("Probe Settings");
LSTR MSG_ZPROBE_OFFSETS = _UxGT("Probe Offsets");
LSTR MSG_ZPROBE_XOFFSET = _UxGT("Probe X Offset");
Expand Down
2 changes: 1 addition & 1 deletion Marlin/src/lcd/language/language_es.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -398,7 +398,7 @@ namespace Language_es {
LSTR MSG_MANUAL_DEPLOY_TOUCHMI = _UxGT("Subir TouchMI");
LSTR MSG_MANUAL_DEPLOY = _UxGT("Subir Sonda Z");
LSTR MSG_MANUAL_STOW = _UxGT("Bajar Sonda Z");
LSTR MSG_HOME_FIRST = _UxGT("Origen %s%s%s Prim.");
LSTR MSG_HOME_FIRST = _UxGT("Origen %s Prim.");
LSTR MSG_ZPROBE_OFFSETS = _UxGT("Desf. Sonda");
LSTR MSG_ZPROBE_XOFFSET = _UxGT("Desf. Sonda X");
LSTR MSG_ZPROBE_YOFFSET = _UxGT("Desf. Sonda Y");
Expand Down
2 changes: 1 addition & 1 deletion Marlin/src/lcd/language/language_eu.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -235,7 +235,7 @@ namespace Language_eu {
LSTR MSG_BLTOUCH_RESET = _UxGT("BLTouch berrabia.");
LSTR MSG_BLTOUCH_DEPLOY = _UxGT("BLTouch jaitsi/luzatu");
LSTR MSG_BLTOUCH_STOW = _UxGT("BLTouch igo/jaso");
LSTR MSG_HOME_FIRST = _UxGT("Etxera %s%s%s lehenengo");
LSTR MSG_HOME_FIRST = _UxGT("Etxera %s lehenengo");
LSTR MSG_ZPROBE_ZOFFSET = _UxGT("Z Konpentsatu");
LSTR MSG_BABYSTEP_X = _UxGT("Mikro-urratsa X");
LSTR MSG_BABYSTEP_Y = _UxGT("Mikro-urratsa Y");
Expand Down
2 changes: 1 addition & 1 deletion Marlin/src/lcd/language/language_fr.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -424,7 +424,7 @@ namespace Language_fr {
LSTR MSG_MANUAL_DEPLOY_TOUCHMI = _UxGT("Déployer TouchMI");
LSTR MSG_MANUAL_DEPLOY = _UxGT("Déployer Sonde Z");
LSTR MSG_MANUAL_STOW = _UxGT("Ranger Sonde Z");
LSTR MSG_HOME_FIRST = _UxGT("Origine %s%s%s Premier");
LSTR MSG_HOME_FIRST = _UxGT("Origine %s Premier");
LSTR MSG_ZPROBE_OFFSETS = _UxGT("Position sonde Z");
LSTR MSG_ZPROBE_XOFFSET = _UxGT("Décalage X");
LSTR MSG_ZPROBE_YOFFSET = _UxGT("Décalage Y");
Expand Down
2 changes: 1 addition & 1 deletion Marlin/src/lcd/language/language_gl.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -413,7 +413,7 @@ namespace Language_gl {
LSTR MSG_MANUAL_DEPLOY_TOUCHMI = _UxGT("Estender TouchMI");
LSTR MSG_MANUAL_DEPLOY = _UxGT("Estender Sonda Z");
LSTR MSG_MANUAL_STOW = _UxGT("Recoller Sonda Z");
LSTR MSG_HOME_FIRST = _UxGT("Orixe %s%s%s Primeiro");
LSTR MSG_HOME_FIRST = _UxGT("Orixe %s Primeiro");
LSTR MSG_ZPROBE_OFFSETS = _UxGT("Desfases Sonda");
LSTR MSG_ZPROBE_XOFFSET = _UxGT("Desfase Sonda X");
LSTR MSG_ZPROBE_YOFFSET = _UxGT("Desfase Sonda Y");
Expand Down
2 changes: 1 addition & 1 deletion Marlin/src/lcd/language/language_hu.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -467,7 +467,7 @@ namespace Language_hu {
LSTR MSG_MANUAL_DEPLOY_TOUCHMI = _UxGT("TouchMI használ");
LSTR MSG_MANUAL_DEPLOY = _UxGT("Z-Szonda telepítés");
LSTR MSG_MANUAL_STOW = _UxGT("Z-Szonda elhelyezés");
LSTR MSG_HOME_FIRST = _UxGT("Elöször %s%s%s kell");
LSTR MSG_HOME_FIRST = _UxGT("Elöször %s kell");
LSTR MSG_ZPROBE_OFFSETS = _UxGT("Szonda eltolások");
LSTR MSG_ZPROBE_XOFFSET = _UxGT("X szonda eltolás");
LSTR MSG_ZPROBE_YOFFSET = _UxGT("Y szonda eltolás");
Expand Down
2 changes: 1 addition & 1 deletion Marlin/src/lcd/language/language_it.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -564,7 +564,7 @@ namespace Language_it {
LSTR MSG_MANUAL_DEPLOY = _UxGT("Estendi Sonda-Z");
LSTR MSG_BLTOUCH_STOW = _UxGT("Ritrai BLTouch");
LSTR MSG_MANUAL_STOW = _UxGT("Ritrai Sonda-Z");
LSTR MSG_HOME_FIRST = _UxGT("Home %s%s%s prima");
LSTR MSG_HOME_FIRST = _UxGT("Home %s prima");
LSTR MSG_ZPROBE_SETTINGS = _UxGT("Impostazioni sonda");
LSTR MSG_ZPROBE_OFFSETS = _UxGT("Offsets sonda");
LSTR MSG_ZPROBE_XOFFSET = _UxGT("Offset X sonda");
Expand Down
2 changes: 1 addition & 1 deletion Marlin/src/lcd/language/language_jp_kana.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@ namespace Language_jp_kana {
LSTR MSG_ZPROBE_OUT = _UxGT("Zプローブ ベッドガイ"); // "Z probe out. bed"
LSTR MSG_BLTOUCH_SELFTEST = _UxGT("BLTouch ジコシンダン"); // "BLTouch Self-Test"
LSTR MSG_BLTOUCH_RESET = _UxGT("BLTouch リセット"); // "Reset BLTouch"
LSTR MSG_HOME_FIRST = _UxGT("サキニ %s%s%s ヲフッキサセテクダサイ"); // "Home ... first"
LSTR MSG_HOME_FIRST = _UxGT("サキニ %s ヲフッキサセテクダサイ"); // "Home ... first"
LSTR MSG_ZPROBE_ZOFFSET = _UxGT("Zオフセット"); // "Z Offset"
LSTR MSG_BABYSTEP_X = _UxGT("Xジク ビドウ"); // "Babystep X"
LSTR MSG_BABYSTEP_Y = _UxGT("Yジク ビドウ"); // "Babystep Y"
Expand Down
2 changes: 1 addition & 1 deletion Marlin/src/lcd/language/language_nl.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ namespace Language_nl {
LSTR MSG_ZPROBE_OUT = _UxGT("Z probe uit. bed");
LSTR MSG_BLTOUCH_SELFTEST = _UxGT("BLTouch Zelf-Test");
LSTR MSG_BLTOUCH_RESET = _UxGT("Reset BLTouch");
LSTR MSG_HOME_FIRST = _UxGT("Home %s%s%s Eerst");
LSTR MSG_HOME_FIRST = _UxGT("Home %s Eerst");
LSTR MSG_ZPROBE_ZOFFSET = _UxGT("Z Offset"); // accepted English term in Dutch
LSTR MSG_BABYSTEP_X = _UxGT("Babystap X");
LSTR MSG_BABYSTEP_Y = _UxGT("Babystap Y");
Expand Down
2 changes: 1 addition & 1 deletion Marlin/src/lcd/language/language_pl.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -372,7 +372,7 @@ namespace Language_pl {
LSTR MSG_BLTOUCH_SELFTEST = _UxGT("BLTouch Self-Test");
LSTR MSG_BLTOUCH_RESET = _UxGT("Reset BLTouch");
LSTR MSG_BLTOUCH_MODE_CHANGE = _UxGT("UWAGA: Złe ustawienia mogą uszkodzić drukarkę. Kontynuować?");
LSTR MSG_HOME_FIRST = _UxGT("Najpierw Home %s%s%s");
LSTR MSG_HOME_FIRST = _UxGT("Najpierw Home %s");
LSTR MSG_ZPROBE_ZOFFSET = _UxGT("Offset Z");
LSTR MSG_MOVE_NOZZLE_TO_BED = _UxGT("Przesuń dyszę do stołu");
LSTR MSG_BABYSTEP_TOTAL = _UxGT("Łącznie");
Expand Down
2 changes: 1 addition & 1 deletion Marlin/src/lcd/language/language_pt_br.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -340,7 +340,7 @@ namespace Language_pt_br {
LSTR MSG_BLTOUCH_DEPLOY = _UxGT("Estender BLTouch");
LSTR MSG_MANUAL_DEPLOY = _UxGT("Estender Sonda-Z");
LSTR MSG_MANUAL_STOW = _UxGT("Recolher Sonda-Z");
LSTR MSG_HOME_FIRST = _UxGT("Home %s%s%s Primeiro");
LSTR MSG_HOME_FIRST = _UxGT("Home %s Primeiro");
LSTR MSG_ZPROBE_OFFSETS = _UxGT("Compensar Sonda");
LSTR MSG_ZPROBE_XOFFSET = _UxGT("Compensar Sonda em X");
LSTR MSG_ZPROBE_YOFFSET = _UxGT("Compensar Sonda em Y");
Expand Down
2 changes: 1 addition & 1 deletion Marlin/src/lcd/language/language_ro.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -419,7 +419,7 @@ namespace Language_ro {
LSTR MSG_MANUAL_DEPLOY_TOUCHMI = _UxGT("Deploy TouchMI");
LSTR MSG_MANUAL_DEPLOY = _UxGT("Deploy Z-Probe");
LSTR MSG_MANUAL_STOW = _UxGT("Stow Z-Probe");
LSTR MSG_HOME_FIRST = _UxGT("Home %s%s%s First");
LSTR MSG_HOME_FIRST = _UxGT("Home %s First");
LSTR MSG_ZPROBE_OFFSETS = _UxGT("Probe Offsets");
LSTR MSG_ZPROBE_XOFFSET = _UxGT("Probe X Offset");
LSTR MSG_ZPROBE_YOFFSET = _UxGT("Probe Y Offset");
Expand Down
2 changes: 1 addition & 1 deletion Marlin/src/lcd/language/language_sk.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -550,7 +550,7 @@ namespace Language_sk {
LSTR MSG_MANUAL_DEPLOY_TOUCHMI = _UxGT("Zasunúť TouchMI");
LSTR MSG_MANUAL_DEPLOY = _UxGT("Zasunúť sondu Z");
LSTR MSG_MANUAL_STOW = _UxGT("Vysunúť sondu Z");
LSTR MSG_HOME_FIRST = _UxGT("Najskôr os %s%s%s domov");
LSTR MSG_HOME_FIRST = _UxGT("Najskôr os %s domov");
LSTR MSG_ZPROBE_SETTINGS = _UxGT("Nastav. sondy");
LSTR MSG_ZPROBE_OFFSETS = _UxGT("Ofsety sondy Z");
LSTR MSG_ZPROBE_XOFFSET = _UxGT("X ofset");
Expand Down
2 changes: 1 addition & 1 deletion Marlin/src/lcd/language/language_sv.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -452,7 +452,7 @@ namespace Language_sv {
LSTR MSG_MANUAL_DEPLOY_TOUCHMI = _UxGT("Fällut TouchMI");
LSTR MSG_MANUAL_DEPLOY = _UxGT("Fällut Z-Sond");
LSTR MSG_MANUAL_STOW = _UxGT("Stuva undan Z-Sond");
LSTR MSG_HOME_FIRST = _UxGT("Hem %s%s%s Först");
LSTR MSG_HOME_FIRST = _UxGT("Hem %s Först");
LSTR MSG_ZPROBE_OFFSETS = _UxGT("Sond Offsets");
LSTR MSG_ZPROBE_XOFFSET = _UxGT("Sond X Offset");
LSTR MSG_ZPROBE_YOFFSET = _UxGT("Sond Y Offset");
Expand Down
2 changes: 1 addition & 1 deletion Marlin/src/lcd/language/language_tr.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -390,7 +390,7 @@ namespace Language_tr {
LSTR MSG_MANUAL_DEPLOY_TOUCHMI = _UxGT("TouchMI Aç");
LSTR MSG_MANUAL_DEPLOY = _UxGT("Z-Probe Aç");
LSTR MSG_MANUAL_STOW = _UxGT("Z-Probe Kapat");
LSTR MSG_HOME_FIRST = _UxGT("Önce %s%s%s Sıfırla");
LSTR MSG_HOME_FIRST = _UxGT("Önce %s Sıfırla");
LSTR MSG_ZPROBE_OFFSETS = _UxGT("Prob Ofsetleri");
LSTR MSG_ZPROBE_XOFFSET = _UxGT("X Prob Ofset");
LSTR MSG_ZPROBE_YOFFSET = _UxGT("Y Prob Ofset");
Expand Down
2 changes: 1 addition & 1 deletion Marlin/src/lcd/language/language_uk.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -598,7 +598,7 @@ namespace Language_uk {
LSTR MSG_MANUAL_DEPLOY_TOUCHMI = _UxGT("Установити TouchMI");
LSTR MSG_MANUAL_DEPLOY = _UxGT("Установити Z-зонд");
LSTR MSG_MANUAL_STOW = _UxGT("Завантажити Z-зонд");
LSTR MSG_HOME_FIRST = _UxGT("Спочатку дім %s%s%s");
LSTR MSG_HOME_FIRST = _UxGT("Спочатку дім %s");
LSTR MSG_ZPROBE_OFFSETS = _UxGT("Зміщення зонду");
LSTR MSG_ZPROBE_XOFFSET = _UxGT("Зміщення по X");
LSTR MSG_ZPROBE_YOFFSET = _UxGT("Зміщення по Y");
Expand Down
2 changes: 1 addition & 1 deletion Marlin/src/lcd/language/language_vi.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -326,7 +326,7 @@ namespace Language_vi {
LSTR MSG_BLTOUCH_STOW = _UxGT("Cất BLTouch"); // Stow BLTouch
LSTR MSG_MANUAL_DEPLOY = _UxGT("Đem Đầu Dò-Z"); // Deploy Z-Probe
LSTR MSG_MANUAL_STOW = _UxGT("Cất Đầu Dò-Z"); // Stow Z-Probe
LSTR MSG_HOME_FIRST = _UxGT("Về nhà %s%s%s Trước");
LSTR MSG_HOME_FIRST = _UxGT("Về nhà %s Trước");
LSTR MSG_ZPROBE_ZOFFSET = _UxGT("Đầu Dò Bù Đắp Z"); // Probe Z Offset
LSTR MSG_BABYSTEP_X = _UxGT("Nhít X"); // Babystep X
LSTR MSG_BABYSTEP_Y = _UxGT("Nhít Y");
Expand Down
2 changes: 1 addition & 1 deletion Marlin/src/lcd/language/language_zh_CN.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -419,7 +419,7 @@ namespace Language_zh_CN {
LSTR MSG_MANUAL_DEPLOY_TOUCHMI = _UxGT("部署TouchMI");
LSTR MSG_MANUAL_DEPLOY = _UxGT("部署Z探针");
LSTR MSG_MANUAL_STOW = _UxGT("收好Z探针");
LSTR MSG_HOME_FIRST = _UxGT("归位 %s%s%s 先"); // "Home ... first"
LSTR MSG_HOME_FIRST = _UxGT("归位 %s 先"); // "Home ... first"
LSTR MSG_ZPROBE_OFFSETS = _UxGT("探针偏移量");
LSTR MSG_ZPROBE_XOFFSET = _UxGT("探针X偏移");
LSTR MSG_ZPROBE_YOFFSET = _UxGT("探针Y偏移");
Expand Down
2 changes: 1 addition & 1 deletion Marlin/src/lcd/language/language_zh_TW.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -369,7 +369,7 @@ namespace Language_zh_TW {
LSTR MSG_BLTOUCH_STOW = _UxGT("裝載BLTouch"); // "Stow BLTouch"
LSTR MSG_BLTOUCH_DEPLOY = _UxGT("部署BLTouch"); // "Deploy BLTouch"

LSTR MSG_HOME_FIRST = _UxGT("歸位 %s%s%s 先"); // "Home ... first"
LSTR MSG_HOME_FIRST = _UxGT("歸位 %s 先"); // "Home ... first"
LSTR MSG_ZPROBE_OFFSETS = _UxGT("探針偏移"); //Probe Offsets
LSTR MSG_ZPROBE_XOFFSET = _UxGT("探針X偏移量"); //Probe X Offset
LSTR MSG_ZPROBE_YOFFSET = _UxGT("探針Y偏移量"); //Probe Y Offset
Expand Down
11 changes: 8 additions & 3 deletions Marlin/src/module/motion.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1488,12 +1488,17 @@ void prepare_line_to_destination() {

bool homing_needed_error(main_axes_bits_t axis_bits/*=main_axes_mask*/) {
if ((axis_bits = axes_should_home(axis_bits))) {
PGM_P home_first = GET_TEXT(MSG_HOME_FIRST);
char all_axes[] = STR_AXES_MAIN, need[NUM_AXES];
uint8_t n = 0;
LOOP_NUM_AXES(i) if (TEST(axis_bits, i)) need[n++] = all_axes[i];
need[n] = '\0';

char msg[30];
#define _AXIS_CHAR(N) TEST(axis_bits, _AXIS(N)) ? STR_##N : ""
sprintf_P(msg, home_first, MAPLIST(_AXIS_CHAR, MAIN_AXIS_NAMES));
sprintf_P(msg, GET_EN_TEXT(MSG_HOME_FIRST), need);
SERIAL_ECHO_START();
SERIAL_ECHOLN(msg);

sprintf_P(msg, GET_TEXT(MSG_HOME_FIRST), need);
ui.set_status(msg);
return true;
}
Expand Down

0 comments on commit 234677e

Please sign in to comment.