From 0d6cc1a5f6680dfc9107d4736367acb114f14487 Mon Sep 17 00:00:00 2001
From: Gridgt <gridgt@mail.ru>
Date: Tue, 30 Jun 2026 23:48:35 +0300
Subject: [PATCH] feat: add hybrid localization system (hardcoded + external
 JSON)

- scanLangDir() discovers lang/*.json at startup, adds new languages
- loadExternal() merges JSON translations over hardcoded dictionaries
- Encoding: UTF-16 LE with BOM via Util::readFile (same as config.json)
- de-DE.json included as external-only test language
---
 ScreenCapture/Lang.cpp        |  62 +++++++++++++++++++++++++++++++++-
 ScreenCapture/Lang.h          |   6 ++++
 ScreenCapture/lang/de-DE.json | Bin 0 -> 5214 bytes
 3 files changed, 67 insertions(+), 1 deletion(-)
 create mode 100644 ScreenCapture/lang/de-DE.json

diff --git a/ScreenCapture/Lang.cpp b/ScreenCapture/Lang.cpp
index 4e6f284..c0afaeb 100644
--- a/ScreenCapture/Lang.cpp
+++ b/ScreenCapture/Lang.cpp
@@ -1,17 +1,20 @@
 #include "pch.h"
 #include "Lang.h"
 #include "Setting.h"
+#include "Util.h"
 
 std::unique_ptr<Lang> lang;
+std::map<std::wstring,std::filesystem::path> Lang::externalFiles;
 
 namespace {
 	// 所有支持的语言（code + 自身语言名称）；新增语言只需在此追加并补全对应字典
-	const std::map<std::wstring,std::wstring> supportedLangs = {
+	std::map<std::wstring,std::wstring> supportedLangs = {
 		{ L"zh-CN", L"中文" },
 		{ L"en-US", L"English" },
 		{ L"id-ID", L"Bahasa Indonesia" },
 		{ L"ru-RU", L"Русский" },
 	};
+
 }
 
 Lang::Lang()
@@ -27,6 +30,7 @@ void Lang::init()
 	if (!lang) {
 		lang = std::make_unique<Lang>();
 	}
+	scanLangDir();
 	lang->setLang(Setting::getLanguage());
 }
 
@@ -62,6 +66,62 @@ void Lang::setLang(const std::wstring& l)
 	}
 	lang->langCode = supported ? l : L"zh-CN";
 	lang->load(lang->langCode);
+	lang->loadExternal(lang->langCode);
+}
+
+std::filesystem::path Lang::getLangDir()
+{
+	std::vector<wchar_t> buf(MAX_PATH);
+	GetModuleFileName(nullptr, buf.data(), MAX_PATH);
+	return std::filesystem::path(buf.data()).parent_path() / L"lang";
+}
+
+void Lang::scanLangDir()
+{
+	auto langDir = getLangDir();
+	if (!std::filesystem::exists(langDir)) return;
+
+	for (auto& entry : std::filesystem::directory_iterator(langDir)) {
+		if (entry.path().extension() != L".json") continue;
+
+		auto content = Util::readFile(entry.path().wstring());
+		if (content.empty()) continue;
+
+		try {
+			auto obj = JsonObject::Parse(content.data());
+			if (!obj.HasKey(L"language") || !obj.HasKey(L"name")) continue;
+			auto code = std::wstring(obj.GetNamedString(L"language"));
+			auto name = std::wstring(obj.GetNamedString(L"name"));
+			if (code.empty() || name.empty()) continue;
+
+			supportedLangs[code] = name;
+			externalFiles[code] = entry.path();
+		}
+		catch (winrt::hresult_error const&) {
+			continue;
+		}
+	}
+}
+
+void Lang::loadExternal(const std::wstring& l)
+{
+	auto it = externalFiles.find(l);
+	if (it == externalFiles.end()) return;
+
+	auto content = Util::readFile(it->second.wstring());
+	if (content.empty()) return;
+
+	try {
+		auto obj = JsonObject::Parse(content.data());
+		if (!obj.HasKey(L"translations")) return;
+		auto translations = obj.GetNamedObject(L"translations");
+		for (const auto& [key, value] : translations) {
+			dic[std::wstring(key)] = std::wstring(value.GetString());
+		}
+	}
+	catch (winrt::hresult_error const&) {
+		return;
+	}
 }
 
 void Lang::load(const std::wstring& l)
diff --git a/ScreenCapture/Lang.h b/ScreenCapture/Lang.h
index a85f212..8afe3c1 100644
--- a/ScreenCapture/Lang.h
+++ b/ScreenCapture/Lang.h
@@ -1,5 +1,7 @@
 #pragma once
 
+#include <filesystem>
+
 /// <summary>
 /// 多语言管理（单例），与 Setting 同一套模式。
 /// 字典直接硬编码在代码中（保持“单文件、零外部依赖”的定位）。
@@ -23,6 +25,10 @@ class Lang
 	static const std::map<std::wstring, std::wstring>& getLangs();
 private:
 	void load(const std::wstring& lang);
+	void loadExternal(const std::wstring& l);
+	static void scanLangDir();
+	static std::filesystem::path getLangDir();
 	std::map<std::wstring, std::wstring> dic;
 	std::wstring langCode{ L"zh-CN" };
+	static std::map<std::wstring, std::filesystem::path> externalFiles;
 };
diff --git a/ScreenCapture/lang/de-DE.json b/ScreenCapture/lang/de-DE.json
new file mode 100644
index 0000000000000000000000000000000000000000..71e35ff3c0ca1a2d0bae51cca068fdfc5cfeab04
GIT binary patch
literal 5214
zcmbVQ%Wm6N5S?|ug7B&Z8lj5-1+w!)b_2_WVH*k1O`uA$%vur!ii)ii{nG;7<TH%6
z=gigcj!2QB1Hz_wd1vO#dwBo*_fPpw5?n_zlc6kRDr?-QGQr9_T_5B38#$9cR(>pZ
zFR*LwcAeq(S_)aoNFH`}7LqIHl}acil?-xLTmB|LU<i9R(gT;FEaevW9GoYhFgz#V
zFq83CQi}I;;2c8wJ$6kXow&H)(C+6wP#n{e??6#f^9A^M$t&>8pj(1>Iph|&&v12-
z@&RaR!K{?ihW`t8rfNZI(x$@-?+aWhc10cf`Wz9i^=&(+i9Ca<aQK3~iP{i^7%@9$
z&}If7(K91Qd85w{SmFBP9uF90uwM!fQxEfOU#%KftNt_UAtdL(@KjP>!}qk@tVQMm
z5i*zGu`e&_e$_R`3)h<D&D5$9=RluRMczb18$3JP+?CHw6mw{_LJZRXW|3<=J%f@6
zh%tJEzNq?xJBDh}sNoG(##?IU_8eE*qAMe2?4tEXUeuRU`Kqy$YP2=!K!l$9qe^BZ
z<(flHIb)t3sisSKDFf~tyv!26!P_ZxV|AewhS<Z36)IH|9@_IW_8XU5M4V+9F<E@?
zvnH|7Bc7VlgD?J36wNWS1X^+rHS`$2iThr2!=$!n)j2q@${3FerGL>iM%N1d|JIB<
z#5+N?r|j3{;vt?n@V+)r5AjT-p27RAN<T94?=(l)f0i0yjHOune!<!dkrjK^?yjad
zW4y8_nXk?vjn%n1K3H)n%V+x~@{|1~Ma%|DuggefWY`fZZ<Ka}H+5Nl{|0#IPhT?`
zPt>)F(bG*KZMXYgVC7{`-gv5!Y@l0={?qb#*M6Rc*}R4<v)~Dy+0)z5E!AF2?2L2+
zSdWzLbj(fmr;wejvf;TM-*DU20u?8O2UI22sV`f3-d~@=HFW+Sd|JTv%Wb~WhtYe-
z(1Mf85Zu^_68NOvfn$a8d^6A%;LHD4xW6rRI))WkA+C^fZ*gb5w^zO<z8BErzQ*@L
z-pl!``7)a5b?SeMs0fqFyyWiJXfaM=hbKFa+)KCu^4LrH^a#lrwD}g!#7bWm9laR$
z@9WwgbC(HhzyB?+PT_6V>U!Ti*@>kDk;49-U^i_WCWA!Ux@!WfF?O3L5U-0N3Y9zN
z<)J8#$XFE_xo5C8`&^3OuZv#8(63Ck-7$nYgEpOr@AN*ucPH>3u(GE6TI9bWPNB^b
z?^)sbJ=Mo<b|GrW%G^AuSLHB&IK?rBt%5PzXF3b9f{=5y{#ChzZyHAPNUMi&x&zLD
ziWTt%X!%W2pR23<IFE&DWSsuiI#!>n>y)fs8R~)MmvNxK_-3w=VACI?!FDpU-gVUV
zY1{iZrPabLuz@#Ncld3<F3yUxP^~%Zc9X!4v+vuP^CoBVFtr*|A4Sn_J)KlT|M$NA
z01R=}c*J_(IZ#?Ae}KY&mtB{ukFZ=j2UgnxorpEM>WBOQ?UTxVP;VLSN35NKA9I;~
zlR34<f5!VK`3cw0Sp6RM=C?^AmyqmhP4LE}((#*;{`jHhac=|W#}fX$1;-ICPRe%L
zaD=?ewf-|(n2F(Qd$-2bXDQErrG4uTl*`gW?}3V4g=Z1eG@NmS9Q59<W}TgLn6=u@
z2K?DZ-G_C~oc8?LzyQejObd2D-{>MK*8eVgRL?lNNMKwCKVIVQGdNZ&b~DbV79~B*
z$-Ql)cpsQu!c-PIy5WvBh*qlB&`3!%mepf9fu%X^vr<J)j4f98aFWAGFq|L7s4H;d
zkVt!1s>fnPL5Z0R@aO$(F~lCvN||VGG4q1|yUX-eV^!c}-9w!79y@#N(?{FW!M||l
F-~Uw2G8+H@

literal 0
HcmV?d00001