Merge branch 'feature/irish_language_support' into 'main'

Feature/irish language support

See merge request famedly/fluffychat!804
This commit is contained in:
Krille Fear 2022-04-03 16:59:28 +00:00
commit 39c0fa2f8b
3 changed files with 14 additions and 2 deletions

View File

@ -8,6 +8,7 @@ import 'package:adaptive_theme/adaptive_theme.dart';
import 'package:flutter_app_lock/flutter_app_lock.dart'; import 'package:flutter_app_lock/flutter_app_lock.dart';
import 'package:flutter_gen/gen_l10n/l10n.dart'; import 'package:flutter_gen/gen_l10n/l10n.dart';
import 'package:future_loading_dialog/future_loading_dialog.dart'; import 'package:future_loading_dialog/future_loading_dialog.dart';
import 'package:gaeilge_flutter_l10n/gaeilge_flutter_l10n.dart';
import 'package:matrix/matrix.dart'; import 'package:matrix/matrix.dart';
import 'package:universal_html/html.dart' as html; import 'package:universal_html/html.dart' as html;
import 'package:vrouter/vrouter.dart'; import 'package:vrouter/vrouter.dart';
@ -128,7 +129,10 @@ class _FluffyChatAppState extends State<FluffyChatApp> {
scrollBehavior: CustomScrollBehavior(), scrollBehavior: CustomScrollBehavior(),
logs: kReleaseMode ? VLogs.none : VLogs.info, logs: kReleaseMode ? VLogs.none : VLogs.info,
darkTheme: darkTheme, darkTheme: darkTheme,
localizationsDelegates: L10n.localizationsDelegates, localizationsDelegates: const [
...L10n.localizationsDelegates,
GaMaterialLocalizations.delegate
],
supportedLocales: L10n.supportedLocales, supportedLocales: L10n.supportedLocales,
initialUrl: _initialUrl ?? '/', initialUrl: _initialUrl ?? '/',
routes: AppRoutes(columnMode ?? false).routes, routes: AppRoutes(columnMode ?? false).routes,

View File

@ -716,6 +716,13 @@ packages:
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "0.2.3" version: "0.2.3"
gaeilge_flutter_l10n:
dependency: "direct main"
description:
name: gaeilge_flutter_l10n
url: "https://pub.dartlang.org"
source: hosted
version: "1.0.0"
geolocator: geolocator:
dependency: "direct main" dependency: "direct main"
description: description:
@ -1949,5 +1956,5 @@ packages:
source: hosted source: hosted
version: "3.1.0" version: "3.1.0"
sdks: sdks:
dart: ">=2.16.0 <3.0.0" dart: ">=2.16.1 <3.0.0"
flutter: ">=2.10.0" flutter: ">=2.10.0"

View File

@ -48,6 +48,7 @@ dependencies:
flutter_web_auth: ^0.4.0 flutter_web_auth: ^0.4.0
flutter_webrtc: ^0.8.2 flutter_webrtc: ^0.8.2
future_loading_dialog: ^0.2.3 future_loading_dialog: ^0.2.3
gaeilge_flutter_l10n: ^1.0.0
geolocator: ^7.6.2 geolocator: ^7.6.2
hive_flutter: ^1.1.0 hive_flutter: ^1.1.0
image: ^3.1.1 image: ^3.1.1