From 3c8ca009ff2630bdb2e9778448d73e9b3e37faee Mon Sep 17 00:00:00 2001
From: Enes Hecan <nshecan@gmail.com>
Date: Fri, 13 Jan 2023 16:28:34 +0100
Subject: [PATCH] Sanitize hyprland language string only instead of the whole
 format. Fixes #1940

---
 src/modules/hyprland/language.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/modules/hyprland/language.cpp b/src/modules/hyprland/language.cpp
index d398b23..f9ad091 100644
--- a/src/modules/hyprland/language.cpp
+++ b/src/modules/hyprland/language.cpp
@@ -55,6 +55,8 @@ void Language::onEvent(const std::string& ev) {
   if (config_.isMember("keyboard-name") && kbName != config_["keyboard-name"].asString())
     return;  // ignore
 
+  layoutName = waybar::util::sanitize_string(layoutName);
+
   const auto briefName = getShortFrom(layoutName);
 
   if (config_.isMember("format-" + briefName)) {
@@ -64,8 +66,6 @@ void Language::onEvent(const std::string& ev) {
     layoutName = fmt::format(fmt::runtime(format_), layoutName);
   }
 
-  layoutName = waybar::util::sanitize_string(layoutName);
-
   if (layoutName == layoutName_) return;
 
   layoutName_ = layoutName;
@@ -87,6 +87,8 @@ void Language::initLanguage() {
     searcher = searcher.substr(searcher.find("keymap:") + 8);
     searcher = searcher.substr(0, searcher.find_first_of("\n\t"));
 
+    searcher = waybar::util::sanitize_string(searcher);
+
     auto layoutName = std::string{};
     const auto briefName = getShortFrom(searcher);
 
@@ -97,8 +99,6 @@ void Language::initLanguage() {
       layoutName = fmt::format(fmt::runtime(format_), searcher);
     }
 
-    layoutName = waybar::util::sanitize_string(layoutName);
-
     layoutName_ = layoutName;
 
     spdlog::debug("hyprland language initLanguage found {}", layoutName_);