Remove desktop locale workaround

stuartmorgan-g · stuartmorgan-g · commit ba4ad68270b3 · 2020-08-13T11:05:52.000-07:00
The desktop embeddings now set locales on startup, so there is no longer a need to work around the lack of locale. Fixes flutter#35
diff --git a/lib/data/gallery_options.dart b/lib/data/gallery_options.dart
@@ -68,14 +68,7 @@ class GalleryOptions {
     }
   }
 
-  Locale get locale =>
-      _locale ??
-      deviceLocale ??
-      // TODO: When deviceLocale can be obtained on desktop, this won't be necessary
-      // https://github.com/flutter/flutter/issues/45152
-      (!kIsWeb && (Platform.isMacOS || Platform.isWindows || Platform.isLinux)
-          ? const Locale('en', 'US')
-          : null);
+  Locale get locale => _locale ?? deviceLocale;
 
   /// Returns a text direction based on the [CustomTextDirection] setting.
   /// If it is based on locale and the locale cannot be determined, returns

Original file line number	Diff line number	Diff line change
`@@ -68,14 +68,7 @@ class GalleryOptions {`
`68`	`68`	`}`
`69`	`69`	`}`
`70`	`70`
`71`		`- Locale get locale =>`
`72`		`- _locale ??`
`73`		`- deviceLocale ??`
`74`		`- // TODO: When deviceLocale can be obtained on desktop, this won't be necessary`
`75`		`- // https://github.com/flutter/flutter/issues/45152`
`76`		`- (!kIsWeb && (Platform.isMacOS \|\| Platform.isWindows \|\| Platform.isLinux)`
`77`		`- ? const Locale('en', 'US')`
`78`		`- : null);`
	`71`	`+ Locale get locale => _locale ?? deviceLocale;`
`79`	`72`
`80`	`73`	`/// Returns a text direction based on the [CustomTextDirection] setting.`
`81`	`74`	`/// If it is based on locale and the locale cannot be determined, returns`