refactor and extends vehicle translation. Mantis 26839