From cce5b1fcede240bba8826928c07003178c08bc11 Mon Sep 17 00:00:00 2001
From: Thibault Deckers <thibault.deckers@gmail.com>
Date: Sun, 27 Oct 2024 23:22:17 +0100
Subject: [PATCH] l10n: en-Shaw

---
 lib/widgets/aves_app.dart |  6 ++++--
 pubspec.lock              | 18 +++++++++---------
 pubspec.yaml              |  4 ++--
 3 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/lib/widgets/aves_app.dart b/lib/widgets/aves_app.dart
index 2699ee245..c6f3f6823 100644
--- a/lib/widgets/aves_app.dart
+++ b/lib/widgets/aves_app.dart
@@ -49,7 +49,7 @@ import 'package:event_bus/event_bus.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
-import 'package:flutter_localization_nn/flutter_localization_nn.dart';
+import 'package:flutter_localizations_plus/flutter_localizations_plus.dart';
 import 'package:intl/intl.dart';
 import 'package:latlong2/latlong.dart';
 import 'package:overlay_support/overlay_support.dart';
@@ -305,8 +305,10 @@ class _AvesAppState extends State<AvesApp> with WidgetsBindingObserver {
                                 themeMode: themeBrightness.appThemeMode,
                                 locale: settingsLocale,
                                 localizationsDelegates: const [
-                                  ...AppLocalizations.localizationsDelegates,
+                                  // order matters for resolution of sublocales (e.g. `en_Shaw` before `en`)
+                                  ...LocalizationsEnShaw.delegates,
                                   ...LocalizationsNn.delegates,
+                                  ...AppLocalizations.localizationsDelegates,
                                 ],
                                 supportedLocales: AvesApp.supportedLocales,
                                 scrollBehavior: AvesScrollBehavior(),
diff --git a/pubspec.lock b/pubspec.lock
index 6a095a079..088637368 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -527,20 +527,20 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "5.0.0"
-  flutter_localization_nn:
-    dependency: "direct main"
-    description:
-      path: "."
-      ref: HEAD
-      resolved-ref: f35b88327b98a1494426cf40ff7c30281cc7f937
-      url: "https://github.com/deckerst/flutter_localization_nn.git"
-    source: git
-    version: "0.0.1"
   flutter_localizations:
     dependency: "direct main"
     description: flutter
     source: sdk
     version: "0.0.0"
+  flutter_localizations_plus:
+    dependency: "direct main"
+    description:
+      path: "."
+      ref: HEAD
+      resolved-ref: "3ce50168ea196acc8d18e09377a3e88bb13cb125"
+      url: "https://github.com/deckerst/flutter_localizations_plus.git"
+    source: git
+    version: "0.0.1"
   flutter_map:
     dependency: "direct main"
     description:
diff --git a/pubspec.yaml b/pubspec.yaml
index 47406ba3c..92ff5e859 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -71,9 +71,9 @@ dependencies:
   fluster:
   flutter_displaymode:
   flutter_highlight:
-  flutter_localization_nn:
+  flutter_localizations_plus:
     git:
-      url: https://github.com/deckerst/flutter_localization_nn.git
+      url: https://github.com/deckerst/flutter_localizations_plus.git
   flutter_map:
   flutter_markdown:
   flutter_staggered_animations: