Skip to content

Fixed incorrect use of fmt::format, missing fmt::runtime(). #126

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
cschreib merged 1 commit into from
Jun 10, 2023
Merged

Fixed incorrect use of fmt::format, missing fmt::runtime(). #126

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 8 additions & 6 deletions include/lxgui/gui_localizer.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@ class localizer {
localizer();

// Non-copiable, non-movable
localizer(const localizer&) = delete;
localizer(localizer&&) = delete;
localizer(const localizer&) = delete;
localizer(localizer&&) = delete;
localizer& operator=(const localizer&) = delete;
localizer& operator=(localizer&&) = delete;
localizer& operator=(localizer&&) = delete;

/**
* \brief Changes the current locale (used to format numbers).
Expand Down Expand Up @@ -234,10 +234,12 @@ class localizer {
constexpr bool is_string =
std::is_same_v<std::decay_t<decltype(item)>, std::string>;
if constexpr (is_string) {
if constexpr (sizeof...(Args) == 0)
if constexpr (sizeof...(Args) == 0) {
return item;
else
return fmt::format(locale_, item, std::forward<Args>(args)...);
} else {
return fmt::format(
locale_, fmt::runtime(item), std::forward<Args>(args)...);
}
} else {
auto result = item(std::forward<Args>(args)...);
if (result.valid() && result.begin() != result.end()) {
Expand Down