Skip to content

Commit ee37e25

Browse files
altostratousaltostratous
committed
Add access to blog.
1 parent 83f7939 commit ee37e25

File tree

20 files changed

+139
-69
lines changed

20 files changed

+139
-69
lines changed

‎aic_site/context_processors.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ def menu(request):
1313
_('History'): reverse('intro:index') + "#section-history",
1414
_('Schedule'): reverse('intro:index') + '#section-schedule',
1515
_('FAQ'): reverse('intro:faq'),
16-
_('Q&A'): '/blog',
16+
_('Blog and Q&A'): '/blog',
1717
_('Contact Us'): reverse('intro:index') + '#section-organizer'
1818
}
1919
}
@@ -31,7 +31,7 @@ def menu(request):
3131
_('Blog'): {
3232
'dropdown': {
3333
_('FAQ'): reverse('intro:faq'),
34-
_('Q&A'): '/blog',
34+
_('Blog and Q&A'): '/blog',
3535
}
3636
},
3737
_('Game'): {

‎apps/accounts/locale/fa/LC_MESSAGES/django.po‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ msgid ""
88
msgstr ""
99
"Project-Id-Version: PACKAGE VERSION\n"
1010
"Report-Msgid-Bugs-To: \n"
11-
"POT-Creation-Date: 2018-02-01 11:30+0000\n"
11+
"POT-Creation-Date: 2018-02-01 12:49+0000\n"
1212
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
1313
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
1414
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -91,7 +91,13 @@ msgstr "نام کاربری"
9191
msgid "Password"
9292
msgstr "رمز"
9393

94-
#: apps/accounts/templates/accounts/login.html:32
94+
#: apps/accounts/templates/accounts/login.html:31
95+
#: apps/accounts/templates/accounts/signup.html:5
96+
#: apps/accounts/templates/accounts/update_profile.html:5
97+
msgid "Sign Up"
98+
msgstr "ثبت نام"
99+
100+
#: apps/accounts/templates/accounts/login.html:33
95101
msgid "I forgot my password"
96102
msgstr "رمزم را فراموش کردم"
97103

@@ -143,11 +149,6 @@ msgstr "هنوز همه اعضا شرکت در مسابقه را تایید نک
143149
msgid "Create New Team"
144150
msgstr "ایجاد تیم جدید"
145151

146-
#: apps/accounts/templates/accounts/signup.html:5
147-
#: apps/accounts/templates/accounts/update_profile.html:5
148-
msgid "Sign Up"
149-
msgstr "ثبت نام"
150-
151152
#: apps/accounts/templates/accounts/signup.html:10
152153
msgid "SignUp Form"
153154
msgstr "ثبت نام"

‎apps/accounts/templates/accounts/login.html‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ <h3 class="ui dividing header">{% trans 'Login' %}</h3>
2828

2929

3030
<button type="submit" class="ui green button">{% trans 'Login' %}</button>
31+
<a href="{% url 'accounts:signup' %}" class="ui green button">{% trans 'Sign Up' %}</a>
3132
<p>
3233
<a class="ui blue link" href="{% url 'password_reset' %}">{% trans 'I forgot my password' %}</a>
3334
</p>

‎apps/accounts/templates/email/locale/fa/LC_MESSAGES/django.po‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ msgid ""
88
msgstr ""
99
"Project-Id-Version: PACKAGE VERSION\n"
1010
"Report-Msgid-Bugs-To: \n"
11-
"POT-Creation-Date: 2018-02-01 11:30+0000\n"
11+
"POT-Creation-Date: 2018-02-01 12:49+0000\n"
1212
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
1313
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
1414
"Language-Team: LANGUAGE <LL@li.org>\n"

‎apps/game/locale/fa/LC_MESSAGES/django.po‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ msgid ""
88
msgstr ""
99
"Project-Id-Version: PACKAGE VERSION\n"
1010
"Report-Msgid-Bugs-To: \n"
11-
"POT-Creation-Date: 2018-02-01 11:30+0000\n"
11+
"POT-Creation-Date: 2018-02-01 12:49+0000\n"
1212
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
1313
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
1414
"Language-Team: LANGUAGE <LL@li.org>\n"

‎apps/intro/locale/fa/LC_MESSAGES/django.po‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ msgid ""
88
msgstr ""
99
"Project-Id-Version: PACKAGE VERSION\n"
1010
"Report-Msgid-Bugs-To: \n"
11-
"POT-Creation-Date: 2018-02-01 11:30+0000\n"
11+
"POT-Creation-Date: 2018-02-01 12:49+0000\n"
1212
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
1313
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
1414
"Language-Team: LANGUAGE <LL@li.org>\n"

‎locale/fa/LC_MESSAGES/django.po‎

Lines changed: 86 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ msgid ""
88
msgstr ""
99
"Project-Id-Version: PACKAGE VERSION\n"
1010
"Report-Msgid-Bugs-To: \n"
11-
"POT-Creation-Date: 2018-02-01 11:30+0000\n"
11+
"POT-Creation-Date: 2018-02-01 12:49+0000\n"
1212
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
1313
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
1414
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -43,9 +43,9 @@ msgid "FAQ"
4343
msgstr "سوالات متداول"
4444

4545
#: aic_site/context_processors.py:16 aic_site/context_processors.py:34
46-
#: templates/zinnia/entry_detail_base.html:66
47-
msgid "Q&A"
48-
msgstr "پرسش و پاسخ"
46+
#: templates/base/navbar.html:59
47+
msgid "Blog and Q&A"
48+
msgstr "وبلاگ و پرسش و پاسخ"
4949

5050
#: aic_site/context_processors.py:17 aic_site/context_processors.py:28
5151
msgid "Contact Us"
@@ -212,7 +212,7 @@ msgid "Thanks for flagging"
212212
msgstr ""
213213

214214
#: templates/comments/form.html:51 templates/comments/preview.html:36
215-
#: templates/comments/zinnia/entry/form.html:49
215+
#: templates/comments/zinnia/entry/form.html:51
216216
msgid "Post"
217217
msgstr "فرستادن"
218218

@@ -619,56 +619,69 @@ msgstr "سال قبل"
619619
msgid "Next year"
620620
msgstr "سال بعد"
621621

622-
#: templates/zinnia/entry_detail_base.html:28
622+
#: templates/zinnia/entry_detail_base.html:29
623623
#, python-format
624624
msgid "RSS feed of discussions on %(object)s"
625625
msgstr "فید RSS بحث %(object)s"
626626

627-
#: templates/zinnia/entry_detail_base.html:31
627+
#: templates/zinnia/entry_detail_base.html:32
628628
#, python-format
629629
msgid "RSS feed of comments on %(object)s"
630630
msgstr "فید RSS نظرات %(object)s"
631631

632-
#: templates/zinnia/entry_detail_base.html:34
632+
#: templates/zinnia/entry_detail_base.html:35
633633
#, python-format
634634
msgid "RSS feed of pingbacks on %(object)s"
635635
msgstr ""
636636

637-
#: templates/zinnia/entry_detail_base.html:37
637+
#: templates/zinnia/entry_detail_base.html:38
638638
#, python-format
639639
msgid "RSS feed of trackbacks on %(object)s"
640640
msgstr ""
641641

642-
#: templates/zinnia/entry_detail_base.html:88
643-
#: templates/zinnia/entry_detail_base.html:129
642+
#: templates/zinnia/entry_detail_base.html:67
643+
#| msgid "Comment as"
644+
msgid "Comments and Q&A"
645+
msgstr "پرسش و پاسخ و نظرات"
646+
647+
#: templates/zinnia/entry_detail_base.html:89
644648
#, python-format
645649
msgid ""
646-
"<a href=\"%(comment_url)s\" rel=\"external nofollow\" class=\"fn url\">"
647-
"%(comment_name)s</a> on <time class=\"comment-published\" datetime="
648-
"\"%(comment_technical_date)s\"> %(comment_human_date)s </time> <a href="
649-
"\"#comment-%(comment_pk)s-by-%(comment_author_slug)s\" id=\"c%(comment_pk)s"
650-
"\" class=\"anchor-link\" title=\"Direct link to this comment\">"
651-
"%(comment_title)s</a>"
650+
"<a href=\"#comment-%(comment_pk)s-by-%(comment_author_slug)s\" id=\"c"
651+
"%(comment_pk)s\" class=\"anchor-link ui header\" title=\"Direct link to this "
652+
"comment\" class=\"large\"> %(comment_title)s </a> <a href=\"%(comment_url)s"
653+
"\" rel=\"external nofollow\" class=\"fn url header\">%(comment_name)s</a> on "
654+
"<time class=\"comment-published\" datetime=\"%(comment_technical_date)s\"> "
655+
"%(comment_human_date)s </time>"
652656
msgstr ""
653-
"<a href=\"%(comment_url)s\" rel=\"external nofollow\" class=\"fn url\">"
654-
"%(comment_name)s</a> در <time class=\"comment-published\" datetime="
655-
"\"%(comment_technical_date)s\"> %(comment_human_date)s </time> <a href="
656-
"\"#comment-%(comment_pk)s-by-%(comment_author_slug)s\" id=\"c%(comment_pk)s"
657-
"\" class=\"anchor-link\" title=\"لینک مستقیم به این نظر\">%(comment_title)s</"
658-
"a>"
659657

660-
#: templates/zinnia/entry_detail_base.html:164
661-
#: templates/zinnia/entry_detail_base.html:170
658+
#: templates/zinnia/entry_detail_base.html:131
659+
#, python-format
660+
msgid ""
661+
"<a href=\"#comment-%(comment_pk)s-by-%(comment_author_slug)s\" id=\"c"
662+
"%(comment_pk)s\" class=\"anchor-link ui header\" title=\"Direct link to this "
663+
"comment\">%(comment_title)s</a> <a href=\"%(comment_url)s\" rel=\"external "
664+
"nofollow\" class=\"fn url large\">%(comment_name)s</a> on <time class="
665+
"\"comment-published\" datetime=\"%(comment_technical_date)s\"> "
666+
"%(comment_human_date)s </time>"
667+
msgstr ""
668+
669+
#: templates/zinnia/entry_detail_base.html:166
670+
#: templates/zinnia/entry_detail_base.html:172
662671
msgid "Comments are closed."
663672
msgstr "نظرات بسته است."
664673

665-
#: templates/zinnia/entry_detail_base.html:168
674+
#: templates/zinnia/entry_detail_base.html:170
666675
#: templates/zinnia/tags/comments_recent.html:18
667676
msgid "No comments yet."
668677
msgstr "بدون نظر"
669678

670-
#: templates/zinnia/entry_detail_base.html:189
671-
#: templates/zinnia/entry_detail_base.html:190
679+
#: templates/zinnia/entry_detail_base.html:184
680+
msgid "Login To Comment"
681+
msgstr "برای پرسش و پاسخ وارد شوید"
682+
683+
#: templates/zinnia/entry_detail_base.html:193
684+
#: templates/zinnia/entry_detail_base.html:194
672685
msgid "Edit the entry"
673686
msgstr "ویرایش نوشته"
674687

@@ -998,6 +1011,51 @@ msgid "%(entry_count)s entry tagged by %(tag)s"
9981011
msgid_plural "%(entry_count)s entries tagged by %(tag)s"
9991012
msgstr[0] "%(entry_count)s تا پست با تگ %(tag)s"
10001013

1014+
#~| msgid ""
1015+
#~| "<a href=\"%(comment_url)s\" rel=\"external nofollow\" class=\"fn url\">"
1016+
#~| "%(comment_name)s</a> on <time class=\"comment-published\" datetime="
1017+
#~| "\"%(comment_technical_date)s\"> %(comment_human_date)s </time> <a href="
1018+
#~| "\"#comment-%(comment_pk)s-by-%(comment_author_slug)s\" id=\"c"
1019+
#~| "%(comment_pk)s\" class=\"anchor-link\" title=\"Direct link to this "
1020+
#~| "comment\">%(comment_title)s</a>"
1021+
#~ msgid ""
1022+
#~ "<a href=\"%(comment_url)s\" rel=\"external nofollow\" class=\"fn url "
1023+
#~ "header\">%(comment_name)s</a> on <time class=\"comment-published\" "
1024+
#~ "datetime=\"%(comment_technical_date)s\"> %(comment_human_date)s </time> "
1025+
#~ "<a href=\"#comment-%(comment_pk)s-by-%(comment_author_slug)s\" id=\"c"
1026+
#~ "%(comment_pk)s\" class=\"anchor-link\" title=\"Direct link to this comment"
1027+
#~ "\" class=\"large\"> %(comment_title)s </a>"
1028+
#~ msgstr ""
1029+
#~ "<a href=\"%(comment_url)s\" rel=\"external nofollow\" class=\"fn url\">"
1030+
#~ "%(comment_name)s</a> در <time class=\"comment-published\" datetime="
1031+
#~ "\"%(comment_technical_date)s\"> %(comment_human_date)s </time> <a href="
1032+
#~ "\"#comment-%(comment_pk)s-by-%(comment_author_slug)s\" id=\"c"
1033+
#~ "%(comment_pk)s\" class=\"anchor-link\" title=\"لینک مستقیم به این نظر\">"
1034+
#~ "%(comment_title)s</a>"
1035+
1036+
#, fuzzy
1037+
#~| msgid ""
1038+
#~| "<a href=\"%(comment_url)s\" rel=\"external nofollow\" class=\"fn url\">"
1039+
#~| "%(comment_name)s</a> on <time class=\"comment-published\" datetime="
1040+
#~| "\"%(comment_technical_date)s\"> %(comment_human_date)s </time> <a href="
1041+
#~| "\"#comment-%(comment_pk)s-by-%(comment_author_slug)s\" id=\"c"
1042+
#~| "%(comment_pk)s\" class=\"anchor-link\" title=\"Direct link to this "
1043+
#~| "comment\">%(comment_title)s</a>"
1044+
#~ msgid ""
1045+
#~ "<a href=\"%(comment_url)s\" rel=\"external nofollow\" class=\"fn url large"
1046+
#~ "\">%(comment_name)s</a> on <time class=\"comment-published\" datetime="
1047+
#~ "\"%(comment_technical_date)s\"> %(comment_human_date)s </time><span> </"
1048+
#~ "span> <a href=\"#comment-%(comment_pk)s-by-%(comment_author_slug)s\" id="
1049+
#~ "\"c%(comment_pk)s\" class=\"anchor-link ui header\" title=\"Direct link "
1050+
#~ "to this comment\">%(comment_title)s</a>"
1051+
#~ msgstr ""
1052+
#~ "<a href=\"%(comment_url)s\" rel=\"external nofollow\" class=\"fn url\">"
1053+
#~ "%(comment_name)s</a> در <time class=\"comment-published\" datetime="
1054+
#~ "\"%(comment_technical_date)s\"> %(comment_human_date)s </time> <a href="
1055+
#~ "\"#comment-%(comment_pk)s-by-%(comment_author_slug)s\" id=\"c"
1056+
#~ "%(comment_pk)s\" class=\"anchor-link\" title=\"لینک مستقیم به این نظر\">"
1057+
#~ "%(comment_title)s</a>"
1058+
10011059
#~ msgid "Password Reset"
10021060
#~ msgstr "بازیابی رمز"
10031061

‎templates/base/navbar.html‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,10 @@
5656
<a class="fitted item popup-link" onclick="document.changeLang.submit();" href="#" data-tooltip="{% trans 'Change Language' %}" data-position="left center" data-inverted="">
5757
<i class="world icon large-icon"></i>
5858
</a>
59+
<a class="fitted item popup-link" href="/blog" data-tooltip="{% trans 'Blog and Q&A' %}" data-position="left center" data-inverted="">
60+
<i class="help icon large-icon"></i>
61+
</a>
62+
5963
{% if not no_sidebar %}
6064
<div style="cursor: pointer;" class="fitted item" onclick="$('.ui.sidebar').sidebar('toggle');">
6165
<i class="sidebar icon large-icon"></i>

‎templates/comments/approve.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
{% extends "comments/base.html" %}
1+
{% extends "base/base.html" %}
22
{% load i18n %}
33

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

6-
{% block content %}
6+
{% block container %}
77
<h1>{% trans "Really make this comment public?" %}</h1>
88
<blockquote>{{ comment|linebreaks }}</blockquote>
99
<form action="." method="post">{% csrf_token %}

‎templates/comments/approved.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
{% extends "comments/base.html" %}
1+
{% extends "base/base.html" %}
22
{% load i18n %}
33

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

6-
{% block content %}
6+
{% block container %}
77
<h1>{% trans "Thanks for taking the time to improve the quality of discussion on our site" %}.</h1>
88
{% endblock %}

0 commit comments

Comments
 (0)