diff options
| author | Evgeny Fadeev <evgeny.fadeev@gmail.com> | 2013-04-22 19:58:43 -0400 |
|---|---|---|
| committer | Evgeny Fadeev <evgeny.fadeev@gmail.com> | 2013-04-22 19:58:43 -0400 |
| commit | 697d0cf56906b867e77ae995501a7cbcb9ce767f (patch) | |
| tree | e7c25eb980628dd4d3916e80c94905db0cee492c | |
| parent | 697ea4fc2e363f064ff012ebf382a3c7a69db3f7 (diff) | |
| parent | ecba919218ba7b6fb90be9c0a7958c6e89832574 (diff) | |
| download | askbot-697d0cf56906b867e77ae995501a7cbcb9ce767f.tar.gz askbot-697d0cf56906b867e77ae995501a7cbcb9ce767f.tar.bz2 askbot-697d0cf56906b867e77ae995501a7cbcb9ce767f.zip | |
Merge branch 'master' of github.com:ASKBOT/askbot-devel
| -rw-r--r-- | askbot/mail/__init__.py | 2 | ||||
| -rw-r--r-- | askbot/templates/question/question_controls.html | 12 |
2 files changed, 7 insertions, 7 deletions
diff --git a/askbot/mail/__init__.py b/askbot/mail/__init__.py index 60deec68..e5f97deb 100644 --- a/askbot/mail/__init__.py +++ b/askbot/mail/__init__.py @@ -176,7 +176,7 @@ def mail_moderators( msg.content_subtype = 'html' msg.send() except smtplib.SMTPException, error: - sys.stderr.write('\n' + error.encode('utf-8') + '\n') + sys.stderr.write('\n' + unicode(error).encode('utf-8') + '\n') if raise_on_failure == True: raise exceptions.EmailNotSent(unicode(error)) diff --git a/askbot/templates/question/question_controls.html b/askbot/templates/question/question_controls.html index 88ef42d8..ddb40e1d 100644 --- a/askbot/templates/question/question_controls.html +++ b/askbot/templates/question/question_controls.html @@ -2,23 +2,23 @@ <script type="text/javascript"> var retagUrl = "{% url retag_question question.id %}"; </script> -<a id="retag" class="question-retag"href="{% url retag_question question.id %}">{% trans %}retag{% endtrans %}</a> +<a id="retag" class="question-retag" href="{% url retag_question question.id %}">{% trans %}retag{% endtrans %}</a> {% if question.offensive_flag_count > 0 %} - <span + <span id="question-offensive-remove-flag-{{ question.id }}" class="offensive-flag" title="{% trans %}report as offensive (i.e containing spam, advertising, malicious text, etc.){% endtrans %}" > <a class="question-flag">{% trans %}remove flag{% endtrans %}</a> </span> - <span + <span id="question-offensive-flag-{{ question.id }}" class="offensive-flag" title="{% trans %}report as offensive (i.e containing spam, advertising, malicious text, etc.){% endtrans %}" > <a class="question-flag">{% trans %}flag offensive{% endtrans %} ({{ question.offensive_flag_count }})</a> </span> {% else %} - <span + <span id="question-offensive-flag-{{ question.id }}" class="offensive-flag" title="{% trans %}report as offensive (i.e containing spam, advertising, malicious text, etc.){% endtrans %}" > @@ -26,11 +26,11 @@ </span> {% endif %} {% if thread.closed %} - <a class="question-close" href="{% url reopen question.id %}">{% trans %}reopen{% endtrans %}</a> + <a class="question-close" href="{% url reopen question.id %}">{% trans %}reopen{% endtrans %}</a> {% else %} <a class="question-close" href="{% url close question.id %}">{% trans %}close{% endtrans %}</a> {% endif %} -<a +<a id="post-{{question.id}}-delete" class="question-delete" >{% if question.deleted %}{% trans %}undelete{% endtrans %}{% else %}{% trans %}delete{% endtrans %}{% endif %}</a> |