Adjust warpling's additions to use I18n