hyprwm/hyprutils
1
0
Fork 0
mirror of https://github.com/hyprwm/hyprutils.git synced 2025-12-20 09:20:08 +01:00
Code Issues Projects Releases Packages Wiki Activity

i18n: fix error with localizing multi-var strings

Browse source
This commit is contained in:
Vaxry 2025-11-19 00:51:03 +00:00
parent 0c6411851c
commit 671792bcfe
Signed by: vaxry
GPG key ID: 665806380871D640
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/i18n/I18nEngine.cpp
View file

@ -148,7 +148,7 @@ std::string CI18nEngine::localizeEntry(const std::string& locale, uint64_t key,
newStr.reserve(stringLen); newStr.reserve(stringLen);
for (const auto& r : rangesFound) { for (const auto& r : rangesFound) {
newStr += ORIGINAL_STR.substr(lastBegin, r.begin); newStr += ORIGINAL_STR.substr(lastBegin, r.begin - lastBegin);
newStr += *r.val; newStr += *r.val;
lastBegin = r.end; lastBegin = r.end;
@ -201,6 +201,7 @@ TEST(I18n, Engine) {
engine.registerEntry("es_XX", TXT_KEY_FALLBACK, "I don't speak spanish"); engine.registerEntry("es_XX", TXT_KEY_FALLBACK, "I don't speak spanish");
engine.registerEntry("es_ES", TXT_KEY_FALLBACK, "I don't speak spanish here either"); engine.registerEntry("es_ES", TXT_KEY_FALLBACK, "I don't speak spanish here either");
engine.registerEntry("ts_TST", TXT_KEY_FALLBACK, "Hello {var1} world {var2}");
engine.registerEntry("am", TXT_KEY_FALLBACK, "Amongus!"); engine.registerEntry("am", TXT_KEY_FALLBACK, "Amongus!");
@ -235,6 +236,8 @@ TEST(I18n, Engine) {
EXPECT_EQ(engine.localizeEntry("ts", TXT_KEY_HELLO, {{"count", "1"}}), "{count"); EXPECT_EQ(engine.localizeEntry("ts", TXT_KEY_HELLO, {{"count", "1"}}), "{count");
EXPECT_EQ(engine.localizeEntry("ts", 42069 /* invalid key */, {{"count", "1"}}), ""); EXPECT_EQ(engine.localizeEntry("ts", 42069 /* invalid key */, {{"count", "1"}}), "");
EXPECT_EQ(engine.localizeEntry("ts_TST", TXT_KEY_FALLBACK, {{"var1", "hi"}, {"var2", "!"}}), "Hello hi world !");
} }
#endif #endif