Merge branch 'release/20-July-2017'

Author: SehoNoh

README.md

@@ -1,4 +1,5 @@
 # A git repository for PyCon Korea 2017
+## Version 20-July-2017
 
 [![Build Status](https://travis-ci.org/pythonkr/pyconkr-2017.svg?branch=master)](https://travis-ci.org/pythonkr/pyconkr-2017)
 

pyconkr/context_processors.py

@@ -43,6 +43,8 @@ def default(request):
                 ('keynote', {'title': _('Keynotes')}),
                 ('speaker', {'title': _('Speakers')}),
                 ('tutorials', {'title': _('Sprint and Tutorial')}),
+                ('young_coder', {'title': _('Young Coder')}),
+                ('child_care', {'title': _('Child Care')}),
                 ('lightning_talk', {'title': _('Lightning talk')}),
                 ('ost', {'title': _('Open Spaces')}),
             ]),

pyconkr/locale/en/LC_MESSAGES/django.po

@@ -38,6 +38,12 @@ msgstr "Announcements"
 msgid "PyCon.KR 2017 Blog"
 msgstr "PyCon.KR 2017 Blog"
 
+msgid "Young Coder"
+msgstr "Young Coder"
+
+msgid "Child Care"
+msgstr "Child Care"
+
 #: pyconkr/context_processors.py:28 pyconkr/templates/base.html:76
 #: pyconkr/templates/pyconkr/sponsor_list.html:4
 msgid "Sponsors"
@@ -635,6 +641,18 @@ msgstr "Tutorial proposal successfully updated."
 msgid "Update tutorial"
 msgstr "Update tutorial"
 
+#: pyconkr/views.py:415
+msgid "Sprint proposal successfully created."
+msgstr "Sprint proposal successfully created."
+
+#: pyconkr/views.py:539
+msgid "Sprint proposal successfully updated."
+msgstr "Sprint proposal successfully updated."
+
+#: pyconkr/views.py:546
+msgid "Update sprint"
+msgstr "Update sprint"
+
 #~ msgid "About PyCon 2017"
 #~ msgstr "About PyCon Korea 2017"
 

pyconkr/locale/ko/LC_MESSAGES/django.po

@@ -39,6 +39,12 @@ msgstr "알림"
 msgid "PyCon.KR 2017 Blog"
 msgstr "파이콘 한국 2017 블로그"
 
+msgid "Young Coder"
+msgstr "영코더"
+
+msgid "Child Care"
+msgstr "아이돌봄"
+
 #: pyconkr/context_processors.py:28 pyconkr/templates/base.html:76
 #: pyconkr/templates/pyconkr/sponsor_list.html:4
 msgid "Sponsors"
@@ -640,6 +646,18 @@ msgstr "튜토리얼 제안서가 수정되었습니다."
 msgid "Update tutorial"
 msgstr "튜토리얼 갱신"
 
+#: pyconkr/views.py:415
+msgid "Sprint proposal successfully created."
+msgstr "스프린트 제안을 제출하였습니다."
+
+#: pyconkr/views.py:539
+msgid "Sprint proposal successfully updated."
+msgstr "스프린트 제안서가 수정되었습니다."
+
+#: pyconkr/views.py:546
+msgid "Update sprint"
+msgstr "스프린트 갱신"
+
 #~ msgid "About PyCon 2017"
 #~ msgstr "파이콘 한국 2017"
 

pyconkr/views.py

@@ -536,14 +536,14 @@ class SprintProposalUpdate(SuccessMessageMixin, UpdateView):
     model = SprintProposal
     form_class = SprintProposalForm
     template_name = "pyconkr/proposal_form.html"
-    success_message = _("Tutorial proposal successfully updated.")
+    success_message = _("Sprint proposal successfully updated.")
 
     def get_object(self, queryset=None):
         return get_object_or_404(SprintProposal, pk=self.request.user.sprintproposal.pk)
 
     def get_context_data(self, **kwargs):
         context = super(SprintProposalUpdate, self).get_context_data(**kwargs)
-        context['title'] = _("Update tutorial")
+        context['title'] = _("Update sprint")
         return context
 
     def get_success_url(self):