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-gb/japanese.js | |
| parent | ab235fc5f13385a690a1ed31ae77d0006c85197d (diff) | |
| parent | 1c4f5e83900fdd71a84f2e142c694c75106bef53 (diff) | |
Merge branch 'dojo-1.12.1'
Conflicts:
js/prefs.js
Diffstat (limited to 'lib/dojo/cldr/nls/en-gb/japanese.js')
| -rw-r--r-- | lib/dojo/cldr/nls/en-gb/japanese.js | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/lib/dojo/cldr/nls/en-gb/japanese.js b/lib/dojo/cldr/nls/en-gb/japanese.js new file mode 100644 index 000000000..cdf6fcf14 --- /dev/null +++ b/lib/dojo/cldr/nls/en-gb/japanese.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-gb/japanese",{"dateFormat-short":"dd/MM/y GGGGG","dateFormat-medium":"d MMM y G","dateFormat-long":"d MMMM y G","field-dayperiod":"am/pm","dateFormat-full":"EEEE, d MMMM y G"});
\ No newline at end of file |