diff --git a/lib/folder_views/journal_view.dart b/lib/folder_views/journal_view.dart index b978573e..8de651bb 100644 --- a/lib/folder_views/journal_view.dart +++ b/lib/folder_views/journal_view.dart @@ -13,8 +13,8 @@ class JournalView extends StatelessWidget { final NotesFolder folder; final String emptyText; - static final _dateFormat = DateFormat('dd MMM, yyyy ', 'en'); - static final _timeFormat = DateFormat('Hm', 'en'); + static final _dateFormat = DateFormat('dd MMM, yyyy '); + static final _timeFormat = DateFormat('Hm'); JournalView({ @required this.folder, diff --git a/lib/folder_views/standard_view.dart b/lib/folder_views/standard_view.dart index d39c3a68..1ec57923 100644 --- a/lib/folder_views/standard_view.dart +++ b/lib/folder_views/standard_view.dart @@ -22,7 +22,7 @@ class StandardView extends StatelessWidget { final StandardViewHeader headerType; final bool showSummary; - static final _dateFormat = DateFormat('dd MMM, yyyy', 'en'); + static final _dateFormat = DateFormat('dd MMM, yyyy'); StandardView({ @required this.folder, diff --git a/lib/setup/repo_selector.dart b/lib/setup/repo_selector.dart index 4c952bf3..0817c3ed 100644 --- a/lib/setup/repo_selector.dart +++ b/lib/setup/repo_selector.dart @@ -189,7 +189,7 @@ class GitHostSetupRepoSelectorState extends State { } Widget _buildRepoTile(GitHostRepo repo) { - final _dateFormat = DateFormat('dd MMM, yyyy', 'en'); + final _dateFormat = DateFormat('dd MMM, yyyy'); Widget trailing = Container(); if (repo.updatedAt != null) { diff --git a/lib/utils/datetime.dart b/lib/utils/datetime.dart index 6d6283df..b30d3ceb 100644 --- a/lib/utils/datetime.dart +++ b/lib/utils/datetime.dart @@ -2,8 +2,8 @@ import 'dart:core'; import 'package:gitjournal/utils/logger.dart'; import 'package:intl/intl.dart'; -final _simpleDateFormat = DateFormat("yyyy-MM-dd-HH-mm-ss", 'en'); -final _iso8601DateFormat = DateFormat("yyyy-MM-ddTHH:mm:ss", 'en'); +final _simpleDateFormat = DateFormat("yyyy-MM-dd-HH-mm-ss"); +final _iso8601DateFormat = DateFormat("yyyy-MM-ddTHH:mm:ss"); String toSimpleDateTime(DateTime dt) { return _simpleDateFormat.format(dt); diff --git a/lib/widgets/journal_editor_header.dart b/lib/widgets/journal_editor_header.dart index f8ac821e..9db8299d 100644 --- a/lib/widgets/journal_editor_header.dart +++ b/lib/widgets/journal_editor_header.dart @@ -12,8 +12,8 @@ class JournalEditorHeader extends StatelessWidget { if (note.created == null) { return Container(); } - var dateStr = DateFormat('MMMM, yyyy', 'en').format(note.created); - var timeStr = DateFormat('EEEE HH:mm', 'en').format(note.created); + var dateStr = DateFormat('MMMM, yyyy').format(note.created); + var timeStr = DateFormat('EEEE HH:mm').format(note.created); var bigNum = Text( note.created.day.toString(), diff --git a/test/datetime_utils_test.dart b/test/datetime_utils_test.dart index 0d59dec7..1f0d850a 100644 --- a/test/datetime_utils_test.dart +++ b/test/datetime_utils_test.dart @@ -1,11 +1,8 @@ import 'package:gitjournal/utils/datetime.dart'; import 'package:test/test.dart'; -import 'package:intl/date_symbol_data_local.dart'; void main() { group('DateTime Utils', () { - initializeDateFormatting('en'); - test('Test random date', () { var dateTime = DateTime.utc(2011, 12, 23, 10, 15, 30); var str = toIso8601WithTimezone(dateTime); diff --git a/test/flattened_notes_folder_large_test.dart b/test/flattened_notes_folder_large_test.dart index 8cc419e1..e93c6616 100644 --- a/test/flattened_notes_folder_large_test.dart +++ b/test/flattened_notes_folder_large_test.dart @@ -6,12 +6,9 @@ import 'package:gitjournal/core/notes_folder_fs.dart'; import 'package:gitjournal/core/note.dart'; import 'package:path/path.dart' as p; import 'package:test/test.dart'; -import 'package:intl/date_symbol_data_local.dart'; void main() { group('Flattened Notes Folder Large Test', () { - initializeDateFormatting('en'); - Directory tempDir; NotesFolderFS rootFolder; diff --git a/test/flattened_notes_folder_test.dart b/test/flattened_notes_folder_test.dart index 0201e78c..6e388c4f 100644 --- a/test/flattened_notes_folder_test.dart +++ b/test/flattened_notes_folder_test.dart @@ -6,12 +6,9 @@ import 'package:gitjournal/core/notes_folder_fs.dart'; import 'package:gitjournal/core/note.dart'; import 'package:path/path.dart' as p; import 'package:test/test.dart'; -import 'package:intl/date_symbol_data_local.dart'; void main() { group('Flattened Notes Folder Test', () { - initializeDateFormatting('en'); - Directory tempDir; NotesFolderFS rootFolder; diff --git a/test/md_yaml_codec_test.dart b/test/md_yaml_codec_test.dart index f1a7313d..b9109a4e 100644 --- a/test/md_yaml_codec_test.dart +++ b/test/md_yaml_codec_test.dart @@ -4,7 +4,6 @@ import 'package:gitjournal/core/md_yaml_doc.dart'; import 'package:gitjournal/core/md_yaml_doc_codec.dart'; import 'package:gitjournal/utils/datetime.dart'; import 'package:test/test.dart'; -import 'package:intl/date_symbol_data_local.dart'; DateTime nowWithoutMicro() { var dt = DateTime.now(); @@ -13,8 +12,6 @@ DateTime nowWithoutMicro() { void main() { group('Serializers', () { - initializeDateFormatting('en'); - test('Markdown Serializer', () { var created = toIso8601WithTimezone(nowWithoutMicro()); var note = MdYamlDoc( diff --git a/test/md_yaml_doc_loader_test.dart b/test/md_yaml_doc_loader_test.dart index e206bf91..9ab50dd6 100644 --- a/test/md_yaml_doc_loader_test.dart +++ b/test/md_yaml_doc_loader_test.dart @@ -3,12 +3,9 @@ import 'dart:io'; import 'package:gitjournal/core/md_yaml_doc_loader.dart'; import 'package:path/path.dart' as p; import 'package:test/test.dart'; -import 'package:intl/date_symbol_data_local.dart'; void main() { group('MdYamlDocLoader', () { - initializeDateFormatting('en'); - Directory tempDir; String filePath; var contents = """--- diff --git a/test/md_yaml_doc_test.dart b/test/md_yaml_doc_test.dart index 31a83fb3..56432b7e 100644 --- a/test/md_yaml_doc_test.dart +++ b/test/md_yaml_doc_test.dart @@ -2,11 +2,8 @@ import 'dart:collection'; import 'package:gitjournal/core/md_yaml_doc.dart'; import 'package:test/test.dart'; -import 'package:intl/date_symbol_data_local.dart'; void main() { - initializeDateFormatting('en'); - test('Equality', () { // ignore: prefer_collection_literals var aProps = LinkedHashMap(); diff --git a/test/note_storage_test.dart b/test/note_storage_test.dart index 7683814f..6712e2a3 100644 --- a/test/note_storage_test.dart +++ b/test/note_storage_test.dart @@ -6,12 +6,9 @@ import 'package:gitjournal/core/note.dart'; import 'package:gitjournal/core/md_yaml_doc.dart'; import 'package:path/path.dart' as p; import 'package:test/test.dart'; -import 'package:intl/date_symbol_data_local.dart'; void main() { group('NoteStorage', () { - initializeDateFormatting('en'); - var notes = []; String n1Path; String n2Path; diff --git a/test/note_test.dart b/test/note_test.dart index 49126c2e..4398140a 100644 --- a/test/note_test.dart +++ b/test/note_test.dart @@ -4,12 +4,9 @@ import 'package:gitjournal/core/note.dart'; import 'package:gitjournal/core/notes_folder_fs.dart'; import 'package:path/path.dart' as p; import 'package:test/test.dart'; -import 'package:intl/date_symbol_data_local.dart'; void main() { group('Note', () { - initializeDateFormatting('en'); - Directory tempDir; setUpAll(() async { diff --git a/test/sorted_notes_folder_test.dart b/test/sorted_notes_folder_test.dart index c431f5f4..4e647e1c 100644 --- a/test/sorted_notes_folder_test.dart +++ b/test/sorted_notes_folder_test.dart @@ -7,12 +7,9 @@ import 'package:gitjournal/core/sorting_mode.dart'; import 'package:gitjournal/core/note.dart'; import 'package:path/path.dart' as p; import 'package:test/test.dart'; -import 'package:intl/date_symbol_data_local.dart'; void main() { group('Sorted Notes Folder Test', () { - initializeDateFormatting('en'); - Directory tempDir; NotesFolderFS folder; diff --git a/test/sorting_mode_test.dart b/test/sorting_mode_test.dart index 636cf9fc..59d872e2 100644 --- a/test/sorting_mode_test.dart +++ b/test/sorting_mode_test.dart @@ -2,12 +2,9 @@ import 'package:gitjournal/core/note.dart'; import 'package:gitjournal/core/notes_folder_fs.dart'; import 'package:gitjournal/core/sorting_mode.dart'; import 'package:test/test.dart'; -import 'package:intl/date_symbol_data_local.dart'; void main() { group('Sorting Mode', () { - initializeDateFormatting('en'); - test('Created', () async { var folder = NotesFolderFS(null, '/tmp/'); var n1 = Note(folder, '/tmp/1.md'); diff --git a/test/strip_markdown_formatting_test.dart b/test/strip_markdown_formatting_test.dart index dac1926f..2022d47d 100644 --- a/test/strip_markdown_formatting_test.dart +++ b/test/strip_markdown_formatting_test.dart @@ -1,11 +1,8 @@ import 'package:gitjournal/utils/markdown.dart'; import 'package:test/test.dart'; -import 'package:intl/date_symbol_data_local.dart'; void main() { group('Markdown Remove Formatting', () { - initializeDateFormatting('en'); - test('Test Headers', () { var input = '# Hello\nHow are you?'; expect(stripMarkdownFormatting(input), 'Hello How are you? ');