Use the same non-standard locale code format that we currently use on th...

...e server (underscores instead of hyphens).