DontSellMe/richdocuments
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #35 from pranavk/fix_lang_Tags

Browse Source 
Fix language tags that are fed to loleaflet
This commit is contained in:
Andras Timar 2017-04-19 20:46:30 +02:00 committed by GitHub
commit c49a7c7331
2 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
js/documents.js
View File

@ -129,7 +129,7 @@ var documentsMain = {
var urlsrc = documentsMain.urlsrc + var urlsrc = documentsMain.urlsrc +
"WOPISrc=" + wopisrc + "WOPISrc=" + wopisrc +
"&title=" + encodeURIComponent(title) + "&title=" + encodeURIComponent(title) +
"&lang=" + OC.getLocale() + "&lang=" + OC.getLocale().replace('_', '-') + // loleaflet expects a BCP47 language tag syntax
"&permission=readonly"; "&permission=readonly";
// access_token - must be passed via a form post // access_token - must be passed via a form post
@ -320,7 +320,7 @@ var documentsMain = {
var urlsrc = documentsMain.urlsrc + var urlsrc = documentsMain.urlsrc +
"WOPISrc=" + wopisrc + "WOPISrc=" + wopisrc +
"&title=" + encodeURIComponent(title) + "&title=" + encodeURIComponent(title) +
"&lang=" + OC.getLocale() + "&lang=" + OC.getLocale().replace('_', '-') + // loleaflet expects a BCP47 language tag syntax
"&closebutton=1" + "&closebutton=1" +
"&revisionhistory=1"; "&revisionhistory=1";
if (!documentsMain.canEdit || action === "view") { if (!documentsMain.canEdit || action === "view") {

5
lib/Controller/DocumentController.php
View File

@ -233,13 +233,8 @@ class DocumentController extends Controller {
if ($content && $view->file_put_contents($path, $content)) { if ($content && $view->file_put_contents($path, $content)) {
$info = $view->getFileInfo($path); $info = $view->getFileInfo($path);
$ret = $this->wopiParser->getUrlSrc($mimetype); $ret = $this->wopiParser->getUrlSrc($mimetype);
$lolang = strtolower(str_replace('_', '-', $this->settings->getUserValue($this->uid, 'core', 'lang', 'en')));
$response = array( $response = array(
'status' => 'success', 'status' => 'success',
'fileid' => $info['fileid'] . '_' . $this->settings->getSystemValue('instanceid'),
'urlsrc' => $ret['urlsrc'],
'action' => $ret['action'],
'lolang' => $lolang,
'data' => \OCA\Files\Helper::formatFileInfo($info) 'data' => \OCA\Files\Helper::formatFileInfo($info)
); );
} else { } else {