AuroraMiddleware/fmt
1
0
Fork 0
mirror of https://github.com/fmtlib/fmt.git synced 2024-12-01 22:20:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

More time formatting

Browse Source
This commit is contained in:
Victor Zverovich 2018-11-30 19:04:14 -08:00
parent bcf3fcd673
commit 68214bd904
2 changed files with 27 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
include/fmt/time.h
View File

@ -159,6 +159,17 @@ struct chrono_formatter {
out = format_decimal<char_type>(out, n, num_digits); out = format_decimal<char_type>(out, n, num_digits);
} }
void format_localized(const tm &time, char format) {
auto locale = context.locale().template get<std::locale>();
auto &facet = std::use_facet<std::time_put<char_type>>(locale);
std::basic_ostringstream<char_type> os;
os.imbue(locale);
const char format_str[] = {'%', 'O', format};
facet.put(os, os, ' ', &time, format_str, format_str + sizeof(format_str));
auto str = os.str();
std::copy(str.begin(), str.end(), out);
}
void on_text(const char_type *begin, const char_type *end) { void on_text(const char_type *begin, const char_type *end) {
std::copy(begin, end, out); std::copy(begin, end, out);
} }
@ -174,21 +185,19 @@ struct chrono_formatter {
auto hour = (s.count() / 3600) % 24; auto hour = (s.count() / 3600) % 24;
if (ns == numeric_system::standard) if (ns == numeric_system::standard)
return write(hour, 2); return write(hour, 2);
auto locale = context.locale().template get<std::locale>();
auto &facet = std::use_facet<std::time_put<char_type>>(locale);
std::basic_ostringstream<char_type> os;
os.imbue(locale);
auto time = tm(); auto time = tm();
time.tm_hour = hour; time.tm_hour = hour;
const char format[] = {'%', 'O', 'H'}; format_localized(time, 'H');
facet.put(os, os, ' ', &time, format, format + sizeof(format));
auto str = os.str();
std::copy(str.begin(), str.end(), out);
} }
void on_12_hour(numeric_system) { void on_12_hour(numeric_system ns) {
auto hour = (s.count() / 3600) % 12; auto hour = (s.count() / 3600) % 12;
write(hour > 0 ? hour : 12, 2); hour = hour > 0 ? hour : 12;
if (ns == numeric_system::standard)
return write(hour, 2);
auto time = tm();
time.tm_hour = hour;
format_localized(time, 'I');
} }
void on_minute(numeric_system) { void on_minute(numeric_system) {

9
test/time-test.cc
View File

@ -95,10 +95,17 @@ TEST(TimeTest, ChronoLocale) {
return; return;
} }
std::ostringstream os; std::ostringstream os;
auto str = [&] {
auto s = os.str();
os.str("");
return s;
};
os.imbue(loc); os.imbue(loc);
auto time = std::tm(); auto time = std::tm();
time.tm_hour = 14; time.tm_hour = 14;
os << std::put_time(&time, "%OH"); os << std::put_time(&time, "%OH");
EXPECT_EQ(os.str(), fmt::format(loc, "{:%OH}", std::chrono::hours(14))); EXPECT_EQ(str(), fmt::format(loc, "{:%OH}", std::chrono::hours(14)));
os << std::put_time(&time, "%OI");
EXPECT_EQ(str(), fmt::format(loc, "{:%OI}", std::chrono::hours(14)));
} }
#endif #endif