Skip to content
Snippets Groups Projects
Commit 36d3f01a authored by Guillaume Heurtier's avatar Guillaume Heurtier
Browse files

FEAT #13983 TIME 1:20 load collabora lang with app language

parent 8fcb5c6e
No related branches found
No related tags found
No related merge requests found
...@@ -15,6 +15,5 @@ ...@@ -15,6 +15,5 @@
<server_uri>collaboraonline.maarchcourrier.com</server_uri> <server_uri>collaboraonline.maarchcourrier.com</server_uri>
<server_port>9980</server_port> <server_port>9980</server_port>
<server_ssl>false</server_ssl> <server_ssl>false</server_ssl>
<editor_language>fr-FR</editor_language>
</collaboraonline> </collaboraonline>
</ROOT> </ROOT>
...@@ -364,8 +364,11 @@ class CollaboraOnlineController ...@@ -364,8 +364,11 @@ class CollaboraOnlineController
$urlIFrame = $urlSrc . 'WOPISrc=' . $coreUrl . 'rest/wopi/files/' . $body['resId'] . '&access_token=' . $jwt . '&NotWOPIButIframe=true'; $urlIFrame = $urlSrc . 'WOPISrc=' . $coreUrl . 'rest/wopi/files/' . $body['resId'] . '&access_token=' . $jwt . '&NotWOPIButIframe=true';
if (!empty($loadedXml->collaboraonline->editor_language)) { $appLanguage = CoreConfigModel::getLanguage();
$urlIFrame .= '&lang=' . (string)$loadedXml->collaboraonline->editor_language; if ($appLanguage == 'fr') {
$urlIFrame .= '&lang=fr-FR';
} elseif ($appLanguage == 'nl') {
$urlIFrame .= '&lang=nl-NL';
} }
return $response->withJson(['url' => $urlIFrame, 'token' => $jwt, 'coreUrl' => $coreUrl]); return $response->withJson(['url' => $urlIFrame, 'token' => $jwt, 'coreUrl' => $coreUrl]);
...@@ -397,7 +400,7 @@ class CollaboraOnlineController ...@@ -397,7 +400,7 @@ class CollaboraOnlineController
} }
$tmpPath = CoreConfigModel::getTmpPath(); $tmpPath = CoreConfigModel::getTmpPath();
$filename = "collabora_encoded_{$GLOBALS['id']}_{$body['key']}.${body['format']}"; $filename = "collabora_encoded_{$GLOBALS['id']}_{$body['key']}.{$body['format']}";
$fileContent = base64_decode($body['content']); $fileContent = base64_decode($body['content']);
$put = file_put_contents($tmpPath . $filename, $fileContent); $put = file_put_contents($tmpPath . $filename, $fileContent);
......
This diff is collapsed.
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment