Merge branch 'dev'

This commit is contained in:
Ashla
2025-04-15 18:25:58 -04:00
2 changed files with 8 additions and 7 deletions

View File

@ -2,15 +2,16 @@
{% block content %} {% block content %}
{%- set number_of_tags = terms | length -%} {%- set number_of_tags = terms | length -%}
<h1>{{ macros_translate::translate(key="tags_title", default="Tags", language_strings=language_strings) }}</h1> {%- set taxon_name = taxonomy.name -%}
<h1>{{- macros_translate::translate(key="tags_title", default="$TAXON", language_strings=language_strings) | replace(from="$TAXON", to=taxon_name) -}}</h1>
<p> <p>
<small>{{ macros_translate::translate(key="tags", number=number_of_tags, default="$NUMBER tags", language_strings=language_strings) }}</small> <small>{{- macros_translate::translate(key="tags", number=number_of_tags, default="$NUMBER $TAXON", language_strings=language_strings) | replace(from="$TAXON", to=taxon_name) -}}</small>
</p> </p>
<ul class="tags"> <ul class="tags">
{%- for tag in terms -%} {%- for term in terms -%}
<li><a href="{{ current_url }}{{ tag.slug }}"><span class="tag">{{ tag.name }}</span><span class="count">{{ tag.pages | length }}</span></a></li> <li><a href="{{ current_url }}{{ term.slug }}"><span class="tag">{{ term.name }}</span><span class="count">{{ term.pages | length }}</span></a></li>
{%- endfor -%} {%- endfor -%}
</ul> </ul>
{% endblock content %} {% endblock content %}

View File

@ -5,17 +5,17 @@
{%- set date_locale = macros_translate::translate(key="date_locale", default="en_US", language_strings=language_strings) -%} {%- set date_locale = macros_translate::translate(key="date_locale", default="en_US", language_strings=language_strings) -%}
{%- set number_of_posts = term.pages | length -%} {%- set number_of_posts = term.pages | length -%}
{%- set taxon_name = "taxonomy.name" -%} {%- set taxon_name = taxonomy.name -%}
{%- set term_name = "“" ~ term.name ~ "”" -%} {%- set term_name = "“" ~ term.name ~ "”" -%}
<h1> <h1>
{{- macros_translate::translate(key="posts_with_tag", default="Posts with $TAXON $TERM", language_strings=language_strings) | replace (from="$TAXON", to=taxon_name) | replace(from="$TERM", to=term_name) -}} {{- macros_translate::translate(key="posts_with_tag", default="Posts with $TAXON $TERM", language_strings=language_strings) | replace(from="$TAXON", to=taxon_name) | replace(from="$TERM", to=term_name) -}}
<a href="{{ current_url ~ 'atom.xml' }}"><i class="icon feed"></i></a> <a href="{{ current_url ~ 'atom.xml' }}"><i class="icon feed"></i></a>
</h1> </h1>
<p> <p>
<small> <small>
<a href="{{ get_url(path='tags', lang=lang) }}"> <a href="{{ get_url(path='tags', lang=lang) }}">
{{ macros_translate::translate(key="all_tags", default="See all $TAXON", language_strings=language_strings) | replace (from="$TAXON", to=taxon_name) }} {{- macros_translate::translate(key="all_tags", default="See all $TAXON", language_strings=language_strings) | replace(from="$TAXON", to=taxon_name) -}}
</a> </a>
<br /> <br />
{{ macros_translate::translate(key="posts", number=number_of_posts, default="$NUMBER posts", language_strings=language_strings) }} {{ macros_translate::translate(key="posts", number=number_of_posts, default="$NUMBER posts", language_strings=language_strings) }}