Skip to content
Snippets Groups Projects
Commit a78893d6 authored by Nik | Klampfradler's avatar Nik | Klampfradler
Browse files

Merge branch '579-imprint-is-called-imprint' into 'master' 

Resolve ""Imprint" is called "imprint""

Closes #579

See merge request !834
parents 0bacbedd c76501d3
No related branches found
No related tags found
1 merge request!834Resolve ""Imprint" is called "imprint""
Pipeline #46256 passed with warnings
Stage: test
Stage: build
Stage: publish
Stage: docker
Stage: deploy
Pipeline: AlekSIS

#46266

    Hide whitespace changes
    Inline Side-by-side
    CHANGELOG.rst
    + 1
    − 0
    View file @ a78893d6
    ......@@ -18,6 +18,7 @@ Fixed
    ~~~~~
    * Correctly update theme colours on change again
    * Imprint is now called "Imprint" and not "Impress".
    `2.3.1`_ – 2021-12-17
    ---------------------
    ......
    aleksis/core/templates/core/base.html
    + 1
    − 1
    View file @ a78893d6
    ......@@ -180,7 +180,7 @@
    <span id="doit"></span>
    {% if request.site.preferences.footer__imprint_url %}
    <a class="blue-text text-lighten-4" href="{{ request.site.preferences.footer__imprint_url }}">
    {% trans "Impress" %}
    {% trans "Imprint" %}
    </a>
    {% endif %}
    {% if request.site.preferences.footer__privacy_url and request.site.preferences.footer__imprint_url %}
    ......
    0% or .
    You are about to add 0 people to the discussion. Proceed with caution.
    Finish editing this message first!
    Please register or to comment