feat: i18n support (#40)

This commit is contained in:
monkeyWie authored and GitHub committed 2022-11-05 17:04:22 +08:00
1 parent 135fba1b54
commit 77e59f7376
10 files changed
+172 -50

No files matched your search

+75
View File
@@ -0,0 +1,75 @@
import 'package:flutter/material.dart';
import 'package:get/get.dart';
Locale toLocale(String key) {
final arr = key.split('_');
return Locale(arr[0], arr[1]);
}
final messages = _Messages();
const fallbackLocale = Locale('en', 'US');
class _Messages extends Translations {
@override
Map<String, Map<String, String>> get keys => {
'zh_CN': {
'error': '错误',
'confirm': '确认',
'cancel': '取消',
'home.task': '任务',
'home.setting': '设置',
'create.title': '创建任务',
'create.downloadLink': '下载链接',
'create.downloadLinkValid': '请输入下载链接',
'create.downloadLinkHit': '请输入下载链接,支持 HTTP/HTTPS/MAGNET',
'create.download': '下载',
'create.error.noStoragePermission': '需要开启存储权限',
'create.selectDir': '选择目录',
'setting.title': '设置',
'setting.basic': '基础设置',
'setting.theme': '主题',
'setting.themeSystem': '跟随系统',
'setting.themeLight': '明亮主题',
'setting.themeDark': '暗黑主题',
'setting.downloadDir': '下载目录',
'setting.downloadDirValid': '请选择下载目录',
'setting.connections': '连接数',
'setting.locale': '语言',
'setting.locale.zh_CN': '中文(简体)',
'setting.locale.en_US': '英文(美国)',
'task.deleteTask': '删除任务',
'task.deleteTaskTip': '保留已下载的文件',
'task.delete': '删除',
},
'en_US': {
'error': 'Error',
'confirm': 'Confirm',
'cancel': 'Cancel',
'home.task': 'Task',
'home.setting': 'Setting',
'create.title': 'Create Task',
'create.downloadLink': 'Download Link',
'create.downloadLinkValid': 'Please enter the download link',
'create.downloadLinkHit':
'Please enter the download link, HTTP/HTTPS/MAGNET supported',
'create.download': 'Download',
'create.error.noStoragePermission': 'Storage permission required',
'create.selectDir': 'Select Directory',
'setting.title': 'Setting',
'setting.basic': 'Basic',
'setting.theme': 'Theme',
'setting.themeSystem': 'System',
'setting.themeLight': 'Light',
'setting.themeDark': 'Dark',
'setting.downloadDir': 'Download Directory',
'setting.downloadDirValid': 'Please select the download directory',
'setting.connections': 'Connections',
'setting.locale': 'Language',
'setting.locale.zh_CN': 'Chinese(Simplified)',
'setting.locale.en_US': 'English(US)',
'task.deleteTask': 'Delete Task',
'task.deleteTaskTip': 'Keep downloaded files',
'task.delete': 'Delete',
},
};
}
+4
View File
@@ -2,6 +2,7 @@ import 'package:flutter/material.dart';
import 'package:get/get.dart'; import 'package:get/get.dart';
import 'core/libgopeed_boot.dart'; import 'core/libgopeed_boot.dart';
import 'i18n/messages.dart';
import 'routes/router.dart'; import 'routes/router.dart';
import 'setting/setting.dart'; import 'setting/setting.dart';
import 'theme/theme.dart'; import 'theme/theme.dart';
@@ -24,6 +25,9 @@ void main() async {
theme: GopeedTheme.light, theme: GopeedTheme.light,
darkTheme: GopeedTheme.dark, darkTheme: GopeedTheme.dark,
themeMode: Setting.instance.themeMode, themeMode: Setting.instance.themeMode,
translations: messages,
locale: Setting.instance.locale,
fallbackLocale: fallbackLocale,
getPages: Routes.routes, getPages: Routes.routes,
)); ));
} }
+16 -13
View File
@@ -30,13 +30,13 @@ class CreateView extends GetView<CreateController> {
icon: const Icon(Icons.arrow_back), icon: const Icon(Icons.arrow_back),
onPressed: () => Get.rootDelegate.offNamed(Routes.task)), onPressed: () => Get.rootDelegate.offNamed(Routes.task)),
actions: [Container()], actions: [Container()],
title: const Text("创建任务"), title: Text('create.title'.tr),
), ),
body: Padding( body: Padding(
padding: const EdgeInsets.symmetric(vertical: 16.0, horizontal: 24.0), padding: const EdgeInsets.symmetric(vertical: 16.0, horizontal: 24.0),
child: Form( child: Form(
key: _resolveFormKey, key: _resolveFormKey,
autovalidateMode: AutovalidateMode.always, //开启自动校验 autovalidateMode: AutovalidateMode.always,
child: Column( child: Column(
children: [ children: [
TextFormField( TextFormField(
@@ -44,12 +44,14 @@ class CreateView extends GetView<CreateController> {
controller: _urlController, controller: _urlController,
minLines: 1, minLines: 1,
maxLines: 15, maxLines: 15,
decoration: const InputDecoration( decoration: InputDecoration(
hintText: "请输入下载链接,支持 HTTP/HTTPS/MAGNET", hintText: 'create.downloadLinkHit'.tr,
labelText: "下载链接", labelText: 'create.downloadLink'.tr,
icon: Icon(Icons.link)), icon: const Icon(Icons.link)),
validator: (v) { validator: (v) {
return v!.trim().isNotEmpty ? null : "请输入下载链接"; return v!.trim().isNotEmpty
? null
: 'create.downloadLinkValid'.tr;
}), }),
// 登录按钮 // 登录按钮
Center( Center(
@@ -71,14 +73,14 @@ class CreateView extends GetView<CreateController> {
)); ));
await _showResolveDialog(res); await _showResolveDialog(res);
} catch (e) { } catch (e) {
Get.snackbar("错误", e.toString()); Get.snackbar('error'.tr, e.toString());
} finally { } finally {
_confirmController.reset(); _confirmController.reset();
} }
} }
}, },
controller: _confirmController, controller: _confirmController,
child: const Text("确认"), child: Text('confirm'.tr),
), ),
)), )),
), ),
@@ -142,7 +144,7 @@ class CreateView extends GetView<CreateController> {
onPressed: () { onPressed: () {
Get.back(); Get.back();
}, },
child: const Text("取消"), child: Text('cancel'.tr),
), ),
), ),
ConstrainedBox( ConstrainedBox(
@@ -158,7 +160,8 @@ class CreateView extends GetView<CreateController> {
downloadController.start(); downloadController.start();
if (Util.isAndroid()) { if (Util.isAndroid()) {
if (!await Permission.storage.request().isGranted) { if (!await Permission.storage.request().isGranted) {
Get.snackbar("错误", "需要开启存储权限"); Get.snackbar('error'.tr,
'create.error.noStoragePermission'.tr);
return; return;
} }
} }
@@ -179,14 +182,14 @@ class CreateView extends GetView<CreateController> {
Get.rootDelegate.offNamed(Routes.task); Get.rootDelegate.offNamed(Routes.task);
} }
} catch (e) { } catch (e) {
Get.snackbar("错误", e.toString()); Get.snackbar('error'.tr, e.toString());
rethrow; rethrow;
} finally { } finally {
downloadController.reset(); downloadController.reset();
} }
}, },
controller: downloadController, controller: downloadController,
child: const Text("下载"), child: Text('create.download'.tr),
), ),
), ),
], ],
+2 -2
View File
@@ -37,11 +37,11 @@ class HomeView extends GetView<HomeController> {
AnimatedBarItems( AnimatedBarItems(
icon: const Icon(Icons.list), icon: const Icon(Icons.list),
selectedColor: Get.theme.primaryColor, selectedColor: Get.theme.primaryColor,
title: const Text('任务')), title: Text('home.task'.tr)),
AnimatedBarItems( AnimatedBarItems(
icon: const Icon(Icons.settings), icon: const Icon(Icons.settings),
selectedColor: Get.theme.primaryColor, selectedColor: Get.theme.primaryColor,
title: const Text('设置')), title: Text('home.setting'.tr)),
], ],
iconSize: 32, iconSize: 32,
barAnimation: BarAnimation.fade, barAnimation: BarAnimation.fade,
@@ -5,4 +5,8 @@ import '../../setting/setting.dart';
class SettingController extends GetxController { class SettingController extends GetxController {
final setting = Setting.instance.obs; final setting = Setting.instance.obs;
final tapStatues = <int, bool>{}.obs; final tapStatues = <int, bool>{}.obs;
void clearTapStatus() {
tapStatues.clear();
}
} }
+46 -10
View File
@@ -3,6 +3,7 @@ import 'dart:async';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter/services.dart'; import 'package:flutter/services.dart';
import 'package:get/get.dart'; import 'package:get/get.dart';
import 'package:gopeed/i18n/messages.dart';
import '../../setting/setting.dart'; import '../../setting/setting.dart';
import '../../widget/directory_selector.dart'; import '../../widget/directory_selector.dart';
@@ -21,26 +22,26 @@ class SettingView extends GetView<SettingController> {
return Scaffold( return Scaffold(
appBar: AppBar( appBar: AppBar(
title: const Text('设置'), title: Text('setting.title'.tr),
centerTitle: true, centerTitle: true,
), ),
body: Column( body: Column(
// 左对齐
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
Text("基本设置", style: Get.textTheme.titleLarge), Text('setting.basic'.tr, style: Get.textTheme.titleLarge),
const SizedBox(height: 10), const SizedBox(height: 10),
Obx(() => Card( Obx(() => Card(
child: Column( child: Column(
children: _buildConfigItems([ children: _buildConfigItems([
_ConfigItem( _ConfigItem(
"主题", 'setting.theme'.tr,
() => _getThemeName(controller.setting.value.themeMode), () => _getThemeName(controller.setting.value.themeMode),
() => DropdownButton<ThemeMode>( () => DropdownButton<ThemeMode>(
value: controller.setting.value.themeMode, value: controller.setting.value.themeMode,
isDense: true, isDense: true,
onChanged: (value) { onChanged: (value) {
controller.setting.value.themeMode = value!; controller.setting.value.themeMode = value!;
controller.clearTapStatus();
Get.changeThemeMode(value); Get.changeThemeMode(value);
debounceSave(); debounceSave();
@@ -52,8 +53,8 @@ class SettingView extends GetView<SettingController> {
)) ))
.toList(), .toList(),
)), )),
_ConfigItem( _ConfigItem('setting.downloadDir'.tr,
"下载目录", () => controller.setting.value.downloadDir, () { () => controller.setting.value.downloadDir, () {
final downloadDirController = TextEditingController( final downloadDirController = TextEditingController(
text: controller.setting.value.downloadDir); text: controller.setting.value.downloadDir);
downloadDirController.addListener(() { downloadDirController.addListener(() {
@@ -61,6 +62,7 @@ class SettingView extends GetView<SettingController> {
controller.setting.value.downloadDir) { controller.setting.value.downloadDir) {
controller.setting.value.downloadDir = controller.setting.value.downloadDir =
downloadDirController.text; downloadDirController.text;
controller.clearTapStatus();
debounceSave(); debounceSave();
} }
@@ -70,7 +72,7 @@ class SettingView extends GetView<SettingController> {
showLabel: false, showLabel: false,
); );
}), }),
_ConfigItem("连接数", _ConfigItem('setting.connections'.tr,
() => controller.setting.value.connections.toString(), () => controller.setting.value.connections.toString(),
() { () {
final connectionsController = TextEditingController( final connectionsController = TextEditingController(
@@ -95,6 +97,27 @@ class SettingView extends GetView<SettingController> {
], ],
); );
}), }),
_ConfigItem(
'setting.locale'.tr,
() => _getLocaleName(controller.setting.value.locale),
() => DropdownButton<Locale>(
value: controller.setting.value.locale,
isDense: true,
onChanged: (value) {
controller.setting.value.locale = value!;
controller.clearTapStatus();
Get.updateLocale(value);
debounceSave();
},
items: _getLocales()
.map((e) => DropdownMenuItem<Locale>(
value: toLocale(e
.substring(_settingLocaleKey.length)),
child: Text(e.tr),
))
.toList(),
)),
]), ]),
))), ))),
], ],
@@ -130,13 +153,26 @@ class SettingView extends GetView<SettingController> {
String _getThemeName(ThemeMode themeMode) { String _getThemeName(ThemeMode themeMode) {
switch (themeMode) { switch (themeMode) {
case ThemeMode.system: case ThemeMode.system:
return "跟随系统"; return 'setting.themeSystem'.tr;
case ThemeMode.light: case ThemeMode.light:
return "明亮主题"; return 'setting.themeLight'.tr;
case ThemeMode.dark: case ThemeMode.dark:
return "暗黑主题"; return 'setting.themeDark'.tr;
} }
} }
final _settingLocaleKey = 'setting.locale.';
List<String> _getLocales() {
return messages.keys[fallbackLocale.toString()]!.entries
.where((e) => e.key.startsWith(_settingLocaleKey))
.map((e) => e.key)
.toList();
}
String _getLocaleName(Locale locale) {
return '$_settingLocaleKey${locale.toString()}'.tr;
}
} }
class _ConfigItem { class _ConfigItem {
+9 -10
View File
@@ -65,8 +65,6 @@ class Item extends StatelessWidget {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
var controller = Get.find<TaskController>();
return Card( return Card(
elevation: 4.0, elevation: 4.0,
child: InkWell( child: InkWell(
@@ -153,22 +151,23 @@ class Item extends StatelessWidget {
context: Get.context!, context: Get.context!,
barrierDismissible: false, barrierDismissible: false,
builder: (_) => AlertDialog( builder: (_) => AlertDialog(
title: const Text("删除任务"), title: Text('task.deleteTask'.tr),
content: Obx(() => CheckboxListTile( content: Obx(() => CheckboxListTile(
value: keep.value, value: keep.value,
title: Text("保留已下载的文件", style: Get.textTheme.bodyText1), title: Text('task.deleteTaskTip'.tr,
style: Get.textTheme.bodyText1),
onChanged: (v) { onChanged: (v) {
keep.value = v!; keep.value = v!;
})), })),
actions: [ actions: [
TextButton( TextButton(
child: const Text("取消"), child: Text('cancel'.tr),
onPressed: () => Get.back(), //关闭对话框 onPressed: () => Get.back(),
), ),
TextButton( TextButton(
child: const Text( child: Text(
"删除", 'task.delete'.tr,
style: TextStyle(color: Colors.redAccent), style: const TextStyle(color: Colors.redAccent),
), ),
onPressed: () async { onPressed: () async {
try { try {
@@ -176,7 +175,7 @@ class Item extends StatelessWidget {
Get.find<TaskController>().loadTab(); Get.find<TaskController>().loadTab();
Get.back(); Get.back();
} catch (e) { } catch (e) {
Get.snackbar("错误", e.toString()); Get.snackbar('error'.tr, e.toString());
} }
}, },
), ),
+10 -11
View File
@@ -1,8 +1,11 @@
import 'package:external_path/external_path.dart'; import 'package:external_path/external_path.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:gopeed/i18n/messages.dart';
import '../api/api.dart'; import '../api/api.dart';
import 'package:path_provider/path_provider.dart'; import 'package:path_provider/path_provider.dart';
import 'dart:ui' as ui;
import '../api/model/server_config.dart'; import '../api/model/server_config.dart';
import '../util/util.dart'; import '../util/util.dart';
@@ -12,14 +15,7 @@ class Setting {
int connections = 0; int connections = 0;
String downloadDir = ""; String downloadDir = "";
ThemeMode themeMode = ThemeMode.system; ThemeMode themeMode = ThemeMode.system;
Locale locale = ui.window.locale;
Setting({
required this.host,
required this.port,
required this.connections,
required this.downloadDir,
required this.themeMode,
});
// singleton pattern // singleton pattern
static Setting? _instance; static Setting? _instance;
@@ -38,11 +34,13 @@ class Setting {
connections = config.connections; connections = config.connections;
downloadDir = config.downloadDir; downloadDir = config.downloadDir;
final themeMode = config.extra?['themeMode']; final themeMode = config.extra?['themeMode'];
if (themeMode == null) { if (themeMode != null) {
this.themeMode = ThemeMode.system;
} else {
this.themeMode = ThemeMode.values.byName(themeMode); this.themeMode = ThemeMode.values.byName(themeMode);
} }
final locale = config.extra?['locale'];
if (locale != null) {
this.locale = toLocale(locale);
}
if (Util.isWeb()) { if (Util.isWeb()) {
downloadDir = "./"; downloadDir = "./";
@@ -69,6 +67,7 @@ class Setting {
downloadDir: downloadDir, downloadDir: downloadDir,
extra: { extra: {
'themeMode': themeMode.name, 'themeMode': themeMode.name,
'locale': locale.toString(),
}, },
); );
await putConfig(config); await putConfig(config);
@@ -26,12 +26,12 @@ class _DirectorySelectorState extends State<DirectorySelector> {
readOnly: true, readOnly: true,
controller: widget.controller, controller: widget.controller,
decoration: widget.showLabel decoration: widget.showLabel
? const InputDecoration( ? InputDecoration(
labelText: "下载目录", labelText: 'setting.downloadDir'.tr,
) )
: null, : null,
validator: (v) { validator: (v) {
return v!.trim().isNotEmpty ? null : "请选择下载目录"; return v!.trim().isNotEmpty ? null : 'setting.downloadDirValid'.tr;
}, },
)), )),
IconButton( IconButton(
+3 -1
View File
@@ -1,4 +1,5 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:get/get.dart';
import '../util/util.dart'; import '../util/util.dart';
import '../api/model/resource.dart'; import '../api/model/resource.dart';
@@ -29,7 +30,8 @@ class _FileListViewState extends State<FileListView> {
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
const Padding(padding: EdgeInsets.only(top: 10)), const Padding(padding: EdgeInsets.only(top: 10)),
Text("选择文件", style: TextStyle(color: themeData.hintColor)), Text('create.selectDir'.tr,
style: TextStyle(color: themeData.hintColor)),
Expanded( Expanded(
child: Container( child: Container(
margin: const EdgeInsets.only(top: 10), margin: const EdgeInsets.only(top: 10),