From e5be2991019f1a6716d253596562f8ab0f4df008 Mon Sep 17 00:00:00 2001
From: Roeland Jago Douma <roeland@famdouma.nl>
Date: Wed, 7 Feb 2018 11:04:37 +0100
Subject: [PATCH] Use proper lanugage in langauge code
Fixes #8180
The _ is not valid in language codes use - instead.
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
---
lib/private/TemplateLayout.php | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/lib/private/TemplateLayout.php b/lib/private/TemplateLayout.php
index 3acdae0e395..d37a8bbabbe 100644
--- a/lib/private/TemplateLayout.php
+++ b/lib/private/TemplateLayout.php
@@ -128,7 +128,9 @@ class TemplateLayout extends \OC_Template {
}
// Send the language to our layouts
- $this->assign('language', \OC::$server->getL10NFactory()->findLanguage());
+ $lang = \OC::$server->getL10NFactory()->findLanguage();
+ $lang = str_replace('_', '-', $lang);
+ $this->assign('language', $lang);
if(\OC::$server->getSystemConfig()->getValue('installed', false)) {
if (empty(self::$versionHash)) {
--
GitLab