[damned-lies] Use new url syntax
- From: Claude Paroz <claudep src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [damned-lies] Use new url syntax
- Date: Wed, 8 Feb 2012 08:22:02 +0000 (UTC)
commit 42898f3d0f7e84f831e914526bb8ff0b4d19ffe1
Author: Claude Paroz <claude 2xlibre net>
Date: Wed Feb 8 09:19:38 2012 +0100
Use new url syntax
languages/urls.py | 3 +-
templates/base.html | 19 +++++++-------
templates/index.html | 11 ++++----
templates/languages/language_release.html | 3 +-
templates/languages/language_release_stats.html | 5 ++-
templates/languages/language_release_summary.html | 15 ++++++-----
templates/people/person_base.html | 10 ++++----
templates/people/person_team_membership.html | 3 +-
templates/release_detail.html | 15 ++++++-----
templates/release_list.html | 5 ++-
templates/stats_show.html | 5 ++-
templates/teams/team_base.html | 3 +-
templates/teams/team_detail.html | 8 +++---
templates/vertimus/vertimus_detail.html | 27 ++++++++++-----------
templates/vertimus/vertimus_diff.html | 3 +-
urls.py | 9 ++++--
16 files changed, 79 insertions(+), 65 deletions(-)
---
diff --git a/languages/urls.py b/languages/urls.py
index 226b5f6..8df4819 100644
--- a/languages/urls.py
+++ b/languages/urls.py
@@ -22,7 +22,8 @@ urlpatterns = patterns('',
view = 'languages.views.language_release_xml'),
url(
regex = r'^(?P<locale>[\w\- ]+)/(?P<release_name>[\w-]+)/(?P<dtype>(ui|ui-part|doc)+).tar.gz$',
- view = 'languages.views.language_release_tar'),
+ view = 'languages.views.language_release_tar',
+ name = 'language_release_tar'),
url(
regex = r'^(?P<team_slug>[\w\- ]+)/$',
view = 'teams.views.team'),
diff --git a/templates/base.html b/templates/base.html
index d54d5d8..24179d0 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -1,5 +1,6 @@
{% load i18n %}
{% load stats_extras %}
+{% load url from future %}
<!DOCTYPE html>
<html lang="{{ LANGUAGE_CODE }}">
<head>
@@ -30,35 +31,35 @@
<li id="siteaction-gnome_community"><a href="http://www.gnome.org/community/">{% trans "Community" %}</a></li>
</ul>
<div id="header">
- <h1><a href="{% url home %}">{% trans "Damned Lies" %}</a></h1>
+ <h1><a href="{% url 'home' %}">{% trans "Damned Lies" %}</a></h1>
<div id="tabs">
<ul id="portal-globalnav">
<li
{% if pageSection == "home" %}
class="selected"
{% endif %}
- ><a href="{% url home %}" title="{% trans "Back to Damned Lies home page" %}"><span>{% trans "Home" %}</span></a>
+ ><a href="{% url 'home' %}" title="{% trans "Back to Damned Lies home page" %}"><span>{% trans "Home" %}</span></a>
</li>
<li
{% if pageSection == "teams" %}
class="selected"
{% endif %}
- ><a href="{% url teams %}"><span>{% trans "Teams" %}</span></a></li>
+ ><a href="{% url 'teams' %}"><span>{% trans "Teams" %}</span></a></li>
<li
{% if pageSection == "languages" %}
class="selected"
{% endif %}
- ><a href="{% url languages %}"><span>{% trans "Languages" %}</span></a></li>
+ ><a href="{% url 'languages' %}"><span>{% trans "Languages" %}</span></a></li>
<li
{% if pageSection == "releases" %}
class="selected"
{% endif %}
- ><a href="{% url releases %}"><span>{% trans "Release sets" %}</span></a></li>
+ ><a href="{% url 'releases' %}"><span>{% trans "Release sets" %}</span></a></li>
<li
{% if pageSection == "module" %}
class="selected"
{% endif %}
- ><a href="{% url modules %}"><span>{% trans "Modules" %}</span></a></li>
+ ><a href="{% url 'modules' %}"><span>{% trans "Modules" %}</span></a></li>
</ul>
</div> <!-- end of #tabs -->
</div> <!-- end of #header -->
@@ -66,13 +67,13 @@
<!-- end site header -->
<div id="authenticated">
{% if user.is_authenticated %}
- <form action="{% url login %}" method="post">
+ <form action="{% url 'login' %}" method="post">
<a href="{{ user.get_absolute_url }}"><img src="{{ MEDIA_URL }}img/nobody-16.png" alt="Person"> {{ user.person }}</a> •
<input type="hidden" name="logout" value="1">
<input type="submit" value="{% trans 'Log out' %}">
</form>
{% else %}
- <a href="{% url login %}">{% trans "Log in" %}</a>
+ <a href="{% url 'login' %}">{% trans "Log in" %}</a>
{% endif %}
</div>
@@ -89,7 +90,7 @@
</div>
<div id="footer">
- <a href="{% url about %}">{% trans "About Damned Liesâ" %}</a>
+ <a href="{% url 'about' %}">{% trans "About Damned Liesâ" %}</a>
<br>
{% trans "Copyright © 2006-2012" %} <a href="http://www.gnome.org/">{% trans "The GNOME Project" %}</a>.
<br>
diff --git a/templates/index.html b/templates/index.html
index d70508e..a55f984 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -1,5 +1,6 @@
{% extends "base.html" %}
{% load i18n %}
+{% load url from future %}
{% block title %} {% trans "Damned Lies about GNOME" %} {% endblock %}
@@ -9,10 +10,10 @@
<h1>{% trans "Damned Lies about GNOME" %}</h1>
<p>{% trans "Damned Lies is the Web application used to manage the localisation (l10n) of the GNOME project." %}
-<em><a href="{% url about %}">{% trans "Moreâ" %}</a></em></p>
+<em><a href="{% url 'about' %}">{% trans "Moreâ" %}</a></em></p>
<div class="bloc50">
- <h2><a href="{% url teams %}">{% trans "Teams" %}</a></h2>
+ <h2><a href="{% url 'teams' %}">{% trans "Teams" %}</a></h2>
<p>{% trans "List of all GNOME Translation Teams, with full information such as primary contact (coordinator), web pages and mailing list information." %}
{% trans "If there is no team for your language, you can easily <a href='http://live.gnome.org/TranslationProject/StartingATeam/'>start your own team</a>." %}
{% if user_language %}
@@ -26,14 +27,14 @@
</div>
<div class="bloc50">
- <h2><a href="{% url languages %}">{% trans "Languages" %}</a></h2>
+ <h2><a href="{% url 'languages' %}">{% trans "Languages" %}</a></h2>
{% url teams as teams_url %}
<p>{% blocktrans %}List of all languages there are <a href='{{ teams_url }}'>Translation Teams</a> for.{% endblocktrans %}
{% trans "Some teams manage more than one language (usually just simple variants), and here you can see all the languages GNOME is being translated to." %}</p>
</div>
<div class="bloc50 reset">
- <h2><a href="{% url releases %}">{% trans "Release Sets" %}</a></h2>
+ <h2><a href="{% url 'releases' %}">{% trans "Release Sets" %}</a></h2>
<p>{% trans "List of all GNOME release sets and releases we gather stats for." %}</p>
<p>{% trans "Examples of release sets are "GNOME Infrastructure" or "GNOME 2.26"." %}
@@ -43,7 +44,7 @@
</div>
<div class="bloc50">
- <h2><a href="{% url modules %}">{% trans "Modules" %}</a></h2>
+ <h2><a href="{% url 'modules' %}">{% trans "Modules" %}</a></h2>
<p>{% trans "List of all modules with statistics in here." %}</p>
<p>{% trans "Modules are separate libraries or applications, with one or more branches of development included." %}
diff --git a/templates/languages/language_release.html b/templates/languages/language_release.html
index c476f79..964c42f 100644
--- a/templates/languages/language_release.html
+++ b/templates/languages/language_release.html
@@ -1,5 +1,6 @@
{% extends "base.html" %}
{% load i18n %}
+{% load url from future %}
{% block title %} {% trans release.description %} - {{ language_name }}{% endblock %}
{% block extrahead %}
@@ -40,7 +41,7 @@ $(document).ready(function()
{% if language %}
<hr />
-<p><a href="{% url languages.views.language_release_tar locale=language.locale release_name=release.name dtype=dtype %}"><img src="{{ MEDIA_URL }}img/download.png" /> {% trans "Download all po files" %}</a></p>
+<p><a href="{% url 'language_release_tar' language.locale release.name dtype %}"><img src="{{ MEDIA_URL }}img/download.png" /> {% trans "Download all po files" %}</a></p>
{% endif %}
</div>
diff --git a/templates/languages/language_release_stats.html b/templates/languages/language_release_stats.html
index d96077b..f64d257 100644
--- a/templates/languages/language_release_stats.html
+++ b/templates/languages/language_release_stats.html
@@ -1,6 +1,7 @@
{# parent template has to define variable modstats #}
{% load i18n stats_extras %}
+{% load url from future %}
<table>
<tr>
@@ -49,9 +50,9 @@
{% endif %}
<td class="leftcell">
{% if language %}
- <a href="{% url vertimus_by_names modname,branch,stat.domain.name,language.locale %}">{{ stat.module_description }}
+ <a href="{% url 'vertimus_by_names' modname branch stat.domain.name language.locale %}">{{ stat.module_description }}
{% else %}
- <a href="{% url stats.views.module modname %}">{{ stat.module_description }}
+ <a href="{% url 'module' modname %}">{{ stat.module_description }}
{% endif %}
{% if stat.partial_po %}
{# For a partial po, domain description is appended #}
diff --git a/templates/languages/language_release_summary.html b/templates/languages/language_release_summary.html
index 5491933..07cb3cc 100644
--- a/templates/languages/language_release_summary.html
+++ b/templates/languages/language_release_summary.html
@@ -1,4 +1,5 @@
{% load i18n stats_extras %}
+{% load url from future %}
{% comment %}
Following variables should be set:
lang : current language
@@ -11,7 +12,7 @@ Following variables should be set:
<th>{% trans "User Interface" %}</th>
<th>{% trans "Graph" %}</th>
<th>{% trans "User Interface (red.)" %}
- <a href="{% url help 'reduced_po' %}"><img src="{{ MEDIA_URL }}img/help.png" alt="help icon" width="26"></a>
+ <a href="{% url 'help' 'reduced_po' %}"><img src="{{ MEDIA_URL }}img/help.png" alt="help icon" width="26"></a>
</th>
<th>{% trans "Documentation" %}</th>
<th>{% trans "Graph" %}</th>
@@ -23,18 +24,18 @@ Following variables should be set:
{{ stat.description }}
</td>
- <td class="stats_numb" title="{% trans "Translated/Fuzzy/Untranslated" %}"><a href="{% url language_release lang.locale,stat.name,"ui" %}">
+ <td class="stats_numb" title="{% trans "Translated/Fuzzy/Untranslated" %}"><a href="{% url 'language_release' lang.locale stat.name "ui" %}">
{{ stat.ui|num_stats }}</a>
</td>
<td style="width: 108px; text-align: center;">
<div class="graph">{{ stat.ui|vis_stats }}</div>
</td>
- <td class="stats_numb" title="{% trans "Translated/Fuzzy/Untranslated" %}"><a href="{% url language_release lang.locale,stat.name,"ui-part" %}">
+ <td class="stats_numb" title="{% trans "Translated/Fuzzy/Untranslated" %}"><a href="{% url 'language_release' lang.locale stat.name "ui-part" %}">
{{ stat.ui_part|num_stats }}</a>
</td>
{% if stat.doc.total %}
- <td class="stats_numb" title="{% trans "Translated/Fuzzy/Untranslated" %}"><a href="{% url language_release lang.locale,stat.name,"doc" %}">
+ <td class="stats_numb" title="{% trans "Translated/Fuzzy/Untranslated" %}"><a href="{% url 'language_release' lang.locale stat.name "doc" %}">
{{ stat.doc|num_stats }}</a>
</td>
<td style="width: 108px; text-align: center;">
@@ -46,8 +47,8 @@ Following variables should be set:
</tr>
{% endfor %}
{% if show_all_modules_line %}
- <tr style="border-top: 1px solid gray;"><td></td><td class="stats_numb"><a href="{% url language_all lang.locale,"ui" %}">{% trans "All modules" %}</a></td>
- <td></td><td class="stats_numb"><a href="{% url language_all lang.locale,"ui-part" %}">{% trans "All modules" %}</a></td>
- <td class="stats_numb"><a href="{% url language_all lang.locale,"doc" %}">{% trans "All modules" %}</a></td><td></td></tr>
+ <tr style="border-top: 1px solid gray;"><td></td><td class="stats_numb"><a href="{% url 'language_all' lang.locale "ui" %}">{% trans "All modules" %}</a></td>
+ <td></td><td class="stats_numb"><a href="{% url 'language_all' lang.locale "ui-part" %}">{% trans "All modules" %}</a></td>
+ <td class="stats_numb"><a href="{% url 'language_all' lang.locale "doc" %}">{% trans "All modules" %}</a></td><td></td></tr>
{% endif %}
</table>
diff --git a/templates/people/person_base.html b/templates/people/person_base.html
index e0602af..8469f87 100644
--- a/templates/people/person_base.html
+++ b/templates/people/person_base.html
@@ -1,6 +1,6 @@
{% extends "base.html" %}
-{% load i18n %}
-{% load stats_extras %}
+{% load i18n stats_extras %}
+{% load url from future %}
{% block title %}{% trans "GNOME Contributor" %}{% endblock %}
@@ -9,9 +9,9 @@
{% if on_own_page %}
<div class="right_actions">
<ul>
- <li><a href="{% url person_detail_change %}">{% trans "Change your details" %}</a></li>
- <li><a href="{% url person_password_change %}">{% trans "Change your password" %}</a></li>
- <li><a href="{% url person_team_join %}">{% trans "Join a team" %}</a></li>
+ <li><a href="{% url 'person_detail_change' %}">{% trans "Change your details" %}</a></li>
+ <li><a href="{% url 'person_password_change' %}">{% trans "Change your password" %}</a></li>
+ <li><a href="{% url 'person_team_join' %}">{% trans "Join a team" %}</a></li>
</ul>
</div>
{% endif %}
diff --git a/templates/people/person_team_membership.html b/templates/people/person_team_membership.html
index 9d71d54..8673085 100644
--- a/templates/people/person_team_membership.html
+++ b/templates/people/person_team_membership.html
@@ -1,5 +1,6 @@
{% load i18n %}
{% load stats_extras %}
+{% load url from future %}
{% if person.role_set.all %}
<h2>{% trans "Team membership" %}</h2>
@@ -8,7 +9,7 @@
{% with role.get_role_display as role_name %}
<li>{% blocktrans with role.team|linked_with:role.team.get_description|safe as team_name %}Member of {{ team_name }} team ({{ role_name }}){% endblocktrans %}
{% if on_own_page %}
- <form class="inline" method="GET" action="{% url person_team_leave role.team.name %}">
+ <form class="inline" method="GET" action="{% url 'person_team_leave' role.team.name %}">
<input type="submit" value="{% trans "Leave" %}"
onClick="javascript:return confirm('{% trans "Are you sure you want to leave the team?" %}')">
</form>
diff --git a/templates/release_detail.html b/templates/release_detail.html
index 7bb7802..cce523b 100644
--- a/templates/release_detail.html
+++ b/templates/release_detail.html
@@ -1,5 +1,6 @@
{% extends "base.html" %}
{% load i18n stats_extras %}
+{% load url from future %}
{% block title %} {% trans release.description %} {% endblock %}
@@ -21,7 +22,7 @@
<th>{% trans "User Interface" %}</th>
<th>{% trans "Graph" %}</th>
<th>{% trans "User Interface (red.)" %}
- <a href="{% url help 'reduced_po' %}"><img src="{{ MEDIA_URL }}img/help.png" alt="help icon" width="26"></a>
+ <a href="{% url 'help' 'reduced_po' %}"><img src="{{ MEDIA_URL }}img/help.png" alt="help icon" width="26"></a>
</th>
<th>{% trans "Documentation" %}</th>
<th>{% trans "Graph" %}</th>
@@ -32,7 +33,7 @@
<tr>
<td class="counter">{{ forloop.counter }}</td>
<td class="leftcell">
- <a href="{% url team_slug lstats.lang_locale %}">
+ <a href="{% url 'team_slug' lstats.lang_locale %}">
{% if user_language.locale == lstats.lang_locale %}
<b>{% trans lstats.lang_name %}</b>
{% else %}
@@ -41,18 +42,18 @@
</a>
</td>
- <td class="stats_numb"><a href="{% url language_release lstats.lang_locale release.name "ui" %}">
+ <td class="stats_numb"><a href="{% url 'language_release' lstats.lang_locale release.name "ui" %}">
{{ lstats.ui|num_stats }}</a>
</td>
<td style="width: 108px; text-align: center;">
<div class="graph">{{ lstats.ui|vis_stats }}</div>
</td>
- <td class="stats_numb"><a href="{% url language_release lstats.lang_locale release.name "ui-part" %}">
+ <td class="stats_numb"><a href="{% url 'language_release' lstats.lang_locale release.name "ui-part" %}">
{{ lstats.ui_part|num_stats }}</a>
</td>
{% if lstats.doc.translated|add:lstats.doc.fuzzy != "0" %}
- <td class="stats_numb"><a href="{% url language_release lstats.lang_locale release.name "doc" %}">
+ <td class="stats_numb"><a href="{% url 'language_release' lstats.lang_locale release.name "doc" %}">
{{ lstats.doc|num_stats }}</a>
</td>
{% else %}
@@ -68,8 +69,8 @@
<tr><td class="counter"><td colspan="6"><hr></td></tr>
<tr><td class="counter"></td>
<td class="leftcell"><i><small>{% trans "Original strings" %}</small></i></td>
- <td colspan="3"><i><small><a href="{% url language_release "C" release.name "ui" %}">{% trans "User Interface" %}</a></small></i></td>
- <td colspan="2"><i><small><a href="{% url language_release "C" release.name "doc" %}">{% trans "Documentation" %}</a></small></i></td>
+ <td colspan="3"><i><small><a href="{% url 'language_release' "C" release.name "ui" %}">{% trans "User Interface" %}</a></small></i></td>
+ <td colspan="2"><i><small><a href="{% url 'language_release' "C" release.name "doc" %}">{% trans "Documentation" %}</a></small></i></td>
</tr>
</table>
diff --git a/templates/release_list.html b/templates/release_list.html
index e0681a9..eb395d6 100644
--- a/templates/release_list.html
+++ b/templates/release_list.html
@@ -1,5 +1,6 @@
{% extends "base.html" %}
{% load i18n %}
+{% load url from future %}
{% block title %} {% trans "GNOME Releases" %} {% endblock %}
@@ -19,7 +20,7 @@
{% endif %}
{% endifchanged %}
<li>
- <a href="{% url stats.views.release rel.name %}">{% trans rel.description %}</a>
+ <a href="{% url 'release' rel.name %}">{% trans rel.description %}</a>
</li>
{% endfor %}
</ul>
@@ -34,7 +35,7 @@
{% endif %}
{% endifchanged %}
<li>
- <a href="{% url stats.views.release rel.name %}">{% trans rel.description %}</a>
+ <a href="{% url 'release' rel.name %}">{% trans rel.description %}</a>
</li>
{% endfor %}
</ul>
diff --git a/templates/stats_show.html b/templates/stats_show.html
index 4ca3efa..bc9a7a9 100644
--- a/templates/stats_show.html
+++ b/templates/stats_show.html
@@ -1,4 +1,5 @@
{% load i18n stats_extras %}
+{% load url from future %}
{% for dname, stat in stats.items %}
{% with stat|first as pot_stat %}
@@ -55,7 +56,7 @@
{% if not forloop.first %}
<tr>
<td class="leftcell">
- <a href="{% url vertimus_by_names module.name,branch.name,pot_stat.domain.name,line.language.locale %}">
+ <a href="{% url 'vertimus_by_names' module.name branch.name pot_stat.domain.name line.language.locale %}">
{% if user_language.locale == line.language.locale %}
<b>{{ line.get_lang }}</b>
{% else %}
@@ -70,7 +71,7 @@
</td>
<td>{{ line|num_stats }}</td>
{% if pot_stat.full_po.fig_count %}
- <td><a href="{% url stats.views.docimages module_name=module.name,potbase=pot_stat.domain.name,branch_name=branch.name,langcode=line.language.locale %}">
+ <td><a href="{% url 'docimages' module.name pot_stat.domain.name branch.name line.language.locale %}">
<img src="{{ MEDIA_URL }}img/figure.png" alt="{% trans "Display document figures" %}"></a>
</td>
{% endif %}
diff --git a/templates/teams/team_base.html b/templates/teams/team_base.html
index e06b3fd..cd49ae4 100644
--- a/templates/teams/team_base.html
+++ b/templates/teams/team_base.html
@@ -1,11 +1,12 @@
{# Variables 'team' and 'language' must be defined prior to calling this template #}
{% load i18n %}
+{% load url from future %}
{% with team.get_description as lang %}
<table width="100%"><tr><td valign="top" width="50%">
<h2>{% trans "Details" %}
- {% if can_edit_details %}<a href="{% url team_edit team.name %}">
+ {% if can_edit_details %}<a href="{% url 'team_edit' team.name %}">
<img src="{{ MEDIA_URL }}img/edit_small.png" alt="Edit"/></a>
{% endif %}
</h2>
diff --git a/templates/teams/team_detail.html b/templates/teams/team_detail.html
index fdd86ff..ada7908 100644
--- a/templates/teams/team_detail.html
+++ b/templates/teams/team_detail.html
@@ -1,7 +1,7 @@
{% extends "base.html" %}
-{% load i18n %}
-{% load stats_extras %}
-{% load markup %}
+{% load i18n stats_extras markup %}
+{% load url from future %}
+
{% block extrahead %}
<link rel="alternate" type="application/rss+xml"
title="{% blocktrans with team.get_description as lang %}Last actions made by the {{ lang }} team of the GNOME Translation Project{% endblocktrans %}"
@@ -54,7 +54,7 @@ $(document).ready(function() {
{% include "languages/language_release_summary.html" %}
{% endwith %}
{% if user.is_authenticated %}
- <div class="float_right"><a href="{% url activity_by_language lang.locale %}">{% trans "Current activities" %}</a></div>
+ <div class="float_right"><a href="{% url 'activity_by_language' lang.locale %}">{% trans "Current activities" %}</a></div>
{% endif %}
<div><strong>{% trans "Plural forms:" %}</strong> {{ lang.get_plurals }}</div>
diff --git a/templates/vertimus/vertimus_detail.html b/templates/vertimus/vertimus_detail.html
index b5a9efe..c47b4b5 100644
--- a/templates/vertimus/vertimus_detail.html
+++ b/templates/vertimus/vertimus_detail.html
@@ -1,7 +1,6 @@
{% extends "base.html" %}
-{% load i18n %}
-{% load humanize %}
-{% load stats_extras %}
+{% load i18n humanize stats_extras %}
+{% load url from future %}
{% block title %}
{% blocktrans with module.get_description as name %}Module Translation: {{ name }}{% endblocktrans %}
@@ -27,7 +26,7 @@ $(document).ready(function() {
{% if releases %}
<p><em>{% trans "Used in release(s):" %}</em><br />
{% for release in releases %}
- <a href="{% url languages.views.language_release language.locale,release.name,domain.dtype %}">
+ <a href="{% url 'language_release' language.locale release.name domain.dtype %}">
{% trans release.description %}
</a><br/>
{% endfor %}
@@ -36,8 +35,8 @@ $(document).ready(function() {
{% endwith %}
<h1>
-<a href="{% url stats.views.module module.name %}">{{ module.get_description }}</a>
-Â {{ branch.name }} Â {{ language.get_name }}
+<a href="{% url 'module' module.name %}">{{ module.get_description }}</a>
+Â {{ branch.name }} Â <a href="{{ language.get_team_url }}">{{ language.get_name }}</a>
</h1>
<p>{{ domain.get_description }}</p>
@@ -81,7 +80,7 @@ $(document).ready(function() {
<a href="{{ po_url_reduced }}"><img src="{{ MEDIA_URL }}img/download.png" alt="{% trans "Download PO file" %}" /></a>
{% trans "PO file statistics (reduced):" %}
<div style="display: inline-block;">
- <span class="help_link"><a href="{% url help 'reduced_po' %}">
+ <span class="help_link"><a href="{% url 'help' 'reduced_po' %}">
<img src="{{ MEDIA_URL }}img/help.png" alt="help icon" width="26">
</a></span>
</div>
@@ -98,7 +97,7 @@ $(document).ready(function() {
{% endif %}
{% if fig_stats and stats.language %}
<div class="docimages">
- {% url stats.views.docimages module_name=module.name,potbase=stats.domain.name,branch_name=branch.name,langcode=stats.language.locale as img_url %}
+ {% url 'docimages' module.name stats.domain.name branch.name stats.language.locale as img_url %}
{% blocktrans with stats=fig_stats|num_stats count total=fig_stats.total %} including <a href="{{ img_url }}">{{ stats }} image</a>{% plural %} including <a href="{{ img_url }}">{{ stats }} images</a>{% endblocktrans %}
</div>
{% endif %}
@@ -121,7 +120,7 @@ $(document).ready(function() {
<img src="{{ MEDIA_URL }}img/warn.png" alt="Warning logo" />
{% trans "On-going activities in same module:" %}
{% for st in other_states %}
- <a href="{% url vertimus_by_ids st.branch.pk,st.domain.pk,st.language.pk %}">{{ st.branch.name }}</a>
+ <a href="{% url 'vertimus_by_ids' st.branch.pk st.domain.pk st.language.pk %}">{{ st.branch.name }}</a>
{% endfor %}
</div>
{% endif %}
@@ -136,12 +135,12 @@ $(document).ready(function() {
which should be localized in Django itself
{% endcomment %}
{% blocktrans with level|ordinal|safe as human_level %}Archived Actions ({{ human_level }} archived series){% endblocktrans %}
- <a href="{% url vertimus_by_names module.name,branch.name,domain.name,language.locale %}">
+ <a href="{% url 'vertimus_by_names' module.name branch.name domain.name language.locale %}">
{% trans "(Return to current actions)" %}
</a>
{% endif %}
{% if grandparent_level %}
- <a href="{% url vertimus_archives_by_names module.name,branch.name,domain.name,language.locale,grandparent_level %}">
+ <a href="{% url 'vertimus_archives_by_names' module.name branch.name domain.name language.locale grandparent_level %}">
{% trans "(Previous action history)" %}
</a>
{% endif %}
@@ -177,7 +176,7 @@ $(document).ready(function() {
{% endif %}
<div class="right_actions">{% trans "diff with:" %}
{% for f in files %}
- <a href="{% url vertimus_diff action.id,f.action_id,level %}" title="{{ f.title }}">[{{ forloop.revcounter }}]</a>
+ <a href="{% url 'vertimus_diff' action.id f.action_id level %}" title="{{ f.title }}">[{{ forloop.revcounter }}]</a>
{% endfor %}
</div>
{% endif %}
@@ -202,7 +201,7 @@ $(document).ready(function() {
{% if action_form %}
<form enctype="multipart/form-data"
- action="{% url vertimus_by_stats_id stats.id,language.id %}"
+ action="{% url 'vertimus_by_stats_id' stats.id language.id %}"
method="POST">
<table class="djform">
{% for field in action_form %}
@@ -215,7 +214,7 @@ $(document).ready(function() {
</table>
</form>
{% else %}
- {% url login as login_url %}
+ {% url 'login' as login_url %}
{% blocktrans with team_name=language.team.get_description %}You need <a href="{{ login_url }}">to be authenticated</a> and member of the {{ team_name }} team.{% endblocktrans %}
{% endif %}
{% endif %}
diff --git a/templates/vertimus/vertimus_diff.html b/templates/vertimus/vertimus_diff.html
index 593b4bc..4e35d32 100644
--- a/templates/vertimus/vertimus_diff.html
+++ b/templates/vertimus/vertimus_diff.html
@@ -1,5 +1,6 @@
{% extends "base.html" %}
{% load i18n %}
+{% load url from future %}
{% block title %}
{% trans "Diff between po files" %}
@@ -13,7 +14,7 @@
<div class="mainpage">
<h1>{{ state.branch.module.get_description }} - {{ state.branch.name }} - {{ state.domain.get_description }} - {{ state.language.get_name }}</h1>
-<p><a href="{% url vertimus_by_names state.branch.module.name,state.branch.name,state.domain.name,state.language.locale %}">{% trans "<- Back to actions" %}</a></p>
+<p><a href="{% url 'vertimus_by_names' state.branch.module.name state.branch.name state.domain.name state.language.locale %}">{% trans "<- Back to actions" %}</a></p>
{{ diff_content|safe }}
diff --git a/urls.py b/urls.py
index 039dd36..182cc67 100644
--- a/urls.py
+++ b/urls.py
@@ -70,7 +70,8 @@ urlpatterns += patterns('stats.views',
name = 'dynamic_po'),
url(
regex = r'^module/(?P<module_name>[\w\-\+]+)/$',
- view = 'module'),
+ view = 'module',
+ name = 'module'),
url(
regex = r'^module/(?P<module_name>[\w\-\+]+)/edit/branches/$',
view = 'module_edit_branches'),
@@ -79,14 +80,16 @@ urlpatterns += patterns('stats.views',
view = 'module_branch'),
url(
regex = r'^module/(?P<module_name>[\w\-\+]+)/(?P<potbase>[\w~-]+)/(?P<branch_name>[\w\-\.]+)/(?P<langcode>[\w ]+)/images/$',
- view = 'docimages'),
+ view = 'docimages',
+ name = 'docimages'),
url(
regex = r'^releases/(?P<format>(html|json|xml))?/?$',
view = 'releases',
name = 'releases'),
url(
regex = r'^releases/(?P<release_name>[\w-]+)/(?P<format>(html|xml))?/?$',
- view = 'release'),
+ view = 'release',
+ name = 'release'),
url(
regex = r'^releases/compare/(?P<dtype>\w+)/(?P<rels_to_compare>[/\w-]+)/$',
view = 'compare_by_releases'),
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]