Issue #2256953 by ja_ca: Fixed language mapping order is not alphabetical.