Cleanup

src/plugin/PluginUserSettings.cpp

Index: src/plugin/PluginUserSettings.cpp
===================================================================
--- a/src/plugin/PluginUserSettings.cpp
+++ b/src/plugin/PluginUserSettings.cpp
@@ -3,7 +3,7 @@
 #include <algorithm>
 #include "PluginSettings.h"
 #include "PluginClient.h"
-#include "PluginIniFileW.h"
+#include "../shared/Dictionary.h"
 
 static const CString s_GetMessage = L"GetMessage";
 static const CString s_GetLanguageCount = L"GetLanguageCount";
@@ -93,34 +93,20 @@
 static CString sGetLanguage()
 {
   CPluginSettings* settings = CPluginSettings::GetInstance();
-
-  return settings->GetString(SETTING_LANGUAGE);
-}
-
-
-static bool sReadSettingsPageFile(CPluginIniFileW& iniFile)
-{
-  return iniFile.HasSection(sGetLanguage());
-}
-
-
-static CPluginIniFileW& sReadSettingsPageFile(bool& readOK)
-{
-  static CPluginIniFileW iniFile(CPluginSettings::GetDataPath(SETTING_PAGE_INI_FILE));
-  static bool s_readOK = iniFile.Read();
-
-  readOK = s_readOK;
-
-  return iniFile;
+  return settings->GetSubscription();
 }
 
 
 CStringW sGetMessage(const CString& key)
 {
-  bool readOK = false;
-  CPluginIniFileW& iniFile = sReadSettingsPageFile(readOK);
+  Dictionary* dictionary = Dictionary::GetInstance();
+  return CString(dictionary->Lookup("settings", std::string(CW2A(key))).c_str());

[Felix Dahlke, 2013/07/25 13:52:33]

Better use ToUtf8String() instead of std::string(CW2A()). But I do wonder why
Lookup uses std::string in the signature to begin with, I think we generally
wanted to use std::wstring in the plugin.

Also, this can be simplified by not duplicating logic from the other sGetMessage
function:

return CString(sGetMessage("settings", ToUtf8String(key)).c_str());

+}
 
-  return iniFile.GetValue(sGetLanguage(), key);
+std::wstring sGetMessage(const std::string& key)
+{
+  Dictionary* dictionary = Dictionary::GetInstance();
+  return dictionary->Lookup("settings", key);
 }