I was shocked to see public opinion change overnight on this issue because some German auto manufacturer cheated on their tests. This should motivate people to fight corruption, not fuels.
Properly maintained EURO4+ vehicles are just fine. Yes, they product some more particulates and NOx, but if you look up the specifics in absolute values, the difference is essentially trivial.
Replacing diesel with gasoline in commercial vehicles will increase transportation prices at least 30-40%, my guess would be much higher. It simply won't happen. Commercial electric vehicles are a dream (or a financial nightmare, depending on your perspective) at this point.
Are diesel's days limited in light personal transport vehicles? Maybe, depending on politics. Are trucks, buses etc going electric anytime soon? Not really.
For public transport, most people and most city councils will choose to improve their services (like more routes, more buses per line etc) and not to shrink just to use the latest bus-sized gadget.