Merge branch 'master' into master

CHANGELOG.md

@@ -23,4 +23,5 @@
 ## [1.1.1] - add 3 more languages
 ## [1.1.2] - add Portuguese
 ## [1.1.3] - update date picker format
-## [1.1.4] - add 2 more languages
+## [1.1.4] - add 2 more languages
+## [1.1.5] - add japanese

README.md

@@ -7,8 +7,8 @@ A flutter date time picker inspired by [flutter-cupertino-date-picker](https://g
 you can choose date / time / date&time in multiple languages:
 
 - English(en)
-- Dutch(nl)
 - Chinese(zh)
+- Dutch(nl)
 - Russian(ru)
 - Italian(it)
 - French(fr)
@@ -16,6 +16,8 @@ you can choose date / time / date&time in multiple languages:
 - Portuguese(pt)
 - Korean(ko)
 - Arabic(ar)
+- Turkish(tr)
+- Japanese(jp)
 
 and you can also custom your own picker content
 

lib/src/date_model.dart

@@ -149,7 +149,7 @@ class DatePickerModel extends CommonPickerModel {
 
   void _fillLeftLists() {
     this.leftList = List.generate(maxTime.year - minTime.year + 1, (int index) {
-      print('LEFT LIST... ${minTime.year + index}${_localeYear()}');
+      // print('LEFT LIST... ${minTime.year + index}${_localeYear()}');
       return '${minTime.year + index}${_localeYear()}';
     });
   }
@@ -301,6 +301,8 @@ class DatePickerModel extends CommonPickerModel {
   String _localeYear() {
     if (locale == LocaleType.zh) {
       return '年';
+    } else if (locale == LocaleType.ko) {
+      return '년';
     } else {
       return '';
     }
@@ -309,6 +311,8 @@ class DatePickerModel extends CommonPickerModel {
   String _localeMonth(int month) {
     if (locale == LocaleType.zh) {
       return '$month月';
+    } else if (locale == LocaleType.ko) {
+      return '$month월';
     } else {
       List monthStrings = i18nObjInLocale(locale)['monthLong'];
       return monthStrings[month - 1];
@@ -318,6 +322,8 @@ class DatePickerModel extends CommonPickerModel {
   String _localeDay() {
     if (locale == LocaleType.zh) {
       return '日';
+    } else if (locale == LocaleType.ko) {
+      return '일';
     } else {
       return '';
     }

lib/src/i18n_model.dart

@@ -1,7 +1,7 @@
-enum LocaleType { en, zh, nl, ru, it, fr, es, pt, ko, ar, de }
+enum LocaleType { en, zh, nl, ru, it, fr, es, pt, ko, ar, tr, jp, de }
+
 final _i18nModel = {
   'en': {
-    //default
     'cancel': 'Cancel',
     'done': 'Done',
     'today': 'Today',
@@ -139,7 +139,7 @@ final _i18nModel = {
     ],
     'monthLong': [
       'Январь',
-      'Декабрь',
+      'Февраль',
       'Март',
       'Апрель',
       'Май',
@@ -379,6 +379,79 @@ final _i18nModel = {
     'am': 'ص',
     'pm': 'م'
   },
+  'tr': {
+    'cancel': 'İptal',
+    'done': 'Tamam',
+    'today': 'Bugün',
+    'monthShort': [
+      'Oca',
+      'Şub',
+      'Mar',
+      'Nis',
+      'May',
+      'Haz',
+      'Tem',
+      'Ağu',
+      'Eyl',
+      'Eki',
+      'Kas',
+      'Ara'
+    ],
+    'monthLong': [
+      'Ocak',
+      'Şubat',
+      'Mart',
+      'Nisan',
+      'Mayıs',
+      'Haziran',
+      'Temmuz',
+      'Ağustos',
+      'Eylül',
+      'Ekim',
+      'Kasım',
+      'Aralık'
+    ],
+    'day': ['Pzt', 'Sal', 'Çarş', 'Perş', 'Cum', 'Ctes', 'Paz'],
+    'am': 'ÖÖ',
+    'pm': 'ÖS'
+  },
+  'jp': {
+    //Japanese
+    'cancel': 'キャンセル',
+    'done': '決定する',
+    'today': '今日',
+    'monthShort': [
+      '一月',
+      '二月',
+      '三月',
+      '四月',
+      '五月',
+      '六月',
+      '七月',
+      '八月',
+      '九月',
+      '十月',
+      '十一月',
+      '十二月'
+    ],
+    'monthLong': [
+      '一月',
+      '二月',
+      '三月',
+      '四月',
+      '五月',
+      '六月',
+      '七月',
+      '八月',
+      '九月',
+      '十月',
+      '十一月',
+      '十二月'
+    ],
+    'day': ['月曜日', '火曜日', '水曜日', '木曜日', '金曜日', '土曜日', '日曜日'],
+    'am': '朝',
+    'pm': '午後'
+  },
   'de': {
     //German
     'cancel': 'Abbrechen',
@@ -438,6 +511,10 @@ Map<String, dynamic> i18nObjInLocale(LocaleType type) {
       return _i18nModel['ko'];
     case LocaleType.ar:
       return _i18nModel['ar'];
+    case LocaleType.tr:
+      return _i18nModel['tr'];
+    case LocaleType.jp:
+      return _i18nModel['jp'];
     case LocaleType.de:
       return _i18nModel['de'];
     default:

pubspec.yaml

@@ -1,6 +1,6 @@
 name: flutter_datetime_picker
 description: A date time picker for flutter, you can choose date / time / date&time in English Dutch and Chinese, and you can also custom your own picker content
-version: 1.1.4
+version: 1.1.5
 author: Realank <realank@126.com>
 homepage: https://github.com/Realank/flutter_datetime_picker