GitHub/Anki
1
0
Fork 0
mirror of https://github.com/ankitects/anki.git synced 2025-09-20 15:02:21 -04:00
Code Issues Projects Releases Packages 1 Wiki Activity Actions

preserve variable order when extracting from ftl files

Browse source
This commit is contained in:
Damien Elmes 2021-03-27 09:09:13 +10:00
parent dc5fdd30d4
commit d5e5722dc8
1 changed files with 19 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
rslib/i18n/build/extract.rs
View file

@ -72,10 +72,10 @@ fn extract_metadata(ftl_text: &str) -> Vec<Translation> {
// special case translations that were ported from gettext, and use embedded // special case translations that were ported from gettext, and use embedded
// terms that reference other variables that aren't visible to our visitor // terms that reference other variables that aren't visible to our visitor
if key == "statistics-studied-today" { if key == "statistics-studied-today" {
visitor.variables.insert("amount".to_string()); visitor.variables.push("amount".to_string());
visitor.variables.insert("cards".to_string()); visitor.variables.push("cards".to_string());
} else if key == "statistics-average-answer-time" { } else if key == "statistics-average-answer-time" {
visitor.variables.insert("cards-per-minute".to_string()); visitor.variables.push("cards-per-minute".to_string());
} }
let (text, variables) = visitor.into_output(); let (text, variables) = visitor.into_output();
@ -99,13 +99,25 @@ fn extract_metadata(ftl_text: &str) -> Vec<Translation> {
#[derive(Default)] #[derive(Default)]
struct Visitor { struct Visitor {
text: String, text: String,
variables: HashSet<String>, variables: Vec<String>,
} }
impl Visitor { impl Visitor {
fn into_output(self) -> (String, Vec<Variable>) { fn into_output(self) -> (String, Vec<Variable>) {
let mut vars: Vec<_> = self.variables.into_iter().map(Into::into).collect(); // make unique, preserving order
vars.sort_unstable(); let mut seen = HashSet::new();
let vars: Vec<_> = self
.variables
.into_iter()
.filter(|v| {
if seen.contains(v) {
false
} else {
seen.insert(v.clone())
}
})
.map(Into::into)
.collect();
(self.text, vars) (self.text, vars)
} }
@ -124,7 +136,7 @@ impl Visitor {
if !in_select { if !in_select {
write!(self.text, "{{${}}}", id.name).unwrap(); write!(self.text, "{{${}}}", id.name).unwrap();
} }
self.variables.insert(id.name.to_string()); self.variables.push(id.name.to_string());
} }
InlineExpression::Placeable { expression } => { InlineExpression::Placeable { expression } => {
self.visit_expression(expression); self.visit_expression(expression);