Browse Source

Don't capitalize the content of verbose_name

Baptiste Jonglez 10 years ago
parent
commit
f69adfbea1
3 changed files with 37 additions and 37 deletions
  1. 14 14
      coin/billing/models.py
  2. 14 14
      coin/members/models.py
  3. 9 9
      coin/offers/models.py

+ 14 - 14
coin/billing/models.py

@@ -36,22 +36,22 @@ class Invoice(models.Model):
         ('trouble', 'Litige')
     )
 
-    validated = models.BooleanField(default=False, verbose_name='Validée')
+    validated = models.BooleanField(default=False, verbose_name='validée')
     number = models.CharField(max_length=25,
                               default=next_invoice_number,
                               unique=True,
-                              verbose_name='Numéro')
+                              verbose_name='numéro')
     status = models.CharField(max_length=50, choices=INVOICES_STATUS_CHOICES,
                               default='open',
-                              verbose_name='Statut')
+                              verbose_name='statut')
     date = models.DateField(default=datetime.date.today, null=True)
     date_due = models.DateField(
         default=end_of_month,
         null=True,
-        verbose_name='Date d\'échéance de paiement')
+        verbose_name="date d'échéance de paiement")
     member = models.ForeignKey(Member, null=True, blank=True, default=None,
                                related_name='invoices',
-                               verbose_name='Membre',
+                               verbose_name='membre',
                                on_delete=models.SET_NULL)
     pdf = models.FileField(storage=private_files_storage, upload_to=invoice_pdf_filename,
                            null=True, blank=True,
@@ -116,28 +116,28 @@ class InvoiceDetail(models.Model):
 
     label = models.CharField(max_length=100)
     amount = models.DecimalField(max_digits=5, decimal_places=2,
-                                 verbose_name='Montant')
-    quantity = models.DecimalField(null=True, verbose_name='Quantité',
+                                 verbose_name='montant')
+    quantity = models.DecimalField(null=True, verbose_name='quantité',
                                    default=1.0, decimal_places=2, max_digits=4)
     tax = models.DecimalField(null=True, default=0.0, decimal_places=2,
                               max_digits=4, verbose_name='TVA',
                               help_text='en %')
-    invoice = models.ForeignKey(Invoice, verbose_name='Facture',
+    invoice = models.ForeignKey(Invoice, verbose_name='facture',
                                 related_name='details')
     offersubscription = models.ForeignKey(OfferSubscription, null=True,
                                           blank=True, default=None,
-                                          verbose_name='Abonnement')
+                                          verbose_name='abonnement')
     period_from = models.DateField(
         default=start_of_month,
         null=True,
         blank=True,
-        verbose_name='Début de période',
+        verbose_name='début de période',
         help_text='Date de début de période sur laquelle est facturé cet item')
     period_to = models.DateField(
         default=end_of_month,
         null=True,
         blank=True,
-        verbose_name='Fin de période',
+        verbose_name='fin de période',
         help_text='Date de fin de période sur laquelle est facturé cet item')
 
     def __unicode__(self):
@@ -164,11 +164,11 @@ class Payment(models.Model):
     payment_mean = models.CharField(max_length=100, null=True,
                                     default='transfer',
                                     choices=PAYMENT_MEAN_CHOICES,
-                                    verbose_name='Moyen de paiement')
+                                    verbose_name='moyen de paiement')
     amount = models.DecimalField(max_digits=5, decimal_places=2, null=True,
-                                 verbose_name='Montant')
+                                 verbose_name='montant')
     date = models.DateField(default=datetime.date.today)
-    invoice = models.ForeignKey(Invoice, verbose_name='Facture',
+    invoice = models.ForeignKey(Invoice, verbose_name='facture',
                                 related_name='payments')
 
     def __unicode__(self):

+ 14 - 14
coin/members/models.py

@@ -40,12 +40,12 @@ class Member(CoinLdapSyncMixin, AbstractUser):
                             default='natural_person')
 
     organization_name = models.CharField(max_length=200, blank=True,
-                                         verbose_name='Nom de l\'organisme',
+                                         verbose_name="nom de l'organisme",
                                          help_text='Pour une personne morale')
     home_phone_number = models.CharField(max_length=25, blank=True,
-                                         verbose_name='Téléphone fixe')
+                                         verbose_name='téléphone fixe')
     mobile_phone_number = models.CharField(max_length=25, blank=True,
-                                           verbose_name='Téléphone mobile')
+                                           verbose_name='téléphone mobile')
     # TODO: use a django module that provides an address model? (would
     # support more countries and address types)
     address = models.TextField(verbose_name='adresse', blank=True, null=True)
@@ -54,19 +54,19 @@ class Member(CoinLdapSyncMixin, AbstractUser):
                                                message='Code postal non valide.')],
                                    verbose_name='code postal')
     city = models.CharField(max_length=200, blank=True, null=True,
-                            verbose_name='Commune')
+                            verbose_name='commune')
     country = models.CharField(max_length=200, blank=True, null=True,
                                default='France',
-                               verbose_name='Pays')
+                               verbose_name='pays')
     entry_date = models.DateField(null=False,
                                   blank=False,
                                   default=datetime.date.today,
-                                  verbose_name='Date de première adhésion')
+                                  verbose_name='date de première adhésion')
     # TODO: for data retention, prevent deletion of a user object while
     # the resign date is recent enough (e.g. one year in France).
     resign_date = models.DateField(null=True, blank=True,
-                                   verbose_name='Date de départ de '
-                                   'l\'association')
+                                   verbose_name="date de départ de "
+                                   "l'association")
 
     # Following fields are managed by the parent class AbstractUser :
     # username, first_name, last_name, email
@@ -238,8 +238,8 @@ class CryptoKey(models.Model):
     KEY_TYPE_CHOICES = (('RSA', 'RSA'), ('GPG', 'GPG'))
 
     type = models.CharField(max_length=3, choices=KEY_TYPE_CHOICES)
-    key = models.TextField(verbose_name='Clé')
-    member = models.ForeignKey('Member', verbose_name='Membre')
+    key = models.TextField(verbose_name='clé')
+    member = models.ForeignKey('Member', verbose_name='membre')
 
     def __unicode__(self):
         return 'Clé %s de %s' % (self.type, self.member)
@@ -250,20 +250,20 @@ class CryptoKey(models.Model):
 
 class MembershipFee(models.Model):
     member = models.ForeignKey('Member', related_name='membership_fees',
-                               verbose_name='Membre')
+                               verbose_name='membre')
     #TODO: config: valeur par défaut à externaliser dans la configuration
     amount = models.IntegerField(null=False, default='20', help_text='en €',
-                                 verbose_name='Montant')
+                                 verbose_name='montant')
     start_date = models.DateField(
         null=False,
         blank=False,
         default=datetime.date.today,
-        verbose_name='Date de début de cotisation')
+        verbose_name='date de début de cotisation')
     end_date = models.DateField(
         null=False,
         blank=False,
         default=utils.in_one_year,
-        verbose_name='Date de fin de cotisation')
+        verbose_name='date de fin de cotisation')
 
     def __unicode__(self):
         return '%s - %s - %i€' % (self.member, self.start_date, self.amount)

+ 9 - 9
coin/offers/models.py

@@ -26,22 +26,22 @@ class Offer(models.Model):
             Configuration.get_configurations_choices_list())
 
     name = models.CharField(max_length=255, blank=False, null=False,
-                            verbose_name='Nom de l\'offre')
+                            verbose_name="nom de l'offre")
     configuration_type = models.CharField(max_length=50,
                             null=True,
                             choices = (('',''),),
                             help_text="Type of configuration to use with this offer")
     billing_period = models.IntegerField(blank=False, null=False, default=1,
-                                         verbose_name='Période de facturation',
+                                         verbose_name='période de facturation',
                                          help_text='en mois')
     period_fees = models.DecimalField(max_digits=5, decimal_places=2,
                                       blank=False, null=False,
-                                      verbose_name='Montant par période de '
+                                      verbose_name='montant par période de '
                                                    'facturation',
                                       help_text='en €')
     initial_fees = models.DecimalField(max_digits=5, decimal_places=2,
                                       blank=False, null=False,
-                                      verbose_name='Frais de mise en service',
+                                      verbose_name='frais de mise en service',
                                       help_text='en €')
 
     def get_configuration_type_display(self):
@@ -76,20 +76,20 @@ class OfferSubscription(models.Model):
         null=False,
         blank=False,
         default=datetime.date.today,
-        verbose_name='Date de souscription à l\'offre')
+        verbose_name="date de souscription à l'offre")
     # TODO: for data retention, prevent deletion of a subscription object
     # while the resign date is recent enough (e.g. one year in France).
     resign_date = models.DateField(
         null=True,
         blank=True,
-        verbose_name='Date de résiliation')
+        verbose_name='date de résiliation')
     # TODO: move this to offers?
     commitment = models.IntegerField(blank=False, null=False,
-                                     verbose_name='Période d\'engagement',
+                                     verbose_name="période d'engagement",
                                      help_text = 'en mois',
                                      default=0)
-    member = models.ForeignKey('members.Member', verbose_name='Membre')
-    offer = models.ForeignKey('Offer', verbose_name='Offre')
+    member = models.ForeignKey('members.Member', verbose_name='membre')
+    offer = models.ForeignKey('Offer', verbose_name='offre')
 
     def __unicode__(self):
         return '%s - %s - %s' % (self.member, self.offer.name,