diff options
| author | Andrew Dolgov <[email protected]> | 2017-01-21 21:59:17 +0300 |
|---|---|---|
| committer | Andrew Dolgov <[email protected]> | 2017-01-21 21:59:17 +0300 |
| commit | e2e2479984b3aaadb4c0947e5ec15276e5c9a337 (patch) | |
| tree | 1662c1772cbcb6e44d017cea28e35d45de44921f /lib/dojo/cldr/nls/en-ca | |
| parent | ab235fc5f13385a690a1ed31ae77d0006c85197d (diff) | |
| parent | 1c4f5e83900fdd71a84f2e142c694c75106bef53 (diff) | |
Merge branch 'dojo-1.12.1'
Conflicts:
js/prefs.js
Diffstat (limited to 'lib/dojo/cldr/nls/en-ca')
| -rw-r--r-- | lib/dojo/cldr/nls/en-ca/currency.js | 2 | ||||
| -rw-r--r-- | lib/dojo/cldr/nls/en-ca/generic.js | 8 | ||||
| -rw-r--r-- | lib/dojo/cldr/nls/en-ca/gregorian.js | 4 |
3 files changed, 11 insertions, 3 deletions
diff --git a/lib/dojo/cldr/nls/en-ca/currency.js b/lib/dojo/cldr/nls/en-ca/currency.js index dffc2b8ef..f9ed0cd31 100644 --- a/lib/dojo/cldr/nls/en-ca/currency.js +++ b/lib/dojo/cldr/nls/en-ca/currency.js @@ -1,5 +1,5 @@ /* - Copyright (c) 2004-2012, The Dojo Foundation All Rights Reserved. + Copyright (c) 2004-2016, The JS Foundation All Rights Reserved. Available via Academic Free License >= 2.1 OR the modified BSD license. see: http://dojotoolkit.org/license for details */ diff --git a/lib/dojo/cldr/nls/en-ca/generic.js b/lib/dojo/cldr/nls/en-ca/generic.js new file mode 100644 index 000000000..6b5b8656a --- /dev/null +++ b/lib/dojo/cldr/nls/en-ca/generic.js @@ -0,0 +1,8 @@ +/* + Copyright (c) 2004-2016, The JS Foundation All Rights Reserved. + Available via Academic Free License >= 2.1 OR the modified BSD license. + see: http://dojotoolkit.org/license for details +*/ + +//>>built +define("dojo/cldr/nls/en-ca/generic",{"dateFormatItem-yyyyMEd":"E, GGGGG y-MM-dd","dateFormat-short":"GGGGG y-MM-dd","dateFormatItem-yyyyM":"GGGGG y-MM","dateFormatItem-MEd":"E, MM-dd","dateFormatItem-Md":"MM-dd","dateFormatItem-yyyyMd":"GGGGG y-MM-dd"});
\ No newline at end of file diff --git a/lib/dojo/cldr/nls/en-ca/gregorian.js b/lib/dojo/cldr/nls/en-ca/gregorian.js index 372bf99eb..3bfaf363e 100644 --- a/lib/dojo/cldr/nls/en-ca/gregorian.js +++ b/lib/dojo/cldr/nls/en-ca/gregorian.js @@ -1,8 +1,8 @@ /* - Copyright (c) 2004-2012, The Dojo Foundation All Rights Reserved. + Copyright (c) 2004-2016, The JS Foundation All Rights Reserved. Available via Academic Free License >= 2.1 OR the modified BSD license. see: http://dojotoolkit.org/license for details */ //>>built -define("dojo/cldr/nls/en-ca/gregorian",{"dateFormatItem-MMMMEd":"E, MMMM d","dateFormatItem-MMdd":"MM/dd","dateFormatItem-yyMMM":"MMM yy","dateFormatItem-MMMMd":"MMMM d"});
\ No newline at end of file +define("dojo/cldr/nls/en-ca/gregorian",{"dateFormatItem-yMEd":"E, y-MM-dd","dateFormatItem-yMd":"y-MM-dd","dateFormat-short":"y-MM-dd","dateFormatItem-MEd":"E, MM-dd","dateFormatItem-yM":"y-MM","dateFormatItem-Md":"MM-dd"});
\ No newline at end of file |