Skip to content
Snippets Groups Projects
Unverified Commit 0d384ded authored by Julius Härtl's avatar Julius Härtl
Browse files

Obtain the user language from the passed in user id


Signed-off-by: default avatarJulius Härtl <jus@bitgrid.net>
parent 39a4b1c4
No related branches found
No related tags found
No related merge requests found
...@@ -45,6 +45,7 @@ use OCP\Files\Template\TemplateFileCreator; ...@@ -45,6 +45,7 @@ use OCP\Files\Template\TemplateFileCreator;
use OCP\IConfig; use OCP\IConfig;
use OCP\IPreview; use OCP\IPreview;
use OCP\IServerContainer; use OCP\IServerContainer;
use OCP\IUserManager;
use OCP\IUserSession; use OCP\IUserSession;
use OCP\L10N\IFactory; use OCP\L10N\IFactory;
use Psr\Log\LoggerInterface; use Psr\Log\LoggerInterface;
...@@ -59,6 +60,7 @@ class TemplateManager implements ITemplateManager { ...@@ -59,6 +60,7 @@ class TemplateManager implements ITemplateManager {
private $serverContainer; private $serverContainer;
private $eventDispatcher; private $eventDispatcher;
private $rootFolder; private $rootFolder;
private $userManager;
private $previewManager; private $previewManager;
private $config; private $config;
private $l10n; private $l10n;
...@@ -74,6 +76,7 @@ class TemplateManager implements ITemplateManager { ...@@ -74,6 +76,7 @@ class TemplateManager implements ITemplateManager {
Coordinator $coordinator, Coordinator $coordinator,
IRootFolder $rootFolder, IRootFolder $rootFolder,
IUserSession $userSession, IUserSession $userSession,
IUserManager $userManager,
IPreview $previewManager, IPreview $previewManager,
IConfig $config, IConfig $config,
IFactory $l10nFactory, IFactory $l10nFactory,
...@@ -83,6 +86,7 @@ class TemplateManager implements ITemplateManager { ...@@ -83,6 +86,7 @@ class TemplateManager implements ITemplateManager {
$this->eventDispatcher = $eventDispatcher; $this->eventDispatcher = $eventDispatcher;
$this->bootstrapCoordinator = $coordinator; $this->bootstrapCoordinator = $coordinator;
$this->rootFolder = $rootFolder; $this->rootFolder = $rootFolder;
$this->userManager = $userManager;
$this->previewManager = $previewManager; $this->previewManager = $previewManager;
$this->config = $config; $this->config = $config;
$this->l10nFactory = $l10nFactory; $this->l10nFactory = $l10nFactory;
...@@ -259,7 +263,7 @@ class TemplateManager implements ITemplateManager { ...@@ -259,7 +263,7 @@ class TemplateManager implements ITemplateManager {
$skeletonTemplatePath = $this->config->getSystemValue('templatedirectory', $defaultTemplateDirectory); $skeletonTemplatePath = $this->config->getSystemValue('templatedirectory', $defaultTemplateDirectory);
$isDefaultSkeleton = $skeletonPath === $defaultSkeletonDirectory; $isDefaultSkeleton = $skeletonPath === $defaultSkeletonDirectory;
$isDefaultTemplates = $skeletonTemplatePath === $defaultTemplateDirectory; $isDefaultTemplates = $skeletonTemplatePath === $defaultTemplateDirectory;
$userLang = $this->l10nFactory->getUserLanguage(); $userLang = $this->l10nFactory->getUserLanguage($this->userManager->get($this->userId));
try { try {
$l10n = $this->l10nFactory->get('lib', $userLang); $l10n = $this->l10nFactory->get('lib', $userLang);
......
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