diff --git a/src/i18n.rs b/src/i18n.rs index d56f145f..3a3b9f56 100644 --- a/src/i18n.rs +++ b/src/i18n.rs @@ -145,6 +145,7 @@ impl Iterator for BundleIter { fn next(&mut self) -> Option { let locale = self.locales.next()?; let mut bundle = FluentBundle::new(vec![locale.clone()]); + bundle.set_use_isolating(false); let mut res_path_scheme = PathBuf::new(); res_path_scheme.push("{locale}"); res_path_scheme.push("{res_id}"); diff --git a/src/ui_ascii.rs b/src/ui_ascii.rs index 53171785..83d65677 100644 --- a/src/ui_ascii.rs +++ b/src/ui_ascii.rs @@ -119,13 +119,8 @@ pub struct AsciiJobStatus { impl AsciiJobStatus { fn new(target: MakeTarget) -> Self { if !CONF.get_bool("passthrough").unwrap() { - // Without this, copying the string in the terminal as a word brings a U+2069 with it - // c.f. https://github.com/XAMPPRocky/fluent-templates/issues/72 - let mut printable_target: String = target.to_string(); - printable_target.push(' '); - let printable_target = style(printable_target).white().bold(); let msg = LocalText::new("make-report-start") - .arg("target", printable_target) + .arg("target", style(target.clone()).white().bold()) .fmt(); let msg = style(msg).yellow().bright(); println!("{msg}"); @@ -173,12 +168,7 @@ impl JobStatus for AsciiJobStatus { if CONF.get_bool("passthrough").unwrap() { return; } - // Without this, copying the string in the terminal as a word brings a U+2069 with it - // c.f. https://github.com/XAMPPRocky/fluent-templates/issues/72 - let mut printable_target: String = self.target.to_string(); - printable_target.push(' '); - let target = printable_target; - let target = style(target).white().bold(); + let target = style(self.target.clone()).white().bold(); let msg = LocalText::new("make-report-pass") .arg("target", target) .fmt(); @@ -189,11 +179,7 @@ impl JobStatus for AsciiJobStatus { if CONF.get_bool("passthrough").unwrap() { return; } - // Without this, copying the string in the terminal as a word brings a U+2069 with it - let mut printable_target: String = self.target.to_string(); - printable_target.push(' '); - let target = printable_target; - let target = style(target).white().bold(); + let target = style(self.target.clone()).white().bold(); let msg = LocalText::new("make-report-fail") .arg("target", target) .arg("code", code) diff --git a/src/ui_indicatif.rs b/src/ui_indicatif.rs index b073924f..094f0ae5 100644 --- a/src/ui_indicatif.rs +++ b/src/ui_indicatif.rs @@ -241,13 +241,9 @@ impl std::ops::Deref for IndicatifJobStatus { impl IndicatifJobStatus { // pub fn new(ui: &IndicatifInterface, mut target: String) -> Self { pub fn new(subcommand: &IndicatifSubcommandStatus, target: MakeTarget) -> Self { - // Without this, copying the string in the terminal as a word brings a U+2069 with it - // c.f. https://github.com/XAMPPRocky/fluent-templates/issues/72 - let mut printable_target: String = target.to_string(); - printable_target.push(' '); let msg = style( LocalText::new("make-report-start") - .arg("target", style(printable_target).white().bold()) + .arg("target", style(target.clone()).white().bold()) .fmt(), ) .yellow()