From: Guillaume Pellerin <guillaume.pellerin@ircam.fr>
Date: Thu, 3 Nov 2016 14:33:17 +0000 (+0100)
Subject: Merge branch 'dev' into feature/demos
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=597977acefe971ae46a06021285d6ee5d477f71a;p=mezzo.git

Merge branch 'dev' into feature/demos

Conflicts:
	app/local_settings.py
---

597977acefe971ae46a06021285d6ee5d477f71a
diff --cc app/local_settings.py
index e5a9f4c8,17f7313a..98e4c370
--- a/app/local_settings.py
+++ b/app/local_settings.py
@@@ -219,9 -223,3 +223,5 @@@ JQUERY_UI_FILENAME = 'jquery-ui-1.9.2.m
  #SHOP_CURRENCY_LOCALE = ''
  SHOP_USE_VARIATIONS = False
  SHOP_USE_RATINGS = False
 +
- date_now = datetime.now()
- CURRENT_SEASON = int(date_now.year) - 1 if datetime(date_now.year, 1,1) <= date_now and date_now <= datetime(date_now.year, 7, 31) else date_now.year
- CURRENT_SEASON_STYLED = str(CURRENT_SEASON)[-2:]+"."+str(CURRENT_SEASON+1)[-2:]
- 
 +PROJECT_DEMOS_DIR = '/srv/media/projects/demos/'
diff --cc app/organization/projects/admin.py
index d507ca1b,d507ca1b..89f65000
--- a/app/organization/projects/admin.py
+++ b/app/organization/projects/admin.py
@@@ -80,3 -80,3 +80,6 @@@ admin.site.register(ProjectProgram, Pro
  admin.site.register(ProjectProgramType, ProjectProgramTypeAdmin)
  admin.site.register(ProjectTopic, ProjectTopicAdmin)
  admin.site.register(ProjectTopicPage, ProjectTopicPageAdmin)
++admin.site.register(ProjectDemo)
++admin.site.register(Repository)
++admin.site.register(RepositorySystem)
diff --cc app/organization/projects/translation.py
index 5cf18d9d,5cf18d9d..8398acd6
--- a/app/organization/projects/translation.py
+++ b/app/organization/projects/translation.py
@@@ -61,3 -61,3 +61,9 @@@ class ProjectTopicTranslationOptions(Tr
  class ProjectTopicPageTranslationOptions(TranslationOptions):
  
      fields = ('sub_title',)
++
++
++@register(ProjectDemo)
++class ProjectDemoTranslationOptions(TranslationOptions):
++
++    fields = ('title', 'description',)