language switcher always points home page

Hi,
I'm using myfolio template in conjuction with sef404 for SEO.
My website is in two languages and everything seems to work fine but not the language switcher.
At the beginning the switcher was pointing only the home page in the main language so I went to GKBase.class.php and I did the following:

..
if ($v->home == 1) {
/////////$v->url = JURI::base();
//patch di riccardo-multilingua
$doc =& JFactory::getDocument();
if ($doc->getLanguage()==='en-gb')
{
$v->url .='en/';
}
//end patch di riccardo-multilingua
...

This helps because, when in Home page, I can switch languages correctly.

The problem is that, unfortunately, the language switcher continues to point the home pages also when clicked in different pages.

In this case I would like to bring the user to the current translated page and not in home page.

Please help me.

You should configure everything like it is described here https://www.gavick.com/documentation/questions/configuration-multilanguage-site-with-joomla-1-7/, then the language switcher should redirect to 'Home' items for every language, without any changes in menu code.