damned-lies r1270 - in trunk: . people teams templates/languages templates/people templates/vertimus vertimus

[claudep svn gnome org]

Author: claudep
Date: Tue Dec 30 12:41:41 2008
New Revision: 1270
URL: http://svn.gnome.org/viewvc/damned-lies?rev=1270&view=rev

Log:
2008-12-30  Claude Paroz  <claude 2xlibre net>

	* people/urls.py: 
	* templates/people/person_detail.html: Fix edit link, translate team
	description.
	* templates/languages/language_release_stats.html: Get translated state
	name.
	* templates/vertimus/vertimus_detail.html: No need of language for
	release link.
	* teams/models.py: Translate ROLE_CHOICES.
	* vertimus/forms.py: Separate test for extension validation.
	* vertimus/models.py: ugettext should be used in functions.

Modified:
   trunk/ChangeLog
   trunk/people/urls.py
   trunk/teams/models.py
   trunk/templates/languages/language_release_stats.html
   trunk/templates/people/person_detail.html
   trunk/templates/vertimus/vertimus_detail.html
   trunk/vertimus/forms.py
   trunk/vertimus/models.py

Modified: trunk/people/urls.py
==============================================================================
--- trunk/people/urls.py	(original)
+++ trunk/people/urls.py	Tue Dec 30 12:41:41 2008
@@ -14,5 +14,5 @@
     url(r'^(?P<object_id>\d+)/$', 'people.views.person_detail_from_id', name='person_from_id'),
     # equivalent to the previous, but using username instead of user pk
     url(r'^(?P<slug>[\w \ \-]+)/$', 'people.views.person_detail_from_username', name='person'),
-    url(r'^(?P<slug>[\w \ \-]+)/edit$', 'people.views.person_detail_from_username', {'edit_profile': True}, name='person_edit'),
+    url(r'^(?P<slug>[\w \ \-]+)/edit/$', 'people.views.person_detail_from_username', {'edit_profile': True}, name='person_edit'),
 )

Modified: trunk/teams/models.py
==============================================================================
--- trunk/teams/models.py	(original)
+++ trunk/teams/models.py	Tue Dec 30 12:41:41 2008
@@ -20,7 +20,7 @@
 
 from django.db import models
 from django.contrib.auth.models import Group
-from django.utils.translation import ugettext as _
+from django.utils.translation import ugettext_lazy, ugettext as _
 from people.models import Person
 
 class TeamManager(models.Manager):
@@ -127,9 +127,9 @@
 
 
 ROLE_CHOICES = (
-    ('translator', 'Translator'),
-    ('reviewer', 'Reviewer'),
-    ('committer', 'Committer'),
+    ('translator', ugettext_lazy('Translator')),
+    ('reviewer', ugettext_lazy('Reviewer')),
+    ('committer', ugettext_lazy('Committer')),
 )
 
 class Role(models.Model):

Modified: trunk/templates/languages/language_release_stats.html
==============================================================================
--- trunk/templates/languages/language_release_stats.html	(original)
+++ trunk/templates/languages/language_release_stats.html	Tue Dec 30 12:41:41 2008
@@ -64,7 +64,7 @@
            <td>
            {% if dom.1.state.name %}
              {% ifnotequal dom.1.state.name "None" %}
-             <em><small>{{ dom.1.state.name }} - {{ dom.1.state.updated|date:"Y-m-d" }}</small></em>
+             <em><small>{{ dom.1.state.get_state }} - {{ dom.1.state.updated|date:"Y-m-d" }}</small></em>
              {% endifnotequal %}
            {% endif %}
            </td>

Modified: trunk/templates/people/person_detail.html
==============================================================================
--- trunk/templates/people/person_detail.html	(original)
+++ trunk/templates/people/person_detail.html	Tue Dec 30 12:41:41 2008
@@ -12,7 +12,7 @@
       <div class="right_actions">
         {% include "logout_form.html" %}<br />
         {% if not profile_form %}
-        <a href="{% url people.views.person_detail_from_username slug=person.username %}edit">
+        <a href="{% url person_edit slug=person.username %}">
           <img src="/media/img/edit.png" alt="{% trans "Edit" %}" title="{% trans "Edit" %}" /></a>
         {% endif %}
       </div>
@@ -46,7 +46,7 @@
     <ul>
     {% for role in person.role_set.all %}
       {% with role.role as role_name %}
-      <li>{% blocktrans with role.team|linked_with:role.team.description|safe as team_name %}Member of {{ team_name }} team ({{ role_name }}){% endblocktrans %}
+      <li>{% blocktrans with role.team|linked_with:role.team.get_description|safe as team_name %}Member of {{ team_name }} team ({{ role_name }}){% endblocktrans %}
       </li>
       {% endwith %}
     {% endfor %}

Modified: trunk/templates/vertimus/vertimus_detail.html
==============================================================================
--- trunk/templates/vertimus/vertimus_detail.html	(original)
+++ trunk/templates/vertimus/vertimus_detail.html	Tue Dec 30 12:41:41 2008
@@ -12,7 +12,7 @@
 {% 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 %}">{% trans release.description %} - {{ language.get_name }}</a><br />
+  <a href="{% url languages.views.language_release language.locale, release.name, domain.dtype %}">{% trans release.description %}</a><br />
   {% endfor %}
 {% else %}
   <a href="{% url stats.views.module module.name %}">{{ module.get_description }}</a>

Modified: trunk/vertimus/forms.py
==============================================================================
--- trunk/vertimus/forms.py	(original)
+++ trunk/vertimus/forms.py	Tue Dec 30 12:41:41 2008
@@ -45,11 +45,13 @@
         data = self.cleaned_data['file']
         if data:
             ext = os.path.splitext(data.name)[1]
+            if ext not in ('.po', '.gz', '.bz2', '.png'):
+                raise forms.ValidationError(_("Only files with extension .po, .gz, .bz2 or .png are admitted."))
             # If this is a .po file, check validity (msgfmt)
-            if ext in ('.po', '.gz', '.bz2', '.png'):
+            if ext == '.po':
                 res = po_file_stats(data)
                 if res['errors']:
-                    raise forms.ValidationError(".po file does not pass 'msgfmt -vc'. Please correct the file and try again.")
+                    raise forms.ValidationError(_(".po file does not pass 'msgfmt -vc'. Please correct the file and try again."))
         return data
 
     def clean(self):

Modified: trunk/vertimus/models.py
==============================================================================
--- trunk/vertimus/models.py	(original)
+++ trunk/vertimus/models.py	Tue Dec 30 12:41:41 2008
@@ -22,7 +22,7 @@
 
 from datetime import datetime
 from django.db import models
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import ugettext, ugettext_lazy as _
 from django.core import mail, urlresolvers
 from django.contrib.sites.models import Site
 from django.conf import settings
@@ -364,8 +364,8 @@
                 'new_state': new_state, 
                 'url': url
             }
-            message += self.comment or _("Without comment")
-            message += "\n" + self.person.name
+            message += self.comment or ugettext("Without comment")
+            message += "\n\n" + self.person.name
             mail.send_mail(subject, message, self.person.email, recipient_list)
 
 class ActionWC(ActionAbstract):
@@ -409,7 +409,7 @@
                 'language': state.language.name, 
                 'url': url
             }
-            message += comment or _("Without comment")
+            message += comment or ugettext("Without comment")
             message += "\n" + person.name
             mail.send_mail(subject, message, person.email, translator_emails)