added some comments

diff --git a/moment.js b/moment.js
index f57c1214203bf20884d11a1c4682c292b9e17f96..82b6ec31511bac389355ae07eca7e7767de72d22 100644 (file)
--- a/moment.js
+++ b/moment.js
@@ -691,6 +691,9 @@
             key = [key];
         }
 
+        //pick the language from the array
+        //try ['en-au', 'en-gb'] as 'en-au', 'en-gb', 'en', as in move through the list trying each
+        //substring from most specific to least, but move to the next array item if it's a more specific variant than the current root
         while (i < key.length) {
             split = normalizeLanguage(key[i]).split('-');
             j = split.length;

diff --git a/test/moment/lang.js b/test/moment/lang.js
index b0d4654ad092df1f1255577bc12e3cea405ab95e..6e42cc13fb1ebe600844d139a142534d4a7b6144 100644 (file)
--- a/test/moment/lang.js
+++ b/test/moment/lang.js
@@ -51,6 +51,7 @@ exports.lang = {
         test.equals(moment.lang(['fake-CA', 'fake-MX', 'fr']), 'fr', "always find something if possible");
         test.equals(moment.lang(['fake-CA', 'fake-MX', 'fr']), 'fr', "always find something if possible");
         test.equals(moment.lang(['fake-CA', 'fake-MX', 'fr-fake-fake-fake']), 'fr', "always find something if possible");
+        test.equals(moment.lang(['en', 'en-CA']), 'en', "prefer earlier if it works");
         test.done();
     },