felix/Marlin
1
0 Fork 0
Code Issues Pull Requests Releases Wiki Activity
1,718 Commits 1 Branch 0 Tags
2309c9f43aea4d99ec8157da5f6b9255c912194a
Commit Graph
5 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Caleb Anderson 2309c9f43a Merge branch 'LanguageFix' of github.com:RobotCaleb/Marlin-Kossel_Clear into LanguageFix 
Conflicts:
	Marlin/language.h
 2014-12-29 10:48:56 -07:00
Caleb Anderson 236db44669 Fix spacing 2014-12-29 10:44:55 -07:00
Caleb Anderson e6774fb7d2 Using the new language implementation wasn't behaving as expected. 
No matter what LANGUAGE_CHOICE was set to it would always take the en branch.
I revamped it a bit to use a macro to create the language include file name. This required a slight tweak to the RU declaration since it's special-cased in a couple places in code.

This is an attempt to pull my changes from #1222 over.
 2014-12-29 10:43:19 -07:00
Caleb Anderson d254651146 Fix spacing 2014-12-21 19:57:41 -07:00
Caleb Anderson 7db943b147 Language change implementation revamped. Didn't work as intended with Arduino IDE. 2014-12-21 14:45:34 -07:00