Gentoo Archives: gentoo-commits

From: Slava Bacherikov <slava@××××××××××××××.ua>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/gentoo-packages:master commit in: gpackages/templates/includes/, gpackages/templates/
Date: Sun, 26 Aug 2012 23:01:28
Message-Id: 1346017411.71598e8919ded1930fc08a00bb2f25dafd2e3e1d.bacher09@gentoo
1 commit: 71598e8919ded1930fc08a00bb2f25dafd2e3e1d
2 Author: Slava Bacherikov <slava <AT> bacher09 <DOT> org>
3 AuthorDate: Sun Aug 26 21:43:31 2012 +0000
4 Commit: Slava Bacherikov <slava <AT> bacherikov <DOT> org <DOT> ua>
5 CommitDate: Sun Aug 26 21:43:31 2012 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gentoo-packages.git;a=commit;h=71598e89
7
8 Add i18n to templates
9
10 ---
11 gpackages/templates/arch_choice.html | 4 +-
12 gpackages/templates/base.html | 12 +++---
13 gpackages/templates/categories.html | 6 +-
14 gpackages/templates/filtering_view.html | 4 +-
15 gpackages/templates/global_use.html | 6 +-
16 gpackages/templates/herds.html | 8 ++--
17 gpackages/templates/includes/ebuild_table.html | 15 ++++---
18 gpackages/templates/includes/ebuild_use_flag.html | 5 +-
19 gpackages/templates/includes/package_object.html | 11 +++--
20 .../templates/includes/portage_news_object.html | 9 ++--
21 gpackages/templates/includes/recent_ebuilds.html | 3 +-
22 gpackages/templates/license_groups.html | 5 +-
23 gpackages/templates/local_use.html | 7 ++-
24 gpackages/templates/maintainers.html | 7 ++-
25 gpackages/templates/repositories.html | 7 ++-
26 gpackages/templates/repository.html | 45 ++++++++++----------
27 16 files changed, 82 insertions(+), 72 deletions(-)
28
29 diff --git a/gpackages/templates/arch_choice.html b/gpackages/templates/arch_choice.html
30 index 1fc8403..d1c2526 100644
31 --- a/gpackages/templates/arch_choice.html
32 +++ b/gpackages/templates/arch_choice.html
33 @@ -1,5 +1,5 @@
34 {% extends 'base.html' %}
35 -
36 +{% load i18n %}
37 {% block content %}
38 <script>
39 // set default arches
40 @@ -26,7 +26,7 @@
41 {{ form.arches }}
42 </div>
43 </fieldset>
44 - <input type="submit" class="btn btn-primary" value="Submit" />
45 + <input type="submit" class="btn btn-primary" value="{% trans 'Submit' %}" />
46 </form>
47 </div>
48 {% endblock content %}
49
50 diff --git a/gpackages/templates/base.html b/gpackages/templates/base.html
51 index bff6e17..f8a7651 100644
52 --- a/gpackages/templates/base.html
53 +++ b/gpackages/templates/base.html
54 @@ -38,7 +38,7 @@
55 <div class="nav-collapse">
56 <ul class="nav">
57 {% get_flatpages '/about/' as about_pages %}
58 - <li class="{% active_str '/' %}"><a href="/">Home</a></li>
59 + <li class="{% active_str '/' %}"><a href="/">{% trans 'Home' %}</a></li>
60 {% active_link 'news' 'Portage News' %}
61 {% for about in about_pages %}<li class="{% active_str about.url %}"><a href="{{ about.url }}">{{ about.title }}</a></li>{% endfor %}
62 <li><a href="#contact">Contact</a></li>
63 @@ -89,15 +89,15 @@
64 <div class="well">
65 <div id="rightcontent">
66 <div>
67 - <span class="label label-info label-legend"> Last update</span>
68 + <span class="label label-info label-legend">{% trans 'Last update' %}</span>
69 {% last_updated %}
70 </div><br/>
71 <div>
72 - <span class="label label-info label-legend">Legend</span>
73 + <span class="label label-info label-legend">{% trans 'Legend' %}</span>
74 <ul class="legend left-bar-list">
75 - <li><span class="stable">+</span> - stable</li>
76 - <li><span class="unstable">~</span> - unstable</li>
77 - <li><span class="hardmask">M</span> - hardmask</li>
78 + <li><span class="stable">+</span> - {% trans 'stable' %}</li>
79 + <li><span class="unstable">~</span> - {% trans 'unstable' %}</li>
80 + <li><span class="hardmask">M</span> - {% trans 'hardmask' %}</li>
81 </ul>
82 </div>
83 </div>
84
85 diff --git a/gpackages/templates/categories.html b/gpackages/templates/categories.html
86 index ebd2116..6cf972d 100644
87 --- a/gpackages/templates/categories.html
88 +++ b/gpackages/templates/categories.html
89 @@ -1,7 +1,7 @@
90 {% extends "base.html" %}
91 {% load url from future %}
92 {% load cache %}
93 -
94 +{% load i18n %}
95 {% block content %}
96 {% cache 3600 categories_table %}
97 <table class='table table-striped table-hover'>
98 @@ -11,8 +11,8 @@
99 </colgroup>
100 <thead>
101 <tr>
102 - <th>Category</th>
103 - <th>Description</th>
104 + <th>{% trans 'Category' %}</th>
105 + <th>{% trans 'Description' %}</th>
106 </tr>
107 </thead>
108 <tbody>
109
110 diff --git a/gpackages/templates/filtering_view.html b/gpackages/templates/filtering_view.html
111 index d7a2f14..6909a0b 100644
112 --- a/gpackages/templates/filtering_view.html
113 +++ b/gpackages/templates/filtering_view.html
114 @@ -1,10 +1,10 @@
115 {% extends 'base.html' %}
116 -
117 +{% load i18n %}
118 {% block content %}
119 <div class="filter">
120 <form action="./" method="post" enctype="multipart/form-data">{% csrf_token %}
121 {{ form.as_ul }} <br />
122 - <input type="submit" value="Submit" />
123 + <input type="submit" value="{% trans 'Submit' %}" />
124 </form>
125 </div>
126 {% endblock content %}
127
128 diff --git a/gpackages/templates/global_use.html b/gpackages/templates/global_use.html
129 index bc7354d..5f7f9ce 100644
130 --- a/gpackages/templates/global_use.html
131 +++ b/gpackages/templates/global_use.html
132 @@ -1,7 +1,7 @@
133 {% extends "base.html" %}
134 {% load url from future %}
135 {% load cache %}
136 -
137 +{% load i18n %}
138 {% block content %}
139 {% cache 1800 global_use_table %}
140 <table class='table table-striped table-hover'>
141 @@ -11,8 +11,8 @@
142 </colgroup>
143 <thead>
144 <tr>
145 - <th>Use flag</th>
146 - <th>Description</th>
147 + <th>{% trans 'Use flag' %}</th>
148 + <th>{% trans 'Description' %}</th>
149 </tr>
150 </thead>
151 <tbody>
152
153 diff --git a/gpackages/templates/herds.html b/gpackages/templates/herds.html
154 index 45814ab..b470637 100644
155 --- a/gpackages/templates/herds.html
156 +++ b/gpackages/templates/herds.html
157 @@ -2,9 +2,9 @@
158 {% load packages %}
159 {% load url from future %}
160 {% load cache %}
161 +{% load i18n %}
162
163 {% block content %}
164 -
165 {% cache 1800 herds_table %}
166 <table class='table table-striped table-hover'>
167 <colgroup>
168 @@ -14,9 +14,9 @@
169 </colgroup>
170 <thead>
171 <tr>
172 - <th>Herd</th>
173 - <th>Email</th>
174 - <th>Description</th>
175 + <th>{% trans 'Herd' %}</th>
176 + <th>{% trans 'Email' %}</th>
177 + <th>{% trans 'Description' %}</th>
178 </tr>
179 </thead>
180 <tbody>
181
182 diff --git a/gpackages/templates/includes/ebuild_table.html b/gpackages/templates/includes/ebuild_table.html
183 index 9a83fb0..eeb6698 100644
184 --- a/gpackages/templates/includes/ebuild_table.html
185 +++ b/gpackages/templates/includes/ebuild_table.html
186 @@ -1,12 +1,13 @@
187 {% load packages %}
188 +{% load i18n %}
189 <div class="tabbable">
190 <ul class="nav nav-tabs">
191 {% if package %}
192 - <li{% if table_items.changelog %} class="active"{% endif %}><a href="changelog" tab-id="changelog">Changelog</a></li>
193 + <li{% if table_items.changelog %} class="active"{% endif %}><a href="changelog" tab-id="changelog">{% trans 'Changelog' %}</a></li>
194 {% endif %}
195 - <li{% if table_items.use_flags %} class="active"{% endif %}><a href="use_flags" tab-id="use_flags">Use flags</a></li>
196 - <li{% if table_items.licenses %} class="active"{% endif %}><a href="licenses" tab-id="licenses">Licenses</a></li>
197 - <li{% if table_items.dependences %} class="active"{% endif %}><a href="dependences" tab-id="dependences">Dependences</a></li>
198 + <li{% if table_items.use_flags %} class="active"{% endif %}><a href="use_flags" tab-id="use_flags">{% trans 'Use flags' %}</a></li>
199 + <li{% if table_items.licenses %} class="active"{% endif %}><a href="licenses" tab-id="licenses">{% trans 'Licenses' %}</a></li>
200 + <li{% if table_items.dependences %} class="active"{% endif %}><a href="dependences" tab-id="dependences">{% trans 'Dependences' %}</a></li>
201 </ul>
202 <div class="tab-content">
203 {% if package %}
204 @@ -22,19 +23,19 @@
205 </div>
206 <div class="tab-pane{% if table_items.dependences %} active{% endif %}" id="dependences">
207 {% if ebuild.depend %}
208 - <h3>Depen</h3>
209 + <h3>{% trans 'Depen' %}</h3>
210 <pre>
211 {{ ebuild.depend }}
212 </pre>
213 {% endif %}
214 {% if ebuild.rdepend %}
215 - <h3>Runtime Depen</h3>
216 + <h3>{% trans 'Runtime Depen' %}</h3>
217 <pre>
218 {{ ebuild.rdepend }}
219 </pre>
220 {% endif %}
221 {% if ebuild.pdepend %}
222 - <h3>Post-Merge Depen</h3>
223 + <h3>{% trans 'Post-Merge Depen' %}</h3>
224 <pre>
225 {{ ebuild.pdepend }}
226 </pre>
227
228 diff --git a/gpackages/templates/includes/ebuild_use_flag.html b/gpackages/templates/includes/ebuild_use_flag.html
229 index 065d892..7a94914 100644
230 --- a/gpackages/templates/includes/ebuild_use_flag.html
231 +++ b/gpackages/templates/includes/ebuild_use_flag.html
232 @@ -1,4 +1,5 @@
233 {% load url from future %}
234 +{% load i18n %}
235 <table class='table table-striped table-hover'>
236 <colgroup>
237 <col class="span1" >
238 @@ -6,8 +7,8 @@
239 </colgroup>
240 <thead>
241 <tr>
242 - <th class="nowrap">Use flag</th>
243 - <th>Description</th>
244 + <th class="nowrap">{% trans 'Use flag' %}</th>
245 + <th>{% trans 'Description' %}</th>
246 </tr>
247 </thead>
248 <tbody>
249
250 diff --git a/gpackages/templates/includes/package_object.html b/gpackages/templates/includes/package_object.html
251 index cc13439..d97a27d 100644
252 --- a/gpackages/templates/includes/package_object.html
253 +++ b/gpackages/templates/includes/package_object.html
254 @@ -1,6 +1,7 @@
255 {% spaceless %}
256 {% load url from future %}
257 {% load packages %}
258 +{% load i18n %}
259 <div class="well package-well package">
260 <div class="package-name">
261 <span><a href="{{ package.get_absolute_url }}">{{ package.cp }}</a>:: {{ package.repository.name }}</span>
262 @@ -16,7 +17,7 @@
263 {% with herds=package.herds.all maintainers=package.maintainers.all homepages=package.latest_ebuild.homepages.all %}
264 {% if herds or maintainers or homepages %}
265 <div style="padding-bottom: 10px; padding-top: 0px; margin-top: 0px;">
266 - <a href="#" class="trigger"><span class="trigger">+</span>Details</a>
267 + <a href="#" class="trigger"><span class="trigger">+</span>{% trans 'Details' %}</a>
268 </div>
269 <div class="row-fluid details hide">
270 <table class="table table-striped table-hover">
271 @@ -27,7 +28,7 @@
272 <tbody>
273 {% if herds %}
274 <tr>
275 - <td>Herds:</td>
276 + <td>{% trans 'Herds' %}:</td>
277 <td>
278 {% for herd in herds %}
279 <a href="{% url 'packages' herd=herd.name %}">{{ herd.name }}</a>{% if not forloop.last %},{% endif %}
280 @@ -37,7 +38,7 @@
281 {% endif %}
282 {% if maintainers %}
283 <tr>
284 - <td>Maintainers:</td>
285 + <td>{% trans 'Maintainers' %}:</td>
286 <td>
287 {% for maintainer in maintainers %}
288 <a href="{% url 'packages' maintainer=maintainer.pk %}">{{ maintainer.name }}</a>{% if not forloop.last %},{% endif %}
289 @@ -47,7 +48,7 @@
290 {% endif %}
291 {% if homepages %}
292 <tr>
293 - <td>Homepages:</td>
294 + <td>{% trans 'Homepages' %}:</td>
295 <td>
296 {% for homepage in homepages %}
297 <a href="{{ homepage.url }}">{{ homepage.url }}</a>{% if not forloop.last %},{% endif %}
298 @@ -63,7 +64,7 @@
299 {% endif %}
300 {% if package.changelog_url %}
301 <tr>
302 - <td>Changelog url</td>
303 + <td>{% trans 'Changelog url' %}</td>
304 <td><a href="{{ package.changelog_url }}">{{ package.changelog_url }}</a></td>
305 </tr>
306 {% endif %}
307
308 diff --git a/gpackages/templates/includes/portage_news_object.html b/gpackages/templates/includes/portage_news_object.html
309 index fc03658..6919d5e 100644
310 --- a/gpackages/templates/includes/portage_news_object.html
311 +++ b/gpackages/templates/includes/portage_news_object.html
312 @@ -1,16 +1,17 @@
313 {% load url from future %}
314 +{% load i18n %}
315 <div class="news_item">
316 <h2><a href="{% url 'news_item' slug=news_item.name %}">{{ news_item.title }}</a></h2>
317 <p>{{ news_item.message_as_html|safe }}</p>
318 <div class="metadata" >
319 - <span>Date: {{ news_item.date }}</span>
320 - <span>Revision: {{ news_item.revision }}</span>
321 + <span>{% trans 'Date' %}: {{ news_item.date }}</span>
322 + <span>{% trans 'Revision' %}: {{ news_item.revision }}</span>
323 {% with authors=news_item.authors.all %}
324 <span>
325 {% if authors|length_is:"1" %}
326 - Author:
327 + {% trans 'Author' %}:
328 {% else %}
329 - Authors:
330 + {% trans 'Authors' %}:
331 {% endif %}
332 {% for author in authors %}
333 <a href="{% url 'packages' maintainer=author.pk %}">{{ author.name }}</a>
334
335 diff --git a/gpackages/templates/includes/recent_ebuilds.html b/gpackages/templates/includes/recent_ebuilds.html
336 index 3fc0c2a..368f6aa 100644
337 --- a/gpackages/templates/includes/recent_ebuilds.html
338 +++ b/gpackages/templates/includes/recent_ebuilds.html
339 @@ -1,7 +1,8 @@
340 {% spaceless %}
341 +{% load i18n %}
342 <div class="well">
343 <ul class="nav nav-list recent-ebuilds">
344 - <li class="nav-header">Recent Ebuilds</li>
345 + <li class="nav-header">{% trans 'Recent Ebuilds' %}</li>
346 {% for ebuild in ebuilds %}
347 <li>
348 <a href="{{ ebuild.package.get_absolute_url }}">{{ ebuild.cpv_or_cpvr }}</a>
349
350 diff --git a/gpackages/templates/license_groups.html b/gpackages/templates/license_groups.html
351 index 080c7fc..8a31050 100644
352 --- a/gpackages/templates/license_groups.html
353 +++ b/gpackages/templates/license_groups.html
354 @@ -1,6 +1,7 @@
355 {% extends "base.html" %}
356 {% load url from future %}
357 {% load cache %}
358 +{% load i18n %}
359
360 {% block content %}
361 {% cache 3600 license_groups %}
362 @@ -11,8 +12,8 @@
363 </colgroup>
364 <thead>
365 <tr>
366 - <th>License group</th>
367 - <th>Licenses</th>
368 + <th>{% trans 'License group' %}</th>
369 + <th>{% trans 'Licenses' %}</th>
370 </tr>
371 </thead>
372 <tbody>
373
374 diff --git a/gpackages/templates/local_use.html b/gpackages/templates/local_use.html
375 index af13bf0..94af890 100644
376 --- a/gpackages/templates/local_use.html
377 +++ b/gpackages/templates/local_use.html
378 @@ -1,5 +1,6 @@
379 {% extends "base.html" %}
380 {% load url from future %}
381 +{% load i18n %}
382
383 {% block content %}
384
385 @@ -11,9 +12,9 @@
386 </colgroup>
387 <thead>
388 <tr>
389 - <th>Use flag</th>
390 - <th>Package</th>
391 - <th>Description</th>
392 + <th>{% trans 'Use flag' %}</th>
393 + <th>{% trans 'Package' %}</th>
394 + <th>{% trans 'Description' %}</th>
395 </tr>
396 </thead>
397 <tbody>
398
399 diff --git a/gpackages/templates/maintainers.html b/gpackages/templates/maintainers.html
400 index e09db72..b337f18 100644
401 --- a/gpackages/templates/maintainers.html
402 +++ b/gpackages/templates/maintainers.html
403 @@ -1,5 +1,6 @@
404 {% extends "base.html" %}
405 {% load url from future %}
406 +{% load i18n %}
407 {% load packages %}
408 {% load paginator %}
409
410 @@ -13,9 +14,9 @@
411 </colgroup>
412 <thead>
413 <tr>
414 - <th>Name</th>
415 - <th>Email</th>
416 - <th>Gentoo dev</th>
417 + <th>{% trans 'Name' %}</th>
418 + <th>{% trans 'Email' %}</th>
419 + <th>{% trans 'Gentoo dev' %}</th>
420 </tr>
421 </thead>
422 <tbody>
423
424 diff --git a/gpackages/templates/repositories.html b/gpackages/templates/repositories.html
425 index 575be00..af253c6 100644
426 --- a/gpackages/templates/repositories.html
427 +++ b/gpackages/templates/repositories.html
428 @@ -1,6 +1,7 @@
429 {% extends "base.html" %}
430 {% load url from future %}
431 {% load cache %}
432 +{% load i18n %}
433
434 {% block content %}
435 {% cache 300 repositories_table %}
436 @@ -12,9 +13,9 @@
437 </colgroup>
438 <thead>
439 <tr>
440 - <th>Repository</th>
441 - <th>Description</th>
442 - <th>Last updated</th>
443 + <th>{% trans 'Repository' %}</th>
444 + <th>{% trans 'Description' %}</th>
445 + <th>{% trans 'Last updated' %}</th>
446 </tr>
447 </thead>
448 <tbody>
449
450 diff --git a/gpackages/templates/repository.html b/gpackages/templates/repository.html
451 index bbe6b0b..062326a 100644
452 --- a/gpackages/templates/repository.html
453 +++ b/gpackages/templates/repository.html
454 @@ -1,5 +1,6 @@
455 {% extends "base.html" %}
456 {% load url from future %}
457 +{% load i18n %}
458 {% load packages %}
459
460 {% block content %}
461 @@ -14,44 +15,44 @@
462 <col class="span1" />
463 <col class="span1" />
464 </colgroup>
465 - <caption><h3>Options</h3></caption>
466 + <caption><h3>{% trans 'Options' %}</h3></caption>
467 <thead>
468 <tr>
469 - <th>Name</th>
470 - <th>Value</th>
471 + <th>{% trans 'Name' %}</th>
472 + <th>{% trans 'Value' %}</th>
473 </tr>
474 </thead>
475 <tbody>
476 {% if repository.owner_name %}
477 <tr>
478 - <td class="nowrap">Owner name</td>
479 + <td class="nowrap">{% trans 'Owner name' %}</td>
480 <td>{{ repository.owner_name }}</td>
481 </tr>
482 {% endif %}
483 {% if repository.owner_email %}
484 <tr>
485 - <td class="nowrap">Owner email</td>
486 + <td class="nowrap">{% trans 'Owner email' %}</td>
487 <td><a href="{{ 'mailto:'|add:repository.owner_email|obfuscate }}">{{ repository.owner_email|obfuscate }}</a></td>
488 </tr>
489 {% endif %}
490 <tr>
491 - <td>Homepage</td>
492 + <td>{% trans 'Homepage' %}</td>
493 <td><a href="{{ repository.homepage }}">{{ repository.homepage }}</a></td>
494 </tr>
495 <tr>
496 - <td>Quality</td>
497 + <td>{% trans 'Quality' %}</td>
498 <td>{{ repository.get_quality_display }}</td>
499 </tr>
500 <tr>
501 - <td>Official</td>
502 + <td>{% trans 'Official' %}</td>
503 <td>{% if repository.official %}<span class="bool-ok">&#10004; Yes</span>{% else %}<span class="bool-no">&#10005; No</span>{% endif %}</td>
504 </tr>
505 <tr>
506 - <td>Last Updated</td>
507 + <td>{% trans 'Last Updated' %}</td>
508 <td>{{ repository.updated_datetime }}</td>
509 </tr>
510 <tr>
511 - <td>Created in database</td>
512 + <td>{% trans 'Created in database' %}</td>
513 <td>{{ repository.created_datetime }}</td>
514 </tr>
515 </tbody>
516 @@ -63,32 +64,32 @@
517 <col class="span1" />
518 <col class="span1" />
519 </colgroup>
520 - <caption><h3>Stats</h3></caption>
521 + <caption><h3>{% trans 'Stats' %}</h3></caption>
522 <thead>
523 <tr>
524 - <th>Name</th>
525 - <th>Value</th>
526 + <th>{% trans 'Name' %}</th>
527 + <th>{% trans 'Value' %}</th>
528 </tr>
529 </thead>
530 <tbody>
531 <tr>
532 - <td class="nowrap">Categories Count</td>
533 + <td class="nowrap">{% trans 'Categories Count' %}</td>
534 <td>{{ repository.categories_count }}</td>
535 </tr>
536 <tr>
537 - <td class="nowrap">Maintainers Count</td>
538 + <td class="nowrap">{% trans 'Maintainers Count' %}</td>
539 <td>{{ repository.maintainers_count }}</td>
540 </tr>
541 <tr>
542 - <td class="nowrap">Herds Count</td>
543 + <td class="nowrap">{% trans 'Herds Count' %}</td>
544 <td>{{ repository.herds_count }}</td>
545 </tr>
546 <tr>
547 - <td class="nowrap">Packages Count</td>
548 + <td class="nowrap">{% trans 'Packages Count' %}</td>
549 <td>{{ repository.packages_count }}</td>
550 </tr>
551 <tr>
552 - <td class="nowrap">Ebuilds Count</td>
553 + <td class="nowrap">{% trans 'Ebuilds Count' %}</td>
554 <td>{{ repository.ebuilds_count }}</td>
555 </tr>
556 </tbody>
557 @@ -103,11 +104,11 @@
558 <col class="span1" />
559 <col class="span7" />
560 </colgroup>
561 - <caption><h3>Sources</h3></caption>
562 + <caption><h3>{% trans 'Sources' %}</h3></caption>
563 <thead>
564 <tr>
565 - <th class="nowrap">Repository type</th>
566 - <th>URL</th>
567 + <th class="nowrap">{% trans 'Repository type' %}</th>
568 + <th>{% trans 'URL' %}</th>
569 </tr>
570 </thead>
571 <tbody>
572 @@ -124,7 +125,7 @@
573 {% with feeds=repository.repositoryfeedmodel_set.all %}
574 {% if feeds %}
575 <div>
576 - <h4>Feeds:</h4>
577 + <h4>{% trans 'Feeds:' %}</h4>
578 <ul>
579 {% for feed in feeds %}
580 <li><a href="{{ feed.feed }}">{{ feed.feed }}</a></li>