From c6feee81cc7ac3b031b1ce3decf2de8bc46cafeb Mon Sep 17 00:00:00 2001 From: shota io Date: Tue, 21 Mar 2023 01:52:26 +0900 Subject: [PATCH 1/6] Add Japanese language support --- lib/src/pluto_grid_configuration.dart | 40 +++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/lib/src/pluto_grid_configuration.dart b/lib/src/pluto_grid_configuration.dart index 1973c35f7..565723972 100644 --- a/lib/src/pluto_grid_configuration.dart +++ b/lib/src/pluto_grid_configuration.dart @@ -1501,6 +1501,46 @@ class PlutoGridLocaleText { this.loadingText = 'Lädt', }); + 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) || From 267b47c99cc274a5d2ed2bb53b15eefc9599d173 Mon Sep 17 00:00:00 2001 From: Mehmet Date: Thu, 23 Mar 2023 07:19:22 +0300 Subject: [PATCH 2/6] Add Turkish language support --- lib/src/pluto_grid_configuration.dart | 40 +++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/lib/src/pluto_grid_configuration.dart b/lib/src/pluto_grid_configuration.dart index 1973c35f7..bb69d630e 100644 --- a/lib/src/pluto_grid_configuration.dart +++ b/lib/src/pluto_grid_configuration.dart @@ -1500,6 +1500,46 @@ class PlutoGridLocaleText { // Common 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', +}); @override bool operator ==(covariant Object other) { From fced87276796f494464ac9eaa8b7178c84170c6d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tautvydas=20S=CC=8Cidlauskas?= Date: Fri, 12 May 2023 21:15:56 +0300 Subject: [PATCH 3/6] fix: use same intl version as in Flutter 3.10.0 SDK --- pubspec.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pubspec.yaml b/pubspec.yaml index af6e13f18..4ab0bc7fd 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -11,7 +11,7 @@ environment: dependencies: flutter: sdk: flutter - intl: ^0.18.1 + intl: ^0.18.0 rxdart: ^0.27.7 collection: ^1.17.1 From 7fa194cc8a8f04d78c0c340c9a4e76dc73004803 Mon Sep 17 00:00:00 2001 From: kmk Date: Sat, 13 May 2023 08:11:03 +0900 Subject: [PATCH 4/6] Add comments. --- pubspec.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pubspec.yaml b/pubspec.yaml index 4ab0bc7fd..1334e187d 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -11,6 +11,8 @@ environment: dependencies: flutter: sdk: flutter + # 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 From 17477511159041451782bfec5f6480ed54743268 Mon Sep 17 00:00:00 2001 From: kmk Date: Sat, 13 May 2023 08:26:25 +0900 Subject: [PATCH 5/6] Update demo. --- demo/lib/screen/development_screen.dart | 8 ++++++++ demo/lib/screen/home_screen.dart | 21 +++++++++++++++++++++ lib/src/pluto_grid_configuration.dart | 4 ++-- test/src/pluto_grid_configuration_test.dart | 12 ++++++++++++ 4 files changed, 43 insertions(+), 2 deletions(-) diff --git a/demo/lib/screen/development_screen.dart b/demo/lib/screen/development_screen.dart index 7dace3716..87d7b5088 100644 --- a/demo/lib/screen/development_screen.dart +++ b/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; diff --git a/demo/lib/screen/home_screen.dart b/demo/lib/screen/home_screen.dart index 576fd1c75..cdcae2d82 100644 --- a/demo/lib/screen/home_screen.dart +++ b/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', diff --git a/lib/src/pluto_grid_configuration.dart b/lib/src/pluto_grid_configuration.dart index 8a7a46d41..9b946b169 100644 --- a/lib/src/pluto_grid_configuration.dart +++ b/lib/src/pluto_grid_configuration.dart @@ -1500,7 +1500,7 @@ class PlutoGridLocaleText { // Common this.loadingText = 'Lädt', }); - + const PlutoGridLocaleText.turkish({ // Column menu this.unfreezeColumn = 'Sütunu serbest bırak', @@ -1539,7 +1539,7 @@ class PlutoGridLocaleText { this.minute = 'Dakika', // Common this.loadingText = 'Yükleniyor', -}); + }); const PlutoGridLocaleText.japanese({ // Column menu diff --git a/test/src/pluto_grid_configuration_test.dart b/test/src/pluto_grid_configuration_test.dart index e32836ee0..0f13e8d6e 100644 --- a/test/src/pluto_grid_configuration_test.dart +++ b/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, 'にゃ〜'); + }); }); } From dcb46aa553b4b23c26e5d7f759b0339270935d95 Mon Sep 17 00:00:00 2001 From: kmk Date: Sat, 13 May 2023 08:31:54 +0900 Subject: [PATCH 6/6] Update 7.0.2 --- CHANGELOG.md | 5 +++++ README.md | 2 +- pubspec.yaml | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d9727211d..a7fafa2ae 100644 --- a/CHANGELOG.md +++ b/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. diff --git a/README.md b/README.md index 3c0f51eaf..3def278a3 100644 --- a/README.md +++ b/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) diff --git a/pubspec.yaml b/pubspec.yaml index 1334e187d..9ff0f667c 100644 --- a/pubspec.yaml +++ b/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