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
1=== modified file 'harvest/locale/harvest.pot'
2--- harvest/locale/harvest.pot 2010-06-01 06:40:13 +0000
3+++ harvest/locale/harvest.pot 2010-07-12 09:35:51 +0000
4@@ -8,7 +8,7 @@
5 msgstr ""
6 "Project-Id-Version: PACKAGE VERSION\n"
7 "Report-Msgid-Bugs-To: \n"
8-"POT-Creation-Date: 2010-06-01 01:38-0500\n"
9+"POT-Creation-Date: 2010-07-12 04:32-0500\n"
10 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
11 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
12 "Language-Team: LANGUAGE <LL@li.org>\n"
13@@ -16,80 +16,92 @@
14 "Content-Type: text/plain; charset=UTF-8\n"
15 "Content-Transfer-Encoding: 8bit\n"
16
17-#: opportunities/models.py:15 opportunities/models.py:23
18-#: opportunities/models.py:51
19+#: opportunities/models.py:18 opportunities/models.py:25
20+#: opportunities/models.py:49
21 msgid "Name"
22 msgstr ""
23
24-#: opportunities/models.py:52 opportunities/models.py:83
25+#: opportunities/models.py:50 opportunities/models.py:77
26 msgid "URL"
27 msgstr ""
28
29-#: opportunities/models.py:53 opportunities/models.py:82
30+#: opportunities/models.py:51 opportunities/models.py:76
31 msgid "Description"
32 msgstr ""
33
34-#: opportunities/models.py:54 opportunities/models.py:84
35+#: opportunities/models.py:52 opportunities/models.py:78
36 msgid "Last Updated"
37 msgstr ""
38
39-#: opportunities/models.py:55
40+#: opportunities/models.py:53
41 msgid "Active"
42 msgstr ""
43
44-#: opportunities/models.py:56
45+#: opportunities/models.py:54
46 msgid "Featured"
47 msgstr ""
48
49-#: opportunities/models.py:57
50+#: opportunities/models.py:55
51 msgid "Specially feature this list of opportunities?"
52 msgstr ""
53
54-#: opportunities/models.py:58
55+#: opportunities/models.py:56
56 msgid "Explanatory help text"
57 msgstr ""
58
59-#: opportunities/models.py:59
60+#: opportunities/models.py:57
61 msgid "Commentable"
62 msgstr ""
63
64-#: opportunities/models.py:60
65+#: opportunities/models.py:58
66 msgid "Can opportunities on this list have comments?"
67 msgstr ""
68
69-#: opportunities/models.py:61 opportunities/models.py:91
70+#: opportunities/models.py:59 opportunities/models.py:86
71 msgid "Required Experience"
72 msgstr ""
73
74-#: opportunities/models.py:62
75+#: opportunities/models.py:60
76 msgid "Level of experience required for this type of opportunities."
77 msgstr ""
78
79-#: opportunities/models.py:85
80+#: opportunities/models.py:79
81 msgid "Since"
82 msgstr ""
83
84-#: opportunities/models.py:85
85+#: opportunities/models.py:79
86 msgid "On the list since"
87 msgstr ""
88
89-#: opportunities/models.py:86
90+#: opportunities/models.py:80
91 msgid "Irrelevant"
92 msgstr ""
93
94-#: opportunities/models.py:89
95+#: opportunities/models.py:81
96+msgid "Applied"
97+msgstr ""
98+
99+#: opportunities/models.py:84
100 msgid "Comment"
101 msgstr ""
102
103-#: opportunities/models.py:90
104+#: opportunities/models.py:85
105 msgid "Valid"
106 msgstr ""
107
108-#: opportunities/models.py:92
109+#: opportunities/models.py:87
110 msgid "Level of experience required for this specific opportunity."
111 msgstr ""
112
113-#: opportunities/views.py:60
114+#: opportunities/models.py:101
115+msgid "Timestamp"
116+msgstr ""
117+
118+#: opportunities/models.py:103
119+msgid "Action"
120+msgstr ""
121+
122+#: opportunities/views.py:81
123 msgid "Opportunity details could not be saved."
124 msgstr ""
125
126@@ -97,8 +109,19 @@
127 msgid "Opportunities By Package"
128 msgstr ""
129
130+#: opportunities/templates/opportunities/opportunities_by_package.html:18
131+#: opportunities/templates/opportunities/opportunities_by_type.html:18
132+#: templates/opportunities/opportunitylist_list.html:11
133+#: templates/opportunities/sourcepackage_list.html:11
134+#, python-format
135+msgid "(1 opportunity)"
136+msgid_plural "(%(counter)s opportunities)"
137+msgstr[0] ""
138+msgstr[1] ""
139+
140 #: opportunities/templates/opportunities/opportunities_by_package.html:49
141-#: opportunities/templates/opportunities/opportunities_by_type.html:49
142+#: opportunities/templates/opportunities/opportunities_by_type.html:24
143+#: templates/opportunities/opportunities_filter.html:45
144 #: templates/opportunities/opportunity_index.html:41
145 msgid "There are currently no opportunities in Harvest. :("
146 msgstr ""
147@@ -123,7 +146,7 @@
148 msgid "A server error has occurred."
149 msgstr ""
150
151-#: templates/base.html:7 templates/index.html:9
152+#: templates/base.html:7 templates/base.html.py:82 templates/index.html:9
153 #: templates/admin/base_site.html:7
154 msgid "Harvest"
155 msgstr ""
156@@ -136,23 +159,25 @@
157 msgid "Harvest Admin"
158 msgstr ""
159
160-#: templates/opportunities/opportunity_edit.html:10
161-msgid "Please correct the error"
162-msgstr ""
163-
164-#: templates/opportunities/opportunity_edit.html:14
165-msgid "Update Information Now!"
166-msgstr ""
167-
168+#: templates/opportunities/opportunities_filter.html:4
169 #: templates/opportunities/opportunity_index.html:4
170 msgid "Opportunity Index"
171 msgstr ""
172
173+#: templates/opportunities/opportunities_filter.html:9
174 #: templates/opportunities/opportunity_index.html:9
175 #: templates/opportunities/opportunity_list.html:5
176 msgid "Opportunities"
177 msgstr ""
178
179+#: templates/opportunities/opportunity_edit.html:10
180+msgid "Please correct the error"
181+msgstr ""
182+
183+#: templates/opportunities/opportunity_edit.html:14
184+msgid "Update Information Now!"
185+msgstr ""
186+
187 #: templates/opportunities/opportunitylist_list.html:5
188 msgid "Opportunity Lists"
189 msgstr ""
190
191=== modified file 'harvest/opportunities/templates/opportunities/opportunities_by_package.html'
192--- harvest/opportunities/templates/opportunities/opportunities_by_package.html 2010-06-07 15:04:29 +0000
193+++ harvest/opportunities/templates/opportunities/opportunities_by_package.html 2010-07-12 09:35:51 +0000
194@@ -15,7 +15,7 @@
195 <div class="package_name threshold{{ source.opportunity_class }}">
196 <span class="name"><a href="{% url sourcepackage_detail source.name %}">{{ source.name }}</a></span>
197 <span class="count">
198- ({{ source.valid_opportunities.count }} issues)
199+ {% blocktrans count source.valid_opportunities|length as counter %}(1 opportunity){% plural %}({{ counter }} opportunities){% endblocktrans %}
200 </span>
201 </div>
202 <div class="package_details">
203
204=== modified file 'harvest/opportunities/templates/opportunities/opportunities_by_type.html'
205--- harvest/opportunities/templates/opportunities/opportunities_by_type.html 2010-03-17 11:52:46 +0000
206+++ harvest/opportunities/templates/opportunities/opportunities_by_type.html 2010-07-12 09:35:51 +0000
207@@ -15,7 +15,7 @@
208 <div class="package_name threshold{{ type.opportunity_class }}">
209 <span class="name"><a href="{{ type.get_absolute_url }}">{{ type.name }}</a></span>
210 <span class="count">
211- ({{ type.opportunity_set.count }} issues)
212+ {% blocktrans count source.valid_opportunities.count as counter %}(1 opportunity){% plural %}({{ counter }} opportunities){% endblocktrans %}
213 </span>
214 </div>
215 {% endfor %}
216
217=== modified file 'harvest/templates/opportunities/opportunitylist_list.html'
218--- harvest/templates/opportunities/opportunitylist_list.html 2010-06-07 15:04:29 +0000
219+++ harvest/templates/opportunities/opportunitylist_list.html 2010-07-12 09:35:51 +0000
220@@ -7,7 +7,8 @@
221 {% block content %}
222 <h2>Opportunity Lists</h2>
223 {% for opportunity_list in object_list %}
224- <h3><a href="{% url opportunitylist_detail opportunity_list %}">{{ opportunity_list.name }}</a> ({{ opportunity_list.opportunity__count }} issue{{ opportunity_list.opportunity__count|pluralize }})</h3>
225+ <h3><a href="{% url opportunitylist_detail opportunity_list %}">{{ opportunity_list.name }}</a>
226+ {% blocktrans count opportunity_list.opportunity__count as counter %}(1 opportunity){% plural %}({{ counter }} opportunities){% endblocktrans %}</h3>
227 <p>{{ opportunity_list.description }}</p>
228 {% endfor %}
229 {% endblock %}
230
231=== modified file 'harvest/templates/opportunities/sourcepackage_list.html'
232--- harvest/templates/opportunities/sourcepackage_list.html 2010-06-07 15:04:29 +0000
233+++ harvest/templates/opportunities/sourcepackage_list.html 2010-07-12 09:35:51 +0000
234@@ -8,7 +8,7 @@
235 <h2>Source Packages</h2>
236 <ul>
237 {% for source_package in object_list %}
238- <li><a href="{% url sourcepackage_detail source_package %}">{{ source_package.name }}</a> {{ source_package.opportunity__count }} issue{{ source_package.opportunity__count|pluralize }}</li>
239+ <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>
240 {% endfor %}
241 </ul>
242 {% endblock %}

Subscribers

People subscribed via source and target branches

to all changes: