The following commit has been merged in the master branch:
commit c4499029518490d54311ae2fd2967812a5d81762
Author: Michal Čihař <[email protected]>
Date: Thu Oct 8 11:35:33 2009 +0200
Document phone model in help texts.
diff --git a/locale/cs/LC_MESSAGES/django.po b/locale/cs/LC_MESSAGES/django.po
index 0f1458b..10087ee 100644
--- a/locale/cs/LC_MESSAGES/django.po
+++ b/locale/cs/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Wammu web 2009\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-08 11:21+0200\n"
+"POT-Creation-Date: 2009-10-08 11:35+0200\n"
"PO-Revision-Date: 2009-10-07 14:47+0200\n"
"Last-Translator: Michal Čihař <[email protected]>\n"
"Language-Team: Czech <[email protected]>\n"
@@ -2198,6 +2198,34 @@ msgstr ""
msgid "%(description)s (%(name)s)"
msgstr ""
+#: phonedb/models.py:19
+msgid "Use [at] and [dot]"
+msgstr ""
+
+#: phonedb/models.py:20
+msgid "Display it normally"
+msgstr ""
+
+#: phonedb/models.py:21
+msgid "Don't show email at all"
+msgstr ""
+
+#: phonedb/models.py:22
+msgid "Insert NOSPAM text at random position"
+msgstr ""
+
+#: phonedb/models.py:26
+msgid "Draft"
+msgstr ""
+
+#: phonedb/models.py:27
+msgid "Approved"
+msgstr ""
+
+#: phonedb/models.py:28
+msgid "Deleted"
+msgstr ""
+
#: phonedb/models.py:32
msgid "Phone information"
msgstr "Informace o telefonu"
@@ -2242,6 +2270,36 @@ msgstr "Loga"
msgid "Ringtones"
msgstr "Melodie"
+#: phonedb/models.py:78
+msgid "Phone name, please exclude vendor name."
+msgstr ""
+
+#: phonedb/models.py:80
+msgid "Connection used in Gammu configuration."
+msgstr ""
+
+#: phonedb/models.py:81
+msgid "Features which are working in Gammu."
+msgstr ""
+
+#: phonedb/models.py:82
+msgid "Model used in Gammu configuration, usually empty."
+msgstr ""
+
+#: phonedb/models.py:83
+msgid "Gammu version where you tested this phone."
+msgstr ""
+
+#: phonedb/models.py:84
+msgid ""
+"Any note about this phone and Gammu support for it. You can use <a href="
+"\"http://daringfireball.net/projects/markdown/syntax\";>markdown markup</a>."
+msgstr ""
+
+#: phonedb/models.py:87
+msgid "Please choose how will be email handled in next field."
+msgstr ""
+
#: phonedb/views.py:110
msgid "Gammu Phone Database Feed (RSS)"
msgstr "Databáze telefonů Gammu (RSS)"
diff --git a/locale/de/LC_MESSAGES/django.po b/locale/de/LC_MESSAGES/django.po
index e9bf077..0e91c17 100644
--- a/locale/de/LC_MESSAGES/django.po
+++ b/locale/de/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-08 11:21+0200\n"
+"POT-Creation-Date: 2009-10-08 11:35+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <em...@address>\n"
"Language-Team: LANGUAGE <[email protected]>\n"
@@ -2132,6 +2132,34 @@ msgstr ""
msgid "%(description)s (%(name)s)"
msgstr ""
+#: phonedb/models.py:19
+msgid "Use [at] and [dot]"
+msgstr ""
+
+#: phonedb/models.py:20
+msgid "Display it normally"
+msgstr ""
+
+#: phonedb/models.py:21
+msgid "Don't show email at all"
+msgstr ""
+
+#: phonedb/models.py:22
+msgid "Insert NOSPAM text at random position"
+msgstr ""
+
+#: phonedb/models.py:26
+msgid "Draft"
+msgstr ""
+
+#: phonedb/models.py:27
+msgid "Approved"
+msgstr ""
+
+#: phonedb/models.py:28
+msgid "Deleted"
+msgstr ""
+
#: phonedb/models.py:32
msgid "Phone information"
msgstr ""
@@ -2176,6 +2204,36 @@ msgstr ""
msgid "Ringtones"
msgstr ""
+#: phonedb/models.py:78
+msgid "Phone name, please exclude vendor name."
+msgstr ""
+
+#: phonedb/models.py:80
+msgid "Connection used in Gammu configuration."
+msgstr ""
+
+#: phonedb/models.py:81
+msgid "Features which are working in Gammu."
+msgstr ""
+
+#: phonedb/models.py:82
+msgid "Model used in Gammu configuration, usually empty."
+msgstr ""
+
+#: phonedb/models.py:83
+msgid "Gammu version where you tested this phone."
+msgstr ""
+
+#: phonedb/models.py:84
+msgid ""
+"Any note about this phone and Gammu support for it. You can use <a href="
+"\"http://daringfireball.net/projects/markdown/syntax\";>markdown markup</a>."
+msgstr ""
+
+#: phonedb/models.py:87
+msgid "Please choose how will be email handled in next field."
+msgstr ""
+
#: phonedb/views.py:110
msgid "Gammu Phone Database Feed (RSS)"
msgstr ""
diff --git a/phonedb/models.py b/phonedb/models.py
index abef30f..64e180b 100644
--- a/phonedb/models.py
+++ b/phonedb/models.py
@@ -16,16 +16,16 @@ CONNECTION_CHOICES = (
)
GARBLE_CHOICES = (
- ('atdot', 'atdot'),
- ('none', 'none'),
- ('hide', 'hide'),
- ('nospam', 'nospam'),
+ ('atdot', ugettext_lazy('Use [at] and [dot]')),
+ ('none', ugettext_lazy('Display it normally')),
+ ('hide', ugettext_lazy('Don\'t show email at all')),
+ ('nospam', ugettext_lazy('Insert NOSPAM text at random position')),
)
STATE_CHOICES = (
- ('draft', 'Draft'),
- ('approved', 'Approved'),
- ('deleted', 'Deleted'),
+ ('draft', ugettext_lazy('Draft')),
+ ('approved', ugettext_lazy('Approved')),
+ ('deleted', ugettext_lazy('Deleted')),
)
FEATURE_NAMES = {
@@ -75,16 +75,16 @@ class Connection(models.Model):
return '%s (%s)' % (self.name, self.medium)
class Phone(models.Model):
- name = models.CharField(max_length = 250)
+ name = models.CharField(max_length = 250, help_text = ugettext_lazy('Phone
name, please exclude vendor name.'))
vendor = models.ForeignKey(Vendor)
- connection = models.ForeignKey(Connection, null = True, blank = True)
- features = models.ManyToManyField(Feature, blank = True)
- model = models.CharField(max_length = 100, blank = True)
- gammu_version = models.CharField(max_length = 100, blank = True)
- note = models.TextField(blank = True)
+ connection = models.ForeignKey(Connection, null = True, blank = True,
help_text = ugettext_lazy('Connection used in Gammu configuration.'))
+ features = models.ManyToManyField(Feature, help_text =
ugettext_lazy('Features which are working in Gammu.'), blank = True)
+ model = models.CharField(max_length = 100, blank = True, help_text =
ugettext_lazy('Model used in Gammu configuration, usually empty.'))
+ gammu_version = models.CharField(max_length = 100, blank = True, help_text
= ugettext_lazy('Gammu version where you tested this phone.'))
+ note = models.TextField(blank = True, help_text = ugettext_lazy('Any note
about this phone and Gammu support for it. You can use <a
href="http://daringfireball.net/projects/markdown/syntax";>markdown
markup</a>.'))
note_html = models.TextField(editable = False, blank = True)
author_name = models.CharField(max_length = 250, blank = True)
- author_email = models.EmailField(max_length = 250, blank = True)
+ author_email = models.EmailField(max_length = 250, blank = True, help_text
= ugettext_lazy('Please choose how will be email handled in next field.'))
email_garble = models.CharField(max_length = 100, choices =
GARBLE_CHOICES, default = 'atdot')
state = models.CharField(max_length = 100, choices = STATE_CHOICES,
db_index = True, default = 'draft')
created = models.DateTimeField(auto_now_add = True)
--
UNNAMED PROJECT
_______________________________________________
Wammu-svn mailing list
[email protected]
https://lists.cihar.com/cgi-bin/mailman/listinfo/wammu-svn
