diff options
| author | Richard Beales <[email protected]> | 2013-03-18 07:32:01 +0000 |
|---|---|---|
| committer | Richard Beales <[email protected]> | 2013-03-18 07:32:01 +0000 |
| commit | 7c97d17aaf373339a8bcd917ad59ca6018148f0d (patch) | |
| tree | 5a3c04f0f9529be392c1263d3feb75806eb43797 /lib/dojo/cldr/nls/en-gb/gregorian.js | |
| parent | 70db7424e7068701e60cc5bcdfe8f858be508179 (diff) | |
| parent | c670a80ddd9b03bd4ea6d940a9ed682fd26248d7 (diff) | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'lib/dojo/cldr/nls/en-gb/gregorian.js')
| -rw-r--r-- | lib/dojo/cldr/nls/en-gb/gregorian.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/dojo/cldr/nls/en-gb/gregorian.js b/lib/dojo/cldr/nls/en-gb/gregorian.js index 472c7dbeb..b8e2461be 100644 --- a/lib/dojo/cldr/nls/en-gb/gregorian.js +++ b/lib/dojo/cldr/nls/en-gb/gregorian.js @@ -1,8 +1,8 @@ /* - Copyright (c) 2004-2011, The Dojo Foundation All Rights Reserved. + Copyright (c) 2004-2012, The Dojo 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/gregorian",{"dateFormatItem-yyMMM":"MMM yy","dateFormatItem-Md":"d/M","dateFormatItem-yMEd":"EEE, d/M/yyyy","timeFormat-full":"HH:mm:ss zzzz","timeFormat-medium":"HH:mm:ss","dateFormatItem-yyyyMMMM":"MMMM y","dateFormatItem-MEd":"E, d/M","dateFormat-medium":"d MMM y","dateFormatItem-MMdd":"dd/MM","dateFormatItem-yyyyMM":"MM/yyyy","dateFormat-full":"EEEE, d MMMM y","timeFormat-long":"HH:mm:ss z","timeFormat-short":"HH:mm","dateFormat-short":"dd/MM/yyyy","dateFormatItem-MMMMd":"d MMMM","dateFormat-long":"d MMMM y","dateFormatItem-MMMEd":"E d MMM"});
\ No newline at end of file +define("dojo/cldr/nls/en-gb/gregorian",{"dateFormatItem-yM":"MM/y","field-dayperiod":"am/pm","dayPeriods-format-wide-pm":"pm","dateFormatItem-yQ":"Q y","dateFormatItem-MMMEd":"E d MMM","dateTimeFormat-full":"{1} {0}","dateFormatItem-hms":"h:mm:ss a","dateFormatItem-MMdd":"dd/MM","dateFormatItem-yQQQ":"QQQ y","dateFormatItem-MMM":"LLL","dateTimeFormat-short":"{1} {0}","dayPeriods-format-wide-am":"am","dateTimeFormat-medium":"{1} {0}","dateFormatItem-y":"y","timeFormat-full":"HH:mm:ss zzzz","dateFormatItem-Ed":"E d","dateFormatItem-yMMM":"MMM y","dateFormatItem-yyyyMM":"MM/yyyy","dateFormatItem-yyyyMMMM":"MMMM y","dateFormat-long":"d MMMM y","timeFormat-medium":"HH:mm:ss","dateFormatItem-Ehm":"E h:mm a","dateFormatItem-Hm":"HH:mm","dateFormat-medium":"d MMM y","dateFormatItem-Hms":"HH:mm:ss","dateFormatItem-yyMMM":"MMM yy","dateFormatItem-yMd":"dd/MM/yyyy","dateFormatItem-ms":"mm:ss","dateTimeFormat-long":"{1} {0}","dateFormatItem-MMMd":"d MMM","dateFormatItem-Ehms":"E h:mm:ss a","timeFormat-long":"HH:mm:ss z","timeFormat-short":"HH:mm","dateFormatItem-H":"HH","dateFormatItem-MMMMd":"d MMMM","dateFormatItem-M":"LL","dateFormatItem-yMMMd":"d MMM y","dateFormatItem-MEd":"E dd/MM","dateFormatItem-hm":"h:mm a","dateFormat-short":"dd/MM/yyyy","dateFormatItem-yMMMEd":"E, d MMM y","dateFormat-full":"EEEE, d MMMM y","dateFormatItem-EHms":"E HH:mm:ss","dateFormatItem-Md":"dd/MM","dateFormatItem-EHm":"E HH:mm","dateFormatItem-yMEd":"E, dd/MM/yyyy","dateFormatItem-d":"d","dateFormatItem-h":"h a"});
\ No newline at end of file |