From 132407851a43a681d1dcc92cd970b24d0e6aaac9 Mon Sep 17 00:00:00 2001 From: Jason Tibbitts Date: Sep 14 2016 20:00:24 +0000 Subject: [PATCH 1/2] Fix grammar on issues page The current issues page will show something like: 100 Open Issues (on 140) "on" should be "of". "out of" also works, but I've gone with the former. --- diff --git a/pagure/templates/issues.html b/pagure/templates/issues.html index cfd0049..fcc6073 100644 --- a/pagure/templates/issues.html +++ b/pagure/templates/issues.html @@ -12,9 +12,9 @@

{% if status|lower in ['open', 'true'] %} - {{ issues|count }} Open Issues (on {{ issues_cnt }}) + {{ issues|count }} Open Issues (of {{ issues_cnt }}) {% elif status|lower not in ['open', 'true', 'all', 'none'] %} - {{ issues|count }} Closed Issues (on {{ issues_cnt }}) + {{ issues|count }} Closed Issues (of {{ issues_cnt }}) {% else %} {{ issues|count }} Issues {% endif %} From 8c0d7528bda60da793585c665d15be7ad98cfab2 Mon Sep 17 00:00:00 2001 From: Jason Tibbitts Date: Sep 14 2016 23:23:29 +0000 Subject: [PATCH 2/2] Also fix grammar on pull request page. --- diff --git a/pagure/templates/requests.html b/pagure/templates/requests.html index 22b0560..8898169 100644 --- a/pagure/templates/requests.html +++ b/pagure/templates/requests.html @@ -16,7 +16,7 @@ %} {{ status }} {%- elif status|lower in ['closed', 'false'] %} Closed/Merged {%- endif - %} Pull Requests (on {{ requests_cnt }}) + %} Pull Requests (of {{ requests_cnt }}) {% if authenticated and repo.settings.get('pull_requests', True) %}