Merge pull request #25 from tracim/feature/734_add_lang_to_user

backend/tracim_backend/lib/core/user.py

@@ -314,6 +314,7 @@ class UserApi(object):
             email: str=None,
             password: str=None,
             timezone: str=None,
+            lang: str=None,
             groups: typing.Optional[typing.List[Group]]=None,
             do_save=True,
     ) -> User:
@@ -330,6 +331,9 @@ class UserApi(object):
         if timezone is not None:
             user.timezone = timezone
 
+        if lang is not None:
+            user.lang = lang
+
         if groups is not None:
             # INFO - G.M - 2018-07-18 - Delete old groups
             for group in user.groups:
@@ -351,6 +355,7 @@ class UserApi(object):
         password: str = None,
         name: str = None,
         timezone: str = '',
+        lang: str= None,
         groups=[],
         do_save: bool=True,
         do_notify: bool=True,
@@ -362,6 +367,7 @@ class UserApi(object):
             email=email,
             password=password,
             timezone=timezone,
+            lang=lang,
             do_save=False,
         )
         if do_notify:

backend/tracim_backend/migration/versions/a143b60aad61_add_lang_to_user.py

@@ -0,0 +1,26 @@
+"""add lang to user
+
+Revision ID: a143b60aad61
+Revises: 78b52ca39419
+Create Date: 2018-08-20 10:17:14.859250
+
+"""
+
+# revision identifiers, used by Alembic.
+revision = 'a143b60aad61'
+down_revision = '78b52ca39419'
+
+from alembic import op
+import sqlalchemy as sa
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.add_column('users', sa.Column('lang', sa.Unicode(length=3), nullable=True))  # nopep8
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_column('users', 'lang')
+    # ### end Alembic commands ###

backend/tracim_backend/models/auth.py

@@ -138,7 +138,10 @@ class User(DeclarativeBase):
     is_active = Column(Boolean, default=True, nullable=False)
     is_deleted = Column(Boolean, default=False, nullable=False, server_default=sqlalchemy.sql.expression.literal(False))
     imported_from = Column(Unicode(32), nullable=True)
+    # timezone as tz database format
     timezone = Column(Unicode(255), nullable=False, server_default='')
+    # lang in iso639 format
+    lang = Column(Unicode(3), nullable=True, default=None)
     # TODO - G.M - 04-04-2018 - [auth] Check if this is already needed
     # with new auth system
     auth_token = Column(Unicode(255))

backend/tracim_backend/models/context_models.py

@@ -82,9 +82,10 @@ class UserInfos(object):
     """
     Just some user infos
     """
-    def __init__(self, timezone: str, public_name: str) -> None:
+    def __init__(self, timezone: str, public_name: str, lang: str) -> None:
         self.timezone = timezone
         self.public_name = public_name
+        self.lang = lang
 
 
 class UserProfile(object):
@@ -106,6 +107,7 @@ class UserCreation(object):
             public_name: str = None,
             timezone: str = None,
             profile: str = None,
+            lang: str = None,
             email_notification: bool = True,
     ) -> None:
         self.email = email
@@ -114,6 +116,7 @@ class UserCreation(object):
         self.password = password or password_generator()
         self.public_name = public_name or None
         self.timezone = timezone or ''
+        self.lang = lang or None
         self.profile = profile or Group.TIM_USER_GROUPNAME
         self.email_notification = email_notification
 
@@ -412,6 +415,10 @@ class UserInContext(object):
         return self.user.timezone
 
     @property
+    def lang(self) -> str:
+        return self.user.lang
+
+    @property
     def profile(self) -> Profile:
         return self.user.profile.name
 

backend/tracim_backend/tests/functional/test_session.py

@@ -160,6 +160,7 @@ class TestWhoamiEndpoint(FunctionalTest):
         assert res.json_body['profile'] == 'administrators'
         assert res.json_body['caldav_url'] is None
         assert res.json_body['avatar_url'] is None
+        assert res.json_body['lang'] is None
 
     def test_api__try_whoami_enpoint__err_401__user_is_not_active(self):
         dbsession = get_tm_session(self.session_factory, transaction.manager)
@@ -183,6 +184,7 @@ class TestWhoamiEndpoint(FunctionalTest):
             name='bob',
             groups=groups,
             timezone='Europe/Paris',
+            lang='en',
             do_save=True,
             do_notify=False,
         )

backend/tracim_backend/tests/functional/test_user.py

@@ -76,6 +76,7 @@ class TestUserRecentlyActiveContentEndpoint(FunctionalTest):
             name='bob',
             groups=groups,
             timezone='Europe/Paris',
+            lang='fr',
             do_save=True,
             do_notify=False,
         )
@@ -200,6 +201,7 @@ class TestUserRecentlyActiveContentEndpoint(FunctionalTest):
             name='bob',
             groups=groups,
             timezone='Europe/Paris',
+            lang='fr',
             do_save=True,
             do_notify=False,
         )
@@ -291,6 +293,7 @@ class TestUserRecentlyActiveContentEndpoint(FunctionalTest):
             name='bob',
             groups=groups,
             timezone='Europe/Paris',
+            lang='fr',
             do_save=True,
             do_notify=False,
         )
@@ -416,6 +419,7 @@ class TestUserRecentlyActiveContentEndpoint(FunctionalTest):
             name='bob',
             groups=groups,
             timezone='Europe/Paris',
+            lang='fr',
             do_save=True,
             do_notify=False,
         )
@@ -704,6 +708,7 @@ class TestUserReadStatusEndpoint(FunctionalTest):
             name='bob',
             groups=groups,
             timezone='Europe/Paris',
+            lang='fr',
             do_save=True,
             do_notify=False,
         )
@@ -816,6 +821,7 @@ class TestUserReadStatusEndpoint(FunctionalTest):
             name='bob',
             groups=groups,
             timezone='Europe/Paris',
+            lang='fr',
             do_save=True,
             do_notify=False,
         )
@@ -939,6 +945,7 @@ class TestUserReadStatusEndpoint(FunctionalTest):
             name='bob',
             groups=groups,
             timezone='Europe/Paris',
+            lang='fr',
             do_save=True,
             do_notify=False,
         )
@@ -1152,6 +1159,7 @@ class TestUserSetContentAsRead(FunctionalTest):
             name='bob',
             groups=groups,
             timezone='Europe/Paris',
+            lang='fr',
             do_save=True,
             do_notify=False,
         )
@@ -1233,6 +1241,7 @@ class TestUserSetContentAsRead(FunctionalTest):
             name='bob',
             groups=groups,
             timezone='Europe/Paris',
+            lang='fr',
             do_save=True,
             do_notify=False,
         )
@@ -1314,6 +1323,7 @@ class TestUserSetContentAsRead(FunctionalTest):
             name='bob',
             groups=groups,
             timezone='Europe/Paris',
+            lang='fr',
             do_save=True,
             do_notify=False,
         )
@@ -1413,6 +1423,7 @@ class TestUserSetContentAsRead(FunctionalTest):
             name='bob',
             groups=groups,
             timezone='Europe/Paris',
+            lang='fr',
             do_save=True,
             do_notify=False,
         )
@@ -1494,6 +1505,7 @@ class TestUserSetContentAsRead(FunctionalTest):
             name='bob',
             groups=groups,
             timezone='Europe/Paris',
+            lang='fr',
             do_save=True,
             do_notify=False,
         )
@@ -1611,6 +1623,7 @@ class TestUserSetContentAsUnread(FunctionalTest):
             name='bob',
             groups=groups,
             timezone='Europe/Paris',
+            lang='fr',
             do_save=True,
             do_notify=False,
         )
@@ -1720,6 +1733,7 @@ class TestUserSetContentAsUnread(FunctionalTest):
             name='bob',
             groups=groups,
             timezone='Europe/Paris',
+            lang='fr',
             do_save=True,
             do_notify=False,
         )
@@ -1801,6 +1815,7 @@ class TestUserSetContentAsUnread(FunctionalTest):
             name='bob',
             groups=groups,
             timezone='Europe/Paris',
+            lang='fr',
             do_save=True,
             do_notify=False,
         )
@@ -1883,6 +1898,7 @@ class TestUserSetContentAsUnread(FunctionalTest):
             name='bob',
             groups=groups,
             timezone='Europe/Paris',
+            lang='fr',
             do_save=True,
             do_notify=False,
         )
@@ -1978,6 +1994,7 @@ class TestUserSetContentAsUnread(FunctionalTest):
             name='bob',
             groups=groups,
             timezone='Europe/Paris',
+            lang='fr',
             do_save=True,
             do_notify=False,
         )
@@ -2122,6 +2139,7 @@ class TestUserSetWorkspaceAsRead(FunctionalTest):
             name='bob',
             groups=groups,
             timezone='Europe/Paris',
+            lang='fr',
             do_save=True,
             do_notify=False,
         )
@@ -2219,6 +2237,7 @@ class TestUserSetWorkspaceAsRead(FunctionalTest):
             name='bob',
             groups=groups,
             timezone='Europe/Paris',
+            lang='fr',
             do_save=True,
             do_notify=False,
         )
@@ -2316,6 +2335,7 @@ class TestUserSetWorkspaceAsRead(FunctionalTest):
             name='bob',
             groups=groups,
             timezone='Europe/Paris',
+            lang='fr',
             do_save=True,
             do_notify=False,
         )
@@ -2496,6 +2516,7 @@ class TestUserEndpoint(FunctionalTest):
             name='bob',
             groups=groups,
             timezone='Europe/Paris',
+            lang='fr',
             do_save=True,
             do_notify=False,
         )
@@ -2523,6 +2544,7 @@ class TestUserEndpoint(FunctionalTest):
         assert res['public_name'] == 'bob'
         assert res['timezone'] == 'Europe/Paris'
         assert res['is_deleted'] is False
+        assert res['lang'] == 'fr'
 
     def test_api__get_user__ok_200__user_itself(self):
         dbsession = get_tm_session(self.session_factory, transaction.manager)
@@ -2546,6 +2568,7 @@ class TestUserEndpoint(FunctionalTest):
             name='bob',
             groups=groups,
             timezone='Europe/Paris',
+            lang='fr',
             do_save=True,
             do_notify=False,
         )
@@ -2605,6 +2628,7 @@ class TestUserEndpoint(FunctionalTest):
             name='bob2',
             groups=groups,
             timezone='Europe/Paris',
+            lang='fr',
             do_save=True,
             do_notify=False,
         )
@@ -2638,6 +2662,7 @@ class TestUserEndpoint(FunctionalTest):
             'password': 'mysuperpassword',
             'profile': 'users',
             'timezone': 'Europe/Paris',
+            'lang': 'fr',
             'public_name': 'test user',
             'email_notification': False,
         }
@@ -2655,7 +2680,7 @@ class TestUserEndpoint(FunctionalTest):
         assert res['email'] == 'test@test.test'
         assert res['public_name'] == 'test user'
         assert res['timezone'] == 'Europe/Paris'
-
+        assert res['lang'] == 'fr'
         dbsession = get_tm_session(self.session_factory, transaction.manager)
         admin = dbsession.query(models.User) \
             .filter(models.User.email == 'admin@admin.admin') \
@@ -2695,6 +2720,7 @@ class TestUserEndpoint(FunctionalTest):
         assert res['email'] == 'test@test.test'
         assert res['public_name'] == 'test'
         assert res['timezone'] == ''
+        assert res['lang'] is None
 
         dbsession = get_tm_session(self.session_factory, transaction.manager)
         admin = dbsession.query(models.User) \
@@ -2731,6 +2757,7 @@ class TestUserEndpoint(FunctionalTest):
             name='bob',
             groups=groups,
             timezone='Europe/Paris',
+            lang='fr',
             do_save=True,
             do_notify=False,
         )
@@ -2748,6 +2775,7 @@ class TestUserEndpoint(FunctionalTest):
             'password': 'mysuperpassword',
             'profile': 'users',
             'timezone': 'Europe/Paris',
+            'lang': 'fr',
             'public_name': 'test user',
             'email_notification': False,
         }
@@ -2779,6 +2807,7 @@ class TestUserEndpoint(FunctionalTest):
             name='bob',
             groups=groups,
             timezone='Europe/Paris',
+            lang='fr',
             do_save=True,
             do_notify=False,
         )
@@ -2797,6 +2826,7 @@ class TestUserEndpoint(FunctionalTest):
             'profile': 'users',
             'timezone': 'Europe/Paris',
             'public_name': 'test user',
+            'lang': 'fr',
             'email_notification': False,
         }
         res = self.testapp.post_json(
@@ -2827,6 +2857,7 @@ class TestUserWithNotificationEndpoint(FunctionalTest):
             'profile': 'users',
             'timezone': 'Europe/Paris',
             'public_name': 'test user',
+            'lang': 'fr',
             'email_notification': True,
         }
         res = self.testapp.post_json(
@@ -2843,6 +2874,7 @@ class TestUserWithNotificationEndpoint(FunctionalTest):
         assert res['email'] == 'test@test.test'
         assert res['public_name'] == 'test user'
         assert res['timezone'] == 'Europe/Paris'
+        assert res['lang'] == 'fr'
 
         dbsession = get_tm_session(self.session_factory, transaction.manager)
         admin = dbsession.query(models.User) \
@@ -2896,6 +2928,7 @@ class TestUserWithNotificationEndpoint(FunctionalTest):
         assert res['email'] == 'test@test.test'
         assert res['public_name'] == 'test'
         assert res['timezone'] == ''
+        assert res['lang'] == None
 
         dbsession = get_tm_session(self.session_factory, transaction.manager)
         admin = dbsession.query(models.User) \
@@ -2944,6 +2977,7 @@ class TestUserWithNotificationEndpoint(FunctionalTest):
             name='bob',
             groups=groups,
             timezone='Europe/Paris',
+            lang='fr',
             do_save=True,
             do_notify=False,
         )
@@ -2998,6 +3032,7 @@ class TestUsersEndpoint(FunctionalTest):
             name='bob',
             groups=groups,
             timezone='Europe/Paris',
+            lang='fr',
             do_save=True,
             do_notify=False,
         )
@@ -3048,6 +3083,7 @@ class TestUsersEndpoint(FunctionalTest):
             name='bob',
             groups=groups,
             timezone='Europe/Paris',
+            lang='fr',
             do_save=True,
             do_notify=False,
         )
@@ -3097,6 +3133,7 @@ class TestKnownMembersEndpoint(FunctionalTest):
             name='bob',
             groups=groups,
             timezone='Europe/Paris',
+            lang='fr',
             do_save=True,
             do_notify=False,
         )
@@ -3106,6 +3143,7 @@ class TestKnownMembersEndpoint(FunctionalTest):
             name='bob2',
             groups=groups,
             timezone='Europe/Paris',
+            lang='fr',
             do_save=True,
             do_notify=False,
         )
@@ -3161,6 +3199,7 @@ class TestKnownMembersEndpoint(FunctionalTest):
             name='bob',
             groups=groups,
             timezone='Europe/Paris',
+            lang='fr',
             do_save=True,
             do_notify=False,
         )
@@ -3170,6 +3209,7 @@ class TestKnownMembersEndpoint(FunctionalTest):
             name='bob2',
             groups=groups,
             timezone='Europe/Paris',
+            lang='fr',
             do_save=True,
             do_notify=False,
         )
@@ -3225,6 +3265,7 @@ class TestKnownMembersEndpoint(FunctionalTest):
             name='bob',
             groups=groups,
             timezone='Europe/Paris',
+            lang='fr',
             do_save=True,
             do_notify=False,
         )
@@ -3234,6 +3275,7 @@ class TestKnownMembersEndpoint(FunctionalTest):
             name='bob2',
             groups=groups,
             timezone='Europe/Paris',
+            lang='fr',
             do_save=True,
             do_notify=False,
         )
@@ -3279,6 +3321,7 @@ class TestKnownMembersEndpoint(FunctionalTest):
             name='bob',
             groups=groups,
             timezone='Europe/Paris',
+            lang='fr',
             do_save=True,
             do_notify=False,
         )
@@ -3288,6 +3331,7 @@ class TestKnownMembersEndpoint(FunctionalTest):
             name='bob2',
             groups=groups,
             timezone='Europe/Paris',
+            lang='fr',
             do_save=True,
             do_notify=False,
         )
@@ -3297,6 +3341,7 @@ class TestKnownMembersEndpoint(FunctionalTest):
             name='bob3',
             groups=groups,
             timezone='Europe/Paris',
+            lang='fr',
             do_save=True,
             do_notify=False,
         )
@@ -3382,6 +3427,7 @@ class TestSetEmailEndpoint(FunctionalTest):
             name='bob',
             groups=groups,
             timezone='Europe/Paris',
+            lang='fr',
             do_save=True,
             do_notify=False,
         )
@@ -3444,6 +3490,7 @@ class TestSetEmailEndpoint(FunctionalTest):
             name='bob',
             groups=groups,
             timezone='Europe/Paris',
+            lang='fr',
             do_save=True,
             do_notify=False,
         )
@@ -3506,6 +3553,7 @@ class TestSetEmailEndpoint(FunctionalTest):
             name='bob',
             groups=groups,
             timezone='Europe/Paris',
+            lang='fr',
             do_save=True,
             do_notify=False,
         )
@@ -3568,6 +3616,7 @@ class TestSetEmailEndpoint(FunctionalTest):
             name='bob',
             groups=groups,
             timezone='Europe/Paris',
+            lang='fr',
             do_save=True,
             do_notify=False,
         )
@@ -3630,6 +3679,7 @@ class TestSetEmailEndpoint(FunctionalTest):
             name='bob',
             groups=groups,
             timezone='Europe/Paris',
+            lang='fr',
             do_save=True,
             do_notify=False,
         )
@@ -3699,6 +3749,7 @@ class TestSetEmailEndpoint(FunctionalTest):
             name='bob',
             groups=groups,
             timezone='Europe/Paris',
+            lang='fr',
             do_save=True,
             do_notify=False,
         )
@@ -3708,6 +3759,7 @@ class TestSetEmailEndpoint(FunctionalTest):
             name='bob2',
             groups=groups,
             timezone='Europe/Paris',
+            lang='fr',
             do_save=True,
             do_notify=False,
         )
@@ -3764,6 +3816,7 @@ class TestSetPasswordEndpoint(FunctionalTest):
             name='bob',
             groups=groups,
             timezone='Europe/Paris',
+            lang='fr',
             do_save=True,
             do_notify=False,
         )
@@ -3826,6 +3879,7 @@ class TestSetPasswordEndpoint(FunctionalTest):
             name='bob',
             groups=groups,
             timezone='Europe/Paris',
+            lang='fr',
             do_save=True,
             do_notify=False,
         )
@@ -3888,6 +3942,7 @@ class TestSetPasswordEndpoint(FunctionalTest):
             name='bob',
             groups=groups,
             timezone='Europe/Paris',
+            lang='fr',
             do_save=True,
             do_notify=False,
         )
@@ -3952,6 +4007,7 @@ class TestSetPasswordEndpoint(FunctionalTest):
             name='bob',
             groups=groups,
             timezone='Europe/Paris',
+            lang='fr',
             do_save=True,
             do_notify=False,
         )
@@ -4013,6 +4069,7 @@ class TestSetPasswordEndpoint(FunctionalTest):
             password='pass',
             name='bob',
             groups=groups,
+            lang='fr',
             timezone='Europe/Paris',
             do_save=True,
             do_notify=False,
@@ -4023,6 +4080,7 @@ class TestSetPasswordEndpoint(FunctionalTest):
             name='bob2',
             groups=groups,
             timezone='Europe/Paris',
+            lang='fr',
             do_save=True,
             do_notify=False,
         )
@@ -4079,6 +4137,7 @@ class TestSetUserInfoEndpoint(FunctionalTest):
             name='bob',
             groups=groups,
             timezone='Europe/Paris',
+            lang='fr',
             do_save=True,
             do_notify=False,
         )
@@ -4102,10 +4161,12 @@ class TestSetUserInfoEndpoint(FunctionalTest):
         assert res['user_id'] == user_id
         assert res['public_name'] == 'bob'
         assert res['timezone'] == 'Europe/Paris'
+        assert res['lang'] == 'fr'
         # Set params
         params = {
             'public_name': 'updated',
             'timezone': 'Europe/London',
+            'lang': 'en',
         }
         self.testapp.put_json(
             '/api/v2/users/{}'.format(user_id),
@@ -4121,6 +4182,7 @@ class TestSetUserInfoEndpoint(FunctionalTest):
         assert res['user_id'] == user_id
         assert res['public_name'] == 'updated'
         assert res['timezone'] == 'Europe/London'
+        assert res['lang'] == 'en'
 
     def test_api__set_user_info__ok_200__user_itself(self):
         dbsession = get_tm_session(self.session_factory, transaction.manager)
@@ -4144,6 +4206,7 @@ class TestSetUserInfoEndpoint(FunctionalTest):
             name='bob',
             groups=groups,
             timezone='Europe/Paris',
+            lang='fr',
             do_save=True,
             do_notify=False,
         )
@@ -4167,10 +4230,12 @@ class TestSetUserInfoEndpoint(FunctionalTest):
         assert res['user_id'] == user_id
         assert res['public_name'] == 'bob'
         assert res['timezone'] == 'Europe/Paris'
+        assert res['lang'] == 'fr'
         # Set params
         params = {
             'public_name': 'updated',
             'timezone': 'Europe/London',
+            'lang' : 'en',
         }
         self.testapp.put_json(
             '/api/v2/users/{}'.format(user_id),
@@ -4186,6 +4251,7 @@ class TestSetUserInfoEndpoint(FunctionalTest):
         assert res['user_id'] == user_id
         assert res['public_name'] == 'updated'
         assert res['timezone'] == 'Europe/London'
+        assert res['lang'] == 'en'
 
     def test_api__set_user_email__err_403__other_normal_user(self):
         dbsession = get_tm_session(self.session_factory, transaction.manager)
@@ -4209,6 +4275,7 @@ class TestSetUserInfoEndpoint(FunctionalTest):
             name='bob',
             groups=groups,
             timezone='Europe/Paris',
+            lang='fr',
             do_save=True,
             do_notify=False,
         )
@@ -4218,6 +4285,7 @@ class TestSetUserInfoEndpoint(FunctionalTest):
             name='test',
             groups=groups,
             timezone='Europe/Paris',
+            lang='fr',
             do_save=True,
             do_notify=False,
         )
@@ -4237,6 +4305,7 @@ class TestSetUserInfoEndpoint(FunctionalTest):
         params = {
             'public_name': 'updated',
             'timezone': 'Europe/London',
+            'lang': 'en'
         }
         self.testapp.put_json(
             '/api/v2/users/{}'.format(user_id),
@@ -4274,6 +4343,7 @@ class TestSetUserProfilEndpoint(FunctionalTest):
             name='bob',
             groups=groups,
             timezone='Europe/Paris',
+            lang='fr',
             do_save=True,
             do_notify=False,
         )
@@ -4336,6 +4406,7 @@ class TestSetUserProfilEndpoint(FunctionalTest):
             name='bob',
             groups=groups,
             timezone='Europe/Paris',
+            lang='fr',
             do_save=True,
             do_notify=False,
         )
@@ -4398,6 +4469,7 @@ class TestSetUserProfilEndpoint(FunctionalTest):
             name='bob',
             groups=groups,
             timezone='Europe/Paris',
+            lang='fr',
             do_save=True,
             do_notify=False,
         )
@@ -4407,6 +4479,7 @@ class TestSetUserProfilEndpoint(FunctionalTest):
             name='test',
             groups=groups,
             timezone='Europe/Paris',
+            lang='fr',
             do_save=True,
             do_notify=False,
         )
@@ -4463,6 +4536,7 @@ class TestSetUserEnableDisableEndpoints(FunctionalTest):
             name='bob',
             groups=groups,
             timezone='Europe/Paris',
+            lang='fr',
             do_save=True,
             do_notify=False,
         )
@@ -4521,6 +4595,7 @@ class TestSetUserEnableDisableEndpoints(FunctionalTest):
             name='bob',
             groups=groups,
             timezone='Europe/Paris',
+            lang='fr',
             do_save=True,
             do_notify=False,
         )
@@ -4579,6 +4654,7 @@ class TestSetUserEnableDisableEndpoints(FunctionalTest):
             name='bob',
             groups=groups,
             timezone='Europe/Paris',
+            lang='fr',
             do_save=True,
             do_notify=False,
         )
@@ -4588,6 +4664,7 @@ class TestSetUserEnableDisableEndpoints(FunctionalTest):
             name='test2',
             groups=groups,
             timezone='Europe/Paris',
+            lang='fr',
             do_save=True,
             do_notify=False,
         )
@@ -4631,6 +4708,7 @@ class TestSetUserEnableDisableEndpoints(FunctionalTest):
             name='bob',
             groups=groups,
             timezone='Europe/Paris',
+            lang='fr',
             do_save=True,
             do_notify=False,
         )
@@ -4640,6 +4718,7 @@ class TestSetUserEnableDisableEndpoints(FunctionalTest):
             name='test2',
             groups=groups,
             timezone='Europe/Paris',
+            lang='fr',
             do_save=True,
             do_notify=False,
         )
@@ -4683,6 +4762,7 @@ class TestSetUserEnableDisableEndpoints(FunctionalTest):
             name='bob',
             groups=groups,
             timezone='Europe/Paris',
+            lang='fr',
             do_save=True,
             do_notify=False,
         )

backend/tracim_backend/tests/library/test_user_api.py

@@ -55,6 +55,7 @@ class TestUserApi(DefaultTest):
             password='pass',
             name='bob',
             timezone='+2',
+            lang='en',
             do_save=True,
             do_notify=False,
         )
@@ -63,6 +64,7 @@ class TestUserApi(DefaultTest):
         assert u.validate_password('pass')
         assert u.display_name == 'bob'
         assert u.timezone == '+2'
+        assert u.lang == 'en'
 
     def test_unit__user_with_email_exists__ok__nominal_case(self):
         api = UserApi(

backend/tracim_backend/views/core_api/schemas.py

@@ -84,6 +84,7 @@ class UserSchema(UserDigestSchema):
     )
     # TODO - G.M - 17-04-2018 - Restrict timezone values
     timezone = marshmallow.fields.String(
+        description="Timezone as tz database format",
         example="Europe/Paris",
     )
     # TODO - G.M - 17-04-2018 - check this, relative url allowed ?
@@ -99,6 +100,14 @@ class UserSchema(UserDigestSchema):
         validate=OneOf(Profile._NAME),
         example='managers',
     )
+    lang = marshmallow.fields.String(
+        description="User langage in iso639 format",
+        example='en',
+        required=False,
+        validate=Length(min=2, max=3),
+        allow_none=True,
+        default=None,
+    )
 
     class Meta:
         description = 'User account of Tracim'
@@ -138,6 +147,7 @@ class SetPasswordSchema(LoggedInUserPasswordSchema):
 
 class UserInfosSchema(marshmallow.Schema):
     timezone = marshmallow.fields.String(
+        description="Timezone as tz database format",
         example="Europe/Paris",
         required=True,
     )
@@ -145,6 +155,14 @@ class UserInfosSchema(marshmallow.Schema):
         example='Suri Cate',
         required=True,
     )
+    lang = marshmallow.fields.String(
+        description="User langage in iso639 format",
+        example='en',
+        required=True,
+        validate=Length(min=2, max=3),
+        allow_none=True,
+        default=None,
+    )
 
     @post_load
     def create_user_info_object(self, data):
@@ -179,6 +197,7 @@ class UserCreationSchema(marshmallow.Schema):
         default=Group.TIM_USER_GROUPNAME
     )
     timezone = marshmallow.fields.String(
+        description="Timezone as tz database format",
         example="Europe/Paris",
         required=False,
         default=''
@@ -188,6 +207,14 @@ class UserCreationSchema(marshmallow.Schema):
         required=False,
         default=None,
     )
+    lang = marshmallow.fields.String(
+        description="User langage in iso639 format",
+        example='en',
+        required=False,
+        validate=Length(min=2, max=3),
+        allow_none=True,
+        default=None,
+    )
     email_notification = marshmallow.fields.Bool(
         example=True,
         required=False,

backend/tracim_backend/views/core_api/user_controller.py

@@ -190,6 +190,7 @@ class UserController(Controller):
             request.candidate_user,
             name=hapic_data.body.public_name,
             timezone=hapic_data.body.timezone,
+            lang=hapic_data.body.lang,
             do_save=True
         )
         return uapi.get_user_with_context(user)
@@ -219,6 +220,7 @@ class UserController(Controller):
             email=hapic_data.body.email,
             password=hapic_data.body.password,
             timezone=hapic_data.body.timezone,
+            lang=hapic_data.body.lang,
             name=hapic_data.body.public_name,
             do_notify=hapic_data.body.email_notification,
             groups=groups,