Some refactoring of repeated code in I18N
Merge pull request #3 from anserran/i18n

Some refactoring of repeated code in I18N