LoCo Team Portal

Merge lp:~ronnie.vd.c/loco-team-portal/translation-blocktrans into lp:loco-team-portal

  1. translation-blocktrans
  2. Merge into 0.2
Proposed by Ronnie
Status: Merged
Approved by: Chris Johnston
Approved revision: 405
Merged at revision: 412
Proposed branch: lp:~ronnie.vd.c/loco-team-portal/translation-blocktrans
Merge into: lp:loco-team-portal
Diff against target: 166 lines (+90/-42)
3 files modified
loco_directory/templates/about.html (+74/-38)
loco_directory/templates/about_loco.html (+13/-2)
loco_directory/templates/teams/team_detail.html (+3/-2)
To merge this branch: bzr merge lp:~ronnie.vd.c/loco-team-portal/translation-blocktrans
Reviewer Review Type Date Requested Status
Chris Johnston Approve
Ronnie (community) Needs Resubmitting
Review via email: mp+50447@code.launchpad.net

Description of the change

Splitted translations, now with blocktrans

To post a comment you must log in.
Revision history for this message
Chris Johnston (cjohnston) wrote :

There is a conflict on the team_details.html page.

review: Needs Fixing
lp:~ronnie.vd.c/loco-team-portal/translation-blocktrans updated
405. By Ronnie

Pulled new version and fixed conflict in team_detail.html

Revision history for this message
Ronnie (ronnie.vd.c) :
review: Needs Resubmitting
Revision history for this message
Chris Johnston (cjohnston) wrote :

Quotes need to be removed from the text on the about page.

review: Needs Fixing
Revision history for this message
Chris Johnston (cjohnston) wrote :

Made a few minor changes and pushed.

review: Approve
Revision history for this message
Ronnie (ronnie.vd.c) wrote :

I guess am an hour too late ;)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'loco_directory/templates/about.html'
--- loco_directory/templates/about.html 2010-11-27 03:08:29 +0000
+++ loco_directory/templates/about.html 2011-03-02 22:38:10 +0000
@@ -8,42 +8,78 @@
88
9<article class="main-content leading">9<article class="main-content leading">
10 <h2>{% trans "What is the LoCo Team Directory?" %}</h2>10 <h2>{% trans "What is the LoCo Team Directory?" %}</h2>
11 <p>{% trans "The LoCo Team Directory is a place where you can find information regarding LoCo Teams. It was originally developed by <a href='https://launchpad.net/~nixternal'>Richard Johnson</a> and further development has been made possible by the <a href='https://launchpad.net/~loco-directory-dev'>The LoCo Team Directory Developers</a>." %} {% trans "The LoCo Team Directory is made available under the <a href='http://www.gnu.org/licenses/gpl-3.0-standalone.html'>GNU GPL v3</a>." %}11 {% with '</a>' as link_end %}
12 </p>12 {% with '<a href="https://launchpad.net/~nixternal">' as link_developer %}
13</article>13 {% with '<a href="https://launchpad.net/~loco-directory-dev">' as link_loco-directory-dev %}
1414 {% with '<a href="http://www.gnu.org/licenses/gpl-3.0-standalone.html">' as link_gpl-3.0 %}
15<hr class="divide" />15 <p>{% blocktrans %}"The LoCo Team Directory is a place where you can find information regarding LoCo Teams. It was originally developed by {{ link_developer }}Richard Johnson{{ link_end }} and further development has been made possible by the {{ link_loco-directory-dev }}The LoCo Team Directory Developers{{ link_end }}."{% endblocktrans %} {% blocktrans %}"The LoCo Team Directory is made available under the {{ link_gpl-3.0 }}GNU GPL v3{{ link_end }}."{% endblocktrans %}
1616 </p>
17<article class="minor-content">17 {% endwith %}
18<h2>{% trans "The Directory Data" %}</h2>18 {% endwith %}
19<p>{% trans "The LoCo Team Directory comes from two sources, <a href='https://launchpad.net/'>Launchpad</a> and its <a href='https://help.launchpad.net/API/launchpadlib'>APIs</a>. The data that the LoCo Team Directory gathers is also made available as <a href='/data/xml'>XML</a> format to interoperate with other web apps and for possible mashups." %}19 {% endwith %}
20{% trans "The LoCo Team Directory is made available under the <a href='http://www.gnu.org/licenses/gpl-3.0-standalone.html'>GNU GPL v3</a> and the Code is available in <a href='https://code.launchpad.net/loco-directory'>Launchpad Code Hosting</a>." %}20 {% endwith %}
21</p>21</article>
22</article>22
23<article class="minor-content">23<hr class="divide" />
24<h2>{% trans "Contribute to the LoCo Team Directory!" %}</h2>24
25<p>{% trans "You can make it better:" %}25<article class="minor-content">
26<ul>26 <h2>{% trans "The Directory Data" %}</h2>
27<li>{% trans "Have an Idea?" %} <a href='https://blueprints.launchpad.net/loco-directory'>{% trans "Write a blueprint!" %}</a></li>27 {% with '</a>' as link_end %}
28<li> {% trans "Help <a href='https://translations.launchpad.net/loco-directory'>Translate!</a>" %}</li>28 {% with '<a href="https://launchpad.net/">' as link_launchpad %}
29<li> {% trans "Found a bug?" %} <a href='https://bugs.launchpad.net/loco-directory'>{% trans "Report it!" %}</a></li>29 {% with '<a href="https://help.launchpad.net/API/launchpadlib">' as link_launchpadlib %}
30<li> {% trans "Help with code:" %} <a href='https://code.launchpad.net/loco-directory'>{% trans "Get the code!" %}</a></li>30 {% with '<a href="/data/xml/">' as link_xml %}
31<li> {% trans "Discuss:" %} <a href='https://lists.ubuntu.com/mailman/listinfo/loco-directory'>{% trans "LoCo Directory Mailing List" %}</a> {% trans "or send an email to" %} loco-directory at lists.ubuntu.com </li>31 {% with '<a href="http://www.gnu.org/licenses/gpl-3.0-standalone.html">' as link_gpl-3.0 %}
32</ul>32 {% with '<a href="https://code.launchpad.net/loco-directory">' as link_ld %}
33</p>33 <p>
34<p>{% trans "Need to know more," %} <a href='https://answers.launchpad.net/loco-directory'>{% trans "just ask!" %}</a></p>34 {% blocktrans %}"The LoCo Team Directory comes from two sources, {{ link_launchpad }}Launchpad{{ link_end }} and its {{ link_launchpadlib }}APIs{{ link_end }}. The data that the LoCo Team Directory gathers is also made available as {{ link_xml }}XML{{ link_end }} format to interoperate with other web apps and for possible mashups."{% endblocktrans %}
3535 {% blocktrans %}"The LoCo Team Directory is made available under the {{ link_gpl-3.0 }}GNU GPL v3{{ link_end }} and the Code is available in {{ link_ld }}Launchpad Code Hosting{{ link_end }}."{% endblocktrans %}
36<hr class="divide" />36 </p>
3737 {% endwith %}
38</article>38 {% endwith %}
39 <article class="minor-content">39 {% endwith %}
40 <h2>{% trans "Coming Soon!" %}</h2>40 {% endwith %}
41 <p>41 {% endwith %}
42 {% trans "Future additions to this site will include:" %}42 {% endwith %}
43 <ul>43</article>
44 <li>Team Collaboration</li>44
45 <li>Various mashups</li>45<article class="minor-content">
46 </ul>46 <h2>{% trans "Contribute to the LoCo Team Directory!" %}</h2>
47 </p>47 {% with '</a>' as link_end %}
48 </article>48 <p>{% trans "You can make it better:" %}
49 <ul>
50 {% with '<a href="https://blueprints.launchpad.net/loco-directory">' as link_blueprint %}
51 {% with '<a href="https://translations.launchpad.net/loco-directory">' as link_trans %}
52 {% with '<a href="https://bugs.launchpad.net/loco-directory">' as link_bugs %}
53 {% with '<a href="https://code.launchpad.net/loco-directory">' as link_code %}
54 {% with '<a href="https://lists.ubuntu.com/mailman/listinfo/loco-directory">' as link_mail %}
55 <li>{% blocktrans %}Have an Idea? {{ link_blueprint }}Write a blueprint!{{ link_end }}{% endblocktrans %}</li>
56 <li>{% blocktrans %}Help {{ link_trans }}Translate!{{ link_end }}{% endblocktrans %}</li>
57 <li>{% blocktrans %}Found a bug? {{ link_bugs }}Report it!{{ link_end }}{% endblocktrans %}</li>
58 <li>{% blocktrans %}Help with code: {{ link_code }}Get the code!{{ link_end }}{% endblocktrans %}</li>
59 <li>{% blocktrans %}Discuss: {{ link_mail }}LoCo Directory Mailing List{{ link_end }} or send an email to loco-directory at lists.ubuntu.com{% endblocktrans %}</li>
60 {% endwith %}
61 {% endwith %}
62 {% endwith %}
63 {% endwith %}
64 {% endwith %}
65 </ul>
66 </p>
67 {% with '<a href="https://answers.launchpad.net/loco-directory">' as link_ld %}
68 <p>{% blocktrans %}Need to know more, {{ link_ld }}just ask!{{ link_end }}{% endblocktrans %}</p>
69 {% endwith %}
70 {% endwith %}
71
72 <hr class="divide" />
73</article>
74
75<article class="minor-content">
76 <h2>{% trans "Coming Soon!" %}</h2>
77 <p>
78 {% trans "Future additions to this site will include:" %}
79 <ul>
80 <li>Team Collaboration</li>
81 <li>Various mashups</li>
82 </ul>
83 </p>
84</article>
49{% endblock %}85{% endblock %}
5086
=== modified file 'loco_directory/templates/about_loco.html'
--- loco_directory/templates/about_loco.html 2010-11-20 17:25:50 +0000
+++ loco_directory/templates/about_loco.html 2011-03-02 22:38:10 +0000
@@ -13,8 +13,19 @@
13<article class="main-content">13<article class="main-content">
14 <h3>{% trans "Joining a LoCo Team" %}</h3>14 <h3>{% trans "Joining a LoCo Team" %}</h3>
15 <ul>15 <ul>
16 <li>{% trans "Do you want to join a LoCo Team? It's easy! Just " %}<a title="{% trans "See All LoCo Teams" %}" href="{% url team-list %}">{% trans "find a team" %}</a> {% trans "in your area and click the 'Join This Team!' link at the top of their page." %}</li>16 {% with '</a>' as link_end %}
17 <li>{% trans "If you are not able to find a LoCo Team in your area and want to create one, take a look at the " %}<a href="https://wiki.ubuntu.com/LoCoTeamHowto" title="{% trans "LoCo Team HowTo" %}">{% trans "LoCo Team HowTo" %}</a>{% trans " for more information on setting up a LoCo Team." %}</li>17 {% with '<a title="' as start_link_title %}
18 {% with '" href="' as start_link_href %}
19 {% url team-list as url_team_list %}
20 {% with '">' as end_link_href %}
21 {% with 'https://wiki.ubuntu.com/LoCoTeamHowto' as url_locohowto %}
22 <li>{% blocktrans %}Do you want to join a LoCo Team? It's easy! Just {{ start_link_title }}See All LoCo Teams{{ start_link_href }}{{ url_team_list }}{{ end_link_href }}find a team{{ link_end }} in your area and click the 'Join This Team!' link at the top of their page.{% endblocktrans %}</li>
23 <li>{% blocktrans %}If you are not able to find a LoCo Team in your area and want to create one, take a look at the {{ start_link_title }}LoCo Team HowTo{{ start_link_href }}{{ url_locohowto }}{{ end_link_href }}LoCo Team HowTo{{ link_end }} for more information on setting up a LoCo Team.{% endblocktrans %}</li>
24 {% endwith %}
25 {% endwith %}
26 {% endwith %}
27 {% endwith %}
28 {% endwith %}
18 </ul>29 </ul>
19</article>30</article>
2031
2132
=== modified file 'loco_directory/templates/teams/team_detail.html'
--- loco_directory/templates/teams/team_detail.html 2011-02-19 14:16:30 +0000
+++ loco_directory/templates/teams/team_detail.html 2011-03-02 22:38:10 +0000
@@ -226,12 +226,13 @@
226226
227{% if team.flickr_id or team.picasa_id or team.pixie_id %} 227{% if team.flickr_id or team.picasa_id or team.pixie_id %}
228<article class="main-content">228<article class="main-content">
229 <h2>{% trans "Photos from" %} {{ team.name }}</h2>229 {% with team.name as team_name %}
230 <h2>{% blocktrans %}Photos from {{ team_name }}{% endblocktrans %}</h2>
231 {% endwith %}
230 <div style="width:100%;" id="flickr"> </div>232 <div style="width:100%;" id="flickr"> </div>
231 <div style="width:100%;" id="picasa"> </div> 233 <div style="width:100%;" id="picasa"> </div>
232 <div style="width:100%;" id="pixie"> </div> 234 <div style="width:100%;" id="pixie"> </div>
233</article>235</article>
234{% endif %}236{% endif %}
235237
236
237{% endblock %}238{% endblock %}

Subscribers

People subscribed via source and target branches