Updated to use i18n-2 instead of i18n. Tests updated.