From: Jan Szejko <janek37@gmail.com>
Date: Fri, 14 Apr 2017 10:39:00 +0000 (+0200)
Subject: update year
X-Git-Url: https://git.mdrn.pl/prawokultury.git/commitdiff_plain/34f34890a9c2e1d0c2bfb851206ed6dfb2e4a57a

update year
---

diff --git a/prawokultury/contact_forms.py b/prawokultury/contact_forms.py
index 0cc995f..a223cf1 100644
--- a/prawokultury/contact_forms.py
+++ b/prawokultury/contact_forms.py
@@ -17,8 +17,8 @@ mark_safe_lazy = lazy(mark_safe, unicode)
 class RegistrationForm(ContactForm):
     form_tag = 'register'
 
-    save_as_tag = '2016'
-    conference_name = u'CopyCamp 2016'
+    save_as_tag = '2017'
+    conference_name = u'CopyCamp 2017'
     
     form_title = _('Registration')
     admin_list = ['first_name', 'last_name', 'organization']
@@ -175,7 +175,7 @@ tracks = (
 
 class RegisterSpeaker(RegistrationForm):
     form_tag = 'register-speaker'
-    save_as_tag = '2016-speaker'
+    save_as_tag = '2017-speaker'
     form_title = _('Open call for presentations')
 
     presentation_thematic_track = forms.ChoiceField(
@@ -273,8 +273,8 @@ class NextForm(ContactForm):
 
 class WorkshopForm(ContactForm):
     form_tag = 'workshops'
-    save_as_tag = 'workshops-2016'
-    conference_name = u'CopyCamp 2016'
+    save_as_tag = 'workshops-2017'
+    conference_name = u'CopyCamp 2017'
     form_title = _('Workshop')
 
     name = forms.CharField(label=_('Name'), max_length=128)
diff --git a/prawokultury/locale/pl/LC_MESSAGES/django.mo b/prawokultury/locale/pl/LC_MESSAGES/django.mo
index e52675d..79b1456 100644
Binary files a/prawokultury/locale/pl/LC_MESSAGES/django.mo and b/prawokultury/locale/pl/LC_MESSAGES/django.mo differ
diff --git a/prawokultury/locale/pl/LC_MESSAGES/django.po b/prawokultury/locale/pl/LC_MESSAGES/django.po
index e87345c..03dbaf0 100644
--- a/prawokultury/locale/pl/LC_MESSAGES/django.po
+++ b/prawokultury/locale/pl/LC_MESSAGES/django.po
@@ -562,8 +562,8 @@ msgid "Message sent automatically. Please do not reply to it."
 msgstr "Wiadomość wysłana automatycznie, prosimy nie odpowiadać."
 
 #: templates/contact/register/mail_subject.txt:1
-msgid "Thank you for registering to CopyCamp 2016"
-msgstr "Dziękujemy za rejestrację na konferencję CopyCamp 2016"
+msgid "Thank you for registering to CopyCamp 2017"
+msgstr "Dziękujemy za rejestrację na konferencję CopyCamp 2017"
 
 #: templates/contact/register/thanks.html:5
 #: templates/contact/workshops/thanks.html:5
diff --git a/prawokultury/static/img/copycamp_2017_en.png b/prawokultury/static/img/copycamp_2017_en.png
new file mode 100644
index 0000000..0ddbac3
Binary files /dev/null and b/prawokultury/static/img/copycamp_2017_en.png differ
diff --git a/prawokultury/static/img/copycamp_2017_en_big.png b/prawokultury/static/img/copycamp_2017_en_big.png
new file mode 100644
index 0000000..2c5217f
Binary files /dev/null and b/prawokultury/static/img/copycamp_2017_en_big.png differ
diff --git a/prawokultury/static/img/copycamp_2017_pl.png b/prawokultury/static/img/copycamp_2017_pl.png
new file mode 100644
index 0000000..d9f5942
Binary files /dev/null and b/prawokultury/static/img/copycamp_2017_pl.png differ
diff --git a/prawokultury/static/img/copycamp_2017_pl_big.png b/prawokultury/static/img/copycamp_2017_pl_big.png
new file mode 100644
index 0000000..892bce5
Binary files /dev/null and b/prawokultury/static/img/copycamp_2017_pl_big.png differ
diff --git a/prawokultury/templates/base.html b/prawokultury/templates/base.html
index 97e1537..c7d3752 100755
--- a/prawokultury/templates/base.html
+++ b/prawokultury/templates/base.html
@@ -18,7 +18,7 @@
         <meta property='og:site_name' content='CopyCamp' />
         <meta property='og:description' content='{% block ogdescription %}{% trans "CopyCamp Conference is the first large-scale meeting in Poland devoted to the issues of copyright in both ideological and practical terms." %}{% endblock %}' />
         <meta property='og:type' content='{% block ogtype %}website{% endblock %}' />
-        <meta property='og:image' content='{% block ogimage %}https://copycamp.pl{% static "img/copycamp_2016_"|add:request.LANGUAGE_CODE|add:"_big.png" %}{% endblock %}' />
+        <meta property='og:image' content='{% block ogimage %}https://copycamp.pl{% static "img/copycamp_2017_"|add:request.LANGUAGE_CODE|add:"_big.png" %}{% endblock %}' />
         <meta property='og:locale' content='{% if LANGUAGE_CODE == 'en'%}en_US{% else %}pl_PL{% endif %}' />
     </head>
     <body>
@@ -33,7 +33,7 @@
         <div class="bar-left">
             <a id="logo" href="{% url "migdal_main" %}">
                 <img alt="{% trans "CopyCamp" %}"
-                    src="{% static "img/copycamp_2016_"|add:request.LANGUAGE_CODE|add:".png" %}" /></a>
+                    src="{% static "img/copycamp_2017_"|add:request.LANGUAGE_CODE|add:".png" %}" /></a>
         </div>
         <div class="bar-right">
             <a href="http://prawokultury.pl"><img src="{% static "img/logo_160.png" %}" alt="PrawoKultury.pl"/></a>
diff --git a/prawokultury/templates/contact/register/mail_subject.txt b/prawokultury/templates/contact/register/mail_subject.txt
index 6e38131..27f9858 100755
--- a/prawokultury/templates/contact/register/mail_subject.txt
+++ b/prawokultury/templates/contact/register/mail_subject.txt
@@ -1 +1 @@
-{% load i18n %}{% trans "Thank you for registering to CopyCamp 2016" %}
+{% load i18n %}{% trans "Thank you for registering to CopyCamp 2017" %}