From 77a73b415888b0285ba64b27c3f69440216e475c Mon Sep 17 00:00:00 2001 From: metamuffin Date: Tue, 17 Sep 2024 16:08:52 +0200 Subject: trim spaces around = in locales --- locale/tools/src/main.rs | 2 +- pixel-client/src/strings.rs | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/locale/tools/src/main.rs b/locale/tools/src/main.rs index c74416ea..19f58b39 100644 --- a/locale/tools/src/main.rs +++ b/locale/tools/src/main.rs @@ -295,7 +295,7 @@ fn load_ini(path: &Path) -> Result> { .skip(1) .map(|l| { let (k, v) = l.split_once("=").ok_or(anyhow!("'=' missing"))?; - Ok::<_, anyhow::Error>((k.to_owned(), v.replace("%n", "\n"))) + Ok::<_, anyhow::Error>((k.trim_end().to_owned(), v.trim_start().replace("%n", "\n"))) }) .try_collect() } diff --git a/pixel-client/src/strings.rs b/pixel-client/src/strings.rs index cf225c7d..a941ecec 100644 --- a/pixel-client/src/strings.rs +++ b/pixel-client/src/strings.rs @@ -23,7 +23,10 @@ impl Strings { .skip(1) .map(|l| { let (k, v) = l.split_once("=").ok_or(anyhow!("'=' missing"))?; - Ok::<_, anyhow::Error>((k.to_owned(), v.replace("%n", "\n"))) + Ok::<_, anyhow::Error>(( + k.trim_end().to_owned(), + v.trim_start().replace("%n", "\n"), + )) }) .try_collect()?, )) -- cgit v1.2.3-70-g09d2