From 308a039b0fcdf61423ee63477eebfaceeb9d9f32 Mon Sep 17 00:00:00 2001
From: Menno Dekker <mennodekker@users.sourceforge.net>
Date: Mon, 1 Apr 2013 21:10:44 +0200
Subject: [PATCH] dev: fixes for plugin and menu localisation

---
 application/core/LSUserIdentity.php        |  4 +++-
 application/core/LSWebUser.php             |  9 +++++++++
 application/extensions/Menu/MenuWidget.php |  3 ++-
 application/views/plugins/configure.php    |  6 +++---
 application/views/plugins/index.php        | 12 ++++++------
 5 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/application/core/LSUserIdentity.php b/application/core/LSUserIdentity.php
index 7fe1725f2c3..f5865491c3e 100644
--- a/application/core/LSUserIdentity.php
+++ b/application/core/LSUserIdentity.php
@@ -148,7 +148,9 @@ protected function postLogin()
         }
 
         Yii::app()->session['adminlang'] = $sLanguage;
-        App()->getController()->lang= new limesurvey_lang($sLanguage);
+        $lang = new limesurvey_lang($sLanguage);
+        App()->lang = $lang;
+        App()->getController()->lang= $lang;
     }
     
     public function setPlugin($name) {
diff --git a/application/core/LSWebUser.php b/application/core/LSWebUser.php
index 168a4625602..7b17509c2ff 100644
--- a/application/core/LSWebUser.php
+++ b/application/core/LSWebUser.php
@@ -10,6 +10,15 @@ public function __construct()
         {
             $this->loginUrl = Yii::app()->createUrl('admin/authentication', array('sa' => 'login'));
             
+            // Try to fix missing language in plugin controller
+            Yii::import('application.libraries.Limesurvey_lang');
+            if (empty(Yii::app()->session['adminlang'])) 
+            {
+                 Yii::app()->session["adminlang"] = Yii::app()->getConfig("defaultlang");
+            }
+               
+            $lang = new Limesurvey_lang(Yii::app()->session['adminlang']);
+            Yii::app()->setLang($lang);
         }
 
         public function checkAccess($operation, $params = array(), $allowCaching = true)
diff --git a/application/extensions/Menu/MenuWidget.php b/application/extensions/Menu/MenuWidget.php
index ccf75d2744c..ee985ae377e 100644
--- a/application/extensions/Menu/MenuWidget.php
+++ b/application/extensions/Menu/MenuWidget.php
@@ -51,6 +51,7 @@ protected function menuMain()
             $menu['imageUrl'] = App()->getConfig('adminimageurl');
             $menu['items']['left'][] = array(
                 'href' => array('admin/survey'),
+                'alt' => gT('Default administration page'),
                 'image' => 'home.png',
             );
             $menu['items']['left'][] = 'separator';
@@ -489,7 +490,7 @@ protected function globalSettings()
                 return array(
                     'href' => array('admin/globalsettings'),
                     'image' => 'global.png',
-                    'alt' => gT('Global Settings')
+                    'alt' => gT('Global settings')
                 );
             }
         }
diff --git a/application/views/plugins/configure.php b/application/views/plugins/configure.php
index bd04e1d2169..76deeff4dbe 100644
--- a/application/views/plugins/configure.php
+++ b/application/views/plugins/configure.php
@@ -9,7 +9,7 @@
     <?php
         if (isset($plugin['name']))
         {
-            echo CHtml::tag('h1', array(), "Settings for plugin {$plugin['name']}");
+            echo CHtml::tag('h1', array(), sprintf(gT("Settings for plugin %s"), $plugin['name']));
         }
 
         Yii::import("application.helpers.PluginSettingsHelper");
@@ -23,8 +23,8 @@
             
         }
         echo CHtml::closeTag('ol');
-        echo CHtml::submitButton('Save plugin settings', array('name'=>'ok'));
-        echo CHtml::submitButton('Cancel', array('name'=>'cancel'));
+        echo CHtml::submitButton(gT('Save plugin settings'), array('name'=>'ok'));
+        echo CHtml::submitButton(gT('Cancel'), array('name'=>'cancel'));
         echo CHtml::endForm();
 
     ?>
diff --git a/application/views/plugins/index.php b/application/views/plugins/index.php
index d4b14c908c2..1b3cdbd0948 100644
--- a/application/views/plugins/index.php
+++ b/application/views/plugins/index.php
@@ -8,25 +8,25 @@
     $gridColumns = array(
         array(// display the activation link
             'class' => 'CLinkColumn',
-            'header' => 'Status',
-            'labelExpression' => function($data) { return ($data['active'] == 1 ? CHtml::image(App()->getConfig('adminimageurl') . 'active.png', 'Activated', array('width' => 32, 'height' => 32)) : CHtml::image(App()->getConfig('adminimageurl') . 'inactive.png', 'Deactivated', array('width' => 32, 'height' => 32))); },
+            'header' => gT('Status'),
+            'labelExpression' => function($data) { return ($data['active'] == 1 ? CHtml::image(App()->getConfig('adminimageurl') . 'active.png', gT('Activated'), array('width' => 32, 'height' => 32)) : CHtml::image(App()->getConfig('adminimageurl') . 'inactive.png', gT('Deactivated'), array('width' => 32, 'height' => 32))); },
             'url' => '#'
         ),
         array(// display the activation link
             'class' => 'CLinkColumn',
-            'header' => 'Action',
-            'labelExpression' => function($data) { return ($data['active'] == 0 ? CHtml::image(App()->getConfig('adminimageurl') . 'active.png', 'Activate', array('width' => 16, 'height' => 16)) : CHtml::image(App()->getConfig('adminimageurl') . 'inactive.png', 'Deactivate', array('width' => 16, 'height' => 16))); },
+            'header' => gT('Action'),
+            'labelExpression' => function($data) { return ($data['active'] == 0 ? CHtml::image(App()->getConfig('adminimageurl') . 'active.png', gT('Activate'), array('width' => 16, 'height' => 16)) : CHtml::image(App()->getConfig('adminimageurl') . 'inactive.png', gT('Deactivate'), array('width' => 16, 'height' => 16))); },
             'urlExpression' => function($data) { return $data['active'] == 0 ? array("/plugins/activate", "id" => $data['id']) : array("/plugins/activate", "id" => $data['id']); }
         ),
         array(// display the 'name' attribute
             'class' => 'CLinkColumn',
-            'header' => 'Plugin',
+            'header' => gT('Plugin'),
             'labelExpression' => function($data) { return $data['name']; },
             'urlExpression' => function($data) { return array("/plugins/configure", "id" => $data['id']); }    
         ),
         array(// display the 'name' attribute
             'class' => 'CDataColumn',
-            'header' => 'Description',
+            'header' => gT('Description'),
             'name' => 'description'
         ),
     );