From f7311627794726842da24cdd768062610057fb65 Mon Sep 17 00:00:00 2001 From: "Jason C.H" Date: Thu, 9 Dec 2021 00:40:40 +0800 Subject: [PATCH] Fix about translation for CN --- lib/main/main_page.dart | 7 ++----- pubspec.lock | 9 ++++++++- res/translation/en.json | 2 +- res/translation/zh-CN.json | 4 ++-- res/translation/zh-Hans.json | 2 +- windows/flutter/generated_plugin_registrant.cc | 6 +++--- 6 files changed, 17 insertions(+), 13 deletions(-) diff --git a/lib/main/main_page.dart b/lib/main/main_page.dart index 7a0e4a31..703a7325 100644 --- a/lib/main/main_page.dart +++ b/lib/main/main_page.dart @@ -92,10 +92,7 @@ class _MainPageState extends State { body: SafeArea( child: Row( children: [ - AnimatedSwitcher( - duration: const Duration(milliseconds: 300), - child: navigationRail, - ), + navigationRail, const VerticalDivider(thickness: 1, width: 1), Expanded( child: PageTransitionSwitcher( @@ -113,7 +110,7 @@ class _MainPageState extends State { ), ), bottomNavigationBar: AnimatedSwitcher( - duration: const Duration(milliseconds: 300), + duration: const Duration(milliseconds: 200), child: bottomNavigationBar, ), drawer: const MainDrawer(), diff --git a/pubspec.lock b/pubspec.lock index fb7123b8..d08a1a29 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -625,6 +625,13 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "0.12.11" + material_color_utilities: + dependency: transitive + description: + name: material_color_utilities + url: "https://pub.dartlang.org" + source: hosted + version: "0.1.2" meta: dependency: transitive description: @@ -986,7 +993,7 @@ packages: name: test_api url: "https://pub.dartlang.org" source: hosted - version: "0.4.3" + version: "0.4.8" timezone: dependency: transitive description: diff --git a/res/translation/en.json b/res/translation/en.json index 3aef3802..d3f5440d 100644 --- a/res/translation/en.json +++ b/res/translation/en.json @@ -30,7 +30,7 @@ "CalendarCardTime": "Time", "CalendarCardRoom": "Room", "CalendarCardLecturer": "Lecturer", - "CalendarCardAddToSystem":"Add to system calendar", + "CalendarCardAddToSystem": "Add to system calendar", "Classes": "Classes", "Exams": "Exams", "Assignments": "Assignments", diff --git a/res/translation/zh-CN.json b/res/translation/zh-CN.json index c8f6944a..eece586f 100644 --- a/res/translation/zh-CN.json +++ b/res/translation/zh-CN.json @@ -23,14 +23,14 @@ "ErrorFormat": "格式不正确。" }, "SignOut": "登出", - "About": "于", + "About": "关于", "Calendar": { "Calendar": "日程", "CalendarCardCode": "代号", "CalendarCardTime": "时间", "CalendarCardRoom": "教室", "CalendarCardLecturer": "讲师", - "CalendarCardAddToSystem":"添加到系统日程", + "CalendarCardAddToSystem": "添加到系统日程", "Classes": "课程", "Exams": "考试", "Assignments": "作业", diff --git a/res/translation/zh-Hans.json b/res/translation/zh-Hans.json index 29e9098e..eece586f 100644 --- a/res/translation/zh-Hans.json +++ b/res/translation/zh-Hans.json @@ -30,7 +30,7 @@ "CalendarCardTime": "时间", "CalendarCardRoom": "教室", "CalendarCardLecturer": "讲师", - "CalendarCardAddToSystem":"添加到系统日程", + "CalendarCardAddToSystem": "添加到系统日程", "Classes": "课程", "Exams": "考试", "Assignments": "作业", diff --git a/windows/flutter/generated_plugin_registrant.cc b/windows/flutter/generated_plugin_registrant.cc index d9fdd539..4f788487 100644 --- a/windows/flutter/generated_plugin_registrant.cc +++ b/windows/flutter/generated_plugin_registrant.cc @@ -6,9 +6,9 @@ #include "generated_plugin_registrant.h" -#include +#include void RegisterPlugins(flutter::PluginRegistry* registry) { - UrlLauncherPluginRegisterWithRegistrar( - registry->GetRegistrarForPlugin("UrlLauncherPlugin")); + UrlLauncherWindowsRegisterWithRegistrar( + registry->GetRegistrarForPlugin("UrlLauncherWindows")); }