Commander1024/lostplaces-backend
Commander1024/lostplaces-backend
1
0
Fork 0
Code Issues 14 Pull Requests Releases Wiki Activity

Use shorter trans tag instead of translate.

Browse Source
This commit is contained in:
Marcus Scholz 2020-10-10 23:46:26 +02:00
parent f73b264a2a
commit 3fa6170f0c
17 changed files with 61 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
django_lostplaces/lostplaces/templates/403.html
View File

@ -1,7 +1,7 @@
{% extends 'global.html'%}
{% load i18n %}
{% block title %}{% translate 'Forbidden' %}{% endblock %}
{% block title %}{% trans 'Forbidden' %}{% endblock %}
{% block additional_head %}
{% if request.META.HTTP_REFERER %}
@ -11,6 +11,6 @@
{% block maincontent %}
{% if request.META.HTTP_REFERER %}
<p class="LP-Headline">{% translate 'You will be redirected in 5 seconds' %}</p><p class="LP-Headline"><a href="{{ request.META.HTTP_REFERER }}" class="LP-Link">{% translate 'Go Back' %}</a></p>
<p class="LP-Headline">{% trans 'You will be redirected in 5 seconds' %}</p><p class="LP-Headline"><a href="{{ request.META.HTTP_REFERER }}" class="LP-Link">{% trans 'Go Back' %}</a></p>
{% endif %}
{% endblock maincontent %}

16
django_lostplaces/lostplaces/templates/global.html
View File

@ -29,15 +29,15 @@
<span class="LP-Paragraph">
{% if user.is_authenticated %}
Hi {{ user.username }}!
<a class="LP-Link" href="{% url 'logout' %}"><span class="LP-Link__Text">{% translate 'Logout' %}</span></a>
<a class="LP-Link" href="{% url 'logout' %}"><span class="LP-Link__Text">{% trans 'Logout' %}</span></a>
{% if user.is_superuser %}
<a class="LP-Link" href="{% url 'admin:index' %}" target="_blank"><span class="LP-Link__Text">{% translate 'Admin' %}</span></a>
<a class="LP-Link" href="{% url 'admin:index' %}" target="_blank"><span class="LP-Link__Text">{% trans 'Admin' %}</span></a>
{% endif %}
{% else %}
You are not logged in.
<a class="LP-Link" href="{% url 'login' %}"><span class="LP-Link__Text">{% translate 'Login' %}</span></a> |
<a class="LP-Link" href="{% url 'signup' %}"><span class="LP-Link__Text">{% translate 'Sign Up' %}</span></a>
<a class="LP-Link" href="{% url 'login' %}"><span class="LP-Link__Text">{% trans 'Login' %}</span></a> |
<a class="LP-Link" href="{% url 'signup' %}"><span class="LP-Link__Text">{% trans 'Sign Up' %}</span></a>
{% endif %}
</span>
</div>
@ -47,14 +47,14 @@
<aside class="LP-Main__Sidebar">
<nav class="LP-Menu LP-Menu--sidebar">
<ul class="LP-Menu__List">
<li class="LP-Menu__Item"><a href="{% url 'lostplaces_home' %}" class="LP-Link"><span class="LP-Link__Text">{% translate 'Home' %}</span></a></li>
<li class="LP-Menu__Item"><a href="{% url 'flatpage' slug='codex' %}" class="LP-Link"><span class="LP-Link__Text">{% translate 'UrBex Codex' %}</span></a></li>
<li class="LP-Menu__Item"><a href="{% url 'lostplaces_home' %}" class="LP-Link"><span class="LP-Link__Text">{% trans 'Home' %}</span></a></li>
<li class="LP-Menu__Item"><a href="{% url 'flatpage' slug='codex' %}" class="LP-Link"><span class="LP-Link__Text">{% trans 'UrBex Codex' %}</span></a></li>
{% block additional_menu_items %}
{% endblock additional_menu_items %}
<li class="LP-Menu__Item LP-Menu__Item--additional"><a href="{% url 'place_create'%}" class="LP-Link"><span class="LP-Link__Text">{% translate 'Create Place' %}</span></a></li>
<li class="LP-Menu__Item LP-Menu__Item--additional"><a href="{% url 'place_list'%}" class="LP-Link"><span class="LP-Link__Text">{% translate 'All Places' %}</span></a></li>
<li class="LP-Menu__Item LP-Menu__Item--additional"><a href="{% url 'place_create'%}" class="LP-Link"><span class="LP-Link__Text">{% trans 'Create Place' %}</span></a></li>
<li class="LP-Menu__Item LP-Menu__Item--additional"><a href="{% url 'place_list'%}" class="LP-Link"><span class="LP-Link__Text">{% trans 'All Places' %}</span></a></li>
</ul>
</nav>
</aside>

4
django_lostplaces/lostplaces/templates/home.html
View File

@ -7,7 +7,7 @@
<script src="{% static 'maps/ol.js' %}"></script>
{% endblock additional_head %}
# {% block title %}{% translate 'Home' %}{% endblock %}
# {% block title %}{% trans 'Home' %}{% endblock %}
{% block maincontent %}
@ -17,7 +17,7 @@
{% include 'partials/osm_map.html' with config=mapping_config %}
<div class="LP-PlaceGrid">
<h1 class="LP-Headline LP-Headline">{% translate 'Explore the latest places' %}</h1>
<h1 class="LP-Headline LP-Headline">{% trans 'Explore the latest places' %}</h1>
<ul class="LP-PlaceGrid__Grid">
{% for place in place_list %}
<li class="LP-PlaceGrid__Item">

2
django_lostplaces/lostplaces/templates/home_unauth.html
View File

@ -29,7 +29,7 @@
</article>
<div class="LP-PlaceGrid">
<h1 class="LP-Headline LP-Headline">{% translate 'Explore the latest places' %}</h1>
<h1 class="LP-Headline LP-Headline">{% trans 'Explore the latest places' %}</h1>
<ul class="LP-PlaceGrid__Grid">
{% for place in place_list %}
<li class="LP-PlaceGrid__Item">

8
django_lostplaces/lostplaces/templates/partials/nav/footer.html
View File

@ -61,13 +61,13 @@
<!-- Bottom section with last line of text and links. -->
<section class="LP-Footer__BottomSection LP-Footer__Flex">
<div class="LP-Footer__BottomWrapper">
{% translate 'Proudly made by' %} <a href="https://git.mowoe.com/reverend" class="LP-Footer__GenericAnchor">Reverend</a>
{% translate 'and' %} <a href="https://www.commander1024.de" class="LP-Footer__GenericAnchor">Commander1024.</a></span>
{% trans 'Proudly made by' %} <a href="https://git.mowoe.com/reverend" class="LP-Footer__GenericAnchor">Reverend</a>
{% trans 'and' %} <a href="https://www.commander1024.de" class="LP-Footer__GenericAnchor">Commander1024.</a></span>
</div>
<div class="LP-Footer__BottomWrapper">
<a href="{% url 'flatpage' slug='privacy-policy' %}" class="LP-Footer__GenericAnchor">{% translate 'Privacy Policy' %}</a>
<a href="{% url 'flatpage' slug='privacy-policy' %}" class="LP-Footer__GenericAnchor">{% trans 'Privacy Policy' %}</a>
|
<a href="{% url 'flatpage' slug='imprint' %}" class="LP-Footer__GenericAnchor">{% translate 'Imprint' %}</a>
<a href="{% url 'flatpage' slug='imprint' %}" class="LP-Footer__GenericAnchor">{% trans 'Imprint' %}</a>
</div>
</section>
</footer>

16
django_lostplaces/lostplaces/templates/partials/nav/pagination.html
View File

@ -8,26 +8,26 @@
<li class="LP-Pagination__Item LP-Pagination__Item--other LP-Pagination__Item--first">
<a href="?page=1" class="LP-Link">
<span class="LP-Icon">⟪</span>
<span class="LP-Text">{% translate 'First' %}</span>
<span class="LP-Text">{% trans 'First' %}</span>
</a>
</li>
<li class="LP-Pagination__Item LP-Pagination__Item--other LP-Pagination__Item--previous">
<a href="?page={{ page_obj.previous_page_number }}" class="LP-Link">
<span class="LP-Icon">⟨</span>
<span class="LP-Text">{% translate 'Previous' %}</span>
<span class="LP-Text">{% trans 'Previous' %}</span>
</a>
</li>
{% else %}
<li class="LP-Pagination__Item LP-Pagination__Item--other LP-Pagination__Item--first LP-Pagination__Item--disabled">
<a href="#" class="LP-Link">
<span class="LP-Icon">⟪</span>
<span class="LP-Text">{% translate 'First' %}</span>
<span class="LP-Text">{% trans 'First' %}</span>
</a>
</li>
<li class="LP-Pagination__Item LP-Pagination__Item--other LP-Pagination__Item--previous LP-Pagination__Item--disabled">
<a href="#" class="LP-Link">
<span class="LP-Icon">⟨</span>
<span class="LP-Text">{% translate 'Previous' %}</span>
<span class="LP-Text">{% trans 'Previous' %}</span>
</a>
</li>
{% endif %}
@ -47,25 +47,25 @@
{% if page_obj.has_next %}
<li class="LP-Pagination__Item LP-Pagination__Item--other LP-Pagination__Item--next">
<a href="?page={{ page_obj.next_page_number }}" class="LP-Link">
<span class="LP-Text">{% translate 'Next' %}</span>
<span class="LP-Text">{% trans 'Next' %}</span>
<span class="LP-Icon">⟩</span>
</a>
</li>
<li class="LP-Pagination__Item LP-Pagination__Item--other LP-Pagination__Item--last">
<a href="?page={{ page_obj.paginator.num_pages }}" class="LP-Link">
<span class="LP-Text">{% translate 'Last' %}</span>
<span class="LP-Text">{% trans 'Last' %}</span>
<span class="LP-Icon">⟫</span>
</a>
</li>
{% else %}
<li class="LP-Pagination__Item LP-Pagination__Item--other LP-Pagination__Item--next LP-Pagination__Item--disabled">
<a href="#" class="LP-Link">
<span class="LP-Text">{% translate 'Next' %}</span>
<span class="LP-Text">{% trans 'Next' %}</span>
<span class="LP-Icon">⟩</span>
</a>
<li class="LP-Pagination__Item LP-Pagination__Item--other LP-Pagination__Item--last LP-Pagination__Item--disabled">
<a href="#" class="LP-Link">
<span class="LP-Text">{% translate 'Last' %}</span>
<span class="LP-Text">{% trans 'Last' %}</span>
<span class="LP-Icon">⟫</span>
</a>
</li>

4
django_lostplaces/lostplaces/templates/partials/tagging.html
View File

@ -27,11 +27,11 @@
<form id="id_tag_submit_form" class="LP-Form LP-Form--inline LP-Form--tagging" method="POST" action="{% url config.submit_url_name tagged_id=config.tagged_item.id%}">
<fieldset class="LP-Form__Fieldset">
<legend class="LP-Form__Legend">{% translate 'Add tags' %}</legend>
<legend class="LP-Form__Legend">{% trans 'Add tags' %}</legend>
{% csrf_token %}
<div class="LP-Form__Composition LP-Form__Composition--breakable">
<div class="LP-Form__Field LP-Form__Button LP-Input LP-Input--tagging">
<button id="id_tag_submit_button" class="LP-Button">{% translate 'Add tags' %}</button>
<button id="id_tag_submit_button" class="LP-Button">{% trans 'Add tags' %}</button>
</div>
<div class="LP-Form__Field">
{% include 'partials/form/inputField.html' with field=config.submit_form.tag_list classes="LP-Input--tagging" %}

12
django_lostplaces/lostplaces/templates/partials/welcome.html
View File

@ -1,21 +1,21 @@
{% load i18n %}
<header class="LP-TextSection__Headline">
<h1 class="LP-Headline">{% translate 'Start' %}</h1>
<h1 class="LP-Headline">{% trans 'Start' %}</h1>
</header>
<div class="LP-TextSection__Text">
<p class="LP-Paragraph">{% translate 'Welcome to our Urban Exploration community catalogue,' %}
<p class="LP-Paragraph">{% trans 'Welcome to our Urban Exploration community catalogue,' %}
{% if user.is_authenticated %}
{{ user.username }}
{% else %}
{% translate 'explorer' %}
{% trans 'explorer' %}
{% endif %}
!
</p>
<p class="LP-Paragraph">
{% translate 'We strictly follow our' %}
<a class="LP-Link" href="{% url 'flatpage' slug='codex' %}"><span class="LP-Link__Text">{% translate 'UrBex codex' %}</span></a>
{% translate 'and expect you to do so, too.' %}'
{% trans 'We strictly follow our' %}
<a class="LP-Link" href="{% url 'flatpage' slug='codex' %}"><span class="LP-Link__Text">{% trans 'UrBex codex' %}</span></a>
{% trans 'and expect you to do so, too.' %}'
</p>
</div>

8
django_lostplaces/lostplaces/templates/photo_album/photo_album_create.html
View File

@ -1,19 +1,19 @@
{% load i18n %}
{% extends 'global.html'%}
{% block title %}{% translate 'Submit a photo album' %}{% endblock %}
{% block title %}{% trans 'Submit a photo album' %}{% endblock %}
{% block additional_menu_items %}
<li class="LP-Menu__Item LP-Menu__Item--additional"><a href="{% url 'place_edit' pk=place.pk %}" class="LP-Link"><span
class="LP-Link__Text">{% translate 'Edit place' %}</span></a></li>
class="LP-Link__Text">{% trans 'Edit place' %}</span></a></li>
<li class="LP-Menu__Item LP-Menu__Item--additional"><a href="{% url 'place_delete' pk=place.pk %}" class="LP-Link"><span
class="LP-Link__Text">{% translate 'Delete place' %}</span></a></li>
class="LP-Link__Text">{% trans 'Delete place' %}</span></a></li>
{% endblock additional_menu_items %}
{% block maincontent %}
<form class="LP-Form" method="POST">
<fieldset class="LP-Form__Fieldset">
<legend class="LP-Form__Legend">{% translate 'Submit a photo album for' %}% {{place.name}}</legend>
<legend class="LP-Form__Legend">{% trans 'Submit a photo album for' %}% {{place.name}}</legend>
{% csrf_token %}
<div class="LP-Form__Composition">
<div class="LP-Form__Field">

4
django_lostplaces/lostplaces/templates/place/place_create.html
View File

@ -2,12 +2,12 @@
{% load static %}
{% load i18n %}
# {% block title %}{% translate 'Create Place' %}{% endblock %}
# {% block title %}{% trans 'Create Place' %}{% endblock %}
{% block maincontent %}
<form class="LP-Form" method="POST" enctype="multipart/form-data">
<fieldset class="LP-Form__Fieldset">
<legend class="LP-Form__Legend">{% translate 'Create Place' %}</legend>
<legend class="LP-Form__Legend">{% trans 'Create Place' %}</legend>
{% csrf_token %}
<div class="LP-Form__Composition LP-Form__Composition--breakable">
<div class="LP-Form__Field">

8
django_lostplaces/lostplaces/templates/place/place_delete.html
View File

@ -2,20 +2,20 @@
{% load static %}
{% load i18n %}
{% block title %}{% translate 'Lost Place Deletion' %}{% endblock %}
{% block title %}{% trans 'Lost Place Deletion' %}{% endblock %}
{% block maincontent %}
<form class="LP-Form" method="POST">
<fieldset class="LP-Form__Fieldset">
<legend class="LP-Form__Legend">{% translate 'Delete place' %}</legend>
<legend class="LP-Form__Legend">{% trans 'Delete place' %}</legend>
{% csrf_token %}
<div class="LP-Form__Composition">
<div class="LP-Form__Field LP-Form__InfoText">
<p class="LP-Paragraph">{% translate 'Are you sure you want to delete' %} "{{place.name}}"?</p>
<p class="LP-Paragraph">{% trans 'Are you sure you want to delete' %} "{{place.name}}"?</p>
</div>
</div>
{% translate 'Delete' as action %}
{% trans 'Delete' as action %}
<div class="LP-Form__Composition LP-Form__Composition--buttons">
{% include 'partials/form/submit.html' with referer=request.META.HTTP_REFERER action=action %}
</div>

12
django_lostplaces/lostplaces/templates/place/place_detail.html
View File

@ -15,8 +15,8 @@
{% block title %}{{place.name}}{% endblock %}
{% block additional_menu_items %}
<li class="LP-Menu__Item LP-Menu__Item--additional"><a href="{% url 'place_edit' pk=place.pk %}" class="LP-Link"><span class="LP-Link__Text">{% translate 'Edit place' %}</span></a></li>
<li class="LP-Menu__Item LP-Menu__Item--additional"><a href="{% url 'place_delete' pk=place.pk %}" class="LP-Link"><span class="LP-Link__Text">{% translate 'Delete place' %}</span></a></li>
<li class="LP-Menu__Item LP-Menu__Item--additional"><a href="{% url 'place_edit' pk=place.pk %}" class="LP-Link"><span class="LP-Link__Text">{% trans 'Edit place' %}</span></a></li>
<li class="LP-Menu__Item LP-Menu__Item--additional"><a href="{% url 'place_delete' pk=place.pk %}" class="LP-Link"><span class="LP-Link__Text">{% trans 'Delete place' %}</span></a></li>
{% endblock additional_menu_items %}
{% block maincontent %}
@ -43,7 +43,7 @@
</section>
<section class="LP-Section">
<h1 class="LP-Headline">{% translate 'Map links' %}</h1>
<h1 class="LP-Headline">{% trans 'Map links' %}</h1>
{% include 'partials/osm_map.html' with config=mapping_config%}
<div class="LP-LinkList">
<ul class="LP-LinkList__Container">
@ -55,7 +55,7 @@
</section>
<section class=" LP-Section">
<h1 class="LP-Headline">{% translate 'Photo albums' %}</h1>
<h1 class="LP-Headline">{% trans 'Photo albums' %}</h1>
<div class="LP-LinkList">
<ul class="LP-LinkList__Container">
{% for photo_album in place.photoalbums.all %}
@ -81,7 +81,7 @@
v216c0,11.046,8.954,20,20,20s20-8.954,20-20V276h216c11.046,0,20-8.954,20-20C512,244.954,503.046,236,492,236z" />
</g>
</svg>
<span class="RV-Iconized__Text">{% translate 'Add photo album' %}</span>
<span class="RV-Iconized__Text">{% trans 'Add photo album' %}</span>
</div>
</a>
</li>
@ -90,7 +90,7 @@
</section>
<section class="LP-Section">
<h1 class="LP-Headline">{% translate 'Images' %}</h1>
<h1 class="LP-Headline">{% trans 'Images' %}</h1>
<div class="LP-ImageGrid">
<ul class="LP-ImageGrid__Container">
{% for place_image in place.placeimages.all %}

4
django_lostplaces/lostplaces/templates/place/place_list.html
View File

@ -7,13 +7,13 @@
<script src="{% static 'maps/ol.js' %}"></script>
{% endblock additional_head %}
{% block title %}{% translate 'Lost Places' %}{% endblock %}
{% block title %}{% trans 'Lost Places' %}{% endblock %}
{% block maincontent %}
{% include 'partials/osm_map.html' with config=mapping_config %}
<div class="LP-PlaceList">
<h1 class="LP-Headline">{% translate 'Listing our places' %}</h1>
<h1 class="LP-Headline">{% trans 'Listing our places' %}</h1>
<ul class="LP-PlaceList__List">
{% for place in place_list %}
<li class="LP-PlaceList__Item">

4
django_lostplaces/lostplaces/templates/place/place_update.html
View File

@ -2,12 +2,12 @@
{% load static %}
{% load i18n %}
# {% block title %}{% translate 'Update place' %}{% endblock %}
# {% block title %}{% trans 'Update place' %}{% endblock %}
{% block maincontent %}
<form class="LP-Form" method="POST" enctype="multipart/form-data">
<fieldset class="LP-Form__Fieldset">
<legend class="LP-Form__Legend">{% translate 'Update place' %}</legend>
<legend class="LP-Form__Legend">{% trans 'Update place' %}</legend>
{% csrf_token %}
<div class="LP-Form__Composition LP-Form__Composition--breakable">
<div class="LP-Form__Field">

2
django_lostplaces/lostplaces/templates/place_image/place_image_create.html
View File

@ -4,7 +4,7 @@
{% block maincontent %}
<form class="LP-Form" method="POST" enctype="multipart/form-data">
<fieldset class="LP-Form__Fieldset">
<legend class="LP-Form__Legend">{% translate 'Submit images to a place' %}</legend>
<legend class="LP-Form__Legend">{% trans 'Submit images to a place' %}</legend>
{% csrf_token %}
<div class="LP-Form__Composition">

8
django_lostplaces/lostplaces/templates/registration/login.html
View File

@ -1,13 +1,13 @@
{% extends 'global.html'%}
{% load static %}
{% load i18n %}
# {% block title %}{% translate 'Login' %}{% endblock %}
# {% block title %}{% trans 'Login' %}{% endblock %}
{% block maincontent %}
<form class="LP-Form" method="POST" enctype="multipart/form-data">
<fieldset class="LP-Form__Fieldset">
<legend class="LP-Form__Legend">{% translate 'Login' %}</legend>
<legend class="LP-Form__Legend">{% trans 'Login' %}</legend>
{% csrf_token %}
<div class="LP-Form__Composition LP-Form__Composition--breakable">
<div class="LP-Form__Field">
@ -20,12 +20,12 @@
<div class="LP-Form__Composition LP-Form__Composition--buttons">
<div class="LP-Form__Field LP-Form__Button LP-Input">
<button class="LP-Button">{% translate 'Login' %}</button>
<button class="LP-Button">{% trans 'Login' %}</button>
</div>
</div>
</fieldset>
</form>
<p class="LP-Headline">{% translate 'Have No Account Yet?' %} <a class="LP-Link" href="{% url 'signup' %}"><span class="LP-Link__Text">{% translate 'Sign Up' %}</span></a></p>
<p class="LP-Headline">{% trans 'Have No Account Yet?' %} <a class="LP-Link" href="{% url 'signup' %}"><span class="LP-Link__Text">{% trans 'Sign Up' %}</span></a></p>
{% endblock maincontent %}

6
django_lostplaces/lostplaces/templates/signup.html
View File

@ -3,13 +3,13 @@
{% load i18n %}
{% load widget_tweaks %}
# {% block title %}{% translate 'Sign up' %}{% endblock %}
# {% block title %}{% trans 'Sign up' %}{% endblock %}
{% block maincontent %}
<form class="LP-Form" method="POST">
<fieldset class="LP-Form__Fieldset">
<legend class="LP-Form__Legend">{% translate 'Sign Up' %}</legend>
<legend class="LP-Form__Legend">{% trans 'Sign Up' %}</legend>
{% csrf_token %}
<div class="LP-Form__Composition LP-Form__Composition--breakable">
<div class="LP-Form__Field">
@ -38,7 +38,7 @@
<div class="LP-Form__Composition LP-Form__Composition--buttons">
<div class="LP-Form__Field LP-Form__Button LP-Input">
<button class="LP-Button">{% translate 'Sign Up' %}</button>
<button class="LP-Button">{% trans 'Sign Up' %}</button>
</div>
</div>
</fieldset>