Merge branch 'master' into fix/532/webdav_apache_documentation

tracim/tracim/controllers/workspace.py

@@ -22,6 +22,7 @@ from tracim.model.data import Workspace
 
 from tracim.model.serializers import Context, CTX, DictLikeClass
 
+from urllib.parse import urlparse
 
 class UserWorkspaceRestController(TIMRestController):
 
@@ -100,12 +101,21 @@ class UserWorkspaceRestController(TIMRestController):
         )
 
         dictified_workspace = Context(CTX.WORKSPACE).toDict(workspace, 'workspace')
+
+        # INFO - G.M - 15-02-2018 - Deal with url scheme for dav link
+        # TODO - G.M - 15-02-2018 - Find better solution to deal with url ?
         webdav_url = CFG.get_instance().WSGIDAV_CLIENT_BASE_URL
+        website_protocol = urlparse(CFG.get_instance().WEBSITE_BASE_URL).scheme
+        dav_protocol = 'dav'
+        if website_protocol == "https":
+            dav_protocol = 'davs'
 
         return DictLikeClass(
             result=dictified_workspace,
             fake_api=fake_api,
             webdav_url=webdav_url,
+            website_protocol = website_protocol,
+            dav_protocol = dav_protocol,
             show_deleted=show_deleted,
             show_archived=show_archived,
         )

tracim/tracim/i18n/fr/LC_MESSAGES/tracim.po

@@ -1403,7 +1403,7 @@ msgstr "Activer le calendrier associé"
 
 #: tracim/templates/admin/workspace_getall.mak:48
 msgid "<u>Note</u>: members will be added during next step."
-msgstr "<u>Note</u> : les membres seront ajoutées à la prochaine étape."
+msgstr "<u>Note</u> : les membres seront ajouté(e)s à la prochaine étape."
 
 #: tracim/templates/admin/workspace_getall.mak:75
 msgid "User Nb"
@@ -1433,7 +1433,7 @@ msgid ""
 "This workspace offers a calendar that you can configure in your software:"
 " Outlook, Thunderbird, etc."
 msgstr ""
-"Cet espace de travaille propose un calendrier que vous pouvez configurer "
+"Cet espace de travail propose un calendrier que vous pouvez configurer "
 "dans votre logiciel : Outlook, Thunderbird, etc."
 
 #: tracim/templates/admin/workspace_getone.mak:46

tracim/tracim/templates/workspace/getone.mak

@@ -129,12 +129,12 @@
             <div class="col-md-6">
                 <div class="input-group">
                     <span class="input-group-addon" style="width: 8em;"><i class="fa fa-fw fa-windows"></i> Windows</span>
-                    <div class="form-control webdavconfig__input">http://${webdav_url}</div>
+                    <div class="form-control webdavconfig__input">${website_protocol}://${webdav_url}</div>
                 </div>
                 <p></p>
                 <div class="input-group">
                     <span class="input-group-addon" style="width: 8em;"><i class="fa fa-fw fa-linux"></i> Linux</span>
-                    <div class="form-control webdavconfig__input">dav://${webdav_url}</div>
+                    <div class="form-control webdavconfig__input">${dav_protocol}://${webdav_url}</div>
                 </div>
             </div>
             <div class="col-md-6">