Modified i18n to all objects rather than arrays