Fixed inconsistent translations/plurals and billing tab UI improvement

membermatters · Jun 16, 2024 · aebfffa · aebfffa
1 parent 6f80f54
commit aebfffa
Show file tree

Hide file tree

Showing 10 changed files with 283 additions and 160 deletions.
diff --git a/memberportal/api_admin_tools/models.py b/memberportal/api_admin_tools/models.py
@@ -35,7 +35,7 @@ def get_object(self):
 class PaymentPlan(ExportModelOperationsMixin("payment-plan"), models.Model):
     """A Membership Plan that specifies how a member is billed for a member tier."""
 
-    BILLING_PERIODS = [("Months", "month"), ("Weeks", "week"), ("Days", "days")]
+    BILLING_PERIODS = [("Month", "month"), ("Week", "week"), ("Day", "day")]
 
     id = models.AutoField(primary_key=True)
     name = models.CharField("Name", max_length=50)

diff --git a/memberportal/profile/models.py b/memberportal/profile/models.py
@@ -526,7 +526,7 @@ def get_basic_profile(self):
                 "full": self.get_full_name(),
             },
             "phone": self.phone,
-            "state": self.get_state_display(),
+            "state": self.state,
             "vehicleRegistrationPlate": self.vehicle_registration_plate,
             "rfid": self.rfid,
             "memberBucks": {

diff --git a/src-frontend/src/components/AccessList.vue b/src-frontend/src/components/AccessList.vue
@@ -14,7 +14,7 @@
     <div class="row flex content-start items-start">
       <q-list bordered padding class="rounded-borders q-ma-sm access-list">
         <q-item-label header>
-          {{ $t('access.doors') }}
+          {{ $tc('access.door', 2) }}
         </q-item-label>
 
         <div class="q-pa-md" v-if="!doors.length">
@@ -65,7 +65,7 @@
 
       <q-list bordered padding class="rounded-borders q-ma-sm access-list">
         <q-item-label header>
-          {{ $t('access.interlocks') }}
+          {{ $tc('access.interlock', 2) }}
         </q-item-label>
 
         <q-item-label class="q-pa-md" v-if="!interlocks.length">