mirror
/
maposmatic
kopia lustrzana https://github.com/hholzgra/maposmatic/
1
0
Forkuj 0
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

fix errors from failed manual merging

site-osm-baustelle
Hartmut Holzgraefe 2023-01-17 15:59:30 +01:00
rodzic 1afc0f6f25
commit bbe2ab4d6e
1 zmienionych plików z 2 dodań i 2 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

4
www/maposmatic/templates/maposmatic/maps.html
Wyświetl plik

@ -96,7 +96,7 @@
<tr><td><strong>{% trans "Map locale" %}</strong></td><td>{{ MAP_LANGUAGES|getitem:map.map_language }}</td></tr>
{% with date=map.submission_time|date:"DATETIME_FORMAT" %}
<tr><td><strong>{% trans "Request submitted" %}</strong></td><td title="{{ date }}">{{ map.submission_time|timesince }} ago{% endblocktrans %}</td></tr>
<tr><td><strong>{% trans "Request submitted" %}</strong></td><td title="{{ date }}">{% blocktrans with map.submission_time|timesince as since %}{{since}} ago{% endblocktrans %}</td></tr>
{% endwith %}
{% if map.is_rendering %}
@ -110,7 +110,7 @@
<tr><td><strong>{% trans "Rendering started" %}</strong></td><td title="{{ date }}">{% blocktrans with map.startofrendering_time|timesince as since %}{{since}} ago{% endblocktrans %}, {% blocktrans %}after {{ duration}} in the queue{% endblocktrans %}</td></tr>
{% endwith %}
{% with date=map.endofrendering_time|date:"DATETIME_FORMAT" duration=map.startofrendering_time|timesince:map.endofrendering_time %}
<tr><td><strong>{% trans "Rendering completed" %}</strong></td><td title="{{ date }}">{% blockstrans with map.endofrendering_time|timesince as since %}{{since}} ago{% endblockstrans %}, {% blocktrans %}after {{ duration }} {% endblocktrans %}</td></tr>
<tr><td><strong>{% trans "Rendering completed" %}</strong></td><td title="{{ date }}">{% blocktrans with map.endofrendering_time|timesince as since %}{{since}} ago{% endblocktrans %}, {% blocktrans %}after {{ duration }} {% endblocktrans %}</td></tr>
{% endwith %}
{% endif %}