diff options
author | Sergey Linnik <sergey.linnik@onlyoffice.com> | 2017-05-03 16:16:31 +0300 |
---|---|---|
committer | Sergey Linnik <sergey.linnik@onlyoffice.com> | 2017-05-03 18:40:11 +0300 |
commit | 5c81f3b3345334f1c8f46b89f3b221468e60b0d2 (patch) | |
tree | 0cff19b4da5d1ac86315a31e6b9e44f3650c1606 | |
parent | ad161d6c31f269ddb636f5cab93542cb259e7ef3 (diff) |
new file on user lang (Issue #44)
-rw-r--r-- | assets/az/new.docx | bin | 0 -> 8473 bytes | |||
-rw-r--r-- | assets/az/new.pptx (renamed from assets/new.pptx) | bin | 35742 -> 35742 bytes | |||
-rw-r--r-- | assets/az/new.xlsx | bin | 0 -> 6437 bytes | |||
-rw-r--r-- | assets/de/new.docx | bin | 0 -> 8467 bytes | |||
-rw-r--r-- | assets/de/new.pptx | bin | 0 -> 35742 bytes | |||
-rw-r--r-- | assets/de/new.xlsx | bin | 0 -> 6437 bytes | |||
-rw-r--r-- | assets/en/new.docx (renamed from assets/new.docx) | bin | 8463 -> 8463 bytes | |||
-rw-r--r-- | assets/en/new.pptx | bin | 0 -> 35742 bytes | |||
-rw-r--r-- | assets/en/new.xlsx (renamed from assets/new.xlsx) | bin | 6427 -> 6427 bytes | |||
-rw-r--r-- | assets/es/new.docx | bin | 0 -> 8466 bytes | |||
-rw-r--r-- | assets/es/new.pptx | bin | 0 -> 35742 bytes | |||
-rw-r--r-- | assets/es/new.xlsx | bin | 0 -> 6437 bytes | |||
-rw-r--r-- | assets/fr/new.docx | bin | 0 -> 8467 bytes | |||
-rw-r--r-- | assets/fr/new.pptx | bin | 0 -> 35742 bytes | |||
-rw-r--r-- | assets/fr/new.xlsx | bin | 0 -> 6437 bytes | |||
-rw-r--r-- | assets/it/new.docx | bin | 0 -> 8466 bytes | |||
-rw-r--r-- | assets/it/new.pptx | bin | 0 -> 35742 bytes | |||
-rw-r--r-- | assets/it/new.xlsx | bin | 0 -> 6437 bytes | |||
-rw-r--r-- | assets/lv/new.docx | bin | 0 -> 8468 bytes | |||
-rw-r--r-- | assets/lv/new.pptx | bin | 0 -> 35742 bytes | |||
-rw-r--r-- | assets/lv/new.xlsx | bin | 0 -> 6437 bytes | |||
-rw-r--r-- | assets/pl/new.docx | bin | 0 -> 8466 bytes | |||
-rw-r--r-- | assets/pl/new.pptx | bin | 0 -> 35742 bytes | |||
-rw-r--r-- | assets/pl/new.xlsx | bin | 0 -> 6437 bytes | |||
-rw-r--r-- | assets/pt/new.docx | bin | 0 -> 8466 bytes | |||
-rw-r--r-- | assets/pt/new.pptx | bin | 0 -> 35742 bytes | |||
-rw-r--r-- | assets/pt/new.xlsx | bin | 0 -> 6437 bytes | |||
-rw-r--r-- | assets/ru/new.docx | bin | 0 -> 8467 bytes | |||
-rw-r--r-- | assets/ru/new.pptx | bin | 0 -> 35742 bytes | |||
-rw-r--r-- | assets/ru/new.xlsx | bin | 0 -> 6437 bytes | |||
-rw-r--r-- | controller/callbackcontroller.php | 2 | ||||
-rw-r--r-- | controller/editorcontroller.php | 13 |
32 files changed, 13 insertions, 2 deletions
diff --git a/assets/az/new.docx b/assets/az/new.docx Binary files differnew file mode 100644 index 0000000..1bec95e --- /dev/null +++ b/assets/az/new.docx diff --git a/assets/new.pptx b/assets/az/new.pptx Binary files differindex 1c40671..1c40671 100644 --- a/assets/new.pptx +++ b/assets/az/new.pptx diff --git a/assets/az/new.xlsx b/assets/az/new.xlsx Binary files differnew file mode 100644 index 0000000..3b301e7 --- /dev/null +++ b/assets/az/new.xlsx diff --git a/assets/de/new.docx b/assets/de/new.docx Binary files differnew file mode 100644 index 0000000..0c83b58 --- /dev/null +++ b/assets/de/new.docx diff --git a/assets/de/new.pptx b/assets/de/new.pptx Binary files differnew file mode 100644 index 0000000..1c40671 --- /dev/null +++ b/assets/de/new.pptx diff --git a/assets/de/new.xlsx b/assets/de/new.xlsx Binary files differnew file mode 100644 index 0000000..3b301e7 --- /dev/null +++ b/assets/de/new.xlsx diff --git a/assets/new.docx b/assets/en/new.docx Binary files differindex 56831d5..56831d5 100644 --- a/assets/new.docx +++ b/assets/en/new.docx diff --git a/assets/en/new.pptx b/assets/en/new.pptx Binary files differnew file mode 100644 index 0000000..1c40671 --- /dev/null +++ b/assets/en/new.pptx diff --git a/assets/new.xlsx b/assets/en/new.xlsx Binary files differindex ab1038c..ab1038c 100644 --- a/assets/new.xlsx +++ b/assets/en/new.xlsx diff --git a/assets/es/new.docx b/assets/es/new.docx Binary files differnew file mode 100644 index 0000000..feb0bc8 --- /dev/null +++ b/assets/es/new.docx diff --git a/assets/es/new.pptx b/assets/es/new.pptx Binary files differnew file mode 100644 index 0000000..1c40671 --- /dev/null +++ b/assets/es/new.pptx diff --git a/assets/es/new.xlsx b/assets/es/new.xlsx Binary files differnew file mode 100644 index 0000000..3b301e7 --- /dev/null +++ b/assets/es/new.xlsx diff --git a/assets/fr/new.docx b/assets/fr/new.docx Binary files differnew file mode 100644 index 0000000..0836cb2 --- /dev/null +++ b/assets/fr/new.docx diff --git a/assets/fr/new.pptx b/assets/fr/new.pptx Binary files differnew file mode 100644 index 0000000..1c40671 --- /dev/null +++ b/assets/fr/new.pptx diff --git a/assets/fr/new.xlsx b/assets/fr/new.xlsx Binary files differnew file mode 100644 index 0000000..3b301e7 --- /dev/null +++ b/assets/fr/new.xlsx diff --git a/assets/it/new.docx b/assets/it/new.docx Binary files differnew file mode 100644 index 0000000..3c903a3 --- /dev/null +++ b/assets/it/new.docx diff --git a/assets/it/new.pptx b/assets/it/new.pptx Binary files differnew file mode 100644 index 0000000..1c40671 --- /dev/null +++ b/assets/it/new.pptx diff --git a/assets/it/new.xlsx b/assets/it/new.xlsx Binary files differnew file mode 100644 index 0000000..3b301e7 --- /dev/null +++ b/assets/it/new.xlsx diff --git a/assets/lv/new.docx b/assets/lv/new.docx Binary files differnew file mode 100644 index 0000000..b3edf0b --- /dev/null +++ b/assets/lv/new.docx diff --git a/assets/lv/new.pptx b/assets/lv/new.pptx Binary files differnew file mode 100644 index 0000000..1c40671 --- /dev/null +++ b/assets/lv/new.pptx diff --git a/assets/lv/new.xlsx b/assets/lv/new.xlsx Binary files differnew file mode 100644 index 0000000..3b301e7 --- /dev/null +++ b/assets/lv/new.xlsx diff --git a/assets/pl/new.docx b/assets/pl/new.docx Binary files differnew file mode 100644 index 0000000..f526604 --- /dev/null +++ b/assets/pl/new.docx diff --git a/assets/pl/new.pptx b/assets/pl/new.pptx Binary files differnew file mode 100644 index 0000000..1c40671 --- /dev/null +++ b/assets/pl/new.pptx diff --git a/assets/pl/new.xlsx b/assets/pl/new.xlsx Binary files differnew file mode 100644 index 0000000..3b301e7 --- /dev/null +++ b/assets/pl/new.xlsx diff --git a/assets/pt/new.docx b/assets/pt/new.docx Binary files differnew file mode 100644 index 0000000..133b3b5 --- /dev/null +++ b/assets/pt/new.docx diff --git a/assets/pt/new.pptx b/assets/pt/new.pptx Binary files differnew file mode 100644 index 0000000..1c40671 --- /dev/null +++ b/assets/pt/new.pptx diff --git a/assets/pt/new.xlsx b/assets/pt/new.xlsx Binary files differnew file mode 100644 index 0000000..3b301e7 --- /dev/null +++ b/assets/pt/new.xlsx diff --git a/assets/ru/new.docx b/assets/ru/new.docx Binary files differnew file mode 100644 index 0000000..4ce057b --- /dev/null +++ b/assets/ru/new.docx diff --git a/assets/ru/new.pptx b/assets/ru/new.pptx Binary files differnew file mode 100644 index 0000000..1c40671 --- /dev/null +++ b/assets/ru/new.pptx diff --git a/assets/ru/new.xlsx b/assets/ru/new.xlsx Binary files differnew file mode 100644 index 0000000..3b301e7 --- /dev/null +++ b/assets/ru/new.xlsx diff --git a/controller/callbackcontroller.php b/controller/callbackcontroller.php index 154918f..8a534f1 100644 --- a/controller/callbackcontroller.php +++ b/controller/callbackcontroller.php @@ -216,7 +216,7 @@ class CallbackController extends Controller { return new JSONResponse(["message" => $this->trans->t("Invalid request")], Http::STATUS_BAD_REQUEST); } - $templatePath = dirname(__DIR__) . DIRECTORY_SEPARATOR . "assets" . DIRECTORY_SEPARATOR . "new.docx"; + $templatePath = dirname(__DIR__) . DIRECTORY_SEPARATOR . "assets" . DIRECTORY_SEPARATOR . "en" . DIRECTORY_SEPARATOR . "new.docx"; $template = file_get_contents($templatePath); if (!$template) { diff --git a/controller/editorcontroller.php b/controller/editorcontroller.php index eabf26d..1232223 100644 --- a/controller/editorcontroller.php +++ b/controller/editorcontroller.php @@ -164,7 +164,14 @@ class EditorController extends Controller { $name = $userFolder->getNonExistingName($name); $filePath = $dir . DIRECTORY_SEPARATOR . $name; $ext = strtolower("." . pathinfo($filePath, PATHINFO_EXTENSION)); - $templatePath = dirname(__DIR__) . DIRECTORY_SEPARATOR . "assets" . DIRECTORY_SEPARATOR . "new" . $ext; + + $lang = \OC::$server->getL10NFactory("")->get("")->getLanguageCode(); + + $templatePath = $this->getTemplatePath($lang, $ext); + if (!file_exists($templatePath)) { + $lang = "en"; + $templatePath = $this->getTemplatePath($lang, $ext); + } $template = file_get_contents($templatePath); if (!$template) { @@ -189,6 +196,10 @@ class EditorController extends Controller { return $result; } + private function getTemplatePath($lang, $ext) { + return dirname(__DIR__) . DIRECTORY_SEPARATOR . "assets" . DIRECTORY_SEPARATOR . $lang . DIRECTORY_SEPARATOR . "new" . $ext; + } + /** * Conversion file to Office Open XML format * |