fixed to work with the recent i18n changes and also to use _.merge rather than extend