I agree with the patch, did a similar solution for multilang notices some time ago

and it worked. But it's a workaround.

But I'm afraid that we are late for 3.20 :( 

Also agree with Joubu that we need a more generic solution,

one that provides a fallback lang to assure that you always 

show the same number of options, translated or not.

And I'll be glad to help

Bernardo