From bf2ab2872a3bf540a1dd9b3b73b222f22f31f7ab Mon Sep 17 00:00:00 2001
From: atif-shaikh <shaikh388@gmail.com>
Date: Mon, 8 Dec 2014 10:23:54 +0530
Subject: [PATCH] CRM-11993 - Onchange locale(Language Switcher) reload on the
 same page

----------------------------------------
* CRM-11993: Few bugs on switching language
  https://issues.civicrm.org/jira/browse/CRM-11993
---
 CRM/Core/Block.php                 | 5 +++++
 templates/CRM/Block/LangSwitch.tpl | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/CRM/Core/Block.php b/CRM/Core/Block.php
index a865fda6df..2916318f3b 100644
--- a/CRM/Core/Block.php
+++ b/CRM/Core/Block.php
@@ -312,6 +312,11 @@ class CRM_Core_Block {
         );
         break;
 
+        case self::LANGSWITCH:
+        // gives the currentPath without trailing empty lcMessages to be completed
+        $values = array('queryString' => CRM_Utils_System::getLinksUrl('lcMessages', TRUE, FALSE, FALSE));
+        self::setProperty(self::LANGSWITCH, 'templateValues', $values);
+        break;
       case self::FULLTEXT_SEARCH:
         $urlArray = array(
           'fullTextSearchID' => CRM_Core_DAO::getFieldValue('CRM_Core_DAO_OptionValue',
diff --git a/templates/CRM/Block/LangSwitch.tpl b/templates/CRM/Block/LangSwitch.tpl
index 0c02cf258b..fb8bfbbdac 100644
--- a/templates/CRM/Block/LangSwitch.tpl
+++ b/templates/CRM/Block/LangSwitch.tpl
@@ -25,7 +25,7 @@
 *}
 {if isset($langSwitch) and $langSwitch|@count > 1}
   <form action="#">
-    <select name="lcMessages" onchange="window.location='{crmURL p="civicrm/admin" q="lcMessages="}'+this.value">
+    <select name="lcMessages" onchange="window.location='{crmURL q="$queryString"}'+this.value">
       {foreach from=$langSwitch item=language key=locale}
         <option value="{$locale}" {if $locale == $tsLocale}selected="selected"{/if}>{$language}</option>
       {/foreach}
-- 
2.25.1