=== modified file 'common.inc'
--- common.inc	
+++ common.inc	
@@ -1058,7 +1058,12 @@
       over exch 0 exch put
       1 add
     } forall
-    tmp 2 0 put % only short locale name
+    true lang.defaultnames {
+      .la.locale get tmp eq { pop false exit } if
+    } forall {
+      % If we don't know about this locale, then try the short locale name.
+      tmp 2 0 put
+    } if
     tmp dup setlang pop setkeymap
   } {
     pop