yul/bookwyrm-mastodon
1
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #812 from SavinaRoja/357-tz-in-datetimes

Browse Source 
357 Users set preferred timezone, used for readthroughs
This commit is contained in:
Mouse Reeve
2021-03-29 15:20:01 -07:00
committed by GitHub
parent 47cf1f3b22 765e6b542f
commit e86f160c53
20 changed files with 3053 additions and 620 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
bookwyrm/templates/preferences/edit_user.html
View File

@ -61,6 +61,12 @@
{% url 'directory' as path %}
<p class="help">{% blocktrans %}Your account will show up in the <a href="{{ path }}">directory</a>, and may be recommended to other BookWyrm users.{% endblocktrans %}</p>
</div>
<button class="button is-primary" type="submit">{% trans "Save" %}</button>
<div class="block">
<label class="label" for="id_preferred_timezone">{% trans "Preferred Timezone: " %}</label>
<div class="select">
{{ form.preferred_timezone }}
</div>
</div>
<div class="block"><button class="button is-primary" type="submit">{% trans "Save" %}</button></div>
</form>
{% endblock %}

5
bookwyrm/templates/snippets/readthrough.html
View File

@ -1,5 +1,6 @@
{% load i18n %}
{% load humanize %}
{% load tz %}
<div class="content block">
<div id="hide-edit-readthrough-{{ readthrough.id }}">
<div class="columns">
@ -8,7 +9,7 @@
</dl>
<ul>
{% if readthrough.finish_date or readthrough.progress %}
<li>{% if readthrough.finish_date %} {{ readthrough.finish_date | naturalday }}: {% trans "finished" %} {% else %}{% if readthrough.progress_mode == 'PG' %}on page {{ readthrough.progress }}{% if book.pages %} of {{ book.pages }}{% endif %}
<li>{% if readthrough.finish_date %} {{ readthrough.finish_date | localtime | naturalday }}: {% trans "finished" %} {% else %}{% if readthrough.progress_mode == 'PG' %}on page {{ readthrough.progress }}{% if book.pages %} of {{ book.pages }}{% endif %}
{% else %}{{ readthrough.progress }}%{% endif %}{% endif %}
{% if readthrough.progress %}
{% trans "Show all updates" as button_text %}
@ -37,7 +38,7 @@
{% endif %}
</li>
{% endif %}
<li>{{ readthrough.start_date | naturalday }}: {% trans "started" %}</li>
<li>{{ readthrough.start_date | localtime | naturalday }}: {% trans "started" %}</li>
</ul>
</div>
<div class="column is-narrow">