Use mediawiki plural template when providing bug counts

1 files changed, 20 insertions, 11 deletions

diff --git a/update-blocker-wiki b/update-blocker-wiki
index e33f06e..8a2ea7d 100755
--- a/update-blocker-wiki
+++ b/update-blocker-wiki
@@ -229,8 +229,10 @@ if __name__ == '__main__':
     page_content += '''
 == Approved Blockers ==
 The following list of bugs are approved blockers that must be resolved.  There
-are %s bug(s) affecting %s component(s).
-''' % (len(join_lists(accepted_blocker_by_component.values())), len(accepted_blocker_by_component))
+{{plural:%(bug_count)s|is|are}} %(bug_count)s bug{{plural:%(bug_count)s||s}}
+affecting %(component_count)s component{{plural:%(component_count)s||s}}.
+''' % dict (bug_count=len(join_lists(accepted_blocker_by_component.values())),
+            component_count=len(accepted_blocker_by_component))
     # Sorted list of approved bugs
     page_content += display_bugs_by_component(accepted_blocker_by_component, bugs_by_id)
 
@@ -238,9 +240,12 @@ are %s bug(s) affecting %s component(s).
     page_content += '''
 == Proposed Blockers ==
 The following list of bugs are not yet approved to block the release.  There
-are %s bug(s) affecting %s component(s).  For guidance on reviewing the following
-bugs, refer to [[QA:SOP_blocker_bug_process]].
-''' % (len(join_lists(proposed_blocker_by_component.values())), len(proposed_blocker_by_component))
+{{plural:%(bug_count)s|is|are}} %(bug_count)s bug{{plural:%(bug_count)s||s}}
+affecting %(component_count)s component{{plural:%(component_count)s||s}}.  For
+guidance on reviewing the following bugs, refer to
+[[QA:SOP_blocker_bug_process]].
+''' % dict (bug_count=len(join_lists(proposed_blocker_by_component.values())),
+            component_count=len(proposed_blocker_by_component))
     # Sorted list of proposed bugs
     page_content += display_bugs_by_component(proposed_blocker_by_component, bugs_by_id)
 
@@ -248,9 +253,11 @@ bugs, refer to [[QA:SOP_blocker_bug_process]].
     page_content += '''
 == Approved NICE-TO-HAVE ==
 The following list of of bugs are approved nice-to-have.  Fixes for
-nice-to-have bugs will be accepted during the freeze.  There are %s bug(s)
-affecting %s component(s).
-''' % (len(join_lists(accepted_nth_by_component.values())), len(accepted_nth_by_component))
+nice-to-have bugs will be accepted during the freeze.  There
+{{plural:%(bug_count)s|is|are}} %(bug_count)s bug{{plural:%(bug_count)s||s}}
+affecting %(component_count)s component{{plural:%(component_count)s||s}}.
+''' % dict (bug_count=len(join_lists(accepted_nth_by_component.values())),
+            component_count=len(accepted_nth_by_component))
 
     # Sorted list of approved bugs
     page_content += display_bugs_by_component(accepted_nth_by_component, bugs_by_id)
@@ -260,9 +267,11 @@ affecting %s component(s).
 == Proposed NICE-TO-HAVE ==
 The following list of bugs are not yet approved nice-to-have issues.  Only
 fixes for approved nice-to-have bugs will be accepted during the freeze.  There
-are %s bug(s) affecting %s component(s).  For guidance on reviewing the
-following bugs, refer to [[QA:SOP_nth_bug_process]].
-''' % (len(join_lists(proposed_nth_by_component.values())), len(proposed_nth_by_component))
+{{plural:%(bug_count)s|is|are}} %(bug_count)s bug{{plural:%(bug_count)s||s}}
+affecting %(component_count)s component{{plural:%(component_count)s||s}}.  For
+guidance on reviewing the following bugs, refer to [[QA:SOP_nth_bug_process]].
+''' % dict (bug_count=len(join_lists(proposed_nth_by_component.values())),
+            component_count=len(proposed_nth_by_component))
 
     # Sorted list of proposed bugs
     page_content += display_bugs_by_component(proposed_nth_by_component, bugs_by_id)