Make standalone (non-browser) locale detection for windows also accept short locale names

pkg/intl/lib/intl_standalone.dart

 // Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 /**
  * This provides facilities for Internationalization that are only available
  * when running standalone. You should import only one of this or
  * intl_browser.dart. Right now the only thing provided here is finding
  * the operating system locale.
  */
@@ skipping 34 matching lines @@
     return _getAppleDefaults();
   }
   // We can't find anything, don't set the system locale and return null.
   return new Future.immediate(null);
 }
 
 /**
  * Regular expression to match the expected output of systeminfo on
  * Windows. e.g. System Locale:<tab>en_US;English (United States)
  */
-RegExp _sysInfoRegex = new RegExp(r"System Locale:\s+(\w\w-\w+);");
+RegExp sysInfoRegex = new RegExp(r"System Locale:\s+((\w\w;)|(\w\w-\w+;))");
 
 /**
  * Regular expression to match the expected output of reading the defaults
  * database for AppleLanguages on Mac systems.
  * e.g. {
  *     en,
  *     "pt-PT",
  *     ...
  */
-RegExp _appleDefaultsRegex = new RegExp(r'(\w\w_\w+)');
+RegExp _appleDefaultsRegex = new RegExp(r'((\w\w)_\w+)');
 
 /**
  * Check to see if we have a "LANG" environment variable we can use and return
  * it if found. Otherwise return null;
  */
 String _checkEnvironmentVariable() {
   try {
     return Platform.environment['LANG'];
   } catch (e) {};
   return null;
 }
 
 /**
  * Run the "defaults read -g AppleLocale" command and return the output in
  * a future.
  */
 Future _getAppleDefaults() {
   var p = Process.run('defaults', ['read', '-g', 'AppleLocale']);
   var myResult = p.then((result) => _checkResult(result, _appleDefaultsRegex));
   return myResult;
 }
 
 /**
  * Run the "systemlocale" command and return the output in a future.
  */
 Future _getWindowsSystemInfo() {
   var p = Process.run('systeminfo', []);
-  var myResult = p.then((result) => _checkResult(result, _sysInfoRegex));
+  var myResult = p.then((result) => _checkResult(result, sysInfoRegex));
   return myResult;
 }
 
 /**
  * Given [result], find its text and extract the locale from it using
  * [regex], and set it as the system locale. If the process didn't run correctly
  * then don't set the variable and return a future that completes with null.
  */
 Future<String> _checkResult(ProcessResult result, RegExp regex) {
   if (result.exitCode != 0) return new Future.immediate(null);
   var match = regex.firstMatch(result.stdout);
   if (match == null) return new Future.immediate(null);
   var locale = match.group(1);
   _setLocale(locale);
   return new Future.immediate(locale);
 }
 
 /**
  * Set [Intl.systemLocale] to be the canonicalizedLocale of [aLocale].
  */
 Future<String> _setLocale(aLocale) {
   Intl.systemLocale = Intl.canonicalizedLocale(aLocale);
   return new Future.immediate(Intl.systemLocale);
 }