Fixed default language setting
Merge branch '31-internationalization-translations' into staging