Rewrote the i18n system - now more lightweight