UTF-8 language translation support#5441
UTF-8 language translation support#5441thinkyhead wants to merge 7 commits intoMarlinFirmware:bugfix-1.1.xfrom
Conversation
d95aff3 to
00ff40a
Compare
|
@thinkyhead
lcd_implementation_drawmenu_setting_edit_callback_float62
diff --git a/Marlin/ultralcd_impl_DOGM.h b/Marlin/ultralcd_impl_DOGM.h
index c6a97ec..b8e955f 100644
--- a/Marlin/ultralcd_impl_DOGM.h
+++ b/Marlin/ultralcd_impl_DOGM.h
@@ -572,7 +572,7 @@ static void lcd_implementation_status_screen() {
if (PAGE_CONTAINS(51 - INFO_FONT_HEIGHT, 49)) {
lcd_setFont(FONT_MENU);
lcd_moveto(3, 50);
- lcd_print(LCD_STR_FEEDRATE[0]);
+ lcd_print_u(LCD_STR_FEEDRATE[0]);
lcd_setFont(FONT_STATUSMENU);
lcd_moveto(12, 50); |
|
The |
00ff40a to
fbc0067
Compare
Ah yes, I forgot about some of those reversions. Thanks for pointing that out.
Do we need to re-generate these files? If so, we should re-generate them and replace the ones here with the newer generated files. |
fbc0067 to
1f020d4
Compare
|
Are we going to keep |
|
The language_cn.h is for Simplified Chinese only, it was replaced by new files language_zh_CN.h and language_zh_TW.h for Simplified Chinese and Traditional Chinese. You may leave the language_data_*.h as it and we can re-generate it later once we have this PR done. |
76af0a2 to
d4a94dc
Compare
|
Finally compiling. Can you give it a test on your display and see if it's good? |
|
@thinkyhead I also merged the latest changes from Marin to my branch: https://github.com/yhfudev/Marlin.git |
|
The following may fix the arrow problem: diff --git a/Marlin/ultralcd_impl_DOGM.h b/Marlin/ultralcd_impl_DOGM.h
index d14d24f..58ae728 100644
--- a/Marlin/ultralcd_impl_DOGM.h
+++ b/Marlin/ultralcd_impl_DOGM.h
@@ -657,7 +657,7 @@ static void lcd_implementation_status_screen() {
if (!PAGE_CONTAINS(row_y1, row_y2)) return;
lcd_printstr_P(pstr, (LCD_WIDTH - (START_COL) - 2) * DOG_CHAR_WIDTH);
- lcd_moveto(LCD_PIXEL_WIDTH - (DOG_CHAR_WIDTH), (row + 1) * (DOG_CHAR_HEIGHT));
+ lcd_moveto(LCD_PIXEL_WIDTH - (DOG_CHAR_WIDTH), row_y2);
lcd_print_u(post_char);
lcd_print_u(' ');
@@ -679,7 +679,7 @@ static void lcd_implementation_status_screen() {
const uint8_t vallen = (pgm ? lcd_strlen_P(data) : (lcd_strlen((char*)data)));
lcd_printstr_P(pstr, (LCD_WIDTH - (START_COL) - 2 - vallen) * DOG_CHAR_WIDTH);
- lcd_moveto(LCD_PIXEL_WIDTH - (DOG_CHAR_WIDTH) * vallen, (row + 1) * (DOG_CHAR_HEIGHT));
+ lcd_moveto(LCD_PIXEL_WIDTH - (DOG_CHAR_WIDTH) * vallen, row_y2);
pgm ? lcd_printPGM(data) : lcd_print((char*)data);
} |
|
@yhfudev Feel free to compare and contribute a patch to my branch, if you catch the cause for mis-alignment of the right-side icons. |
46eef55 to
96927e5
Compare
|
What about other commits of the "Update to the current version and also code improvements. thinkyhead#18"? |
96927e5 to
816fb5c
Compare
They have all been applied as "fixups" to previous commits using |
|
Oh, I see. |
54081a8 to
4e19c59
Compare
38898fa to
7c1adff
Compare
7c81e3c to
b567790
Compare
d50e088 to
670df2e
Compare
5a75a1b to
b0abce5
Compare
34e9ed4 to
71c05f1
Compare
53f0c75 to
29b0488
Compare
b8b1a22 to
fa3c14f
Compare
0bebc14 to
0c1be96
Compare



Rebuild of #4704 by @yhfudev
Please review and test.
The last commit is a set of incomplete and uncertain changes. Some of them may actually be reversions of the code to the earlier point where #4704 was created. We need to sort that out.