Merge pull request #839 from bosskmk/develop

PlutoGrid 7.0.2

CHANGELOG.md

@@ -1,3 +1,8 @@
+## [7.0.2] - 2023. 5. 13
+
+* Add Japanese, Turkish languages.
+* Fix Intl version.
+
 ## [7.0.1] - 2023. 5. 11
 
 * Fix SDK version.

README.md

@@ -1,4 +1,4 @@
-## PlutoGrid for flutter - v7.0.1
+## PlutoGrid for flutter - v7.0.2
 
 [![Awesome Flutter](https://img.shields.io/badge/Awesome-Flutter-blue.svg)](https://github.com/Solido/awesome-flutter)
 [![codecov](https://codecov.io/gh/bosskmk/pluto_grid/branch/master/graph/badge.svg)](https://codecov.io/gh/bosskmk/pluto_grid)

demo/lib/screen/development_screen.dart

@@ -613,6 +613,12 @@ class _HeaderState extends State<_Header> {
         case _Locale.french:
           localeText = const PlutoGridLocaleText.french();
           break;
+        case _Locale.turkish:
+          localeText = const PlutoGridLocaleText.turkish();
+          break;
+        case _Locale.japanese:
+          localeText = const PlutoGridLocaleText.japanese();
+          break;
       }
 
       widget.setConfiguration(widget.stateManager.configuration.copyWith(
@@ -1173,6 +1179,8 @@ enum _Locale {
   persian,
   russian,
   spanish,
+  turkish,
+  japanese,
 }
 
 final _isAndroid = defaultTargetPlatform == TargetPlatform.android;

demo/lib/screen/home_screen.dart

@@ -676,6 +676,27 @@ class PlutoContributors extends StatelessWidget {
               launchUrl('https://github.com/coda538');
             },
           ),
+          PlutoContributorTile(
+            name: 'billyio',
+            linkTitle: 'Github',
+            onTapLink: () {
+              launchUrl('https://github.com/billyio');
+            },
+          ),
+          PlutoContributorTile(
+            name: 'Mehmet',
+            linkTitle: 'Github',
+            onTapLink: () {
+              launchUrl('https://github.com/mehmetkalayci');
+            },
+          ),
+          PlutoContributorTile(
+            name: 'Tautvydas Šidlauskas',
+            linkTitle: 'Github',
+            onTapLink: () {
+              launchUrl('https://github.com/sidlatau');
+            },
+          ),
           PlutoContributorTile.invisible(
             name: 'And you.',
             linkTitle: 'Github',

lib/src/pluto_grid_configuration.dart

@@ -1501,6 +1501,86 @@ class PlutoGridLocaleText {
     this.loadingText = 'Lädt',
   });
 
+  const PlutoGridLocaleText.turkish({
+    // Column menu
+    this.unfreezeColumn = 'Sütunu serbest bırak',
+    this.freezeColumnToStart = 'Başa sabitle',
+    this.freezeColumnToEnd = 'Sona sabitle',
+    this.autoFitColumn = 'Otomatik genişlik',
+    this.hideColumn = 'Sütunu gizle',
+    this.setColumns = 'Sütunları seç',
+    this.setFilter = 'Filtre uygula',
+    this.resetFilter = 'Filtreyi sıfırla',
+    // SetColumns popup
+    this.setColumnsTitle = 'Sütun başlıkları',
+    // Filter popup
+    this.filterColumn = 'Sütun',
+    this.filterType = 'Tip',
+    this.filterValue = 'Değer',
+    this.filterAllColumns = 'Tüm sütunlar',
+    this.filterContains = 'İçerir',
+    this.filterEquals = 'Eşittir',
+    this.filterStartsWith = 'Başlar',
+    this.filterEndsWith = 'Biter',
+    this.filterGreaterThan = 'Büyüktür',
+    this.filterGreaterThanOrEqualTo = 'Büyük veya eşittir',
+    this.filterLessThan = 'Küçüktür',
+    this.filterLessThanOrEqualTo = 'Küçük veya eşittir',
+    // Date popup
+    this.sunday = 'Paz',
+    this.monday = 'Pzt',
+    this.tuesday = 'Sal',
+    this.wednesday = 'Çar',
+    this.thursday = 'Per',
+    this.friday = 'Cum',
+    this.saturday = 'Cmt',
+    // Time column popup
+    this.hour = 'Saat',
+    this.minute = 'Dakika',
+    // Common
+    this.loadingText = 'Yükleniyor',
+  });
+
+  const PlutoGridLocaleText.japanese({
+    // Column menu
+    this.unfreezeColumn = '列の固定を解除する',
+    this.freezeColumnToStart = '列を最初に固定する',
+    this.freezeColumnToEnd = '列を最後に固定する',
+    this.autoFitColumn = '列幅の自動修正',
+    this.hideColumn = '列を非表示にする',
+    this.setColumns = '列の表示設定',
+    this.setFilter = 'フィルタの作成',
+    this.resetFilter = 'フィルタの削除',
+    // SetColumns popup
+    this.setColumnsTitle = '列のタイトル',
+    // Filter popup
+    this.filterColumn = '列',
+    this.filterType = '種類',
+    this.filterValue = '値',
+    this.filterAllColumns = '全列',
+    this.filterContains = '含む',
+    this.filterEquals = '等しい',
+    this.filterStartsWith = '指定の値で始まる',
+    this.filterEndsWith = '指定の値で終わる',
+    this.filterGreaterThan = 'より大きい',
+    this.filterGreaterThanOrEqualTo = '以上',
+    this.filterLessThan = '未満',
+    this.filterLessThanOrEqualTo = '以下',
+    // Date popup
+    this.sunday = '日',
+    this.monday = '月',
+    this.tuesday = '火',
+    this.wednesday = '水',
+    this.thursday = '木',
+    this.friday = '金',
+    this.saturday = '土',
+    // Time column popup
+    this.hour = '時間',
+    this.minute = '分',
+    // Common
+    this.loadingText = 'にゃ〜',
+  });
+
   @override
   bool operator ==(covariant Object other) {
     return identical(this, other) ||

pubspec.yaml

@@ -1,6 +1,6 @@
 name: pluto_grid
 description: PlutoGrid is a dataGrid that can be controlled by the keyboard on desktop and web. Of course, it works well on Android and IOS. (DataGrid, DataTable, Data Grid, Data Table, Sticky)
-version: 7.0.1
+version: 7.0.2
 homepage: https://pluto.weblaze.dev
 repository: https://github.com/bosskmk/pluto_grid
 
@@ -11,7 +11,9 @@ environment:
 dependencies:
   flutter:
     sdk: flutter
-  intl: ^0.18.1
+  # Follows the intl version included in Flutter.
+  # https://github.com/flutter/flutter/blob/84a1e904f44f9b0e9c4510138010edcc653163f8/packages/flutter_localizations/pubspec.yaml#L11
+  intl: ^0.18.0
   rxdart: ^0.27.7
   collection: ^1.17.1
 

test/src/pluto_grid_configuration_test.dart

@@ -650,5 +650,17 @@ void main() {
 
       expect(locale.loadingText, 'Lädt');
     });
+
+    test('turkish 이 호출 되어야 한다.', () {
+      const locale = PlutoGridLocaleText.turkish();
+
+      expect(locale.loadingText, 'Yükleniyor');
+    });
+
+    test('japanese 이 호출 되어야 한다.', () {
+      const locale = PlutoGridLocaleText.japanese();
+
+      expect(locale.loadingText, 'にゃ〜');
+    });
   });
 }