From ea52d7b60d1c9cfbcb7e68a3cdaf869b7492f75d Mon Sep 17 00:00:00 2001
From: Michael Watters <michael.watters@dart.biz>
Date: Mar 18 2019 15:31:10 +0000
Subject: [PATCH 1/2] Remove extra "s" character from the starred repos page


---

diff --git a/pagure/templates/userprofile_starred.html b/pagure/templates/userprofile_starred.html
index a23857f..4afb4e0 100644
--- a/pagure/templates/userprofile_starred.html
+++ b/pagure/templates/userprofile_starred.html
@@ -11,7 +11,7 @@
         <div class="d-flex align-items-center mb-3">
           <h4 class="font-weight-bold mb-0">Starred {{ projectstring(plural=True) }}</h4>
           <span class="btn btn-outline-secondary disabled opacity-100 border-0 ml-auto font-weight-bold">{{
-              user.stars | length }} {{ projectstring(plural=(user.stars | length > 1)) }}s</span>
+              user.stars | length }} {{ projectstring(plural=(user.stars | length > 1)) }}</span>
         </div>
           {% if repos %}
             {{ render_repo_listing(repos)}}

From 4f046dff5b5a54bccc59d4deb2d8d87e4bf03a02 Mon Sep 17 00:00:00 2001
From: Pierre-Yves Chibon <pingou@pingoured.fr>
Date: Mar 18 2019 15:45:30 +0000
Subject: [PATCH 2/2] Fix the unit-tests for the change in dropping the double 's'


Merges https://pagure.io/pagure/pull-request/4354

Signed-off-by: Pierre-Yves Chibon <pingou@pingoured.fr>

---

diff --git a/tests/test_pagure_flask_ui_star_project.py b/tests/test_pagure_flask_ui_star_project.py
index 1406ace..32e8dda 100644
--- a/tests/test_pagure_flask_ui_star_project.py
+++ b/tests/test_pagure_flask_ui_star_project.py
@@ -194,7 +194,7 @@ class TestStarProjectUI(tests.SimplePagureTest):
         )
         self.assertIn(
             '<span class="btn btn-outline-secondary disabled opacity-100 '
-            'border-0 ml-auto font-weight-bold">0 Projects</span>',
+            'border-0 ml-auto font-weight-bold">0 Project</span>',
             output_text)
 
         # make pingou star the project
@@ -224,7 +224,7 @@ class TestStarProjectUI(tests.SimplePagureTest):
         )
         self.assertIn(
             '<span class="btn btn-outline-secondary disabled opacity-100 '
-            'border-0 ml-auto font-weight-bold">1 Projects</span>',
+            'border-0 ml-auto font-weight-bold">1 Project</span>',
             output_text)
         self.assertEqual(
             output_text.count('class="list-group-item"'), 1)
@@ -264,7 +264,7 @@ class TestStarProjectUI(tests.SimplePagureTest):
         )
         self.assertIn(
             '<span class="btn btn-outline-secondary disabled opacity-100 '
-            'border-0 ml-auto font-weight-bold">0 Projects</span>',
+            'border-0 ml-auto font-weight-bold">0 Project</span>',
             output_text)
         self.assertEqual(
             output_text.count('class="list-group-item"'), 0)