# HG changeset patch
# User souliane <souliane@mailoo.org>
# Date 1432770405 -7200
# Node ID 651c4049f32b176a85ca4bd388dc4f8975ec3e02
# Parent  da355fb3a9ab86f9b80db0410a33090b0316220a
rename "Newsletter" to "Mailing list" in the adhesion form

diff -r da355fb3a9ab -r 651c4049f32b locale/fr/LC_MESSAGES/django.po
--- a/locale/fr/LC_MESSAGES/django.po	Wed May 27 19:52:36 2015 +0200
+++ b/locale/fr/LC_MESSAGES/django.po	Thu May 28 01:46:45 2015 +0200
@@ -7,8 +7,8 @@
 msgstr ""
 "Project-Id-Version: 0.0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-05-27 19:21+0200\n"
-"PO-Revision-Date: 2015-05-27 19:51+0100\n"
+"POT-Creation-Date: 2015-05-28 01:43+0200\n"
+"PO-Revision-Date: 2015-05-28 01:43+0100\n"
 "Last-Translator: Salut à Toi <contact@salut-a-toi.org>\n"
 "Language-Team: français <goffi@goffi.org>\n"
 "Language: fr\n"
@@ -87,8 +87,8 @@
 msgstr "Commentaire"
 
 #: sat_website/forms.py:108
-msgid "I would like to receive the newsletter."
-msgstr "Je souhaite recevoir la lettre d'information."
+msgid "I would like to subscribe to the adherents' mailing list."
+msgstr "Je souhaite être abonné à la liste de diffusion des adhérents."
 
 #: sat_website/forms.py:113
 msgid "I read the "
@@ -652,7 +652,6 @@
 "adhérant à l'association !"
 
 #: templates/sat_website/base.html:89
-#| msgid "language"
 msgid "Set language"
 msgstr "Changer la langue"
 
@@ -1053,13 +1052,11 @@
 
 #: templates/sat_website/finance.html:27
 #, python-format
-#| msgid "%(members_actual)s members"
 msgid "%(actual)s members"
 msgstr "%(actual)s membres"
 
 #: templates/sat_website/finance.html:30
 #, python-format
-#| msgid "%(members_left)s left"
 msgid "%(left)s members left"
 msgstr "%(left)s membres restants"
 
@@ -1070,7 +1067,6 @@
 
 #: templates/sat_website/finance.html:41
 #, python-format
-#| msgid "%(members_left)s left"
 msgid "%(left)s € left"
 msgstr "%(left)s € restants"
 
diff -r da355fb3a9ab -r 651c4049f32b sat_website/forms.py
--- a/sat_website/forms.py	Wed May 27 19:52:36 2015 +0200
+++ b/sat_website/forms.py	Thu May 28 01:46:45 2015 +0200
@@ -105,7 +105,7 @@
     section_6 = Section(label=_(u'Comment'))
     comment = CharField(required=False, label=_(u"Comment"), placeholder="", widget=forms.Textarea(attrs={'rows': 3}))
 
-    newsletter = BooleanField(required=False, label=_(u'I would like to receive the newsletter.'))
+    mailing = BooleanField(required=False, label=_(u"I would like to subscribe to the adherents' mailing list."))
 
     def html_link(url, label):
         return string_concat('<a target="#" href="', url, '">', label, '</a>')
@@ -168,7 +168,7 @@
                 value = re.sub(r"[\n\r]+", ", ", unicode(field.value()))
             if user_readable:
                 if isinstance(field.field, BooleanField):
-                    key = key.capitalize()  # to get Newsletter instead of "Please add me..."
+                    key = key.capitalize()  # to get Mailing instead of "I would like..."
                 else:
                     key = field.label
                 if isinstance(field.field, ChoiceField):
diff -r da355fb3a9ab -r 651c4049f32b sat_website/views.py
--- a/sat_website/views.py	Wed May 27 19:52:36 2015 +0200
+++ b/sat_website/views.py	Thu May 28 01:46:45 2015 +0200
@@ -97,7 +97,7 @@
         else:
             form = forms.RegistrationForm(initial={'subscription_amount': 10,
                                                    'payment_method': 'transfer',
-                                                   'newsletter': True})
+                                                   'mailing': True})
         context['form'] = form
         context.update(utils.get_asso_urls())