mirror of
				https://gitlab.com/famedly/fluffychat.git
				synced 2025-11-04 06:17:26 +01:00 
			
		
		
		
	Merge branch 'feature/irish_language_support' into 'main'
Feature/irish language support See merge request famedly/fluffychat!804
This commit is contained in:
		
						commit
						39c0fa2f8b
					
				@ -8,6 +8,7 @@ import 'package:adaptive_theme/adaptive_theme.dart';
 | 
			
		||||
import 'package:flutter_app_lock/flutter_app_lock.dart';
 | 
			
		||||
import 'package:flutter_gen/gen_l10n/l10n.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:universal_html/html.dart' as html;
 | 
			
		||||
import 'package:vrouter/vrouter.dart';
 | 
			
		||||
@ -128,7 +129,10 @@ class _FluffyChatAppState extends State<FluffyChatApp> {
 | 
			
		||||
            scrollBehavior: CustomScrollBehavior(),
 | 
			
		||||
            logs: kReleaseMode ? VLogs.none : VLogs.info,
 | 
			
		||||
            darkTheme: darkTheme,
 | 
			
		||||
            localizationsDelegates: L10n.localizationsDelegates,
 | 
			
		||||
            localizationsDelegates: const [
 | 
			
		||||
              ...L10n.localizationsDelegates,
 | 
			
		||||
              GaMaterialLocalizations.delegate
 | 
			
		||||
            ],
 | 
			
		||||
            supportedLocales: L10n.supportedLocales,
 | 
			
		||||
            initialUrl: _initialUrl ?? '/',
 | 
			
		||||
            routes: AppRoutes(columnMode ?? false).routes,
 | 
			
		||||
 | 
			
		||||
@ -716,6 +716,13 @@ packages:
 | 
			
		||||
      url: "https://pub.dartlang.org"
 | 
			
		||||
    source: hosted
 | 
			
		||||
    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:
 | 
			
		||||
    dependency: "direct main"
 | 
			
		||||
    description:
 | 
			
		||||
@ -1949,5 +1956,5 @@ packages:
 | 
			
		||||
    source: hosted
 | 
			
		||||
    version: "3.1.0"
 | 
			
		||||
sdks:
 | 
			
		||||
  dart: ">=2.16.0 <3.0.0"
 | 
			
		||||
  dart: ">=2.16.1 <3.0.0"
 | 
			
		||||
  flutter: ">=2.10.0"
 | 
			
		||||
 | 
			
		||||
@ -48,6 +48,7 @@ dependencies:
 | 
			
		||||
  flutter_web_auth: ^0.4.0
 | 
			
		||||
  flutter_webrtc: ^0.8.2
 | 
			
		||||
  future_loading_dialog: ^0.2.3
 | 
			
		||||
  gaeilge_flutter_l10n: ^1.0.0
 | 
			
		||||
  geolocator: ^7.6.2
 | 
			
		||||
  hive_flutter: ^1.1.0
 | 
			
		||||
  image: ^3.1.1
 | 
			
		||||
 | 
			
		||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user