Adapt to new I18n extension