diff --git a/com/templates/com/mailing_admin.jinja b/com/templates/com/mailing_admin.jinja index 195b2c31..b0c7be95 100644 --- a/com/templates/com/mailing_admin.jinja +++ b/com/templates/com/mailing_admin.jinja @@ -5,7 +5,7 @@ {% endblock %} {% block content %} -

{% trans %}This page list all existing mailing lists{% endtrans %}

+

{% trans %}This page lists all existing mailing lists{% endtrans %}

{% if has_objects %} diff --git a/core/templates/core/user_clubs.jinja b/core/templates/core/user_clubs.jinja index 17462120..93cd0958 100644 --- a/core/templates/core/user_clubs.jinja +++ b/core/templates/core/user_clubs.jinja @@ -62,7 +62,7 @@ {% if profile.mailing_subscriptions.exists() and (profile.id == user.id or user.is_root or self.user.is_in_group(settings.SITH_GROUP_COM_ADMIN_ID)) %}

{% trans %}Subscribed mailing lists{% endtrans %}

{% for sub in profile.mailing_subscriptions.all() %} -

{{ sub.mailing.email }} {% trans %}Unsuscribe{% endtrans %}

+

{{ sub.mailing.email }} {% trans %}Unsubscribe{% endtrans %}

{% endfor %} {% endif %} {% endblock %} diff --git a/migrate.py b/migrate.py index 8f63561c..475d0633 100644 --- a/migrate.py +++ b/migrate.py @@ -1353,7 +1353,7 @@ def migrate_mailings(): club = club.first() if mailing['nom']: mailing['nom'] = '.' + mailing['nom'] - Mailing(id=mailing['id_mailing'], club=club, email=str(club.unix_name + mailing['nom'] + '@utbm.fr')).save() + Mailing(id=mailing['id_mailing'], club=club, email=to_unicode(club.unix_name + mailing['nom'] + '@utbm.fr')).save() print("-------------------") cur.execute(""" @@ -1369,7 +1369,7 @@ def migrate_mailings(): user = User.objects.get(id=mailing_sub['id_user']) MailingSubscription(mailing=mailing, user=user, email=user.email).save() elif mailing_sub['email']: - MailingSubscription(mailing=mailing, email=mailing_sub['email']).save() + MailingSubscription(mailing=mailing, email=to_unicode(mailing_sub['email'])).save() def main():