I18n, better implementation

Missing the tests part, i'm really not good at that.