From 5596ae17ce3610ebb23f7709112fdcaa314efc28 Mon Sep 17 00:00:00 2001 From: Pranav Kant Date: Wed, 5 Apr 2017 15:53:07 +0530 Subject: [PATCH 1/2] Fix incorrect language tags feeding to loleaflet loleaflet expect a BCP47 language tag syntax while OC.getLocale returns a lanugage tag where subtags are separated by '_' instead of '-' (BCP47). It seems safe to just replace '_' with '-' before feeding it to loleaflet --- js/documents.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/js/documents.js b/js/documents.js index 3c44b34b..d902d182 100644 --- a/js/documents.js +++ b/js/documents.js @@ -129,7 +129,7 @@ var documentsMain = { var urlsrc = documentsMain.urlsrc + "WOPISrc=" + wopisrc + "&title=" + encodeURIComponent(title) + - "&lang=" + OC.getLocale() + + "&lang=" + OC.getLocale().replace('_', '-') + // loleaflet expects a BCP47 language tag syntax "&permission=readonly"; // access_token - must be passed via a form post @@ -320,7 +320,7 @@ var documentsMain = { var urlsrc = documentsMain.urlsrc + "WOPISrc=" + wopisrc + "&title=" + encodeURIComponent(title) + - "&lang=" + OC.getLocale() + + "&lang=" + OC.getLocale().replace('_', '-') + // loleaflet expects a BCP47 language tag syntax "&closebutton=1" + "&revisionhistory=1"; if (!documentsMain.canEdit || action === "view") { From 4c1943b956f187708450d30f62df17d59b85397c Mon Sep 17 00:00:00 2001 From: Pranav Kant Date: Wed, 5 Apr 2017 16:02:23 +0530 Subject: [PATCH 2/2] Bin unused params These were passed earlier and used when creating a document from the dedicated richdocument's app page. But since that page is gone now and they are not used anymore, lets bin them. --- lib/Controller/DocumentController.php | 5 ----- 1 file changed, 5 deletions(-) diff --git a/lib/Controller/DocumentController.php b/lib/Controller/DocumentController.php index c2eb7621..72c5bafd 100644 --- a/lib/Controller/DocumentController.php +++ b/lib/Controller/DocumentController.php @@ -233,13 +233,8 @@ class DocumentController extends Controller { if ($content && $view->file_put_contents($path, $content)) { $info = $view->getFileInfo($path); $ret = $this->wopiParser->getUrlSrc($mimetype); - $lolang = strtolower(str_replace('_', '-', $this->settings->getUserValue($this->uid, 'core', 'lang', 'en'))); $response = array( 'status' => 'success', - 'fileid' => $info['fileid'] . '_' . $this->settings->getSystemValue('instanceid'), - 'urlsrc' => $ret['urlsrc'], - 'action' => $ret['action'], - 'lolang' => $lolang, 'data' => \OCA\Files\Helper::formatFileInfo($info) ); } else {