diff --git a/include/fmt/chrono.h b/include/fmt/chrono.h index 8f5426f2..7bd4206d 100644 --- a/include/fmt/chrono.h +++ b/include/fmt/chrono.h @@ -582,8 +582,9 @@ template FMT_CONSTEXPR inline const char* get_units() { if (std::is_same::value) return "Ts"; if (std::is_same::value) return "Ps"; if (std::is_same::value) return "Es"; - if (std::is_same>::value) return "m"; + if (std::is_same>::value) return "min"; if (std::is_same>::value) return "h"; + if (std::is_same>::value) return "d"; return nullptr; } diff --git a/test/chrono-test.cc b/test/chrono-test.cc index f047c1ea..c218a873 100644 --- a/test/chrono-test.cc +++ b/test/chrono-test.cc @@ -454,8 +454,11 @@ TEST(chrono_test, format_default) { fmt::format("{}", std::chrono::duration(42))); EXPECT_EQ("42Es", fmt::format("{}", std::chrono::duration(42))); - EXPECT_EQ("42m", fmt::format("{}", std::chrono::minutes(42))); + EXPECT_EQ("42min", fmt::format("{}", std::chrono::minutes(42))); EXPECT_EQ("42h", fmt::format("{}", std::chrono::hours(42))); +# if defined(__cpp_lib_chrono) && __cpp_lib_chrono >= 201907L + EXPECT_EQ("42d", fmt::format("{}", std::chrono::days(42))); +# endif EXPECT_EQ( "42[15]s", fmt::format("{}", std::chrono::duration>(42)));