From 147639582964d3d65143501d2ddd4c474331fd90 Mon Sep 17 00:00:00 2001
From: stefansjfw <57057282+stefansjfw@users.noreply.github.com>
Date: Wed, 25 Mar 2020 11:11:27 +0100
Subject: [PATCH] Enable non-ascii chars (#1669)

* Enable non-ascii chars

* Follow file naming policy

* Use stream read and write methods

* Remove obsolete close() calls

* Revert "Remove obsolete close() calls"

This reverts commit 7006bcb038ef3047a1397af212859889741adfd8.

* Revert "Use stream read and write methods"

This reverts commit ec06a1a05b234aaaaf4b648a2b21d8d44f2d9be8.
---
 src/common/json.cpp | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/common/json.cpp b/src/common/json.cpp
index 4fbbf9adc7..0c8533a46e 100644
--- a/src/common/json.cpp
+++ b/src/common/json.cpp
@@ -9,11 +9,12 @@ namespace json
     {
         try
         {
-            std::wifstream file(file_name.data(), std::ios::binary);
+            std::ifstream file(file_name.data(), std::ios::binary);
             if (file.is_open())
             {
-                using isbi = std::istreambuf_iterator<wchar_t>;
-                return JsonValue::Parse(std::wstring{ isbi{ file }, isbi{} }).GetObjectW();
+                using isbi = std::istreambuf_iterator<char>;
+                std::string obj_str{ isbi{ file }, isbi{} };
+                return JsonValue::Parse(winrt::to_hstring(obj_str)).GetObjectW();
             }
             return std::nullopt;
         }
@@ -25,6 +26,7 @@ namespace json
 
     void to_file(std::wstring_view file_name, const JsonObject& obj)
     {
-        std::wofstream{ file_name.data(), std::ios::binary } << obj.Stringify().c_str();
+        std::wstring obj_str{ obj.Stringify().c_str() };
+        std::ofstream{ file_name.data(), std::ios::binary } << winrt::to_string(obj_str);
     }
 }