Multiple unimportant fixes

master
Alice 8 years ago
parent 20241b2115
commit a8e0a2b15b

@ -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/'

@ -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"

@ -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),
),
]

@ -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
Loading…
Cancel
Save