update year

diff --git a/prawokultury/contact_forms.py b/prawokultury/contact_forms.py
index 2f7c0dd..bf6949a 100644 (file)
--- a/prawokultury/contact_forms.py
+++ b/prawokultury/contact_forms.py
@@ -21,8 +21,8 @@ mark_safe_lazy = lazy(mark_safe, unicode)
 class RegistrationForm(ContactForm):
     form_tag = 'register'
 
 class RegistrationForm(ContactForm):
     form_tag = 'register'
 

-    save_as_tag = '2017'
-    conference_name = u'CopyCamp 2017'
+    save_as_tag = '2018'
+    conference_name = u'CopyCamp 2018'

     notify_on_register = False
     
     form_title = _('Registration')
     notify_on_register = False
     
     form_title = _('Registration')


@@ -38,7 +38,7 @@ class RegistrationForm(ContactForm):
     organization = forms.CharField(label=_('Organization'), max_length=256, required=False)
     country = forms.ChoiceField(label=_('Country of residence'), choices=zip(COUNTRIES, COUNTRIES))
     travel_grant = forms.BooleanField(
     organization = forms.CharField(label=_('Organization'), max_length=256, required=False)
     country = forms.ChoiceField(label=_('Country of residence'), choices=zip(COUNTRIES, COUNTRIES))
     travel_grant = forms.BooleanField(

-        label=_('I require financial assistance to attend CopyCamp 2017.'), required=False)
+        label=_('I require financial assistance to attend CopyCamp 2018.'), required=False)

     travel_grant_motivation = forms.CharField(
         label=_('Please write us about yourself and why you want to come to CopyCamp. '
                 'This information will help us evaluate your travel grant application:'),
     travel_grant_motivation = forms.CharField(
         label=_('Please write us about yourself and why you want to come to CopyCamp. '
                 'This information will help us evaluate your travel grant application:'),


@@ -295,8 +295,8 @@ def workshop_field(label):
 
 class WorkshopForm(ContactForm):
     form_tag = 'workshops'
 
 class WorkshopForm(ContactForm):
     form_tag = 'workshops'

-    save_as_tag = 'workshops-2017'
-    conference_name = u'CopyCamp 2017'
+    save_as_tag = 'workshops-2018'
+    conference_name = u'CopyCamp 2018'

     form_title = _('Workshop')
     notify_on_register = False
     mailing_field = 'agree_mailing'
     form_title = _('Workshop')
     notify_on_register = False
     mailing_field = 'agree_mailing'

diff --git a/prawokultury/locale/pl/LC_MESSAGES/django.po b/prawokultury/locale/pl/LC_MESSAGES/django.po
index d9be0a6..0aded6f 100644 (file)
--- a/prawokultury/locale/pl/LC_MESSAGES/django.po
+++ b/prawokultury/locale/pl/LC_MESSAGES/django.po
@@ -515,8 +515,8 @@ msgstr ""
 
 # msgstr "Wiadomość wysłana automatycznie, prosimy nie odpowiadać."
 #: templates/contact/register/mail_subject.txt:1
 
 # msgstr "Wiadomość wysłana automatycznie, prosimy nie odpowiadać."
 #: templates/contact/register/mail_subject.txt:1

-msgid "Thank you for registering to CopyCamp 2017"
-msgstr "Dziękujemy za rejestrację na konferencję CopyCamp 2017"
+msgid "Thank you for registering to CopyCamp 2018"
+msgstr "Dziękujemy za rejestrację na konferencję CopyCamp 2018"

 
 #: templates/contact/register/thanks.html:5
 #: templates/contact/workshops/thanks.html:5
 
 #: templates/contact/register/thanks.html:5
 #: templates/contact/workshops/thanks.html:5

diff --git a/prawokultury/static/img/copycamp_2018_en.png b/prawokultury/static/img/copycamp_2018_en.png
new file mode 100644 (file)
index 0000000..2502d45
Binary files /dev/null and b/prawokultury/static/img/copycamp_2018_en.png differ

diff --git a/prawokultury/static/img/copycamp_2018_en_big.png b/prawokultury/static/img/copycamp_2018_en_big.png
new file mode 100644 (file)
index 0000000..e138478
Binary files /dev/null and b/prawokultury/static/img/copycamp_2018_en_big.png differ

diff --git a/prawokultury/static/img/copycamp_2018_pl.png b/prawokultury/static/img/copycamp_2018_pl.png
new file mode 100644 (file)
index 0000000..1b876e7
Binary files /dev/null and b/prawokultury/static/img/copycamp_2018_pl.png differ

diff --git a/prawokultury/static/img/copycamp_2018_pl_big.png b/prawokultury/static/img/copycamp_2018_pl_big.png
new file mode 100644 (file)
index 0000000..ff5b7b3
Binary files /dev/null and b/prawokultury/static/img/copycamp_2018_pl_big.png differ

diff --git a/prawokultury/templates/base.html b/prawokultury/templates/base.html
index 5661694..a7ca7ad 100755 (executable)
--- 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: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_2017_"|add:request.LANGUAGE_CODE|add:"_big.png" %}{% endblock %}' />
+        <meta property='og:image' content='{% block ogimage %}https://copycamp.pl{% static "img/copycamp_2018_"|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>
         <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" %}"
         <div class="bar-left">
             <a id="logo" href="{% url "migdal_main" %}">
                 <img alt="{% trans "CopyCamp" %}"

-                    src="{% static "img/copycamp_2017_"|add:request.LANGUAGE_CODE|add:".png" %}" /></a>
+                    src="{% static "img/copycamp_2018_"|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>
         </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 27f9858..a9788da 100755 (executable)
--- 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 2017" %}
+{% load i18n %}{% trans "Thank you for registering to CopyCamp 2018" %}