Better i18n take two