Fix a typo and change e-mail -> email

feincms · Dec 1, 2019 · d64de0c · d64de0c
1 parent c313065
commit d64de0c
Show file tree

Hide file tree

Showing 7 changed files with 75 additions and 69 deletions.
diff --git a/form_designer/default_field_types.py b/form_designer/default_field_types.py
@@ -28,7 +28,7 @@ def require_choices(field):
     },
     {
         "type": "email",
-        "verbose_name": _("e-mail address"),
+        "verbose_name": _("email address"),
         "field": forms.EmailField,
         "clean_field": [disallow_choices],
     },

diff --git a/form_designer/locale/cs/LC_MESSAGES/django.mo b/form_designer/locale/cs/LC_MESSAGES/django.mo
diff --git a/form_designer/locale/cs/LC_MESSAGES/django.po b/form_designer/locale/cs/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-12-01 11:55+0100\n"
+"POT-Creation-Date: 2019-12-01 12:18+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -31,15 +31,15 @@ msgstr "Pro nastavení možností klikněte na talčítko uložit."
 msgid "Form configuration: %s"
 msgstr "Konfigurace formuláře: %s"
 
-#: admin.py:147
+#: admin.py:151
 msgid "Configuration"
 msgstr "Konfigurace"
 
 #: apps.py:7
 msgid "Form Designer"
 msgstr "Formuláře"
 
-#: contents.py:20 contents.py:34 models.py:82 models.py:159 models.py:238
+#: contents.py:20 contents.py:34 models.py:93 models.py:179 models.py:258
 msgid "form"
 msgstr "formulář"
 
@@ -55,7 +55,7 @@ msgstr "Zpráva po úspěšném vyplnení"
 msgid "Custom message to display after valid form is submitted"
 msgstr "Vlastní zpráva, která se zobrazí po úspěšném vyplnení"
 
-#: contents.py:35 models.py:83
+#: contents.py:35 models.py:94
 msgid "forms"
 msgstr "formuláře"
 
@@ -74,8 +74,10 @@ msgstr "Nemůžete specifikovat možnosti pro %s pole"
 msgid "text"
 msgstr "text"
 
-#: default_field_types.py:31 models.py:63
-msgid "e-mail address"
+#: default_field_types.py:31 models.py:74
+#, fuzzy
+#| msgid "e-mail address"
+msgid "email address"
 msgstr "emailová adresa"
 
 #: default_field_types.py:37
@@ -106,98 +108,102 @@ msgstr ""
 msgid "recaptcha"
 msgstr ""
 
-#: models.py:40
+#: models.py:42
 msgid "Thank you, your input has been received."
 msgstr "Děkujeme za vyplnění."
 
-#: models.py:52
+#: models.py:55
 msgid "Save form submission"
 msgstr "Uložit vyplený formulář"
 
-#: models.py:52
+#: models.py:57
 msgid ""
 "Save form submissions in the database so that they may be exported later."
 msgstr ""
 
-#: models.py:57
-msgid "Send e-mail"
+#: models.py:66
+#, fuzzy
+#| msgid "Send e-mail"
+msgid "Send email"
 msgstr "Poslat email"
 
-#: models.py:58
+#: models.py:68
 msgid "Send the submitted form data to a list of email addresses."
 msgstr ""
 
-#: models.py:66
-msgid "Separate multiple e-mail addresses with commas."
+#: models.py:77
+#, fuzzy
+#| msgid "Separate multiple e-mail addresses with commas."
+msgid "Separate multiple email addresses with commas."
 msgstr "Více emailových adres oddělte čárkou."
 
-#: models.py:76
+#: models.py:87
 msgid "title"
 msgstr "titulek"
 
-#: models.py:78
+#: models.py:89
 msgid "config"
 msgstr "konfigurace"
 
-#: models.py:161
+#: models.py:181
 msgid "ordering"
 msgstr "řazení"
 
-#: models.py:163
+#: models.py:183
 #, fuzzy
 #| msgid "title"
 msgid "field title"
 msgstr "titulek"
 
-#: models.py:164
+#: models.py:184
 msgid "field name"
 msgstr ""
 
-#: models.py:166
+#: models.py:186
 msgid "field type"
 msgstr ""
 
-#: models.py:171
+#: models.py:191
 msgid "choices"
 msgstr "možnosti"
 
-#: models.py:171
+#: models.py:191
 msgid "Comma-separated"
 msgstr "Oddělené čárkou"
 
-#: models.py:174
+#: models.py:194
 msgid "help text"
 msgstr "nápověda"
 
-#: models.py:177
+#: models.py:197
 msgid "Optional extra explanatory text beside the field"
 msgstr "Volitelně extra vysvětlující text"
 
-#: models.py:180
+#: models.py:200
 msgid "default value"
 msgstr "výchozí hodnota"
 
-#: models.py:183
+#: models.py:203
 msgid "Optional default value of the field"
 msgstr "Volitelně výchozí hodnota položky"
 
-#: models.py:185
+#: models.py:205
 msgid "is required"
 msgstr "je povinný"
 
-#: models.py:190
+#: models.py:210
 msgid "form field"
 msgstr "pole formuláře"
 
-#: models.py:191
+#: models.py:211
 msgid "form fields"
 msgstr "pole formuláře"
 
-#: models.py:247
+#: models.py:267
 msgid "form submission"
 msgstr "uložený formuláře"
 
-#: models.py:248
+#: models.py:268
 msgid "form submissions"
 msgstr "uložené formuláře"
 

diff --git a/form_designer/locale/de/LC_MESSAGES/django.mo b/form_designer/locale/de/LC_MESSAGES/django.mo
diff --git a/form_designer/locale/de/LC_MESSAGES/django.po b/form_designer/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: 2019-12-01 11:55+0100\n"
+"POT-Creation-Date: 2019-12-01 12:18+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -31,15 +31,15 @@ msgstr "Speichern und weiter bearbeiten um die Optionen zu bearbeiten."
 msgid "Form configuration: %s"
 msgstr "Formulareinstellungen: %s"
 
-#: admin.py:147
+#: admin.py:151
 msgid "Configuration"
 msgstr "Einstellungen"
 
 #: apps.py:7
 msgid "Form Designer"
 msgstr "Form-Designer"
 
-#: contents.py:20 contents.py:34 models.py:82 models.py:159 models.py:238
+#: contents.py:20 contents.py:34 models.py:93 models.py:179 models.py:258
 msgid "form"
 msgstr "Formular"
 
@@ -57,7 +57,7 @@ msgstr ""
 "Mitteilung, welche angezeigt wird, wenn ein gültiges Formular abgeschickt "
 "wird"
 
-#: contents.py:35 models.py:83
+#: contents.py:35 models.py:94
 msgid "forms"
 msgstr "Formulare"
 
@@ -75,8 +75,8 @@ msgstr "Bitte geben Sie Wahlmöglichkeiten für %s-Felder an"
 msgid "text"
 msgstr "Text"
 
-#: default_field_types.py:31 models.py:63
-msgid "e-mail address"
+#: default_field_types.py:31 models.py:74
+msgid "email address"
 msgstr "E-Mail-Adresse"
 
 #: default_field_types.py:37
@@ -107,98 +107,98 @@ msgstr "versteckt"
 msgid "recaptcha"
 msgstr "ReCaptcha"
 
-#: models.py:40
+#: models.py:42
 msgid "Thank you, your input has been received."
 msgstr "Vielen Dank"
 
-#: models.py:52
+#: models.py:55
 msgid "Save form submission"
 msgstr "Formulardaten sichern"
 
-#: models.py:52
+#: models.py:57
 msgid ""
 "Save form submissions in the database so that they may be exported later."
 msgstr ""
-"Speichert die Formulardaten in er Datenbank, so dass sie später exportiert"
-" werden können."
+"Speichert die Formulardaten in der Datenbank, so dass sie später exportiert "
+"werden können."
 
-#: models.py:57
-msgid "Send e-mail"
+#: models.py:66
+msgid "Send email"
 msgstr "E-Mail versenden"
 
-#: models.py:58
+#: models.py:68
 msgid "Send the submitted form data to a list of email addresses."
 msgstr "Versendet die Formulardaten an eine Liste von Emailadressen."
 
-#: models.py:66
-msgid "Separate multiple e-mail addresses with commas."
+#: models.py:77
+msgid "Separate multiple email addresses with commas."
 msgstr "Mehrere E-Mailadressen mit Kommas trennen."
 
-#: models.py:76
+#: models.py:87
 msgid "title"
 msgstr "Titel"
 
-#: models.py:78
+#: models.py:89
 msgid "config"
 msgstr "Konfiguration"
 
-#: models.py:161
+#: models.py:181
 msgid "ordering"
 msgstr "Sortierung"
 
-#: models.py:163
+#: models.py:183
 msgid "field title"
 msgstr "Feldtitel"
 
-#: models.py:164
+#: models.py:184
 msgid "field name"
 msgstr "Feldname"
 
-#: models.py:166
+#: models.py:186
 msgid "field type"
 msgstr "Feldtyp"
 
-#: models.py:171
+#: models.py:191
 msgid "choices"
 msgstr "Wahlmöglichkeiten"
 
-#: models.py:171
+#: models.py:191
 msgid "Comma-separated"
 msgstr "Durch Kommata getrennt"
 
-#: models.py:174
+#: models.py:194
 msgid "help text"
 msgstr "Hilfstext"
 
-#: models.py:177
+#: models.py:197
 msgid "Optional extra explanatory text beside the field"
 msgstr "Optionaler zusätzlicher Erklärungstext neben dem Feld"
 
-#: models.py:180
+#: models.py:200
 msgid "default value"
 msgstr "Standardwert"
 
-#: models.py:183
+#: models.py:203
 msgid "Optional default value of the field"
 msgstr "Optionaler Standardwert des Feldes"
 
-#: models.py:185
+#: models.py:205
 msgid "is required"
 msgstr "Wird benötigt"
 
-#: models.py:190
+#: models.py:210
 msgid "form field"
 msgstr "Formularfeld"
 
-#: models.py:191
+#: models.py:211
 msgid "form fields"
 msgstr "Formularfelder"
 
-#: models.py:247
+#: models.py:267
 msgid "form submission"
 msgstr "Formulardaten"
 
-#: models.py:248
+#: models.py:268
 msgid "form submissions"
 msgstr "Formulardaten"
 

diff --git a/form_designer/migrations/0001_initial.py b/form_designer/migrations/0001_initial.py
@@ -4,7 +4,7 @@
 
 field_types = [
     ("text", "text"),
-    ("email", "e-mail address"),
+    ("email", "email address"),
     ("longtext", "long text"),
     ("checkbox", "checkbox"),
     ("select", "select"),

diff --git a/form_designer/models.py b/form_designer/models.py
@@ -63,18 +63,18 @@ class Form(models.Model):
         (
             "email",
             {
-                "title": _("Send e-mail"),
+                "title": _("Send email"),
                 "description": _(
                     "Send the submitted form data to a list of email addresses."
                 ),
                 "form_fields": lambda form: [
                     (
                         "email",
                         forms.CharField(
-                            label=_("e-mail address"),
+                            label=_("email address"),
                             validators=[validate_comma_separated_emails],
                             help_text=_(
-                                "Separate multiple e-mail addresses with commas."
+                                "Separate multiple email addresses with commas."
                             ),
                         ),
                     )