i18n: Remove regex usage
This commit is contained in:
parent
f1593203a0
commit
b202c1d2d2
3 changed files with 7 additions and 17 deletions
1
Cargo.lock
generated
1
Cargo.lock
generated
|
|
@ -1055,7 +1055,6 @@ dependencies = [
|
||||||
"log",
|
"log",
|
||||||
"once_cell",
|
"once_cell",
|
||||||
"pretty_env_logger",
|
"pretty_env_logger",
|
||||||
"regex",
|
|
||||||
"svg_metadata",
|
"svg_metadata",
|
||||||
"url",
|
"url",
|
||||||
]
|
]
|
||||||
|
|
|
||||||
|
|
@ -13,7 +13,6 @@ pretty_env_logger = "0.4.0"
|
||||||
futures-channel = "0.3.25"
|
futures-channel = "0.3.25"
|
||||||
futures = "0.3.25"
|
futures = "0.3.25"
|
||||||
svg_metadata = "0.4.3"
|
svg_metadata = "0.4.3"
|
||||||
regex = "1.6.0"
|
|
||||||
url = "2.3.1"
|
url = "2.3.1"
|
||||||
|
|
||||||
[dependencies.ashpd]
|
[dependencies.ashpd]
|
||||||
|
|
|
||||||
22
src/i18n.rs
22
src/i18n.rs
|
|
@ -23,28 +23,20 @@ use gettextrs::gettext;
|
||||||
use gettextrs::ngettext;
|
use gettextrs::ngettext;
|
||||||
use gettextrs::npgettext;
|
use gettextrs::npgettext;
|
||||||
use gettextrs::pgettext;
|
use gettextrs::pgettext;
|
||||||
use regex::Captures;
|
|
||||||
use regex::Regex;
|
|
||||||
|
|
||||||
#[allow(dead_code)]
|
#[allow(dead_code)]
|
||||||
fn freplace(input: String, args: &[&str]) -> String {
|
fn freplace(mut s: String, args: &[&str]) -> String {
|
||||||
let mut parts = input.split("{}");
|
for arg in args {
|
||||||
let mut output = parts.next().unwrap_or_default().to_string();
|
s = s.replacen("{}", arg, 1);
|
||||||
for (p, a) in parts.zip(args.iter()) {
|
|
||||||
output += &(a.to_string() + p);
|
|
||||||
}
|
}
|
||||||
output
|
|
||||||
|
s
|
||||||
}
|
}
|
||||||
|
|
||||||
#[allow(dead_code)]
|
#[allow(dead_code)]
|
||||||
fn kreplace(input: String, kwargs: &[(&str, &str)]) -> String {
|
fn kreplace(mut s: String, kwargs: &[(&str, &str)]) -> String {
|
||||||
let mut s = input;
|
|
||||||
for (k, v) in kwargs {
|
for (k, v) in kwargs {
|
||||||
if let Ok(re) = Regex::new(&format!("\\{{{}\\}}", k)) {
|
s = s.replace(&format!("{{{k}}}"), v);
|
||||||
s = re
|
|
||||||
.replace_all(&s, |_: &Captures<'_>| v.to_string())
|
|
||||||
.to_string();
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
s
|
s
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue