diff options
| -rw-r--r-- | include/m_langpack.h | 3 | ||||
| -rw-r--r-- | libs/win32/mir_core.lib | bin | 494038 -> 494254 bytes | |||
| -rw-r--r-- | libs/win64/mir_core.lib | bin | 499282 -> 499484 bytes | |||
| -rw-r--r-- | src/mir_app/src/pluginopts.cpp | 2 | ||||
| -rw-r--r-- | src/mir_core/src/Windows/langpack.cpp | 5 | ||||
| -rw-r--r-- | src/mir_core/src/mir_core.def | 1 | ||||
| -rw-r--r-- | src/mir_core/src/mir_core64.def | 1 |
7 files changed, 11 insertions, 1 deletions
diff --git a/include/m_langpack.h b/include/m_langpack.h index 26f37ff380..0eb2a0a677 100644 --- a/include/m_langpack.h +++ b/include/m_langpack.h @@ -50,6 +50,9 @@ EXTERN_C MIR_CORE_DLL(char*) TranslateU_LP(const char *str, HPLUGIN = nullptr EXTERN_C MIR_CORE_DLL(wchar_t*) TranslateW_LP(const wchar_t *str, HPLUGIN = nullptr);
EXTERN_C MIR_CORE_DLL(void) TranslateDialog_LP(HWND hDlg, HPLUGIN = nullptr);
+// if uuid == NULL, translations are loaded from the global section only
+EXTERN_C MIR_CORE_DLL(wchar_t *) TranslateW_UUID(const wchar_t *str, const MUUID *uuid);
+
#define Translate(s) TranslateA_LP(s, &g_plugin)
#define TranslateU(s) TranslateU_LP(s, &g_plugin)
#define TranslateW(s) TranslateW_LP(s, &g_plugin)
diff --git a/libs/win32/mir_core.lib b/libs/win32/mir_core.lib Binary files differindex 809d219ee7..15c5ec2121 100644 --- a/libs/win32/mir_core.lib +++ b/libs/win32/mir_core.lib diff --git a/libs/win64/mir_core.lib b/libs/win64/mir_core.lib Binary files differindex 664f6c20d7..6845ee9eda 100644 --- a/libs/win64/mir_core.lib +++ b/libs/win64/mir_core.lib diff --git a/src/mir_app/src/pluginopts.cpp b/src/mir_app/src/pluginopts.cpp index 73b86e43d1..a39b28a73d 100644 --- a/src/mir_app/src/pluginopts.cpp +++ b/src/mir_app/src/pluginopts.cpp @@ -545,7 +545,7 @@ public: m_plugList.GetItemText(hdr->iItem, 2, buf, _countof(buf));
SetDlgItemText(m_hwnd, IDC_PLUGININFOFRAME, sel ? buf : L"");
m_author.SetText(sel ? dat->author : L"");
- m_plugInfo.SetText(sel ? TranslateW_LP(dat->description, &GetPluginByInstance(dat->hInst)) : L"");
+ m_plugInfo.SetText(sel ? TranslateW_UUID(dat->description, &dat->uuid) : L"");
m_copyright.SetText(sel ? dat->copyright : L"");
szUrl = sel ? _T2A(dat->homepage) : "";
diff --git a/src/mir_core/src/Windows/langpack.cpp b/src/mir_core/src/Windows/langpack.cpp index a71d3dabb2..912e8feb7c 100644 --- a/src/mir_core/src/Windows/langpack.cpp +++ b/src/mir_core/src/Windows/langpack.cpp @@ -567,6 +567,11 @@ MIR_CORE_DLL(wchar_t*) TranslateW_LP(const wchar_t *str, HPLUGIN pPlugin) return (wchar_t*)LangPackTranslateString(GetMuid(pPlugin), (LPCSTR)str, 1);
}
+MIR_CORE_DLL(wchar_t *) TranslateW_UUID(const wchar_t *str, const MUUID *uuid)
+{
+ return (wchar_t *)LangPackTranslateString(uuid, (LPCSTR)str, 1);
+}
+
MIR_CORE_DLL(void) TranslateMenu_LP(HMENU hMenu, HPLUGIN pPlugin)
{
const MUUID *uuid = &pPlugin->getInfo().uuid;
diff --git a/src/mir_core/src/mir_core.def b/src/mir_core/src/mir_core.def index 899da28097..d243278ac2 100644 --- a/src/mir_core/src/mir_core.def +++ b/src/mir_core/src/mir_core.def @@ -1561,3 +1561,4 @@ db_event_updateId @1772 ?getExtension@MFilePath@@QBE?AV?$CMStringT@_WV?$ChTraitsCRT@_W@@@@XZ @1782 NONAME
?isExecutable@MFilePath@@QBE_NXZ @1783 NONAME
?GetPlugin@CDlgBase@@QBEPBVCMPluginBase@@XZ @1784 NONAME
+_TranslateW_UUID@8 @1785 NONAME
diff --git a/src/mir_core/src/mir_core64.def b/src/mir_core/src/mir_core64.def index 4e9a187683..efa7ecff00 100644 --- a/src/mir_core/src/mir_core64.def +++ b/src/mir_core/src/mir_core64.def @@ -1561,3 +1561,4 @@ db_event_updateId @1772 ?getExtension@MFilePath@@QEBA?AV?$CMStringT@_WV?$ChTraitsCRT@_W@@@@XZ @1782 NONAME
?isExecutable@MFilePath@@QEBA_NXZ @1783 NONAME
?GetPlugin@CDlgBase@@QEBAPEBVCMPluginBase@@XZ @1784 NONAME
+TranslateW_UUID @1785 NONAME
|