From 65f3d73a474fe481ccf1618f59e4de941c89862a Mon Sep 17 00:00:00 2001 From: Joshua Rubingh Date: Tue, 19 May 2020 16:13:34 +0200 Subject: [PATCH] Seconds part of translations in models --- polyclinic_scheduling/apps/employee/admin.py | 3 ++- polyclinic_scheduling/apps/employee/models.py | 4 ++-- polyclinic_scheduling/apps/polyclinic/models.py | 2 +- polyclinic_scheduling/apps/schedule/admin.py | 2 ++ polyclinic_scheduling/apps/schedule/models.py | 2 +- 5 files changed, 8 insertions(+), 5 deletions(-) diff --git a/polyclinic_scheduling/apps/employee/admin.py b/polyclinic_scheduling/apps/employee/admin.py index 24bc992..7e76ea6 100644 --- a/polyclinic_scheduling/apps/employee/admin.py +++ b/polyclinic_scheduling/apps/employee/admin.py @@ -1,6 +1,7 @@ from django.contrib import admin from django.contrib.auth.admin import UserAdmin as BaseUserAdmin from django.contrib.auth.models import User +from django.utils.translation import gettext_lazy as _ from .models import Employee @@ -9,7 +10,7 @@ from .models import Employee class EmployeeInline(admin.StackedInline): model = Employee can_delete = False - verbose_name_plural = 'employee' + verbose_name_plural = _('employee') # Define a new User admin class UserAdmin(BaseUserAdmin): diff --git a/polyclinic_scheduling/apps/employee/models.py b/polyclinic_scheduling/apps/employee/models.py index 6babd32..5e6ee00 100644 --- a/polyclinic_scheduling/apps/employee/models.py +++ b/polyclinic_scheduling/apps/employee/models.py @@ -30,9 +30,9 @@ class Employee(MetaDataModel): user = models.OneToOneField(User, on_delete=models.CASCADE, help_text=_('Django user')) - hospital = models.ForeignKey(Hospital, on_delete=models.CASCADE, help_text=_('Select the hospital for this employee')) + hospital = models.ForeignKey(Hospital, verbose_name=Hospital._meta.verbose_name, on_delete=models.CASCADE, help_text=_('Select the hospital for this employee')) - polyclinic = models.ManyToManyField(Polyclinic, blank=True, help_text=_('Select the polyclinic(s) for this employee')) + polyclinic = models.ManyToManyField(Polyclinic, verbose_name=Polyclinic._meta.verbose_name, blank=True, help_text=_('Select the polyclinic(s) for this employee')) phone = models.CharField(_('Phone number'), max_length=20, blank=True, help_text=_('The direct phone number of this employee')) def __str__(self): diff --git a/polyclinic_scheduling/apps/polyclinic/models.py b/polyclinic_scheduling/apps/polyclinic/models.py index 7ab3490..92cccfd 100644 --- a/polyclinic_scheduling/apps/polyclinic/models.py +++ b/polyclinic_scheduling/apps/polyclinic/models.py @@ -24,7 +24,7 @@ class Polyclinic(MetaDataModel): verbose_name = _('polyclinic') verbose_name_plural = _('polyclinics') - hospital = models.ForeignKey(Hospital, on_delete=models.CASCADE, help_text=_('To which hospital belongs this polyclinic')) + hospital = models.ForeignKey(Hospital, verbose_name=Hospital._meta.verbose_name, on_delete=models.CASCADE, help_text=_('To which hospital belongs this polyclinic')) name = models.CharField(_('Name'), max_length=200, blank=True, help_text=_('The name of this polyclinic')) phone = models.CharField(_('Phone number'), max_length=20, blank=True, help_text=_('The general/direct phone number of this polyclinic')) diff --git a/polyclinic_scheduling/apps/schedule/admin.py b/polyclinic_scheduling/apps/schedule/admin.py index 1647a8a..c5e200d 100644 --- a/polyclinic_scheduling/apps/schedule/admin.py +++ b/polyclinic_scheduling/apps/schedule/admin.py @@ -1,4 +1,5 @@ from django.contrib import admin +from django.utils.translation import gettext_lazy as _ from .models import Schedule @@ -14,3 +15,4 @@ class ScheduleAdmin(admin.ModelAdmin): return obj.done done.boolean = True + done.short_description = _('Done') diff --git a/polyclinic_scheduling/apps/schedule/models.py b/polyclinic_scheduling/apps/schedule/models.py index 9f9dd5e..16c414b 100644 --- a/polyclinic_scheduling/apps/schedule/models.py +++ b/polyclinic_scheduling/apps/schedule/models.py @@ -69,7 +69,7 @@ class Schedule(MetaDataModel): INVALID = 'invalid', _('Invalid') FAILURE = 'failure', _('Failure') - employee = models.ForeignKey(Employee, on_delete=models.CASCADE, help_text=_('Select the employee that is responsible for this schedule request')) + employee = models.ForeignKey(Employee, verbose_name=Employee._meta.verbose_name, on_delete=models.CASCADE, help_text=_('Select the employee that is responsible for this schedule request')) name = models.CharField(_('Name'), max_length=100, help_text=_('Name of the schedule')) email = models.CharField(_('Email address'), max_length=100, help_text=_('Email address where the results will be sent to.'))