add localized strings

calliope-mini · Mar 14, 2017 · 2cc3733 · 2cc3733
1 parent 440c57c
commit 2cc3733
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 8 deletions.
diff --git a/source/CalliopeDemo.cpp b/source/CalliopeDemo.cpp
@@ -156,7 +156,7 @@ const MicroBitImage Wave(7, 5, wave);
 
 MicroBit uBit;
 
-// DEMO 0 - 3 
+// DEMO 0 - 3
 static const int MAX_DEMOS = 3;
 static const int DEFAULT_PAUSE = 300;
 
@@ -257,7 +257,7 @@ void showIntro() {
 
     invoke(startSound);
 
-    uBit.display.scroll("Hallo!");
+    uBit.display.scroll(DISPLAY_HELLO);
     // press A
     uBit.display.print("A");
     uBit.sleep(DEFAULT_PAUSE);
@@ -295,7 +295,7 @@ void showIntro() {
     uBit.display.clear();
 
     // shake
-    uBit.display.scroll("SCHUETTELN");
+    uBit.display.scroll(DISPLAY_SHAKE);
     uBit.messageBus.listen(MICROBIT_ID_GESTURE, MICROBIT_ACCELEROMETER_EVT_SHAKE, simpleEventHandler);
     introAnimateImage(DoubleRow, 2, -1, 2);
     if (introEventSkip) return;
@@ -304,7 +304,7 @@ void showIntro() {
     uBit.display.print(Tick);
     uBit.sleep(DEFAULT_PAUSE);
     uBit.display.clear();
-    uBit.display.scroll("SUPER!");
+    uBit.display.scroll(DISPLAY_SUPER);
 
     // show heart and change RGB led colors randomly
 
@@ -376,7 +376,7 @@ void leaveOracle(MicroBitEvent event) {
 void oracle() {
     uBit.messageBus.listen(MICROBIT_ID_BUTTON_AB, MICROBIT_BUTTON_EVT_CLICK, leaveOracle);
 
-    uBit.display.scroll("Orakel");
+    uBit.display.scroll(DISPLAY_ORACLE);
     uBit.messageBus.listen(MICROBIT_ID_BUTTON_A, MICROBIT_BUTTON_EVT_CLICK, simpleEventHandler);
     do {
         eventOK = false;
@@ -733,7 +733,7 @@ void menuSelect(MicroBitEvent event) {
             break;
         default:
             state = Menu;
-            uBit.display.scroll("Huch?");
+            uBit.display.scroll(DISPLAY_ERROR);
             selectedDemo = 0;
             uBit.messageBus.send(MicroBitEvent(MICROBIT_ID_BUTTON_AB, MICROBIT_BUTTON_EVT_CLICK));
             break;

diff --git a/source/CalliopeDemo.h b/source/CalliopeDemo.h
@@ -1,6 +1,8 @@
 #ifndef CALLOPE_DEMO_H
 #define CALLOPE_DEMO_H
 
+//#define COMPILE_FIRMWARE_MASTER 0
+//#define USE_ENGLISH
 
 // MENU HANDLING
 typedef volatile enum State {
@@ -20,6 +22,22 @@ extern const MicroBitImage Tick;
 void testBoard();
 void snake();
 
-//#define COMPILE_FIRMWARE_MASTER 0
+
+// localization
+#ifndef USE_ENGLISH
+#define DISPLAY_HELLO "Hallo!"
+#define DISPLAY_SHAKE "SCHUETTELN"
+#define DISPLAY_ORACLE "Orakel"
+#define DISPLAY_SUPER "SUPER!"
+#define DISPLAY_THEEND "ENDE"
+#define DISPLAY_ERROR "Huch?"
+#else
+#define DISPLAY_HELLO "Hello!"
+#define DISPLAY_SHAKE "SHAKE"
+#define DISPLAY_ORACLE "Oracle"
+#define DISPLAY_SUPER "SUPER!"
+#define DISPLAY_THEEND "THE END"
+#define DISPLAY_ERROR "Oops?"
+#endif
 
 #endif
diff --git a/source/Snake.cpp b/source/Snake.cpp
@@ -196,7 +196,7 @@ void snake() {
 
             int status = map.getPixelValue(newHead.x, newHead.y);
             if (status == SNAKE_UP || status == SNAKE_DOWN || status == SNAKE_LEFT || status == SNAKE_RIGHT) {
-                uBit.display.scroll("ENDE");
+                uBit.display.scroll(DISPLAY_THEEND);
                 uBit.display.scroll(score);
 
                 return;