Skip to content

Commit 735e2f5

Browse files
committed
Migrate localizations to integrated package
1 parent 318bf07 commit 735e2f5

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

75 files changed

+407
-301
lines changed

.github/workflows/dart.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,11 @@ jobs:
2525
- name: Install dependencies
2626
run: |
2727
flutter pub get
28+
- name: Run flutter gen-l10n
29+
if: matrix.projects == 'app'
30+
run: |
31+
flutter gen-l10n
32+
dart format lib/src/generated
2833
# Uncomment this step to verify the use of 'dart format' on each commit.
2934
- name: Verify formatting
3035
run: dart format --output=none --set-exit-if-changed .

api/pubspec.lock

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -165,8 +165,8 @@ packages:
165165
dependency: "direct main"
166166
description:
167167
path: "packages/dart_leap"
168-
ref: db69a03082e6811c58dc2d0e5c23d04305e1623f
169-
resolved-ref: db69a03082e6811c58dc2d0e5c23d04305e1623f
168+
ref: b7787191b0705ff0a22149409b1b360468d9e06d
169+
resolved-ref: b7787191b0705ff0a22149409b1b360468d9e06d
170170
url: "https://github.com/LinwoodDev/dart_pkgs.git"
171171
source: git
172172
version: "1.0.0"

api/pubspec.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ dependencies:
1414
dart_leap:
1515
git:
1616
url: https://github.com/LinwoodDev/dart_pkgs.git
17-
ref: db69a03082e6811c58dc2d0e5c23d04305e1623f
17+
ref: b7787191b0705ff0a22149409b1b360468d9e06d
1818
path: packages/dart_leap
1919
dev_dependencies:
2020
build_runner: ^2.4.14

app/.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
.pub-cache/
3131
.pub/
3232
/build/
33+
/lib/src/generated
3334

3435
# Web related
3536

app/android/Gemfile.lock

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ GEM
1010
artifactory (3.0.17)
1111
atomos (0.1.3)
1212
aws-eventstream (1.3.2)
13-
aws-partitions (1.1066.0)
14-
aws-sdk-core (3.220.1)
13+
aws-partitions (1.1071.0)
14+
aws-sdk-core (3.220.2)
1515
aws-eventstream (~> 1, >= 1.3.0)
1616
aws-partitions (~> 1, >= 1.992.0)
1717
aws-sigv4 (~> 1.9)

app/l10n.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
arb-dir: lib/l10n
22
template-arb-file: app_en.arb
33
output-localization-file: app_localizations.dart
4-
nullable-getter: false
4+
nullable-getter: false
5+
synthetic-package: false
6+
output-dir: lib/src/generated/i18n

app/lib/helpers/event.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import 'package:flutter/material.dart';
22
import 'package:material_leap/material_leap.dart';
33
import 'package:phosphor_flutter/phosphor_flutter.dart';
44
import 'package:flow_api/models/event/model.dart';
5-
import 'package:flutter_gen/gen_l10n/app_localizations.dart';
5+
import 'package:flow/src/generated/i18n/app_localizations.dart';
66

77
extension EventStatusHelper on EventStatus {
88
String getLocalizedName(BuildContext context) {

app/lib/helpers/theme_mode.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import 'package:flutter/material.dart';
2-
import 'package:flutter_gen/gen_l10n/app_localizations.dart';
2+
import 'package:flow/src/generated/i18n/app_localizations.dart';
33
import 'package:phosphor_flutter/phosphor_flutter.dart';
44

55
extension ThemeModeHelper on ThemeMode {

app/lib/main.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import 'package:flutter/material.dart';
1313
import 'package:flutter_bloc/flutter_bloc.dart';
1414
import 'package:flutter_native_splash/flutter_native_splash.dart';
1515
import 'package:go_router/go_router.dart';
16-
import 'package:flutter_gen/gen_l10n/app_localizations.dart';
16+
import 'package:flow/src/generated/i18n/app_localizations.dart';
1717
import 'package:flutter_web_plugins/url_strategy.dart';
1818
import 'package:material_leap/l10n/leap_localizations.dart';
1919
import 'package:flow_api/models/model.dart';

app/lib/pages/calendar/filter.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import 'package:flutter/material.dart';
77
import 'dart:typed_data';
88
import 'package:phosphor_flutter/phosphor_flutter.dart';
99
import 'package:flow_api/models/event/model.dart';
10-
import 'package:flutter_gen/gen_l10n/app_localizations.dart';
10+
import 'package:flow/src/generated/i18n/app_localizations.dart';
1111
import 'package:flow_api/models/group/model.dart';
1212
import 'package:flow_api/models/model.dart';
1313

0 commit comments

Comments
 (0)