Merge pull request #81 from stackhpc/upstream/master-2025-12-01

Synchronise master with upstream

Author: priteau

cloudkittydashboard/dashboards/admin/hashmap/templates/hashmap/_field_create.html

@@ -3,5 +3,5 @@
 
 {% block modal-body-right %}
     <h3>{% trans "Description:" %}</h3>
-    <p>{% trans "A field is referring to a metadata field of a resource. " %}</p>
+    <p>{% trans "A field is referring to a metadata field of a resource." %}</p>
 {% endblock %}

cloudkittydashboard/dashboards/admin/hashmap/templates/hashmap/_group_create.html

@@ -3,5 +3,11 @@
 
 {% block modal-body-right %}
     <h3>{% trans "Description:" %}</h3>
-    <p>{% trans "A group is a way to group calculations of mappings." %}</p>
+    <p>{% blocktrans trimmed %}
+       A group lets you organize mapping calculations into separate sets.
+       For example, you might create one group with rules for rating instance uptime
+       and another for evaluating block storage volumes. Keeping them in separate
+       groups ensures the calculations remain independent and don’t interfere
+       with each other.
+       {% endblocktrans %}</p>
 {% endblock %}

cloudkittydashboard/dashboards/admin/hashmap/templates/hashmap/_mapping_create.html

@@ -3,5 +3,5 @@
 
 {% block modal-body-right %}
     <h3>{% trans "Description:" %}</h3>
-    <p>{% trans "A mapping is the final object, it’s what triggers calculation." %}</p>
+    <p>{% trans "A mapping is the final object that triggers calculation." %}</p>
 {% endblock %}

cloudkittydashboard/dashboards/admin/hashmap/templates/hashmap/group_details.html

@@ -6,7 +6,7 @@
 <div class="row">
   <div class="col-sm-12">
       <div class="detail">
-          <dl>
+          <dl class="dl-horizontal">
               <dt>{% trans "Id" %}</dt>
               <dd>{{ group.group_id }}</dd>
               <dt>{% trans "Name" %}</dt>
@@ -18,7 +18,7 @@ <h3>{% trans "Mappings" %}</h3>
               {% if mappings.services %}
               <h4>{% trans "Services" %}</h4>
                 {% for service in mappings.services %}
-                  <dl>
+                  <dl class="dl-horizontal">
                       <dt>{% trans "Mapping ID" %}</dt>
                       <dd>{{ service.mapping_id }}</dd>
                       <dt>{% trans "Service ID" %}</dt>
@@ -33,7 +33,7 @@ <h4>{% trans "Services" %}</h4>
               {% if mappings.fields %}
               <h4>{% trans "Fields" %}</h4>
                 {% for field in mappings.fields %}
-                  <dl>
+                  <dl class="dl-horizontal">
                       <dt>{% trans "Mapping ID" %}</dt>
                       <dd>{{ field.mapping_id }}</dd>
                       <dt>{% trans "Field ID" %}</dt>
@@ -53,7 +53,7 @@ <h3>{% trans "Thresholds" %}</h3>
               {% if thresholds.services %}
               <h4>{% trans "Services" %}</h4>
                 {% for service in thresholds.services %}
-                  <dl>
+                  <dl class="dl-horizontal">
                       <dt>{% trans "Service ID" %}</dt>
                       <dd>{{ service.service_id }}</dd>
                       <dt>{% trans "Level" %}</dt>
@@ -68,7 +68,7 @@ <h4>{% trans "Services" %}</h4>
               {% if thresholds.fields %}
               <h4>{% trans "Fields" %}</h4>
                 {% for field in thresholds.fields %}
-                  <dl>
+                  <dl class="dl-horizontal">
                       <dt>{% trans "Field ID" %}</dt>
                       <dd>{{ field.field_id }}</dd>
                       <dt>{% trans "Level" %}</dt>

cloudkittydashboard/dashboards/admin/hashmap/templates/hashmap/service_details.html

@@ -7,9 +7,11 @@
   <div class="span12">
 
 {% if service_period %}
-  {% blocktrans with service_period as period %}
-   <p>Usage data are collected every {{ period }} seconds.</p>
-  {% endblocktrans %}
+    <p>
+      {% blocktrans trimmed with service_period as period %}
+        Usage data is collected every {{ period }} seconds.
+      {% endblocktrans %}
+    </p>
 {% endif %}
 
   {{ tab_group.render }}

cloudkittydashboard/dashboards/admin/hashmap/views.py

@@ -189,8 +189,8 @@ def get_success_url(self, **kwargs):
 class FieldMappingCreateView(forms.ModalFormView):
     form_class = hashmap_forms.CreateFieldMappingForm
     form_id = "create_field_mapping"
-    modal_header = _("Create Field Mapping")
-    page_title = _("Create field Mapping")
+    modal_header = _("Create field mapping")
+    page_title = _("Create field mapping")
     template_name = 'admin/hashmap/mapping_create.html'
     submit_url = 'horizon:admin:hashmap:field_mapping_create'
     success_url = 'horizon:admin:hashmap:field_mapping_create'

cloudkittydashboard/dashboards/admin/modules/templates/rating_modules/_priority_edit.html

@@ -4,7 +4,7 @@
 {% block modal-body-right %}
     <h3>{% trans "Description:" %}</h3>
     <p>
-      {% blocktrans with module_id=module_id %}
+      {% blocktrans trimmed with module_id=module_id %}
         Edit the priority for the <i>{{ module_id }}</i> module.
       {% endblocktrans %}
     </p>

cloudkittydashboard/dashboards/admin/modules/templates/rating_modules/details.html

@@ -6,7 +6,7 @@
 <div class="row">
   <div class="col-sm-12">
       <div class="detail">
-          <dl>
+          <dl class="dl-horizontal">
               <dt>{% trans "Id" %}</dt>
               <dd>{{ module.module_id }}</dd>
               <dt>{% trans "Description" %}</dt>

cloudkittydashboard/dashboards/admin/pyscripts/templates/pyscripts/details.html

@@ -6,7 +6,7 @@
 <div class="row">
   <div class="col-sm-12">
       <div class="detail">
-          <dl>
+          <dl class="dl-horizontal">
               <dt>{{ _("Id") }}</dt>
               <dd>{{ script.script_id }}</dd>
               <dt>{{ _("Name") }}</dt>

cloudkittydashboard/dashboards/admin/pyscripts/views.py

@@ -81,7 +81,7 @@ def get_success_url(self, **kwargs):
 
 class ScriptDetailsView(views.APIView):
     template_name = 'admin/pyscripts/details.html'
-    page_title = _("Script Details : {{ script.name }}")
+    page_title = _("Script details: {{ script.name }}")
 
     def get_data(self, request, context, *args, **kwargs):
         script_id = kwargs.get("script_id")