refs #4899 move language selector to user settings for logged in users, still visible for anonymous users + during install

1 files changed, 15 insertions, 2 deletions

diff --git a/plugins/LanguagesManager/LanguagesManager.php b/plugins/LanguagesManager/LanguagesManager.php
index 449d77987d..3815c1942f 100644
--- a/plugins/LanguagesManager/LanguagesManager.php
+++ b/plugins/LanguagesManager/LanguagesManager.php
@@ -38,6 +38,7 @@ class LanguagesManager extends \Piwik\Plugin
             'User.getLanguage'                => 'getLanguageToLoad',
             'UsersManager.deleteUser'         => 'deleteUserLanguage',
             'Template.topBar'                 => 'addLanguagesManagerToOtherTopBar',
+            'Template.jsGlobalVariables'      => 'jsGlobalVariables',
             'Console.addCommands'             => 'addConsoleCommands'
         );
     }
@@ -65,7 +66,9 @@ class LanguagesManager extends \Piwik\Plugin
 
     public function showLanguagesSelector()
     {
-        MenuTop::addEntry('LanguageSelector', $this->getLanguagesSelector(), true, $order = 30, true);
+        if (Piwik::isUserIsAnonymous() || !DbHelper::isInstalled()) {
+            MenuTop::addEntry('LanguageSelector', $this->getLanguagesSelector(), true, $order = 30, true);
+        }
     }
 
     /**
@@ -82,6 +85,17 @@ class LanguagesManager extends \Piwik\Plugin
     }
 
     /**
+     * Adds the languages drop-down list to topbars other than the main one rendered
+     * in CoreHome/templates/top_bar.twig. The 'other' topbars are on the Installation
+     * and CoreUpdater screens.
+     */
+    public function jsGlobalVariables(&$str)
+    {
+        // piwik object & scripts aren't loaded in 'other' topbars
+        $str .= "piwik.languageName = '" .  self::getLanguageNameForCurrentUser() . "';";
+    }
+
+    /**
      * Renders and returns the language selector HTML.
      *
      * @return string
@@ -91,7 +105,6 @@ class LanguagesManager extends \Piwik\Plugin
         $view = new View("@LanguagesManager/getLanguagesSelector");
         $view->languages = API::getInstance()->getAvailableLanguageNames();
         $view->currentLanguageCode = self::getLanguageCodeForCurrentUser();
-        $view->currentLanguageName = self::getLanguageNameForCurrentUser();
         return $view->render();
     }