fix Language vs Locale errors

restored full Language and Locale functionality. :-)