Merge branch 'licensing' of https://github.com/drewfish/Intl.js into drewfish-licensing

Conflicts:
	README.md

Author: andyearnshaw

LICENSE.txt

@@ -0,0 +1,66 @@
+The MIT License (MIT)
+
+Copyright (c) 2013 Andy Earnshaw
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+
+
+------------------------------------------------------------------------------
+Contents of the `locale-data` directory are a modified form of the Unicode CLDR
+data found at http://www.unicode.org/cldr/data/.  It comes with the following
+license.
+
+COPYRIGHT AND PERMISSION NOTICE
+
+Copyright (c) 1991-2013 Unicode, Inc. All rights reserved. Distributed under
+the Terms of Use in http://www.unicode.org/copyright.html.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+the Unicode data files and any associated documentation (the "Data Files") or
+Unicode software and any associated documentation (the "Software") to deal in
+the Data Files or Software without restriction, including without limitation
+the rights to use, copy, modify, merge, publish, distribute, and/or sell copies
+of the Data Files or Software, and to permit persons to whom the Data Files or
+Software are furnished to do so, provided that (a) the above copyright
+notice(s) and this permission notice appear with all copies of the Data Files
+or Software, (b) both the above copyright notice(s) and this permission notice
+appear in associated documentation, and (c) there is clear notice in each
+modified Data File or in the Software as well as in the documentation
+associated with the Data File(s) or Software that the data or software has been
+modified.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD
+PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN
+THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
+WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
+OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THE DATA FILES OR
+SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder shall not be
+used in advertising or otherwise to promote the sale, use or other dealings in
+these Data Files or Software without prior written authorization of the
+copyright holder.
+
+Unicode and the Unicode logo are trademarks of Unicode, Inc. in the United
+States and other countries. All third party trademarks referenced herein are
+the property of their respective owners.
+

README.md

@@ -97,3 +97,25 @@ Contribute
 See the [CONTRIBUTING file][] for info.
 
 [CONTRIBUTING file]: https://github.com/andyearnshaw/Intl.js/blob/master/CONTRIBUTING.md
+=======
+Contents of the `locale-data` directory are a modified form of the Unicode CLDR
+data found at http://www.unicode.org/cldr/data/.  See the `LICENSE.txt` file
+accompanying this software for terms of use.
+
+
+### Rebuilding
+
+* Visit http://cldr.unicode.org/index/downloads and choose a version, for example http://unicode.org/Public/cldr/23.1/.
+* Download `core.zip` and `tools.zip` to a folder/directory.
+* Unzip the zip files.
+    * (On a mac be sure the use the commandline `unzip` utility, as the Finder will do the wrong thing.)
+* Run `node tools/Ldml2Json.js <folder>` where `<folder>` is the location where you downloaded and unzipped the zip files.
+* TOOD... next steps...
+
+
+## License
+
+Copyright (c) 2013 Andy Earnshaw
+
+This software is licensed under the MIT license.  See the `LICENSE.txt` file
+accompanying this software for terms of use.

tools/getIntlData.js

@@ -5,7 +5,7 @@
  * Downloads and parses the IANA Language Subtag Registry into a JavaScript object that can
  * be used for mapping.
  *
- * http://www.iana.org/assignments/language-subtag-registry
+ * http://www.iana.org/assignments/language-subtag-registry/language-subtag-registry
  *
  * Also downloads the current currency & funds code list, Table A.1 of ISO 4217
  * and parses the code and minor unit value into a JavaScript object.
@@ -37,7 +37,7 @@ function getIANA () {
     var
         httpOpts = {
             host: 'www.iana.org',
-            path: '/assignments/language-subtag-registry'
+            path: '/assignments/language-subtag-registry/language-subtag-registry'
         },
         req = http.request(httpOpts, function (res) {
             var txt = '';