forked from rc/aircox
Merge pull request '#57 - Django 4.1 + blocktrans/trans templates rename' (#58) from fix-1.0-57 into develop-1.0
Reviewed-on: rc/aircox#58
This commit is contained in:
@ -5,7 +5,7 @@
|
||||
{% if not is_popup %}
|
||||
{% block breadcrumbs %}
|
||||
<div class="breadcrumbs">
|
||||
<a href="{% url 'admin:index' %}">{% trans 'Home' %}</a>
|
||||
<a href="{% url 'admin:index' %}">{% translate 'Home' %}</a>
|
||||
› <a href="{% url 'admin:app_list' app_label=opts.app_label %}">{{ opts.app_config.verbose_name }}</a>
|
||||
› {% if has_view_permission %}<a href="{% url opts|admin_urlname:'changelist' %}">{{ opts.verbose_name_plural|capfirst }}</a>{% else %}{{ opts.verbose_name_plural|capfirst }}{% endif %}
|
||||
|
||||
@ -13,7 +13,7 @@
|
||||
› <a href="{% url opts|admin_urlname:"changelist" %}?parent={{parent.id}}">{{ parent.title }}</a>
|
||||
{% endif %}
|
||||
|
||||
› {% if add %}{% blocktrans with name=opts.verbose_name %}Add {{ name }}{% endblocktrans %}{% else %}{{ original|truncatewords:"18" }}{% endif %}
|
||||
› {% if add %}{% blocktranslate with name=opts.verbose_name %}Add {{ name }}{% endblocktranslate %}{% else %}{{ original|truncatewords:"18" }}{% endif %}
|
||||
</div>
|
||||
{% endblock %}
|
||||
{% endif %}
|
||||
@ -24,18 +24,18 @@
|
||||
<div class="columns is-size-5">
|
||||
<div class="column has-text-left">
|
||||
{% if original and not original.is_trash %}
|
||||
<button type="submit" name="status" value="32" class="button is-danger is-size-6">{% trans "Move to trash" %}</button>
|
||||
<button type="submit" name="status" value="32" class="button is-danger is-size-6">{% translate "Move to trash" %}</button>
|
||||
{% endif %}
|
||||
{% if original and not original.is_draft %}
|
||||
<button type="submit" name="status" value="0" class="button is-warning is-size-6">{% trans "Mark as draft" %}</button>
|
||||
<button type="submit" name="status" value="0" class="button is-warning is-size-6">{% translate "Mark as draft" %}</button>
|
||||
{% endif %}
|
||||
</div>
|
||||
|
||||
<div class="column has-text-right">
|
||||
<button type="submit" class="button is-secondary is-size-6">{% trans "Save" %}</button>
|
||||
<button type="submit" name="_continue" class="button is-secondary is-size-6">{% trans "Save and continue" %}</button>
|
||||
<button type="submit" class="button is-secondary is-size-6">{% translate "Save" %}</button>
|
||||
<button type="submit" name="_continue" class="button is-secondary is-size-6">{% translate "Save and continue" %}</button>
|
||||
{% if not original.is_published %}
|
||||
<button type="submit" name="status" value="16" class="button is-primary is-size-6">{% trans "Publish" %}</button>
|
||||
<button type="submit" name="status" value="16" class="button is-primary is-size-6">{% translate "Publish" %}</button>
|
||||
{% endif %}
|
||||
</div>
|
||||
|
||||
|
@ -4,7 +4,7 @@
|
||||
{% if not is_popup %}
|
||||
{% block breadcrumbs %}
|
||||
<div class="breadcrumbs">
|
||||
<a href="{% url 'admin:index' %}">{% trans 'Home' %}</a>
|
||||
<a href="{% url 'admin:index' %}">{% translate 'Home' %}</a>
|
||||
› <a href="{% url 'admin:app_list' app_label=cl.opts.app_label %}">{{ cl.opts.app_config.verbose_name }}</a>
|
||||
{% if parent %}
|
||||
› <a href="{% url cl.opts|admin_urlname:'changelist' %}">{{ cl.opts.verbose_name_plural|capfirst }}</a>
|
||||
|
@ -18,10 +18,10 @@
|
||||
<table class="table is-hoverable is-fullwidth">
|
||||
<thead>
|
||||
<tr>
|
||||
<th>{% trans "time" %}</th>
|
||||
<th>{% trans "episode" %}</th>
|
||||
<th>{% trans "track" %}</th>
|
||||
<th>{% trans "tags" %}</th>
|
||||
<th>{% translate "time" %}</th>
|
||||
<th>{% translate "episode" %}</th>
|
||||
<th>{% translate "track" %}</th>
|
||||
<th>{% translate "tags" %}</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
@ -63,7 +63,7 @@
|
||||
</tbody>
|
||||
<tfoot>
|
||||
<tr>
|
||||
<td class="is-size-6">{% trans "Total" %}</td>
|
||||
<td class="is-size-6">{% translate "Total" %}</td>
|
||||
<td colspan="100">
|
||||
<div class="columns is-size-6">
|
||||
<span v-for="(count, tag) in counts" class="column">
|
||||
|
Reference in New Issue
Block a user