From c5fd9d00768f3b3c9862e23b2ac6fb7f7627dded Mon Sep 17 00:00:00 2001
From: Skia
Date: Fri, 2 Sep 2016 19:31:47 +0200
Subject: [PATCH] Small template fixes
---
core/migrations/0003_auto_20160902_1914.py | 20 ++++
core/models.py | 6 +-
core/templates/core/user_detail.jinja | 14 ++-
locale/fr/LC_MESSAGES/django.mo | Bin 33170 -> 33246 bytes
locale/fr/LC_MESSAGES/django.po | 93 +++++++++---------
.../migrations/0003_auto_20160902_1914.py | 19 ++++
6 files changed, 102 insertions(+), 50 deletions(-)
create mode 100644 core/migrations/0003_auto_20160902_1914.py
create mode 100644 subscription/migrations/0003_auto_20160902_1914.py
diff --git a/core/migrations/0003_auto_20160902_1914.py b/core/migrations/0003_auto_20160902_1914.py
new file mode 100644
index 00000000..f5d2c28b
--- /dev/null
+++ b/core/migrations/0003_auto_20160902_1914.py
@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+import django.core.validators
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('core', '0002_auto_20160831_0144'),
+ ]
+
+ operations = [
+ migrations.AlterField(
+ model_name='user',
+ name='username',
+ field=models.CharField(error_messages={'unique': 'A user with that username already exists.'}, max_length=254, unique=True, validators=[django.core.validators.RegexValidator('^[\\w.+-]+$', 'Enter a valid username. This value may contain only letters, numbers and ./+/-/_ characters.')], help_text='Required. 254 characters or fewer. Letters, digits and ./+/-/_ only.', verbose_name='username'),
+ ),
+ ]
diff --git a/core/models.py b/core/models.py
index f4a95899..8e979f14 100644
--- a/core/models.py
+++ b/core/models.py
@@ -74,12 +74,12 @@ class User(AbstractBaseUser):
_('username'),
max_length=254,
unique=True,
- help_text=_('Required. 254 characters or fewer. Letters, digits and @/./+/-/_ only.'),
+ help_text=_('Required. 254 characters or fewer. Letters, digits and ./+/-/_ only.'),
validators=[
validators.RegexValidator(
- r'^[\w.@+-]+$',
+ r'^[\w.+-]+$',
_('Enter a valid username. This value may contain only '
- 'letters, numbers ' 'and @/./+/-/_ characters.')
+ 'letters, numbers ' 'and ./+/-/_ characters.')
),
],
error_messages={
diff --git a/core/templates/core/user_detail.jinja b/core/templates/core/user_detail.jinja
index ba4ba525..8f4dcfd6 100644
--- a/core/templates/core/user_detail.jinja
+++ b/core/templates/core/user_detail.jinja
@@ -32,6 +32,11 @@
{% if profile.dpt_option %}
{% trans %}Option: {% endtrans %}{{ profile.dpt_option }}
{% endif %}
+ {% if profile.phone %}
+
+ {{ profile.phone }}
+
+ {% endif %}
{% if profile.promo %}
@@ -46,7 +51,14 @@
{% if get_subscriber(profile).is_subscribed() %}
{% trans subscription_end=get_subscriber(profile).subscriptions.last().subscription_end %}Subscribed until {{ subscription_end }}{% endtrans %}
-{% trans %}Account number: {% endtrans %}{{ profile.customer.account_id }}
+{% trans %}Account number: {% endtrans %}{{ profile.customer.account_id }}
+{% if get_subscriber(profile).tokens.exists() %}
+
+{% for i in get_subscriber(profile).tokens.all() %}
+ - {{ i }}
+{% endfor %}
+
+{% endif %}
{% else %}
{% trans %}Not subscribed{% endtrans %}
{% if user.is_in_group(settings.SITH_MAIN_BOARD_GROUP) %}
diff --git a/locale/fr/LC_MESSAGES/django.mo b/locale/fr/LC_MESSAGES/django.mo
index ee443c85478b464eeac4b3f8cdc50a7a20c56e32..763b35c3b74dfb6e47010a7bec2343ec8d83c97a 100644
GIT binary patch
delta 12006
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
delta 11914
zcmYk?2YgTW{>Sl?$dZACNFtF$hMh!$5PQW|t4cy8Mr+qj?O#!DOO2?uMtiBEXthkB9U4e>}gR@A;nZJm<%~|9g6-_oA8Jp3`AIFF9P5
zy&We8JBB*WDaun4RO>j`QyeD=Z(t;rPj#FKOf%bHIC-8q9y7`3q8EOOez*?<@JsV3
zmUJACbBcmLH!j$XYv#XLih8d!*D|Pfaj1@}n624m3
zdcG2B0aY=D@tt%ET0tJF!#SviOE3yopbzfAVBC$R@k`WJpTIB-%W#h(8P%>KhGJXP
zPUfN}It11K2=r(s<0$BXsi=GoYK1Ra{c_Y9uR}e!8#U4W=C`Ph&!YPI71i!0YT~yn
zzlUMuzO~(VEwVQIudS*}gS#P_<}*+o7NU+~iMbjz;rHzR4%C33pq}54
zn&=T!KWC7a&bemyZ`Ef1b>@C`+<`+;9YmmZAON`#B(k{<~1nOsAk`I32YEb5UEn$nqtq9a@2!@H)G{
z-R|!~^|KGPGoPa-^c8C0B8k)FJnF&PsFx)ZHIe41j@x2Y?1Wlz
z0ji^EsP^+w?U$n3uQb<~8&F@vyEqwlp+_ssYT*9RG)3h(n1*?%Ghbl!g{YOkf_k~u
zqK@Q!)RFB&J%0ifCMVE@+8#Cs-U(y4b@S7)L%}G
zQCpge5!e^iae?J?P!n5)>gOHQ%eM{H-(D;}5>&rM4cULq@E8@Ez)94DKcPClfa>55
z>a7lF*%b)X5P)CbV1Fo@r2i7A00yVKa
z7=`yR1|u80&(%c@*cx>-T~I5{LoIADY5^myehTV{W}z19nM*+fzldu1CaS|NsG09Z
zb$kfb?i7aO4b*q+-^9HiW7a_R(*X5Sx3N4I`2w9m$ZO!Nz*v3%KT^<^+(HfP-_)I1
zD5`@fREITDFHaU~A{{Ui^H3|9fPL{9%YQ|LaClu8n
z2DS2JY>jnM9ZW$@U