Pārlūkot izejas kodu

🌐 Tweak language selection

Scott Lahteine 3 gadus atpakaļ
vecāks
revīzija
f55a28b015

+ 6
- 7
Marlin/src/core/multi_language.h Parādīt failu

36
   #define NUM_LANGUAGES 1
36
   #define NUM_LANGUAGES 1
37
 #endif
37
 #endif
38
 
38
 
39
-// Setting the unused languages equal to each other allows
40
-// the compiler to optimize away the conditionals
41
-
39
+// Set unused languages equal to each other so the
40
+// compiler can optimize away the conditionals.
42
 #ifndef LCD_LANGUAGE_2
41
 #ifndef LCD_LANGUAGE_2
43
   #define LCD_LANGUAGE_2 LCD_LANGUAGE
42
   #define LCD_LANGUAGE_2 LCD_LANGUAGE
44
 #endif
43
 #endif
58
 #if NUM_LANGUAGES > 1
57
 #if NUM_LANGUAGES > 1
59
   #define HAS_MULTI_LANGUAGE 1
58
   #define HAS_MULTI_LANGUAGE 1
60
   #define GET_TEXT(MSG) ( \
59
   #define GET_TEXT(MSG) ( \
61
-    ui.language == 0 ? GET_LANG(LCD_LANGUAGE  )::MSG : \
62
-    ui.language == 1 ? GET_LANG(LCD_LANGUAGE_2)::MSG : \
63
-    ui.language == 2 ? GET_LANG(LCD_LANGUAGE_3)::MSG : \
60
+    ui.language == 4 ? GET_LANG(LCD_LANGUAGE_5)::MSG : \
64
     ui.language == 3 ? GET_LANG(LCD_LANGUAGE_4)::MSG : \
61
     ui.language == 3 ? GET_LANG(LCD_LANGUAGE_4)::MSG : \
65
-                       GET_LANG(LCD_LANGUAGE_5)::MSG   )
62
+    ui.language == 2 ? GET_LANG(LCD_LANGUAGE_3)::MSG : \
63
+    ui.language == 1 ? GET_LANG(LCD_LANGUAGE_2)::MSG : \
64
+                       GET_LANG(LCD_LANGUAGE  )::MSG   )
66
   #define MAX_LANG_CHARSIZE _MAX(GET_LANG(LCD_LANGUAGE  )::CHARSIZE, \
65
   #define MAX_LANG_CHARSIZE _MAX(GET_LANG(LCD_LANGUAGE  )::CHARSIZE, \
67
                                  GET_LANG(LCD_LANGUAGE_2)::CHARSIZE, \
66
                                  GET_LANG(LCD_LANGUAGE_2)::CHARSIZE, \
68
                                  GET_LANG(LCD_LANGUAGE_3)::CHARSIZE, \
67
                                  GET_LANG(LCD_LANGUAGE_3)::CHARSIZE, \

+ 12
- 10
Marlin/src/lcd/language/language_en.h Parādīt failu

41
 #endif
41
 #endif
42
 #undef en
42
 #undef en
43
 
43
 
44
+#define MEDIA_TYPE_EN "Media"
45
+
44
 namespace Language_en {
46
 namespace Language_en {
45
   constexpr uint8_t    CHARSIZE                            = 2;
47
   constexpr uint8_t    CHARSIZE                            = 2;
46
   PROGMEM Language_Str LANGUAGE                            = _UxGT("English");
48
   PROGMEM Language_Str LANGUAGE                            = _UxGT("English");
51
   PROGMEM Language_Str MSG_NO                              = _UxGT("NO");
53
   PROGMEM Language_Str MSG_NO                              = _UxGT("NO");
52
   PROGMEM Language_Str MSG_BACK                            = _UxGT("Back");
54
   PROGMEM Language_Str MSG_BACK                            = _UxGT("Back");
53
   PROGMEM Language_Str MSG_MEDIA_ABORTING                  = _UxGT("Aborting...");
55
   PROGMEM Language_Str MSG_MEDIA_ABORTING                  = _UxGT("Aborting...");
54
-  PROGMEM Language_Str MSG_MEDIA_INSERTED                  = _UxGT("Media Inserted");
55
-  PROGMEM Language_Str MSG_MEDIA_REMOVED                   = _UxGT("Media Removed");
56
-  PROGMEM Language_Str MSG_MEDIA_WAITING                   = _UxGT("Waiting for media");
56
+  PROGMEM Language_Str MSG_MEDIA_INSERTED                  = MEDIA_TYPE_EN _UxGT(" Inserted");
57
+  PROGMEM Language_Str MSG_MEDIA_REMOVED                   = MEDIA_TYPE_EN _UxGT(" Removed");
58
+  PROGMEM Language_Str MSG_MEDIA_WAITING                   = _UxGT("Waiting for card");
57
   PROGMEM Language_Str MSG_SD_INIT_FAIL                    = _UxGT("SD Init Fail");
59
   PROGMEM Language_Str MSG_SD_INIT_FAIL                    = _UxGT("SD Init Fail");
58
-  PROGMEM Language_Str MSG_MEDIA_READ_ERROR                = _UxGT("Media read error");
60
+  PROGMEM Language_Str MSG_MEDIA_READ_ERROR                = MEDIA_TYPE_EN _UxGT(" read error");
59
   PROGMEM Language_Str MSG_MEDIA_USB_REMOVED               = _UxGT("USB device removed");
61
   PROGMEM Language_Str MSG_MEDIA_USB_REMOVED               = _UxGT("USB device removed");
60
   PROGMEM Language_Str MSG_MEDIA_USB_FAILED                = _UxGT("USB start failed");
62
   PROGMEM Language_Str MSG_MEDIA_USB_FAILED                = _UxGT("USB start failed");
61
   PROGMEM Language_Str MSG_KILL_SUBCALL_OVERFLOW           = _UxGT("Subcall Overflow");
63
   PROGMEM Language_Str MSG_KILL_SUBCALL_OVERFLOW           = _UxGT("Subcall Overflow");
399
   PROGMEM Language_Str MSG_ERR_EEPROM_INDEX                = _UxGT("EEPROM Index Error");
401
   PROGMEM Language_Str MSG_ERR_EEPROM_INDEX                = _UxGT("EEPROM Index Error");
400
   PROGMEM Language_Str MSG_ERR_EEPROM_VERSION              = _UxGT("EEPROM Version Error");
402
   PROGMEM Language_Str MSG_ERR_EEPROM_VERSION              = _UxGT("EEPROM Version Error");
401
   PROGMEM Language_Str MSG_SETTINGS_STORED                 = _UxGT("Settings Stored");
403
   PROGMEM Language_Str MSG_SETTINGS_STORED                 = _UxGT("Settings Stored");
402
-  PROGMEM Language_Str MSG_MEDIA_UPDATE                    = _UxGT("Media Update");
404
+  PROGMEM Language_Str MSG_MEDIA_UPDATE                    = MEDIA_TYPE_EN _UxGT(" Update");
403
   PROGMEM Language_Str MSG_RESET_PRINTER                   = _UxGT("Reset Printer");
405
   PROGMEM Language_Str MSG_RESET_PRINTER                   = _UxGT("Reset Printer");
404
   PROGMEM Language_Str MSG_REFRESH                         = LCD_STR_REFRESH _UxGT("Refresh");
406
   PROGMEM Language_Str MSG_REFRESH                         = LCD_STR_REFRESH _UxGT("Refresh");
405
   PROGMEM Language_Str MSG_INFO_SCREEN                     = _UxGT("Info Screen");
407
   PROGMEM Language_Str MSG_INFO_SCREEN                     = _UxGT("Info Screen");
431
   PROGMEM Language_Str MSG_CANCEL_OBJECT                   = _UxGT("Cancel Object");
433
   PROGMEM Language_Str MSG_CANCEL_OBJECT                   = _UxGT("Cancel Object");
432
   PROGMEM Language_Str MSG_CANCEL_OBJECT_N                 = _UxGT("Cancel Object =");
434
   PROGMEM Language_Str MSG_CANCEL_OBJECT_N                 = _UxGT("Cancel Object =");
433
   PROGMEM Language_Str MSG_OUTAGE_RECOVERY                 = _UxGT("Power Outage");
435
   PROGMEM Language_Str MSG_OUTAGE_RECOVERY                 = _UxGT("Power Outage");
434
-  PROGMEM Language_Str MSG_MEDIA_MENU                      = _UxGT("Print from Media");
435
-  PROGMEM Language_Str MSG_NO_MEDIA                        = _UxGT("No Media");
436
+  PROGMEM Language_Str MSG_MEDIA_MENU                      = _UxGT("Print from ") MEDIA_TYPE_EN;
437
+  PROGMEM Language_Str MSG_NO_MEDIA                        = _UxGT("No ") MEDIA_TYPE_EN;
436
   PROGMEM Language_Str MSG_DWELL                           = _UxGT("Sleep...");
438
   PROGMEM Language_Str MSG_DWELL                           = _UxGT("Sleep...");
437
   PROGMEM Language_Str MSG_USERWAIT                        = _UxGT("Click to Resume...");
439
   PROGMEM Language_Str MSG_USERWAIT                        = _UxGT("Click to Resume...");
438
   PROGMEM Language_Str MSG_PRINT_PAUSED                    = _UxGT("Print Paused");
440
   PROGMEM Language_Str MSG_PRINT_PAUSED                    = _UxGT("Print Paused");
475
   PROGMEM Language_Str MSG_FILAMENTUNLOAD                  = _UxGT("Unload Filament");
477
   PROGMEM Language_Str MSG_FILAMENTUNLOAD                  = _UxGT("Unload Filament");
476
   PROGMEM Language_Str MSG_FILAMENTUNLOAD_E                = _UxGT("Unload *");
478
   PROGMEM Language_Str MSG_FILAMENTUNLOAD_E                = _UxGT("Unload *");
477
   PROGMEM Language_Str MSG_FILAMENTUNLOAD_ALL              = _UxGT("Unload All");
479
   PROGMEM Language_Str MSG_FILAMENTUNLOAD_ALL              = _UxGT("Unload All");
478
-  PROGMEM Language_Str MSG_ATTACH_MEDIA                    = _UxGT("Attach Media");
479
-  PROGMEM Language_Str MSG_CHANGE_MEDIA                    = _UxGT("Change Media");
480
-  PROGMEM Language_Str MSG_RELEASE_MEDIA                   = _UxGT("Release Media");
480
+  PROGMEM Language_Str MSG_ATTACH_MEDIA                    = _UxGT("Attach ") MEDIA_TYPE_EN;
481
+  PROGMEM Language_Str MSG_CHANGE_MEDIA                    = _UxGT("Change ") MEDIA_TYPE_EN;
482
+  PROGMEM Language_Str MSG_RELEASE_MEDIA                   = _UxGT("Release ") MEDIA_TYPE_EN;
481
   PROGMEM Language_Str MSG_ZPROBE_OUT                      = _UxGT("Z Probe Past Bed");
483
   PROGMEM Language_Str MSG_ZPROBE_OUT                      = _UxGT("Z Probe Past Bed");
482
   PROGMEM Language_Str MSG_SKEW_FACTOR                     = _UxGT("Skew Factor");
484
   PROGMEM Language_Str MSG_SKEW_FACTOR                     = _UxGT("Skew Factor");
483
   PROGMEM Language_Str MSG_BLTOUCH                         = _UxGT("BLTouch");
485
   PROGMEM Language_Str MSG_BLTOUCH                         = _UxGT("BLTouch");

Notiek ielāde…
Atcelt
Saglabāt