harvest

Merge lp:~dholbach/harvest/581716 into lp:harvest

  1. 581716
  2. Merge into trunk
Proposed by Daniel Holbach
Status: Merged
Merged at revision: 190
Proposed branch: lp:~dholbach/harvest/581716
Merge into: lp:harvest
Diff against target: 242 lines (+61/-35)
5 files modified
harvest/locale/harvest.pot (+56/-31)
harvest/opportunities/templates/opportunities/opportunities_by_package.html (+1/-1)
harvest/opportunities/templates/opportunities/opportunities_by_type.html (+1/-1)
harvest/templates/opportunities/opportunitylist_list.html (+2/-1)
harvest/templates/opportunities/sourcepackage_list.html (+1/-1)
To merge this branch: bzr merge lp:~dholbach/harvest/581716
Reviewer Review Type Date Requested Status
James Westby Approve
Review via email: mp+29681@code.launchpad.net

This proposal supersedes a proposal from 2010-07-09.

To post a comment you must log in.
Revision history for this message
James Westby (james-w) wrote : Posted in a previous version of this proposal

Look good, thanks.

Not great for translations, but we may never go down that route.

Thanks,

James

review: Approve
Revision history for this message
James Westby (james-w) wrote :

Nice, thanks.

Took me a few reads to understand the syntax for this, but translators
will thank us :-)

James

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'harvest/locale/harvest.pot'
--- harvest/locale/harvest.pot 2010-06-01 06:40:13 +0000
+++ harvest/locale/harvest.pot 2010-07-12 09:35:51 +0000
@@ -8,7 +8,7 @@
8msgstr ""8msgstr ""
9"Project-Id-Version: PACKAGE VERSION\n"9"Project-Id-Version: PACKAGE VERSION\n"
10"Report-Msgid-Bugs-To: \n"10"Report-Msgid-Bugs-To: \n"
11"POT-Creation-Date: 2010-06-01 01:38-0500\n"11"POT-Creation-Date: 2010-07-12 04:32-0500\n"
12"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"12"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"13"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14"Language-Team: LANGUAGE <LL@li.org>\n"14"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,80 +16,92 @@
16"Content-Type: text/plain; charset=UTF-8\n"16"Content-Type: text/plain; charset=UTF-8\n"
17"Content-Transfer-Encoding: 8bit\n"17"Content-Transfer-Encoding: 8bit\n"
1818
19#: opportunities/models.py:15 opportunities/models.py:2319#: opportunities/models.py:18 opportunities/models.py:25
20#: opportunities/models.py:5120#: opportunities/models.py:49
21msgid "Name"21msgid "Name"
22msgstr ""22msgstr ""
2323
24#: opportunities/models.py:52 opportunities/models.py:8324#: opportunities/models.py:50 opportunities/models.py:77
25msgid "URL"25msgid "URL"
26msgstr ""26msgstr ""
2727
28#: opportunities/models.py:53 opportunities/models.py:8228#: opportunities/models.py:51 opportunities/models.py:76
29msgid "Description"29msgid "Description"
30msgstr ""30msgstr ""
3131
32#: opportunities/models.py:54 opportunities/models.py:8432#: opportunities/models.py:52 opportunities/models.py:78
33msgid "Last Updated"33msgid "Last Updated"
34msgstr ""34msgstr ""
3535
36#: opportunities/models.py:5536#: opportunities/models.py:53
37msgid "Active"37msgid "Active"
38msgstr ""38msgstr ""
3939
40#: opportunities/models.py:5640#: opportunities/models.py:54
41msgid "Featured"41msgid "Featured"
42msgstr ""42msgstr ""
4343
44#: opportunities/models.py:5744#: opportunities/models.py:55
45msgid "Specially feature this list of opportunities?"45msgid "Specially feature this list of opportunities?"
46msgstr ""46msgstr ""
4747
48#: opportunities/models.py:5848#: opportunities/models.py:56
49msgid "Explanatory help text"49msgid "Explanatory help text"
50msgstr ""50msgstr ""
5151
52#: opportunities/models.py:5952#: opportunities/models.py:57
53msgid "Commentable"53msgid "Commentable"
54msgstr ""54msgstr ""
5555
56#: opportunities/models.py:6056#: opportunities/models.py:58
57msgid "Can opportunities on this list have comments?"57msgid "Can opportunities on this list have comments?"
58msgstr ""58msgstr ""
5959
60#: opportunities/models.py:61 opportunities/models.py:9160#: opportunities/models.py:59 opportunities/models.py:86
61msgid "Required Experience"61msgid "Required Experience"
62msgstr ""62msgstr ""
6363
64#: opportunities/models.py:6264#: opportunities/models.py:60
65msgid "Level of experience required for this type of opportunities."65msgid "Level of experience required for this type of opportunities."
66msgstr ""66msgstr ""
6767
68#: opportunities/models.py:8568#: opportunities/models.py:79
69msgid "Since"69msgid "Since"
70msgstr ""70msgstr ""
7171
72#: opportunities/models.py:8572#: opportunities/models.py:79
73msgid "On the list since"73msgid "On the list since"
74msgstr ""74msgstr ""
7575
76#: opportunities/models.py:8676#: opportunities/models.py:80
77msgid "Irrelevant"77msgid "Irrelevant"
78msgstr ""78msgstr ""
7979
80#: opportunities/models.py:8980#: opportunities/models.py:81
81msgid "Applied"
82msgstr ""
83
84#: opportunities/models.py:84
81msgid "Comment"85msgid "Comment"
82msgstr ""86msgstr ""
8387
84#: opportunities/models.py:9088#: opportunities/models.py:85
85msgid "Valid"89msgid "Valid"
86msgstr ""90msgstr ""
8791
88#: opportunities/models.py:9292#: opportunities/models.py:87
89msgid "Level of experience required for this specific opportunity."93msgid "Level of experience required for this specific opportunity."
90msgstr ""94msgstr ""
9195
92#: opportunities/views.py:6096#: opportunities/models.py:101
97msgid "Timestamp"
98msgstr ""
99
100#: opportunities/models.py:103
101msgid "Action"
102msgstr ""
103
104#: opportunities/views.py:81
93msgid "Opportunity details could not be saved."105msgid "Opportunity details could not be saved."
94msgstr ""106msgstr ""
95107
@@ -97,8 +109,19 @@
97msgid "Opportunities By Package"109msgid "Opportunities By Package"
98msgstr ""110msgstr ""
99111
112#: opportunities/templates/opportunities/opportunities_by_package.html:18
113#: opportunities/templates/opportunities/opportunities_by_type.html:18
114#: templates/opportunities/opportunitylist_list.html:11
115#: templates/opportunities/sourcepackage_list.html:11
116#, python-format
117msgid "(1 opportunity)"
118msgid_plural "(%(counter)s opportunities)"
119msgstr[0] ""
120msgstr[1] ""
121
100#: opportunities/templates/opportunities/opportunities_by_package.html:49122#: opportunities/templates/opportunities/opportunities_by_package.html:49
101#: opportunities/templates/opportunities/opportunities_by_type.html:49123#: opportunities/templates/opportunities/opportunities_by_type.html:24
124#: templates/opportunities/opportunities_filter.html:45
102#: templates/opportunities/opportunity_index.html:41125#: templates/opportunities/opportunity_index.html:41
103msgid "There are currently no opportunities in Harvest. :("126msgid "There are currently no opportunities in Harvest. :("
104msgstr ""127msgstr ""
@@ -123,7 +146,7 @@
123msgid "A server error has occurred."146msgid "A server error has occurred."
124msgstr ""147msgstr ""
125148
126#: templates/base.html:7 templates/index.html:9149#: templates/base.html:7 templates/base.html.py:82 templates/index.html:9
127#: templates/admin/base_site.html:7150#: templates/admin/base_site.html:7
128msgid "Harvest"151msgid "Harvest"
129msgstr ""152msgstr ""
@@ -136,23 +159,25 @@
136msgid "Harvest Admin"159msgid "Harvest Admin"
137msgstr ""160msgstr ""
138161
139#: templates/opportunities/opportunity_edit.html:10162#: templates/opportunities/opportunities_filter.html:4
140msgid "Please correct the error"
141msgstr ""
142
143#: templates/opportunities/opportunity_edit.html:14
144msgid "Update Information Now!"
145msgstr ""
146
147#: templates/opportunities/opportunity_index.html:4163#: templates/opportunities/opportunity_index.html:4
148msgid "Opportunity Index"164msgid "Opportunity Index"
149msgstr ""165msgstr ""
150166
167#: templates/opportunities/opportunities_filter.html:9
151#: templates/opportunities/opportunity_index.html:9168#: templates/opportunities/opportunity_index.html:9
152#: templates/opportunities/opportunity_list.html:5169#: templates/opportunities/opportunity_list.html:5
153msgid "Opportunities"170msgid "Opportunities"
154msgstr ""171msgstr ""
155172
173#: templates/opportunities/opportunity_edit.html:10
174msgid "Please correct the error"
175msgstr ""
176
177#: templates/opportunities/opportunity_edit.html:14
178msgid "Update Information Now!"
179msgstr ""
180
156#: templates/opportunities/opportunitylist_list.html:5181#: templates/opportunities/opportunitylist_list.html:5
157msgid "Opportunity Lists"182msgid "Opportunity Lists"
158msgstr ""183msgstr ""
159184
=== 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-12 09:35:51 +0000
@@ -15,7 +15,7 @@
15 <div class="package_name threshold{{ source.opportunity_class }}">15 <div class="package_name threshold{{ source.opportunity_class }}">
16 <span class="name"><a href="{% url sourcepackage_detail source.name %}">{{ source.name }}</a></span>16 <span class="name"><a href="{% url sourcepackage_detail source.name %}">{{ source.name }}</a></span>
17 <span class="count">17 <span class="count">
18 ({{ source.valid_opportunities.count }} issues)18 {% blocktrans count source.valid_opportunities|length as counter %}(1 opportunity){% plural %}({{ counter }} opportunities){% endblocktrans %}
19 </span>19 </span>
20 </div>20 </div>
21 <div class="package_details">21 <div class="package_details">
2222
=== 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-12 09:35:51 +0000
@@ -15,7 +15,7 @@
15 <div class="package_name threshold{{ type.opportunity_class }}">15 <div class="package_name threshold{{ type.opportunity_class }}">
16 <span class="name"><a href="{{ type.get_absolute_url }}">{{ type.name }}</a></span>16 <span class="name"><a href="{{ type.get_absolute_url }}">{{ type.name }}</a></span>
17 <span class="count">17 <span class="count">
18 ({{ type.opportunity_set.count }} issues)18 {% blocktrans count source.valid_opportunities.count as counter %}(1 opportunity){% plural %}({{ counter }} opportunities){% endblocktrans %}
19 </span>19 </span>
20 </div>20 </div>
21 {% endfor %}21 {% endfor %}
2222
=== 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-12 09:35:51 +0000
@@ -7,7 +7,8 @@
7{% block content %}7{% block content %}
8 <h2>Opportunity Lists</h2>8 <h2>Opportunity Lists</h2>
9 {% for opportunity_list in object_list %}9 {% for opportunity_list in object_list %}
10 <h3><a href="{% url opportunitylist_detail opportunity_list %}">{{ opportunity_list.name }}</a> ({{ opportunity_list.opportunity__count }} issue{{ opportunity_list.opportunity__count|pluralize }})</h3>10 <h3><a href="{% url opportunitylist_detail opportunity_list %}">{{ opportunity_list.name }}</a>
11 {% blocktrans count opportunity_list.opportunity__count as counter %}(1 opportunity){% plural %}({{ counter }} opportunities){% endblocktrans %}</h3>
11 <p>{{ opportunity_list.description }}</p>12 <p>{{ opportunity_list.description }}</p>
12 {% endfor %}13 {% endfor %}
13{% endblock %}14{% endblock %}
1415
=== 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-12 09:35:51 +0000
@@ -8,7 +8,7 @@
8 <h2>Source Packages</h2>8 <h2>Source Packages</h2>
9 <ul>9 <ul>
10 {% for source_package in object_list %}10 {% for source_package in object_list %}
11 <li><a href="{% url sourcepackage_detail source_package %}">{{ source_package.name }}</a> {{ source_package.opportunity__count }} issue{{ source_package.opportunity__count|pluralize }}</li>11 <li><a href="{% url sourcepackage_detail source_package %}">{{ source_package.name }}</a> {% blocktrans count source_package.opportunity__count as counter %}(1 opportunity){% plural %}({{ counter }} opportunities){% endblocktrans %}</li>
12 {% endfor %}12 {% endfor %}
13 </ul>13 </ul>
14{% endblock %}14{% endblock %}

Subscribers

People subscribed via source and target branches

to all changes: