Big merge from experimental to bleeding edge.

pkg/intl/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.
  *
  * 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` directory.
  */
 library intl;
 
+import 'dart:async';
 import 'src/intl_helpers.dart';
 import 'dart:math';
 import 'date_symbols.dart';
 import 'src/date_format_internal.dart';
 
 part 'date_format.dart';
 part 'src/date_format_field.dart';
 part 'src/date_format_helpers.dart';
 part 'bidi_formatter.dart';
 part 'bidi_utils.dart';
@@ skipping 91 matching lines @@
    * The values of [desc] and [examples] are not used at run-time but are only
    * made available to the translators, so they MUST be simple Strings available
    * at compile time: no String interpolation or concatenation.
    * The expected usage of this is inside a function that takes as parameters
    * the variables used in the interpolated string, and additionally also a
    * locale (optional).
    * Ultimately, the information about the enclosing function and its arguments
    * will be extracted automatically but for the time being it must be passed
    * explicitly in the [name] and [args] arguments.
    */
-  static String message(String message_str, {final String desc: '',
+  static Future<String> message(String message_str, {final String desc: '',
       final Map examples: const {}, String locale, String name,
       List<String> args}) {
     return messageLookup.lookupMessage(
         message_str, desc, examples, locale, name, args);
   }
 
   /**
    * Return the locale for this instance. If none was set, the locale will
    * be the default.
    */
@@ skipping 122 matching lines @@
 
   /**
    * 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;
   }
-}
+}