From a8e0a2b15b617160d543051201541b1f7f94be63 Mon Sep 17 00:00:00 2001
From: Alice <alice@packetimpact.net>
Date: Wed, 7 Sep 2016 00:33:43 +0000
Subject: [PATCH] Multiple unimportant fixes

---
 ccvpn/settings.py                             |  4 ++--
 locale/fr/LC_MESSAGES/django.po               |  2 +-
 .../migrations/0005_auto_20160907_0018.py     | 20 +++++++++++++++++++
 update.sh                                     | 19 ++++++++++++++++++
 4 files changed, 42 insertions(+), 3 deletions(-)
 create mode 100644 payments/migrations/0005_auto_20160907_0018.py
 create mode 100755 update.sh

diff --git a/ccvpn/settings.py b/ccvpn/settings.py
index e5b4dbd..8e67857 100644
--- a/ccvpn/settings.py
+++ b/ccvpn/settings.py
@@ -88,8 +88,8 @@ WSGI_APPLICATION = 'ccvpn.wsgi.application'
 LOGIN_URL = 'account:login'
 LOGOUT_URL = 'account:logout'
 
-LOGIN_REDIRECT_URL = 'ccvpn.views.index'
-LOGOUT_REDIRECT_URL = 'ccvpn.views.index'
+LOGIN_REDIRECT_URL = 'account:index'
+LOGOUT_REDIRECT_URL = '/'
 
 PAGES_DIR = BASE_DIR + '/pages/'
 
diff --git a/locale/fr/LC_MESSAGES/django.po b/locale/fr/LC_MESSAGES/django.po
index 59ce0e9..abe2a67 100644
--- a/locale/fr/LC_MESSAGES/django.po
+++ b/locale/fr/LC_MESSAGES/django.po
@@ -726,7 +726,7 @@ msgstr "Acheter"
 
 #: templates/lambdainst/account.html:165
 msgid "If you still have time, it will be added."
-msgstr "Si il vous reste du temps, il sera ajouté."
+msgstr "S'il vous reste du temps, il sera ajouté."
 
 #: templates/lambdainst/account.html:176
 msgid "Gift code"
diff --git a/payments/migrations/0005_auto_20160907_0018.py b/payments/migrations/0005_auto_20160907_0018.py
new file mode 100644
index 0000000..93d608c
--- /dev/null
+++ b/payments/migrations/0005_auto_20160907_0018.py
@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.5 on 2016-09-07 00:18
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('payments', '0004_auto_20160904_0048'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='subscription',
+            name='status',
+            field=models.CharField(choices=[('new', 'Created'), ('unconfirmed', 'Waiting for payment'), ('active', 'Active'), ('cancelled', 'Cancelled'), ('error', 'Error')], default='new', max_length=16),
+        ),
+    ]
diff --git a/update.sh b/update.sh
new file mode 100755
index 0000000..e2a00c4
--- /dev/null
+++ b/update.sh
@@ -0,0 +1,19 @@
+#!/bin/bash
+
+set -e
+
+local_settings="ccvpn/local_settings.py"
+
+run_manage() {
+    echo "> manage.py $1..."
+    python3 manage.py "$@"
+}
+
+run_manage compilemessages
+run_manage migrate
+run_manage update_stripe_plans
+
+if [ -f $local_settings ] && grep "^STATIC_ROOT" $local_settings; then 
+    run_manage collectstatic
+fi
+