Merge branch 'develop' of github.com:tracim/tracim_v2 into feature/refactor_content_type_and_content_status

README_traduction.md

@@ -0,0 +1,74 @@
+# Tracim internationalization
+
+## How to for Frontend part
+
+In each frontend repo (frontend, frontend_app_..., frontend_lib), there is a folder i18next.scanner that holds every translation files in JSON.
+
+___
+
+### I have found a translation error, how do I fix it ?
+
+**If the error is in any language other than english:**
+
+a) you can edit the values of the json files.
+
+b) Then commit/push your changes
+
+**If the error is in en.json:**
+
+1) You must find the key in the according .jsx file of that same repo.
+
+2) Fix the error
+ 
+3) Rebuild the translation files with:
+
+`npm run build-translation`
+
+This will add your new key in the translation files and remove the old one.
+
+4) Add translations for your new key in other .json files.
+
+5) commit/push your changes
+
+___
+
+### I have found an untranslated key in a language, how do I fix it ?
+
+It means you have found an english text even though you have selected another language. 
+
+Do task a) and b) in the according .json file, in folder i18next.scanner.
+
+___
+
+### I have found an untranslated key in a language but the key does not appear in the .json file.
+
+Do step 3).
+
+If the key still isn't in the .json file, it means the text in the .jsx file does not implement the translation process.
+
+So you must:
+
+I) Find the according .jsx file that have your untranslated key
+
+II) wrap your untranslated key in the translation function `t`:
+
+Exemple: `<div>My untranslated key</div>` will become `<div>{this.props.t('My untranslated key')}</div>`
+
+III) Check that `t` in available in your component, meanings your component must be wraped in the `translate()` higher order function
+
+``` javascript
+import React from 'react'
+import { translate } from 'react-i18next'
+
+class MyComponent extends React.Component {
+  render () {
+    return (<div>{this.props.t('My untranslated key')}</div>)
+  }
+}
+
+export default translate()(MyComponent)
+```
+
+IV) You can destruct `t` from `this.props` in the `render()` like it is done in most components.
+
+V) Do steps 3), 4), 5)

backend/tracim_backend/models/applications.py

@@ -50,7 +50,7 @@ calendar = Application(
 
 thread = Application(
     label='Threads',
-    slug='contents/threads',
+    slug='contents/thread',
     fa_icon='comments-o',
     hexcolor='#ad4cf9',
     is_active=True,
@@ -61,7 +61,7 @@ thread = Application(
 
 _file = Application(
     label='Files',
-    slug='contents/files',
+    slug='contents/file',
     fa_icon='paperclip',
     hexcolor='#FF9900',
     is_active=True,
@@ -81,12 +81,12 @@ markdownpluspage = Application(
 
 html_documents = Application(
     label='Text Documents',  # TODO - G.M - 24-05-2018 - Check label
-    slug='contents/html-documents',
+    slug='contents/html-document',
     fa_icon='file-text-o',
     hexcolor='#3f52e3',
     is_active=True,
     config={},
-    main_route='/#/workspaces/{workspace_id}/contents?type=html-documents',
+    main_route='/#/workspaces/{workspace_id}/contents?type=html-document',
 )
 # TODO - G.M - 08-06-2018 - This is hardcoded lists of app, make this dynamic.
 # List of applications

backend/tracim_backend/models/contents.py

@@ -159,7 +159,7 @@ markdownpluspage_type = ContentType(
 )
 
 html_documents_type = ContentType(
-    slug='html-documents',
+    slug='html-document',
     fa_icon=html_documents.fa_icon,
     hexcolor=html_documents.hexcolor,
     label='Text Document',

backend/tracim_backend/models/context_models.py

@@ -291,7 +291,7 @@ class ContentCreation(object):
     ) -> None:
         self.label = label
         self.content_type = content_type
-        self.parent_id = parent_id
+        self.parent_id = parent_id or None
 
 
 class CommentCreation(object):

backend/tracim_backend/tests/__init__.py

@@ -50,7 +50,7 @@ def set_html_document_slug_to_legacy(session_factory) -> None:
     )
     content_query = dbsession.query(ContentRevisionRO).filter(ContentRevisionRO.type == 'page').filter(ContentRevisionRO.content_id == 6)  # nopep8
     assert content_query.count() == 0
-    html_documents_query = dbsession.query(ContentRevisionRO).filter(ContentRevisionRO.type == 'html-documents')  # nopep8
+    html_documents_query = dbsession.query(ContentRevisionRO).filter(ContentRevisionRO.type == 'html-document')  # nopep8
     html_documents_query.update({ContentRevisionRO.type: 'page'})
     transaction.commit()
     assert content_query.count() > 0

backend/tracim_backend/tests/functional/test_contents.py

@@ -50,7 +50,7 @@ class TestHtmlDocuments(FunctionalTest):
             status=200
         )
         content = res.json_body
-        assert content['content_type'] == 'html-documents'
+        assert content['content_type'] == 'html-document'
         assert content['content_id'] == 6
         assert content['is_archived'] is False
         assert content['is_deleted'] is False
@@ -91,7 +91,7 @@ class TestHtmlDocuments(FunctionalTest):
             status=200
         )
         content = res.json_body
-        assert content['content_type'] == 'html-documents'
+        assert content['content_type'] == 'html-document'
         assert content['content_id'] == 6
         assert content['is_archived'] is False
         assert content['is_deleted'] is False
@@ -254,7 +254,7 @@ class TestHtmlDocuments(FunctionalTest):
             status=200
         )
         content = res.json_body
-        assert content['content_type'] == 'html-documents'
+        assert content['content_type'] == 'html-document'
         assert content['content_id'] == 6
         assert content['is_archived'] is False
         assert content['is_deleted'] is False
@@ -281,7 +281,7 @@ class TestHtmlDocuments(FunctionalTest):
             status=200
         )
         content = res.json_body
-        assert content['content_type'] == 'html-documents'
+        assert content['content_type'] == 'html-document'
         assert content['content_id'] == 6
         assert content['is_archived'] is False
         assert content['is_deleted'] is False
@@ -323,7 +323,7 @@ class TestHtmlDocuments(FunctionalTest):
         revisions = res.json_body
         assert len(revisions) == 3
         revision = revisions[0]
-        assert revision['content_type'] == 'html-documents'
+        assert revision['content_type'] == 'html-document'
         assert revision['content_id'] == 6
         assert revision['is_archived'] is False
         assert revision['is_deleted'] is False
@@ -345,7 +345,7 @@ class TestHtmlDocuments(FunctionalTest):
         assert revision['author']['avatar_url'] is None
         assert revision['author']['public_name'] == 'Global manager'
         revision = revisions[1]
-        assert revision['content_type'] == 'html-documents'
+        assert revision['content_type'] == 'html-document'
         assert revision['content_id'] == 6
         assert revision['is_archived'] is False
         assert revision['is_deleted'] is False
@@ -367,7 +367,7 @@ class TestHtmlDocuments(FunctionalTest):
         assert revision['author']['avatar_url'] is None
         assert revision['author']['public_name'] == 'Global manager'
         revision = revisions[2]
-        assert revision['content_type'] == 'html-documents'
+        assert revision['content_type'] == 'html-document'
         assert revision['content_id'] == 6
         assert revision['is_archived'] is False
         assert revision['is_deleted'] is False
@@ -410,7 +410,7 @@ class TestHtmlDocuments(FunctionalTest):
             status=200
         )
         content = res.json_body
-        assert content['content_type'] == 'html-documents'
+        assert content['content_type'] == 'html-document'
         assert content['content_id'] == 6
         assert content['status'] == 'open'
 
@@ -427,7 +427,7 @@ class TestHtmlDocuments(FunctionalTest):
             status=200
         )
         content = res.json_body
-        assert content['content_type'] == 'html-documents'
+        assert content['content_type'] == 'html-document'
         assert content['content_id'] == 6
         assert content['status'] == 'closed-deprecated'
 

backend/tracim_backend/tests/functional/test_system.py

@@ -5,6 +5,7 @@ from tracim_backend.tests import FunctionalTest
 Tests for /api/v2/system subpath endpoints.
 """
 
+
 class TestApplicationEndpoint(FunctionalTest):
     """
     Tests for /api/v2/system/applications
@@ -25,7 +26,7 @@ class TestApplicationEndpoint(FunctionalTest):
         res = res.json_body
         application = res[0]
         assert application['label'] == "Text Documents"
-        assert application['slug'] == 'contents/html-documents'
+        assert application['slug'] == 'contents/html-document'
         assert application['fa_icon'] == 'file-text-o'
         assert application['hexcolor'] == '#3f52e3'
         assert application['is_active'] is True
@@ -39,14 +40,14 @@ class TestApplicationEndpoint(FunctionalTest):
         assert 'config' in application
         application = res[2]
         assert application['label'] == "Files"
-        assert application['slug'] == 'contents/files'
+        assert application['slug'] == 'contents/file'
         assert application['fa_icon'] == 'paperclip'
         assert application['hexcolor'] == '#FF9900'
         assert application['is_active'] is True
         assert 'config' in application
         application = res[3]
         assert application['label'] == "Threads"
-        assert application['slug'] == 'contents/threads'
+        assert application['slug'] == 'contents/thread'
         assert application['fa_icon'] == 'comments-o'
         assert application['hexcolor'] == '#ad4cf9'
         assert application['is_active'] is True
@@ -122,9 +123,7 @@ class TestContentsTypesEndpoint(FunctionalTest):
         assert content_type['creation_label'] == 'Create a Markdown document'
         assert 'available_statuses' in content_type
         assert len(content_type['available_statuses']) == 4
-
-        content_type = res[4]
-        assert content_type['slug'] == 'html-documents'
+        assert content_type['slug'] == 'html-document'
         assert content_type['fa_icon'] == 'file-text-o'
         assert content_type['hexcolor'] == '#3f52e3'
         assert content_type['label'] == 'Text Document'

backend/tracim_backend/tests/functional/test_user.py

@@ -762,9 +762,9 @@ class TestUserWorkspaceEndpoint(FunctionalTest):
         assert sidebar_entry['fa_icon'] == "th"
 
         sidebar_entry = workspace['sidebar_entries'][2]
-        assert sidebar_entry['slug'] == 'contents/html-documents'
+        assert sidebar_entry['slug'] == 'contents/html-document'
         assert sidebar_entry['label'] == 'Text Documents'
-        assert sidebar_entry['route'] == '/#/workspaces/1/contents?type=html-documents'  # nopep8
+        assert sidebar_entry['route'] == '/#/workspaces/1/contents?type=html-document'  # nopep8
         assert sidebar_entry['hexcolor'] == "#3f52e3"
         assert sidebar_entry['fa_icon'] == "file-text-o"
 
@@ -776,14 +776,14 @@ class TestUserWorkspaceEndpoint(FunctionalTest):
         assert sidebar_entry['fa_icon'] == "file-code-o"
 
         sidebar_entry = workspace['sidebar_entries'][4]
-        assert sidebar_entry['slug'] == 'contents/files'
+        assert sidebar_entry['slug'] == 'contents/file'
         assert sidebar_entry['label'] == 'Files'
         assert sidebar_entry['route'] == "/#/workspaces/1/contents?type=file"  # nopep8
         assert sidebar_entry['hexcolor'] == "#FF9900"
         assert sidebar_entry['fa_icon'] == "paperclip"
 
         sidebar_entry = workspace['sidebar_entries'][5]
-        assert sidebar_entry['slug'] == 'contents/threads'
+        assert sidebar_entry['slug'] == 'contents/thread'
         assert sidebar_entry['label'] == 'Threads'
         assert sidebar_entry['route'] == "/#/workspaces/1/contents?type=thread"  # nopep8
         assert sidebar_entry['hexcolor'] == "#ad4cf9"

backend/tracim_backend/tests/functional/test_workspaces.py

@@ -58,9 +58,9 @@ class TestWorkspaceEndpoint(FunctionalTest):
         assert sidebar_entry['fa_icon'] == "th"
 
         sidebar_entry = workspace['sidebar_entries'][2]
-        assert sidebar_entry['slug'] == 'contents/html-documents'
+        assert sidebar_entry['slug'] == 'contents/html-document'
         assert sidebar_entry['label'] == 'Text Documents'
-        assert sidebar_entry['route'] == '/#/workspaces/1/contents?type=html-documents'  # nopep8
+        assert sidebar_entry['route'] == '/#/workspaces/1/contents?type=html-document'  # nopep8
         assert sidebar_entry['hexcolor'] == "#3f52e3"
         assert sidebar_entry['fa_icon'] == "file-text-o"
 
@@ -72,14 +72,14 @@ class TestWorkspaceEndpoint(FunctionalTest):
         assert sidebar_entry['fa_icon'] == "file-code-o"
 
         sidebar_entry = workspace['sidebar_entries'][4]
-        assert sidebar_entry['slug'] == 'contents/files'
+        assert sidebar_entry['slug'] == 'contents/file'
         assert sidebar_entry['label'] == 'Files'
         assert sidebar_entry['route'] == "/#/workspaces/1/contents?type=file"  # nopep8
         assert sidebar_entry['hexcolor'] == "#FF9900"
         assert sidebar_entry['fa_icon'] == "paperclip"
 
         sidebar_entry = workspace['sidebar_entries'][5]
-        assert sidebar_entry['slug'] == 'contents/threads'
+        assert sidebar_entry['slug'] == 'contents/thread'
         assert sidebar_entry['label'] == 'Threads'
         assert sidebar_entry['route'] == "/#/workspaces/1/contents?type=thread"  # nopep8
         assert sidebar_entry['hexcolor'] == "#ad4cf9"
@@ -643,7 +643,7 @@ class TestWorkspaceContents(FunctionalTest):
         assert content['show_in_ui'] is True
         assert content['slug'] == 'tools'
         assert content['status'] == 'open'
-        assert set(content['sub_content_types']) == {'thread', 'html-documents', 'folder', 'file'}  # nopep8
+        assert set(content['sub_content_types']) == {'thread', 'html-document', 'folder', 'file'}  # nopep8
         assert content['workspace_id'] == 1
         content = res[1]
         assert content['content_id'] == 2
@@ -655,11 +655,11 @@ class TestWorkspaceContents(FunctionalTest):
         assert content['show_in_ui'] is True
         assert content['slug'] == 'menus'
         assert content['status'] == 'open'
-        assert set(content['sub_content_types']) == {'thread', 'html-documents', 'folder', 'file'}  # nopep8
+        assert set(content['sub_content_types']) == {'thread', 'html-document', 'folder', 'file'}  # nopep8
         assert content['workspace_id'] == 1
         content = res[2]
         assert content['content_id'] == 11
-        assert content['content_type'] == 'html-documents'
+        assert content['content_type'] == 'html-document'
         assert content['is_archived'] is False
         assert content['is_deleted'] is False
         assert content['label'] == 'Current Menu'
@@ -667,7 +667,7 @@ class TestWorkspaceContents(FunctionalTest):
         assert content['show_in_ui'] is True
         assert content['slug'] == 'current-menu'
         assert content['status'] == 'open'
-        assert set(content['sub_content_types']) == {'thread', 'html-documents', 'folder', 'file'}  # nopep8
+        assert set(content['sub_content_types']) == {'thread', 'html-document', 'folder', 'file'}  # nopep8
         assert content['workspace_id'] == 1
 
     def test_api__get_workspace_content__ok_200__get_default_html_documents(self):
@@ -682,14 +682,14 @@ class TestWorkspaceContents(FunctionalTest):
             )
         )
         params = {
-            'content_type': 'html-documents',
+            'content_type': 'html-document',
         }
         res = self.testapp.get('/api/v2/workspaces/1/contents', status=200, params=params).json_body   # nopep8
         assert len(res) == 1
         content = res[0]
         assert content
         assert content['content_id'] == 11
-        assert content['content_type'] == 'html-documents'
+        assert content['content_type'] == 'html-document'
         assert content['is_archived'] is False
         assert content['is_deleted'] is False
         assert content['label'] == 'Current Menu'
@@ -697,7 +697,7 @@ class TestWorkspaceContents(FunctionalTest):
         assert content['show_in_ui'] is True
         assert content['slug'] == 'current-menu'
         assert content['status'] == 'open'
-        assert set(content['sub_content_types']) == {'thread', 'html-documents', 'folder', 'file'}  # nopep8
+        assert set(content['sub_content_types']) == {'thread', 'html-document', 'folder', 'file'}  # nopep8
         assert content['workspace_id'] == 1
 
     # Root related
@@ -727,7 +727,7 @@ class TestWorkspaceContents(FunctionalTest):
         # TODO - G.M - 30-05-2018 - Check this test
         assert len(res) == 4
         content = res[1]
-        assert content['content_type'] == 'html-documents'
+        assert content['content_type'] == 'html-document'
         assert content['content_id'] == 15
         assert content['is_archived'] is False
         assert content['is_deleted'] is False
@@ -736,11 +736,11 @@ class TestWorkspaceContents(FunctionalTest):
         assert content['show_in_ui'] is True
         assert content['slug'] == 'new-fruit-salad'
         assert content['status'] == 'open'
-        assert set(content['sub_content_types']) == {'thread', 'html-documents', 'folder', 'file'}  # nopep8
+        assert set(content['sub_content_types']) == {'thread', 'html-document', 'folder', 'file'}  # nopep8
         assert content['workspace_id'] == 3
 
         content = res[2]
-        assert content['content_type'] == 'html-documents'
+        assert content['content_type'] == 'html-document'
         assert content['content_id'] == 16
         assert content['is_archived'] is True
         assert content['is_deleted'] is False
@@ -749,11 +749,11 @@ class TestWorkspaceContents(FunctionalTest):
         assert content['show_in_ui'] is True
         assert content['slug'].startswith('fruit-salad')
         assert content['status'] == 'open'
-        assert set(content['sub_content_types']) == {'thread', 'html-documents', 'folder', 'file'}  # nopep8
+        assert set(content['sub_content_types']) == {'thread', 'html-document', 'folder', 'file'}  # nopep8
         assert content['workspace_id'] == 3
 
         content = res[3]
-        assert content['content_type'] == 'html-documents'
+        assert content['content_type'] == 'html-document'
         assert content['content_id'] == 17
         assert content['is_archived'] is False
         assert content['is_deleted'] is True
@@ -762,7 +762,7 @@ class TestWorkspaceContents(FunctionalTest):
         assert content['show_in_ui'] is True
         assert content['slug'].startswith('bad-fruit-salad')
         assert content['status'] == 'open'
-        assert set(content['sub_content_types']) == {'thread', 'html-documents', 'folder', 'file'}  # nopep8
+        assert set(content['sub_content_types']) == {'thread', 'html-document', 'folder', 'file'}  # nopep8
         assert content['workspace_id'] == 3
 
     def test_api__get_workspace_content__ok_200__get_all_root_content(self):
@@ -790,7 +790,7 @@ class TestWorkspaceContents(FunctionalTest):
         # TODO - G.M - 30-05-2018 - Check this test
         assert len(res) == 4
         content = res[1]
-        assert content['content_type'] == 'html-documents'
+        assert content['content_type'] == 'html-document'
         assert content['content_id'] == 15
         assert content['is_archived'] is False
         assert content['is_deleted'] is False
@@ -799,11 +799,11 @@ class TestWorkspaceContents(FunctionalTest):
         assert content['show_in_ui'] is True
         assert content['slug'] == 'new-fruit-salad'
         assert content['status'] == 'open'
-        assert set(content['sub_content_types']) == {'thread', 'html-documents', 'folder', 'file'}  # nopep8
+        assert set(content['sub_content_types']) == {'thread', 'html-document', 'folder', 'file'}  # nopep8
         assert content['workspace_id'] == 3
 
         content = res[2]
-        assert content['content_type'] == 'html-documents'
+        assert content['content_type'] == 'html-document'
         assert content['content_id'] == 16
         assert content['is_archived'] is True
         assert content['is_deleted'] is False
@@ -812,11 +812,11 @@ class TestWorkspaceContents(FunctionalTest):
         assert content['show_in_ui'] is True
         assert content['slug'].startswith('fruit-salad')
         assert content['status'] == 'open'
-        assert set(content['sub_content_types']) == {'thread', 'html-documents', 'folder', 'file'}  # nopep8
+        assert set(content['sub_content_types']) == {'thread', 'html-document', 'folder', 'file'}  # nopep8
         assert content['workspace_id'] == 3
 
         content = res[3]
-        assert content['content_type'] == 'html-documents'
+        assert content['content_type'] == 'html-document'
         assert content['content_id'] == 17
         assert content['is_archived'] is False
         assert content['is_deleted'] is True
@@ -825,7 +825,7 @@ class TestWorkspaceContents(FunctionalTest):
         assert content['show_in_ui'] is True
         assert content['slug'].startswith('bad-fruit-salad')
         assert content['status'] == 'open'
-        assert set(content['sub_content_types']) == {'thread', 'html-documents', 'folder', 'file'}  # nopep8
+        assert set(content['sub_content_types']) == {'thread', 'html-document', 'folder', 'file'}  # nopep8
         assert content['workspace_id'] == 3
 
     def test_api__get_workspace_content__ok_200__get_only_active_root_content(self):  # nopep8
@@ -853,7 +853,7 @@ class TestWorkspaceContents(FunctionalTest):
         # TODO - G.M - 30-05-2018 - Check this test
         assert len(res) == 2
         content = res[1]
-        assert content['content_type'] == 'html-documents'
+        assert content['content_type'] == 'html-document'
         assert content['content_id'] == 15
         assert content['is_archived'] is False
         assert content['is_deleted'] is False
@@ -862,7 +862,7 @@ class TestWorkspaceContents(FunctionalTest):
         assert content['show_in_ui'] is True
         assert content['slug'] == 'new-fruit-salad'
         assert content['status'] == 'open'
-        assert set(content['sub_content_types']) == {'thread', 'html-documents', 'folder', 'file'}  # nopep8
+        assert set(content['sub_content_types']) == {'thread', 'html-document', 'folder', 'file'}  # nopep8
         assert content['workspace_id'] == 3
 
     def test_api__get_workspace_content__ok_200__get_only_archived_root_content(self):  # nopep8
@@ -889,7 +889,7 @@ class TestWorkspaceContents(FunctionalTest):
         ).json_body   # nopep8
         assert len(res) == 1
         content = res[0]
-        assert content['content_type'] == 'html-documents'
+        assert content['content_type'] == 'html-document'
         assert content['content_id'] == 16
         assert content['is_archived'] is True
         assert content['is_deleted'] is False
@@ -898,7 +898,7 @@ class TestWorkspaceContents(FunctionalTest):
         assert content['show_in_ui'] is True
         assert content['slug'].startswith('fruit-salad')
         assert content['status'] == 'open'
-        assert set(content['sub_content_types']) == {'thread', 'html-documents', 'folder', 'file'}  # nopep8
+        assert set(content['sub_content_types']) == {'thread', 'html-document', 'folder', 'file'}  # nopep8
         assert content['workspace_id'] == 3
 
     def test_api__get_workspace_content__ok_200__get_only_deleted_root_content(self):  # nopep8
@@ -927,7 +927,7 @@ class TestWorkspaceContents(FunctionalTest):
 
         assert len(res) == 1
         content = res[0]
-        assert content['content_type'] == 'html-documents'
+        assert content['content_type'] == 'html-document'
         assert content['content_id'] == 17
         assert content['is_archived'] is False
         assert content['is_deleted'] is True
@@ -936,7 +936,7 @@ class TestWorkspaceContents(FunctionalTest):
         assert content['show_in_ui'] is True
         assert content['slug'].startswith('bad-fruit-salad')
         assert content['status'] == 'open'
-        assert set(content['sub_content_types']) == {'thread', 'html-documents', 'folder', 'file'}  # nopep8
+        assert set(content['sub_content_types']) == {'thread', 'html-document', 'folder', 'file'}  # nopep8
         assert content['workspace_id'] == 3
 
     def test_api__get_workspace_content__ok_200__get_nothing_root_content(self):
@@ -1058,7 +1058,7 @@ class TestWorkspaceContents(FunctionalTest):
         assert content['show_in_ui'] is True
         assert content['slug'] == 'test-thread'
         assert content['status'] == 'open'
-        assert set(content['sub_content_types']) == {'thread', 'html-documents', 'folder', 'file'}  # nopep8
+        assert set(content['sub_content_types']) == {'thread', 'html-document', 'folder', 'file'}  # nopep8
         assert content['workspace_id'] == 1
 
     def test_api__get_workspace_content__ok_200__get_all_filter_content_html_and_legacy_page(self):  # nopep8
@@ -1130,7 +1130,7 @@ class TestWorkspaceContents(FunctionalTest):
             'show_archived': 1,
             'show_deleted': 1,
             'show_active': 1,
-            'content_type': 'html-documents',
+            'content_type': 'html-document',
         }
         self.testapp.authorization = (
             'Basic',
@@ -1146,7 +1146,7 @@ class TestWorkspaceContents(FunctionalTest):
         ).json_body
         assert len(res) == 2
         content = res[0]
-        assert content['content_type'] == 'html-documents'
+        assert content['content_type'] == 'html-document'
         assert content['content_id']
         assert content['is_archived'] is False
         assert content['is_deleted'] is False
@@ -1155,10 +1155,10 @@ class TestWorkspaceContents(FunctionalTest):
         assert content['show_in_ui'] is True
         assert content['slug'] == 'test-page'
         assert content['status'] == 'open'
-        assert set(content['sub_content_types']) == {'thread', 'html-documents', 'folder', 'file'}  # nopep8
+        assert set(content['sub_content_types']) == {'thread', 'html-document', 'folder', 'file'}  # nopep8
         assert content['workspace_id'] == 1
         content = res[1]
-        assert content['content_type'] == 'html-documents'
+        assert content['content_type'] == 'html-document'
         assert content['content_id']
         assert content['is_archived'] is False
         assert content['is_deleted'] is False
@@ -1167,7 +1167,7 @@ class TestWorkspaceContents(FunctionalTest):
         assert content['show_in_ui'] is True
         assert content['slug'] == 'test-html-page'
         assert content['status'] == 'open'
-        assert set(content['sub_content_types']) == {'thread', 'html-documents', 'folder', 'file'}  # nopep8
+        assert set(content['sub_content_types']) == {'thread', 'html-document', 'folder', 'file'}  # nopep8
         assert content['workspace_id'] == 1
         assert res[0]['content_id'] != res[1]['content_id']
 
@@ -1196,7 +1196,7 @@ class TestWorkspaceContents(FunctionalTest):
         ).json_body   # nopep8
         assert len(res) == 3
         content = res[0]
-        assert content['content_type'] == 'html-documents'
+        assert content['content_type'] == 'html-document'
         assert content['content_id'] == 12
         assert content['is_archived'] is False
         assert content['is_deleted'] is False
@@ -1205,11 +1205,11 @@ class TestWorkspaceContents(FunctionalTest):
         assert content['show_in_ui'] is True
         assert content['slug'] == 'new-fruit-salad'
         assert content['status'] == 'open'
-        assert set(content['sub_content_types']) == {'thread', 'html-documents', 'folder', 'file'}  # nopep8
+        assert set(content['sub_content_types']) == {'thread', 'html-document', 'folder', 'file'}  # nopep8
         assert content['workspace_id'] == 2
 
         content = res[1]
-        assert content['content_type'] == 'html-documents'
+        assert content['content_type'] == 'html-document'
         assert content['content_id'] == 13
         assert content['is_archived'] is True
         assert content['is_deleted'] is False
@@ -1218,11 +1218,11 @@ class TestWorkspaceContents(FunctionalTest):
         assert content['show_in_ui'] is True
         assert content['slug'].startswith('fruit-salad')
         assert content['status'] == 'open'
-        assert set(content['sub_content_types']) == {'thread', 'html-documents', 'folder', 'file'}  # nopep8
+        assert set(content['sub_content_types']) == {'thread', 'html-document', 'folder', 'file'}  # nopep8
         assert content['workspace_id'] == 2
 
         content = res[2]
-        assert content['content_type'] == 'html-documents'
+        assert content['content_type'] == 'html-document'
         assert content['content_id'] == 14
         assert content['is_archived'] is False
         assert content['is_deleted'] is True
@@ -1231,7 +1231,7 @@ class TestWorkspaceContents(FunctionalTest):
         assert content['show_in_ui'] is True
         assert content['slug'].startswith('bad-fruit-salad')
         assert content['status'] == 'open'
-        assert set(content['sub_content_types']) == {'thread', 'html-documents', 'folder', 'file'}  # nopep8
+        assert set(content['sub_content_types']) == {'thread', 'html-document', 'folder', 'file'}  # nopep8
         assert content['workspace_id'] == 2
 
     def test_api__get_workspace_content__ok_200__get_only_active_folder_content(self):  # nopep8
@@ -1267,7 +1267,7 @@ class TestWorkspaceContents(FunctionalTest):
         assert content['show_in_ui'] is True
         assert content['slug'] == 'new-fruit-salad'
         assert content['status'] == 'open'
-        assert set(content['sub_content_types']) == {'thread', 'html-documents', 'folder', 'file'}  # nopep8
+        assert set(content['sub_content_types']) == {'thread', 'html-document', 'folder', 'file'}  # nopep8
         assert content['workspace_id'] == 2
 
     def test_api__get_workspace_content__ok_200__get_only_archived_folder_content(self):  # nopep8
@@ -1294,7 +1294,7 @@ class TestWorkspaceContents(FunctionalTest):
         ).json_body   # nopep8
         assert len(res) == 1
         content = res[0]
-        assert content['content_type'] == 'html-documents'
+        assert content['content_type'] == 'html-document'
         assert content['content_id'] == 13
         assert content['is_archived'] is True
         assert content['is_deleted'] is False
@@ -1303,7 +1303,7 @@ class TestWorkspaceContents(FunctionalTest):
         assert content['show_in_ui'] is True
         assert content['slug'].startswith('fruit-salad')
         assert content['status'] == 'open'
-        assert set(content['sub_content_types']) == {'thread', 'html-documents', 'folder', 'file'}  # nopep8
+        assert set(content['sub_content_types']) == {'thread', 'html-document', 'folder', 'file'}  # nopep8
         assert content['workspace_id'] == 2
 
     def test_api__get_workspace_content__ok_200__get_only_deleted_folder_content(self):  # nopep8
@@ -1331,7 +1331,7 @@ class TestWorkspaceContents(FunctionalTest):
 
         assert len(res) == 1
         content = res[0]
-        assert content['content_type'] == 'html-documents'
+        assert content['content_type'] == 'html-document'
         assert content['content_id'] == 14
         assert content['is_archived'] is False
         assert content['is_deleted'] is True
@@ -1340,7 +1340,7 @@ class TestWorkspaceContents(FunctionalTest):
         assert content['show_in_ui'] is True
         assert content['slug'].startswith('bad-fruit-salad')
         assert content['status'] == 'open'
-        assert set(content['sub_content_types']) == {'thread', 'html-documents', 'folder', 'file'}  # nopep8
+        assert set(content['sub_content_types']) == {'thread', 'html-document', 'folder', 'file'}  # nopep8
         assert content['workspace_id'] == 2
 
     def test_api__get_workspace_content__ok_200__get_nothing_folder_content(self):  # nopep8
@@ -1436,6 +1436,7 @@ class TestWorkspaceContents(FunctionalTest):
             )
         )
         params = {
+            'parent_id': None,
             'label': 'GenericCreatedContent',
             'content_type': 'markdownpage',
         }
@@ -1466,6 +1467,70 @@ class TestWorkspaceContents(FunctionalTest):
         active_contents = self.testapp.get('/api/v2/workspaces/1/contents', params=params_active, status=200).json_body  # nopep8
         assert res.json_body in active_contents
 
+    def test_api__post_content_create_generic_content__ok_200__no_parent_id_param(self) -> None:  # nopep8
+        """
+        Create generic content
+        """
+        self.testapp.authorization = (
+            'Basic',
+            (
+                'admin@admin.admin',
+                'admin@admin.admin'
+            )
+        )
+        params = {
+            'label': 'GenericCreatedContent',
+            'content_type': 'markdownpage',
+        }
+        res = self.testapp.post_json(
+            '/api/v2/workspaces/1/contents',
+            params=params,
+            status=200
+        )
+        assert res
+        assert res.json_body
+        assert res.json_body['status'] == 'open'
+        assert res.json_body['content_id']
+        assert res.json_body['content_type'] == 'markdownpage'
+        assert res.json_body['is_archived'] is False
+        assert res.json_body['is_deleted'] is False
+        assert res.json_body['workspace_id'] == 1
+        assert res.json_body['slug'] == 'genericcreatedcontent'
+        assert res.json_body['parent_id'] is None
+        assert res.json_body['show_in_ui'] is True
+        assert res.json_body['sub_content_types']
+        params_active = {
+            'parent_id': 0,
+            'show_archived': 0,
+            'show_deleted': 0,
+            'show_active': 1,
+        }
+        # INFO - G.M - 2018-06-165 - Verify if new content is correctly created
+        active_contents = self.testapp.get('/api/v2/workspaces/1/contents', params=params_active, status=200).json_body  # nopep8
+        assert res.json_body in active_contents
+
+    def test_api__post_content_create_generic_content__err_400__parent_id_0(self) -> None:  # nopep8
+        """
+        Create generic content
+        """
+        self.testapp.authorization = (
+            'Basic',
+            (
+                'admin@admin.admin',
+                'admin@admin.admin'
+            )
+        )
+        params = {
+            'parent_id': 0,
+            'label': 'GenericCreatedContent',
+            'content_type': 'markdownpage',
+        }
+        res = self.testapp.post_json(
+            '/api/v2/workspaces/1/contents',
+            params=params,
+            status=400
+        )
+
     def test_api__post_content_create_generic_content__ok_200__in_folder(self) -> None:  # nopep8
         """
         Create generic content in folder

backend/tracim_backend/views/core_api/schemas.py

@@ -645,17 +645,20 @@ class ContentCreationSchema(marshmallow.Schema):
         description='Title of the content to create'
     )
     content_type = marshmallow.fields.String(
-        example='html-documents',
-        validate=OneOf(CONTENT_TYPES.endpoint_allowed_types_slug()),  # nopep8
+        example='html-document',
+        validate=OneOf(CONTENT_TYPES.endpoint_allowed_types_slug()),
     )
     parent_id = marshmallow.fields.Integer(
         example=35,
-        description='content_id of parent content, if content should be placed in a folder, this should be folder content_id.'
+        description='content_id of parent content, if content should be placed in a folder, this should be folder content_id.', # nopep8
+        allow_none=True,
+        default=None,
+        validate=Range(min=1, error="Value must be positive"),
     )
 
 
     @post_load
-    def make_content_filter(self, data):
+    def make_content_creation(self, data):
         return ContentCreation(**data)
 
 
@@ -677,7 +680,7 @@ class ContentDigestSchema(marshmallow.Schema):
     )
     label = marshmallow.fields.Str(example='Intervention Report 12')
     content_type = marshmallow.fields.Str(
-        example='html-documents',
+        example='html-document',
         validate=OneOf(CONTENT_TYPES.endpoint_allowed_types_slug()),
     )
     sub_content_types = marshmallow.fields.List(
@@ -716,6 +719,7 @@ class ReadStatusSchema(marshmallow.Schema):
 # Content
 #####
 
+
 class ContentSchema(ContentDigestSchema):
     current_revision_id = marshmallow.fields.Int(example=12)
     created = marshmallow.fields.DateTime(

build_full_frontend.sh

@@ -9,23 +9,46 @@ fi
 
 echo -e "\n${BROWN}/!\ ${NC}this script does not run 'npm install'\n${BROWN}/!\ ${NC}it also assumes your webpack dev server of frontend is running"
 
+# Tracim Lib
+
 log "cd frontend_lib"
 cd frontend_lib
 log "npm run buildtracimlib$windoz"
 npm run buildtracimlib$windoz
 cd -
 
+# app Html Document
+
 log "cd frontend_app_html-document"
 cd frontend_app_html-document
+
 log "npm run build$windoz # for frontend_app_html-document"
 npm run build$windoz
+
 log "cp dist/html-document.app.js"
 cp dist/html-document.app.js ../frontend/dist/app
+
+log "cp i18next.scanner/en/translation.json ../frontend/dist/app/tml-document_en_translation.json"
+cp i18next.scanner/en/translation.json ../frontend/dist/app/html-document_en_translation.json
+
+log "cp i18next.scanner/fr/translation.json ../frontend/dist/app/html-document_fr_translation.json"
+cp i18next.scanner/fr/translation.json ../frontend/dist/app/html-document_fr_translation.json
 cd -
 
+# app Thread
+
 log "cd frontend_app_thread"
 cd frontend_app_thread
+
 log "npm run build$windoz # for frontend_app_thread"
 npm run build$windoz
+
 log "cp dist/thread.app.js"
 cp dist/thread.app.js ../frontend/dist/app
+
+log "cp i18next.scanner/en/translation.json ../frontend/dist/app/thread_en_translation.json"
+cp i18next.scanner/en/translation.json ../frontend/dist/app/thread_en_translation.json
+
+log "cp i18next.scanner/fr/translation.json ../frontend/dist/app/thread_fr_translation.json"
+cp i18next.scanner/fr/translation.json ../frontend/dist/app/thread_fr_translation.json
+cd -

frontend/dist/appInterface.js

@@ -3,7 +3,7 @@
 
   getSelectedApp = name => {
     switch (name) {
-      case 'html-documents':
+      case 'html-document':
         return appHtmlDocument
       case 'thread':
         return appThread

frontend/i18next.scanner.js

@@ -0,0 +1,16 @@
+const scanner = require('i18next-scanner')
+const vfs = require('vinyl-fs')
+
+const option = require('../i18next.option.js')
+
+// this script is run by npm run build-translation and generate i18next.scanner/**/*.json
+
+// --------------------
+// 2018/07/27 - currently, last version is 2.6.5 but a bug is spaming log with errors. So I'm using 2.6.1
+// this issue seems related : https://github.com/i18next/i18next-scanner/issues/88
+// --------------------
+
+vfs.src(['./src/**/*.jsx'])
+  // .pipe(sort()) // Sort files in stream by path
+  .pipe(scanner(option))
+  .pipe(vfs.dest('./i18next.scanner'))

frontend/i18next.scanner/en/translation.json

@@ -0,0 +1,23 @@
+{
+  "Create your own collaborative workspaces on trac.im": "Create your own collaborative workspaces on trac.im",
+  "Copyright 2013 - 2017": "Copyright 2013 - 2017",
+  "Disconnection error": "Disconnection error",
+  "Error": "Error",
+  "Email or password invalid": "Email or password invalid",
+  "Type": "Type",
+  "Status": "Status",
+  "Create in folder...": "Create in folder...",
+  "Search...": "Search...",
+  "Create a workspace": "Create a workspace",
+  "Title": "Title",
+  "Change": "Change",
+  "Move": "Move",
+  "Download": "Download",
+  "Archive": "Archive",
+  "Delete": "Delete",
+  "My Account": "My Account",
+  "Logout": "Logout",
+  "Notification": "Notification",
+  "Archive Topic": "Archive Topic",
+  "Deleted File": "Deleted File"
+}

frontend/i18next.scanner/fr/translation.json

@@ -0,0 +1,23 @@
+{
+  "Create your own collaborative workspaces on trac.im": "Créer votre propre espace de travail sur trac.im",
+  "Copyright 2013 - 2017": "Copyright 2013 - 2017",
+  "Disconnection error": "Erreur de déconnexion",
+  "Error": "Erreur",
+  "Email or password invalid": "Email ou mot de passe invalid",
+  "Type": "Type",
+  "Status": "Statut",
+  "Create in folder...": "Créer dans le dossier ...",
+  "Search...": "Rechercher ...",
+  "Create a workspace": "Créer un espace de travail",
+  "Title": "Titre",
+  "Change": "Modifier",
+  "Move": "Déplacer",
+  "Download": "Télécharger",
+  "Archive": "Archiver",
+  "Delete": "Supprimer",
+  "My Account": "Mon Compte",
+  "Logout": "Se Déconnecter",
+  "Notification": "Notification",
+  "Archive Topic": "Conversation archivée",
+  "Deleted File": "Fichier supprimé"
+}

frontend/package.json

@@ -10,6 +10,7 @@
     "servdev-dashboard": "NODE_ENV=development webpack-dashboard -m -- webpack-dev-server --watch --colors --inline --hot --progress",
     "buildwindoz": "set NODE_ENV=production&& webpack -p",
     "build": "NODE_ENV=production webpack -p",
+    "build-translation": "node i18next.scanner.js",
     "test": "echo \"Error: no test specified\" && exit 1"
   },
   "author": "",
@@ -52,6 +53,7 @@
     "whatwg-fetch": "^2.0.3"
   },
   "devDependencies": {
+    "i18next-scanner": "^2.6.1",
     "json-server": "^0.12.0",
     "webpack-dashboard": "^1.0.2",
     "webpack-dev-server": "^2.9.2"

frontend/src/action-creator.sync.js

@@ -1,44 +1,51 @@
+export const SET = 'Set'
+export const UPDATE = 'Update'
+export const ADD = 'Add'
+export const REMOVE = 'Remove'
+
 export const TIMEZONE = 'Timezone'
-export const setTimezone = timezone => ({ type: `Set/${TIMEZONE}`, timezone })
+export const setTimezone = timezone => ({ type: `${SET}/${TIMEZONE}`, timezone })
 
 export const FLASH_MESSAGE = 'FlashMessage'
 export const newFlashMessage = (msgText = '', msgType = 'info', msgDelay = 5000) => dispatch => {
   msgDelay !== 0 && window.setTimeout(() => dispatch(removeFlashMessage(msgText)), msgDelay)
   return dispatch(addFlashMessage({message: msgText, type: msgType}))
 }
-export const addFlashMessage = msg => ({ type: `Add/${FLASH_MESSAGE}`, msg })
-export const removeFlashMessage = msg => ({ type: `Remove/${FLASH_MESSAGE}`, msg })
+export const addFlashMessage = msg => ({ type: `${ADD}/${FLASH_MESSAGE}`, msg })
+export const removeFlashMessage = msg => ({ type: `${REMOVE}/${FLASH_MESSAGE}`, msg })
 
+export const USER = 'User'
 export const USER_LOGIN = 'User/Login'
 export const USER_LOGOUT = 'User/Logout'
 export const USER_DATA = 'User/Data'
 export const USER_ROLE = 'User/Role'
 export const USER_CONNECTED = 'User/Connected'
 export const USER_DISCONNECTED = 'User/Disconnected'
-export const setUserConnected = user => ({ type: `Set/${USER_CONNECTED}`, user })
-export const setUserDisconnected = () => ({ type: `Set/${USER_DISCONNECTED}` })
-export const updateUserData = userData => ({ type: `Update/${USER_DATA}`, data: userData })
-export const setUserRole = userRole => ({ type: `Set/${USER_ROLE}`, userRole }) // this actually update workspaceList state
+export const USER_LANG = 'User/Lang'
+export const setUserConnected = user => ({ type: `${SET}/${USER}/Connected`, user })
+export const setUserDisconnected = () => ({ type: `${SET}/${USER}/Disconnected` })
+export const updateUserData = userData => ({ type: `${UPDATE}/${USER}/Data`, data: userData })
+export const setUserRole = userRole => ({ type: `${SET}/${USER}/Role`, userRole }) // this actually update workspaceList state
+export const setUserLang = lang => ({ type: `${SET}/${USER}/Lang`, lang })
 export const updateUserWorkspaceSubscriptionNotif = (workspaceId, subscriptionNotif) =>
-  ({ type: `Update/${USER_ROLE}/SubscriptionNotif`, workspaceId, subscriptionNotif })
+  ({ type: `${UPDATE}/${USER_ROLE}/SubscriptionNotif`, workspaceId, subscriptionNotif })
 
 export const WORKSPACE = 'Workspace'
-export const setWorkspaceContent = (workspaceContent, filterStr = '') => ({ type: `Set/${WORKSPACE}/Content`, workspaceContent, filterStr })
-export const updateWorkspaceFilter = filterList => ({ type: `Update/${WORKSPACE}/Filter`, filterList })
+export const setWorkspaceContent = (workspaceContent, filterStr = '') => ({ type: `${SET}/${WORKSPACE}/Content`, workspaceContent, filterStr })
+export const updateWorkspaceFilter = filterList => ({ type: `${UPDATE}/${WORKSPACE}/Filter`, filterList })
 
 export const FOLDER = 'Folder'
-export const setFolderData = (folderId, content) => ({ type: `Set/${WORKSPACE}/${FOLDER}/Content`, folderId, content })
+export const setFolderData = (folderId, content) => ({ type: `${SET}/${WORKSPACE}/${FOLDER}/Content`, folderId, content })
 
 export const WORKSPACE_LIST = 'WorkspaceList'
-export const updateWorkspaceListData = workspaceList => ({ type: `Update/${WORKSPACE_LIST}`, workspaceList })
-export const setWorkspaceListIsOpenInSidebar = (workspaceId, isOpenInSidebar) => ({ type: `Set/${WORKSPACE_LIST}/isOpenInSidebar`, workspaceId, isOpenInSidebar })
+export const updateWorkspaceListData = workspaceList => ({ type: `${UPDATE}/${WORKSPACE_LIST}`, workspaceList })
+export const setWorkspaceListIsOpenInSidebar = (workspaceId, isOpenInSidebar) => ({ type: `${SET}/${WORKSPACE_LIST}/isOpenInSidebar`, workspaceId, isOpenInSidebar })
 
 export const APP_LIST = 'App/List'
-export const setAppList = appList => ({ type: `Set/${APP_LIST}`, appList })
+export const setAppList = appList => ({ type: `${SET}/${APP_LIST}`, appList })
 
 export const CONTENT_TYPE_LIST = 'ContentType/List'
-export const setContentTypeList = contentTypeList => ({ type: `Set/${CONTENT_TYPE_LIST}`, contentTypeList })
+export const setContentTypeList = contentTypeList => ({ type: `${SET}/${CONTENT_TYPE_LIST}`, contentTypeList })
 
 export const LANG = 'Lang'
-export const updateLangList = langList => ({ type: `Update/${LANG}`, langList })
-export const setLangActive = langId => ({ type: `Set/${LANG}/Active`, langId })
+export const updateLangList = langList => ({ type: `${UPDATE}/${LANG}`, langList })

frontend/src/appFactory.js

@@ -1,5 +1,6 @@
 import React from 'react'
 import { FETCH_CONFIG } from './helper.js'
+import i18n from './i18n.js'
 
 export function appFactory (WrappedComponent) {
   return class AppFactory extends React.Component {
@@ -10,7 +11,8 @@ export function appFactory (WrappedComponent) {
         domContainer: 'appContainer',
         apiUrl: FETCH_CONFIG.apiUrl,
         mockApiUrl: FETCH_CONFIG.mockApiUrl,
-        apiHeader: FETCH_CONFIG.headers
+        apiHeader: FETCH_CONFIG.headers,
+        translation: i18n.store.data
       },
       content
     })
@@ -22,7 +24,8 @@ export function appFactory (WrappedComponent) {
         domContainer: 'popupCreateContentContainer',
         apiUrl: FETCH_CONFIG.apiUrl,
         mockApiUrl: FETCH_CONFIG.mockApiUrl,
-        apiHeader: FETCH_CONFIG.headers // should this be used by app ? right now, apps have their own headers
+        apiHeader: FETCH_CONFIG.headers, // should this be used by app ? right now, apps have their own headers
+        translation: i18n.store.data
       },
       idWorkspace,
       idFolder: idFolder === 'null' ? null : idFolder

frontend/src/component/FlashMessage.jsx

@@ -22,7 +22,7 @@ const FlashMessage = props => {
 
               <div className='flashmessage__container__content__text'>
                 <div className='flashmessage__container__content__text__title'>
-                  {props.t('FlashMessage.error')}
+                  {props.t('Error')}
                 </div>
                 <div className='flashmessage__container__content__text__paragraph'>
                   {props.flashMessage[0].message}

frontend/src/component/Footer.jsx

@@ -7,7 +7,7 @@ const Footer = ({ t }) => {
   return (
     <footer className='footer text-right'>
       <div className='footer__text'>
-        {t('Footer.marketing_msg')} - {t('Footer.copyright')}
+        {t('Create your own collaborative workspaces on trac.im')} - {t('Copyright 2013 - 2017')}
       </div>
       <img className='footer__logo' src={logoFooter} />
     </footer>

frontend/src/component/Header/MenuActionListItem/DropdownLang.jsx

@@ -2,7 +2,6 @@ import React from 'react'
 import PropTypes from 'prop-types'
 
 const DropdownLang = props => {
-  const activeLang = props.langList.find(l => l.active) || {id: 'fr', name: 'Français', src: '', active: true}
   return (
     <li className='header__menu__rightside__itemlanguage'>
       <div className='header__menu__rightside__itemlanguage__languagedropdown dropdown'>
@@ -14,12 +13,12 @@ const DropdownLang = props => {
           aria-haspopup='true'
           aria-expanded='false'
         >
-          <img className='languagedropdown__btnlanguage__imgselected' src={activeLang.src} />
+          <img className='languagedropdown__btnlanguage__imgselected' src={props.langList.find(l => l.id === props.idLangActive).icon} />
         </button>
         <div className='languagedropdown__subdropdown dropdown-menu' aria-labelledby='headerDropdownMenuButton'>
-          { props.langList.map((l, i) => l.active === false &&
+          { props.langList.filter(l => l.id !== props.idLangActive).map((l, i) =>
             <div className='subdropdown__link dropdown-item' onClick={() => props.onChangeLang(l.id)} key={i}>
-              <img className='subdropdown__flag' src={l.src} />
+              <img className='subdropdown__flag' src={l.icon} />
             </div>
           )}
         </div>
@@ -31,5 +30,6 @@ export default DropdownLang
 
 DropdownLang.propTypes = {
   langList: PropTypes.array.isRequired,
+  idLangActive: PropTypes.string.isRequired,
   onChangeLang: PropTypes.func.isRequired
 }

frontend/src/component/Header/MenuActionListItem/MenuProfil.jsx

@@ -2,6 +2,7 @@ import React from 'react'
 import { Link } from 'react-router-dom'
 import PropTypes from 'prop-types'
 import { PAGE } from '../../../helper.js'
+import { translate } from 'react-i18next'
 
 const MenuProfil = props => {
   return props.user.logged
@@ -17,12 +18,12 @@ const MenuProfil = props => {
           <div className='profilgroup__setting dropdown-menu' aria-labelledby='dropdownMenuButton'>
             <Link className='setting__link dropdown-item' to={PAGE.ACCOUNT}>
               <i className='fa fa-fw fa-user-o mr-2' />
-              Mon compte
+              {props.t('My Account')}
             </Link>
             {/* <div className='setting__link dropdown-item'>Mot de passe</div> */}
             <div className='setting__link dropdown-item' onClick={props.onClickLogout}>
               <i className='fa fa-fw fa-sign-out mr-2' />
-              Se déconnecter
+              {props.t('Logout')}
             </div>
           </div>
         </div>
@@ -30,7 +31,7 @@ const MenuProfil = props => {
     )
     : ''
 }
-export default MenuProfil
+export default translate()(MenuProfil)
 
 MenuProfil.propTypes = {
   user: PropTypes.object.isRequired,

frontend/src/component/Header/MenuActionListItem/Notification.jsx

@@ -1,4 +1,5 @@
 import React from 'react'
+import { translate } from 'react-i18next'
 // import PropTypes from 'prop-types'
 
 const Notification = props => {
@@ -13,18 +14,18 @@ const Notification = props => {
           aria-haspopup='true'
           aria-expanded='false'
         >
-          Notification
+          {props.t('Notification')}
         </button>
         <div className='timeline__subdropdown dropdown-menu' aria-labelledby='headerDropdownMenuButton'>
           <div className='timeline__subdropdown__text dropdown-item' >
-            Conversation archivé
+            {props.t('Archive Topic')}
           </div>
           <div className='timeline__subdropdown__text dropdown-item' >
-            Fichier supprimé
+            {props.t('Deleted File')}
           </div>
         </div>
       </div>
     </li>
   )
 }
-export default Notification
+export default translate()(Notification)

frontend/src/component/Header/MenuActionListItem/Search.jsx

@@ -9,7 +9,7 @@ const Search = props => {
         <input
           type='text'
           className='search__input form-control'
-          placeholder={`${props.t('Header.Search')}...`}
+          placeholder={`${props.t('Search...')}`}
           aria-describedby='headerInputSearch'
           onChange={props.onChangeInput}
         />

frontend/src/component/Workspace/BtnExtandedAction.jsx

@@ -1,5 +1,6 @@
 import React from 'react'
 import PropTypes from 'prop-types'
+import { translate } from 'react-i18next'
 
 const ExtandedAction = props => {
   return (
@@ -22,7 +23,7 @@ const ExtandedAction = props => {
             <i className='fa fa-fw fa-pencil' />
           </div>
           <div className='subdropdown__item__text'>
-            Modifier
+            {props.t('Change')}
           </div>
         </div>
 
@@ -31,7 +32,7 @@ const ExtandedAction = props => {
             <i className='fa fa-fw fa-arrows-alt' />
           </div>
           <div className='subdropdown__item__text'>
-            Déplacer
+            {props.t('Move')}
           </div>
         </div>
 
@@ -40,7 +41,7 @@ const ExtandedAction = props => {
             <i className='fa fa-fw fa-download' />
           </div>
           <div className='subdropdown__item__text'>
-            Télécharger
+            {props.t('Download')}
           </div>
         </div> */ }
 
@@ -49,7 +50,7 @@ const ExtandedAction = props => {
             <i className='fa fa-fw fa-archive' />
           </div>
           <div className='subdropdown__item__text'>
-            Archiver
+            {props.t('Archive')}
           </div>
         </div>
 
@@ -58,7 +59,7 @@ const ExtandedAction = props => {
             <i className='fa fa-fw fa-trash-o' />
           </div>
           <div className='subdropdown__item__text'>
-            Supprimer
+            {props.t('Delete')}
           </div>
         </div>
 
@@ -67,7 +68,7 @@ const ExtandedAction = props => {
   )
 }
 
-export default ExtandedAction
+export default translate()(ExtandedAction)
 
 ExtandedAction.propTypes = {
   onClickExtendedAction: PropTypes.object.isRequired

frontend/src/component/Workspace/ContentItemHeader.jsx

@@ -5,13 +5,13 @@ const FileItemHeader = props => {
   return (
     <div className='content__header'>
       <div className='content__header__type'>
-        {props.t('FileItemHeader.type')}
+        {props.t('Type')}
       </div>
       <div className='content__header__name'>
-        {props.t('FileItemHeader.document_name')}
+        {props.t('Title')}
       </div>
       <div className='content__header__status'>
-        {props.t('FileItemHeader.status')}
+        {props.t('Status')}
       </div>
     </div>
   )

frontend/src/component/Workspace/Folder.jsx

@@ -65,7 +65,7 @@ class Folder extends React.Component {
                 aria-expanded='false'
                 onClick={e => e.stopPropagation()}
               >
-                {t('Folder.create')} ...
+                {t('Create in folder...')}
               </button>
 
               <div className='addbtn__subdropdown dropdown-menu' aria-labelledby='dropdownMenuButton'>

frontend/src/component/Workspace/OpenContentApp.jsx

@@ -22,7 +22,7 @@ export class OpenContentApp extends React.Component {
 
       if (appOpenedType === contentToOpen.type) { // app already open
         GLOBAL_dispatchEvent({
-          type: `${contentToOpen.type}_reloadContent`, // handled by html-documents:src/container/HtmlDocument.jsx
+          type: `${contentToOpen.type}_reloadContent`, // handled by html-document:src/container/HtmlDocument.jsx
           data: contentToOpen
         })
       } else { // open another app

frontend/src/container/Dashboard.jsx

@@ -414,7 +414,10 @@ class Dashboard extends React.Component {
                         </li>
                       </ul>
 
-                      <div className='dashboard__memberlist__btnadd'>
+                      <div
+                        className='dashboard__memberlist__btnadd'
+                        onClick={this.handleToggleNewMemberDashboard}
+                      >
                         <div className='dashboard__memberlist__btnadd__button'>
                           <div className='dashboard__memberlist__btnadd__button__avatar'>
                             <div className='dashboard__memberlist__btnadd__button__avatar__icon'>
@@ -423,7 +426,7 @@ class Dashboard extends React.Component {
                           </div>
                           <div
                             className='dashboard__memberlist__btnadd__button__text'
-                            onClick={this.handleToggleNewMemberDashboard}
+
                           >
                              Ajouter un membre
                           </div>

frontend/src/container/Header.jsx

@@ -1,6 +1,8 @@
 import React from 'react'
 import { connect } from 'react-redux'
+import { withRouter } from 'react-router'
 import i18n from '../i18n.js'
+import appFactory from '../appFactory.js'
 import { translate } from 'react-i18next'
 import Cookies from 'js-cookie'
 import Logo from '../component/Header/Logo.jsx'
@@ -14,13 +16,13 @@ import MenuActionListItemNotification from '../component/Header/MenuActionListIt
 import logoHeader from '../img/logo-tracim.png'
 import {
   newFlashMessage,
-  setLangActive,
+  setUserLang,
   setUserDisconnected
 } from '../action-creator.sync.js'
 import {
   postUserLogout
 } from '../action-creator.async.js'
-import { COOKIE } from '../helper.js'
+import { COOKIE, PAGE } from '../helper.js'
 
 class Header extends React.Component {
   handleClickLogo = () => {}
@@ -32,15 +34,16 @@ class Header extends React.Component {
   handleChangeInput = e => this.setState({inputSearchValue: e.target.value})
   handleClickSubmit = () => {}
 
-  handleChangeLang = langId => {
-    this.props.dispatch(setLangActive(langId))
-    i18n.changeLanguage(langId)
+  handleChangeLang = idLang => {
+    this.props.dispatch(setUserLang(idLang))
+    i18n.changeLanguage(idLang)
+    this.props.emitEventApp('allApp_changeLang', idLang)
   }
 
   handleClickHelp = () => {}
 
   handleClickLogout = async () => {
-    const { dispatch, t } = this.props
+    const { history, dispatch, t } = this.props
 
     const fetchPostUserLogout = await dispatch(postUserLogout())
     if (fetchPostUserLogout.status === 204) {
@@ -48,8 +51,9 @@ class Header extends React.Component {
       Cookies.remove(COOKIE.USER_AUTH)
 
       dispatch(setUserDisconnected())
+      history.push(PAGE.LOGIN)
     } else {
-      dispatch(newFlashMessage(t('Login.logout_error', 'danger')))
+      dispatch(newFlashMessage(t('Disconnection error', 'danger')))
     }
   }
 
@@ -82,6 +86,7 @@ class Header extends React.Component {
 
               <MenuActionListItemDropdownLang
                 langList={lang}
+                idLangActive={user.lang}
                 onChangeLang={this.handleChangeLang}
               />
 
@@ -104,4 +109,4 @@ class Header extends React.Component {
 }
 
 const mapStateToProps = ({ lang, user }) => ({ lang, user })
-export default connect(mapStateToProps)(translate()(Header))
+export default withRouter(connect(mapStateToProps)(translate()(appFactory(Header))))

frontend/src/container/Login.jsx

@@ -57,7 +57,7 @@ class Login extends React.Component {
 
       history.push(PAGE.HOME)
     } else if (fetchPostUserLogin.status === 400) {
-      dispatch(newFlashMessage(t('Login.fail'), 'danger'))
+      dispatch(newFlashMessage(t('Email or password invalid'), 'danger'))
     }
   }
 

frontend/src/container/Sidebar.jsx

@@ -86,7 +86,7 @@ class Sidebar extends React.Component {
 
             <div className='sidebar__btnnewworkspace'>
               <button className='sidebar__btnnewworkspace__btn btn btn-primary primaryColorBg primaryColorBorder primaryColorBorderDarkenHover mb-5'>
-                {t('Sidebar.create_new_workspace')}
+                {t('Create a workspace')}
               </button>
             </div>
 

frontend/src/css/Generic.styl

@@ -237,4 +237,4 @@ a
       margin-bottom 15px
       border 1px solid grey
       border-radius 10px
-      padding 15px 25px
+      padding 15px

frontend/src/css/Header.styl

@@ -40,7 +40,6 @@
         background-color transparent
         cursor pointer
       &__itemlanguage
-        display none
         &__languagedropdown
           .languagedropdown
             &__btnlanguage

frontend/src/css/Login.styl

@@ -65,10 +65,10 @@
         width 130px
   &__footer
     position fixed
-    top 95%
-    left calc(50% - 152px) // 152px => width of the text / 2
+    bottom 2%
+    left calc(50% - 155px) // 155px => width of the text / 2
     &__text
-      width 305px
+      width 310px
       font-size 17px
 
 @media (min-width: min-lg) and (max-width: max-lg)

frontend/src/css/Workspace.styl

@@ -8,7 +8,7 @@
     &__button
       display flex
       justify-content flex-end
-      margin 50px 15px 0 0
+      margin 45px 15px 45px 0
       width 100%
       &__btnaddworkspace
         margin-bottom 50px

frontend/src/i18n.js

@@ -1,29 +1,39 @@
 import i18n from 'i18next'
 import { reactI18nextModule } from 'react-i18next'
-import { langFr, langEn } from 'tracim_frontend_lib'
-import fr from './translate/fr.js'
-import en from './translate/en.js'
+import { frLib, enLib } from 'tracim_frontend_lib'
+import en from '../i18next.scanner/en/translation.json'
+import fr from '../i18next.scanner/fr/translation.json'
+
+// get translation files of apps
+// theses files are generated by build_appname.sh
+const htmlDocEnTranslation = require('../dist/app/html-document_en_translation.json')
+const htmlDocFrTranslation = require('../dist/app/html-document_fr_translation.json')
 
 i18n
   .use(reactI18nextModule)
   .init({
-    fallbackLng: 'fr',
+    fallbackLng: 'en',
     // have a common namespace used around the full app
     ns: ['translation'], // namespace
     defaultNS: 'translation',
     debug: true,
-    // interpolation: {
-    //   escapeValue: false, // not needed for react!!
-    // },
     react: {
       wait: true
     },
     resources: {
       en: {
-        translation: {...langEn.translation, ...en.translation}
+        translation: {
+          ...enLib, // fronted_lib
+          ...en, // frontend
+          ...htmlDocEnTranslation // html-document
+        }
       },
       fr: {
-        translation: {...langFr.translation, ...fr.translation}
+        translation: {
+          ...frLib, // fronted_lib
+          ...fr, // frontend
+          ...htmlDocFrTranslation // html-document
+        }
       }
     }
   })

frontend/src/reducer/app.js

@@ -1,8 +1,8 @@
-import { APP_LIST } from '../action-creator.sync.js'
+import { SET, APP_LIST } from '../action-creator.sync.js'
 
 export default function app (state = [], action) {
   switch (action.type) {
-    case `Set/${APP_LIST}`:
+    case `${SET}/${APP_LIST}`:
       return action.appList.map(a => ({
         label: a.label,
         slug: a.slug,

frontend/src/reducer/contentType.js

@@ -1,8 +1,8 @@
-import { CONTENT_TYPE_LIST } from '../action-creator.sync.js'
+import { SET, CONTENT_TYPE_LIST } from '../action-creator.sync.js'
 
 export function contentType (state = [], action) {
   switch (action.type) {
-    case `Set/${CONTENT_TYPE_LIST}`:
+    case `${SET}/${CONTENT_TYPE_LIST}`:
       return action.contentTypeList.map(ct => ({
         label: ct.label,
         slug: ct.slug,

frontend/src/reducer/flashMessage.js

@@ -1,16 +1,14 @@
-import {
-  FLASH_MESSAGE
-} from '../action-creator.sync.js'
+import { ADD, REMOVE, FLASH_MESSAGE } from '../action-creator.sync.js'
 
 export default function flashMessage (state = [], action) {
   switch (action.type) {
-    case `Add/${FLASH_MESSAGE}`:
+    case `${ADD}/${FLASH_MESSAGE}`:
       return [...state, {
         message: action.msg.message,
         type: action.msg.type || 'info' // may be info, success, danger
       }]
 
-    case `Remove/${FLASH_MESSAGE}`:
+    case `${REMOVE}/${FLASH_MESSAGE}`:
       return state.filter(fm => fm.message === action.message)
 
     default:

frontend/src/reducer/lang.js

@@ -1,12 +1,23 @@
-import { LANG } from '../action-creator.sync.js'
+import { UPDATE, LANG } from '../action-creator.sync.js'
+import flagEn from '../img/flag_en.png'
+import flagFr from '../img/flag_fr.png'
 
-export function lang (state = [], action) {
+const defaultLang = [{
+  id: 'en',
+  icon: flagEn
+}, {
+  id: 'fr',
+  icon: flagFr
+}]
+
+export function lang (state = defaultLang, action) {
   switch (action.type) {
-    case `Update/${LANG}`:
+    case `${UPDATE}/${LANG}`:
       return action.langList
 
-    case `Set/${LANG}/Active`:
-      return state.map(l => ({...l, active: l.id === action.langId}))
+    // Côme - 2018/07/30 - deprecated, lang active is saved in user reducer
+    // case `Set/${LANG}/Active`:
+    //   return state.map(l => ({...l, active: l.id === action.langId}))
 
     default:
       return state

frontend/src/reducer/timezone.js

@@ -1,8 +1,8 @@
-import { TIMEZONE } from '../action-creator.sync.js'
+import { SET, TIMEZONE } from '../action-creator.sync.js'
 
 export function timezone (state = [], action) {
   switch (action.type) {
-    case `Set/${TIMEZONE}`:
+    case `${SET}/${TIMEZONE}`:
       return action.timezone
 
     default:

frontend/src/reducer/user.js

@@ -1,12 +1,16 @@
 import {
+  SET,
+  UPDATE,
   USER_CONNECTED,
   USER_DISCONNECTED,
-  USER_DATA
+  USER_DATA,
+  USER_LANG
 } from '../action-creator.sync.js'
 
 const defaultUser = {
   user_id: -1,
   logged: null, // null avoid to be redirected to /login while whoami ep has not responded yet
+  auth: '',
   timezone: '',
   profile: {
     id: 1,
@@ -17,23 +21,28 @@ const defaultUser = {
   caldav_url: null,
   avatar_url: null,
   created: '',
-  display_name: ''
+  public_name: '',
+  lang: 'en' // @FIXME Côme - 2018/07/30 - remove this line when api returns the lang (https://github.com/tracim/tracim/issues/734)
 }
 
 export default function user (state = defaultUser, action) {
   switch (action.type) {
-    case `Set/${USER_CONNECTED}`:
+    case `${SET}/${USER_CONNECTED}`:
       return {
+        ...state,
         ...action.user,
         avatar_url: 'https://www.algoo.fr/static/images/people_images/PERSO_SEUL.png' // @FIXME use avatar from api when db handles it
       }
 
-    case `Set/${USER_DISCONNECTED}`:
+    case `${SET}/${USER_DISCONNECTED}`:
       return defaultUser
 
-    case `Update/${USER_DATA}`:
+    case `${UPDATE}/${USER_DATA}`:
       return {...state, ...action.data}
 
+    case `${SET}/${USER_LANG}`:
+      return {...state, lang: action.lang}
+
     default:
       return state
   }

frontend/src/reducer/workspaceContent.js

@@ -1,11 +1,13 @@
 import {
+  SET,
+  UPDATE,
   WORKSPACE,
   FOLDER
 } from '../action-creator.sync.js'
 
 export default function workspace (state = [], action) {
   switch (action.type) {
-    case `Set/${WORKSPACE}/Content`:
+    case `${SET}/${WORKSPACE}/Content`:
       return action.workspaceContent.map(wsc => ({
         id: wsc.content_id,
         label: wsc.label,
@@ -20,10 +22,10 @@ export default function workspace (state = [], action) {
         subContentTypeSlug: wsc.sub_content_type_slug
       }))
 
-    case `Update/${WORKSPACE}/Filter`: // not used anymore ?
+    case `${UPDATE}/${WORKSPACE}/Filter`: // not used anymore ?
       return {...state, filter: action.filterList}
 
-    case `Set/${WORKSPACE}/${FOLDER}/Content`:
+    case `${SET}/${WORKSPACE}/${FOLDER}/Content`:
       const setFolderContent = (contentItem, action) => {
         if (contentItem.id === action.folderId) return {...contentItem, content: action.content}
 

frontend/src/reducer/workspaceList.js

@@ -1,4 +1,6 @@
 import {
+  SET,
+  UPDATE,
   WORKSPACE_LIST,
   USER_ROLE
 } from '../action-creator.sync.js'
@@ -7,7 +9,7 @@ const handleRouteFromApi = route => route.startsWith('/#') ? route.slice(2) : ro
 
 export function workspaceList (state = [], action) {
   switch (action.type) {
-    case `Update/${WORKSPACE_LIST}`:
+    case `${UPDATE}/${WORKSPACE_LIST}`:
       return action.workspaceList.map(ws => ({
         id: ws.workspace_id,
         label: ws.label,
@@ -23,13 +25,13 @@ export function workspaceList (state = [], action) {
         isOpenInSidebar: false
       }))
 
-    case `Set/${WORKSPACE_LIST}/isOpenInSidebar`:
+    case `${SET}/${WORKSPACE_LIST}/isOpenInSidebar`:
       return state.map(ws => ws.id === action.workspaceId
         ? {...ws, isOpenInSidebar: action.isOpenInSidebar}
         : ws
       )
 
-    case `Set/${USER_ROLE}`: // not used yet
+    case `${SET}/${USER_ROLE}`: // not used yet
       return state.map(ws => {
         const foundWorkspace = action.userRole.find(r => ws.id === r.workspace.id) || {role: '', subscribed_to_notif: ''}
         return {
@@ -39,7 +41,7 @@ export function workspaceList (state = [], action) {
         }
       })
 
-    case `Update/${USER_ROLE}/SubscriptionNotif`: // not used yet
+    case `${UPDATE}/${USER_ROLE}/SubscriptionNotif`: // not used yet
       return state.map(ws => ws.id === action.workspaceId
         ? {...ws, notif: action.subscriptionNotif}
         : ws

frontend/src/translate/en.js

@@ -1,41 +0,0 @@
-const en = {
-  translation: { // 'en' in the namespace 'translation'
-    Header: {
-      Search: 'Search'
-    },
-    Footer: {
-      marketing_msg: 'Create your own collaborative workspaces on trac.im',
-      copyright: 'Copyright 2013 - 2017'
-    },
-    FlashMessage: {
-      error: 'Error'
-    },
-    Login: {
-      fail: 'Unknown email or password',
-      logout_error: 'Disconnection error'
-    },
-    FileItemHeader: {
-      type: 'Type',
-      document_name: "Document's name",
-      status: 'Status'
-    },
-    Folder: {
-      create: 'Create in this folder',
-      content_type: 'Content type'
-    },
-    Sidebar: {
-      create_new_workspace: 'Create new workspace'
-    },
-    Account: {
-      title: 'My account'
-    },
-    role: {
-      reader: 'Reader',
-      contributor: 'Contributor',
-      content_manager: 'Content manager',
-      manager: 'Manager'
-    }
-  }
-}
-
-export default en

frontend/src/translate/fr.js

@@ -1,41 +0,0 @@
-const fr = {
-  translation: { // 'fr' in the namespace 'translation'
-    Header: {
-      Search: 'Rechercher'
-    },
-    Footer: {
-      marketing_msg: 'Créer votre propre espace de travail collaboratif sur trac.im',
-      copyright: 'Copyright 2013 - 2017'
-    },
-    FlashMessage: {
-      error: 'Erreur'
-    },
-    Login: {
-      fail: 'Email ou mot de passe inconnu.',
-      logout_error: 'Erreur de déconnexion.'
-    },
-    FileItemHeader: {
-      type: 'Type',
-      document_name: 'Nom du document',
-      status: 'Statut'
-    },
-    Folder: {
-      create: 'Créer dans ce dossier',
-      content_type: 'Type de contenu'
-    },
-    Sidebar: {
-      create_new_workspace: 'Créer un workspace'
-    },
-    Account: {
-      title: 'Mon compte'
-    },
-    role: {
-      reader: 'Lecteur',
-      contributor: 'Contributeur',
-      content_manager: 'Gestionnaire de contenu',
-      manager: 'Responsable'
-    }
-  }
-}
-
-export default fr

frontend_app_html-document/build_html-document.sh

@@ -0,0 +1,17 @@
+#!/bin/bash
+
+. ../bash_library.sh # source bash_library.sh
+
+windoz=""
+if [[ $1 = "-w" ]]; then
+    windoz="windoz"
+fi
+
+log "npm run build$windoz"
+npm run build$windoz
+log "cp dist/html-document.app.js ../frontend/dist/app"
+cp dist/html-document.app.js ../frontend/dist/app
+log "cp i18next.scanner/en/translation.json ../frontend/dist/app/html-document_en_translation.json"
+cp i18next.scanner/en/translation.json ../frontend/dist/app/html-document_en_translation.json
+log "cp i18next.scanner/fr/translation.json ../frontend/dist/app/html-document_fr_translation.json"
+cp i18next.scanner/fr/translation.json ../frontend/dist/app/html-document_fr_translation.json

frontend_app_html-document/dist/index.html

@@ -3,7 +3,7 @@
 <head>
   <meta charset='utf-8' />
   <meta name="viewport" content="width=device-width, user-scalable=no" />
-  <title>Html-documents App Tracim</title>
+  <title>Html-document App Tracim</title>
   <link rel='shortcut icon' href='favicon.ico'>
 
   <link rel="stylesheet" type="text/css" href="./font/font-awesome-4.7.0/css/font-awesome.css">

frontend_app_html-document/i18next.scanner.js

@@ -0,0 +1,14 @@
+const scanner = require('i18next-scanner')
+const vfs = require('vinyl-fs')
+
+const option = require('../i18next.option.js')
+
+// --------------------
+// 2018/07/27 - currently, last version is 2.6.5 but a bug is spaming log with errors. So I'm using 2.6.1
+// this issue seems related : https://github.com/i18next/i18next-scanner/issues/88
+// --------------------
+
+vfs.src(['./src/**/*.jsx'])
+// .pipe(sort()) // Sort files in stream by path
+  .pipe(scanner(option))
+  .pipe(vfs.dest('./i18next.scanner'))

frontend_app_html-document/i18next.scanner/en/translation.json

@@ -0,0 +1,5 @@
+{
+  "Last version": "Last version",
+  "Validate and create": "Validate and create",
+  "Document's title": "Document's title"
+}

frontend_app_html-document/i18next.scanner/fr/translation.json

@@ -0,0 +1,5 @@
+{
+  "Last version": "Dernière version",
+  "Validate and create": "Valider et créer",
+  "Document's title": "Titre du document"
+}

frontend_app_html-document/package.json

@@ -1,5 +1,5 @@
 {
-  "name": "tracim_app_html-documents",
+  "name": "tracim_app_html-document",
   "version": "1.1.2",
   "description": "",
   "main": "index.js",
@@ -7,8 +7,9 @@
     "servdev": "NODE_ENV=development webpack-dev-server --watch --colors --inline --hot --progress",
     "servdevwindoz": "set NODE_ENV=development&& webpack-dev-server --watch --colors --inline --hot --progress",
     "servdev-dashboard": "NODE_ENV=development webpack-dashboard -m -p 9871 -- webpack-dev-server --watch --colors --inline --hot --progress",
-    "buildwindoz": "set NODE_ENV=production&& webpack -p",
     "build": "NODE_ENV=production webpack -p",
+    "build-translation": "node i18next.scanner.js",
+    "buildwindoz": "set NODE_ENV=production&& webpack -p",
     "test": "echo \"Error: no test specified\" && exit 1"
   },
   "author": "",
@@ -41,6 +42,7 @@
     "whatwg-fetch": "^2.0.3"
   },
   "devDependencies": {
+    "i18next-scanner": "^2.6.1",
     "webpack-dashboard": "^1.1.1",
     "webpack-dev-server": "^2.9.2"
   },

frontend_app_html-document/rebuild_html-document.sh

@@ -1,13 +0,0 @@
-#!/bin/bash
-
-. ../bash_library.sh # source bash_library.sh
-
-windoz=""
-if  [[ $1 = "-w" ]]; then
-    windoz="windoz"
-fi
-
-log "npm run build$windoz"
-npm run build$windoz
-log "cp dist/html-document.app.js ../frontend/dist/app"
-cp dist/html-document.app.js ../frontend/dist/app

frontend_app_html-document/src/component/HtmlDocument.jsx

@@ -4,27 +4,27 @@ import { MODE } from '../helper.js'
 
 const HtmlDocument = props => {
   return (
-    <div className='wsContentHtmlDocument__contentpage__textnote html-documents__contentpage__textnote'>
+    <div className='wsContentHtmlDocument__contentpage__textnote html-document__contentpage__textnote'>
       {(props.mode === MODE.VIEW || props.mode === MODE.REVISION) &&
         <div>
-          <div className='html-documents__contentpage__textnote__version'>
+          <div className='html-document__contentpage__textnote__version'>
             version n°
             <div dangerouslySetInnerHTML={{__html: props.mode === MODE.VIEW ? props.lastVersion : props.version}} />
             {props.mode === MODE.REVISION &&
-              <div className='html-documents__contentpage__textnote__lastversion'>
+              <div className='html-document__contentpage__textnote__lastversion'>
                 (dernière version : {props.lastVersion})
               </div>
             }
           </div>
           {/* need try to inject html in stateless component () => <span>{props.text}</span> */}
-          <div className='html-documents__contentpage__textnote__text' dangerouslySetInnerHTML={{__html: props.text}} />
+          <div className='html-document__contentpage__textnote__text' dangerouslySetInnerHTML={{__html: props.text}} />
         </div>
       }
 
       {props.mode === MODE.EDIT &&
         <TextAreaApp
           id={props.wysiwygNewVersion}
-          customClass={'html-documents__editionmode'}
+          customClass={'html-document__editionmode'}
           customColor={props.customColor}
           onClickCancelBtn={props.onClickCloseEditMode}
           onClickValidateBtn={props.onClickValidateBtn}

frontend_app_html-document/src/container/HtmlDocument.jsx

@@ -1,6 +1,9 @@
 import React from 'react'
 import HtmlDocumentComponent from '../component/HtmlDocument.jsx'
+import { translate } from 'react-i18next'
+import i18n from '../i18n.js'
 import {
+  addAllResourceI18n,
   handleFetchResult,
   PopinFixed,
   PopinFixedHeader,
@@ -20,13 +23,12 @@ import {
   putHtmlDocContent,
   putHtmlDocStatus
 } from '../action.async.js'
-import i18n from '../i18n.js'
 
 class HtmlDocument extends React.Component {
   constructor (props) {
     super(props)
     this.state = {
-      appName: 'html-documents',
+      appName: 'html-document',
       isVisible: true,
       config: props.data ? props.data.config : debug.config,
       loggedUser: props.data ? props.data.loggedUser : debug.loggedUser,
@@ -38,22 +40,37 @@ class HtmlDocument extends React.Component {
       mode: MODE.VIEW
     }
 
+    // i18n has been init, add resources from frontend
+    addAllResourceI18n(i18n, this.state.config.translation)
+    i18n.changeLanguage(this.state.loggedUser.lang)
+
     document.addEventListener('appCustomEvent', this.customEventReducer)
   }
 
   customEventReducer = ({ detail: { type, data } }) => { // action: { type: '', data: {} }
     switch (type) {
-      case 'html-documents_showApp':
+      case 'html-document_showApp':
         console.log('%c<HtmlDocument> Custom event', 'color: #28a745', type, data)
         this.setState({isVisible: true})
         break
-      case 'html-documents_hideApp':
+      case 'html-document_hideApp':
         console.log('%c<HtmlDocument> Custom event', 'color: #28a745', type, data)
         this.setState({isVisible: false})
         break
-      case 'html-documents_reloadContent':
+      case 'html-document_reloadContent':
         console.log('%c<HtmlDocument> Custom event', 'color: #28a745', type, data)
         this.setState(prev => ({content: {...prev.content, ...data}, isVisible: true}))
+        break
+      case 'allApp_changeLang':
+        console.log('%c<HtmlDocument> Custom event', 'color: #28a745', type, data)
+        this.setState(prev => ({
+          loggedUser: {
+            ...prev.loggedUser,
+            lang: data
+          }
+        }))
+        i18n.changeLanguage(data)
+        break
     }
   }
 
@@ -284,6 +301,7 @@ class HtmlDocument extends React.Component {
 
   render () {
     const { isVisible, loggedUser, content, timeline, newComment, timelineWysiwyg, config, mode } = this.state
+    const { t } = this.props
 
     if (!isVisible) return null
 
@@ -316,12 +334,12 @@ class HtmlDocument extends React.Component {
 
               {mode === MODE.REVISION &&
                 <button
-                  className='wsContentGeneric__option__menu__lastversion html-documents__lastversionbtn btn'
+                  className='wsContentGeneric__option__menu__lastversion html-document__lastversionbtn btn'
                   onClick={this.handleClickLastVersion}
                   style={{backgroundColor: config.hexcolor, color: '#fdfdfd'}}
                 >
                   <i className='fa fa-code-fork' />
-                  Dernière version
+                  {t('Last version')}
                 </button>
               }
             </div>
@@ -358,7 +376,7 @@ class HtmlDocument extends React.Component {
             lastVersion={timeline.filter(t => t.timelineType === 'revision').length}
             text={content.raw_content}
             onChangeText={this.handleChangeText}
-            key={'html-documents'}
+            key={'html-document'}
           />
 
           <Timeline
@@ -381,4 +399,4 @@ class HtmlDocument extends React.Component {
   }
 }
 
-export default HtmlDocument
+export default translate()(HtmlDocument)

frontend_app_html-document/src/container/PopupCreateHtmlDocument.jsx

@@ -1,13 +1,17 @@
 import React from 'react'
+import { translate } from 'react-i18next'
 import {
-  CardPopupCreateContent, handleFetchResult
+  CardPopupCreateContent,
+  handleFetchResult,
+  addAllResourceI18n
 } from 'tracim_frontend_lib'
 import { postHtmlDocContent } from '../action.async.js'
+import i18n from '../i18n.js'
 
 const debug = { // outdated
   config: {
     label: 'Text Document',
-    slug: 'html-documents',
+    slug: 'html-document',
     faIcon: 'file-text-o',
     hexcolor: '#3f52e3',
     creationLabel: 'Write a document',
@@ -35,13 +39,34 @@ class PopupCreateHtmlDocument extends React.Component {
   constructor (props) {
     super(props)
     this.state = {
-      appName: 'html-documents',
+      appName: 'html-document', // must remain 'html-document' because it is the name of the react built app (which contains HtmlDocument and PopupCreateHtmlDocument)
       config: props.data ? props.data.config : debug.config,
       loggedUser: props.data ? props.data.loggedUser : debug.loggedUser,
       idWorkspace: props.data ? props.data.idWorkspace : debug.idWorkspace,
       idFolder: props.data ? props.data.idFolder : debug.idFolder,
       newContentName: ''
     }
+
+    // i18n has been init, add resources from frontend
+    addAllResourceI18n(i18n, this.state.config.translation)
+    i18n.changeLanguage(this.state.loggedUser.lang)
+
+    document.addEventListener('appCustomEvent', this.customEventReducer)
+  }
+
+  customEventReducer = ({ detail: { type, data } }) => { // action: { type: '', data: {} }
+    switch (type) {
+      case 'allApp_changeLang':
+        console.log('%c<PopupCreateHtmlDocument> Custom event', 'color: #28a745', type, data)
+        this.setState(prev => ({
+          loggedUser: {
+            ...prev.loggedUser,
+            lang: data
+          }
+        }))
+        i18n.changeLanguage(data)
+        break
+    }
   }
 
   handleChangeNewContentName = e => this.setState({newContentName: e.target.value})
@@ -88,10 +113,11 @@ class PopupCreateHtmlDocument extends React.Component {
         faIcon={this.state.config.faIcon}
         contentName={this.state.newContentName}
         onChangeContentName={this.handleChangeNewContentName}
-        btnValidateLabel='Valider et créer'
+        btnValidateLabel={this.props.t('Validate and create')}
+        inputPlaceholder={this.props.t("Document's title")}
       />
     )
   }
 }
 
-export default PopupCreateHtmlDocument
+export default translate()(PopupCreateHtmlDocument)

frontend_app_html-document/src/css/index.styl

@@ -1,6 +1,6 @@
 @import "../../node_modules/tracim_frontend_lib/src/css/Variable.styl"
 
-.html-documents
+.html-document
   width 70%
   &__header
     &__editionmode
@@ -68,7 +68,7 @@
     background-color htmlColor
 
 @media (min-width: min-sm) and (max-width: max-lg)
-  .html-documents
+  .html-document
     &__contentpage
       &__content
         margin 10px
@@ -77,18 +77,18 @@
 
 @media (min-width: min-md) and (max-width: max-md)
 
-  .html-documents
+  .html-document
     top 68px
 
 @media (min-width: min-sm) and (max-width: max-sm)
 
-  .html-documents
+  .html-document
     top 68px
     width 100%
 
 @media (max-width: max-xs)
 
-  .html-documents
+  .html-document
     top 68px
     width 100%
     &__contentpage

frontend_app_html-document/src/helper.js

@@ -16,7 +16,7 @@ export const MODE = {
 export const debug = {
   config: {
     label: 'Text Document',
-    slug: 'html-documents',
+    slug: 'html-document',
     faIcon: 'file-text-o',
     hexcolor: '#3f52e3',
     creationLabel: 'Write a document',
@@ -51,7 +51,19 @@ export const debug = {
       faIcon: 'warning',
       hexcolor: '#ababab',
       globalStatus: 'closed'
-    }]
+    }],
+    translation: {
+      en: {
+        translation: {
+          'Last version': 'Last version debug en'
+        }
+      },
+      fr: {
+        translation: {
+          'Last version': 'Dernière version debug fr'
+        }
+      }
+    }
   },
   loggedUser: { // @FIXME this object is outdated
     user_id: 5,
@@ -59,6 +71,7 @@ export const debug = {
     firstname: 'Côme',
     lastname: 'Stoilenom',
     email: 'osef@algoo.fr',
+    lang: 'en',
     avatar_url: 'https://avatars3.githubusercontent.com/u/11177014?s=460&v=4',
     auth: btoa(`${'admin@admin.admin'}:${'admin@admin.admin'}`)
   },
@@ -69,7 +82,7 @@ export const debug = {
       user_id: 1 // -1 or 1 for debug
     },
     content_id: 22, // 1 or 22 for debug
-    content_type: 'html-documents',
+    content_type: 'html-document',
     created: '2018-06-18T14:59:26Z',
     current_revision_id: 11,
     is_archived: false,
@@ -86,7 +99,7 @@ export const debug = {
     show_in_ui: true,
     slug: 'current-menu',
     status: 'open',
-    sub_content_types: ['thread', 'html-documents', 'file', 'folder'],
+    sub_content_types: ['thread', 'html-document', 'file', 'folder'],
     workspace_id: 1
   },
   timeline: timelineDebugData

frontend_app_html-document/src/i18n.js

@@ -1,8 +1,5 @@
 import i18n from 'i18next'
 import { reactI18nextModule } from 'react-i18next'
-import { langFr, langEn } from 'tracim_frontend_lib'
-import fr from './translate/fr.js'
-import en from './translate/en.js'
 
 i18n
   .use(reactI18nextModule)
@@ -18,14 +15,7 @@ i18n
     react: {
       wait: true
     },
-    resources: {
-      en: {
-        translation: {...langEn.translation, ...en.translation}
-      },
-      fr: {
-        translation: {...langFr.translation, ...fr.translation}
-      }
-    }
+    resources: {} // init with empty resources, they will come from frontend in app constructor
   })
 
 export default i18n

frontend_app_html-document/src/index.js

@@ -10,7 +10,7 @@ import PopupCreateHtmlDocument from './container/PopupCreateHtmlDocument.jsx'
 require('./css/index.styl')
 
 const appInterface = {
-  name: 'HtmlDocument',
+  name: 'html-document',
   isRendered: false,
   renderAppFull: data => {
     return ReactDOM.render(

frontend_app_html-document/src/translate/en.js

@@ -1,9 +0,0 @@
-const en = {
-  translation: { // 'en' in the namespace 'translation'
-    PopinFixedOption: {
-      new_version: 'New version'
-    }
-  }
-}
-
-export default en

frontend_app_html-document/src/translate/fr.js

@@ -1,9 +0,0 @@
-const fr = {
-  translation: { // 'fr' in the namespace 'translation'
-    PopinFixedOption: {
-      new_version: 'nouvelle version'
-    }
-  }
-}
-
-export default fr

frontend_app_thread/build_thread.sh

@@ -0,0 +1,17 @@
+#!/bin/bash
+
+. ../bash_library.sh # source bash_library.sh
+
+windoz=""
+if  [[ $1 = "-w" ]]; then
+    windoz="windoz"
+fi
+
+log "npm run build$windoz"
+npm run build$windoz
+log "cp dist/thread.app.js ../frontend/dist/app"
+cp dist/thread.app.js ../frontend/dist/app
+log "cp i18next.scanner/en/translation.json ../frontend/dist/app/thread_en_translation.json"
+cp i18next.scanner/en/translation.json ../frontend/dist/app/thread_en_translation.json
+log "cp i18next.scanner/fr/translation.json ../frontend/dist/app/thread_fr_translation.json"
+cp i18next.scanner/fr/translation.json ../frontend/dist/app/thread_fr_translation.json

frontend_app_thread/i18next.scanner.js

@@ -0,0 +1,14 @@
+const scanner = require('i18next-scanner')
+const vfs = require('vinyl-fs')
+
+const option = require('../i18next.option.js')
+
+// --------------------
+// 2018/07/27 - currently, last version is 2.6.5 but a bug is spaming log with errors. So I'm using 2.6.1
+// this issue seems related : https://github.com/i18next/i18next-scanner/issues/88
+// --------------------
+
+vfs.src(['./src/**/*.jsx'])
+// .pipe(sort()) // Sort files in stream by path
+  .pipe(scanner(option))
+  .pipe(vfs.dest('./i18next.scanner'))

frontend_app_thread/i18next.scanner/en/translation.json

@@ -0,0 +1,4 @@
+{
+  "Validate and create": "Validate and create",
+  "Topic's subject": "Topic's subject"
+}

frontend_app_thread/i18next.scanner/fr/translation.json

@@ -0,0 +1,4 @@
+{
+  "Validate and create": "Valider et créer",
+  "Topic's subject": "Sujet de la discussion"
+}

frontend_app_thread/package.json

@@ -8,6 +8,7 @@
     "servdevwindoz": "set NODE_ENV=development&& webpack-dev-server --watch --colors --inline --hot --progress",
     "servdev-dashboard": "NODE_ENV=development webpack-dashboard -m -p 9872 -- webpack-dev-server --watch --colors --inline --hot --progress",
     "build": "NODE_ENV=production webpack -p",
+    "build-translation": "node i18next.scanner.js",
     "buildwindoz": "set NODE_ENV=production&& webpack -p",
     "test": "echo \"Error: no test specified\" && exit 1"
   },
@@ -41,6 +42,7 @@
     "whatwg-fetch": "^2.0.3"
   },
   "devDependencies": {
+    "i18next-scanner": "^2.6.1",
     "webpack-dashboard": "^1.1.1",
     "webpack-dev-server": "^2.9.2"
   },

frontend_app_thread/rebuild_thread.sh

@@ -1,13 +0,0 @@
-#!/bin/bash
-
-. ../bash_library.sh # source bash_library.sh
-
-windoz=""
-if  [[ $1 = "-w" ]]; then
-    windoz="windoz"
-fi
-
-log "npm run build$windoz"
-npm run build$windoz
-log "cp dist/thread.app.js ../frontend/dist/app"
-cp dist/thread.app.js ../frontend/dist/app

frontend_app_thread/src/container/PopupCreateThread.jsx

@@ -1,13 +1,16 @@
 import React from 'react'
+import { translate } from 'react-i18next'
 import {
+  addAllResourceI18n,
   CardPopupCreateContent,
   handleFetchResult
 } from 'tracim_frontend_lib'
 import { postThreadContent } from '../action.async.js'
+import i18n from '../i18n.js'
 
 const debug = { // outdated
   config: {
-    label: 'Thread',
+    label: 'PopupCreateThread',
     slug: 'thread',
     faIcon: 'file-text-o',
     hexcolor: '#ad4cf9',
@@ -19,6 +22,14 @@ const debug = { // outdated
       'Accept': 'application/json',
       'Content-Type': 'application/json',
       'Authorization': 'Basic ' + btoa(`${'admin@admin.admin'}:${'admin@admin.admin'}`)
+    },
+    translation: {
+      en: {
+        translation: {}
+      },
+      fr: {
+        translation: {}
+      }
     }
   },
   loggedUser: {
@@ -33,17 +44,38 @@ const debug = { // outdated
   idFolder: null
 }
 
-class PopupCreateHtmlDocument extends React.Component {
+class PopupCreateThread extends React.Component {
   constructor (props) {
     super(props)
     this.state = {
-      appName: 'thread',
+      appName: 'thread', // must remain 'thread' because it is the name of the react built app (which contains Threac and PopupCreateThread)
       config: props.data ? props.data.config : debug.config,
       loggedUser: props.data ? props.data.loggedUser : debug.loggedUser,
       idWorkspace: props.data ? props.data.idWorkspace : debug.idWorkspace,
       idFolder: props.data ? props.data.idFolder : debug.idFolder,
       newContentName: ''
     }
+
+    // i18n has been init, add resources from frontend
+    addAllResourceI18n(i18n, this.state.config.translation)
+    i18n.changeLanguage(this.state.loggedUser.lang)
+
+    document.addEventListener('appCustomEvent', this.customEventReducer)
+  }
+
+  customEventReducer = ({ detail: { type, data } }) => { // action: { type: '', data: {} }
+    switch (type) {
+      case 'allApp_changeLang':
+        console.log('%c<PopupCreateThread> Custom event', 'color: #28a745', type, data)
+        this.setState(prev => ({
+          loggedUser: {
+            ...prev.loggedUser,
+            lang: data
+          }
+        }))
+        i18n.changeLanguage(data)
+        break
+    }
   }
 
   handleChangeNewContentName = e => this.setState({newContentName: e.target.value})
@@ -89,10 +121,11 @@ class PopupCreateHtmlDocument extends React.Component {
         faIcon={this.state.config.faIcon}
         contentName={this.state.newContentName}
         onChangeContentName={this.handleChangeNewContentName}
-        btnValidateLabel='Valider et créer'
+        btnValidateLabel={this.props.t('Validate and create')}
+        inputPlaceholder={this.props.t("Topic's subject")}
       />
     )
   }
 }
 
-export default PopupCreateHtmlDocument
+export default translate()(PopupCreateThread)

frontend_app_thread/src/container/Thread.jsx

@@ -2,6 +2,7 @@ import React from 'react'
 import i18n from '../i18n.js'
 import { debug } from '../helper.js'
 import {
+  addAllResourceI18n,
   handleFetchResult,
   PopinFixed,
   PopinFixedHeader,
@@ -33,6 +34,10 @@ class Thread extends React.Component {
       timelineWysiwyg: false
     }
 
+    // i18n has been init, add resources from frontend
+    addAllResourceI18n(i18n, this.state.config.translation)
+    i18n.changeLanguage(this.state.loggedUser.lang)
+
     document.addEventListener('appCustomEvent', this.customEventReducer)
   }
 
@@ -49,6 +54,17 @@ class Thread extends React.Component {
       case 'thread_reloadContent':
         console.log('%c<Thread> Custom event', 'color: #28a745', type, data)
         this.setState(prev => ({content: {...prev.content, ...data}, isVisible: true}))
+        break
+      case 'allApp_changeLang':
+        console.log('%c<Thread> Custom event', 'color: #28a745', type, data)
+        this.setState(prev => ({
+          loggedUser: {
+            ...prev.loggedUser,
+            lang: data
+          }
+        }))
+        i18n.changeLanguage(data)
+        break
     }
   }
 

frontend_app_thread/src/helper.js

@@ -5,7 +5,7 @@ export const FETCH_CONFIG = {
   }
 }
 
-export const debug = { // copied from html-documents => outdated
+export const debug = { // copied from html-document => outdated
   config: {
     label: 'Thread',
     slug: 'thread',
@@ -78,7 +78,7 @@ export const debug = { // copied from html-documents => outdated
     show_in_ui: true,
     slug: 'current-menu',
     status: 'open',
-    sub_content_types: ['thread', 'html-documents', 'file', 'folder'],
+    sub_content_types: ['thread', 'html-document', 'file', 'folder'],
     workspace_id: 1
   },
   timeline: [] // timelineDebugData

frontend_app_thread/src/i18n.js

@@ -1,8 +1,5 @@
 import i18n from 'i18next'
 import { reactI18nextModule } from 'react-i18next'
-import { langFr, langEn } from 'tracim_frontend_lib'
-import fr from './translate/fr.js'
-import en from './translate/en.js'
 
 i18n
   .use(reactI18nextModule)
@@ -18,14 +15,7 @@ i18n
     react: {
       wait: true
     },
-    resources: {
-      en: {
-        translation: {...langEn.translation, ...en.translation}
-      },
-      fr: {
-        translation: {...langFr.translation, ...fr.translation}
-      }
-    }
+    resources: {} // init with empty resources, they will come from frontend in app constructor
   })
 
 export default i18n

frontend_app_thread/src/index.js

@@ -6,7 +6,7 @@ import PopupCreateThread from './container/PopupCreateThread.jsx'
 require('./css/index.styl')
 
 const appInterface = {
-  name: 'Thread',
+  name: 'thread',
   isRendered: false,
   renderAppFull: data => {
     return ReactDOM.render(

frontend_app_thread/src/translate/en.js

@@ -1,9 +0,0 @@
-const en = {
-  translation: { // 'en' in the namespace 'translation'
-    PopinFixedOption: {
-      new_version: 'New version'
-    }
-  }
-}
-
-export default en

frontend_app_thread/src/translate/fr.js

@@ -1,9 +0,0 @@
-const fr = {
-  translation: { // 'fr' in the namespace 'translation'
-    PopinFixedOption: {
-      new_version: 'nouvelle version'
-    }
-  }
-}
-
-export default fr

frontend_lib/i18next.scanner.js

@@ -0,0 +1,9 @@
+const scanner = require('i18next-scanner')
+const vfs = require('vinyl-fs')
+
+const option = require('../i18next.option.js')
+
+vfs.src(['./src/**/*.jsx'])
+// .pipe(sort()) // Sort files in stream by path
+  .pipe(scanner(option))
+  .pipe(vfs.dest('./i18next.scanner'))

frontend_lib/i18next.scanner/en/translation.json

@@ -0,0 +1 @@
+{}

frontend_lib/i18next.scanner/fr/translation.json

@@ -0,0 +1 @@
+{}

frontend_lib/package.json

@@ -9,8 +9,9 @@
     "servdev-dashboard": "NODE_ENV=development webpack-dashboard -m -p 9870 -- webpack-dev-server --watch --colors --inline --hot --progress",
     "buildwindoz": "set NODE_ENV=production&& webpack -p",
     "build": "NODE_ENV=production webpack -p",
+    "build-translation": "node i18next.scanner.js",
     "buildtracimlib": "NODE_ENV=production webpack -p && echo '/* eslint-disable */' | cat - dist/tracim_frontend_lib.js > temp && mv temp dist/tracim_frontend_lib.js && printf '\n/* eslint-enable */\n' >> dist/tracim_frontend_lib.js",
-    "buildtracimlibwindoz": "set NODE_ENV=production&& webpack -p && echo '/* eslint-disable */' | cat - dist/tracim_frontend_lib.js > temp && mv temp dist/tracim_frontend_lib.js && printf '\n/* eslint-enable */\n' >> dist/tracim_frontend_lib.js",
+    "buildtracimlibwindoz": "set NODE_ENV=production&& webpack -p && echo /* eslint-disable */ | cat - dist/tracim_frontend_lib.js > temp && mv temp dist/tracim_frontend_lib.js && echo /* eslint-enable */>> dist/tracim_frontend_lib.js",
     "test": "echo \"Error: no test specified\" && exit 1"
   },
   "author": "",
@@ -44,6 +45,7 @@
     "whatwg-fetch": "^2.0.3"
   },
   "devDependencies": {
+    "i18next-scanner": "^2.6.1",
     "webpack-dashboard": "^1.1.1",
     "webpack-dev-server": "^2.9.2"
   },

frontend_lib/src/component/CardPopup/CardPopupCreateContent.jsx

@@ -27,7 +27,7 @@ const PopupCreateContent = props => {
           <input
             type='text'
             className='createcontent__form__input'
-            placeHolder='Nommez votre contenu...'
+            placeHolder={props.inputPlaceholder}
             value={props.contentName}
             onChange={props.onChangeContentName}
           />
@@ -64,7 +64,8 @@ PopupCreateContent.propTypes = {
   label: PropTypes.string,
   customColor: PropTypes.string,
   faIcon: PropTypes.string,
-  btnValidateLabel: PropTypes.string
+  btnValidateLabel: PropTypes.string,
+  inputPlaceholder: PropTypes.string
 }
 
 PopupCreateContent.defaultProps = {

frontend_lib/src/component/Input/SelectStatus/SelectStatus.jsx

@@ -27,21 +27,20 @@ export const SelectStatus = props => {
       </button>
 
       <div className='selectStatus__submenu dropdown-menu' aria-labelledby='dropdownMenu2'>
-        <h6 className='dropdown-header'>{props.t('Input.SelectStatus.file_status')}</h6>
-
-        <div className='dropdown-divider' />
-
         {props.availableStatus.map(s =>
           <button
             className='selectStatus__submenu__item current dropdown-item'
             type='button'
             onClick={() => props.onChangeStatus(s.slug)}
             key={`status_${s.slug}`}
-            style={{color: s.hexcolor}}
+            // style={{color: s.hexcolor}}
           >
-            {s.label /* props.t('Input.SelectStatus.ongoing') */}
+            {s.label}
             <div className='selectStatus__submenu__item__icon'>
-              <i className={`fa fa-fw fa-${s.faIcon}`} />
+              <i
+                className={`fa fa-fw fa-${s.faIcon}`}
+                style={{color: s.hexcolor}}
+              />
             </div>
           </button>
         )}

frontend_lib/src/component/Timeline/Comment.jsx

@@ -25,22 +25,19 @@ const Comment = props => {
           {props.avatar ? <img src={props.avatar} /> : ''}
         </div>
       </div>
-      <div
-        className={classnames(`${props.customClass}__messagelist__item__authorandhour`, 'timeline__body__messagelist__item__authorandhour')}>
-          <div className='mr-5'>
-            {props.createdAt}
-          </div>
+      <div className={classnames(`${props.customClass}__messagelist__item__authorandhour`, 'timeline__body__messagelist__item__authorandhour')}>
+        <div className={classnames(`${props.customClass}__messagelist__item__authorandhour__author`, 'timeline__body__messagelist__item__authorandhour__author')}>
           {props.author}
+        </div>
+        <div className={classnames(`${props.customClass}__messagelist__item__authorandhour__date`, 'timeline__body__messagelist__item__authorandhour__date')}>
+          {props.createdAt}
+        </div>
       </div>
       <div
         className={classnames(`${props.customClass}__messagelist__item__content`, 'timeline__body__messagelist__item__content')}
         style={props.fromMe ? styleSent : styleReceived}
-
-      >
-        <div className='timeline__body__messagelist__item__content__text'>
-          {props.text}
-        </div>
-      </div>
+        dangerouslySetInnerHTML={{__html: props.text}}
+      />
     </li>
   )
 }

frontend_lib/src/component/Timeline/Timeline.jsx

@@ -107,7 +107,7 @@ class Timeline extends React.Component {
                   }}
                   key={'timeline__comment__advancedtext'}
                 >
-                  {props.wysiwyg ? 'Texte Simple' : 'Texte Avancé'}
+                  {props.wysiwyg ? 'Texte Simple' : 'Texte Riche'}
                 </button>
               </div>
 

frontend_lib/src/component/Timeline/Timeline.styl

@@ -36,7 +36,7 @@
         padding 0 25px 0 35px
         &__avatar
           position relative
-          top 40px
+          top 60px
           left -20px
           border-radius 50%
           width 45px
@@ -46,10 +46,7 @@
             height 45px
             border-radius 25px
         &__authorandhour
-          display flex
-          align-items center
-          justify-content flex-end
-          margin-right 35px
+          margin-left 35px
           opacity 0.7
           font-size 14px
         &__content
@@ -118,7 +115,7 @@
       flex-direction row-reverse
     &__avatar
       left 20px
-    &__createhour
+    &__authorandhour
       margin-left 0
       margin-right 35px
 

frontend_lib/src/component/Timeline/debugData.js

@@ -1,7 +1,7 @@
 export const TimelineDebugData = [{
   'is_deleted': false,
   'is_archived': false,
-  'sub_content_types': ['thread', 'file', 'folder', 'html-documents'],
+  'sub_content_types': ['thread', 'file', 'folder', 'html-document'],
   'raw_content': '',
   'status': 'open',
   'content_id': 22,
@@ -11,7 +11,7 @@ export const TimelineDebugData = [{
   'created': '21/06/2018 à 15:12:40',
   'slug': 'bonjour',
   'author': {'user_id': 1, 'avatar_url': null, 'public_name': 'Global manager'},
-  'content_type': 'html-documents',
+  'content_type': 'html-document',
   'workspace_id': 1,
   'revision_id': 22,
   'label': 'bonjour?',
@@ -21,7 +21,7 @@ export const TimelineDebugData = [{
 }, {
   'is_deleted': false,
   'is_archived': false,
-  'sub_content_types': ['thread', 'file', 'folder', 'html-documents'],
+  'sub_content_types': ['thread', 'file', 'folder', 'html-document'],
   'raw_content': 'bonjour.',
   'status': 'open',
   'content_id': 22,
@@ -31,7 +31,7 @@ export const TimelineDebugData = [{
   'created': '28/06/2018 à 15:13:26',
   'slug': 'bonjour',
   'author': {'user_id': 1, 'avatar_url': null, 'public_name': 'Global manager'},
-  'content_type': 'html-documents',
+  'content_type': 'html-document',
   'workspace_id': 1,
   'revision_id': 30,
   'label': 'bonjour?',
@@ -71,7 +71,7 @@ export const TimelineDebugData = [{
 }, {
   'is_deleted': false,
   'is_archived': false,
-  'sub_content_types': ['thread', 'file', 'folder', 'html-documents'],
+  'sub_content_types': ['thread', 'file', 'folder', 'html-document'],
   'raw_content': 'bonjour.\nmerci.',
   'status': 'open',
   'content_id': 22,
@@ -81,7 +81,7 @@ export const TimelineDebugData = [{
   'created': '28/06/2018 à 15:43:51',
   'slug': 'bonjour',
   'author': {'user_id': 1, 'avatar_url': null, 'public_name': 'Global manager'},
-  'content_type': 'html-documents',
+  'content_type': 'html-document',
   'workspace_id': 1,
   'revision_id': 33,
   'label': 'bonjour?',
@@ -106,7 +106,7 @@ export const TimelineDebugData = [{
 }, {
   'is_deleted': false,
   'is_archived': false,
-  'sub_content_types': ['thread', 'file', 'folder', 'html-documents'],
+  'sub_content_types': ['thread', 'file', 'folder', 'html-document'],
   'raw_content': 'bonjour.\nmerci.',
   'status': 'open',
   'content_id': 22,
@@ -116,7 +116,7 @@ export const TimelineDebugData = [{
   'created': '28/06/2018 à 16:01:41',
   'slug': 'current-menu2',
   'author': {'user_id': 1, 'avatar_url': null, 'public_name': 'Global manager'},
-  'content_type': 'html-documents',
+  'content_type': 'html-document',
   'workspace_id': 1,
   'revision_id': 35,
   'label': 'Current Menu2',
@@ -126,7 +126,7 @@ export const TimelineDebugData = [{
 }, {
   'is_deleted': false,
   'is_archived': false,
-  'sub_content_types': ['thread', 'file', 'folder', 'html-documents'],
+  'sub_content_types': ['thread', 'file', 'folder', 'html-document'],
   'raw_content': 'bonjour.\nmerci.',
   'status': 'open',
   'content_id': 22,
@@ -136,7 +136,7 @@ export const TimelineDebugData = [{
   'created': '28/06/2018 à 16:06:53',
   'slug': 'current-menu25',
   'author': {'user_id': 1, 'avatar_url': null, 'public_name': 'Global manager'},
-  'content_type': 'html-documents',
+  'content_type': 'html-document',
   'workspace_id': 1,
   'revision_id': 36,
   'label': 'Current Menu25',
@@ -146,7 +146,7 @@ export const TimelineDebugData = [{
 }, {
   'is_deleted': false,
   'is_archived': false,
-  'sub_content_types': ['thread', 'file', 'folder', 'html-documents'],
+  'sub_content_types': ['thread', 'file', 'folder', 'html-document'],
   'raw_content': 'bonjour.\nmerci.',
   'status': 'open',
   'content_id': 22,
@@ -156,7 +156,7 @@ export const TimelineDebugData = [{
   'created': '28/06/2018 à 16:23:30',
   'slug': '',
   'author': {'user_id': 1, 'avatar_url': null, 'public_name': 'Global manager'},
-  'content_type': 'html-documents',
+  'content_type': 'html-document',
   'workspace_id': 1,
   'revision_id': 37,
   'label': '',
@@ -166,7 +166,7 @@ export const TimelineDebugData = [{
 }, {
   'is_deleted': false,
   'is_archived': false,
-  'sub_content_types': ['thread', 'file', 'folder', 'html-documents'],
+  'sub_content_types': ['thread', 'file', 'folder', 'html-document'],
   'raw_content': 'bonjour.\nmerci.',
   'status': 'open',
   'content_id': 22,
@@ -176,7 +176,7 @@ export const TimelineDebugData = [{
   'created': '28/06/2018 à 16:23:43',
   'slug': 'woot',
   'author': {'user_id': 1, 'avatar_url': null, 'public_name': 'Global manager'},
-  'content_type': 'html-documents',
+  'content_type': 'html-document',
   'workspace_id': 1,
   'revision_id': 38,
   'label': 'woot',
@@ -186,7 +186,7 @@ export const TimelineDebugData = [{
 }, {
   'is_deleted': false,
   'is_archived': false,
-  'sub_content_types': ['thread', 'file', 'folder', 'html-documents'],
+  'sub_content_types': ['thread', 'file', 'folder', 'html-document'],
   'raw_content': 'bonjour.\nmerci.',
   'status': 'open',
   'content_id': 22,
@@ -196,7 +196,7 @@ export const TimelineDebugData = [{
   'created': '28/06/2018 à 16:35:18',
   'slug': 'woot2',
   'author': {'user_id': 1, 'avatar_url': null, 'public_name': 'Global manager'},
-  'content_type': 'html-documents',
+  'content_type': 'html-document',
   'workspace_id': 1,
   'revision_id': 39,
   'label': 'woot2',
@@ -206,7 +206,7 @@ export const TimelineDebugData = [{
 }, {
   'is_deleted': false,
   'is_archived': false,
-  'sub_content_types': ['thread', 'file', 'folder', 'html-documents'],
+  'sub_content_types': ['thread', 'file', 'folder', 'html-document'],
   'raw_content': 'bonjour.\nmerci.',
   'status': 'open',
   'content_id': 22,
@@ -216,7 +216,7 @@ export const TimelineDebugData = [{
   'created': '28/06/2018 à 16:36:10',
   'slug': 'woot3',
   'author': {'user_id': 1, 'avatar_url': null, 'public_name': 'Global manager'},
-  'content_type': 'html-documents',
+  'content_type': 'html-document',
   'workspace_id': 1,
   'revision_id': 40,
   'label': 'woot3',
@@ -226,7 +226,7 @@ export const TimelineDebugData = [{
 }, {
   'is_deleted': false,
   'is_archived': false,
-  'sub_content_types': ['thread', 'file', 'folder', 'html-documents'],
+  'sub_content_types': ['thread', 'file', 'folder', 'html-document'],
   'raw_content': 'bonjour.\nmerci.',
   'status': 'open',
   'content_id': 22,
@@ -236,7 +236,7 @@ export const TimelineDebugData = [{
   'created': '28/06/2018 à 16:37:21',
   'slug': 'woot4',
   'author': {'user_id': 1, 'avatar_url': null, 'public_name': 'Global manager'},
-  'content_type': 'html-documents',
+  'content_type': 'html-document',
   'workspace_id': 1,
   'revision_id': 41,
   'label': 'woot4',
@@ -246,7 +246,7 @@ export const TimelineDebugData = [{
 }, {
   'is_deleted': false,
   'is_archived': false,
-  'sub_content_types': ['thread', 'file', 'folder', 'html-documents'],
+  'sub_content_types': ['thread', 'file', 'folder', 'html-document'],
   'raw_content': 'bonjour.\nmerci.\nbravo.',
   'status': 'open',
   'content_id': 22,
@@ -256,7 +256,7 @@ export const TimelineDebugData = [{
   'created': '28/06/2018 à 16:37:36',
   'slug': 'woot4',
   'author': {'user_id': 1, 'avatar_url': null, 'public_name': 'Global manager'},
-  'content_type': 'html-documents',
+  'content_type': 'html-document',
   'workspace_id': 1,
   'revision_id': 42,
   'label': 'woot4',
@@ -266,7 +266,7 @@ export const TimelineDebugData = [{
 }, {
   'is_deleted': false,
   'is_archived': false,
-  'sub_content_types': ['thread', 'file', 'folder', 'html-documents'],
+  'sub_content_types': ['thread', 'file', 'folder', 'html-document'],
   'raw_content': 'bonjour.\nmerci.\nbravo.',
   'status': 'closed-validated',
   'content_id': 22,
@@ -276,7 +276,7 @@ export const TimelineDebugData = [{
   'created': '29/06/2018 à 16:04:02',
   'slug': 'woot4',
   'author': {'user_id': 1, 'avatar_url': null, 'public_name': 'Global manager'},
-  'content_type': 'html-documents',
+  'content_type': 'html-document',
   'workspace_id': 1,
   'revision_id': 46,
   'label': 'woot4',
@@ -286,7 +286,7 @@ export const TimelineDebugData = [{
 }, {
   'is_deleted': false,
   'is_archived': false,
-  'sub_content_types': ['thread', 'file', 'folder', 'html-documents'],
+  'sub_content_types': ['thread', 'file', 'folder', 'html-document'],
   'raw_content': 'bonjour.\nmerci.\nbravo.',
   'status': 'closed-deprecated',
   'content_id': 22,
@@ -296,7 +296,7 @@ export const TimelineDebugData = [{
   'created': '29/06/2018 à 16:05:32',
   'slug': 'woot4',
   'author': {'user_id': 1, 'avatar_url': null, 'public_name': 'Global manager'},
-  'content_type': 'html-documents',
+  'content_type': 'html-document',
   'workspace_id': 1,
   'revision_id': 47,
   'label': 'woot4',
@@ -306,7 +306,7 @@ export const TimelineDebugData = [{
 }, {
   'is_deleted': false,
   'is_archived': false,
-  'sub_content_types': ['thread', 'file', 'folder', 'html-documents'],
+  'sub_content_types': ['thread', 'file', 'folder', 'html-document'],
   'raw_content': 'bonjour.\nmerci.\nbravo.',
   'status': 'open',
   'content_id': 22,
@@ -316,7 +316,7 @@ export const TimelineDebugData = [{
   'created': '29/06/2018 à 16:06:35',
   'slug': 'woot4',
   'author': {'user_id': 1, 'avatar_url': null, 'public_name': 'Global manager'},
-  'content_type': 'html-documents',
+  'content_type': 'html-document',
   'workspace_id': 1,
   'revision_id': 48,
   'label': 'woot4',
@@ -326,7 +326,7 @@ export const TimelineDebugData = [{
 }, {
   'is_deleted': false,
   'is_archived': false,
-  'sub_content_types': ['thread', 'file', 'folder', 'html-documents'],
+  'sub_content_types': ['thread', 'file', 'folder', 'html-document'],
   'raw_content': 'bonjour.\nmerci.\nbravo.',
   'status': 'closed-deprecated',
   'content_id': 22,
@@ -336,7 +336,7 @@ export const TimelineDebugData = [{
   'created': '29/06/2018 à 16:08:36',
   'slug': 'woot4',
   'author': {'user_id': 1, 'avatar_url': null, 'public_name': 'Global manager'},
-  'content_type': 'html-documents',
+  'content_type': 'html-document',
   'workspace_id': 1,
   'revision_id': 49,
   'label': 'woot4',
@@ -346,7 +346,7 @@ export const TimelineDebugData = [{
 }, {
   'is_deleted': false,
   'is_archived': false,
-  'sub_content_types': ['thread', 'file', 'folder', 'html-documents'],
+  'sub_content_types': ['thread', 'file', 'folder', 'html-document'],
   'raw_content': 'bonjour.\nmerci.\nbravo.',
   'status': 'open',
   'content_id': 22,
@@ -356,7 +356,7 @@ export const TimelineDebugData = [{
   'created': '29/06/2018 à 16:13:15',
   'slug': 'woot4',
   'author': {'user_id': 1, 'avatar_url': null, 'public_name': 'Global manager'},
-  'content_type': 'html-documents',
+  'content_type': 'html-document',
   'workspace_id': 1,
   'revision_id': 50,
   'label': 'woot4',
@@ -366,7 +366,7 @@ export const TimelineDebugData = [{
 }, {
   'is_deleted': false,
   'is_archived': false,
-  'sub_content_types': ['thread', 'file', 'folder', 'html-documents'],
+  'sub_content_types': ['thread', 'file', 'folder', 'html-document'],
   'raw_content': 'bonjour.\nmerci.\nbravo.',
   'status': 'closed-validated',
   'content_id': 22,
@@ -376,7 +376,7 @@ export const TimelineDebugData = [{
   'created': '29/06/2018 à 16:13:19',
   'slug': 'woot4',
   'author': {'user_id': 1, 'avatar_url': null, 'public_name': 'Global manager'},
-  'content_type': 'html-documents',
+  'content_type': 'html-document',
   'workspace_id': 1,
   'revision_id': 51,
   'label': 'woot4',
@@ -386,7 +386,7 @@ export const TimelineDebugData = [{
 }, {
   'is_deleted': false,
   'is_archived': false,
-  'sub_content_types': ['thread', 'file', 'folder', 'html-documents'],
+  'sub_content_types': ['thread', 'file', 'folder', 'html-document'],
   'raw_content': 'bonjour.\nmerci.\nbravo.',
   'status': 'open',
   'content_id': 22,
@@ -396,7 +396,7 @@ export const TimelineDebugData = [{
   'created': '29/06/2018 à 16:14:34',
   'slug': 'woot4',
   'author': {'user_id': 1, 'avatar_url': null, 'public_name': 'Global manager'},
-  'content_type': 'html-documents',
+  'content_type': 'html-document',
   'workspace_id': 1,
   'revision_id': 52,
   'label': 'woot4',
@@ -406,7 +406,7 @@ export const TimelineDebugData = [{
 }, {
   'is_deleted': false,
   'is_archived': false,
-  'sub_content_types': ['thread', 'file', 'folder', 'html-documents'],
+  'sub_content_types': ['thread', 'file', 'folder', 'html-document'],
   'raw_content': 'bonjour.\nmerci.\nbravo.',
   'status': 'closed-unvalidated',
   'content_id': 22,
@@ -416,7 +416,7 @@ export const TimelineDebugData = [{
   'created': '29/06/2018 à 16:14:38',
   'slug': 'woot4',
   'author': {'user_id': 1, 'avatar_url': null, 'public_name': 'Global manager'},
-  'content_type': 'html-documents',
+  'content_type': 'html-document',
   'workspace_id': 1,
   'revision_id': 53,
   'label': 'woot4',
@@ -426,7 +426,7 @@ export const TimelineDebugData = [{
 }, {
   'is_deleted': false,
   'is_archived': false,
-  'sub_content_types': ['thread', 'file', 'folder', 'html-documents'],
+  'sub_content_types': ['thread', 'file', 'folder', 'html-document'],
   'raw_content': 'bonjour.\nmerci.\nbravo.',
   'status': 'closed-deprecated',
   'content_id': 22,
@@ -436,7 +436,7 @@ export const TimelineDebugData = [{
   'created': '29/06/2018 à 16:15:29',
   'slug': 'woot4',
   'author': {'user_id': 1, 'avatar_url': null, 'public_name': 'Global manager'},
-  'content_type': 'html-documents',
+  'content_type': 'html-document',
   'workspace_id': 1,
   'revision_id': 54,
   'label': 'woot4',
@@ -446,7 +446,7 @@ export const TimelineDebugData = [{
 }, {
   'is_deleted': false,
   'is_archived': false,
-  'sub_content_types': ['thread', 'file', 'folder', 'html-documents'],
+  'sub_content_types': ['thread', 'file', 'folder', 'html-document'],
   'raw_content': 'bonjour.\nmerci.\nbravo.',
   'status': 'open',
   'content_id': 22,
@@ -456,7 +456,7 @@ export const TimelineDebugData = [{
   'created': '29/06/2018 à 16:15:43',
   'slug': 'woot4',
   'author': {'user_id': 1, 'avatar_url': null, 'public_name': 'Global manager'},
-  'content_type': 'html-documents',
+  'content_type': 'html-document',
   'workspace_id': 1,
   'revision_id': 55,
   'label': 'woot4',
@@ -466,7 +466,7 @@ export const TimelineDebugData = [{
 }, {
   'is_deleted': false,
   'is_archived': false,
-  'sub_content_types': ['thread', 'file', 'folder', 'html-documents'],
+  'sub_content_types': ['thread', 'file', 'folder', 'html-document'],
   'raw_content': 'bonjour.\nmerci.\nbravo.',
   'status': 'closed-unvalidated',
   'content_id': 22,
@@ -476,7 +476,7 @@ export const TimelineDebugData = [{
   'created': '29/06/2018 à 16:15:53',
   'slug': 'woot4',
   'author': {'user_id': 1, 'avatar_url': null, 'public_name': 'Global manager'},
-  'content_type': 'html-documents',
+  'content_type': 'html-document',
   'workspace_id': 1,
   'revision_id': 56,
   'label': 'woot4',
@@ -486,7 +486,7 @@ export const TimelineDebugData = [{
 }, {
   'is_deleted': false,
   'is_archived': false,
-  'sub_content_types': ['thread', 'file', 'folder', 'html-documents'],
+  'sub_content_types': ['thread', 'file', 'folder', 'html-document'],
   'raw_content': 'bonjour.\nmerci.\nbravo.',
   'status': 'closed-deprecated',
   'content_id': 22,
@@ -496,7 +496,7 @@ export const TimelineDebugData = [{
   'created': '29/06/2018 à 16:15:55',
   'slug': 'woot4',
   'author': {'user_id': 1, 'avatar_url': null, 'public_name': 'Global manager'},
-  'content_type': 'html-documents',
+  'content_type': 'html-document',
   'workspace_id': 1,
   'revision_id': 57,
   'label': 'woot4',
@@ -506,7 +506,7 @@ export const TimelineDebugData = [{
 }, {
   'is_deleted': false,
   'is_archived': false,
-  'sub_content_types': ['thread', 'file', 'folder', 'html-documents'],
+  'sub_content_types': ['thread', 'file', 'folder', 'html-document'],
   'raw_content': '<p>bonjour.</p>\n<p>merci.</p>\n<p>bravo.</p>',
   'status': 'closed-deprecated',
   'content_id': 22,
@@ -516,7 +516,7 @@ export const TimelineDebugData = [{
   'created': '02/07/2018 à 12:46:16',
   'slug': 'woot4',
   'author': {'user_id': 1, 'avatar_url': null, 'public_name': 'Global manager'},
-  'content_type': 'html-documents',
+  'content_type': 'html-document',
   'workspace_id': 1,
   'revision_id': 58,
   'label': 'woot4',
@@ -631,7 +631,7 @@ export const TimelineDebugData = [{
 }, {
   'is_deleted': false,
   'is_archived': false,
-  'sub_content_types': ['thread', 'file', 'folder', 'html-documents'],
+  'sub_content_types': ['thread', 'file', 'folder', 'html-document'],
   'raw_content': '<p>bonjour.</p>\n<p>merci.</p>\n<p>bravo.1</p>',
   'status': 'closed-deprecated',
   'content_id': 22,
@@ -641,7 +641,7 @@ export const TimelineDebugData = [{
   'created': '02/07/2018 à 15:48:04',
   'slug': 'woot4',
   'author': {'user_id': 1, 'avatar_url': null, 'public_name': 'Global manager'},
-  'content_type': 'html-documents',
+  'content_type': 'html-document',
   'workspace_id': 1,
   'revision_id': 66,
   'label': 'woot4',
@@ -651,7 +651,7 @@ export const TimelineDebugData = [{
 }, {
   'is_deleted': false,
   'is_archived': false,
-  'sub_content_types': ['thread', 'file', 'folder', 'html-documents'],
+  'sub_content_types': ['thread', 'file', 'folder', 'html-document'],
   'raw_content': '<p>bonjour.</p>\n<p>merci.</p>\n<p>bravo.1</p>',
   'status': 'open',
   'content_id': 22,
@@ -661,7 +661,7 @@ export const TimelineDebugData = [{
   'created': '02/07/2018 à 15:49:32',
   'slug': 'woot4',
   'author': {'user_id': 1, 'avatar_url': null, 'public_name': 'Global manager'},
-  'content_type': 'html-documents',
+  'content_type': 'html-document',
   'workspace_id': 1,
   'revision_id': 67,
   'label': 'woot4',
@@ -671,7 +671,7 @@ export const TimelineDebugData = [{
 }, {
   'is_deleted': false,
   'is_archived': false,
-  'sub_content_types': ['thread', 'file', 'folder', 'html-documents'],
+  'sub_content_types': ['thread', 'file', 'folder', 'html-document'],
   'raw_content': '<p>bonjour.</p>\n<p>merci.</p>\n<p>bravo.12</p>',
   'status': 'open',
   'content_id': 22,
@@ -681,7 +681,7 @@ export const TimelineDebugData = [{
   'created': '02/07/2018 à 15:50:36',
   'slug': 'woot4',
   'author': {'user_id': 1, 'avatar_url': null, 'public_name': 'Global manager'},
-  'content_type': 'html-documents',
+  'content_type': 'html-document',
   'workspace_id': 1,
   'revision_id': 68,
   'label': 'woot4',
@@ -691,7 +691,7 @@ export const TimelineDebugData = [{
 }, {
   'is_deleted': false,
   'is_archived': false,
-  'sub_content_types': ['thread', 'file', 'folder', 'html-documents'],
+  'sub_content_types': ['thread', 'file', 'folder', 'html-document'],
   'raw_content': '<p>bonjour.</p>\n<p>merci.</p>\n<p>bravo.123</p>',
   'status': 'open',
   'content_id': 22,
@@ -701,7 +701,7 @@ export const TimelineDebugData = [{
   'created': '02/07/2018 à 15:54:17',
   'slug': 'woot4',
   'author': {'user_id': 1, 'avatar_url': null, 'public_name': 'Global manager'},
-  'content_type': 'html-documents',
+  'content_type': 'html-document',
   'workspace_id': 1,
   'revision_id': 69,
   'label': 'woot4',
@@ -711,7 +711,7 @@ export const TimelineDebugData = [{
 }, {
   'is_deleted': false,
   'is_archived': false,
-  'sub_content_types': ['thread', 'file', 'folder', 'html-documents'],
+  'sub_content_types': ['thread', 'file', 'folder', 'html-document'],
   'raw_content': '<p>bonjour.</p>\n<p>merci.</p>\n<p>bravo.1234</p>',
   'status': 'open',
   'content_id': 22,
@@ -721,7 +721,7 @@ export const TimelineDebugData = [{
   'created': '02/07/2018 à 15:54:22',
   'slug': 'woot4',
   'author': {'user_id': 1, 'avatar_url': null, 'public_name': 'Global manager'},
-  'content_type': 'html-documents',
+  'content_type': 'html-document',
   'workspace_id': 1,
   'revision_id': 70,
   'label': 'woot4',
@@ -731,7 +731,7 @@ export const TimelineDebugData = [{
 }, {
   'is_deleted': false,
   'is_archived': false,
-  'sub_content_types': ['thread', 'file', 'folder', 'html-documents'],
+  'sub_content_types': ['thread', 'file', 'folder', 'html-document'],
   'raw_content': '<p>end</p>',
   'status': 'open',
   'content_id': 22,
@@ -741,7 +741,7 @@ export const TimelineDebugData = [{
   'created': '02/07/2018 à 17:24:41',
   'slug': 'woot4',
   'author': {'user_id': 1, 'avatar_url': null, 'public_name': 'Global manager'},
-  'content_type': 'html-documents',
+  'content_type': 'html-document',
   'workspace_id': 1,
   'revision_id': 71,
   'label': 'woot4',
@@ -751,7 +751,7 @@ export const TimelineDebugData = [{
 }, {
   'is_deleted': false,
   'is_archived': false,
-  'sub_content_types': ['thread', 'file', 'folder', 'html-documents'],
+  'sub_content_types': ['thread', 'file', 'folder', 'html-document'],
   'raw_content': '<p>bonjour.</p>\n<p>merci.</p>\n<p>bravo.12</p>',
   'status': 'open',
   'content_id': 22,
@@ -761,7 +761,7 @@ export const TimelineDebugData = [{
   'created': '02/07/2018 à 17:43:28',
   'slug': 'woot5',
   'author': {'user_id': 1, 'avatar_url': null, 'public_name': 'Global manager'},
-  'content_type': 'html-documents',
+  'content_type': 'html-document',
   'workspace_id': 1,
   'revision_id': 72,
   'label': 'woot5',
@@ -786,7 +786,7 @@ export const TimelineDebugData = [{
 }, {
   'is_deleted': false,
   'is_archived': false,
-  'sub_content_types': ['thread', 'file', 'folder', 'html-documents'],
+  'sub_content_types': ['thread', 'file', 'folder', 'html-document'],
   'raw_content': '<p>bonjour.</p>\n<p>merci.</p>\n<p>bravo.12</p>\n<p>&nbsp;</p>',
   'status': 'open',
   'content_id': 22,
@@ -796,7 +796,7 @@ export const TimelineDebugData = [{
   'created': '04/07/2018 à 11:02:27',
   'slug': 'woot5',
   'author': {'user_id': 1, 'avatar_url': null, 'public_name': 'Global manager'},
-  'content_type': 'html-documents',
+  'content_type': 'html-document',
   'workspace_id': 1,
   'revision_id': 76,
   'label': 'woot5',
@@ -806,7 +806,7 @@ export const TimelineDebugData = [{
 }, {
   'is_deleted': false,
   'is_archived': false,
-  'sub_content_types': ['thread', 'file', 'folder', 'html-documents'],
+  'sub_content_types': ['thread', 'file', 'folder', 'html-document'],
   'raw_content': '<p>bonjour.</p>\n<p>merci.</p>\n<p>bravo.12</p>\n<p>gni</p>',
   'status': 'open',
   'content_id': 22,
@@ -816,7 +816,7 @@ export const TimelineDebugData = [{
   'created': '04/07/2018 à 11:03:53',
   'slug': 'woot5',
   'author': {'user_id': 1, 'avatar_url': null, 'public_name': 'Global manager'},
-  'content_type': 'html-documents',
+  'content_type': 'html-document',
   'workspace_id': 1,
   'revision_id': 77,
   'label': 'woot5',
@@ -826,7 +826,7 @@ export const TimelineDebugData = [{
 }, {
   'is_deleted': false,
   'is_archived': false,
-  'sub_content_types': ['thread', 'file', 'folder', 'html-documents'],
+  'sub_content_types': ['thread', 'file', 'folder', 'html-document'],
   'raw_content': '<p>bonjour.</p>\n<p>merci.</p>\n<p>bravo.12</p>\n<p>gni</p>\n<p>avec un commentaire ?</p>',
   'status': 'open',
   'content_id': 22,
@@ -836,7 +836,7 @@ export const TimelineDebugData = [{
   'created': '04/07/2018 à 11:04:19',
   'slug': 'woot5',
   'author': {'user_id': 1, 'avatar_url': null, 'public_name': 'Global manager'},
-  'content_type': 'html-documents',
+  'content_type': 'html-document',
   'workspace_id': 1,
   'revision_id': 78,
   'label': 'woot5',
@@ -861,7 +861,7 @@ export const TimelineDebugData = [{
 }, {
   'is_deleted': false,
   'is_archived': false,
-  'sub_content_types': ['thread', 'file', 'folder', 'html-documents'],
+  'sub_content_types': ['thread', 'file', 'folder', 'html-document'],
   'raw_content': '<p>bonjour.</p>\n<p>merci.</p>\n<p>bravo.12</p>\n<p>gni</p>\n<p>avec un commentaire ?</p>\n<p>fail.</p>',
   'status': 'open',
   'content_id': 22,
@@ -871,7 +871,7 @@ export const TimelineDebugData = [{
   'created': '04/07/2018 à 11:04:39',
   'slug': 'woot5',
   'author': {'user_id': 1, 'avatar_url': null, 'public_name': 'Global manager'},
-  'content_type': 'html-documents',
+  'content_type': 'html-document',
   'workspace_id': 1,
   'revision_id': 80,
   'label': 'woot5',
@@ -881,7 +881,7 @@ export const TimelineDebugData = [{
 }, {
   'is_deleted': false,
   'is_archived': false,
-  'sub_content_types': ['thread', 'file', 'folder', 'html-documents'],
+  'sub_content_types': ['thread', 'file', 'folder', 'html-document'],
   'raw_content': '<p>bonjour.</p>\n<p>merci.</p>\n<p>bravo.12</p>\n<p>gni</p>\n<p>avec un commentaire ?</p>\n<p>fail.</p>',
   'status': 'closed-validated',
   'content_id': 22,
@@ -891,7 +891,7 @@ export const TimelineDebugData = [{
   'created': '04/07/2018 à 11:05:13',
   'slug': 'woot5',
   'author': {'user_id': 1, 'avatar_url': null, 'public_name': 'Global manager'},
-  'content_type': 'html-documents',
+  'content_type': 'html-document',
   'workspace_id': 1,
   'revision_id': 81,
   'label': 'woot5',
@@ -901,7 +901,7 @@ export const TimelineDebugData = [{
 }, {
   'is_deleted': false,
   'is_archived': false,
-  'sub_content_types': ['thread', 'file', 'folder', 'html-documents'],
+  'sub_content_types': ['thread', 'file', 'folder', 'html-document'],
   'raw_content': '<p>bonjour.</p>\n<p>merci.</p>\n<p>bravo.12</p>\n<p>gni</p>\n<p>avec un commentaire ?</p>\n<p>fail.</p>',
   'status': 'open',
   'content_id': 22,
@@ -911,7 +911,7 @@ export const TimelineDebugData = [{
   'created': '04/07/2018 à 11:05:19',
   'slug': 'woot5',
   'author': {'user_id': 1, 'avatar_url': null, 'public_name': 'Global manager'},
-  'content_type': 'html-documents',
+  'content_type': 'html-document',
   'workspace_id': 1,
   'revision_id': 82,
   'label': 'woot5',
@@ -921,7 +921,7 @@ export const TimelineDebugData = [{
 }, {
   'is_deleted': false,
   'is_archived': false,
-  'sub_content_types': ['thread', 'file', 'folder', 'html-documents'],
+  'sub_content_types': ['thread', 'file', 'folder', 'html-document'],
   'raw_content': '<p>bonjour.</p>\n<p>merci.</p>\n<p>bravo.12</p>\n<p>gni</p>\n<p>avec un commentaire ?</p>\n<p>fail.</p>',
   'status': 'closed-validated',
   'content_id': 22,
@@ -931,7 +931,7 @@ export const TimelineDebugData = [{
   'created': '04/07/2018 à 13:11:50',
   'slug': 'woot5',
   'author': {'user_id': 1, 'avatar_url': null, 'public_name': 'Global manager'},
-  'content_type': 'html-documents',
+  'content_type': 'html-document',
   'workspace_id': 1,
   'revision_id': 83,
   'label': 'woot5',
@@ -941,7 +941,7 @@ export const TimelineDebugData = [{
 }, {
   'is_deleted': false,
   'is_archived': false,
-  'sub_content_types': ['thread', 'file', 'folder', 'html-documents'],
+  'sub_content_types': ['thread', 'file', 'folder', 'html-document'],
   'raw_content': '<p>bonjour.</p>\n<p>merci.</p>\n<p>bravo.12</p>\n<p>gni</p>\n<p>avec un commentaire ?</p>\n<p>fail.</p>',
   'status': 'open',
   'content_id': 22,
@@ -951,7 +951,7 @@ export const TimelineDebugData = [{
   'created': '04/07/2018 à 14:26:43',
   'slug': 'woot5',
   'author': {'user_id': 1, 'avatar_url': null, 'public_name': 'Global manager'},
-  'content_type': 'html-documents',
+  'content_type': 'html-document',
   'workspace_id': 1,
   'revision_id': 84,
   'label': 'woot5',
@@ -1021,7 +1021,7 @@ export const TimelineDebugData = [{
 }, {
   'is_deleted': false,
   'is_archived': false,
-  'sub_content_types': ['thread', 'file', 'folder', 'html-documents'],
+  'sub_content_types': ['thread', 'file', 'folder', 'html-document'],
   'raw_content': '<p>bonjour.</p>\n<p>merci.</p>\n<p>bravo.12</p>\n<p>gni</p>\n<p>avec un commentaire ?</p>\n<p>fail.</p>',
   'status': 'closed-validated',
   'content_id': 22,
@@ -1031,7 +1031,7 @@ export const TimelineDebugData = [{
   'created': '06/07/2018 à 16:21:52',
   'slug': 'woot5',
   'author': {'user_id': 1, 'avatar_url': null, 'public_name': 'Global manager'},
-  'content_type': 'html-documents',
+  'content_type': 'html-document',
   'workspace_id': 1,
   'revision_id': 109,
   'label': 'woot5',
@@ -1071,7 +1071,7 @@ export const TimelineDebugData = [{
 }, {
   'is_deleted': false,
   'is_archived': false,
-  'sub_content_types': ['thread', 'file', 'folder', 'html-documents'],
+  'sub_content_types': ['thread', 'file', 'folder', 'html-document'],
   'raw_content': '<p>bonjour.</p>\n<p>merci.</p>\n<p>bravo.12</p>\n<p>gni</p>\n<p>avec un commentaire ?</p>\n<p>fail.</p>',
   'status': 'closed-validated',
   'content_id': 22,
@@ -1081,7 +1081,7 @@ export const TimelineDebugData = [{
   'created': '06/07/2018 à 18:15:04',
   'slug': 'woot55',
   'author': {'user_id': 1, 'avatar_url': null, 'public_name': 'Global manager'},
-  'content_type': 'html-documents',
+  'content_type': 'html-document',
   'workspace_id': 1,
   'revision_id': 115,
   'label': 'woot55',
@@ -1091,7 +1091,7 @@ export const TimelineDebugData = [{
 }, {
   'is_deleted': false,
   'is_archived': false,
-  'sub_content_types': ['thread', 'file', 'folder', 'html-documents'],
+  'sub_content_types': ['thread', 'file', 'folder', 'html-document'],
   'raw_content': '<p>bonjour.</p>\n<p>merci.</p>\n<p>bravo.12</p>\n<p>gni</p>\n<p>avec un commentaire ?</p>\n<p>fail.</p>',
   'status': 'open',
   'content_id': 22,
@@ -1101,7 +1101,7 @@ export const TimelineDebugData = [{
   'created': '06/07/2018 à 18:15:20',
   'slug': 'woot55',
   'author': {'user_id': 1, 'avatar_url': null, 'public_name': 'Global manager'},
-  'content_type': 'html-documents',
+  'content_type': 'html-document',
   'workspace_id': 1,
   'revision_id': 116,
   'label': 'woot55',

frontend_lib/src/helper.js

@@ -20,3 +20,11 @@ export const libHandleFetchResult = async fetchResult => {
       return new Promise((resolve, reject) => reject(fetchResult)) // @TODO : handle errors from api result
   }
 }
+
+export const libAddAllResourceI18n = (i18n, translation) => {
+  Object.keys(translation).forEach(lang =>
+    Object.keys(translation[lang]).forEach(namespace =>
+      i18n.addResources(lang, namespace, translation[lang][namespace])
+    )
+  )
+}

frontend_lib/src/index.js

@@ -1,4 +1,6 @@
-import { libHandleFetchResult } from './helper.js'
+import { libAddAllResourceI18n, libHandleFetchResult } from './helper.js'
+
+// fr and en are deprecated
 import fr from './translate/fr.js'
 import en from './translate/en.js'
 
@@ -24,6 +26,8 @@ import libSelectStatus from './component/Input/SelectStatus/SelectStatus.jsx'
 export const langFr = fr
 export const langEn = en
 
+export const addAllResourceI18n = libAddAllResourceI18n
+
 export const handleFetchResult = libHandleFetchResult
 
 export const PopinFixed = libPopinFixed

i18next.option.js

@@ -0,0 +1,40 @@
+module.exports = {
+  debug: true,
+  removeUnusedKeys: true,
+  func: {
+    list: ['t', 'props.t', 'this.props.t'],
+    extensions: ['.js', '.jsx']
+  },
+  lngs: ['en', 'fr'],
+  defaultLng: 'en',
+  keySeparator: false, // false means "keyBasedFallback"
+  nsSeparator: false, // false means "keyBasedFallback"
+  fallbackLng: false,
+
+  ns: ['translation'], // namespace
+  defaultNS: 'translation',
+
+  // @param {string} lng The language currently used.
+  // @param {string} ns The namespace currently used.
+  // @param {string} key The translation key.
+  // @return {string} Returns a default value for the translation key.
+  // Return key as the default value for English language. Otherwise, returns '__NOT_TRANSLATED__'
+  defaultValue: (lng, ns, key) => lng === 'en' ? key : '__NOT_TRANSLATED__',
+
+  react: {wait: true},
+
+  resource: {
+    // The path where resources get loaded from.
+    // /!\ /!\ /!\ Relative to CURRENT working directory. /!\
+    loadPath: 'i18next.scanner/{{lng}}/{{ns}}.json',
+    // The path to store resources.
+    // /!\ /!\ /!\ Relative to the path specified by `vfs.dest('./i18next.scanner')`. /!\
+    savePath: '{{lng}}/{{ns}}.json',
+    jsonIndent: 2,
+    lineEnding: '\n'
+  },
+  // interpolation: {
+  //   escapeValue: false, // not needed for react!!
+  // },
+  trans: false,
+}

install_frontend_dependencies.sh

@@ -2,6 +2,8 @@
 
 . bash_library.sh # source bash_library.sh
 
+# install Tracim Lib
+
 log "cd frontend_lib"
 cd frontend_lib
 log "npm i"
@@ -10,6 +12,8 @@ log "sudo npm link"
 sudo npm link
 cd -
 
+# install app Html Document
+
 log "cd frontend_app_html-document"
 cd frontend_app_html-document
 log "npm i"
@@ -18,6 +22,18 @@ log "npm link tracim_frontend_lib"
 npm link tracim_frontend_lib
 cd -
 
+# install app Thread
+
+log "cd frontend_app_thread"
+cd frontend_app_thread
+log "npm i"
+npm i
+log "npm link tracim_frontend_lib"
+npm link tracim_frontend_lib
+cd -
+
+# install Tracim Frontend
+
 log "cd frontend"
 cd frontend
 log "npm i"