games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-25 22:42:04 +02:00
Code Issues Releases Activity

Revert "another approach"

Browse Source 
This reverts commit 2f64457a9a.
This commit is contained in:
Laserlicht
2023-09-24 15:02:59 +02:00
parent 2f64457a9a
commit e93a04409e
3 changed files with 39 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
lib/vstd/DateUtils.cpp
View File

@@ -1,8 +1,9 @@
#include "StdInc.h"
#include <vstd/DateUtils.h>
#include "../CConfigHandler.h"
#include "../Languages.h"
#if defined(VCMI_ANDROID)
#include "../CAndroidVMHelper.h"
#endif
VCMI_LIB_NAMESPACE_BEGIN
@@ -11,17 +12,16 @@ namespace vstd
DLL_LINKAGE std::string getFormattedDateTime(std::time_t dt)
{
std::string lang = settings["general"]["language"].String();
std::string locale = Languages::getLanguageOptions(lang).locale;
#if defined(VCMI_ANDROID)
CAndroidVMHelper vmHelper;
return vmHelper.callStaticStringMethod(CAndroidVMHelper::NATIVE_METHODS_DEFAULT_CLASS, "getFormattedDateTime");
#endif
std::tm tm = *std::localtime(&dt);
std::stringstream s;
try
{
if(locale.empty())
s.imbue(std::locale(""));
else
s.imbue(std::locale(locale));
s.imbue(std::locale(""));
}
catch(const std::runtime_error & e)
{