Skip to content

UTF-8 language header files#5491

Merged
thinkyhead merged 1 commit intoMarlinFirmware:RCBugFixfrom
yhfudev:devel-rcbugfix-language-headers
Dec 14, 2016
Merged

UTF-8 language header files#5491
thinkyhead merged 1 commit intoMarlinFirmware:RCBugFixfrom
yhfudev:devel-rcbugfix-language-headers

Conversation

@yhfudev
Copy link
Contributor

@yhfudev yhfudev commented Dec 13, 2016

This is a language string patch for the PR #5441, by defining a macro _UxGT() to relieve the burden for maintaining the UTF-8 patches, which I suggested in #3350 (comment) . It do NOT add or change any existing functions.

@thinkyhead I tried use git rebase, and unfortunately, I deleted this branch, so I resubmit it again. Sorry!

@thinkyhead
Copy link
Member

thinkyhead commented Dec 13, 2016

I think that it would be best for #define CUSTOM_MACHINE_NAME (in the Configuration.h files) that unless the custom name has non-ASCII characters, we should leave out UxGT(...). I'd like to keep this macro out of the configurations. Will that work?

@yhfudev
Copy link
Contributor Author

yhfudev commented Dec 13, 2016

I agree, but I can't push my changes after run git rebase, so I just use the merge and reverted the changes.

@petrzjunior
Copy link
Contributor

@yhfudev After rebasing you need to force push git push repository branch -f if I'm not mistaken...

@thinkyhead
Copy link
Member

git push -f origin ftw.

@yhfudev
Copy link
Contributor Author

yhfudev commented Dec 13, 2016

It works!! Thanks @thinkyhead, @petrzjunior

@thinkyhead thinkyhead merged commit 77a3609 into MarlinFirmware:RCBugFix Dec 14, 2016
@thinkyhead
Copy link
Member

Merged this and rebased #5441 onto the latest.

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.

3 participants