1 files changed, 8 insertions, 3 deletions

diff --git a/plugins/language_switch/language_switch.inc.php b/plugins/language_switch/language_switch.inc.php
index 721a5af11..c24fcd1a8 100644
--- a/plugins/language_switch/language_switch.inc.php
+++ b/plugins/language_switch/language_switch.inc.php
@@ -70,11 +70,16 @@ class language_controler {
         'url' => str_replace(array('=&','?&'),array('&','?'),
                  add_url_params( $url_starting, array('lang'=> $code) )),
         'alt' => ucwords( $displayname ),
+        'title' => substr($displayname, 0, -4), // remove [FR] or [RU]
         'img' => get_root_url().'language/' . $code . '/' . $code . '.jpg',
         );
-      if ( $code !== $user['language'] ) 
-        $lsw['flags'][$code] = $qlc ;
-      else $lsw['Active'] = $qlc;
+      
+      $lsw['flags'][$code] = $qlc ;
+      
+      if ($code == $user['language'])
+      {
+        $lsw['Active'] = $qlc;
+      }
     }
     $template->set_filename('language_flags', dirname(__FILE__) . '/flags.tpl');
     $lsw['side'] = ceil(sqrt(count($available_lang)));