compose: s/attachments/attachment when # is 1

epilys · epilys · commit 94d04023baf6 · 2024-12-26T15:15:22.000+02:00
Don't print plural `s` when there's only one attachment.

Signed-off-by: Manos Pitsidianakis &lt;manos@pitsidianak.is&gt;
diff --git a/meli/src/mail/compose.rs b/meli/src/mail/compose.rs
@@ -870,7 +870,12 @@ To: {}
             );
         } else {
             grid.write_string(
-                &format!("{} attachments [edit: {}]", attachments_no, edit_shortcut),
+                &format!(
+                    "{} attachment{} [edit: {}]",
+                    attachments_no,
+                    if attachments_no != 1 { "s" } else { "" },
+                    edit_shortcut
+                ),
                 theme_default.fg,
                 if self.cursor == Cursor::Attachments {
                     crate::conf::value(context, "highlight").bg
diff --git a/meli/src/mail/compose/edit_attachments.rs b/meli/src/mail/compose/edit_attachments.rs
@@ -126,7 +126,7 @@ impl Component for EditAttachmentsRefMut<'_, '_> {
             grid.clear_area(area, theme_default);
             if attachments_no == 0 {
                 grid.write_string(
-                    "no attachments",
+                    "No attachments",
                     theme_default.fg,
                     theme_default.bg,
                     theme_default.attrs,
@@ -136,7 +136,11 @@ impl Component for EditAttachmentsRefMut<'_, '_> {
                 );
             } else {
                 grid.write_string(
-                    &format!("{} attachments ", attachments_no),
+                    &format!(
+                        "{} attachment{} ",
+                        attachments_no,
+                        if attachments_no == 1 { "" } else { "s" }
+                    ),
                     theme_default.fg,
                     theme_default.bg,
                     theme_default.attrs,
