1 files changed, 11 insertions, 2 deletions
diff --git a/src/gui/gui.cpp b/src/gui/gui.cpp
index 3e4ec764f..7d38b1025 100644
--- a/src/gui/gui.cpp
+++ b/src/gui/gui.cpp
@@ -107,9 +107,18 @@ Gui::Gui(Graphics *graphics):
 
     // Set global font
     const int fontSize = config.getIntValue("fontSize");
+
     std::string fontFile = config.getValue("font", "");
-// may be here need get paths from paths.getValue?
-//    std::string path = resman->getPath(fontFile);
+
+    std::vector<std::string> langs = getLang();
+    if (!langs.empty() && langs[0].size() > 3
+        && langs[0].substr(0, 3) == "ja_")
+    {
+        fontFile = config.getValue("japanFont", "");
+        if (fontFile.empty())
+            fontFile = branding.getStringValue("japanFont");
+    }
+
     if (fontFile.empty())
         fontFile = branding.getStringValue("font");