Only pluralise "buffer" when required (#11018)

* Only pluralise buffer when required

* Use == 1 instead of != 1
pull/11046/head
Thomas Schafer 5 months ago committed by GitHub
parent b05ed9bf85
commit 6ed0d0cd39
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

@ -164,9 +164,10 @@ fn buffer_close_by_ids_impl(
cx.editor.switch(*first, Action::Replace); cx.editor.switch(*first, Action::Replace);
} }
bail!( bail!(
"{} unsaved buffer(s) remaining: {:?}", "{} unsaved buffer{} remaining: {:?}",
modified_names.len(), modified_names.len(),
modified_names if modified_names.len() == 1 { "" } else { "s" },
modified_names,
); );
} }
@ -658,9 +659,10 @@ pub(super) fn buffers_remaining_impl(editor: &mut Editor) -> anyhow::Result<()>
editor.switch(*first, Action::Replace); editor.switch(*first, Action::Replace);
} }
bail!( bail!(
"{} unsaved buffer(s) remaining: {:?}", "{} unsaved buffer{} remaining: {:?}",
modified_names.len(), modified_names.len(),
modified_names if modified_names.len() == 1 { "" } else { "s" },
modified_names,
); );
} }
Ok(()) Ok(())

Loading…
Cancel
Save