[APPS-277] Fix I18n code