Skip to content

Commit 7619e59

Browse files
oestrogenjquense
oestrogen
authored and
jquense
committed
feat: bigcalendar#1390 use en dashes in ranges (bigcalendar#1391)
1 parent 9c81e9e commit 7619e59

6 files changed

Lines changed: 49 additions & 49 deletions

File tree

‎examples/bundle.js‎

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -5682,7 +5682,7 @@ object-assign
56825682
r = e.end
56835683
return (
56845684
t.format(o, { time: 'short' }, n) +
5685-
' — ' +
5685+
' – ' +
56865686
t.format(r, { time: 'short' }, n)
56875687
)
56885688
}),
@@ -5694,11 +5694,11 @@ object-assign
56945694
eventTimeRangeFormat: l,
56955695
eventTimeRangeStartFormat: function(e, n, t) {
56965696
var o = e.start
5697-
return t.format(o, { time: 'short' }, n) + ' — '
5697+
return t.format(o, { time: 'short' }, n) + ' – '
56985698
},
56995699
eventTimeRangeEndFormat: function(e, n, t) {
57005700
var o = e.end
5701-
return ' — ' + t.format(o, { time: 'short' }, n)
5701+
return ' – ' + t.format(o, { time: 'short' }, n)
57025702
},
57035703
timeGutterFormat: { time: 'short' },
57045704
monthHeaderFormat: 'MMMM yyyy',
@@ -5708,7 +5708,7 @@ object-assign
57085708
a = e.end
57095709
return (
57105710
t.format(o, 'MMM dd', n) +
5711-
' — ' +
5711+
' – ' +
57125712
t.format(a, r.default.eq(o, a, 'month') ? 'dd' : 'MMM dd', n)
57135713
)
57145714
},
@@ -5717,7 +5717,7 @@ object-assign
57175717
r = e.end
57185718
return (
57195719
t.format(o, { date: 'short' }, n) +
5720-
' — ' +
5720+
' – ' +
57215721
t.format(r, { date: 'short' }, n)
57225722
)
57235723
},
@@ -9989,18 +9989,18 @@ object-assign
99899989
name: 'custom',
99909990
raw: 'dateRangeFormat',
99919991
description:
9992-
'Toolbar header format for the Week views, e.g. "Mar 29 - Apr 04"',
9992+
'Toolbar header format for the Week views, e.g. "Mar 29 – Apr 04"',
99939993
required: !1,
99949994
},
99959995
description:
9996-
'Toolbar header format for the Week views, e.g. "Mar 29 - Apr 04"',
9996+
'Toolbar header format for the Week views, e.g. "Mar 29 – Apr 04"',
99979997
required: !1,
99989998
name: 'dayRangeHeaderFormat',
99999999
docblock:
10000-
'Toolbar header format for the Week views, e.g. "Mar 29 - Apr 04"',
10000+
'Toolbar header format for the Week views, e.g. "Mar 29 – Apr 04"',
1000110001
doclets: {},
1000210002
descriptionHtml:
10003-
'<p>Toolbar header format for the Week views, e.g. &quot;Mar 29 - Apr 04&quot;</p>\n',
10003+
'<p>Toolbar header format for the Week views, e.g. &quot;Mar 29 – Apr 04&quot;</p>\n',
1000410004
},
1000510005
dayHeaderFormat: {
1000610006
type: {
@@ -10025,36 +10025,36 @@ object-assign
1002510025
name: 'custom',
1002610026
raw: 'dateRangeFormat',
1002710027
description:
10028-
'Toolbar header format for the Agenda view, e.g. "4/1/2015 — 5/1/2015"',
10028+
'Toolbar header format for the Agenda view, e.g. "4/1/2015 – 5/1/2015"',
1002910029
required: !1,
1003010030
},
1003110031
description:
10032-
'Toolbar header format for the Agenda view, e.g. "4/1/2015 — 5/1/2015"',
10032+
'Toolbar header format for the Agenda view, e.g. "4/1/2015 – 5/1/2015"',
1003310033
required: !1,
1003410034
name: 'agendaHeaderFormat',
1003510035
docblock:
10036-
'Toolbar header format for the Agenda view, e.g. "4/1/2015 — 5/1/2015"',
10036+
'Toolbar header format for the Agenda view, e.g. "4/1/2015 – 5/1/2015"',
1003710037
doclets: {},
1003810038
descriptionHtml:
10039-
'<p>Toolbar header format for the Agenda view, e.g. &quot;4/1/2015 — 5/1/2015&quot;</p>\n',
10039+
'<p>Toolbar header format for the Agenda view, e.g. &quot;4/1/2015 – 5/1/2015&quot;</p>\n',
1004010040
},
1004110041
selectRangeFormat: {
1004210042
type: {
1004310043
name: 'custom',
1004410044
raw: 'dateRangeFormat',
1004510045
description:
10046-
'A time range format for selecting time slots, e.g "8:00am — 2:00pm"',
10046+
'A time range format for selecting time slots, e.g "8:00am – 2:00pm"',
1004710047
required: !1,
1004810048
},
1004910049
description:
10050-
'A time range format for selecting time slots, e.g "8:00am — 2:00pm"',
10050+
'A time range format for selecting time slots, e.g "8:00am – 2:00pm"',
1005110051
required: !1,
1005210052
name: 'selectRangeFormat',
1005310053
docblock:
10054-
'A time range format for selecting time slots, e.g "8:00am — 2:00pm"',
10054+
'A time range format for selecting time slots, e.g "8:00am – 2:00pm"',
1005510055
doclets: {},
1005610056
descriptionHtml:
10057-
'<p>A time range format for selecting time slots, e.g &quot;8:00am — 2:00pm&quot;</p>\n',
10057+
'<p>A time range format for selecting time slots, e.g &quot;8:00am – 2:00pm&quot;</p>\n',
1005810058
},
1005910059
agendaDateFormat: {
1006010060
type: { name: 'custom', raw: 'dateFormat', required: !1 },
@@ -10141,13 +10141,13 @@ object-assign
1014110141
},
1014210142
required: !1,
1014310143
description:
10144-
"Localizer specific formats, tell the Calendar how to format and display dates.\n\n`format` types are dependent on the configured localizer; both Moment and Globalize\naccept strings of tokens according to their own specification, such as: `'DD mm yyyy'`.\n\n```jsx\nlet formats = {\n dateFormat: 'dd',\n\n dayFormat: (date, , localizer) =>\n localizer.format(date, 'DDD', culture),\n\n dayRangeHeaderFormat: ({ start, end }, culture, localizer) =>\n localizer.format(start, { date: 'short' }, culture) + ' — ' +\n localizer.format(end, { date: 'short' }, culture)\n}\n\n<Calendar formats={formats} />\n```\n\nAll localizers accept a function of\nthe form `(date: Date, culture: ?string, localizer: Localizer) -> string`",
10144+
"Localizer specific formats, tell the Calendar how to format and display dates.\n\n`format` types are dependent on the configured localizer; both Moment and Globalize\naccept strings of tokens according to their own specification, such as: `'DD mm yyyy'`.\n\n```jsx\nlet formats = {\n dateFormat: 'dd',\n\n dayFormat: (date, , localizer) =>\n localizer.format(date, 'DDD', culture),\n\n dayRangeHeaderFormat: ({ start, end }, culture, localizer) =>\n localizer.format(start, { date: 'short' }, culture) + ' – ' +\n localizer.format(end, { date: 'short' }, culture)\n}\n\n<Calendar formats={formats} />\n```\n\nAll localizers accept a function of\nthe form `(date: Date, culture: ?string, localizer: Localizer) -> string`",
1014510145
name: 'formats',
1014610146
docblock:
10147-
"Localizer specific formats, tell the Calendar how to format and display dates.\n\n`format` types are dependent on the configured localizer; both Moment and Globalize\naccept strings of tokens according to their own specification, such as: `'DD mm yyyy'`.\n\n```jsx\nlet formats = {\n dateFormat: 'dd',\n\n dayFormat: (date, , localizer) =>\n localizer.format(date, 'DDD', culture),\n\n dayRangeHeaderFormat: ({ start, end }, culture, localizer) =>\n localizer.format(start, { date: 'short' }, culture) + ' — ' +\n localizer.format(end, { date: 'short' }, culture)\n}\n\n<Calendar formats={formats} />\n```\n\nAll localizers accept a function of\nthe form `(date: Date, culture: ?string, localizer: Localizer) -> string`",
10147+
"Localizer specific formats, tell the Calendar how to format and display dates.\n\n`format` types are dependent on the configured localizer; both Moment and Globalize\naccept strings of tokens according to their own specification, such as: `'DD mm yyyy'`.\n\n```jsx\nlet formats = {\n dateFormat: 'dd',\n\n dayFormat: (date, , localizer) =>\n localizer.format(date, 'DDD', culture),\n\n dayRangeHeaderFormat: ({ start, end }, culture, localizer) =>\n localizer.format(start, { date: 'short' }, culture) + ' – ' +\n localizer.format(end, { date: 'short' }, culture)\n}\n\n<Calendar formats={formats} />\n```\n\nAll localizers accept a function of\nthe form `(date: Date, culture: ?string, localizer: Localizer) -> string`",
1014810148
doclets: {},
1014910149
descriptionHtml:
10150-
'<p>Localizer specific formats, tell the Calendar how to format and display dates.</p>\n<p><code>format</code> types are dependent on the configured localizer; both Moment and Globalize\naccept strings of tokens according to their own specification, such as: <code>&#39;DD mm yyyy&#39;</code>.</p>\n<pre><code class="lang-jsx"><span class="token keyword">let</span> formats <span class="token operator">=</span> <span class="token punctuation">{</span>\n dateFormat<span class="token punctuation">:</span> <span class="token string">\'dd\'</span><span class="token punctuation">,</span>\n\n <span class="token function-variable function">dayFormat</span><span class="token punctuation">:</span> <span class="token punctuation">(</span><span class="token parameter">date<span class="token punctuation">,</span> <span class="token punctuation">,</span> localizer</span><span class="token punctuation">)</span> <span class="token operator">=></span>\n localizer<span class="token punctuation">.</span><span class="token function">format</span><span class="token punctuation">(</span>date<span class="token punctuation">,</span> <span class="token string">\'DDD\'</span><span class="token punctuation">,</span> culture<span class="token punctuation">)</span><span class="token punctuation">,</span>\n\n <span class="token function-variable function">dayRangeHeaderFormat</span><span class="token punctuation">:</span> <span class="token punctuation">(</span><span class="token parameter"><span class="token punctuation">{</span> start<span class="token punctuation">,</span> end <span class="token punctuation">}</span><span class="token punctuation">,</span> culture<span class="token punctuation">,</span> localizer</span><span class="token punctuation">)</span> <span class="token operator">=></span>\n localizer<span class="token punctuation">.</span><span class="token function">format</span><span class="token punctuation">(</span>start<span class="token punctuation">,</span> <span class="token punctuation">{</span> date<span class="token punctuation">:</span> <span class="token string">\'short\'</span> <span class="token punctuation">}</span><span class="token punctuation">,</span> culture<span class="token punctuation">)</span> <span class="token operator">+</span> <span class="token string">\' — \'</span> <span class="token operator">+</span>\n localizer<span class="token punctuation">.</span><span class="token function">format</span><span class="token punctuation">(</span>end<span class="token punctuation">,</span> <span class="token punctuation">{</span> date<span class="token punctuation">:</span> <span class="token string">\'short\'</span> <span class="token punctuation">}</span><span class="token punctuation">,</span> culture<span class="token punctuation">)</span>\n<span class="token punctuation">}</span>\n\n<span class="token tag"><span class="token tag"><span class="token punctuation">&lt;</span>Calendar</span> <span class="token attr-name">formats</span><span class="token script language-javascript"><span class="token punctuation">=</span><span class="token punctuation">{</span>formats<span class="token punctuation">}</span></span> <span class="token punctuation">/></span></span>\n</code></pre>\n<p>All localizers accept a function of\nthe form <code>(date: Date, culture: ?string, localizer: Localizer) -&gt; string</code></p>\n',
10150+
'<p>Localizer specific formats, tell the Calendar how to format and display dates.</p>\n<p><code>format</code> types are dependent on the configured localizer; both Moment and Globalize\naccept strings of tokens according to their own specification, such as: <code>&#39;DD mm yyyy&#39;</code>.</p>\n<pre><code class="lang-jsx"><span class="token keyword">let</span> formats <span class="token operator">=</span> <span class="token punctuation">{</span>\n dateFormat<span class="token punctuation">:</span> <span class="token string">\'dd\'</span><span class="token punctuation">,</span>\n\n <span class="token function-variable function">dayFormat</span><span class="token punctuation">:</span> <span class="token punctuation">(</span><span class="token parameter">date<span class="token punctuation">,</span> <span class="token punctuation">,</span> localizer</span><span class="token punctuation">)</span> <span class="token operator">=></span>\n localizer<span class="token punctuation">.</span><span class="token function">format</span><span class="token punctuation">(</span>date<span class="token punctuation">,</span> <span class="token string">\'DDD\'</span><span class="token punctuation">,</span> culture<span class="token punctuation">)</span><span class="token punctuation">,</span>\n\n <span class="token function-variable function">dayRangeHeaderFormat</span><span class="token punctuation">:</span> <span class="token punctuation">(</span><span class="token parameter"><span class="token punctuation">{</span> start<span class="token punctuation">,</span> end <span class="token punctuation">}</span><span class="token punctuation">,</span> culture<span class="token punctuation">,</span> localizer</span><span class="token punctuation">)</span> <span class="token operator">=></span>\n localizer<span class="token punctuation">.</span><span class="token function">format</span><span class="token punctuation">(</span>start<span class="token punctuation">,</span> <span class="token punctuation">{</span> date<span class="token punctuation">:</span> <span class="token string">\'short\'</span> <span class="token punctuation">}</span><span class="token punctuation">,</span> culture<span class="token punctuation">)</span> <span class="token operator">+</span> <span class="token string">\' – \'</span> <span class="token operator">+</span>\n localizer<span class="token punctuation">.</span><span class="token function">format</span><span class="token punctuation">(</span>end<span class="token punctuation">,</span> <span class="token punctuation">{</span> date<span class="token punctuation">:</span> <span class="token string">\'short\'</span> <span class="token punctuation">}</span><span class="token punctuation">,</span> culture<span class="token punctuation">)</span>\n<span class="token punctuation">}</span>\n\n<span class="token tag"><span class="token tag"><span class="token punctuation">&lt;</span>Calendar</span> <span class="token attr-name">formats</span><span class="token script language-javascript"><span class="token punctuation">=</span><span class="token punctuation">{</span>formats<span class="token punctuation">}</span></span> <span class="token punctuation">/></span></span>\n</code></pre>\n<p>All localizers accept a function of\nthe form <code>(date: Date, culture: ?string, localizer: Localizer) -&gt; string</code></p>\n',
1015110151
},
1015210152
components: {
1015310153
type: {
@@ -17724,7 +17724,7 @@ object-assign
1772417724
i = function(e, n, t) {
1772517725
var o = e.start,
1772617726
r = e.end
17727-
return t.format(o, 't', n) + ' — ' + t.format(r, 't', n)
17727+
return t.format(o, 't', n) + ' – ' + t.format(r, 't', n)
1772817728
},
1772917729
l = {
1773017730
dateFormat: 'dd',
@@ -17734,11 +17734,11 @@ object-assign
1773417734
eventTimeRangeFormat: i,
1773517735
eventTimeRangeStartFormat: function(e, n, t) {
1773617736
var o = e.start
17737-
return t.format(o, 't', n) + ' — '
17737+
return t.format(o, 't', n) + ' – '
1773817738
},
1773917739
eventTimeRangeEndFormat: function(e, n, t) {
1774017740
var o = e.end
17741-
return ' — ' + t.format(o, 't', n)
17741+
return ' – ' + t.format(o, 't', n)
1774217742
},
1774317743
timeGutterFormat: 't',
1774417744
monthHeaderFormat: 'Y',
@@ -17748,14 +17748,14 @@ object-assign
1774817748
a = e.end
1774917749
return (
1775017750
t.format(o, 'MMM dd', n) +
17751-
' - ' +
17751+
' – ' +
1775217752
t.format(a, r.default.eq(o, a, 'month') ? 'dd' : 'MMM dd', n)
1775317753
)
1775417754
},
1775517755
agendaHeaderFormat: function(e, n, t) {
1775617756
var o = e.start,
1775717757
r = e.end
17758-
return t.format(o, 'd', n) + ' — ' + t.format(r, 'd', n)
17758+
return t.format(o, 'd', n) + ' – ' + t.format(r, 'd', n)
1775917759
},
1776017760
agendaDateFormat: 'ddd MMM dd',
1776117761
agendaTimeFormat: 't',
@@ -22593,7 +22593,7 @@ object-assign
2259322593
i = function(e, n, t) {
2259422594
var o = e.start,
2259522595
r = e.end
22596-
return t.format(o, 'LT', n) + ' — ' + t.format(r, 'LT', n)
22596+
return t.format(o, 'LT', n) + ' – ' + t.format(r, 'LT', n)
2259722597
},
2259822598
l = {
2259922599
dateFormat: 'DD',
@@ -22603,11 +22603,11 @@ object-assign
2260322603
eventTimeRangeFormat: i,
2260422604
eventTimeRangeStartFormat: function(e, n, t) {
2260522605
var o = e.start
22606-
return t.format(o, 'LT', n) + ' — '
22606+
return t.format(o, 'LT', n) + ' – '
2260722607
},
2260822608
eventTimeRangeEndFormat: function(e, n, t) {
2260922609
var o = e.end
22610-
return ' — ' + t.format(o, 'LT', n)
22610+
return ' – ' + t.format(o, 'LT', n)
2261122611
},
2261222612
timeGutterFormat: 'LT',
2261322613
monthHeaderFormat: 'MMMM YYYY',
@@ -22617,14 +22617,14 @@ object-assign
2261722617
a = e.end
2261822618
return (
2261922619
t.format(o, 'MMMM DD', n) +
22620-
' - ' +
22620+
' – ' +
2262122621
t.format(a, r.default.eq(o, a, 'month') ? 'DD' : 'MMMM DD', n)
2262222622
)
2262322623
},
2262422624
agendaHeaderFormat: function(e, n, t) {
2262522625
var o = e.start,
2262622626
r = e.end
22627-
return t.format(o, 'L', n) + ' — ' + t.format(r, 'L', n)
22627+
return t.format(o, 'L', n) + ' – ' + t.format(r, 'L', n)
2262822628
},
2262922629
agendaDateFormat: 'ddd MMM DD',
2263022630
agendaTimeFormat: 'LT',

‎examples/bundle.js.map‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/Calendar.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -550,7 +550,7 @@ class Calendar extends React.Component {
550550
* localizer.format(date, 'DDD', culture),
551551
*
552552
* dayRangeHeaderFormat: ({ start, end }, culture, localizer) =>
553-
* localizer.format(start, { date: 'short' }, culture) + ' — ' +
553+
* localizer.format(start, { date: 'short' }, culture) + ' – ' +
554554
* localizer.format(end, { date: 'short' }, culture)
555555
* }
556556
*
@@ -603,12 +603,12 @@ class Calendar extends React.Component {
603603
dayHeaderFormat: dateFormat,
604604

605605
/**
606-
* Toolbar header format for the Agenda view, e.g. "4/1/2015 — 5/1/2015"
606+
* Toolbar header format for the Agenda view, e.g. "4/1/2015 – 5/1/2015"
607607
*/
608608
agendaHeaderFormat: dateRangeFormat,
609609

610610
/**
611-
* A time range format for selecting time slots, e.g "8:00am — 2:00pm"
611+
* A time range format for selecting time slots, e.g "8:00am – 2:00pm"
612612
*/
613613
selectRangeFormat: dateRangeFormat,
614614

‎src/localizers/globalize.js‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,23 +5,23 @@ import warning from 'warning'
55

66
let dateRangeFormat = ({ start, end }, culture, local) =>
77
local.format(start, { date: 'short' }, culture) +
8-
' — ' +
8+
' – ' +
99
local.format(end, { date: 'short' }, culture)
1010

1111
let timeRangeFormat = ({ start, end }, culture, local) =>
1212
local.format(start, { time: 'short' }, culture) +
13-
' — ' +
13+
' – ' +
1414
local.format(end, { time: 'short' }, culture)
1515

1616
let timeRangeStartFormat = ({ start }, culture, local) =>
17-
local.format(start, { time: 'short' }, culture) + ' — '
17+
local.format(start, { time: 'short' }, culture) + ' – '
1818

1919
let timeRangeEndFormat = ({ end }, culture, local) =>
20-
' — ' + local.format(end, { time: 'short' }, culture)
20+
' – ' + local.format(end, { time: 'short' }, culture)
2121

2222
let weekRangeFormat = ({ start, end }, culture, local) =>
2323
local.format(start, 'MMM dd', culture) +
24-
' — ' +
24+
' – ' +
2525
local.format(end, dates.eq(start, end, 'month') ? 'dd' : 'MMM dd', culture)
2626

2727
export let formats = {

0 commit comments

Comments
 (0)