harvest-dev team mailing list archive

[Daniel Holbach <daniel.holbach@xxxxxxxxxx>]

Daniel Holbach has proposed merging lp:~dholbach/harvest/581716 into lp:harvest.

Requested reviews:
  harvest-dev (harvest-dev)
Related bugs:
  #581716 "issue" not appropriate, maybe use "opportunity" instead
  https://bugs.launchpad.net/bugs/581716

-- 
https://code.launchpad.net/~dholbach/harvest/581716/+merge/29569
Your team harvest-dev is requested to review the proposed merge of lp:~dholbach/harvest/581716 into lp:harvest.

=== modified file 'harvest/opportunities/templates/opportunities/opportunities_by_package.html'
--- harvest/opportunities/templates/opportunities/opportunities_by_package.html	2010-06-07 15:04:29 +0000
+++ harvest/opportunities/templates/opportunities/opportunities_by_package.html	2010-07-09 15:14:46 +0000
@@ -15,7 +15,7 @@
       <div class="package_name threshold{{ source.opportunity_class }}">
         <span class="name"><a href="{% url sourcepackage_detail source.name %}">{{ source.name }}</a></span>
         <span class="count">
-            ({{ source.valid_opportunities.count }} issues)
+            ({{ source.valid_opportunities.count }} opportunit{{ source.valid_opportunities.count|pluralize:"y,ies" }})
         </span>
       </div>
       <div class="package_details">

=== modified file 'harvest/opportunities/templates/opportunities/opportunities_by_type.html'
--- harvest/opportunities/templates/opportunities/opportunities_by_type.html	2010-03-17 11:52:46 +0000
+++ harvest/opportunities/templates/opportunities/opportunities_by_type.html	2010-07-09 15:14:46 +0000
@@ -15,7 +15,7 @@
       <div class="package_name threshold{{ type.opportunity_class }}">
         <span class="name"><a href="{{ type.get_absolute_url }}">{{ type.name }}</a></span>
         <span class="count">
-            ({{ type.opportunity_set.count }} issues)
+            ({{ type.opportunity_set.count }} opportunit{{ type.opportunity_set.count|pluralize:"y,ies" }})
         </span>
       </div>
   {% endfor %}

=== modified file 'harvest/templates/opportunities/opportunitylist_list.html'
--- harvest/templates/opportunities/opportunitylist_list.html	2010-06-07 15:04:29 +0000
+++ harvest/templates/opportunities/opportunitylist_list.html	2010-07-09 15:14:46 +0000
@@ -7,7 +7,7 @@
 {% block content %}
     <h2>Opportunity Lists</h2>
     {% for opportunity_list in object_list %}
-        <h3><a href="{% url opportunitylist_detail opportunity_list %}">{{ opportunity_list.name }}</a> ({{ opportunity_list.opportunity__count }} issue{{ opportunity_list.opportunity__count|pluralize }})</h3>
+        <h3><a href="{% url opportunitylist_detail opportunity_list %}">{{ opportunity_list.name }}</a> ({{ opportunity_list.opportunity__count }} opportunit{{ opportunity_list.opportunity__count|pluralize:"y,ies" }})</h3>
         <p>{{ opportunity_list.description }}</p>
     {% endfor %}
 {% endblock %}

=== modified file 'harvest/templates/opportunities/sourcepackage_list.html'
--- harvest/templates/opportunities/sourcepackage_list.html	2010-06-07 15:04:29 +0000
+++ harvest/templates/opportunities/sourcepackage_list.html	2010-07-09 15:14:46 +0000
@@ -8,7 +8,7 @@
     <h2>Source Packages</h2>
     <ul>
         {% for source_package in object_list %}
-            <li><a href="{% url sourcepackage_detail source_package %}">{{ source_package.name }}</a> {{ source_package.opportunity__count }} issue{{ source_package.opportunity__count|pluralize }}</li>
+            <li><a href="{% url sourcepackage_detail source_package %}">{{ source_package.name }}</a> {{ source_package.opportunity__count }} opportunit{{ source_package.opportunity__count|pluralize:"y,ies" }}</li>
         {% endfor %}
     </ul>
 {% endblock %}