From 688010d932c14e6f7fae60268adc216101febdf9 Mon Sep 17 00:00:00 2001 From: Michael Gratton Date: Thu, 27 Aug 2020 10:25:36 +1000 Subject: [PATCH 1/2] Plugin.MailMerge: Fix API doc comment --- src/client/plugin/mail-merge/mail-merge.vala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/client/plugin/mail-merge/mail-merge.vala b/src/client/plugin/mail-merge/mail-merge.vala index 10b64660..1bd798cd 100644 --- a/src/client/plugin/mail-merge/mail-merge.vala +++ b/src/client/plugin/mail-merge/mail-merge.vala @@ -15,7 +15,7 @@ public void peas_register_types(TypeModule module) { } /** - * Plugin to Fill in and send email templates using a spreadsheet. + * Plugin to fill in and send email templates using a spreadsheet. */ public class Plugin.MailMerge : PluginBase, FolderExtension, EmailExtension, TrustedExtension { From ca4fa1627b24de0bc70d9eed71d128877ec5f945 Mon Sep 17 00:00:00 2001 From: Michael Gratton Date: Thu, 27 Aug 2020 10:25:50 +1000 Subject: [PATCH 2/2] Plugin.MailMerge: Fix translatable string that should be in plural form Fixes #949 --- src/client/plugin/mail-merge/mail-merge.vala | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/client/plugin/mail-merge/mail-merge.vala b/src/client/plugin/mail-merge/mail-merge.vala index 1bd798cd..1fa7c7c1 100644 --- a/src/client/plugin/mail-merge/mail-merge.vala +++ b/src/client/plugin/mail-merge/mail-merge.vala @@ -236,7 +236,11 @@ public class Plugin.MailMerge : // Translators: Info bar description for the mail merge // folder. The first string substitution the number of email // already sent, the second is the total number to send. - this.merge_bar.description = _("Sent %u of %u").printf( + this.merge_bar.description = ngettext( + "Sent %u of %u", + "Sent %u of %u", + this.merge_folder.email_total + ).printf( this.merge_folder.email_sent, this.merge_folder.email_total );