Refactoring sprint#1 part3 i18n finished