mirror of
https://github.com/GitJournal/GitJournal.git
synced 2025-06-28 09:47:35 +08:00
Revert "Workaround intl bug by harding 'en' locale"
This reverts commit 303192d9d575b26a77a00f7a62212f310ec1e329. This reverts commit cd9d128b47ed523036f7ae1232ec7adcf04ed8a9. GitJournal is used by non-English speakers (a lot in China and Russia) and while we don't support those languages completely, we do support them a little bit. I don't want to loose this functionality. It would be better for us to fix the bug in intl.
This commit is contained in:
@ -13,8 +13,8 @@ class JournalView extends StatelessWidget {
|
|||||||
final NotesFolder folder;
|
final NotesFolder folder;
|
||||||
final String emptyText;
|
final String emptyText;
|
||||||
|
|
||||||
static final _dateFormat = DateFormat('dd MMM, yyyy ', 'en');
|
static final _dateFormat = DateFormat('dd MMM, yyyy ');
|
||||||
static final _timeFormat = DateFormat('Hm', 'en');
|
static final _timeFormat = DateFormat('Hm');
|
||||||
|
|
||||||
JournalView({
|
JournalView({
|
||||||
@required this.folder,
|
@required this.folder,
|
||||||
|
@ -22,7 +22,7 @@ class StandardView extends StatelessWidget {
|
|||||||
final StandardViewHeader headerType;
|
final StandardViewHeader headerType;
|
||||||
final bool showSummary;
|
final bool showSummary;
|
||||||
|
|
||||||
static final _dateFormat = DateFormat('dd MMM, yyyy', 'en');
|
static final _dateFormat = DateFormat('dd MMM, yyyy');
|
||||||
|
|
||||||
StandardView({
|
StandardView({
|
||||||
@required this.folder,
|
@required this.folder,
|
||||||
|
@ -189,7 +189,7 @@ class GitHostSetupRepoSelectorState extends State<GitHostSetupRepoSelector> {
|
|||||||
}
|
}
|
||||||
|
|
||||||
Widget _buildRepoTile(GitHostRepo repo) {
|
Widget _buildRepoTile(GitHostRepo repo) {
|
||||||
final _dateFormat = DateFormat('dd MMM, yyyy', 'en');
|
final _dateFormat = DateFormat('dd MMM, yyyy');
|
||||||
|
|
||||||
Widget trailing = Container();
|
Widget trailing = Container();
|
||||||
if (repo.updatedAt != null) {
|
if (repo.updatedAt != null) {
|
||||||
|
@ -2,8 +2,8 @@ import 'dart:core';
|
|||||||
import 'package:gitjournal/utils/logger.dart';
|
import 'package:gitjournal/utils/logger.dart';
|
||||||
import 'package:intl/intl.dart';
|
import 'package:intl/intl.dart';
|
||||||
|
|
||||||
final _simpleDateFormat = DateFormat("yyyy-MM-dd-HH-mm-ss", 'en');
|
final _simpleDateFormat = DateFormat("yyyy-MM-dd-HH-mm-ss");
|
||||||
final _iso8601DateFormat = DateFormat("yyyy-MM-ddTHH:mm:ss", 'en');
|
final _iso8601DateFormat = DateFormat("yyyy-MM-ddTHH:mm:ss");
|
||||||
|
|
||||||
String toSimpleDateTime(DateTime dt) {
|
String toSimpleDateTime(DateTime dt) {
|
||||||
return _simpleDateFormat.format(dt);
|
return _simpleDateFormat.format(dt);
|
||||||
|
@ -12,8 +12,8 @@ class JournalEditorHeader extends StatelessWidget {
|
|||||||
if (note.created == null) {
|
if (note.created == null) {
|
||||||
return Container();
|
return Container();
|
||||||
}
|
}
|
||||||
var dateStr = DateFormat('MMMM, yyyy', 'en').format(note.created);
|
var dateStr = DateFormat('MMMM, yyyy').format(note.created);
|
||||||
var timeStr = DateFormat('EEEE HH:mm', 'en').format(note.created);
|
var timeStr = DateFormat('EEEE HH:mm').format(note.created);
|
||||||
|
|
||||||
var bigNum = Text(
|
var bigNum = Text(
|
||||||
note.created.day.toString(),
|
note.created.day.toString(),
|
||||||
|
@ -1,11 +1,8 @@
|
|||||||
import 'package:gitjournal/utils/datetime.dart';
|
import 'package:gitjournal/utils/datetime.dart';
|
||||||
import 'package:test/test.dart';
|
import 'package:test/test.dart';
|
||||||
import 'package:intl/date_symbol_data_local.dart';
|
|
||||||
|
|
||||||
void main() {
|
void main() {
|
||||||
group('DateTime Utils', () {
|
group('DateTime Utils', () {
|
||||||
initializeDateFormatting('en');
|
|
||||||
|
|
||||||
test('Test random date', () {
|
test('Test random date', () {
|
||||||
var dateTime = DateTime.utc(2011, 12, 23, 10, 15, 30);
|
var dateTime = DateTime.utc(2011, 12, 23, 10, 15, 30);
|
||||||
var str = toIso8601WithTimezone(dateTime);
|
var str = toIso8601WithTimezone(dateTime);
|
||||||
|
@ -6,12 +6,9 @@ import 'package:gitjournal/core/notes_folder_fs.dart';
|
|||||||
import 'package:gitjournal/core/note.dart';
|
import 'package:gitjournal/core/note.dart';
|
||||||
import 'package:path/path.dart' as p;
|
import 'package:path/path.dart' as p;
|
||||||
import 'package:test/test.dart';
|
import 'package:test/test.dart';
|
||||||
import 'package:intl/date_symbol_data_local.dart';
|
|
||||||
|
|
||||||
void main() {
|
void main() {
|
||||||
group('Flattened Notes Folder Large Test', () {
|
group('Flattened Notes Folder Large Test', () {
|
||||||
initializeDateFormatting('en');
|
|
||||||
|
|
||||||
Directory tempDir;
|
Directory tempDir;
|
||||||
NotesFolderFS rootFolder;
|
NotesFolderFS rootFolder;
|
||||||
|
|
||||||
|
@ -6,12 +6,9 @@ import 'package:gitjournal/core/notes_folder_fs.dart';
|
|||||||
import 'package:gitjournal/core/note.dart';
|
import 'package:gitjournal/core/note.dart';
|
||||||
import 'package:path/path.dart' as p;
|
import 'package:path/path.dart' as p;
|
||||||
import 'package:test/test.dart';
|
import 'package:test/test.dart';
|
||||||
import 'package:intl/date_symbol_data_local.dart';
|
|
||||||
|
|
||||||
void main() {
|
void main() {
|
||||||
group('Flattened Notes Folder Test', () {
|
group('Flattened Notes Folder Test', () {
|
||||||
initializeDateFormatting('en');
|
|
||||||
|
|
||||||
Directory tempDir;
|
Directory tempDir;
|
||||||
NotesFolderFS rootFolder;
|
NotesFolderFS rootFolder;
|
||||||
|
|
||||||
|
@ -4,7 +4,6 @@ import 'package:gitjournal/core/md_yaml_doc.dart';
|
|||||||
import 'package:gitjournal/core/md_yaml_doc_codec.dart';
|
import 'package:gitjournal/core/md_yaml_doc_codec.dart';
|
||||||
import 'package:gitjournal/utils/datetime.dart';
|
import 'package:gitjournal/utils/datetime.dart';
|
||||||
import 'package:test/test.dart';
|
import 'package:test/test.dart';
|
||||||
import 'package:intl/date_symbol_data_local.dart';
|
|
||||||
|
|
||||||
DateTime nowWithoutMicro() {
|
DateTime nowWithoutMicro() {
|
||||||
var dt = DateTime.now();
|
var dt = DateTime.now();
|
||||||
@ -13,8 +12,6 @@ DateTime nowWithoutMicro() {
|
|||||||
|
|
||||||
void main() {
|
void main() {
|
||||||
group('Serializers', () {
|
group('Serializers', () {
|
||||||
initializeDateFormatting('en');
|
|
||||||
|
|
||||||
test('Markdown Serializer', () {
|
test('Markdown Serializer', () {
|
||||||
var created = toIso8601WithTimezone(nowWithoutMicro());
|
var created = toIso8601WithTimezone(nowWithoutMicro());
|
||||||
var note = MdYamlDoc(
|
var note = MdYamlDoc(
|
||||||
|
@ -3,12 +3,9 @@ import 'dart:io';
|
|||||||
import 'package:gitjournal/core/md_yaml_doc_loader.dart';
|
import 'package:gitjournal/core/md_yaml_doc_loader.dart';
|
||||||
import 'package:path/path.dart' as p;
|
import 'package:path/path.dart' as p;
|
||||||
import 'package:test/test.dart';
|
import 'package:test/test.dart';
|
||||||
import 'package:intl/date_symbol_data_local.dart';
|
|
||||||
|
|
||||||
void main() {
|
void main() {
|
||||||
group('MdYamlDocLoader', () {
|
group('MdYamlDocLoader', () {
|
||||||
initializeDateFormatting('en');
|
|
||||||
|
|
||||||
Directory tempDir;
|
Directory tempDir;
|
||||||
String filePath;
|
String filePath;
|
||||||
var contents = """---
|
var contents = """---
|
||||||
|
@ -2,11 +2,8 @@ import 'dart:collection';
|
|||||||
|
|
||||||
import 'package:gitjournal/core/md_yaml_doc.dart';
|
import 'package:gitjournal/core/md_yaml_doc.dart';
|
||||||
import 'package:test/test.dart';
|
import 'package:test/test.dart';
|
||||||
import 'package:intl/date_symbol_data_local.dart';
|
|
||||||
|
|
||||||
void main() {
|
void main() {
|
||||||
initializeDateFormatting('en');
|
|
||||||
|
|
||||||
test('Equality', () {
|
test('Equality', () {
|
||||||
// ignore: prefer_collection_literals
|
// ignore: prefer_collection_literals
|
||||||
var aProps = LinkedHashMap<String, dynamic>();
|
var aProps = LinkedHashMap<String, dynamic>();
|
||||||
|
@ -6,12 +6,9 @@ import 'package:gitjournal/core/note.dart';
|
|||||||
import 'package:gitjournal/core/md_yaml_doc.dart';
|
import 'package:gitjournal/core/md_yaml_doc.dart';
|
||||||
import 'package:path/path.dart' as p;
|
import 'package:path/path.dart' as p;
|
||||||
import 'package:test/test.dart';
|
import 'package:test/test.dart';
|
||||||
import 'package:intl/date_symbol_data_local.dart';
|
|
||||||
|
|
||||||
void main() {
|
void main() {
|
||||||
group('NoteStorage', () {
|
group('NoteStorage', () {
|
||||||
initializeDateFormatting('en');
|
|
||||||
|
|
||||||
var notes = <Note>[];
|
var notes = <Note>[];
|
||||||
String n1Path;
|
String n1Path;
|
||||||
String n2Path;
|
String n2Path;
|
||||||
|
@ -4,12 +4,9 @@ import 'package:gitjournal/core/note.dart';
|
|||||||
import 'package:gitjournal/core/notes_folder_fs.dart';
|
import 'package:gitjournal/core/notes_folder_fs.dart';
|
||||||
import 'package:path/path.dart' as p;
|
import 'package:path/path.dart' as p;
|
||||||
import 'package:test/test.dart';
|
import 'package:test/test.dart';
|
||||||
import 'package:intl/date_symbol_data_local.dart';
|
|
||||||
|
|
||||||
void main() {
|
void main() {
|
||||||
group('Note', () {
|
group('Note', () {
|
||||||
initializeDateFormatting('en');
|
|
||||||
|
|
||||||
Directory tempDir;
|
Directory tempDir;
|
||||||
|
|
||||||
setUpAll(() async {
|
setUpAll(() async {
|
||||||
|
@ -7,12 +7,9 @@ import 'package:gitjournal/core/sorting_mode.dart';
|
|||||||
import 'package:gitjournal/core/note.dart';
|
import 'package:gitjournal/core/note.dart';
|
||||||
import 'package:path/path.dart' as p;
|
import 'package:path/path.dart' as p;
|
||||||
import 'package:test/test.dart';
|
import 'package:test/test.dart';
|
||||||
import 'package:intl/date_symbol_data_local.dart';
|
|
||||||
|
|
||||||
void main() {
|
void main() {
|
||||||
group('Sorted Notes Folder Test', () {
|
group('Sorted Notes Folder Test', () {
|
||||||
initializeDateFormatting('en');
|
|
||||||
|
|
||||||
Directory tempDir;
|
Directory tempDir;
|
||||||
NotesFolderFS folder;
|
NotesFolderFS folder;
|
||||||
|
|
||||||
|
@ -2,12 +2,9 @@ import 'package:gitjournal/core/note.dart';
|
|||||||
import 'package:gitjournal/core/notes_folder_fs.dart';
|
import 'package:gitjournal/core/notes_folder_fs.dart';
|
||||||
import 'package:gitjournal/core/sorting_mode.dart';
|
import 'package:gitjournal/core/sorting_mode.dart';
|
||||||
import 'package:test/test.dart';
|
import 'package:test/test.dart';
|
||||||
import 'package:intl/date_symbol_data_local.dart';
|
|
||||||
|
|
||||||
void main() {
|
void main() {
|
||||||
group('Sorting Mode', () {
|
group('Sorting Mode', () {
|
||||||
initializeDateFormatting('en');
|
|
||||||
|
|
||||||
test('Created', () async {
|
test('Created', () async {
|
||||||
var folder = NotesFolderFS(null, '/tmp/');
|
var folder = NotesFolderFS(null, '/tmp/');
|
||||||
var n1 = Note(folder, '/tmp/1.md');
|
var n1 = Note(folder, '/tmp/1.md');
|
||||||
|
@ -1,11 +1,8 @@
|
|||||||
import 'package:gitjournal/utils/markdown.dart';
|
import 'package:gitjournal/utils/markdown.dart';
|
||||||
import 'package:test/test.dart';
|
import 'package:test/test.dart';
|
||||||
import 'package:intl/date_symbol_data_local.dart';
|
|
||||||
|
|
||||||
void main() {
|
void main() {
|
||||||
group('Markdown Remove Formatting', () {
|
group('Markdown Remove Formatting', () {
|
||||||
initializeDateFormatting('en');
|
|
||||||
|
|
||||||
test('Test Headers', () {
|
test('Test Headers', () {
|
||||||
var input = '# Hello\nHow are you?';
|
var input = '# Hello\nHow are you?';
|
||||||
expect(stripMarkdownFormatting(input), 'Hello How are you? ');
|
expect(stripMarkdownFormatting(input), 'Hello How are you? ');
|
||||||
|
Reference in New Issue
Block a user