diff --git a/Cargo.lock b/Cargo.lock index 50eeb68..1ddc627 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1055,7 +1055,6 @@ dependencies = [ "log", "once_cell", "pretty_env_logger", - "regex", "svg_metadata", "url", ] diff --git a/Cargo.toml b/Cargo.toml index cc6351b..70ab448 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -13,7 +13,6 @@ pretty_env_logger = "0.4.0" futures-channel = "0.3.25" futures = "0.3.25" svg_metadata = "0.4.3" -regex = "1.6.0" url = "2.3.1" [dependencies.ashpd] diff --git a/src/i18n.rs b/src/i18n.rs index 0c138ba..61feb96 100644 --- a/src/i18n.rs +++ b/src/i18n.rs @@ -23,28 +23,20 @@ use gettextrs::gettext; use gettextrs::ngettext; use gettextrs::npgettext; use gettextrs::pgettext; -use regex::Captures; -use regex::Regex; #[allow(dead_code)] -fn freplace(input: String, args: &[&str]) -> String { - let mut parts = input.split("{}"); - let mut output = parts.next().unwrap_or_default().to_string(); - for (p, a) in parts.zip(args.iter()) { - output += &(a.to_string() + p); +fn freplace(mut s: String, args: &[&str]) -> String { + for arg in args { + s = s.replacen("{}", arg, 1); } - output + + s } #[allow(dead_code)] -fn kreplace(input: String, kwargs: &[(&str, &str)]) -> String { - let mut s = input; +fn kreplace(mut s: String, kwargs: &[(&str, &str)]) -> String { for (k, v) in kwargs { - if let Ok(re) = Regex::new(&format!("\\{{{}\\}}", k)) { - s = re - .replace_all(&s, |_: &Captures<'_>| v.to_string()) - .to_string(); - } + s = s.replace(&format!("{{{k}}}"), v); } s