From 4eb2513cc0d99d6ea0e326c230fa945810bd2e12 Mon Sep 17 00:00:00 2001 From: Alex Date: Sat, 4 Jul 2026 03:09:20 +0200 Subject: [PATCH] fix(hyprland/language): pass named args in format- branches The format-[-] override branches only passed a positional arg, so a format using {short}/{long}/{variant} threw 'argument not found', which disabled the whole module. Now supply the same named args as the fallback/tooltip branches. Fixes #5120. --- src/modules/hyprland/language.cpp | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/src/modules/hyprland/language.cpp b/src/modules/hyprland/language.cpp index 9c082d3a..cc9c6c59 100644 --- a/src/modules/hyprland/language.cpp +++ b/src/modules/hyprland/language.cpp @@ -38,10 +38,18 @@ auto Language::update() -> void { std::string layoutName = std::string{}; if (config_.isMember("format-" + layout_.short_description + "-" + layout_.variant)) { const auto propName = "format-" + layout_.short_description + "-" + layout_.variant; - layoutName = fmt::format(fmt::runtime(format_), config_[propName].asString()); + layoutName = trim(fmt::format(fmt::runtime(format_), config_[propName].asString(), + fmt::arg("long", layout_.full_name), + fmt::arg("short", layout_.short_name), + fmt::arg("shortDescription", layout_.short_description), + fmt::arg("variant", layout_.variant))); } else if (config_.isMember("format-" + layout_.short_description)) { const auto propName = "format-" + layout_.short_description; - layoutName = fmt::format(fmt::runtime(format_), config_[propName].asString()); + layoutName = trim(fmt::format(fmt::runtime(format_), config_[propName].asString(), + fmt::arg("long", layout_.full_name), + fmt::arg("short", layout_.short_name), + fmt::arg("shortDescription", layout_.short_description), + fmt::arg("variant", layout_.variant))); } else { layoutName = trim(fmt::format(fmt::runtime(format_), fmt::arg("long", layout_.full_name), fmt::arg("short", layout_.short_name),