Skip to content

Commit 3e7dbed

Browse files
committed
Fix locale reset when previewing files
1 parent d904cf2 commit 3e7dbed

3 files changed

Lines changed: 8 additions & 2 deletions

File tree

app/lib/embed/embedding.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ class Embedding {
1515
Embedding({
1616
this.save = true,
1717
this.editable = true,
18-
this.language = '',
18+
this.language = 'user',
1919
this.theme = 'user',
2020
bool internal = false,
2121
this.onExit,

app/test/views/project_page_lifecycle_test.dart

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ import 'package:butterfly/api/open.dart';
33
import 'package:butterfly/bloc/document_bloc.dart';
44
import 'package:butterfly/cubits/current_index.dart';
55
import 'package:butterfly/cubits/settings.dart';
6+
import 'package:butterfly/embed/embedding.dart';
67
import 'package:butterfly/models/defaults.dart';
78
import 'package:butterfly/src/generated/i18n/app_localizations.dart';
89
import 'package:butterfly/views/main.dart';
@@ -21,6 +22,10 @@ import 'package:shared_preferences/shared_preferences.dart';
2122
import '../helpers/mocks.dart';
2223

2324
void main() {
25+
test('internal embedding preserves the user language', () {
26+
expect(Embedding(internal: true).language, 'user');
27+
});
28+
2429
setUpAll(() {
2530
TestWidgetsFlutterBinding.ensureInitialized();
2631
SharedPreferences.setMockInitialValues({});
Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,6 @@ Cherry picks:
1313
* Respect hidden file extensions in Recent files
1414
* Persist the thumbnail setting
1515
* Correct the texture height label
16+
* Fix file previews resetting the language to the system locale
1617

17-
Read more here: https://linwood.dev/butterfly/2.5.4
18+
Read more here: https://linwood.dev/butterfly/2.5.4

0 commit comments

Comments
 (0)