feat(settings): improve commit messages

- Follow Conventional Commits specification and make the content of the
  commit messages consistent.
- Add button to revert to the site defaults in case users wants to go
  back to the shipped/configured settings.

Fixes #19806

Author: nijel

docs/admin/config.rst

@@ -707,6 +707,12 @@ DEFAULT_ADD_MESSAGE, DEFAULT_ADDON_MESSAGE, DEFAULT_COMMIT_MESSAGE, DEFAULT_DELE
 
 Default commit messages for different operations, please check :ref:`component` for details.
 
+The built-in defaults follow Conventional Commits and include
+Weblate links where available. Changing these settings affects newly created
+defaults; existing message templates can be reset in the settings forms with
+:guilabel:`Restore site default`. For inherited values, restoring the site
+default also disables inheritance for that message.
+
 
 .. seealso::
 
@@ -859,6 +865,9 @@ DEFAULT_PULL_MESSAGE
 
 Configures the default title and message for pull requests.
 
+The built-in default follows Conventional Commits and includes
+Weblate links and translation status.
+
 .. setting:: ENABLE_AVATARS
 
 ENABLE_AVATARS

docs/admin/projects.rst

@@ -416,6 +416,11 @@ The default values can be changed by :setting:`DEFAULT_ADD_MESSAGE`,
 :setting:`DEFAULT_DELETE_MESSAGE`, :setting:`DEFAULT_MERGE_MESSAGE`,
 :setting:`DEFAULT_PULL_MESSAGE`.
 
+The built-in defaults follow Conventional Commits and include
+Weblate links where available. Use :guilabel:`Restore site default` next to a
+message editor to restore the current installation default for that message;
+for inherited values, this also disables inheritance for that message.
+
 .. seealso::
 
    * :ref:`workspace-inherited-settings`
@@ -1027,6 +1032,11 @@ The default value can be changed by :setting:`DEFAULT_ADD_MESSAGE`,
 :setting:`DEFAULT_DELETE_MESSAGE`, :setting:`DEFAULT_MERGE_MESSAGE`,
 :setting:`DEFAULT_PULL_MESSAGE`.
 
+The built-in defaults follow Conventional Commits and include
+Weblate links where available. Use :guilabel:`Restore site default` next to a
+message editor to restore the current installation default for that message;
+for inherited values, this also disables inheritance for that message.
+
 .. seealso::
 
    * :ref:`workspace-inherited-settings`

docs/admin/workspaces.rst

@@ -150,6 +150,10 @@ Default commit and merge request message templates for projects and components
 in this workspace. These templates use the same markup as component message
 settings.
 
+The built-in defaults follow Conventional Commits and include
+Weblate links where available. Use :guilabel:`Restore site default` next to a
+message editor to restore the current installation default for that message.
+
 .. seealso::
 
    * :ref:`workspace-inherited-settings`

docs/changes.rst

@@ -7,6 +7,8 @@ Weblate 2026.7
 
 .. rubric:: Improvements
 
+* Default commit and merge request message templates now use Conventional Commits, and settings forms can restore installation defaults for individual message templates.
+
 .. rubric:: Bug fixes
 
 .. rubric:: Compatibility

weblate/static/loader-bootstrap.js

@@ -1152,6 +1152,52 @@ $(function () {
     });
   });
 
+  const getControlValue = (control) => {
+    if (control.tomselect) {
+      return control.tomselect.getValue();
+    }
+    return control.value;
+  };
+  const setControlValue = (control, value) => {
+    if (control.tomselect) {
+      control.tomselect.setValue(value, true);
+    } else {
+      control.value = value;
+    }
+    control.dispatchEvent(new Event("input", { bubbles: true }));
+    control.dispatchEvent(new Event("change", { bubbles: true }));
+  };
+  const setControlDisabled = (control, disabled) => {
+    control.disabled = disabled;
+    if (!control.tomselect) {
+      return;
+    }
+    if (disabled) {
+      control.tomselect.disable();
+    } else {
+      control.tomselect.enable();
+    }
+  };
+
+  document.querySelectorAll(".site-default-field-button").forEach((button) => {
+    const container = button.closest(".mb-3");
+    const control = container?.querySelector("[data-site-default-value]");
+    if (!control) {
+      return;
+    }
+    button.addEventListener("click", () => {
+      const inheritedSetting = button.closest("[data-inherited-setting]");
+      const inheritCheckbox = inheritedSetting?.querySelector(
+        ".inherited-setting-toggle input[type=checkbox]",
+      );
+      if (inheritCheckbox?.checked) {
+        inheritCheckbox.checked = false;
+        inheritCheckbox.dispatchEvent(new Event("change", { bubbles: true }));
+      }
+      setControlValue(control, control.dataset.siteDefaultValue || "");
+    });
+  });
+
   document.querySelectorAll("[data-inherited-setting]").forEach((el) => {
     const checkbox = el.querySelector(
       ".inherited-setting-toggle input[type=checkbox]",
@@ -1168,31 +1214,6 @@ $(function () {
       return;
     }
 
-    const getControlValue = (control) => {
-      if (control.tomselect) {
-        return control.tomselect.getValue();
-      }
-      return control.value;
-    };
-    const setControlValue = (control, value) => {
-      if (control.tomselect) {
-        control.tomselect.setValue(value, true);
-      } else {
-        control.value = value;
-      }
-    };
-    const setControlDisabled = (control, disabled) => {
-      control.disabled = disabled;
-      if (!control.tomselect) {
-        return;
-      }
-      if (disabled) {
-        control.tomselect.disable();
-      } else {
-        control.tomselect.enable();
-      }
-    };
-
     const updateInheritedSetting = (syncValue) => {
       const disabled = checkbox.checked;
       el.classList.toggle("is-inherited", disabled);

weblate/static/styles/main.css

@@ -2019,6 +2019,23 @@ input.color_edit:checked + label {
   margin-bottom: 0;
 }
 
+.form-label-actions {
+  display: flex;
+  flex-wrap: wrap;
+  align-items: center;
+  justify-content: space-between;
+  gap: 0.5rem;
+  margin-bottom: 0.5rem;
+}
+
+.form-label-actions .form-label {
+  margin-bottom: 0;
+}
+
+.form-label-actions .site-default-field-button {
+  flex: 0 0 auto;
+}
+
 .help-block {
   color: #2a3744;
 }

weblate/templates/bootstrap5/field.html

@@ -1,4 +1,4 @@
-{% load crispy_forms_field translations %}
+{% load crispy_forms_field i18n icons translations %}
 
 {% comment %}Based on crispy original, just adds form_field_doc_link.{% endcomment %}
 
@@ -15,11 +15,23 @@
     <{% if tag %}{{ tag }}{% else %}div{% endif %} id="div_{{ field.auto_id }}" class="{% if field|is_checkbox and form_show_labels %}form-check{% else %}mb-3{% if 'form-horizontal' in form_class %} row{% endif %}{% endif %}{% if wrapper_class %} {{ wrapper_class }}{% endif %}{% if field.css_classes %} {{ field.css_classes }}{% endif %}">
         {% if field.label and not field|is_checkbox and form_show_labels %}
             {% if field.use_fieldset %}<fieldset{% if 'form-horizontal' in form_class %} class="row"{% endif %}{% if field.aria_describedby %} aria-describedby="{{ field.aria_describedby }}"{% endif %}>{% endif %}
-            <{% if field.use_fieldset %}legend{% else %}label{% endif %}
-                {% if field.id_for_label %}for="{{ field.id_for_label }}"{% endif %} class="{% if 'form-horizontal' in form_class %}col-form-label pt-0{% else %}form-label{% endif %}{% if label_class %} {{ label_class }}{% endif %}{% if field.field.required %} requiredField{% endif %}{% if field.use_fieldset %} fs-6{% endif %}">
-                {{ field.label }}{% if field.field.required %}<span class="asteriskField">*</span>{% endif %}
-                {% form_field_doc_link field.form field %}
-            </{% if field.use_fieldset %}legend{% else %}label{% endif %}>
+            {% if field.field.site_default and not field.use_fieldset %}
+                <div class="form-label-actions">
+                    <label {% if field.id_for_label %}for="{{ field.id_for_label }}"{% endif %} class="{% if 'form-horizontal' in form_class %}col-form-label pt-0{% else %}form-label{% endif %}{% if label_class %} {{ label_class }}{% endif %}{% if field.field.required %} requiredField{% endif %}">
+                        {{ field.label }}{% if field.field.required %}<span class="asteriskField">*</span>{% endif %}
+                        {% form_field_doc_link field.form field %}
+                    </label>
+                    <button type="button" class="btn btn-outline-secondary btn-xs site-default-field-button" data-site-default-target="{{ field.html_name }}"{% if field.id_for_label %} aria-controls="{{ field.id_for_label }}"{% endif %} title="{% translate "Restore site default" %}">
+                        {% icon "undo.svg" %} {% translate "Restore site default" %}
+                    </button>
+                </div>
+            {% else %}
+                <{% if field.use_fieldset %}legend{% else %}label{% endif %}
+                    {% if field.id_for_label %}for="{{ field.id_for_label }}"{% endif %} class="{% if 'form-horizontal' in form_class %}col-form-label pt-0{% else %}form-label{% endif %}{% if label_class %} {{ label_class }}{% endif %}{% if field.field.required %} requiredField{% endif %}{% if field.use_fieldset %} fs-6{% endif %}">
+                    {{ field.label }}{% if field.field.required %}<span class="asteriskField">*</span>{% endif %}
+                    {% form_field_doc_link field.form field %}
+                </{% if field.use_fieldset %}legend{% else %}label{% endif %}>
+            {% endif %}
         {% endif %}
 
         {% if field|is_checkboxselectmultiple or field|is_radioselect %}

weblate/trans/defaults.py

@@ -57,38 +57,53 @@
 DEFAULT_VCS = "git"
 
 DEFAULT_COMMIT_MESSAGE = (
-    "Translated using Weblate ({{ language_name }})\n\n"
-    "Currently translated at {{ stats.translated_percent }}% "
-    "({{ stats.translated }} of {{ stats.all }} strings)\n\n"
+    "chore(l10n): update {{ language_name }} translation\n\n"
     "Translation: {{ project_name }}/{{ component_name }}\n"
+    "Language: {{ language_name }}\n"
+    "Progress: {{ stats.translated_percent }}% "
+    "({{ stats.translated }} of {{ stats.all }} strings)\n"
     "Translate-URL: {{ url }}"
 )
 
-DEFAULT_ADD_MESSAGE = "Added translation using Weblate ({{ language_name }})\n\n"
-
-DEFAULT_DELETE_MESSAGE = "Deleted translation using Weblate ({{ language_name }})\n\n"
+DEFAULT_ADD_MESSAGE = (
+    "chore(l10n): add {{ language_name }} translation\n\n"
+    "Translation: {{ project_name }}/{{ component_name }}\n"
+    "Language: {{ language_name }}\n"
+    "Translate-URL: {{ url }}"
+)
 
-DEFAULT_MERGE_MESSAGE = "Merge branch '{{ component_remote_branch }}' into Weblate.\n\n"
+DEFAULT_DELETE_MESSAGE = (
+    "chore(l10n): remove {{ language_name }} translation\n\n"
+    "Translation: {{ project_name }}/{{ component_name }}\n"
+    "Language: {{ language_name }}\n"
+    "Translate-URL: {{ url }}"
+)
 
-DEFAULT_ADDON_MESSAGE = """Update translation files
+DEFAULT_MERGE_MESSAGE = (
+    "chore(l10n): merge remote changes\n\n"
+    "Translation: {{ project_name }}/{{ component_name }}\n"
+    "Remote-Branch: {{ component_remote_branch }}\n"
+    "Translate-URL: {{ url }}"
+)
 
-Updated by "{{ addon_name }}" add-on in Weblate.
+DEFAULT_ADDON_MESSAGE = """chore(l10n): update translation files
 
+Add-on: {{ addon_name }}
 Translation: {{ project_name }}/{{ component_name }}
 Translate-URL: {{ url }}"""
 
-DEFAULT_PULL_MESSAGE = """Translations update from {{ site_title }}
+DEFAULT_PULL_MESSAGE = """chore(l10n): update translations
 
-Translations update from [{{ site_title }}]({{ site_url }}) for [{{ project_name }}/{{ component_name }}]({{url}}).
+Translations updated in [{{ site_title }}]({{ site_url }}) for [{{ project_name }}/{{ component_name }}]({{ url }}).
 
 {% if component_linked_children %}
-It also includes following components:
+Included components:
 {% for linked in component_linked_children %}
 * [{{ linked.project_name }}/{{ linked.name }}]({{ linked.url }})
 {% endfor %}
 {% endif %}
 
-Current translation status:
+Translation status:
 
 ![Weblate translation status]({{widget_url}})
 """

weblate/trans/forms.py

@@ -11,7 +11,7 @@
 from datetime import datetime
 from itertools import chain
 from secrets import token_hex
-from typing import TYPE_CHECKING, Any, ClassVar, Literal, cast
+from typing import TYPE_CHECKING, Any, ClassVar, Literal, Protocol, cast
 
 import jsonschema
 from crispy_forms.bootstrap import InlineCheckboxes, InlineRadios, Tab, TabHolder
@@ -72,6 +72,7 @@
 )
 from weblate.trans.filter import FILTERS
 from weblate.trans.inherited_settings import (
+    COMPONENT_MESSAGE_SETTINGS,
     INHERITABLE_COMPONENT_FLAGS,
     INHERITABLE_COMPONENT_SETTINGS,
     get_inherit_field_name,
@@ -151,6 +152,12 @@
     from weblate.trans.models.translation import NewUnitParams
     from weblate.utils.stats import CategoryLanguage, ProjectLanguage
 
+
+class SiteDefaultField(Protocol):
+    site_default: bool
+    widget: forms.Widget
+
+
 BUTTON_TEMPLATE = """
 <button type="button" class="btn btn-outline-primary {0}" title="{1}" {2}>{3}</button>
 """
@@ -1821,6 +1828,7 @@ def setup_inherited_setting_values(self, field_name: str) -> None:
         )
 
     def setup_inherited_settings(self, parent_name: str, *, has_parent: bool) -> None:
+        setup_message_setting_site_defaults(self.fields)
         self._inherited_setting_fields = set()
         for field_name in INHERITABLE_COMPONENT_SETTINGS:
             inherit_field = get_inherit_field_name(field_name)
@@ -1884,6 +1892,16 @@ def _post_clean(self) -> None:
             self.restore_inherited_values()
 
 
+def setup_message_setting_site_defaults(fields: dict[str, forms.Field]) -> None:
+    for field_name in COMPONENT_MESSAGE_SETTINGS:
+        if field_name not in fields:
+            continue
+        setting_name = f"DEFAULT_{field_name.upper()}"
+        field = cast("SiteDefaultField", fields[field_name])
+        field.site_default = True
+        field.widget.attrs["data-site-default-value"] = getattr(settings, setting_name)
+
+
 class SelectChecksWidget(SortedSelectMultiple):
     def __init__(self, attrs=None, choices=()) -> None:
         choices = CHECKS.get_choices()

weblate/trans/tests/test_file_format_params.py

@@ -364,7 +364,7 @@ def _test_closing_tags(self, closing_tags_active: bool = True) -> None:
         new_revision = self.component.repository.last_revision
         self.assertNotEqual(rev, new_revision)
         new_commit = self.component.repository.show(new_revision)
-        self.assertIn("Added translation using Weblate (German)", new_commit)
+        self.assertIn("chore(l10n): add German translation", new_commit)
         if closing_tags_active:
             self.assertIn(
                 '<location filename="main.c" line="11"></location>', new_commit
@@ -552,7 +552,7 @@ def test_last_translator_header(self):
         rev3 = self.component.repository.last_revision
         commit3 = self.component.repository.show(rev3)
         self.assertNotEqual(rev2, rev3)
-        self.assertIn("Added translation using Weblate (Polish)", commit3)
+        self.assertIn("chore(l10n): add Polish translation", commit3)
         self.assertNotIn("Last-Translator: Automatically generated", commit3)
 
         # check header is present when a new language is added and parameter set to True
@@ -561,7 +561,7 @@ def test_last_translator_header(self):
         rev4 = self.component.repository.last_revision
         self.assertNotEqual(rev3, rev4)
         commit4 = self.component.repository.show(rev4)
-        self.assertIn("Added translation using Weblate (French)", commit4)
+        self.assertIn("chore(l10n): add French translation", commit4)
         self.assertIn("Last-Translator: Automatically generated", commit4)
 
     def test_x_generator_header(self):