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/fr-ch | |
parent | 70db7424e7068701e60cc5bcdfe8f858be508179 (diff) | |
parent | c670a80ddd9b03bd4ea6d940a9ed682fd26248d7 (diff) |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'lib/dojo/cldr/nls/fr-ch')
-rw-r--r-- | lib/dojo/cldr/nls/fr-ch/gregorian.js | 2 | ||||
-rw-r--r-- | lib/dojo/cldr/nls/fr-ch/gregorian.js.uncompressed.js | 9 | ||||
-rw-r--r-- | lib/dojo/cldr/nls/fr-ch/number.js | 2 | ||||
-rw-r--r-- | lib/dojo/cldr/nls/fr-ch/number.js.uncompressed.js | 9 |
4 files changed, 20 insertions, 2 deletions
diff --git a/lib/dojo/cldr/nls/fr-ch/gregorian.js b/lib/dojo/cldr/nls/fr-ch/gregorian.js index 9615b4491..2bb8f7400 100644 --- a/lib/dojo/cldr/nls/fr-ch/gregorian.js +++ b/lib/dojo/cldr/nls/fr-ch/gregorian.js @@ -1,5 +1,5 @@ /* - 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 */ diff --git a/lib/dojo/cldr/nls/fr-ch/gregorian.js.uncompressed.js b/lib/dojo/cldr/nls/fr-ch/gregorian.js.uncompressed.js new file mode 100644 index 000000000..e5d47dd14 --- /dev/null +++ b/lib/dojo/cldr/nls/fr-ch/gregorian.js.uncompressed.js @@ -0,0 +1,9 @@ +define( +"dojo/cldr/nls/fr-ch/gregorian", //begin v1.x content +{ + "timeFormat-full": "HH.mm:ss 'h' zzzz", + "dateFormat-full": "EEEE, d MMMM y", + "dateFormat-short": "dd.MM.yy" +} +//end v1.x content +);
\ No newline at end of file diff --git a/lib/dojo/cldr/nls/fr-ch/number.js b/lib/dojo/cldr/nls/fr-ch/number.js index 8fb691cdb..2630e51d7 100644 --- a/lib/dojo/cldr/nls/fr-ch/number.js +++ b/lib/dojo/cldr/nls/fr-ch/number.js @@ -1,5 +1,5 @@ /* - 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 */ diff --git a/lib/dojo/cldr/nls/fr-ch/number.js.uncompressed.js b/lib/dojo/cldr/nls/fr-ch/number.js.uncompressed.js new file mode 100644 index 000000000..25743295d --- /dev/null +++ b/lib/dojo/cldr/nls/fr-ch/number.js.uncompressed.js @@ -0,0 +1,9 @@ +define( +"dojo/cldr/nls/fr-ch/number", //begin v1.x content +{ + "currencyFormat": "¤ #,##0.00;¤-#,##0.00", + "group": "'", + "decimal": "." +} +//end v1.x content +);
\ No newline at end of file |