Prepare for Japanese language ref #11859 #16129

Signed-off-by: m-kro <[email protected]>
eclipse-sumo · Feb 5, 2025 · 0263b3e · 0263b3e
1 parent 0f622e7
commit 0263b3e
Show file tree

Hide file tree

Showing 7 changed files with 37 additions and 1 deletion.
diff --git a/src/gui/GUIApplicationWindow.cpp b/src/gui/GUIApplicationWindow.cpp
@@ -215,6 +215,8 @@ FXDEFMAP(GUIApplicationWindow) GUIApplicationWindowMap[] = {
     FXMAPFUNC(SEL_UPDATE,   MID_LANGUAGE_TR,    GUIApplicationWindow::onUpdChangeLanguage),
     FXMAPFUNC(SEL_COMMAND,  MID_LANGUAGE_HU,    GUIApplicationWindow::onCmdChangeLanguage),
     FXMAPFUNC(SEL_UPDATE,   MID_LANGUAGE_HU,    GUIApplicationWindow::onUpdChangeLanguage),
+    FXMAPFUNC(SEL_COMMAND,  MID_LANGUAGE_JA,    GUIApplicationWindow::onCmdChangeLanguage),
+    FXMAPFUNC(SEL_UPDATE,   MID_LANGUAGE_JA,    GUIApplicationWindow::onUpdChangeLanguage),
     // keys
     FXMAPFUNC(SEL_KEYPRESS,              0,     GUIApplicationWindow::onKeyPress),
     FXMAPFUNC(SEL_KEYRELEASE,            0,     GUIApplicationWindow::onKeyRelease),

diff --git a/src/netedit/GNEApplicationWindow.cpp b/src/netedit/GNEApplicationWindow.cpp
@@ -430,6 +430,8 @@ FXDEFMAP(GNEApplicationWindow) GNEApplicationWindowMap[] = {
     FXMAPFUNC(SEL_UPDATE,   MID_LANGUAGE_TR,    GNEApplicationWindow::onUpdChangeLanguage),
     FXMAPFUNC(SEL_COMMAND,  MID_LANGUAGE_HU,    GNEApplicationWindow::onCmdChangeLanguage),
     FXMAPFUNC(SEL_UPDATE,   MID_LANGUAGE_HU,    GNEApplicationWindow::onUpdChangeLanguage),
+    FXMAPFUNC(SEL_COMMAND,  MID_LANGUAGE_JA,    GNEApplicationWindow::onCmdChangeLanguage),
+    FXMAPFUNC(SEL_UPDATE,   MID_LANGUAGE_JA,    GNEApplicationWindow::onUpdChangeLanguage),
     // tools
     FXMAPFUNC(SEL_COMMAND,  MID_GNE_RUNNETGENERATE,             GNEApplicationWindow::onCmdRunNetgenerate),
     FXMAPFUNC(SEL_COMMAND,  MID_GNE_POSTPROCESSINGNETGENERATE,  GNEApplicationWindow::onCmdPostprocessingNetgenerate),

diff --git a/src/utils/gui/images/GUIIconSubSys.cpp b/src/utils/gui/images/GUIIconSubSys.cpp
@@ -552,6 +552,7 @@
 #include "icons/languages/tr.xpm"
 #include "icons/languages/zh.xpm"
 #include "icons/languages/zht.xpm"
+#include "icons/languages/ja.xpm"
 
 // ===========================================================================
 // static member variable definitions
@@ -1098,6 +1099,7 @@ GUIIconSubSys::GUIIconSubSys(FXApp* a) {
     myIcons[GUIIcon::LANGUAGE_TR] = new FXXPMIcon(a, language_tr_xpm);
     myIcons[GUIIcon::LANGUAGE_ZH] = new FXXPMIcon(a, language_zh_xpm);
     myIcons[GUIIcon::LANGUAGE_ZHT] = new FXXPMIcon(a, language_zht_xpm);
+    myIcons[GUIIcon::LANGUAGE_JA] = new FXXPMIcon(a, language_ja_xpm);
 
     // ... and create them
     for (const auto& icon : myIcons) {

diff --git a/src/utils/gui/images/GUIIcons.h b/src/utils/gui/images/GUIIcons.h
@@ -728,6 +728,7 @@ enum class GUIIcon {
     LANGUAGE_HU,
     LANGUAGE_TR,
     LANGUAGE_ZH,
-    LANGUAGE_ZHT
+    LANGUAGE_ZHT,
+    LANGUAGE_JA
     /// @}
 };
diff --git a/src/utils/gui/images/icons/languages/ja.xpm b/src/utils/gui/images/icons/languages/ja.xpm
@@ -0,0 +1,21 @@
+/* XPM */
+static const char *language_ja_xpm[] = {
+"16 12 6 1",
+" 	c None",
+".	c #FFFFFF",
+"+	c #FEFEFE",
+"@	c #EFDCDD",
+"#	c #CA7075",
+"$	c #BD0029",
+"                ",
+"................",
+"................",
+".....+@##@+.....",
+".....@$$$$@.....",
+".....#$$$$#.....",
+".....#$$$$#.....",
+".....@$$$$@.....",
+".....+@##@+.....",
+"................",
+"................",
+"                "};
diff --git a/src/utils/gui/windows/GUIAppEnum.h b/src/utils/gui/windows/GUIAppEnum.h
@@ -1664,6 +1664,8 @@ enum {
     MID_LANGUAGE_TR,
     /// @brief change language to hungarian
     MID_LANGUAGE_HU,
+    /// @brief change language to japanese
+    MID_LANGUAGE_JA,
 
     /// @}
 

diff --git a/src/utils/gui/windows/GUIMainWindow.cpp b/src/utils/gui/windows/GUIMainWindow.cpp
@@ -358,6 +358,8 @@ GUIMainWindow::buildLanguageMenu(FXMenuBar* menuBar) {
                                            GUIIconSubSys::getIcon(GUIIcon::LANGUAGE_TR), this, MID_LANGUAGE_TR);
     GUIDesigns::buildFXMenuCommandShortcut(myLanguageMenu, "Magyar", "", TL("Change language to hungarian. (hu)"),
                                            GUIIconSubSys::getIcon(GUIIcon::LANGUAGE_HU), this, MID_LANGUAGE_HU);
+    GUIDesigns::buildFXMenuCommandShortcut(myLanguageMenu, "Japanese", "", TL("Change language to japanese. (ja)"),
+                                           GUIIconSubSys::getIcon(GUIIcon::LANGUAGE_JA), this, MID_LANGUAGE_JA);
 }
 
 
@@ -400,6 +402,10 @@ GUIMainWindow::onCmdChangeLanguage(FXObject*, FXSelector sel, void*) {
             langID = "hu";
             lang = TL("hungarian");
             break;
+        case MID_LANGUAGE_JA:
+            langID = "ja";
+            lang = TL("japanese");
+            break;
         default:
             langID = "C";
             lang = TL("english");