Fixed the local switcher for non-translatable entities
Merge pull request #144 from emiliemarchand/locale_switcher_fix

Fixed the local switcher for non-translatable entities