Commit ccc2387f authored by Malcolm Tredinnick's avatar Malcolm Tredinnick
Browse files

[1.0.X] Add internationalisation support to the comment templates. Fixed #8868, #8905 

Thanks to zgoda for a patch that did most of the internationalisation part.

Backport of r9119 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9126 bcc190cf-cafb-0310-a4f2-bffc1f526a37
parent 38930702

django/contrib/comments/templates/comments/approve.html

+4 −3
Original line number Diff line number Diff line 
{% extends "comments/base.html" %}

{% load i18n %}



{% block title %}Approve a comment{% endblock %}

{% block title %}{% trans "Approve a comment" %}{% endblock %}



{% block content %}

  <h1>Really make this comment public?</h1>

  <h1>{% trans "Really make this comment public?" %}</h1>

  <blockquote>{{ comment|linebreaks }}</blockquote>

  <form action="." method="post">

    <input type="hidden" name="next" value="{{ next }}" id="next" />

    <p class="submit">

      <input type="submit" name="submit" value="Approve" /> or <a href="{{ comment.permalink }}">cancel</a>

      <input type="submit" name="submit" value="{% trans "Approve" %}" /> or <a href="{{ comment.permalink }}">cancel</a>

    </p>

  </form>

{% endblock %}

django/contrib/comments/templates/comments/approved.html

+4 −3
Original line number Diff line number Diff line 
{% extends "comments/base.html" %}

{% load i18n %}



{% block title %}Thanks for approving.{% endblock %}

{% block title %}{% trans "Thanks for approving" %}.{% endblock %}



{% block content %}

  <h1>Thanks for taking the time to improve the quality of discussion on our site.</h1>

  <h1>{% trans "Thanks for taking the time to improve the quality of discussion on our site" %}.</h1>

{% endblock %}

django/contrib/comments/templates/comments/delete.html

+4 −3
Original line number Diff line number Diff line 
{% extends "comments/base.html" %}

{% load i18n %}



{% block title %}Remove a comment{% endblock %}

{% block title %}{% trans "Remove a comment" %}{% endblock %}



{% block content %}

  <h1>Really remove this comment?</h1>

<h1>{% trans "Really remove this comment?" %}</h1>

  <blockquote>{{ comment|linebreaks }}</blockquote>

  <form action="." method="post">

    <input type="hidden" name="next" value="{{ next }}" id="next" />

    <p class="submit">

      <input type="submit" name="submit" value="Remove" /> or <a href="{{ comment.permalink }}">cancel</a>

    <input type="submit" name="submit" value="{% trans "Remove" %}" /> or <a href="{{ comment.permalink }}">cancel</a>

    </p>

  </form>

{% endblock %}

django/contrib/comments/templates/comments/deleted.html

+4 −3
Original line number Diff line number Diff line 
{% extends "comments/base.html" %}

{% load i18n %}



{% block title %}Thanks for removing.{% endblock %}

{% block title %}{% trans "Thanks for removing" %}.{% endblock %}



{% block content %}

  <h1>Thanks for taking the time to improve the quality of discussion on our site.</h1>

  <h1>{% trans "Thanks for taking the time to improve the quality of discussion on our site" %}.</h1>

{% endblock %}

django/contrib/comments/templates/comments/flag.html

+4 −3
Original line number Diff line number Diff line 
{% extends "comments/base.html" %}

{% load i18n %}



{% block title %}Flag this comment{% endblock %}

{% block title %}{% trans "Flag this comment" %}{% endblock %}



{% block content %}

  <h1>Really flag this comment?</h1>

<h1>{% trans "Really flag this comment?" %}</h1>

  <blockquote>{{ comment|linebreaks }}</blockquote>

  <form action="." method="post">

    <input type="hidden" name="next" value="{{ next }}" id="next" />

    <p class="submit">

      <input type="submit" name="submit" value="Flag" /> or <a href="{{ comment.permalink }}">cancel</a>

    <input type="submit" name="submit" value="{% trans "Flag" %}" /> or <a href="{{ comment.permalink }}">cancel</a>

    </p>

  </form>

{% endblock %}