Remove prefixes on Intl.message calls within Intl.dart

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.
  *
  * ## Installing ##
@@ skipping 231 matching lines @@
    * as part of an `Intl.message` text that is to be translated.
    * Selects the correct plural form from
    * the provided alternatives. The [other] named argument is mandatory.
    */
   static String plural(int howMany, {zero, one, two, few, many, other,
       desc, examples, locale, name, args}) {
     // If we are passed a name and arguments, then we are operating as a
     // top-level message, so look up our translation by calling Intl.message
     // with ourselves as an argument.
     if (name != null) {
-      return Intl.message(
-        Intl.plural(howMany,
+      return message(
+        plural(howMany,
             zero: zero, one: one, two: two, few: few, many: many, other: other),
         name: name,
         args: args,
         locale: locale);
     }
     if (other == null) {
       throw new ArgumentError("The 'other' named argument must be provided");
     }
     // TODO(alanknight): This algorithm needs to be locale-dependent.
     switch (howMany) {
       case 0 : return (zero == null) ? other : zero;
       case 1 : return (one == null) ? other : one;
       case 2: return (two == null) ? ((few == null) ? other : few) : two;
       default:
         if (howMany == 3 || howMany == 4 && few != null) return few;
         if (howMany > 10 && howMany < 100 && many != null) return many;
         return other;
     }
     throw new ArgumentError("Invalid plural usage for $howMany");
   }
 
   /**
-   * Format a message differently depending on [gender]. Normally used as part
+   * Format a message differently depending on [targetGender]. Normally used as part

[Emily Fortuna, 2013/08/15 21:59:12]

80 char

[Alan Knight, 2013/08/15 22:27:32]

Done.

    * of an Intl.message message that is to be translated.
    */
-  static String gender(String gender,
+  static String gender(String targetGender,
       {String male, String female, String other,
        String desc, Map examples, String locale, String name,
        List<String>args}) {
     // If we are passed a name and arguments, then we are operating as a
     // top-level message, so look up our translation by calling Intl.message
     // with ourselves as an argument.
     if (name != null) {
-      return Intl.message(
-        Intl.gender(gender, male: male, female: female, other: other),
+      return message(
+        gender(targetGender, male: male, female: female, other: other),
         name: name,
         args: args,
         locale: locale);
     }
 
     if (other == null) {
       throw new ArgumentError("The 'other' named argument must be specified");
     }
-    switch(gender) {
+    switch(targetGender) {
       case "female" : return female == null ? other : female;
       case "male" : return male == null ? other : male;
       default: return other;
     }
   }
 
   /**
    * Format a message differently depending on [choice]. We look up the value
    * of [choice] in [cases] and return the result, or an empty string if
    * it is not found. Normally used as part
    * of an Intl.message message that is to be translated.
    */
   static String select(String choice, Map<String, String> cases,
        {String desc, Map examples, String locale, String name,
        List<String>args}) {
     // If we are passed a name and arguments, then we are operating as a
     // top-level message, so look up our translation by calling Intl.message
     // with ourselves as an argument.
     if (name != null) {
-      return Intl.message(
-          Intl.select(choice, cases),
+      return message(
+          select(choice, cases),
           name: name,
           args: args,
           locale: locale);
     }
     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;
@@ skipping 27 matching lines @@
    * 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)";
 }