diff options
| author | czaks <marcin@6irc.net> | 2013-07-16 13:02:13 -0400 |
|---|---|---|
| committer | czaks <marcin@6irc.net> | 2013-07-16 13:02:13 -0400 |
| commit | 7bdb96a16b51eb8086fead11783bb095ea42cd90 (patch) | |
| tree | b236bbd6082d927e25ecf4b07ea45bb5e1206a60 /templates/banned.html | |
| parent | 8a598982a4f6ae48ad6e2a4d634314215871c4c1 (diff) | |
| parent | aadb57f2a2db9210468f25d7dcd45d561ef6ad54 (diff) | |
Merge branch 'master' of https://github.com/savetheinternet/Tinyboard
Conflicts:
install.php
templates/index.html
templates/thread.html
Diffstat (limited to 'templates/banned.html')
| -rw-r--r-- | templates/banned.html | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/templates/banned.html b/templates/banned.html index e912c1a9..e7b626f6 100644 --- a/templates/banned.html +++ b/templates/banned.html @@ -1,9 +1,17 @@ {% filter remove_whitespace %} {# Automatically removes unnecessary whitespace #} <div class="ban"> - <h2>{% trans %}You are banned! ;_;{% endtrans %}</h2> + {% if ban.expires and time() >= ban.expires %} + <h2>{% trans %}You were banned! ;_;{% endtrans %}</h2> + {% else %} + <h2>{% trans %}You are banned! ;_;{% endtrans %}</h2> + {% endif %} <p> - {% trans %}You have been banned from{% endtrans %} + {% if ban.expires and time() >= ban.expires %} + {% trans %}You were banned from{% endtrans %} + {% else %} + {% trans %}You have been banned from{% endtrans %} + {% endif %} {% if ban.board %} <strong>{{ config.board_abbreviation|sprintf(ban.board) }}</strong> {% else %} @@ -23,7 +31,9 @@ <p> {% trans %}Your ban was filed on{% endtrans %} <strong>{{ ban.set|date(config.ban_date) }}</strong> {% trans %}and{% endtrans %} <span id="expires"> - {% if ban.expires %} + {% if ban.expires and time() >= ban.expires %} + {% trans %} has since expired. Refresh the page to continue.{% endtrans %} + {% elseif ban.expires %} {% trans %}expires{% endtrans %} <span id="countdown">{{ ban.expires|until }}</span> {% trans %}from now, which is on{% endtrans %} <strong> {{ ban.expires|date(config.ban_date) }} |