Better way of handling youtube language codes (#1590)

I realize now that converting back and forth between youtube codes and
our internal codes doesn't work quite right.  So let's keep the
youtube code around, like the old code did.