Adapt to upstream translation scheme

boricj · Oct 28, 2017 · cde51fc · cde51fc
1 parent 4e422a6
commit cde51fc
Show file tree

Hide file tree

Showing 13 changed files with 44 additions and 49 deletions.
diff --git a/Makefile b/Makefile
@@ -1,11 +1,18 @@
-ifneq (,$(findstring boricj.hello-world,${APPS_LIST}))
+snapshots += Helloworld::App::Snapshot
+snapshot_headers += apps/hello_world/app.h
 
-app_objs += $(addprefix apps/boricj.hello-world/,\
+app_objs += $(addprefix apps/hello_world/,\
   app.o\
   hello_controller.o\
   hello_view.o\
 )
 
-app_images += apps/boricj.hello-world/helloworld_icon.png
+i18n_files += $(addprefix apps/hello_world/,\
+  base.de.i18n\
+  base.en.i18n\
+  base.es.i18n\
+  base.fr.i18n\
+  base.pt.i18n\
+)
 
-endif
+app_images += apps/hello_world/helloworld_icon.png
diff --git a/README.md b/README.md
@@ -4,8 +4,7 @@ This is a sample third-party app for the NumWorks calculator.
 
 ## Getting started
 
-Make sure you have the required third-party compile-time app support (https://github.com/numworks/epsilon/pull/73).
 ```
-git clone https://github.com/boricj/numworks-hello-world.git apps/boricj.hello-world
-make PLATFORM=simulator APPS_LIST="boricj.hello-world"
+git clone https://github.com/boricj/numworks-hello-world.git apps/hello_world
+make PLATFORM=simulator EPSILON_APPS='hello_world settings'
 ```
diff --git a/app.cpp b/app.cpp
@@ -4,22 +4,14 @@
 #include "apps/i18n.h"
 #include <assert.h>
 
-namespace boricj {
-namespace helloworld {
+namespace Helloworld {
 
-const I18n::StandardMessage HelloApp("Hello, World!", "Bonjour, Monde!");
-const I18n::StandardMessage HelloAppCapital("Hello, World!", "Bonjour, Monde!");
-
-const char * App::Descriptor::uriName() {
-  return "boricj.hello-world";
-}
-
-const I18n::Message *App::Descriptor::name() {
-  return &HelloApp;
+I18n::Message App::Descriptor::name() {
+  return I18n::Message::HelloApp;
 }
 
-const I18n::Message *App::Descriptor::upperName() {
-  return &HelloAppCapital;
+I18n::Message App::Descriptor::upperName() {
+  return I18n::Message::HelloAppCapital;
 }
 
 const Image * App::Descriptor::icon() {
@@ -48,7 +40,4 @@ App::App(Container * container, Snapshot * snapshot) :
 {
 }
 
-static App::Snapshot::Register r(new App::Snapshot());
-
-}
 }
diff --git a/app.h b/app.h
@@ -1,19 +1,17 @@
-#ifndef BORICJ_HELLOWORLD_APP_H
-#define BORICJ_HELLOWORLD_APP_H
+#ifndef HELLOWORLD_APP_H
+#define HELLOWORLD_APP_H
 
 #include <escher.h>
 #include "hello_controller.h"
 
-namespace boricj {
-namespace helloworld {
+namespace Helloworld {
 
 class App : public ::App {
 public:
   class Descriptor : public ::App::Descriptor {
   public:
-    const char * uriName() override;
-    const I18n::Message *name() override;
-    const I18n::Message *upperName() override;
+    I18n::Message name() override;
+    I18n::Message upperName() override;
     const Image * icon() override;
   };
   class Snapshot : public ::App::Snapshot {
@@ -28,7 +26,6 @@ class App : public ::App {
   HelloController m_helloController;
 };
 
-}
 }
 
 #endif
diff --git a/base.de.i18n b/base.de.i18n
@@ -0,0 +1,2 @@
+HelloApp = "Hallo, Welt!"
+HelloAppCapital = "HALLO WELT"
diff --git a/base.en.i18n b/base.en.i18n
@@ -0,0 +1,2 @@
+HelloApp = "Hello, World!"
+HelloAppCapital = "HELLO WORLD"
diff --git a/base.es.i18n b/base.es.i18n
@@ -0,0 +1,2 @@
+HelloApp = "Hola, Mundo!"
+HelloAppCapital = "HOLA MUNDO"
diff --git a/base.fr.i18n b/base.fr.i18n
@@ -0,0 +1,2 @@
+HelloApp = "Bonjour, Monde!"
+HelloAppCapital = "BONJOUR MONDE"
diff --git a/base.pt.i18n b/base.pt.i18n
@@ -0,0 +1,2 @@
+HelloApp = "Ola, Mundo!"
+HelloAppCapital = "OLA MUNDO"
diff --git a/hello_controller.cpp b/hello_controller.cpp
@@ -1,9 +1,7 @@
 #include "hello_controller.h"
-#include "apps/i18n.h"
 #include <assert.h>
 
-namespace boricj {
-namespace helloworld {
+namespace Helloworld {
 
 HelloController::HelloController(Responder * parentResponder) :
   ViewController(parentResponder)
@@ -26,4 +24,3 @@ bool HelloController::handleEvent(Ion::Events::Event event) {
 }
 
 }
-}
diff --git a/hello_controller.h b/hello_controller.h
@@ -1,12 +1,11 @@
-#ifndef BORICJ_HELLOWORLD_HELLO_CONTROLLER_H
-#define BORICJ_HELLOWORLD_HELLO_CONTROLLER_H
+#ifndef HELLOWORLD_HELLO_CONTROLLER_H
+#define HELLOWORLD_HELLO_CONTROLLER_H
 
 #include <escher.h>
 
 #include "hello_view.h"
 
-namespace boricj {
-namespace helloworld {
+namespace Helloworld {
 
 class HelloController : public ViewController {
 public:
@@ -18,7 +17,6 @@ class HelloController : public ViewController {
   HelloView m_helloView;
 };
 
-}
 }
 
 #endif
diff --git a/hello_view.cpp b/hello_view.cpp
@@ -1,15 +1,16 @@
 #include "hello_view.h"
 
-namespace boricj {
-namespace helloworld {
+#include "apps/i18n.h"
+
+namespace Helloworld {
 
 HelloView::HelloView() :
   View(),
   m_bufferTextView(KDText::FontSize::Large, 0.5, 0.5, KDColorBlack),
   m_color(3),
   m_kdcolor(Palette::GreyWhite)
 {
-  m_bufferTextView.setText("Hello, World!");
+  m_bufferTextView.setText(I18n::translate(I18n::Message::HelloApp));
   m_bufferTextView.setFrame(KDRect(0, 0, bounds().width(), bounds().height()));
 }
 
@@ -58,4 +59,3 @@ void HelloView::layoutSubviews() {
 }
 
 }
-}
diff --git a/hello_view.h b/hello_view.h
@@ -1,10 +1,9 @@
-#ifndef BORICJ_HELLOWORLD_HELLOVIEW_H
-#define BORICJ_HELLOWORLD_HELLOVIEW_H
+#ifndef HELLOWORLD_HELLOVIEW_H
+#define HELLOWORLD_HELLOVIEW_H
 
 #include <escher.h>
 
-namespace boricj {
-namespace helloworld {
+namespace Helloworld {
 
 class HelloView : public View {
 public:
@@ -21,7 +20,6 @@ class HelloView : public View {
   KDColor m_kdcolor;
 };
 
-}
 }
 
 #endif