Make withLocale use a zone

lib/intl.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 library provides internationalization and localization. This includes
  * message formatting and replacement, date and number formatting and parsing,
  * and utilities for working with Bidirectional text.
  *
  * This is part of the [intl package]
  * (https://pub.dartlang.org/packages/intl).
  *
  * For things that require locale or other data, there are multiple different
  * ways of making that data available, which may require importing different
  * libraries. See the class comments for more details.
  *
  * There is also a simple example application that can be found in the
  * [example/basic](https://github.com/dart-lang/intl/tree/master/example/basic)
  * directory.
  */
 library intl;
 
+import 'dart:async';
 import 'dart:collection';
 import 'dart:convert';
 import 'dart:math';
 
 import 'date_symbols.dart';
 import 'number_symbols.dart';
 import 'number_symbols_data.dart';
 import 'src/date_format_internal.dart';
 import 'src/intl_helpers.dart';
 
@@ skipping 48 matching lines @@
  */
  //TODO(efortuna): documentation example involving the offset parameter?
 
 class Intl {
   /**
    * String indicating the locale code with which the message is to be
    * formatted (such as en-CA).
    */
   String _locale;
 
-  /** The default locale. This defaults to being set from systemLocale, but
+  /**
+   * The default locale. This defaults to being set from systemLocale, but
    * can also be set explicitly, and will then apply to any new instances where
    * the locale isn't specified.
    */
-  static String defaultLocale;
+  static String get defaultLocale {
+    var zoneLocale = Zone.current[#Intl_locale];

[Siggi Cherem (dart-lang), 2015/01/02 20:36:48]

how about #intl.locale? or #IntlLocale ?

[Alan Knight, 2015/01/02 20:50:13]

I had just assumed I couldn't use a period in a symbol. Changed to #Intl.locale

+    return zoneLocale == null ? _defaultLocale: zoneLocale;
+  }
+  static set defaultLocale(String newLocale) => _defaultLocale = newLocale;
+  static String _defaultLocale;
 
   /**
    * The system's locale, as obtained from the window.navigator.language
    * or other operating system mechanism. Note that due to system limitations
    * this is not automatically set, and must be set by importing one of
    * intl_browser.dart or intl_standalone.dart and calling findSystemLocale().
    */
   static String systemLocale = 'en_US';
 
   /**
@@ skipping 228 matching lines @@
     }
     var exact = cases[choice];
     if (exact != null) return exact;
     var other = cases["other"];
     if (other == null)
       throw new ArgumentError("The 'other' case must be specified");
     return other;
   }
 
   /**
-   * Format the given function with a specific [locale], given a
-   * [message_function] that takes no parameters. The [message_function] can be
-   * a simple message function that just returns the result of `Intl.message()`
-   * it can be a wrapper around a message function that takes arguments, or it
-   * can be something more complex that manipulates multiple message
-   * functions.
+   * Run [function] with the default locale set to [locale] and
+   * return the result.
    *
-   * In either case, the purpose of this is to delay calling [message_function]
-   * until the proper locale has been set. This returns the result of calling
-   * [message_function], which could be of an arbitrary type.
+   * This is run in a zone, so async operations invoked
+   * from within [message_function] will still have the locale set.
+   *
+   * The [function] might just returns the result of `Intl.message()` or

[Siggi Cherem (dart-lang), 2015/01/02 20:36:48]

rephrase this paragraph? (grammar seems a bit odd after the restructuring. For
example, returns => return, doing => do)

[Alan Knight, 2015/01/02 20:50:13]

Oops. Cleaned up, and removed some of the explanatory text. The examples are
better than trying to write out an explanation of the possibilities.

+   * doing number or date formatting,
+   * it might be a wrapper around a message function that takes arguments, or it
+   * could be something more complex that invokes a number of formatting or
+   * message operations
+   *
+   * For example
+   *
+   *       Intl.withLocale("fr", () => new NumberFormat.format(123456));
+   *
+   * or
+   *
+   *       hello(name) => Intl.message(
+   *           "Hello $name.",
+   *           name: 'hello',
+   *           args: [name],
+   *           desc: 'Say Hello');
+   *       Intl.withLocale("zh", new Timer(new Duration(milliseconds:10),
+   *           () => print(hello("World")));
    */
-  static withLocale(String locale, Function message_function) {
-    // We have to do this silliness because Locale is not known at compile time,
-    // but must be a static variable in order to be visible to the Intl.message
-    // invocation.
-    var oldLocale = getCurrentLocale();
-    defaultLocale = Intl.canonicalizedLocale(locale);
-    var result = message_function();
-    defaultLocale = oldLocale;
-    return result;
+  static withLocale(String locale, function()) {
+    var canonical = Intl.canonicalizedLocale(locale);
+    return runZoned(function, zoneValues: {#Intl_locale : canonical});
   }
 
   /**
    * Accessor for the current locale. This should always == the default locale,
    * unless for some reason this gets called inside a message that resets the
    * locale.
    */
   static String getCurrentLocale() {
     if (defaultLocale == null) defaultLocale = systemLocale;
     return defaultLocale;
   }
 
   toString() => "Intl($locale)";
 }