diff --git a/aic_site/urls.py b/aic_site/urls.py index 418b9df0..9b7c7f19 100644 --- a/aic_site/urls.py +++ b/aic_site/urls.py @@ -13,6 +13,7 @@ 1. Import the include() function: from django.conf.urls import url, include 2. Add a URL to urlpatterns: url(r'^blog/', include('blog.urls')) """ +from django.conf import settings from django.conf.urls import url, include from django.contrib.auth import views as auth_views from django.contrib import admin @@ -37,3 +38,7 @@ url(r'^game/', include(game_urls)), url(r'^articles/comments/', include('django_comments.urls')), ] + +if settings.DEBUG: + from django.conf.urls.static import static + urlpatterns += static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT) \ No newline at end of file diff --git a/apps/accounts/locale/fa/LC_MESSAGES/django.po b/apps/accounts/locale/fa/LC_MESSAGES/django.po index 472744f9..32915326 100644 --- a/apps/accounts/locale/fa/LC_MESSAGES/django.po +++ b/apps/accounts/locale/fa/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-02-01 12:49+0000\n" +"POT-Creation-Date: 2018-02-01 14:06+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/apps/accounts/templates/email/locale/fa/LC_MESSAGES/django.po b/apps/accounts/templates/email/locale/fa/LC_MESSAGES/django.po index aab0c350..de285418 100644 --- a/apps/accounts/templates/email/locale/fa/LC_MESSAGES/django.po +++ b/apps/accounts/templates/email/locale/fa/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-02-01 12:49+0000\n" +"POT-Creation-Date: 2018-02-01 14:06+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/apps/game/locale/fa/LC_MESSAGES/django.po b/apps/game/locale/fa/LC_MESSAGES/django.po index 9ddedbba..afecb5cb 100644 --- a/apps/game/locale/fa/LC_MESSAGES/django.po +++ b/apps/game/locale/fa/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-02-01 12:49+0000\n" +"POT-Creation-Date: 2018-02-01 14:06+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/apps/intro/locale/fa/LC_MESSAGES/django.po b/apps/intro/locale/fa/LC_MESSAGES/django.po index f9b12ec9..a30efa81 100644 --- a/apps/intro/locale/fa/LC_MESSAGES/django.po +++ b/apps/intro/locale/fa/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-02-01 12:49+0000\n" +"POT-Creation-Date: 2018-02-01 14:06+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/deploy/docker-compose.yml b/deploy/docker-compose.yml index cc1c1ea3..461b4600 100644 --- a/deploy/docker-compose.yml +++ b/deploy/docker-compose.yml @@ -11,6 +11,7 @@ services: - 443:443 volumes: - ./static/root:/static/root/static + - ../media/root:/static/root/media - /var/log/aic_site:/var/log/aic_site - ./config/nginx/sites-enabled:/etc/nginx/sites-enabled - ./config/nginx/sites-available:/etc/nginx/sites-available @@ -28,6 +29,7 @@ services: # cp /patches/zinnia_migrations.py /usr/local/lib/python3.5/dist-packages/zinnia/migrations/0003_publication_date.py && volumes: - ./static/root:/root/aic_site/static/root + - ../media/root:/root/aic_site/media - ./patches:/patches depends_on: - aic_db diff --git a/deploy/docker-compose_test.yml b/deploy/docker-compose_test.yml index 256a51db..88c5580e 100644 --- a/deploy/docker-compose_test.yml +++ b/deploy/docker-compose_test.yml @@ -9,6 +9,7 @@ services: - 2016:2016 volumes: - ./static/root:/static/root/static + - ../media_test/root:/static/root/media - /var/log/aic_test_site:/var/log/aic_test_site - ./config/nginx/sites-enabled:/etc/nginx/sites-enabled - ./config/nginx/sites-available:/etc/nginx/sites-available @@ -26,6 +27,7 @@ services: # cp /patches/zinnia_migrations.py /usr/local/lib/python3.5/dist-packages/zinnia/migrations/0003_publication_date.py && volumes: - ./static/root:/root/aic_site/static/root + - ../media_test/root:/root/aic_site/media depends_on: - aic_test_db expose: diff --git a/locale/fa/LC_MESSAGES/django.po b/locale/fa/LC_MESSAGES/django.po index 44e6ffad..288ef0be 100644 --- a/locale/fa/LC_MESSAGES/django.po +++ b/locale/fa/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-02-01 12:49+0000\n" +"POT-Creation-Date: 2018-02-01 14:06+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -59,7 +59,7 @@ msgstr "بلاگ" msgid "Game" msgstr "بازی" -#: aic_site/context_processors.py:39 +#: aic_site/context_processors.py:39 templates/base/navbar.html:23 msgid "Panel" msgstr "پنل" @@ -140,10 +140,6 @@ msgstr "" "تمامی حقوق برای انجمن علمی دانشکده " "مهندسی کامپیوتر دانشگاه صنعتی شریف محفوظ است. " -#: templates/base/navbar.html:23 -msgid "Competition Area" -msgstr "محیط مسابقه" - #: templates/base/navbar.html:47 templates/zinnia/login.html:34 msgid "Login" msgstr "ورود" @@ -640,7 +636,6 @@ msgid "RSS feed of trackbacks on %(object)s" msgstr "" #: templates/zinnia/entry_detail_base.html:67 -#| msgid "Comment as" msgid "Comments and Q&A" msgstr "پرسش و پاسخ و نظرات" @@ -1011,6 +1006,9 @@ msgid "%(entry_count)s entry tagged by %(tag)s" msgid_plural "%(entry_count)s entries tagged by %(tag)s" msgstr[0] "%(entry_count)s تا پست با تگ %(tag)s" +#~ msgid "Competition Area" +#~ msgstr "محیط مسابقه" + #~| msgid "" #~| "" #~| "%(comment_name)s on