Task 13 i18n service does not work anymore

Merge