Add support for side-loading translation files (#535)

Closes #497
picotorrent · Mar 5, 2018 · 30e12a8 · 30e12a8
1 parent 89ff713
commit 30e12a8
Show file tree

Hide file tree

Showing 4 changed files with 50 additions and 3 deletions.
diff --git a/src/picotorrent/config.cpp b/src/picotorrent/config.cpp
@@ -63,6 +63,11 @@ void Configuration::CurrentLanguageId(int languageId)
     Set<int>("language_id", languageId);
 }
 
+fs::path Configuration::LanguagesPath()
+{
+    return Get<std::string>("languages_path", (m_env->GetApplicationDataPath() / "Languages").string());
+}
+
 fs::path Configuration::DefaultSavePath()
 {
     return Get<std::string>("default_save_path", m_env->GetKnownFolderPath(Environment::KnownFolder::UserDownloads).string());

diff --git a/src/picotorrent/config.hpp b/src/picotorrent/config.hpp
@@ -119,6 +119,8 @@ namespace pt
         int CurrentLanguageId();
         void CurrentLanguageId(int id);
 
+        fs::path LanguagesPath();
+
         fs::path DefaultSavePath();
         void DefaultSavePath(fs::path path);
 

diff --git a/src/picotorrent/translator.cpp b/src/picotorrent/translator.cpp
@@ -1,9 +1,15 @@
 #include "translator.hpp"
 
+#include <filesystem>
+#include <fstream>
+#include <sstream>
+
 #include "config.hpp"
+#include "environment.hpp"
 #include "picojson.hpp"
 #include "utils.hpp"
 
+namespace fs = std::experimental::filesystem::v1;
 namespace pj = picojson;
 using pt::Translator;
 
@@ -55,6 +61,27 @@ std::shared_ptr<Translator> Translator::Load(HINSTANCE hInstance, std::shared_pt
         LoadTranslationResource,
         reinterpret_cast<LONG_PTR>(&langs));
 
+    fs::path translationsDirectory = config->LanguagesPath();
+
+    for (fs::directory_entry const& entry : fs::directory_iterator(translationsDirectory))
+    {
+        if (entry.path().extension() != ".json")
+        {
+            continue;
+        }
+
+        std::ifstream jsonStream(entry.path(), std::ios::binary | std::ios::in);
+        std::stringstream json;
+        json << jsonStream.rdbuf();
+
+        Language lang;
+
+        if (LoadLanguageFromJson(json.str(), lang))
+        {
+            langs[lang.code] = lang;
+        }
+    }
+
     return std::shared_ptr<Translator>(
         new Translator(langs,
             config->CurrentLanguageId()));
@@ -70,13 +97,24 @@ BOOL Translator::LoadTranslationResource(HMODULE hModule, LPCTSTR lpszType, LPTS
     const char* buffer = reinterpret_cast<const char*>(LockResource(data));
 
     std::string json(buffer, static_cast<size_t>(size));
+    Language lang;
 
+    if (LoadLanguageFromJson(json, lang))
+    {
+        langs->insert({ lang.code, lang });
+    }
+
+    return TRUE;
+}
+
+bool Translator::LoadLanguageFromJson(std::string const& json, Translator::Language& lang)
+{
     pj::value v;
     std::string err = pj::parse(v, json);
 
     if (!err.empty())
     {
-        return TRUE;
+        return false;
     }
 
     pj::object obj = v.get<pj::object>();
@@ -96,7 +134,7 @@ BOOL Translator::LoadTranslationResource(HMODULE hModule, LPCTSTR lpszType, LPTS
         l.translations.insert({ p.first, converted });
     }
 
-    langs->insert({ langId, l });
+    lang = l;
 
-    return TRUE;
+    return true;
 }
diff --git a/src/picotorrent/translator.hpp b/src/picotorrent/translator.hpp
@@ -14,6 +14,7 @@
 namespace pt
 {
     class Configuration;
+    class Environment;
 
     class Translator
     {
@@ -35,6 +36,7 @@ namespace pt
         Translator(std::map<int, Language> const& languages, int selectedLanguage);
 
         static BOOL CALLBACK LoadTranslationResource(HMODULE hModule, LPCTSTR lpszType, LPTSTR lpszName, LONG_PTR lParam);
+        static bool LoadLanguageFromJson(std::string const& json, Language& lang);
 
         int m_selectedLanguage;
         std::map<int, Language> m_languages;