From d8c9031f4acedc2a5ae3da670b431048a3180889 Mon Sep 17 00:00:00 2001
From: Guillaume Pellerin <guillaume.pellerin@ircam.fr>
Date: Fri, 10 Mar 2017 19:06:43 +0100
Subject: [PATCH] Update form title, use cri user for cron rules, en locale by
 default

---
 app/organization/projects/forms.py                          | 3 ++-
 app/settings.py                                             | 4 ++--
 .../templates/projects/project_ict_create.html              | 2 +-
 bin/update_translation_fields.sh                            | 3 +++
 etc/cron.d/app                                              | 6 +++---
 5 files changed, 11 insertions(+), 7 deletions(-)
 create mode 100755 bin/update_translation_fields.sh

diff --git a/app/organization/projects/forms.py b/app/organization/projects/forms.py
index c878e37a..14c137a3 100644
--- a/app/organization/projects/forms.py
+++ b/app/organization/projects/forms.py
@@ -83,9 +83,10 @@ class ProjectContactInline(InlineFormSet):
     model = ProjectContact
     prefix = 'Contact'
     can_delete = False
-    fields = ['gender', 'person_title', 'first_name', 'last_name', 'address', 'email',
+    fields = ['first_name', 'last_name', 'address', 'email',
                  'telephone', 'address', 'postal_code', 'city', 'country']
 
+
 class ProducerForm(ModelForm):
 
     class Meta:
diff --git a/app/settings.py b/app/settings.py
index 4f583f67..92412522 100644
--- a/app/settings.py
+++ b/app/settings.py
@@ -124,12 +124,12 @@ USE_TZ = True
 
 # Language code for this installation. All choices can be found here:
 # http://www.i18nguy.com/unicode/language-identifiers.html
-LANGUAGE_CODE = "fr"
+LANGUAGE_CODE = "en"
 
 # Supported languages
 LANGUAGES = (
-    ('fr', _('French')),
     ('en', _('English')),
+    ('fr', _('French')),
 )
 
 LOCALE_PATHS = ['locale',]
diff --git a/app/themes/vertigo_starts_eu/templates/projects/project_ict_create.html b/app/themes/vertigo_starts_eu/templates/projects/project_ict_create.html
index f4e123d8..c6b0e688 100644
--- a/app/themes/vertigo_starts_eu/templates/projects/project_ict_create.html
+++ b/app/themes/vertigo_starts_eu/templates/projects/project_ict_create.html
@@ -34,7 +34,7 @@
     </div>
 
     <div class="row">
-        <h2 class="dotted">{% trans "Project submission form" %}</h2>
+        <h2 class="dotted">{% trans "Project submission form (all fields required)" %}</h2>
         {% errors_for form %}
         <form class="mezzanine-form form" method="post"{% if form.is_multipart %} enctype="multipart/form-data"{% endif %}>
             {% fields_for form %}
diff --git a/bin/update_translation_fields.sh b/bin/update_translation_fields.sh
new file mode 100755
index 00000000..55bec142
--- /dev/null
+++ b/bin/update_translation_fields.sh
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+docker-compose run app python /srv/app/manage.py update_translation_fields
diff --git a/etc/cron.d/app b/etc/cron.d/app
index 707b96da..1e518e40 100644
--- a/etc/cron.d/app
+++ b/etc/cron.d/app
@@ -1,6 +1,6 @@
 APP=/srv/vertigo
 PATH=/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin
 
-0    */6  * * *  root cd $APP; bin/push.sh >> var/log/cron/push.log
-*/10 *    * * *  root cd $APP; bin/poll_twitter.sh >> var/log/cron/pull_twitter.log
-#0,30 *    * * * root cd $APP; bin/upgrade.sh >> var/log/cron/upgrade.log
+0     */6  * * * cri cd $APP; bin/push.sh >> var/log/cron/push.log
+*/10  *    * * * cri cd $APP; bin/poll_twitter.sh >> var/log/cron/pull_twitter.log
+#0,30 *    * * * cri cd $APP; bin/upgrade.sh >> var/log/cron/upgrade.log
-- 
2.39.5