Allow Intl.plural/gender as the top-level, omitting the Intl.message wrapper and the first layer of…

pkg/intl/test/message_extraction/sample_with_messages.dart

 // Copyright (c) 2013, 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 is a program with various [Intl.message] messages. It just prints
  * all of them, and is used for testing of message extraction, translation,
  * and code generation.
  */
 library sample;
@@ skipping 50 matching lines @@
 // This is invalid and should be recognized as such, because the message has
 // to be a literal. Otherwise, interpolations would be outside of the function
 // scope.
 var someString = "No, it has to be a literal string";
 noVariables() => Intl.message(someString, name: "noVariables");
 
 // This is unremarkable in English, but the translated versions will contain
 // characters that ought to be escaped during code generation.
 escapable() => Intl.message("Escapable characters here: ", name: "escapable");
 
+outerPlural(n) => Intl.plural(n, zero: 'none', one: 'one', other: 'some',
+    name: 'outerPlural', desc: 'A plural with no enclosing message', args: [n]);
+
+outerGender(g) => Intl.gender(g, male: 'm', female: 'f', other: 'o',
+    name: 'outerGender', desc: 'A gender with no enclosing message', args: [g]);
+
+// A standalone gender message where we don't provide name or args. This should
+// be rejected by validation code.
+invalidOuterGender(g) => Intl.gender(g, other: 'o');
+
+// A trivial nested plural/gender where both are done directly rather than
+// in interpolations.
+nestedOuter(number, gen) => Intl.plural(number,
+    other: Intl.gender(gen, male: "$number male", other: "$number other"),
+    name: 'nestedOuter',
+    args: [number, gen]);
+
 printStuff(Intl locale) {
 
   // Use a name that's not a literal so this will get skipped. Then we have
   // a name that's not in the original but we include it in the French
   // translation. Because it's not in the original it shouldn't get included
   // in the generated catalog and shouldn't get translated.
   if (locale.locale == 'fr') {
     var badName = "thisNameIsNotInTheOriginal";
     var notInOriginal = Intl.message("foo", name: badName);
     if (notInOriginal != "foo") {
@@ skipping 37 matching lines @@
     var bob = new Person("Bob", "male");
     var cat = new Person("cat", null);
     print(thing.whereTheyWent(alice, "house"));
     print(thing.whereTheyWent(bob, "house"));
     print(thing.whereTheyWent(cat, "litter box"));
     print(thing.nested([alice, bob], "magasin"));
     print(thing.nested([alice], "magasin"));
     print(thing.nested([], "magasin"));
     print(thing.nested([bob, bob], "magasin"));
     print(thing.nested([alice, alice], "magasin"));
+
+    print(outerPlural(0));
+    print(outerPlural(1));
+    print(outerGender("male"));
+    print(outerGender("female"));
+    print(nestedOuter(7, "male"));
   });
 }
 
 var localeToUse = 'en_US';
 
 main() {
   var fr = new Intl("fr");
   var english = new Intl("en_US");
   var de = new Intl("de_DE");
   initializeMessages(fr.locale).then((_) => printStuff(fr));
   initializeMessages(de.locale).then((_) => printStuff(de));
   printStuff(english);
 }