From b6899a821b511a286ef93896c4af150a5018fbfd Mon Sep 17 00:00:00 2001
From: Andrei Kortunov <andrei.kortunov@yandex.ru>
Date: Fri, 3 Jan 2020 08:45:53 +0400
Subject: [PATCH 1/3] Improve BetaComment handling (feature #4129)

---
 CHANGELOG.md                            |  1 +
 apps/openmw/mwscript/miscextensions.cpp | 10 ++++++++++
 2 files changed, 11 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 67a2632b93..f58ce5789b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -196,6 +196,7 @@
     Feature #3980: In-game option to disable controller
     Feature #3999: Shift + Double Click should maximize/restore menu size
     Feature #4001: Toggle sneak controller shortcut
+    Feature #4129: Beta Comment to File
     Feature #4209: Editor: Faction rank sub-table
     Feature #4255: Handle broken RepairedOnMe script function
     Feature #4316: Implement RaiseRank/LowerRank functions properly
diff --git a/apps/openmw/mwscript/miscextensions.cpp b/apps/openmw/mwscript/miscextensions.cpp
index d40ad769d6..ada1af59e0 100644
--- a/apps/openmw/mwscript/miscextensions.cpp
+++ b/apps/openmw/mwscript/miscextensions.cpp
@@ -1,10 +1,13 @@
 #include "miscextensions.hpp"
 
 #include <cstdlib>
+#include <iomanip>
 
 #include <components/compiler/opcodes.hpp>
 #include <components/compiler/locals.hpp>
 
+#include <components/debug/debuglog.hpp>
+
 #include <components/interpreter/interpreter.hpp>
 #include <components/interpreter/runtime.hpp>
 #include <components/interpreter/opcodes.hpp>
@@ -1222,6 +1225,11 @@ namespace MWScript
 
                 std::stringstream msg;
 
+                msg << "Report time: ";
+
+                std::time_t currentTime = std::chrono::system_clock::to_time_t(std::chrono::system_clock::now());
+                msg << std::put_time(std::gmtime(&currentTime), "%d.%m.%Y %T UTC") << std::endl;
+
                 msg << "Content file: ";
 
                 if (!ptr.getCellRef().hasContentFile())
@@ -1263,6 +1271,8 @@ namespace MWScript
                     --arg0;
                 }
 
+                Log(Debug::Warning) << "\n" << msg.str();
+
                 runtime.getContext().report(msg.str());
             }
         };

From af36b652aacadd55dac91eb3256b2c8f9eb6bd2a Mon Sep 17 00:00:00 2001
From: Andrei Kortunov <andrei.kortunov@yandex.ru>
Date: Sat, 4 Jan 2020 10:45:11 +0400
Subject: [PATCH 2/3] Simplify datetime formatting

---
 apps/openmw/mwgui/savegamedialog.cpp | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/apps/openmw/mwgui/savegamedialog.cpp b/apps/openmw/mwgui/savegamedialog.cpp
index e9fb2a9642..98449d5075 100644
--- a/apps/openmw/mwgui/savegamedialog.cpp
+++ b/apps/openmw/mwgui/savegamedialog.cpp
@@ -400,17 +400,7 @@ namespace MWGui
         struct tm* timeinfo;
         timeinfo = localtime(&time);
 
-        // Use system/environment locale settings for datetime formatting
-        char* oldLctime = setlocale(LC_TIME, nullptr);
-        setlocale(LC_TIME, "");
-
-        const int size=1024;
-        char buffer[size];
-        if (std::strftime(buffer, size, "%x %X", timeinfo) > 0)
-            text << buffer << "\n";
-
-        // reset
-        setlocale(LC_TIME, oldLctime);
+        text << std::put_time(timeinfo, "%d.%m.%Y %T") << "\n";
 
         text << "#{sLevel} " << mCurrentSlot->mProfile.mPlayerLevel << "\n";
         text << "#{sCell=" << mCurrentSlot->mProfile.mPlayerCell << "}\n";

From a42396254bd7f97bab8c64852630860a8b845c48 Mon Sep 17 00:00:00 2001
From: Andrei Kortunov <andrei.kortunov@yandex.ru>
Date: Mon, 6 Jan 2020 11:27:11 +0400
Subject: [PATCH 3/3] Use ISO format to print datetime

---
 apps/openmw/mwgui/savegamedialog.cpp    | 2 +-
 apps/openmw/mwscript/miscextensions.cpp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/openmw/mwgui/savegamedialog.cpp b/apps/openmw/mwgui/savegamedialog.cpp
index 98449d5075..f85bfc8d37 100644
--- a/apps/openmw/mwgui/savegamedialog.cpp
+++ b/apps/openmw/mwgui/savegamedialog.cpp
@@ -400,7 +400,7 @@ namespace MWGui
         struct tm* timeinfo;
         timeinfo = localtime(&time);
 
-        text << std::put_time(timeinfo, "%d.%m.%Y %T") << "\n";
+        text << std::put_time(timeinfo, "%Y.%m.%d %T") << "\n";
 
         text << "#{sLevel} " << mCurrentSlot->mProfile.mPlayerLevel << "\n";
         text << "#{sCell=" << mCurrentSlot->mProfile.mPlayerCell << "}\n";
diff --git a/apps/openmw/mwscript/miscextensions.cpp b/apps/openmw/mwscript/miscextensions.cpp
index ada1af59e0..8be3945a9c 100644
--- a/apps/openmw/mwscript/miscextensions.cpp
+++ b/apps/openmw/mwscript/miscextensions.cpp
@@ -1228,7 +1228,7 @@ namespace MWScript
                 msg << "Report time: ";
 
                 std::time_t currentTime = std::chrono::system_clock::to_time_t(std::chrono::system_clock::now());
-                msg << std::put_time(std::gmtime(&currentTime), "%d.%m.%Y %T UTC") << std::endl;
+                msg << std::put_time(std::gmtime(&currentTime), "%Y.%m.%d %T UTC") << std::endl;
 
                 msg << "Content file: ";