HG-34 pass i18n key to component, update helper