#269 진행. 리다이렉트 등 파라미터 전체 전달

userfront/lib/core/i18n/locale_utils.dart

@@ -1,34 +1,46 @@
 import 'dart:ui';
 
 import 'locale_storage.dart';
+import 'locale_registry.dart';
 
-const supportedLocaleCodes = ['en', 'ko'];
-const defaultLocaleCode = 'en';
+String get defaultLocaleCode => LocaleRegistry.fallbackLocaleCode;
 
 String normalizeLocaleCode(String? code) {
+  final supportedLocaleCodes = LocaleRegistry.supportedLocaleCodes;
+  final fallbackLocaleCode = LocaleRegistry.fallbackLocaleCode;
+
   if (code == null || code.isEmpty) {
-    return defaultLocaleCode;
+    return fallbackLocaleCode;
   }
-  final normalized = code.toLowerCase();
-  if (normalized == 'ko' || normalized.startsWith('ko-')) {
-    return 'ko';
+  final normalized = code.toLowerCase().replaceAll('_', '-');
+  if (supportedLocaleCodes.contains(normalized)) {
+    return normalized;
   }
-  if (normalized == 'en' || normalized.startsWith('en-')) {
-    return 'en';
+  final languageCode = normalized.split('-').first;
+  if (supportedLocaleCodes.contains(languageCode)) {
+    return languageCode;
   }
-  return defaultLocaleCode;
+  return fallbackLocaleCode;
 }
 
 String resolvePreferredLocaleCode() {
   final stored = LocaleStorage.read();
-  if (stored != null && supportedLocaleCodes.contains(stored)) {
-    return stored;
+  if (stored != null && stored.isNotEmpty) {
+    final normalizedStored = normalizeLocaleCode(stored);
+    if (LocaleRegistry.contains(normalizedStored)) {
+      return normalizedStored;
+    }
   }
   final deviceLocale = PlatformDispatcher.instance.locale;
-  return normalizeLocaleCode(deviceLocale.languageCode);
+  final languageTag =
+      deviceLocale.countryCode == null || deviceLocale.countryCode!.isEmpty
+      ? deviceLocale.languageCode
+      : '${deviceLocale.languageCode}-${deviceLocale.countryCode}';
+  return normalizeLocaleCode(languageTag);
 }
 
 String? extractLocaleFromPath(Uri uri) {
+  final supportedLocaleCodes = LocaleRegistry.supportedLocaleCodes;
   if (uri.pathSegments.isEmpty) {
     return null;
   }
@@ -40,8 +52,10 @@ String? extractLocaleFromPath(Uri uri) {
 }
 
 String stripLocalePath(Uri uri) {
+  final supportedLocaleCodes = LocaleRegistry.supportedLocaleCodes;
   final segments = uri.pathSegments;
-  if (segments.isNotEmpty && supportedLocaleCodes.contains(segments.first)) {
+  if (segments.isNotEmpty &&
+      supportedLocaleCodes.contains(segments.first.toLowerCase())) {
     final rest = segments.skip(1).join('/');
     if (rest.isEmpty) {
       return '/';
@@ -52,18 +66,23 @@ String stripLocalePath(Uri uri) {
 }
 
 String buildLocalizedPath(String localeCode, Uri uri) {
+  final supportedLocaleCodes = LocaleRegistry.supportedLocaleCodes;
   final segments = uri.pathSegments;
   Iterable<String> restSegments = segments;
   if (segments.isNotEmpty) {
     final head = segments.first.toLowerCase();
-    if (supportedLocaleCodes.contains(head) || head.length == 2) {
+    if (supportedLocaleCodes.contains(head)) {
       restSegments = segments.skip(1);
     }
   }
   final newSegments = [localeCode, ...restSegments];
   final path = '/${newSegments.join('/')}';
-  if (uri.queryParameters.isEmpty) {
-    return path;
-  }
-  return Uri(path: path, queryParameters: uri.queryParameters).toString();
+  final queryPart = uri.hasQuery ? '?${uri.query}' : '';
+  final fragmentPart = uri.fragment.isNotEmpty ? '#${uri.fragment}' : '';
+  return '$path$queryPart$fragmentPart';
+}
+
+String buildSigninRedirectPath(String localeCode, Uri uri) {
+  final queryPart = uri.hasQuery ? '?${uri.query}' : '';
+  return '/$localeCode/signin$queryPart';
 }