diff options
| author | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2021-03-27 13:42:02 +0000 |
|---|---|---|
| committer | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2021-03-27 15:27:17 +0000 |
| commit | 98ea25898c41a8111a1faedbccb6b14e84dfe5c3 (patch) | |
| tree | 8a07a3733af587fd7926b43f1f8dafd9406759d0 | |
| parent | be8134386f208b301ea15376d1fb1c871091d1dc (diff) | |
| download | mullvadvpn-98ea25898c41a8111a1faedbccb6b14e84dfe5c3.tar.xz mullvadvpn-98ea25898c41a8111a1faedbccb6b14e84dfe5c3.zip | |
Use `MsgString` for `MsgValue::Plural.plural_id`
| -rw-r--r-- | android/translations-converter/src/gettext.rs | 6 | ||||
| -rw-r--r-- | android/translations-converter/src/main.rs | 7 |
2 files changed, 9 insertions, 4 deletions
diff --git a/android/translations-converter/src/gettext.rs b/android/translations-converter/src/gettext.rs index 70d96a5160..47814ea2fc 100644 --- a/android/translations-converter/src/gettext.rs +++ b/android/translations-converter/src/gettext.rs @@ -45,7 +45,7 @@ pub struct MsgEntry { pub enum MsgValue { Invariant(MsgString), Plural { - plural_id: String, + plural_id: MsgString, values: Vec<MsgString>, }, } @@ -134,7 +134,7 @@ impl Translation { current_plural_id = None; } ["msgid_plural \"", plural_id, "\""] => { - current_plural_id = Some(normalize(plural_id)); + current_plural_id = Some(MsgString(normalize(plural_id))); parsing_header = false; } ["msgstr[", plural_translation, "\""] => { @@ -279,7 +279,7 @@ pub fn append_to_template( match entry.value { MsgValue::Invariant(value) => writeln!(writer, r#"msgstr "{}""#, value)?, MsgValue::Plural { plural_id, values } => { - writeln!(writer, "msgid_plural {:?}", plural_id)?; + writeln!(writer, r#"msgid_plural "{}""#, plural_id)?; for (index, value) in values.into_iter().enumerate() { writeln!(writer, r#"msgstr[{}] "{}""#, index, value)?; diff --git a/android/translations-converter/src/main.rs b/android/translations-converter/src/main.rs index c452a1742b..d755913243 100644 --- a/android/translations-converter/src/main.rs +++ b/android/translations-converter/src/main.rs @@ -191,7 +191,12 @@ fn main() { .iter() .position(|plural| plural.quantity == android::PluralQuantity::Other) .expect("Missing other variant to use as msgid_plural"); - let plural_id = plural.items.remove(other_position).string.to_string(); + let plural_id = plural + .items + .remove(other_position) + .string + .to_string() + .into(); gettext::MsgEntry { id, |