Installation with registry keys

src/shared/Dictionary.cpp

 #include <fstream>
 #include <stdexcept>
 #include <Windows.h>
 
 #include "Dictionary.h"
 #include "Utils.h"
 
 Dictionary* Dictionary::instance = 0;
 
 const std::wstring baseLocale = L"en";
 
-Dictionary::Dictionary(const std::wstring& locale)
+Dictionary::Dictionary( const std::wstring& locale, std::wstring basePath )
 {
-  std::wstring basePath = GetDllDir() + L"locales\\";
-
   // Always load base locale first - that's our fallback
   ReadDictionary(basePath, baseLocale);
 
   // Now try to load by full locale code
   if (locale != baseLocale && !ReadDictionary(basePath, locale))
   {
     // Fall back to short locale name
     size_t pos = locale.find(L'-');
     if (pos != std::wstring::npos && locale.compare(0, pos, baseLocale) != 0)
       ReadDictionary(basePath, locale.substr(0, pos));
   }
 }
 
-void Dictionary::Create(const std::wstring& locale)
+void Dictionary::Create(const std::wstring& locale, std::wstring basePath )
 {
   if (!instance)
-    instance = new Dictionary(locale);
+    instance = new Dictionary(locale, basePath);
 }
 
 Dictionary* Dictionary::GetInstance()
 {
   if (!instance)
     throw std::runtime_error("Attempt to access dictionary before creating");
 
   return instance;
 }
 
@@ skipping 38 matching lines @@
 }
 
 std::wstring Dictionary::Lookup(const std::string& section, const std::string& key) const
 {
   DataType::const_iterator it = data.find(KeyType(section, key));
   if (it == data.end())
     return L"### MISSING STRING [" + ToUtf16String(section) + L", " + ToUtf16String(key) + L"] ###";
 
   return it->second;
 }