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

[Ronnie]

Splitted translations, now with blocktrans

[Chris Johnston (cjohnston)]

There is a conflict on the team_details.html page.

review: Needs Fixing

[lp:~ronnie.vd.c/loco-team-portal/translation-blocktrans]

405. By Ronnie on 2011-03-02

Pulled new version and fixed conflict in team_detail.html

[Ronnie (ronnie.vd.c)]

review: Needs Resubmitting

[Chris Johnston (cjohnston)]

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

review: Needs Fixing

[Chris Johnston (cjohnston)]

Made a few minor changes and pushed.

review: Approve

[Ronnie (ronnie.vd.c)]

I guess am an hour too late ;)

=== 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 @@
 
 <article class="main-content leading">
     <h2>{% trans "What is the LoCo Team Directory?" %}</h2>
-    <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>." %}
-    </p>
-</article>
-
-<hr class="divide" />
-
-<article class="minor-content">
-<h2>{% trans "The Directory Data" %}</h2>
-<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." %}
-{% 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>." %}
-</p>
-</article>
-<article class="minor-content">
-<h2>{% trans "Contribute to the LoCo Team Directory!" %}</h2>
-<p>{% trans "You can make it better:" %}
-<ul>
-<li>{% trans "Have an Idea?" %} <a href='https://blueprints.launchpad.net/loco-directory'>{% trans "Write a blueprint!" %}</a></li>
-<li> {% trans "Help <a href='https://translations.launchpad.net/loco-directory'>Translate!</a>" %}</li>
-<li> {% trans "Found a bug?" %} <a href='https://bugs.launchpad.net/loco-directory'>{% trans "Report it!" %}</a></li>
-<li> {% trans "Help with code:" %} <a href='https://code.launchpad.net/loco-directory'>{% trans "Get the code!" %}</a></li>
-<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>
-</ul>
-</p>
-<p>{% trans "Need to know more," %} <a href='https://answers.launchpad.net/loco-directory'>{% trans "just ask!" %}</a></p>
-
-<hr class="divide" />
-
-</article>
-		<article class="minor-content">
-        <h2>{% trans "Coming Soon!" %}</h2>
-        <p>
-          {% trans "Future additions to this site will include:" %}
-          <ul>
-            <li>Team Collaboration</li>
-            <li>Various mashups</li>
-          </ul>
-        </p>
-        </article>
+    {% with '</a>' as link_end %}
+    {% with '<a href="https://launchpad.net/~nixternal">' as link_developer %}
+    {% with '<a href="https://launchpad.net/~loco-directory-dev">' as link_loco-directory-dev %}
+    {% with '<a href="http://www.gnu.org/licenses/gpl-3.0-standalone.html">' as link_gpl-3.0 %}
+    <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 %}
+    </p>
+    {% endwith %}
+    {% endwith %}
+    {% endwith %}
+    {% endwith %}
+</article>
+
+<hr class="divide" />
+
+<article class="minor-content">
+    <h2>{% trans "The Directory Data" %}</h2>
+    {% with '</a>' as link_end %}
+    {% with '<a href="https://launchpad.net/">' as link_launchpad %}
+    {% with '<a href="https://help.launchpad.net/API/launchpadlib">' as link_launchpadlib %}
+    {% with '<a href="/data/xml/">' as link_xml %}
+    {% with '<a href="http://www.gnu.org/licenses/gpl-3.0-standalone.html">' as link_gpl-3.0 %}
+    {% with '<a href="https://code.launchpad.net/loco-directory">' as link_ld %}
+    <p>
+        {% 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 %}
+        {% 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 %}
+    </p>
+    {% endwith %}
+    {% endwith %}
+    {% endwith %}
+    {% endwith %}
+    {% endwith %}
+    {% endwith %}
+</article>
+
+<article class="minor-content">
+    <h2>{% trans "Contribute to the LoCo Team Directory!" %}</h2>
+    {% with '</a>' as link_end %}
+    <p>{% trans "You can make it better:" %}
+        <ul>
+            {% with '<a href="https://blueprints.launchpad.net/loco-directory">' as link_blueprint %}
+            {% with '<a href="https://translations.launchpad.net/loco-directory">' as link_trans %}
+            {% with '<a href="https://bugs.launchpad.net/loco-directory">' as link_bugs %}
+            {% with '<a href="https://code.launchpad.net/loco-directory">' as link_code %}
+            {% with '<a href="https://lists.ubuntu.com/mailman/listinfo/loco-directory">' as link_mail %}
+            <li>{% blocktrans %}Have an Idea? {{ link_blueprint }}Write a blueprint!{{ link_end }}{% endblocktrans %}</li>
+            <li>{% blocktrans %}Help {{ link_trans }}Translate!{{ link_end }}{% endblocktrans %}</li>
+            <li>{% blocktrans %}Found a bug? {{ link_bugs }}Report it!{{ link_end }}{% endblocktrans %}</li>
+            <li>{% blocktrans %}Help with code: {{ link_code }}Get the code!{{ link_end }}{% endblocktrans %}</li>
+            <li>{% blocktrans %}Discuss: {{ link_mail }}LoCo Directory Mailing List{{ link_end }} or send an email to loco-directory at lists.ubuntu.com{% endblocktrans %}</li>
+            {% endwith %}
+            {% endwith %}
+            {% endwith %}
+            {% endwith %}
+            {% endwith %}
+        </ul>
+    </p>
+    {% with '<a href="https://answers.launchpad.net/loco-directory">' as link_ld %}
+    <p>{% blocktrans %}Need to know more, {{ link_ld }}just ask!{{ link_end }}{% endblocktrans %}</p>
+    {% endwith %}
+    {% endwith %}
+
+    <hr class="divide" />
+</article>
+
+<article class="minor-content">
+    <h2>{% trans "Coming Soon!" %}</h2>
+    <p>
+      {% trans "Future additions to this site will include:" %}
+      <ul>
+        <li>Team Collaboration</li>
+        <li>Various mashups</li>
+      </ul>
+    </p>
+</article>
 {% endblock %}

=== 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 @@
 <article class="main-content">
     <h3>{% trans "Joining a LoCo Team" %}</h3>
     <ul>
-	<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>
-        <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>
+        {% with '</a>' as link_end %}
+        {% with '<a title="' as start_link_title %}
+        {% with '" href="' as start_link_href %}
+        {% url team-list as url_team_list %}
+        {% with '">' as end_link_href %}
+        {% with 'https://wiki.ubuntu.com/LoCoTeamHowto' as url_locohowto %}
+	    <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>
+        <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>
+        {% endwith %}
+        {% endwith %}
+        {% endwith %}
+        {% endwith %}
+        {% endwith %}
     </ul>
 </article>
 

=== 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 @@
 
 {% if team.flickr_id or team.picasa_id or team.pixie_id %} 
 <article class="main-content">
-    <h2>{% trans "Photos from" %} {{ team.name }}</h2>
+    {% with team.name as team_name %}
+    <h2>{% blocktrans %}Photos from {{ team_name }}{% endblocktrans %}</h2>
+    {% endwith %}
     <div style="width:100%;" id="flickr"> </div>
     <div style="width:100%;" id="picasa"> </div> 
     <div style="width:100%;" id="pixie"> </div> 
 </article>
 {% endif %}
 
-
 {% endblock %}