diff --git a/.gitignore b/.gitignore index 3bc22e7b..5d8adc55 100644 --- a/.gitignore +++ b/.gitignore @@ -36,3 +36,6 @@ settings_local.py env/ venv/ db.sqlite3 + +# Ignore migrations during first phase dev +migrations/ diff --git a/member/locale/fr/LC_MESSAGES/django.po b/member/locale/fr/LC_MESSAGES/django.po index 75e11d6d..226234a9 100644 --- a/member/locale/fr/LC_MESSAGES/django.po +++ b/member/locale/fr/LC_MESSAGES/django.po @@ -1,14 +1,9 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# FIRST AUTHOR , YEAR. -# #, fuzzy msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-07-16 13:46+0200\n" +"POT-Creation-Date: 2019-07-16 15:21+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -23,103 +18,99 @@ msgid "member" msgstr "adhérent" #: models.py:24 -msgid "profile picture" -msgstr "image de profil" - -#: models.py:29 msgid "phone number" msgstr "numéro de téléphone" -#: models.py:36 +#: models.py:30 msgid "section" msgstr "section" -#: models.py:37 +#: models.py:31 msgid "e.g. \"1A0\", \"9A♥\", \"SAPHIRE\"" msgstr "e.g. \"1A0\", \"9A♥\", \"SAPHIRE\"" -#: models.py:41 +#: models.py:37 msgid "address" msgstr "adresse" -#: models.py:47 models.py:61 +#: models.py:43 msgid "paid" msgstr "payé" -#: models.py:52 models.py:53 +#: models.py:48 models.py:49 msgid "user profile" msgstr "profil utilisateur" -#: models.py:65 +#: models.py:57 models.py:102 +msgid "name" +msgstr "nom" + +#: models.py:62 msgid "email" msgstr "courriel" -#: models.py:70 +#: models.py:67 msgid "membership fee" msgstr "cotisation pour adhérer" -#: models.py:74 +#: models.py:71 msgid "membership duration" msgstr "durée de l'adhésion" -#: models.py:75 +#: models.py:72 msgid "The longest time a membership can last (NULL = infinite)." msgstr "La durée maximale d'une adhésion (NULL = infinie)." -#: models.py:80 +#: models.py:77 msgid "membership start" msgstr "début de l'adhésion" -#: models.py:81 +#: models.py:78 msgid "How long after January 1st the members can renew their membership." msgstr "" -#: models.py:86 +#: models.py:83 msgid "membership end" msgstr "fin de l'adhésion" -#: models.py:87 +#: models.py:84 msgid "" "How long the membership can last after January 1st of the next year after " "members can renew their membership." msgstr "" -#: models.py:93 +#: models.py:90 msgid "club" msgstr "club" -#: models.py:94 +#: models.py:91 msgid "clubs" msgstr "clubs" -#: models.py:102 -msgid "name" -msgstr "nom" - -#: models.py:107 +#: models.py:108 msgid "role" msgstr "rôle" -#: models.py:108 +#: models.py:109 msgid "roles" msgstr "rôles" -#: models.py:125 +#: models.py:126 msgid "membership starts on" msgstr "l'adhésion commence le" -#: models.py:128 +#: models.py:129 msgid "membership ends on" msgstr "l'adhésion finie le" -#: models.py:132 +#: models.py:133 msgid "fee" msgstr "cotisation" -#: models.py:136 +#: models.py:137 msgid "membership" msgstr "adhésion" -#: models.py:137 +#: models.py:138 msgid "memberships" msgstr "adhésions" diff --git a/member/models.py b/member/models.py index eca2351c..dbe0ad07 100644 --- a/member/models.py +++ b/member/models.py @@ -20,11 +20,6 @@ class Profile(models.Model): settings.AUTH_USER_MODEL, on_delete=models.CASCADE, ) - profile_picture = models.ImageField( - verbose_name=_('profile picture'), - max_length=255, - blank=True, - ) phone_number = models.CharField( verbose_name=_('phone number'), max_length=50, diff --git a/tox.ini b/tox.ini index 41474f6c..dd2f3efe 100644 --- a/tox.ini +++ b/tox.ini @@ -8,6 +8,7 @@ deps = -r{toxinidir}/requirements.txt coverage commands = + ./manage.py makemigrations coverage run ./manage.py test {posargs} coverage report -m