Skip to content

Commit a59927f

Browse files
committedDec 20, 2013
Added more improvements about i18n and Spanish l10n
1 parent 3f77cd2 commit a59927f

File tree

9 files changed

+1190
-34
lines changed

9 files changed

+1190
-34
lines changed
 

‎src/badger/models.py

+2
Original file line numberDiff line numberDiff line change
@@ -80,5 +80,7 @@ def __unicode__(self):
8080

8181
class BadgeI18N(I18nModel):
8282
class Meta:
83+
verbose_name = _(u'Badge I18N')
84+
verbose_name_plural = _(u'Badges I18N')
8385
source_model = Badge
8486
translation_fields = ('title', 'description')

‎src/locale/es/LC_MESSAGES/django.mo

16.1 KB
Binary file not shown.

‎src/locale/es/LC_MESSAGES/django.po

+1,057
Large diffs are not rendered by default.
0 Bytes
Binary file not shown.

‎src/locale/pt_BR/LC_MESSAGES/django.po

+96-18
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ msgid ""
77
msgstr ""
88
"Project-Id-Version: PACKAGE VERSION\n"
99
"Report-Msgid-Bugs-To: \n"
10-
"POT-Creation-Date: 2013-12-05 18:14+0000\n"
10+
"POT-Creation-Date: 2013-12-14 22:56+0000\n"
1111
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
1212
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
1313
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -288,7 +288,7 @@ msgstr "Automaticamente"
288288
msgid "Manual"
289289
msgstr "Manual"
290290

291-
#: badger/models.py:22 super_archives/models.py:258
291+
#: badger/models.py:22 super_archives/models.py:277
292292
msgid "Messages"
293293
msgstr "Mensagens"
294294

@@ -341,6 +341,16 @@ msgstr "Ordem"
341341
msgid "Badge"
342342
msgstr "Medalha"
343343

344+
#: badger/models.py:83
345+
#, fuzzy
346+
msgid "Badge I18N"
347+
msgstr "Medalha"
348+
349+
#: badger/models.py:84
350+
#, fuzzy
351+
msgid "Badges I18N"
352+
msgstr "Medalhas"
353+
344354
#: colab/custom_settings.py:9
345355
msgid "English"
346356
msgstr "Inglês"
@@ -385,11 +395,11 @@ msgstr "Compactado"
385395
msgid "Spreadsheet"
386396
msgstr "Planilha"
387397

388-
#: colab/custom_settings.py:265
398+
#: colab/custom_settings.py:268
389399
msgid "Planet Colab"
390400
msgstr ""
391401

392-
#: colab/custom_settings.py:266
402+
#: colab/custom_settings.py:269
393403
msgid "Colab blog aggregator"
394404
msgstr "Agregador de blog Colab"
395405

@@ -592,6 +602,7 @@ msgid "Changeset"
592602
msgstr "Conjunto de Mudanças"
593603

594604
#: search/views.py:95 search/templates/search/includes/search_filters.html:132
605+
#: super_archives/models.py:44
595606
msgid "User"
596607
msgstr "Usuário"
597608

@@ -646,61 +657,128 @@ msgstr "Ordenar por"
646657
msgid "Types"
647658
msgstr "Tipos"
648659

649-
#: super_archives/models.py:62
660+
#: super_archives/models.py:45
661+
msgid "Select an User from list"
662+
msgstr ""
663+
664+
#: super_archives/models.py:47 super_archives/models.py:57
665+
#, fuzzy
666+
msgid "Email Address"
667+
msgstr "Endereço de e-mail verificado!"
668+
669+
#: super_archives/models.py:48
670+
#, fuzzy
671+
msgid "Enter a Email Address"
672+
msgstr "Adicionar outro endereço de e-mail"
673+
674+
#: super_archives/models.py:50
675+
msgid "Real name"
676+
msgstr ""
677+
678+
#: super_archives/models.py:51
679+
msgid "Enter an User's real name"
680+
msgstr ""
681+
682+
#: super_archives/models.py:53
683+
msgid "MD5"
684+
msgstr ""
685+
686+
#: super_archives/models.py:54
687+
msgid "Enter a MD5 Sum"
688+
msgstr ""
689+
690+
#: super_archives/models.py:58
691+
#, fuzzy
692+
msgid "Email Addresses"
693+
msgstr "Endereço de e-mail verificado!"
694+
695+
#: super_archives/models.py:72
650696
#: super_archives/templates/message-preview.html:62
651697
#: super_archives/templates/message-thread.html:4
652698
msgid "Anonymous"
653699
msgstr "Anônimo"
654700

655-
#: super_archives/models.py:112
701+
#: super_archives/models.py:121
702+
#, fuzzy
703+
msgid "Subject token"
704+
msgstr "Assunto"
705+
706+
#: super_archives/models.py:123
656707
msgid "Mailing List"
657708
msgstr "Lista de e-mail"
658709

659-
#: super_archives/models.py:113
710+
#: super_archives/models.py:124
660711
msgid "The Mailing List where is the thread"
661712
msgstr "A lista de e-mail onde estão as mensagens"
662713

663-
#: super_archives/models.py:116
714+
#: super_archives/models.py:127
664715
msgid "Latest message"
665716
msgstr "Última mensagem"
666717

667-
#: super_archives/models.py:117
718+
#: super_archives/models.py:128
668719
msgid "Latest message posted"
669720
msgstr "Última mensagem postada"
670721

671-
#: super_archives/models.py:118
722+
#: super_archives/models.py:129
672723
msgid "Score"
673724
msgstr "Pontuação"
674725

675-
#: super_archives/models.py:118
726+
#: super_archives/models.py:129
676727
msgid "Thread score"
677728
msgstr "Pontuação do conjunto de mensagens"
678729

679-
#: super_archives/models.py:127
730+
#: super_archives/models.py:131 super_archives/models.py:269
731+
msgid "is SPAM?"
732+
msgstr ""
733+
734+
#: super_archives/models.py:139 super_archives/models.py:251
680735
msgid "Thread"
681736
msgstr "Conjunto de mensagens"
682737

683-
#: super_archives/models.py:128
738+
#: super_archives/models.py:140
684739
msgid "Threads"
685740
msgstr "Conjuntos de mensagens"
686741

687-
#: super_archives/models.py:242
742+
#: super_archives/models.py:249
743+
msgid "From address"
744+
msgstr ""
745+
746+
#: super_archives/models.py:256
688747
msgid "Subject"
689748
msgstr "Assunto"
690749

691-
#: super_archives/models.py:243
750+
#: super_archives/models.py:257
692751
msgid "Please enter a message subject"
693752
msgstr "Por favor, digite o assunto da mensagem"
694753

695-
#: super_archives/models.py:246
754+
#: super_archives/models.py:259
755+
#, fuzzy
756+
msgid "Subject clean"
757+
msgstr "Assunto"
758+
759+
#: super_archives/models.py:261
696760
msgid "Message body"
697761
msgstr "Corpo da mensagem"
698762

699-
#: super_archives/models.py:247
763+
#: super_archives/models.py:262
700764
msgid "Please enter a message body"
701765
msgstr "Por favor, digite o corpo da mensagem"
702766

703-
#: super_archives/models.py:257
767+
#: super_archives/models.py:264
768+
msgid "Received time"
769+
msgstr ""
770+
771+
#: super_archives/models.py:265
772+
#, fuzzy
773+
msgid "Please enter a Received time"
774+
msgstr "Por favor, digite o assunto da mensagem"
775+
776+
#: super_archives/models.py:267
777+
#, fuzzy
778+
msgid "Message id"
779+
msgstr "Mensagem"
780+
781+
#: super_archives/models.py:276
704782
msgid "Message"
705783
msgstr "Mensagem"
706784

1.76 KB
Binary file not shown.

‎src/planet/locale/es/LC_MESSAGES/django.po

+2-2
Original file line numberDiff line numberDiff line change
@@ -96,8 +96,8 @@ msgstr "Solicite la inclusión de un blog"
9696
#: templates/feedzilla/tag.html:5
9797
#, python-format
9898
msgid "Posts with &laquo;%(tag)s&raquo; label"
99-
msgstr "Envíos con etiqueta &laquo;%(tag)s&raquo;"
99+
msgstr "Mensajes con etiqueta &laquo;%(tag)s&raquo;"
100100

101101
#: templates/feedzilla/tag.html:14
102102
msgid "No posts with such label"
103-
msgstr "No hay envíos con dicha etiqueta"
103+
msgstr "No hay mensajes con dicha etiqueta"
Binary file not shown.

‎src/super_archives/models.py

+33-14
Original file line numberDiff line numberDiff line change
@@ -37,15 +37,25 @@ class EmailAddressValidation(models.Model):
3737
class Meta:
3838
unique_together = ('user', 'address')
3939

40-
4140
class EmailAddress(models.Model):
42-
user = models.ForeignKey(User, null=True, related_name='emails',
43-
on_delete=models.SET_NULL)
44-
address = models.EmailField(unique=True)
45-
real_name = models.CharField(max_length=64, blank=True, db_index=True)
46-
md5 = models.CharField(max_length=32, null=True)
41+
user = models.ForeignKey(User,
42+
null=True, related_name='emails',
43+
on_delete=models.SET_NULL,
44+
verbose_name=_(u"User"),
45+
help_text=_(u"Select an User from list"))
46+
address = models.EmailField(unique=True,
47+
verbose_name=_(u"Email Address"),
48+
help_text=_(u"Enter a Email Address"))
49+
real_name = models.CharField(max_length=64, blank=True, db_index=True,
50+
verbose_name=_(u"Real name"),
51+
help_text=_(u"Enter an User's real name"))
52+
md5 = models.CharField(max_length=32, null=True,
53+
verbose_name=_(u"MD5"),
54+
help_text=_(u"Enter a MD5 Sum"))
4755

4856
class Meta:
57+
verbose_name = _(u"Email Address")
58+
verbose_name_plural = _(u"Email Addresses")
4959
ordering = ('id', )
5060

5161
def save(self, *args, **kwargs):
@@ -107,7 +117,8 @@ def __unicode__(self):
107117

108118
class Thread(models.Model, HitCounterModelMixin):
109119

110-
subject_token = models.CharField(max_length=512)
120+
subject_token = models.CharField(max_length=512,
121+
verbose_name=_(u"Subject token"))
111122
mailinglist = models.ForeignKey(MailingList,
112123
verbose_name=_(u"Mailing List"),
113124
help_text=_(u"The Mailing List where is the thread"))
@@ -116,7 +127,8 @@ class Thread(models.Model, HitCounterModelMixin):
116127
verbose_name=_(u"Latest message"),
117128
help_text=_(u"Latest message posted"))
118129
score = models.IntegerField(default=0, verbose_name=_(u"Score"), help_text=_(u"Thread score"))
119-
spam = models.BooleanField(default=False)
130+
spam = models.BooleanField(default=False,
131+
verbose_name=_(u"is SPAM?"))
120132

121133
highest_score = HighestScore()
122134
all_objects = models.Manager()
@@ -233,21 +245,28 @@ def __unicode__(self):
233245

234246
class Message(models.Model):
235247

236-
from_address = models.ForeignKey(EmailAddress, db_index=True)
237-
thread = models.ForeignKey(Thread, null=True, db_index=True)
248+
from_address = models.ForeignKey(EmailAddress, db_index=True,
249+
verbose_name=_(u"From address"))
250+
thread = models.ForeignKey(Thread, null=True, db_index=True,
251+
verbose_name=_(u"Thread"))
238252
# RFC 2822 recommends to use 78 chars + CRLF (so 80 chars) for
239253
# the max_length of a subject but most of implementations
240254
# goes for 256. We use 512 just in case.
241255
subject = models.CharField(max_length=512, db_index=True,
242256
verbose_name=_(u"Subject"),
243257
help_text=_(u"Please enter a message subject"))
244-
subject_clean = models.CharField(max_length=512, db_index=True)
258+
subject_clean = models.CharField(max_length=512, db_index=True,
259+
verbose_name=_(u"Subject clean"))
245260
body = models.TextField(default='',
246261
verbose_name=_(u"Message body"),
247262
help_text=_(u"Please enter a message body"))
248-
received_time = models.DateTimeField(db_index=True)
249-
message_id = models.CharField(max_length=512)
250-
spam = models.BooleanField(default=False)
263+
received_time = models.DateTimeField(db_index=True,
264+
verbose_name=_(u"Received time"),
265+
help_text=_(u"Please enter a Received time"))
266+
message_id = models.CharField(max_length=512,
267+
verbose_name=_(u"Message id"))
268+
spam = models.BooleanField(default=False,
269+
verbose_name=_(u"is SPAM?"))
251270

252271
all_objects = models.Manager()
253272
objects = NotSpamManager()

0 commit comments

Comments
 (0)
Please sign in to comment.