bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

Replace LANGUAGE_INCLUDE with LCD_LANGUAGE

Browse Source
This commit is contained in:
Scott Lahteine
2016-04-26 23:32:15 -07:00
parent 259794c0be
commit 0c11566f42
21 changed files with 30 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Marlin/language.h
View File

@ -25,7 +25,10 @@
#include "Configuration.h"
#define GENERATE_LANGUAGE_INCLUDE(M) STRINGIFY_(language_##M.h)
// Fallback if no language is set. DON'T CHANGE
#ifndef LCD_LANGUAGE
#define LCD_LANGUAGE en
#endif
// For character-based LCD controllers (DISPLAY_CHARSET_HD44780)
#define JAPANESE 1
@ -62,11 +65,6 @@
// cn Chinese
// cz Czech
// fallback if no language is set, don't change
#ifndef LANGUAGE_INCLUDE
#define LANGUAGE_INCLUDE GENERATE_LANGUAGE_INCLUDE(en)
#endif
#if ENABLED(USE_AUTOMATIC_VERSIONING)
#include "_Version.h"
#else
@ -236,7 +234,11 @@
// LCD Menu Messages
#include LANGUAGE_INCLUDE
#define LANGUAGE_INCL_(M) STRINGIFY_(language_##M.h)
#define LANGUAGE_INCL(M) LANGUAGE_INCL_(M)
#define INCLUDE_LANGUAGE LANGUAGE_INCL(LCD_LANGUAGE)
#include INCLUDE_LANGUAGE
#include "language_en.h"
#endif //__LANGUAGE_H