Skip to content

Sith
Sith
Commit 41c9f638 authored by Skia's avatar Skia
Browse files
Options

Merge branch 'bugfix' into 'master' 

Fix continuous tests

See merge request !60
parents 231922cb 9f2566a2
Pipeline #845 passed with stage
    in 3 minutes and 50 seconds
    Expand all Hide whitespace changes
    Inline Side-by-side
    Showing with 189 additions and 152 deletions
    locale/fr/LC_MESSAGES/django.po
    View file @ 41c9f638
    This diff is collapsed.
    sith/settings.py
    View file @ 41c9f638
    ......@@ -443,8 +443,17 @@ SITH_CLUB_ROLES_ID = {
    'Curious': 0,
    }
    for role in SITH_CLUB_ROLES_ID:
    SITH_CLUB_ROLES[SITH_CLUB_ROLES_ID[role]] = _(role)
    SITH_CLUB_ROLES = {
    10: _('President'),
    9: _('Vice-President'),
    7: _('Treasurer'),
    5: _('Communication supervisor'),
    4: _('Secretary'),
    3: _('IT supervisor'),
    2: _('Board member'),
    1: _('Active member'),
    0: _('Curious'),
    }
    # This corresponds to the maximum role a user can freely subscribe to
    # In this case, SITH_MAXIMUM_FREE_ROLE=1 means that a user can set himself as "Membre actif" or "Curieux", but not higher
    ......
    Markdown is supported
    0% or
    You are about to add 0 people to the discussion. Proceed with caution.
    Finish editing this message first!
    Please register or to comment