Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fallback to Czech translations for deprecated language code "cz" #893

Merged
merged 2 commits into from
Jun 25, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ios/Podfile.lock
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
PODS:
- app_group_directory (1.0.0):
- Flutter
- breez_sdk (0.4.2-rc3):
- breez_sdk (0.4.3-rc1):
- Flutter
- clipboard_watcher (0.0.1):
- Flutter
Expand Down Expand Up @@ -300,7 +300,7 @@ EXTERNAL SOURCES:

SPEC CHECKSUMS:
app_group_directory: 7bf9f8f9819ead554de29da7c25fb7a680d6a9a0
breez_sdk: c715e8e0e4d47cc24869bae750958862aeafb0eb
breez_sdk: a9b71ecf97a74267aa1d69d22fad2aa8bbc057e6
clipboard_watcher: 86fb70421aca6f4944e0591a8292605da7784666
connectivity_plus: ddd7f30999e1faaef5967c23d5b6d503d10434db
device_info_plus: 97af1d7e84681a90d0693e63169a5d50e0839a0d
Expand Down
1 change: 1 addition & 0 deletions lib/bloc/user_profile/profile_animal.dart
Original file line number Diff line number Diff line change
Expand Up @@ -185,6 +185,7 @@ extension ProfileAnimalExtension on ProfileAnimal {

Map<String, Map<String, ProfileAnimal>> _animalsFromName = {
"bg": _buildAnimalsFromName(BreezTranslationsBg()),
"cz": _buildAnimalsFromName(BreezTranslationsCs()),
"cs": _buildAnimalsFromName(BreezTranslationsCs()),
"de": _buildAnimalsFromName(BreezTranslationsDe()),
"el": _buildAnimalsFromName(BreezTranslationsEl()),
Expand Down
1 change: 1 addition & 0 deletions lib/bloc/user_profile/profile_color.dart
Original file line number Diff line number Diff line change
Expand Up @@ -180,6 +180,7 @@ extension ProfileColorExtension on ProfileColor {

Map<String, Map<String, ProfileColor>> _colorsFromName = {
"bg": _buildColorsFromName(BreezTranslationsBg()),
"cz": _buildColorsFromName(BreezTranslationsCs()),
"cs": _buildColorsFromName(BreezTranslationsCs()),
"de": _buildColorsFromName(BreezTranslationsDe()),
"el": _buildColorsFromName(BreezTranslationsEl()),
Expand Down
4 changes: 3 additions & 1 deletion lib/routes/security/widget/security_pin_interval.dart
Original file line number Diff line number Diff line change
Expand Up @@ -61,9 +61,11 @@ class SecurityPinInterval extends StatelessWidget {
if (seconds == 0) {
return texts.security_and_backup_lock_automatically_option_immediate;
}
// Duration plugin falsely treats country code "cz" as the Czech language code. Issue: https://github.com/desktop-dart/duration/issues/67
String languageCode = texts.locale == "cs" ? "cz" : texts.locale;
return prettyDuration(
Duration(seconds: seconds),
locale: DurationLocale.fromLanguageCode(texts.locale) ?? const EnglishDurationLocale(),
locale: DurationLocale.fromLanguageCode(languageCode) ?? const EnglishDurationLocale(),
);
}
}
Expand Down
6 changes: 3 additions & 3 deletions pubspec.lock
Original file line number Diff line number Diff line change
Expand Up @@ -103,13 +103,13 @@ packages:
path: "../breez-sdk/libs/sdk-flutter"
relative: true
source: path
version: "0.4.2-rc3"
version: "0.4.3-rc1"
breez_translations:
dependency: "direct main"
description:
path: "."
ref: "79ad21b70c7f0a71da25acbde42f569cc44e0c61"
resolved-ref: "79ad21b70c7f0a71da25acbde42f569cc44e0c61"
ref: a564088448149e9c28b4a2eb82fa0a3536698d24
resolved-ref: a564088448149e9c28b4a2eb82fa0a3536698d24
url: "https://github.com/breez/Breez-Translations"
source: git
version: "1.0.0"
Expand Down
4 changes: 2 additions & 2 deletions pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,11 @@ dependencies:
breez_sdk:
git:
url: https://github.com/breez/breez-sdk-flutter
ref: v0.2.15
ref: v0.4.3-rc1
breez_translations:
git:
url: https://github.com/breez/Breez-Translations
ref: 79ad21b70c7f0a71da25acbde42f569cc44e0c61
ref: a564088448149e9c28b4a2eb82fa0a3536698d24
clipboard_watcher: ^0.2.1
csv: ^6.0.0
connectivity_plus: ^6.0.3
Expand Down
Loading