Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add MSG_MOVE_100MM to language_en #22238

Closed
wants to merge 4 commits into from
Closed

Add MSG_MOVE_100MM to language_en #22238

wants to merge 4 commits into from

Conversation

hho
Copy link

@hho hho commented Jun 27, 2021

Description

Create an MSG_MOVE_100MM entry in the language_en

Requirements

None

Benefits

2.0.9.1 didn't compile for me otherwise, because of the added menu item in #22192 which was missing from the language file

2.0.9.1 didn't compile for me otherwise, because of the added menu item in #22192 which was missing from the language file
@thisiskeithb
Copy link
Member

Looks like #22165 wasn't merged into 2.0.x (or it wasn't in the release notes at least).

@thisiskeithb
Copy link
Member

Related issue: #22239

BeePerNet pushed a commit to BeePerNet/Marlin that referenced this pull request Jun 27, 2021
@thinkyhead thinkyhead closed this Jun 27, 2021
@thisiskeithb
Copy link
Member

thisiskeithb commented Jun 27, 2021

@thinkyhead This is still needed in 2.0.x:

PROGMEM Language_Str MSG_MOVE_01MM = _UxGT("Move 0.1mm");
PROGMEM Language_Str MSG_MOVE_1MM = _UxGT("Move 1mm");
PROGMEM Language_Str MSG_MOVE_10MM = _UxGT("Move 10mm");
PROGMEM Language_Str MSG_MOVE_0001IN = _UxGT("Move 0.001in");

#22242 didn't add the actual fix/english translation.

@thisiskeithb thisiskeithb reopened this Jun 27, 2021
@ellensp
Copy link
Contributor

ellensp commented Jun 28, 2021

It looks like the updated language_en.h with "PROGMEM Language_Str MSG_MOVE_100MM = _UxGT("Move 100mm");" was missed in 2.0.9.1 release. While the rest of the code and the it, and ru where updated with it.
It is in bugfix.

@ellensp
Copy link
Contributor

ellensp commented Jun 28, 2021

@thinkyhead please look at this ASAP. Breaks release 2.0.9.1 for all LCD users

@thinkyhead thinkyhead changed the base branch from 2.0.x to bugfix-2.0.x June 28, 2021 03:47
@thinkyhead thinkyhead changed the base branch from bugfix-2.0.x to 2.0.x June 28, 2021 03:50
@thinkyhead thinkyhead closed this Jun 28, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants