Craft CMS: Language Toggle

craft-cms-language-toggle.html

{# Language switcher #}
{# Loop through all of the site locales, except the current one #}
{% set otherLocales = craft.i18n.getSiteLocaleIds()|without(craft.locale) %}

{% for locale in otherLocales %}
	{# Is this an entry page? #}
	{% if entry is defined %}
		{# Find the current entry in the other locale #}
		{% set localeEntry = craft.entries.id(entry.id).locale(locale).first %}

		{# Make sure that it's actually localized to this locale #}
		{% if localeEntry.locale == locale %}
			{# Output a link to it #}
			<li>
				<a href="{{ craft.config.siteUrl[locale] ~ (localeEntry.uri != '__home__' ? localeEntry.uri) }}">
					{% if craft.locale == "en_ca" %}
						Français
					{% elseif craft.locale == "fr_ca" %}
						English
					{% endif %}
				</a>
			</li>
		{% endif %}
	{% else %}
		{# Just output the same path with the locale's base URL #}
		<li>
			<a href="{{ craft.config.siteUrl[locale] ~ craft.request.getPath() }}">
				{% if craft.locale == "en_ca" %}
					Français
				{% elseif craft.locale == "fr_ca" %}
					English
				{% endif %}
			</a>
		</li>
	{% endif %}
{% endfor %}
{# /Language switcher #}

Change this line:

<a href="{{ craft.config.siteUrl[locale] ~ craft.request.getPath() }}">

to:

{% set path = craft.request.getPath() %}
{% if path %}
    {# Add a trailing slash to it #}
    {% set path = path ~ '/' %}
{% endif %}
<a href="{{ craft.config.siteUrl[locale] ~ path }}">