diff --git a/activity/locale/fr/LC_MESSAGES/django.po b/activity/locale/fr/LC_MESSAGES/django.po index 8d21c1b6..dc8f2db2 100644 --- a/activity/locale/fr/LC_MESSAGES/django.po +++ b/activity/locale/fr/LC_MESSAGES/django.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-07-16 12:37+0200\n" +"POT-Creation-Date: 2019-07-16 13:45+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -13,11 +13,11 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -#: apps.py:11 +#: apps.py:11 models.py:61 msgid "activity" msgstr "activité" -#: models.py:12 models.py:25 +#: models.py:12 models.py:29 msgid "name" msgstr "nom" @@ -29,26 +29,46 @@ msgstr "peut inviter" msgid "guest entry fee" msgstr "cotisation de l'entrée invité" -#: models.py:29 +#: models.py:23 +msgid "activity type" +msgstr "type d'activité" + +#: models.py:24 +msgid "activity types" +msgstr "types d'activité" + +#: models.py:33 msgid "description" msgstr "description" -#: models.py:35 +#: models.py:39 msgid "type" msgstr "type" -#: models.py:41 +#: models.py:45 msgid "organizer" msgstr "organisateur" -#: models.py:47 +#: models.py:51 msgid "attendees club" msgstr "" -#: models.py:50 +#: models.py:54 msgid "start date" msgstr "date de début" -#: models.py:53 +#: models.py:57 msgid "end date" msgstr "date de fin" + +#: models.py:62 +msgid "activities" +msgstr "activités" + +#: models.py:88 +msgid "guest" +msgstr "invité" + +#: models.py:89 +msgid "guests" +msgstr "invités" diff --git a/activity/migrations/0001_initial.py b/activity/migrations/0001_initial.py index ff697212..accbc91e 100644 --- a/activity/migrations/0001_initial.py +++ b/activity/migrations/0001_initial.py @@ -1,4 +1,4 @@ -# Generated by Django 2.2.3 on 2019-07-16 10:33 +# Generated by Django 2.2.3 on 2019-07-16 11:44 from django.conf import settings from django.db import migrations, models @@ -25,6 +25,10 @@ class Migration(migrations.Migration): ('date_start', models.DateTimeField(verbose_name='start date')), ('date_end', models.DateTimeField(verbose_name='end date')), ], + options={ + 'verbose_name': 'activity', + 'verbose_name_plural': 'activities', + }, ), migrations.CreateModel( name='ActivityType', @@ -34,6 +38,10 @@ class Migration(migrations.Migration): ('can_invite', models.BooleanField(verbose_name='can invite')), ('guest_entry_fee', models.PositiveIntegerField(verbose_name='guest entry fee')), ], + options={ + 'verbose_name': 'activity type', + 'verbose_name_plural': 'activity types', + }, ), migrations.CreateModel( name='Guest', @@ -45,6 +53,10 @@ class Migration(migrations.Migration): ('entry_transaction', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='note.Transaction')), ('inviter', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='+', to=settings.AUTH_USER_MODEL)), ], + options={ + 'verbose_name': 'guest', + 'verbose_name_plural': 'guests', + }, ), migrations.AddField( model_name='activity', diff --git a/activity/models.py b/activity/models.py index f5169e5e..ee411d76 100644 --- a/activity/models.py +++ b/activity/models.py @@ -19,6 +19,10 @@ class ActivityType(models.Model): verbose_name=_('guest entry fee'), ) + class Meta: + verbose_name = _("activity type") + verbose_name_plural = _("activity types") + class Activity(models.Model): name = models.CharField( @@ -53,6 +57,10 @@ class Activity(models.Model): verbose_name=_('end date'), ) + class Meta: + verbose_name = _("activity") + verbose_name_plural = _("activities") + class Guest(models.Model): activity = models.ForeignKey( @@ -75,3 +83,7 @@ class Guest(models.Model): 'note.Transaction', on_delete=models.PROTECT, ) + + class Meta: + verbose_name = _("guest") + verbose_name_plural = _("guests") diff --git a/member/locale/fr/LC_MESSAGES/django.po b/member/locale/fr/LC_MESSAGES/django.po index 36a4e414..e3795f30 100644 --- a/member/locale/fr/LC_MESSAGES/django.po +++ b/member/locale/fr/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-07-16 12:37+0200\n" +"POT-Creation-Date: 2019-07-16 13:46+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -66,54 +66,60 @@ msgstr "durée de l'adhésion" msgid "The longest time a membership can last (NULL = infinite)." msgstr "La durée maximale d'une adhésion (NULL = infinie)." -#: models.py:79 +#: models.py:80 msgid "membership start" msgstr "début de l'adhésion" -#: models.py:80 +#: models.py:81 msgid "How long after January 1st the members can renew their membership." msgstr "" -#: models.py:84 +#: models.py:86 msgid "membership end" msgstr "fin de l'adhésion" -#: models.py:85 +#: models.py:87 msgid "" "How long the membership can last after January 1st of the next year after " "members can renew their membership." msgstr "" -#: models.py:95 +#: models.py:93 +msgid "club" +msgstr "club" + +#: models.py:94 +msgid "clubs" +msgstr "clubs" + +#: models.py:102 msgid "name" msgstr "nom" -#: models.py:100 +#: models.py:107 msgid "role" msgstr "rôle" -#: models.py:101 +#: models.py:108 msgid "roles" msgstr "rôles" -#: models.py:118 +#: models.py:125 msgid "membership starts on" msgstr "l'adhésion commence le" -#: models.py:121 -#, fuzzy -#| msgid "membership fees" +#: models.py:128 msgid "membership ends on" msgstr "l'adhésion finie le" -#: models.py:125 +#: models.py:132 msgid "fee" msgstr "cotisation" -#: models.py:129 +#: models.py:136 msgid "membership" msgstr "adhésion" -#: models.py:130 +#: models.py:137 msgid "memberships" msgstr "adhésions" diff --git a/member/migrations/0001_initial.py b/member/migrations/0001_initial.py index d090655d..02d19288 100644 --- a/member/migrations/0001_initial.py +++ b/member/migrations/0001_initial.py @@ -1,4 +1,4 @@ -# Generated by Django 2.2.3 on 2019-07-16 10:33 +# Generated by Django 2.2.3 on 2019-07-16 11:44 from django.conf import settings from django.db import migrations, models @@ -25,6 +25,10 @@ class Migration(migrations.Migration): ('membership_start', models.DurationField(help_text='How long after January 1st the members can renew their membership.', null=True, verbose_name='membership start')), ('membership_end', models.DurationField(help_text='How long the membership can last after January 1st of the next year after members can renew their membership.', null=True, verbose_name='membership end')), ], + options={ + 'verbose_name': 'club', + 'verbose_name_plural': 'clubs', + }, ), migrations.CreateModel( name='Role', diff --git a/member/models.py b/member/models.py index 4910bc43..dc80d87d 100644 --- a/member/models.py +++ b/member/models.py @@ -89,6 +89,10 @@ class Club(models.Model): 'membership.'), ) + class Meta: + verbose_name = _("club") + verbose_name_plural = _("clubs") + class Role(models.Model): """ diff --git a/note/locale/fr/LC_MESSAGES/django.po b/note/locale/fr/LC_MESSAGES/django.po index 1ab6395e..a4c4bfb6 100644 --- a/note/locale/fr/LC_MESSAGES/django.po +++ b/note/locale/fr/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-07-16 12:42+0200\n" +"POT-Creation-Date: 2019-07-16 13:47+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -18,74 +18,118 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -#: apps.py:11 +#: apps.py:11 models/notes.py:34 msgid "note" msgstr "note" -#: models/notes.py:19 +#: models/notes.py:21 msgid "account balance" msgstr "solde du compte" -#: models/notes.py:20 +#: models/notes.py:22 msgid "in centimes, money credited for this instance" msgstr "en centimes, argent crédité pour cette instance" -#: models/notes.py:23 +#: models/notes.py:25 msgid "active" msgstr "actif" -#: models/notes.py:26 +#: models/notes.py:28 msgid "" "Designates whether this note should be treated as active. Unselect this " "instead of deleting notes." msgstr "" "Indique si la note est active. Désactiver cela plutôt que supprimer la note." -#: models/notes.py:43 +#: models/notes.py:35 +msgid "notes" +msgstr "notes" + +#: models/notes.py:49 msgid "one's note" msgstr "note d'un utilisateur" -#: models/notes.py:44 +#: models/notes.py:50 msgid "users note" msgstr "notes des utilisateurs" -#: models/notes.py:58 +#: models/notes.py:64 msgid "club note" msgstr "note d'un club" -#: models/notes.py:59 +#: models/notes.py:65 msgid "clubs notes" msgstr "notes des clubs" -#: models/notes.py:72 models/transactions.py:31 models/transactions.py:60 +#: models/notes.py:78 models/transactions.py:31 models/transactions.py:64 msgid "type" msgstr "type" -#: models/notes.py:83 models/transactions.py:18 +#: models/notes.py:84 +msgid "special note" +msgstr "note spéciale" + +#: models/notes.py:85 +msgid "special notes" +msgstr "notes spéciale" + +#: models/notes.py:93 models/transactions.py:18 msgid "name" msgstr "nom" -#: models/transactions.py:25 models/transactions.py:47 -#: models/transactions.py:50 +#: models/notes.py:103 +msgid "alias" +msgstr "alias" + +#: models/notes.py:104 +msgid "aliases" +msgstr "alias" + +#: models/transactions.py:25 models/transactions.py:51 +#: models/transactions.py:54 msgid "destination" msgstr "destination" -#: models/transactions.py:28 models/transactions.py:57 +#: models/transactions.py:28 models/transactions.py:61 msgid "amount" msgstr "montant" -#: models/transactions.py:41 +#: models/transactions.py:36 +msgid "transaction template" +msgstr "modèle de transaction" + +#: models/transactions.py:37 +msgid "transaction templates" +msgstr "modèles de transaction" + +#: models/transactions.py:45 msgid "source" msgstr "source" -#: models/transactions.py:54 +#: models/transactions.py:58 msgid "quantity" msgstr "quantité" -#: models/transactions.py:64 +#: models/transactions.py:68 msgid "description" msgstr "description" -#: models/transactions.py:67 +#: models/transactions.py:71 msgid "valid" msgstr "valide" + +#: models/transactions.py:75 +msgid "transaction" +msgstr "transaction" + +#: models/transactions.py:76 +msgid "transactions" +msgstr "transactions" + +#: models/transactions.py:87 +msgid "membership transaction" +msgstr "transaction d'adhésion" + +#: models/transactions.py:88 +msgid "membership transactions" +msgstr "transactions d'adhésion" diff --git a/note/migrations/0001_initial.py b/note/migrations/0001_initial.py index 761e7bf3..031d9f51 100644 --- a/note/migrations/0001_initial.py +++ b/note/migrations/0001_initial.py @@ -1,4 +1,4 @@ -# Generated by Django 2.2.3 on 2019-07-16 10:33 +# Generated by Django 2.2.3 on 2019-07-16 11:44 from django.conf import settings from django.db import migrations, models @@ -11,8 +11,8 @@ class Migration(migrations.Migration): initial = True dependencies = [ - migrations.swappable_dependency(settings.AUTH_USER_MODEL), ('member', '0001_initial'), + migrations.swappable_dependency(settings.AUTH_USER_MODEL), ] operations = [ @@ -23,6 +23,10 @@ class Migration(migrations.Migration): ('balance', models.IntegerField(help_text='in centimes, money credited for this instance', verbose_name='account balance')), ('is_active', models.BooleanField(default=True, help_text='Designates whether this note should be treated as active. Unselect this instead of deleting notes.', verbose_name='active')), ], + options={ + 'verbose_name': 'note', + 'verbose_name_plural': 'notes', + }, ), migrations.CreateModel( name='Transaction', @@ -37,6 +41,10 @@ class Migration(migrations.Migration): ('destination', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='+', to='note.Note', verbose_name='destination')), ('source', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='+', to='note.Note', verbose_name='source')), ], + options={ + 'verbose_name': 'transaction', + 'verbose_name_plural': 'transactions', + }, ), migrations.CreateModel( name='NoteSpecial', @@ -44,6 +52,10 @@ class Migration(migrations.Migration): ('note_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='note.Note')), ('special_type', models.CharField(max_length=255, unique=True, verbose_name='type')), ], + options={ + 'verbose_name': 'special note', + 'verbose_name_plural': 'special notes', + }, bases=('note.note',), ), migrations.CreateModel( @@ -55,6 +67,10 @@ class Migration(migrations.Migration): ('template_type', models.CharField(max_length=31, verbose_name='type')), ('destination', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='+', to='note.Note', verbose_name='destination')), ], + options={ + 'verbose_name': 'transaction template', + 'verbose_name_plural': 'transaction templates', + }, ), migrations.CreateModel( name='Alias', @@ -63,6 +79,10 @@ class Migration(migrations.Migration): ('name', models.CharField(max_length=255, unique=True, verbose_name='name')), ('note', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='note.Note')), ], + options={ + 'verbose_name': 'alias', + 'verbose_name_plural': 'aliases', + }, ), migrations.CreateModel( name='NoteUser', @@ -94,6 +114,10 @@ class Migration(migrations.Migration): ('transaction_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='note.Transaction')), ('membership', models.OneToOneField(on_delete=django.db.models.deletion.PROTECT, related_name='transaction', to='member.Membership')), ], + options={ + 'verbose_name': 'membership transaction', + 'verbose_name_plural': 'membership transactions', + }, bases=('note.transaction',), ), ] diff --git a/note/models/notes.py b/note/models/notes.py index 3596bb85..2c91d1c5 100644 --- a/note/models/notes.py +++ b/note/models/notes.py @@ -13,7 +13,9 @@ Defines each note types class Note(models.Model): """ - An abstract model, use to add transactions capabilities to a user + An model, use to add transactions capabilities + + We do not use an abstract model to simplify the transfer between two notes. """ balance = models.IntegerField( verbose_name=_('account balance'), @@ -28,6 +30,10 @@ class Note(models.Model): ), ) + class Meta: + verbose_name = _("note") + verbose_name_plural = _("notes") + class NoteUser(Note): """ @@ -74,6 +80,10 @@ class NoteSpecial(Note): unique=True, ) + class Meta: + verbose_name = _("special note") + verbose_name_plural = _("special notes") + class Alias(models.Model): """ @@ -88,3 +98,7 @@ class Alias(models.Model): Note, on_delete=models.PROTECT, ) + + class Meta: + verbose_name = _("alias") + verbose_name_plural = _("aliases") diff --git a/note/models/transactions.py b/note/models/transactions.py index d9dd856b..753f4925 100644 --- a/note/models/transactions.py +++ b/note/models/transactions.py @@ -32,6 +32,10 @@ class TransactionTemplate(models.Model): max_length=31 ) + class Meta: + verbose_name = _("transaction template") + verbose_name_plural = _("transaction templates") + class Transaction(models.Model): source = models.ForeignKey( @@ -67,6 +71,10 @@ class Transaction(models.Model): verbose_name=_('valid'), ) + class Meta: + verbose_name = _("transaction") + verbose_name_plural = _("transactions") + class MembershipTransaction(Transaction): membership = models.OneToOneField( @@ -74,3 +82,7 @@ class MembershipTransaction(Transaction): on_delete=models.PROTECT, related_name='transaction', ) + + class Meta: + verbose_name = _("membership transaction") + verbose_name_plural = _("membership transactions")