Skip to content
This repository was archived by the owner on May 19, 2025. It is now read-only.

Commit 825eb0b

Browse files
authored
Merge branch 'master' into portuguese_language_support
2 parents 9bedd47 + e6b4639 commit 825eb0b

File tree

6 files changed

+54
-22
lines changed

6 files changed

+54
-22
lines changed

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ class MyComponent extends Component {
5050
* **onChange:** *(Function)* default: none
5151
* **minDate:** *(String, Moment.js object, Function)* default: none
5252
* **maxDate:** *(String, Moment.js object, Function)* default: none
53-
* **lang:** *(String, 'cn' - Chinese, 'jp' - Japanese, 'fr' - French, 'it' - Italian, 'de' - German, 'es' - Spanish, 'ru' - Russian)* default: none
53+
* **lang:** *(String, 'cn' - Chinese, 'jp' - Japanese, 'fr' - French, 'it' - Italian, 'de' - German, 'es' - Spanish, 'ru' - Russian, 'tr' - Turkish, 'pt' - Portuguese)* default: none
5454

5555
### Range Picker
5656
```javascript
@@ -93,5 +93,5 @@ class MyComponent extends Component {
9393
* **maxDate:** *(String, Moment.js object, Function)* default: none
9494
* **twoStepChange:** *(Boolean)* default: false
9595
* **rangedCalendars** *(Boolean)* default: false
96-
* **lang:** *(String, 'cn' - Chinese, 'jp' - Japanese, 'fr' - French, 'it' - Italian, 'de' - German, 'es' - Spanish, 'ru' - Russian)* default: none
96+
* **lang:** *(String, 'cn' - Chinese, 'jp' - Japanese, 'fr' - French, 'it' - Italian, 'de' - German, 'es' - Spanish, 'ru' - Russian, 'tr' - Turkish, 'pt' - Portuguese)* default: none
9797
* **specialDays:** *(Array [{date: Moment.js object}])* default: none

demo/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
"dependencies": {
1616
"moment": "^2.17.0",
1717
"normalize.css": "^3.0.3",
18-
"react": "^15.4.2",
19-
"react-dom": "^15.4.2"
18+
"react": "^16.2.0",
19+
"react-dom": "^16.2.0"
2020
},
2121
"devDependencies": {
2222
"babel-core": "^5.8.25",

demo/src/components/Main.js

Lines changed: 23 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,10 @@ export default class Main extends Component {
1414

1515
this.state = {
1616
'rangePicker' : {},
17+
'rangePickerMobile' : {},
1718
'linked' : {},
1819
'datePicker' : null,
20+
'datePickerInternational': null,
1921
'firstDayOfWeek' : null,
2022
'predefined' : {},
2123
}
@@ -28,7 +30,16 @@ export default class Main extends Component {
2830
}
2931

3032
render() {
31-
const { rangePicker, linked, datePicker, firstDayOfWeek, predefined} = this.state;
33+
const {
34+
rangePicker,
35+
rangePickerMobile,
36+
linked,
37+
datePicker,
38+
firstDayOfWeek,
39+
predefined,
40+
datePickerInternational
41+
} = this.state;
42+
3243
const format = 'dddd, D MMMM YYYY';
3344

3445
return (
@@ -52,7 +63,7 @@ export default class Main extends Component {
5263

5364
<DateRange
5465
startDate='10/11/2015'
55-
endDate={ now => {
66+
endDate={ () => {
5667
return '11/12/2015';
5768
}}
5869
onInit={ this.handleChange.bind(this, 'rangePicker') }
@@ -74,10 +85,10 @@ export default class Main extends Component {
7485
/>
7586
</div>
7687
<DateRange
77-
startDate={ now => {
88+
startDate={ () => {
7889
return '9/10/2015';
7990
}}
80-
endDate={ now => {
91+
endDate={ () => {
8192
return '13/11/2015';
8293
}}
8394
linkedCalendars={ true }
@@ -106,15 +117,15 @@ export default class Main extends Component {
106117
<input
107118
type='text'
108119
readOnly
109-
value={ datePicker && datePicker.format(format).toString() }
120+
value={ datePickerInternational && datePickerInternational.format(format).toString() }
110121
/>
111122
</div>
112123
<Calendar
113124
disableDaysBeforeToday={true}
114125
lang={'cn'}
115-
date={ now => { return now } }
116-
onInit={ this.handleChange.bind(this, 'datePicker') }
117-
onChange={ this.handleChange.bind(this, 'datePicker') }
126+
date={ now => now }
127+
onInit={ this.handleChange.bind(this, 'datePickerInternational') }
128+
onChange={ this.handleChange.bind(this, 'datePickerInternational') }
118129
/>
119130
</Section>
120131

@@ -217,12 +228,12 @@ export default class Main extends Component {
217228
<input
218229
type='text'
219230
readOnly
220-
value={ rangePicker['startDate'] && rangePicker['startDate'].format(format).toString() }
231+
value={ rangePickerMobile['startDate'] && rangePickerMobile['startDate'].format(format).toString() }
221232
/>
222233
<input
223234
type='text'
224235
readOnly
225-
value={ rangePicker['endDate'] && rangePicker['endDate'].format(format).toString() }
236+
value={ rangePickerMobile['endDate'] && rangePickerMobile['endDate'].format(format).toString() }
226237
/>
227238
</div>
228239
<div className={styles['Mobile-Container']}>
@@ -234,8 +245,8 @@ export default class Main extends Component {
234245
disableDaysBeforeToday={true}
235246
showMonthArrow={false}
236247
calendars={4}
237-
onInit={ this.handleChange.bind(this, 'rangePicker') }
238-
onChange={ this.handleChange.bind(this, 'rangePicker') }
248+
onInit={ this.handleChange.bind(this, 'rangePickerMobile') }
249+
onChange={ this.handleChange.bind(this, 'rangePickerMobile') }
239250
/>
240251
</div>
241252
</Section>

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,11 @@
2727
},
2828
"dependencies": {
2929
"classnames": "^2.2.1",
30-
"moment": "^2.10.6",
30+
"moment": "^2.19.4",
3131
"prop-types": "^15.5.10"
3232
},
3333
"peerDependencies": {
34-
"react": "^0.14 || ^15.0.0-rc || ^15.0"
34+
"react": "^0.14 || ^15.0.0-rc || ^15.0 || ^16.0"
3535
},
3636
"devDependencies": {
3737
"babel": "^5.8.23"

src/LangDic.js

Lines changed: 24 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ export default {
7777
'december':'dicembre',
7878
'su':'Domenica',
7979
'mo':'Lunedì',
80-
'tu':'Mardi',
80+
'tu':'Martedì',
8181
'we':'Mercoledì',
8282
'th':'Giovedì',
8383
'fr':'Venerdì',
@@ -104,7 +104,7 @@ export default {
104104
'fr':'Freitag',
105105
'sa':'Samstag'
106106
},
107-
'ko' : { // Korean
107+
'ko' : { // Korean
108108
'january':'1월',
109109
'february':'2월',
110110
'march':'3월',
@@ -124,7 +124,7 @@ export default {
124124
'th':'목',
125125
'fr':'금',
126126
'sa':'토'
127-
}
127+
},
128128
'es' : { // Spanish
129129
'january':'Enero',
130130
'february':'Febrero',
@@ -208,5 +208,26 @@ export default {
208208
'th': 'Qui',
209209
'fr': 'Sex',
210210
'sa': 'Sáb'
211+
},
212+
'pt-br' : { // Português Brazil
213+
'january':'Janeiro',
214+
'february':'Fevereiro',
215+
'march':'Março',
216+
'april':'Abril',
217+
'may':'Maio',
218+
'june':'Junho',
219+
'july':'Julho',
220+
'august':'Agosto',
221+
'september':'Setembro',
222+
'october':'Outubro',
223+
'november':'Novembro',
224+
'december':'Dezembro',
225+
'su':'Dom',
226+
'mo':'Seg',
227+
'tu':'Ter',
228+
'we':'Qua',
229+
'th':'Qui',
230+
'fr':'Sex',
231+
'sa':'Sab'
211232
}
212233
}

src/PredefinedRanges.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ class PredefinedRanges extends Component {
5555
{name}
5656
</a>
5757
);
58-
}.bind(this));
58+
});
5959
}
6060

6161
render() {

0 commit comments

Comments
 (0)