Merge remote-tracking branch 'origin/master' into design_changes

1 files changed, 5 insertions, 0 deletions

diff --git a/appinfo/application.php b/appinfo/application.php
index a0c45816..9791b6c4 100644
--- a/appinfo/application.php
+++ b/appinfo/application.php
@@ -44,6 +44,7 @@ class Application extends App {
 				$c->query('UserManager'),
 				$c->query('AvatarManager'),
 				$c->query('Logger'),
+				$c->query('L10N'),
 				$c->query('ServerContainer')->getURLGenerator(),
 				$c->query('UserId'),
 				$c->query('AccessMapper'),
@@ -69,6 +70,10 @@ class Application extends App {
             return $c->query('ServerContainer')->getLogger();
         });
 
+        $container->registerService('L10N', function($c) {
+            return $c->query('ServerContainer')->getL10N($c->query('AppName'));
+        });
+
 		$server = $container->getServer();
 		$container->registerService('AccessMapper', function($c) use ($server) {
 			/** @var SimpleContainer $c */