From b90895412f46e18e5b17efdea2c8f79e7d7504b3 Mon Sep 17 00:00:00 2001
From: Victor Zverovich <viz@fb.com>
Date: Thu, 15 Dec 2022 09:54:16 -0800
Subject: [PATCH] Fix formatting of named arguments with locale

---
 include/fmt/format.h | 2 +-
 test/format-test.cc  | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/include/fmt/format.h b/include/fmt/format.h
index c60e78a0fbc6..df7c54f05411 100644
--- a/include/fmt/format.h
+++ b/include/fmt/format.h
@@ -4306,7 +4306,7 @@ template <typename Locale, typename... T,
           FMT_ENABLE_IF(detail::is_locale<Locale>::value)>
 inline auto format(const Locale& loc, format_string<T...> fmt, T&&... args)
     -> std::string {
-  return vformat(loc, string_view(fmt), fmt::make_format_args(args...));
+  return fmt::vformat(loc, string_view(fmt), fmt::make_format_args(args...));
 }
 
 template <typename OutputIt, typename Locale,
diff --git a/test/format-test.cc b/test/format-test.cc
index c1042a32e659..69e2c4d6ef48 100644
--- a/test/format-test.cc
+++ b/test/format-test.cc
@@ -2419,4 +2419,9 @@ TEST(format_test, format_facet_grouping) {
   EXPECT_EQ(fmt::format(loc, "{:L}", 1234567890), "1,234,567,89,0");
 }
 
+TEST(format_test, format_named_arg_with_locale) {
+  EXPECT_EQ(fmt::format(std::locale(), "{answer}", fmt::arg("answer", 42)),
+            "42");
+}
+
 #endif  // FMT_STATIC_THOUSANDS_SEPARATOR