diff options
| author | Adolfo Fitoria <fitoria@fitoria-laptop.(none)> | 2009-08-17 10:02:15 -0600 |
|---|---|---|
| committer | Adolfo Fitoria <fitoria@fitoria-laptop.(none)> | 2009-08-17 10:05:23 -0600 |
| commit | aba6338c8d37bea03b23f7013766bc32c5cfa278 (patch) | |
| tree | 95aa73f2ca48c253ce6b34578b129104cf1b8bc0 /templates/question.html | |
| parent | 50241d14814f63cd8c57d69d5fba8bcfc3409f28 (diff) | |
| parent | 5f2a6a9693292e0828a591a6d9a8ad5c7e637c84 (diff) | |
| download | askbot-aba6338c8d37bea03b23f7013766bc32c5cfa278.tar.gz askbot-aba6338c8d37bea03b23f7013766bc32c5cfa278.tar.bz2 askbot-aba6338c8d37bea03b23f7013766bc32c5cfa278.zip | |
Merge branch 'master' into experimental
Conflicts:
locale/es/LC_MESSAGES/django.mo
locale/es/LC_MESSAGES/django.po
Diffstat (limited to 'templates/question.html')
| -rw-r--r-- | templates/question.html | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/templates/question.html b/templates/question.html index d6257a71..facdc4f1 100644 --- a/templates/question.html +++ b/templates/question.html @@ -258,9 +258,9 @@ </table> {% if question.closed %} <div class="question-status" style="margin-bottom:15px"> - <h3>{% blocktrans %}The question has been closed for the following reason "{{ question.get_close_reason_display }}" by{% endblocktrans %} + <h3>{% trans "The question has been closed for the following reason" %} "{{ question.get_close_reason_display }}" {% trans "by"%} <a href="{{ question.closed_by.get_profile_url }}">{{ question.closed_by.username }}</a> - {% blocktrans %}close date {{question.closed_at}}{% endblocktrans %}</h3> + {% blocktrans %}close date {% endblocktrans %} {{question.closed_at|date:"d-m-Y H:i"}}</h3> </div> {% endif %} |