[translations]Updated translations keys (en), comment #247

governanceplatform/admin.py

@@ -488,7 +488,7 @@ class CompanyAdmin(ExportActionModelAdmin, admin.ModelAdmin):
             },
         ),
         (
-            _("Entity Categories"),
+            _("Entity categories"),
             {
                 "classes": ["extrapretty"],
                 "fields": [

governanceplatform/globals.py

@@ -9,15 +9,13 @@
 DECONNECTION = 6
 
 ACTION_FLAG_CHOICES = {
-    ADDITION: _('Addition'),
-    CHANGE: _('Change'),
-    DELETION: _('Deletion'),
+    ADDITION: _("Addition"),
+    CHANGE: _("Change"),
+    DELETION: _("Deletion"),
     # VIEW: _('View'),
-    CONNECTION: _('Logged in'),
-    DECONNECTION: _('Logged out'),
+    CONNECTION: _("Logged in"),
+    DECONNECTION: _("Logged out"),
 }
 
 # Functionalities list
-FUNCTIONALITIES = {
-    "securityobjectives": _('Security Objective')
-}
+FUNCTIONALITIES = {"securityobjectives": _("Security objective")}

governanceplatform/models.py

@@ -30,7 +30,7 @@ class Sector(TranslatableModel):
 
     # name of the regulator who create the object
     creator_name = models.CharField(
-        verbose_name=_("Creator Name"),
+        verbose_name=_("Creator name"),
         max_length=255,
         blank=True,
         default=None,
@@ -130,14 +130,14 @@ class Company(models.Model):
     identifier = models.CharField(
         max_length=4, verbose_name=_("Acronym")
     )  # requirement from business concat(name_country_regulator)
-    name = models.CharField(max_length=64, verbose_name=_("name"))
+    name = models.CharField(max_length=64, verbose_name=_("Name"))
     country = models.CharField(
         max_length=200,
-        verbose_name=_("country"),
+        verbose_name=_("Country"),
         null=True,
         choices=list(CountryField().choices),
     )
-    address = models.CharField(max_length=255, verbose_name=_("address"))
+    address = models.CharField(max_length=255, verbose_name=_("Address"))
     email = models.CharField(
         max_length=100,
         blank=True,
@@ -187,21 +187,21 @@ class Meta:
 # Regulator
 class Regulator(TranslatableModel):
     translations = TranslatedFields(
-        name=models.CharField(max_length=64, verbose_name=_("name")),
+        name=models.CharField(max_length=64, verbose_name=_("Name")),
         full_name=models.TextField(
-            blank=True, default="", null=True, verbose_name=_("full name")
+            blank=True, default="", null=True, verbose_name=_("Full name")
         ),
         description=models.TextField(
-            blank=True, default="", null=True, verbose_name=_("description")
+            blank=True, default="", null=True, verbose_name=_("Description")
         ),
     )
     country = models.CharField(
         max_length=200,
         null=True,
         choices=list(CountryField().choices),
-        verbose_name=_("country"),
+        verbose_name=_("Country"),
     )
-    address = models.CharField(max_length=255, verbose_name=_("address"))
+    address = models.CharField(max_length=255, verbose_name=_("Address"))
     email_for_notification = models.EmailField(
         verbose_name=_("E-mail address for incident notification"),
         default=None,
@@ -226,21 +226,21 @@ class Meta:
 # Observer
 class Observer(TranslatableModel):
     translations = TranslatedFields(
-        name=models.CharField(default="", max_length=64, verbose_name=_("name")),
+        name=models.CharField(default="", max_length=64, verbose_name=_("Name")),
         full_name=models.TextField(
-            blank=True, default="", null=True, verbose_name=_("full name")
+            blank=True, default="", null=True, verbose_name=_("Full name")
         ),
         description=models.TextField(
-            blank=True, default="", null=True, verbose_name=_("description")
+            blank=True, default="", null=True, verbose_name=_("Description")
         ),
     )
     country = models.CharField(
         max_length=200,
         null=True,
         choices=list(CountryField().choices),
-        verbose_name=_("country"),
+        verbose_name=_("Country"),
     )
-    address = models.CharField(max_length=255, verbose_name=_("address"))
+    address = models.CharField(max_length=255, verbose_name=_("Address"))
     email_for_notification = models.EmailField(
         verbose_name=_("E-mail address for incident notification"),
         default=None,
@@ -442,7 +442,7 @@ class CompanyUser(models.Model):
         blank=True,
     )
     is_company_administrator = models.BooleanField(
-        default=False, verbose_name=_("is administrator")
+        default=False, verbose_name=_("Is administrator")
     )
 
     class Meta:
@@ -471,7 +471,7 @@ class RegulatorUser(models.Model):
         verbose_name=_("Regulator"),
     )
     is_regulator_administrator = models.BooleanField(
-        default=False, verbose_name=_("is administrator")
+        default=False, verbose_name=_("Is administrator")
     )
     sectors = models.ManyToManyField(Sector, blank=True)
 
@@ -501,7 +501,7 @@ class ObserverUser(models.Model):
         verbose_name=_("Observer"),
     )
     is_observer_administrator = models.BooleanField(
-        default=False, verbose_name=_("is administrator")
+        default=False, verbose_name=_("Is administrator")
     )
 
     class Meta:

incidents/admin.py

@@ -140,7 +140,7 @@ def has_delete_permission(self, request, obj=None):
     def has_view_permission(self, request, obj=None):
         return request.user.is_superuser
 
-    @admin.display(description=_("action flag"))
+    @admin.display(description=_("Action flag"))
     def _action_flag(self, obj):
         return ACTION_FLAG_CHOICES[obj.action_flag]
 
@@ -234,8 +234,8 @@ class Meta:
 
 class QuestionOptionsInline(PermissionMixin, admin.TabularInline):
     model = QuestionOptions
-    verbose_name = _("Question Option")
-    verbose_name_plural = _("Question Options")
+    verbose_name = _("Question option")
+    verbose_name_plural = _("Question options")
     ordering = ["category_option__position", "position"]
     extra = 0
 
@@ -262,8 +262,8 @@ def formfield_for_foreignkey(self, db_field, request, **kwargs):
 class PredefinedAnswerInline(CustomTranslatableTabularInline):
     model = PredefinedAnswer
     fields = ["predefined_answer", "position"]
-    verbose_name = _("predefined answer")
-    verbose_name_plural = _("predefined answers")
+    verbose_name = _("Predefined answer")
+    verbose_name_plural = _("Predefined answers")
     ordering = ["position"]
     extra = 0
 
@@ -505,7 +505,7 @@ def queryset(self, request, queryset):
 
 
 class EmailTypeListFilter(SimpleListFilter):
-    title = _("Email Type")
+    title = _("Email type")
     parameter_name = ""
 
     def lookups(self, request, model_admin):

incidents/forms.py

@@ -240,7 +240,7 @@ def create_question(self, question_option, incident_workflow=None, incident=None
                 ),
                 required=question_option.is_mandatory,
                 initial=initial_data,
-                help_text=gettext_lazy("Date Format YYYY-MM-DD HH:MM"),
+                help_text=gettext_lazy("Date format yyyy-mm-dd hh:mm"),
             )
             self.fields[field_name].label = question.label
         elif question_type == "FREETEXT":
@@ -737,15 +737,15 @@ class IncidenteDateForm(forms.ModelForm):
             options={}, attrs={"class": "incident_detection_date"}
         ),
         required=False,
-        help_text=gettext_lazy("Date Format YYYY-MM-DD HH:MM"),
+        help_text=gettext_lazy("Date format yyyy-mm-dd hh:mm"),
     )
 
     incident_starting_date = forms.DateTimeField(
         widget=DateTimePickerInput(
             options={}, attrs={"class": "incident_starting_date"}
         ),
         required=False,
-        help_text=gettext_lazy("Date Format YYYY-MM-DD HH:MM"),
+        help_text=gettext_lazy("Date format yyyy-mm-dd hh:mm"),
     )
 
     def __init__(self, *args, **kwargs):

incidents/models.py

@@ -240,7 +240,7 @@ class Workflow(TranslatableModel):
 
     submission_email = models.ForeignKey(
         Email,
-        verbose_name=_("Submision email"),
+        verbose_name=_("Submission email"),
         on_delete=models.SET_NULL,
         null=True,
         blank=True,
@@ -463,24 +463,24 @@ class Incident(models.Model):
         default=None,
     )
     contact_lastname = models.CharField(
-        max_length=100, verbose_name=_("contact last name")
+        max_length=100, verbose_name=_("Contact last name")
     )
     contact_firstname = models.CharField(
-        max_length=100, verbose_name=_("contact first name")
+        max_length=100, verbose_name=_("Contact first name")
     )
     contact_title = models.CharField(
         max_length=100, verbose_name=_("Contact job title")
     )
     contact_email = models.CharField(max_length=100, verbose_name=_("Contact email"))
     contact_telephone = models.CharField(
-        max_length=100, verbose_name=_("contact telephone")
+        max_length=100, verbose_name=_("Contact telephone")
     )
     # technical contact
     technical_lastname = models.CharField(
-        max_length=100, verbose_name=_("technical last name")
+        max_length=100, verbose_name=_("Technical last name")
     )
     technical_firstname = models.CharField(
-        max_length=100, verbose_name=_("technical first name")
+        max_length=100, verbose_name=_("Technical first name")
     )
     technical_title = models.CharField(
         max_length=100, verbose_name=_("Technical job title")
@@ -489,7 +489,7 @@ class Incident(models.Model):
         max_length=100, verbose_name=_("Technical email")
     )
     technical_telephone = models.CharField(
-        max_length=100, verbose_name=_("technical telephone")
+        max_length=100, verbose_name=_("Technical telephone")
     )
 
     incident_reference = models.CharField(

templates/admin/base_site.html

@@ -10,12 +10,20 @@ <h1 id="site-name">{{ site_header|default:_('Django admin area') }}</h1>
 {% endblock %}
 {% block nav-global %}
     <div class="header-links">
-        <a href="{% url 'two_factor:profile' %}">{% trans 'Account Security' %}</a>
-        <a href="{% url 'password_change' %}">{% trans 'Password change' %}</a>
+        <a href="{% url 'two_factor:profile' %}">
+            {% translate 'Account security' %}
+        </a>
+        <a href="{% url 'password_change' %}">
+            {% translate 'Password change' %}
+        </a>
         {% if site_url and not is_only_admin %}
-                <a href="{{ site_url }}">{% translate 'Return to user interface' %}</a>
+                <a href="{{ site_url }}">
+                    {% translate 'Return to user interface' %}
+                </a>
         {% endif %}
-        <a href="{% url 'logout' %}">{% translate 'Log out' %}</a>
+        <a href="{% url 'logout' %}">
+            {% translate 'Log out' %}
+        </a>
         {% include "home/language_selector.html" %}
     </div>
 {% endblock %}

templates/two_factor/core/setup_complete.html

@@ -29,7 +29,7 @@ <h1>
 </p>
 
 <a href="{% url 'two_factor:profile' %}" class="float-right btn btn-link">
-  {% translate "Back to Account Security" %}
+  {% translate "Back to Account security" %}
 </a>
 <p>
   <a href="{% url 'two_factor:phone_create' %}" class="btn btn-success">