Release (05.06.2023)

Nikitosiki · Jun 4, 2023 · 60e6e00 · 60e6e00
1 parent e477203
commit 60e6e00
Show file tree

Hide file tree

Showing 7 changed files with 81 additions and 1 deletion.
diff --git a/LocalizatorDll/LocalizatorDll.vcxproj b/LocalizatorDll/LocalizatorDll.vcxproj
@@ -146,6 +146,7 @@
  <ClInclude Include="pch.h" />
  <ClInclude Include="pugiconfig.hpp" />
  <ClInclude Include="pugixml.hpp" />
+ <ClInclude Include="StringConverter.h" />
  <ClInclude Include="XMLReader.h" />
  </ItemGroup>
  <ItemGroup>
@@ -159,9 +160,20 @@
  <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
  </ClCompile>
  <ClCompile Include="pugixml.cpp" />
+ <ClCompile Include="StringConverter.cpp" />
  <ClCompile Include="XMLReader.cpp" />
  </ItemGroup>
+ <ItemGroup>
+ <None Include="packages.config" />
+ </ItemGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
  <ImportGroup Label="ExtensionTargets">
+ <Import Project="..\LocalizatorApp\packages\libiconv.lib.1.16.0.6\build\native\libiconv.lib.targets" Condition="Exists('..\LocalizatorApp\packages\libiconv.lib.1.16.0.6\build\native\libiconv.lib.targets')" />
  </ImportGroup>
+ <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+ <PropertyGroup>
+ <ErrorText>Данный проект ссылается на пакеты NuGet, отсутствующие на этом компьютере. Используйте восстановление пакетов NuGet, чтобы скачать их. Дополнительную информацию см. по адресу: http://go.microsoft.com/fwlink/?LinkID=322105. Отсутствует следующий файл: {0}.</ErrorText>
+ </PropertyGroup>
+ <Error Condition="!Exists('..\LocalizatorApp\packages\libiconv.lib.1.16.0.6\build\native\libiconv.lib.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\LocalizatorApp\packages\libiconv.lib.1.16.0.6\build\native\libiconv.lib.targets'))" />
+ </Target>
 </Project>
diff --git a/LocalizatorDll/LocalizatorDll.vcxproj.filters b/LocalizatorDll/LocalizatorDll.vcxproj.filters
@@ -40,6 +40,12 @@
  <Filter Include="Файлы заголовков\Entities">
  <UniqueIdentifier>{d6e51436-404d-4828-8ab9-b1f0ed007c37}</UniqueIdentifier>
  </Filter>
+ <Filter Include="Исходные файлы\Helper">
+ <UniqueIdentifier>{8f3fe8c9-7322-4314-a39b-079aea91d5c0}</UniqueIdentifier>
+ </Filter>
+ <Filter Include="Файлы заголовков\Helper">
+ <UniqueIdentifier>{3564fe72-b79c-4d30-95a7-fe4cc4aeab94}</UniqueIdentifier>
+ </Filter>
  </ItemGroup>
  <ItemGroup>
  <ClInclude Include="pugixml.hpp">
@@ -66,6 +72,9 @@
  <ClInclude Include="language.h">
  <Filter>Файлы заголовков\Entities</Filter>
  </ClInclude>
+ <ClInclude Include="StringConverter.h">
+ <Filter>Файлы заголовков\Helper</Filter>
+ </ClInclude>
  </ItemGroup>
  <ItemGroup>
  <ClCompile Include="pugixml.cpp">
@@ -86,5 +95,11 @@
  <ClCompile Include="XMLReader.cpp">
  <Filter>Исходные файлы\Handler</Filter>
  </ClCompile>
+ <ClCompile Include="StringConverter.cpp">
+ <Filter>Исходные файлы\Helper</Filter>
+ </ClCompile>
+ </ItemGroup>
+ <ItemGroup>
+ <None Include="packages.config" />
  </ItemGroup>
 </Project>
diff --git a/LocalizatorDll/LocalizerHandler.cpp b/LocalizatorDll/LocalizerHandler.cpp
@@ -3,6 +3,7 @@
 #include <fstream>
 #include <string>
 #include "LocalizerHandler.h"
+#include "DllFunctions.h"
 #include "XMLReader.h"
 
 
@@ -126,7 +127,7 @@ const char** LocalizerHandler::GetLanguageNames(int& size) const
 const void LocalizerHandler::MessageError(const HWND& hWnd, const LPCSTR& lpText, const LPCSTR& lpCaption, const UINT& uType) const
 {
  MessageBoxA(hWnd, lpText, lpCaption, uType);
-
+ Stop();
  ExitProcess(0);
 }
 

diff --git a/LocalizatorDll/StringConverter.cpp b/LocalizatorDll/StringConverter.cpp
@@ -0,0 +1,33 @@
+//#include <iostream>
+//#include <string>
+//#include <iconv.h>
+//#include <codecvt>
+//#include "StringConverter.h"
+//#include <locale>
+//#include <codecvt>
+
+//const std::string StringConverter::ConvertUtf8ToAnsi(const std::string& input)
+//{
+// using wcvt = std::wstring_convert<std::codecvt_utf8<int32_t>, int32_t>;
+// auto wstr = wcvt{}.from_bytes(input);
+// std::string result(wstr.size(), '0');
+// std::use_facet<std::ctype<char32_t>>(std::locale{}).narrow(
+// reinterpret_cast<const char32_t*>(wstr.data()),
+// reinterpret_cast<const char32_t*>(wstr.data() + wstr.size()),
+// '?', &result[0]);
+// return result;
+//}
+
+//std::string to_utf8(const std::string& str, const std::locale& loc = std::locale{}) {
+// using wcvt = std::wstring_convert<std::codecvt_utf8<char32_t>, char32_t>;
+// std::u32string wstr(str.size(), U'\0');
+// std::use_facet<std::ctype<char32_t>>(loc).widen(str.data(), str.data() + str.size(), &wstr[0]);
+// return wcvt{}.to_bytes(wstr.data(), wstr.data() + wstr.size());
+//}
+
+//const std::string StringConverter::ConvertAnsiToUtf8(const std::string& input)
+//{
+// std::wstring_convert<std::codecvt_utf8<wchar_t>> converter;
+// std::wstring wideStr = converter.from_bytes(input);
+// return std::string(wideStr.begin(), wideStr.end());
+//}
diff --git a/LocalizatorDll/StringConverter.h b/LocalizatorDll/StringConverter.h
@@ -0,0 +1,12 @@
+//#pragma once
+//#include <string>
+//
+//class StringConverter
+//{
+//public:
+//
+// static const std::string ConvertUtf8ToAnsi(const std::string& input);
+//
+// static const std::string ConvertAnsiToUtf8(const std::string& input);
+//};
+
diff --git a/LocalizatorDll/XMLReader.cpp b/LocalizatorDll/XMLReader.cpp
@@ -5,6 +5,7 @@
 #include "XMLReader.h"
 #include "pugixml.hpp"
 #include "language.h"
+#include "StringConverter.h"
 
 using namespace pugi;
 
@@ -119,6 +120,7 @@ const bool XMLReader::ReadSelectLangName_FromFile(const std::string& fileFullPat
  std::string languageCode = languageNode.attribute("code").as_string();
  if (languageCode.compare(selectedLanguageCode) == 0)
  {
+ //values = StringConverter::ConvertUtf8ToAnsi(languageNode.attribute("name").as_string());
  values = languageNode.attribute("name").as_string();
  return true;
  }
@@ -171,6 +173,7 @@ const bool XMLReader::ReadTranslationsFromFile(const std::string& fileFullPath,
  {
  std::string key = entryNode.attribute("key").as_string();
  std::string value = entryNode.attribute("value").as_string();
+ //dictionary[key] = StringConverter::ConvertUtf8ToAnsi(value);
  dictionary[key] = value;
  }
 

diff --git a/LocalizatorDll/packages.config b/LocalizatorDll/packages.config
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+ <package id="libiconv.lib" version="1.16.0.6" targetFramework="native" />
+</packages>