Fix language overrides

CHANGELOG.md

@@ -5,6 +5,10 @@ All notable changes to the "flutter-intl" extension will be documented in this f
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## 2.8.17 - Unreleased
+
+- Fix language overrides ([#19](https://github.com/localizely/intl_utils/issues/19))
+
 ## 2.8.16 - 2026-06-11
 
 - Update `analyzer` dependency
@@ -86,7 +90,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## 2.8.0 - 2022-11-15
 
-- Update `analyzer` and `lints` dependencies
+- Update `analyzer` and `lints` dependencies ([#91](https://github.com/localizely/intl_utils/issues/91))
 
 ## 2.7.0 - 2022-07-07
 

bin/generate.dart

@@ -1,4 +1,4 @@
-library intl_utils;
+library;
 
 import 'package:intl_utils/intl_utils.dart';
 import 'package:intl_utils/src/generator/generator_exception.dart';

bin/localizely_download.dart

@@ -1,4 +1,4 @@
-library intl_utils;
+library;
 
 import 'dart:io';
 

bin/localizely_upload_main.dart

@@ -1,4 +1,4 @@
-library intl_utils;
+library;
 
 import 'dart:io';
 

lib/intl_utils.dart

@@ -1,3 +1,3 @@
-library intl_utils;
+library;
 
 export 'src/generator/generator.dart';

lib/src/config/credentials_config.dart

@@ -20,10 +20,9 @@ class CredentialsConfig {
       );
     }
 
-    _apiToken =
-        credentialsYaml['api_token'] is String
-            ? credentialsYaml['api_token']
-            : null;
+    _apiToken = credentialsYaml['api_token'] is String
+        ? credentialsYaml['api_token']
+        : null;
   }
 
   String? get apiToken => _apiToken;

lib/src/config/pubspec_config.dart

@@ -32,30 +32,24 @@ class PubspecConfig {
       return;
     }
 
-    _enabled =
-        flutterIntlConfig['enabled'] is bool
-            ? flutterIntlConfig['enabled']
-            : null;
-    _className =
-        flutterIntlConfig['class_name'] is String
-            ? flutterIntlConfig['class_name']
-            : null;
-    _mainLocale =
-        flutterIntlConfig['main_locale'] is String
-            ? flutterIntlConfig['main_locale']
-            : null;
-    _arbDir =
-        flutterIntlConfig['arb_dir'] is String
-            ? flutterIntlConfig['arb_dir']
-            : null;
-    _outputDir =
-        flutterIntlConfig['output_dir'] is String
-            ? flutterIntlConfig['output_dir']
-            : null;
-    _useDeferredLoading =
-        flutterIntlConfig['use_deferred_loading'] is bool
-            ? flutterIntlConfig['use_deferred_loading']
-            : null;
+    _enabled = flutterIntlConfig['enabled'] is bool
+        ? flutterIntlConfig['enabled']
+        : null;
+    _className = flutterIntlConfig['class_name'] is String
+        ? flutterIntlConfig['class_name']
+        : null;
+    _mainLocale = flutterIntlConfig['main_locale'] is String
+        ? flutterIntlConfig['main_locale']
+        : null;
+    _arbDir = flutterIntlConfig['arb_dir'] is String
+        ? flutterIntlConfig['arb_dir']
+        : null;
+    _outputDir = flutterIntlConfig['output_dir'] is String
+        ? flutterIntlConfig['output_dir']
+        : null;
+    _useDeferredLoading = flutterIntlConfig['use_deferred_loading'] is bool
+        ? flutterIntlConfig['use_deferred_loading']
+        : null;
     _localizelyConfig = LocalizelyConfig.fromConfig(
       flutterIntlConfig['localizely'],
     );
@@ -94,50 +88,41 @@ class LocalizelyConfig {
       return;
     }
 
-    _projectId =
-        localizelyConfig['project_id'] is String
-            ? localizelyConfig['project_id']
-            : null;
-    _branch =
-        localizelyConfig['branch'] is String
-            ? localizelyConfig['branch']
-            : null;
-    _uploadAsReviewed =
-        localizelyConfig['upload_as_reviewed'] is bool
-            ? localizelyConfig['upload_as_reviewed']
-            : null;
-    _uploadOverwrite =
-        localizelyConfig['upload_overwrite'] is bool
-            ? localizelyConfig['upload_overwrite']
-            : null;
-    _uploadTagAdded =
-        localizelyConfig['upload_tag_added'] is yaml.YamlList
-            ? List<String>.from(localizelyConfig['upload_tag_added'])
-            : null;
-    _uploadTagUpdated =
-        localizelyConfig['upload_tag_updated'] is yaml.YamlList
-            ? List<String>.from(localizelyConfig['upload_tag_updated'])
-            : null;
-    _uploadTagRemoved =
-        localizelyConfig['upload_tag_removed'] is yaml.YamlList
-            ? List<String>.from(localizelyConfig['upload_tag_removed'])
-            : null;
-    _downloadEmptyAs =
-        localizelyConfig['download_empty_as'] is String
-            ? localizelyConfig['download_empty_as']
-            : null;
+    _projectId = localizelyConfig['project_id'] is String
+        ? localizelyConfig['project_id']
+        : null;
+    _branch = localizelyConfig['branch'] is String
+        ? localizelyConfig['branch']
+        : null;
+    _uploadAsReviewed = localizelyConfig['upload_as_reviewed'] is bool
+        ? localizelyConfig['upload_as_reviewed']
+        : null;
+    _uploadOverwrite = localizelyConfig['upload_overwrite'] is bool
+        ? localizelyConfig['upload_overwrite']
+        : null;
+    _uploadTagAdded = localizelyConfig['upload_tag_added'] is yaml.YamlList
+        ? List<String>.from(localizelyConfig['upload_tag_added'])
+        : null;
+    _uploadTagUpdated = localizelyConfig['upload_tag_updated'] is yaml.YamlList
+        ? List<String>.from(localizelyConfig['upload_tag_updated'])
+        : null;
+    _uploadTagRemoved = localizelyConfig['upload_tag_removed'] is yaml.YamlList
+        ? List<String>.from(localizelyConfig['upload_tag_removed'])
+        : null;
+    _downloadEmptyAs = localizelyConfig['download_empty_as'] is String
+        ? localizelyConfig['download_empty_as']
+        : null;
     _downloadIncludeTags =
         localizelyConfig['download_include_tags'] is yaml.YamlList
-            ? List<String>.from(localizelyConfig['download_include_tags'])
-            : null;
+        ? List<String>.from(localizelyConfig['download_include_tags'])
+        : null;
     _downloadExcludeTags =
         localizelyConfig['download_exclude_tags'] is yaml.YamlList
-            ? List<String>.from(localizelyConfig['download_exclude_tags'])
-            : null;
-    _otaEnabled =
-        localizelyConfig['ota_enabled'] is bool
-            ? localizelyConfig['ota_enabled']
-            : null;
+        ? List<String>.from(localizelyConfig['download_exclude_tags'])
+        : null;
+    _otaEnabled = localizelyConfig['ota_enabled'] is bool
+        ? localizelyConfig['ota_enabled']
+        : null;
   }
 
   String? get projectId => _projectId;

lib/src/generator/generator.dart

@@ -119,35 +119,35 @@ class Generator {
     var content = mainArbFile.readAsStringSync();
     var decodedContent = json.decode(content) as Map<String, dynamic>;
 
-    var labels =
-        decodedContent.keys.where((key) => !key.startsWith('@')).map((key) {
-          var name = key;
-          var content = decodedContent[key];
-
-          var meta = decodedContent['@$key'] ?? {};
-          var type = meta['type'];
-          var description = meta['description'];
-          var placeholders =
-              meta['placeholders'] != null
-                  ? (meta['placeholders'] as Map<String, dynamic>).keys
-                      .map(
-                        (placeholder) => Placeholder(
-                          key,
-                          placeholder,
-                          meta['placeholders'][placeholder],
-                        ),
-                      )
-                      .toList()
-                  : null;
-
-          return Label(
-            name,
-            content,
-            type: type,
-            description: description,
-            placeholders: placeholders,
-          );
-        }).toList();
+    var labels = decodedContent.keys.where((key) => !key.startsWith('@')).map((
+      key,
+    ) {
+      var name = key;
+      var content = decodedContent[key];
+
+      var meta = decodedContent['@$key'] ?? {};
+      var type = meta['type'];
+      var description = meta['description'];
+      var placeholders = meta['placeholders'] != null
+          ? (meta['placeholders'] as Map<String, dynamic>).keys
+                .map(
+                  (placeholder) => Placeholder(
+                    key,
+                    placeholder,
+                    meta['placeholders'][placeholder],
+                  ),
+                )
+                .toList()
+          : null;
+
+      return Label(
+        name,
+        content,
+        type: type,
+        description: description,
+        placeholders: placeholders,
+      );
+    }).toList();
 
     return labels;
   }
@@ -156,10 +156,10 @@ class Generator {
     var index = locales.indexOf(_mainLocale);
     return index != -1
         ? [
-          locales.elementAt(index),
-          ...locales.sublist(0, index),
-          ...locales.sublist(index + 1),
-        ]
+            locales.elementAt(index),
+            ...locales.sublist(0, index),
+            ...locales.sublist(index + 1),
+          ]
         : locales;
   }
 

lib/src/generator/intl_translation_helper.dart

@@ -147,10 +147,9 @@ class BasicTranslatedMessage extends TranslatedMessage {
   BasicTranslatedMessage(super.name, super.translated, this.messages);
 
   @override
-  List<MainMessage>? get originalMessages =>
-      (super.originalMessages == null)
-          ? _findOriginals()
-          : super.originalMessages;
+  List<MainMessage>? get originalMessages => (super.originalMessages == null)
+      ? _findOriginals()
+      : super.originalMessages;
 
   // We know that our [id] is the name of the message, which is used as the key in [messages].
   List<MainMessage>? _findOriginals() => originalMessages = messages[id];