新增支持从外部文件(lanugage目录)读取语言

Author: zhongyang219

TrafficMonitor/StrTable.cpp

@@ -2,6 +2,7 @@
 #include "StrTable.h"
 #include "Common.h"
 #include "IniHelper.h"
+#include "TrafficMonitor.h"
 
 CStrTable::CStrTable()
 {
@@ -72,8 +73,37 @@ void CStrTable::Init()
     CIniHelper ini(IDR_LANGUAGE);
     ini.GetAllKeyValues(L"text", m_text_string_table);
     ini.GetAllKeyValues(L"menu", m_menu_string_table);
-
     LanguageInfoFromIni(m_language_info, ini);
+
+    //从外部language文件夹获取语言文件
+    vector<wstring> files;
+    std::wstring language_dir;
+#ifdef _DEBUG
+    language_dir = L".\\language";
+#else
+    language_dir = theApp.m_module_dir + L"language";
+#endif
+    CCommon::GetFiles((language_dir + L"\\*.ini").c_str(), files);
+    for (const wstring& file_name : files)
+    {
+        std::wstring file_path{ language_dir + file_name };
+        CIniHelper ini_file(file_path);
+        LanguageInfo language_info;
+        LanguageInfoFromIni(language_info, ini_file);
+        language_info.language_id = LocaleNameToLCID(language_info.bcp_47.c_str(), 0);  //根据语言bcp-47代码获取语言id
+        WORD cur_language_id = GetThreadUILanguage();   //当前语言id
+        //从外部语言文件读取到当前语言，先从外部语言文件加载
+        if (language_info.language_id == cur_language_id)
+        {
+            ini_file.GetAllKeyValues(L"text", m_text_string_table);
+            ini_file.GetAllKeyValues(L"menu", m_menu_string_table);
+        }
+
+        //如果语言不在m_language_list，添加到该列表
+        auto iter = std::find(m_language_list.begin(), m_language_list.end(), language_info);
+        if (iter == m_language_list.end())
+            m_language_list.push_back(language_info);
+    }
 }
 
 const wstring& CStrTable::LoadText(const wstring& key) const

TrafficMonitor/StrTable.h

@@ -15,6 +15,11 @@ class CStrTable
         wstring translator;
         wstring translator_url;
         WORD language_id{};
+
+        bool operator==(const LanguageInfo& another) const
+        {
+            return bcp_47 == another.bcp_47;
+        }
     };
 
     void Init();

TrafficMonitor/TrafficMonitor.rc

@@ -978,7 +978,6 @@
     <None Include="language\English.ini" />
     <None Include="language\Simplified_Chinese.ini" />
     <None Include="language\Traditional_Chinese.ini" />
-    <None Include="language\Turkish.ini" />
     <None Include="res\TrafficMonitor.rc2" />
   </ItemGroup>
   <ItemGroup>

TrafficMonitor/TrafficMonitor.vcxproj

@@ -241,9 +241,6 @@
     <Filter Include="资源文件\language">
       <UniqueIdentifier>{f1f6139c-f164-49f7-86e8-0e5ac6bef657}</UniqueIdentifier>
     </Filter>
-    <Filter Include="源文件和头文件\StrTable">
-      <UniqueIdentifier>{66216d29-2897-4782-9297-fb60cf20d18e}</UniqueIdentifier>
-    </Filter>
     <Filter Include="源文件和头文件\公共的类\StrTable">
       <UniqueIdentifier>{357eeb5d-af51-4701-83c9-e13a17c7f771}</UniqueIdentifier>
     </Filter>
@@ -792,9 +789,6 @@
     <None Include="language\English.ini">
       <Filter>资源文件\language</Filter>
     </None>
-    <None Include="language\Turkish.ini">
-      <Filter>资源文件\language</Filter>
-    </None>
   </ItemGroup>
   <ItemGroup>
     <Image Include="res\menu_icon\close.ico">