summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEvgeny Fadeev <evgeny.fadeev@gmail.com>2014-09-04 10:39:26 +0700
committerEvgeny Fadeev <evgeny.fadeev@gmail.com>2014-09-04 10:39:26 +0700
commitbc1244e44b0a7501eec74d5f5c41bbeca5041f92 (patch)
tree68a3340a610b9b0b0400cb8599fb98254fcd3354
parentbc1acd6f3e720cdff8d5d8af07d6ade216c877f4 (diff)
downloadaskbot-bc1244e44b0a7501eec74d5f5c41bbeca5041f92.tar.gz
askbot-bc1244e44b0a7501eec74d5f5c41bbeca5041f92.tar.bz2
askbot-bc1244e44b0a7501eec74d5f5c41bbeca5041f92.zip
moved some message strings for js from the main_page to the site-wide js footer
-rw-r--r--askbot/templates/main_page.html4
-rw-r--r--askbot/templates/meta/bottom_scripts.html4
2 files changed, 4 insertions, 4 deletions
diff --git a/askbot/templates/main_page.html b/askbot/templates/main_page.html
index 19c447a2..207e064d 100644
--- a/askbot/templates/main_page.html
+++ b/askbot/templates/main_page.html
@@ -29,10 +29,6 @@
<script type="text/javascript">
{# cant cache this #}
askbot['settings']['showSortByRelevance'] = {{ show_sort_by_relevance|as_js_bool }};
- askbot['messages']['questionSingular'] = '{{ settings.WORDS_QUESTION_SINGULAR|escapejs }}';
- askbot['messages']['answerSingular'] = '{{ settings.WORDS_ANSWER_SINGULAR|escapejs }}';
- askbot['messages']['acceptOwnAnswer'] = '{{ settings.WORDS_ACCEPT_OR_UNACCEPT_OWN_ANSWER|escapejs }}';
- askbot['messages']['followQuestions'] = '{{ settings.WORDS_FOLLOW_QUESTIONS|escapejs }}';
</script>
{% include "main_page/javascript.html" %}
{% include "main_page/custom_javascript.html" ignore missing %}
diff --git a/askbot/templates/meta/bottom_scripts.html b/askbot/templates/meta/bottom_scripts.html
index c027258e..7af13b46 100644
--- a/askbot/templates/meta/bottom_scripts.html
+++ b/askbot/templates/meta/bottom_scripts.html
@@ -34,6 +34,10 @@
askbot['settings']['editorType'] = '{{ settings.EDITOR_TYPE }}';
askbot['settings']['commentsEditorType'] = '{{ settings.COMMENTS_EDITOR_TYPE }}';
askbot['messages']['askYourQuestion'] = '{{ settings.WORDS_ASK_YOUR_QUESTION }}';
+ askbot['messages']['questionSingular'] = '{{ settings.WORDS_QUESTION_SINGULAR|escapejs }}';
+ askbot['messages']['answerSingular'] = '{{ settings.WORDS_ANSWER_SINGULAR|escapejs }}';
+ askbot['messages']['acceptOwnAnswer'] = '{{ settings.WORDS_ACCEPT_OR_UNACCEPT_OWN_ANSWER|escapejs }}';
+ askbot['messages']['followQuestions'] = '{{ settings.WORDS_FOLLOW_QUESTIONS|escapejs }}';
{% if settings.ALLOWED_UPLOAD_FILE_TYPES %}
askbot['settings']['allowedUploadFileTypes'] = [
"{{ settings.ALLOWED_UPLOAD_FILE_TYPES|join('", "')|replace('.','') }}"