mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2026-03-18 11:23:38 +00:00
Merge bcb57a1c5c into a8c5f6ddfc
This commit is contained in:
commit
4e63752752
@ -157,8 +157,7 @@ std::string MovieManager::GetRTCDisplay() const
|
|||||||
const time_t current_time = CEXIIPL::GetEmulatedTime(m_system, CEXIIPL::UNIX_EPOCH);
|
const time_t current_time = CEXIIPL::GetEmulatedTime(m_system, CEXIIPL::UNIX_EPOCH);
|
||||||
const tm gm_time = fmt::gmtime(current_time);
|
const tm gm_time = fmt::gmtime(current_time);
|
||||||
|
|
||||||
// Use current locale for formatting time, as fmt is locale-agnostic by default.
|
return fmt::format("Date/Time: {:%c}", gm_time);
|
||||||
return fmt::format(std::locale{""}, "Date/Time: {:%c}", gm_time);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// NOTE: GPU Thread
|
// NOTE: GPU Thread
|
||||||
|
|||||||
@ -297,8 +297,7 @@ static std::string SystemTimeAsDoubleToString(double time)
|
|||||||
if (!local_time)
|
if (!local_time)
|
||||||
return "";
|
return "";
|
||||||
|
|
||||||
// fmt is locale agnostic by default, so explicitly use current locale.
|
return fmt::format("{:%x %X}", *local_time);
|
||||||
return fmt::format(std::locale{""}, "{:%x %X}", *local_time);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static std::string MakeStateFilename(int number)
|
static std::string MakeStateFilename(int number)
|
||||||
|
|||||||
@ -330,7 +330,7 @@ void PostProcessingConfiguration::SaveOptionsConfiguration()
|
|||||||
case ConfigurationOption::OptionType::Float:
|
case ConfigurationOption::OptionType::Float:
|
||||||
{
|
{
|
||||||
std::ostringstream value;
|
std::ostringstream value;
|
||||||
value.imbue(std::locale("C"));
|
value.imbue(std::locale::classic());
|
||||||
|
|
||||||
for (size_t i = 0; i < it.second.m_float_values.size(); ++i)
|
for (size_t i = 0; i < it.second.m_float_values.size(); ++i)
|
||||||
{
|
{
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user