Send platformResolvedLocale from iOS embedder #18519

GaryQian · 2020-05-20T03:04:17Z

Matches android in sending platform resolved locales. The currently computed value is incorrect as the embedder does not yet have access to supported locales. This is ok because the value is not yet exposed to the user. When the embedder localization work is completed, the value will be computed properly.

See flutter/flutter#47087 and #17755

shihaohong · 2020-05-20T21:11:21Z

shell/platform/darwin/ios/framework/Source/FlutterEngine.mm

+  NSString* countryCode = [platformResolvedLocale objectForKey:NSLocaleCountryCode];
+  NSString* scriptCode = [platformResolvedLocale objectForKey:NSLocaleScriptCode];
+  NSString* variantCode = [platformResolvedLocale objectForKey:NSLocaleVariantCode];
+  if (languageCode) {


Do you have a pointer to the Android side of platform-resolved locales? That just helps with making sure that I can see what I'm comparing this to when looking at this.

https://github.com/flutter/engine/pull/17755/files#diff-dea427d60d1307aa6783086f0a0921d8R29

shihaohong · 2020-05-20T21:12:04Z

shell/platform/darwin/ios/framework/Source/FlutterEngine.mm


+  // Get and pass the user's perferred locale list to dart:ui


nit:

Suggested change

// Get and pass the user's perferred locale list to dart:ui

// Get and pass the user's preferred locale list to dart:ui

shihaohong · 2020-05-20T21:14:45Z

testing/scenario_app/ios/Scenarios/ScenariosUITests/LocalizationInitializationTest.m

@@ -25,11 +25,16 @@ - (void)setUp {
 - (void)testNoLocalePrepend {
  NSTimeInterval timeout = 10.0;

+  // The locales recieved by dart:ui are exposed onBeginFrame via semantics label.


nit:

Suggested change

// The locales recieved by dart:ui are exposed onBeginFrame via semantics label.

// The locales received by dart:ui are exposed onBeginFrame via semantics label.

shihaohong · 2020-05-20T21:16:29Z

testing/scenario_app/ios/Scenarios/ScenariosUITests/LocalizationInitializationTest.m

@@ -25,11 +25,16 @@ - (void)setUp {
 - (void)testNoLocalePrepend {
  NSTimeInterval timeout = 10.0;

+  // The locales recieved by dart:ui are exposed onBeginFrame via semantics label.
+  // There should only be one locale, as we have removed the locale prepend on iOS.


Maybe tweak the comment a little to describe why there should only be one locale. A newer Flutter developer reading this might get confused about what the "locale prepend on iOS" is since it never existed before the PR where it was removed.

shihaohong · 2020-05-20T21:24:30Z

testing/scenario_app/lib/src/locale_initialization.dart

@@ -16,6 +16,8 @@ class LocaleInitialization extends Scenario {
      : assert(window != null),
        super(window);

+  int tapCount = 0;


nit, here and elsewhere (might be why the analyzer is failing too)

Suggested change

int tapCount = 0;

int _tapCount = 0;

shihaohong · 2020-05-20T21:26:46Z

testing/scenario_app/lib/src/locale_initialization.dart

+  void onPointerDataPacket(PointerDataPacket packet) {
+    String label;
+    switch(tapCount) {
+      case 0: label = window.platformResolvedLocale.toString(); break;


nit: I find this syntax hard to read even though it's shorter, I'd prefer:

Suggested change

case 0: label = window.platformResolvedLocale.toString(); break;

case 0: {

label = window.platformResolvedLocale.toString();

}

break;

shihaohong · 2020-05-20T21:36:38Z

testing/scenario_app/lib/src/locale_initialization.dart

+  void onPointerDataPacket(PointerDataPacket packet) {
+    String label;
+    switch(tapCount) {
+      case 0: label = window.platformResolvedLocale.toString(); break;


Also, to make sure, keeping track of the _tapCount is solely to make sure we set the semantics label with the platform resolve locale on the first tap? Is there a reason we want it to only set it the first time?

I expect to extend this in the future with further cases, and this allows easy extension by just adding an extra case here and sending another tap.

shihaohong

LGTM

…#18519)

Roll Engine from 9ce1e5c to 1a83498 (69 revisions) flutter/engine@9ce1e5c...1a83498 2020-05-26 hterkelsen@users.noreply.github.com Revert "Update CanvasKit to 0.15.0 (flutter#18570)" (flutter/engine#18600) 2020-05-26 skia-flutter-autoroll@skia.org Roll Fuchsia Mac SDK from TSEOq... to hr-HZ... (flutter/engine#18594) 2020-05-26 skia-flutter-autoroll@skia.org Roll Dart SDK from 65113fd73dec to 9e3b0289197d (2 revisions) (flutter/engine#18593) 2020-05-26 skia-flutter-autoroll@skia.org Roll Skia from b6d158aaf3dd to e4b4ca1050b9 (1 revision) (flutter/engine#18592) 2020-05-26 skia-flutter-autoroll@skia.org Roll Fuchsia Linux SDK from DzG49... to pLp67... (flutter/engine#18591) 2020-05-24 skia-flutter-autoroll@skia.org Roll Fuchsia Mac SDK from Oz016... to TSEOq... (flutter/engine#18590) 2020-05-23 skia-flutter-autoroll@skia.org Roll Skia from afd8a6c6ae87 to b6d158aaf3dd (3 revisions) (flutter/engine#18588) 2020-05-22 skia-flutter-autoroll@skia.org Roll Fuchsia Mac SDK from 99Z4_... to Oz016... (flutter/engine#18582) 2020-05-22 skia-flutter-autoroll@skia.org Roll Skia from ec31488ace66 to afd8a6c6ae87 (1 revision) (flutter/engine#18581) 2020-05-22 skia-flutter-autoroll@skia.org Roll Fuchsia Linux SDK from Kvwlr... to DzG49... (flutter/engine#18580) 2020-05-22 skia-flutter-autoroll@skia.org Roll Skia from 80abb89c3632 to ec31488ace66 (1 revision) (flutter/engine#18579) 2020-05-22 skia-flutter-autoroll@skia.org Roll Skia from da90c3765908 to 80abb89c3632 (4 revisions) (flutter/engine#18577) 2020-05-22 skia-flutter-autoroll@skia.org Roll Fuchsia Mac SDK from _zNmv... to 99Z4_... (flutter/engine#18576) 2020-05-22 skia-flutter-autoroll@skia.org Roll Skia from 317dce5c81c0 to da90c3765908 (1 revision) (flutter/engine#18575) 2020-05-22 skia-flutter-autoroll@skia.org Roll Dart SDK from 4ee57c08e0a6 to 65113fd73dec (3 revisions) (flutter/engine#18574) 2020-05-22 skia-flutter-autoroll@skia.org Roll Skia from 67e21a19259b to 317dce5c81c0 (3 revisions) (flutter/engine#18573) 2020-05-22 hterkelsen@users.noreply.github.com Update CanvasKit to 0.15.0 (flutter/engine#18570) 2020-05-21 skia-flutter-autoroll@skia.org Roll Skia from 3d52abc84667 to 67e21a19259b (1 revision) (flutter/engine#18568) 2020-05-21 skia-flutter-autoroll@skia.org Roll Dart SDK from 396b5fb7a97d to 4ee57c08e0a6 (6 revisions) (flutter/engine#18567) 2020-05-21 robert.ancell@canonical.com Add fl_value_to_string (flutter/engine#18540) 2020-05-21 skia-flutter-autoroll@skia.org Roll Skia from 1e63279156d6 to 3d52abc84667 (5 revisions) (flutter/engine#18566) 2020-05-21 chris@bracken.jp null-annotate semantics.dart (flutter/engine#18553) 2020-05-21 skia-flutter-autoroll@skia.org Roll Fuchsia Linux SDK from ciqRH... to Kvwlr... (flutter/engine#18565) 2020-05-21 skia-flutter-autoroll@skia.org Roll Skia from b37105ea6cca to 1e63279156d6 (9 revisions) (flutter/engine#18564) 2020-05-21 gw280@google.com Implement WriteAtomically using write/fsync on all platforms, and enable (flutter/engine#18320) 2020-05-21 skia-flutter-autoroll@skia.org Roll Dart SDK from ecce58c1e354 to 396b5fb7a97d (2 revisions) (flutter/engine#18560) 2020-05-21 skia-flutter-autoroll@skia.org Roll Fuchsia Mac SDK from RNByJ... to _zNmv... (flutter/engine#18558) 2020-05-21 st.krwlng@gmail.com [profiling] Memory Profiling support for iOS (flutter/engine#18516) 2020-05-21 skia-flutter-autoroll@skia.org Roll Skia from 22636205ce92 to b37105ea6cca (2 revisions) (flutter/engine#18557) 2020-05-21 skia-flutter-autoroll@skia.org Roll Dart SDK from d551980ac9fc to ecce58c1e354 (2 revisions) (flutter/engine#18556) 2020-05-21 skia-flutter-autoroll@skia.org Roll Dart SDK from bf7e9d13d730 to d551980ac9fc (6 revisions) (flutter/engine#18551) 2020-05-21 skia-flutter-autoroll@skia.org Roll Skia from 4c0578632217 to 22636205ce92 (4 revisions) (flutter/engine#18550) 2020-05-21 skia-flutter-autoroll@skia.org Roll Fuchsia Linux SDK from ThMeW... to ciqRH... (flutter/engine#18549) 2020-05-21 skia-flutter-autoroll@skia.org Roll Skia from 67ff541ac116 to 4c0578632217 (1 revision) (flutter/engine#18547) 2020-05-21 xster@google.com Let run_tests.py just stream output (flutter/engine#18534) 2020-05-21 robert.ancell@canonical.com Add FlKeyEventPlugin (flutter/engine#18313) 2020-05-21 mehmetf@users.noreply.github.com Add tests for StandardMethodCodec (flutter/engine#18521) 2020-05-21 skia-flutter-autoroll@skia.org Roll Skia from f83baf230c69 to 67ff541ac116 (1 revision) (flutter/engine#18545) 2020-05-21 skia-flutter-autoroll@skia.org Roll Fuchsia Mac SDK from 3o9aQ... to RNByJ... (flutter/engine#18543) 2020-05-21 dworsham@google.com fuchsia: Fix runtime_tests and shell_tests (flutter/engine#18492) 2020-05-21 skia-flutter-autoroll@skia.org Roll Skia from d2dc8ddcdf5e to f83baf230c69 (2 revisions) (flutter/engine#18539) 2020-05-21 skia-flutter-autoroll@skia.org Roll Dart SDK from 7aa8656d1dd8 to bf7e9d13d730 (21 revisions) (flutter/engine#18538) 2020-05-21 robert.ancell@canonical.com Add FlMethodChannel, FlMethodCodec, FlStandardMethodCodec and FlJsonMethodCodec (flutter/engine#18220) 2020-05-20 ferhat@gmail.com [web] Fix arc rendering when it starts a new sub path. (flutter/engine#18535) 2020-05-20 garyq@google.com Send platformResolvedLocale from iOS embedder (flutter/engine#18519) 2020-05-20 dkwingsmt@users.noreply.github.com System mouse cursor: macOS (flutter/engine#18131) ...

The code is dead because flutter#17755 has been reverted by flutter#19136 but flutter#18519 has not been properly reverted.

The code is dead because flutter#17755 has been reverted by flutter#19136, although flutter#18519 has not been properly reverted.

Send platformResolvedLocale from iOS embedder

fe206f5

GaryQian added the Work in progress (WIP) Not ready (yet) for review! label May 20, 2020

googlebot added the cla: yes label May 20, 2020

Add test

2e27488

GaryQian changed the title ~~[WIP] Send platformResolvedLocale from iOS embedder~~ Send platformResolvedLocale from iOS embedder May 20, 2020

GaryQian removed the Work in progress (WIP) Not ready (yet) for review! label May 20, 2020

GaryQian marked this pull request as ready for review May 20, 2020 09:50

auto-assign bot requested a review from flar May 20, 2020 09:51

Kick tests

096e302

GaryQian requested review from shihaohong and HansMuller May 20, 2020 10:15

GaryQian added 2 commits May 20, 2020 10:18

Analyzer

def5ce4

Private vars

72e17fc

shihaohong reviewed May 20, 2020

View reviewed changes

GaryQian added 2 commits May 20, 2020 14:49

Use proper index

7791d6d

Address comments

c401fab

shihaohong approved these changes May 20, 2020

View reviewed changes

GaryQian added the waiting for tree to go green This PR is approved and tested, but waiting for the tree to be green to land. label May 20, 2020

GaryQian mentioned this pull request May 20, 2020

Do locale resolution in embedders flutter/flutter#47087

Closed

fluttergithubbot merged commit 1475c2f into flutter:master May 20, 2020

engine-flutter-autoroll mentioned this pull request May 21, 2020

Roll Engine from 9ce1e5c5c7e7 to ec8c9b0e01b7 (44 revisions) flutter/flutter#57757

Closed

engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request May 21, 2020

1475c2f Send platformResolvedLocale from iOS embedder (flutter/engine…

5be6f90

…#18519)

engine-flutter-autoroll mentioned this pull request May 21, 2020

Roll Engine from 9ce1e5c5c7e7 to 9f4468602cb3 (48 revisions) flutter/flutter#57765

Closed

engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request May 21, 2020

1475c2f Send platformResolvedLocale from iOS embedder (flutter/engine…

4f7c7d6

…#18519)

engine-flutter-autoroll mentioned this pull request May 22, 2020

Roll Engine from 9ce1e5c5c7e7 to c1c7ab96aa2b (49 revisions) flutter/flutter#57769

Closed

engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request May 22, 2020

1475c2f Send platformResolvedLocale from iOS embedder (flutter/engine…

208906b

…#18519)

engine-flutter-autoroll mentioned this pull request May 22, 2020

Roll Engine from 9ce1e5c5c7e7 to 89abc38a159a (51 revisions) flutter/flutter#57771

Closed

engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request May 22, 2020

1475c2f Send platformResolvedLocale from iOS embedder (flutter/engine…

b3e4389

…#18519)

engine-flutter-autoroll mentioned this pull request May 22, 2020

Roll Engine from 9ce1e5c5c7e7 to c5a30b945515 (55 revisions) flutter/flutter#57785

Closed

engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request May 22, 2020

1475c2f Send platformResolvedLocale from iOS embedder (flutter/engine…

e460d24

…#18519)

engine-flutter-autoroll mentioned this pull request May 22, 2020

Roll Engine from 9ce1e5c5c7e7 to d0429b865b4b (56 revisions) flutter/flutter#57790

Closed

engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request May 22, 2020

1475c2f Send platformResolvedLocale from iOS embedder (flutter/engine…

e885837

…#18519)

engine-flutter-autoroll mentioned this pull request May 22, 2020

Roll Engine from 9ce1e5c5c7e7 to 29d31f6e507c (60 revisions) flutter/flutter#57816

Closed

engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request May 22, 2020

1475c2f Send platformResolvedLocale from iOS embedder (flutter/engine…

06a2ec2

…#18519)

engine-flutter-autoroll mentioned this pull request May 22, 2020

Roll Engine from 9ce1e5c5c7e7 to 660b48d08048 (61 revisions) flutter/flutter#57820

Closed

engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request May 22, 2020

1475c2f Send platformResolvedLocale from iOS embedder (flutter/engine…

56a27e7

…#18519)

wandyers pushed a commit to wandyers/engine that referenced this pull request May 23, 2020

Send platformResolvedLocale from iOS embedder (flutter#18519)

e24bbcc

engine-flutter-autoroll mentioned this pull request May 23, 2020

Roll Engine from 9ce1e5c5c7e7 to 42bac718f814 (63 revisions) flutter/flutter#57861

Closed

engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request May 23, 2020

1475c2f Send platformResolvedLocale from iOS embedder (flutter/engine…

9cf491d

…#18519)

engine-flutter-autoroll mentioned this pull request May 26, 2020

Roll Engine from 9ce1e5c5c7e7 to cd5f4983e538 (64 revisions) flutter/flutter#58009

Closed

engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request May 26, 2020

1475c2f Send platformResolvedLocale from iOS embedder (flutter/engine…

62001a2

…#18519)

engine-flutter-autoroll mentioned this pull request May 26, 2020

Roll Engine from 9ce1e5c5c7e7 to fb0b82bdc63f (66 revisions) flutter/flutter#58021

Closed

engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request May 26, 2020

1475c2f Send platformResolvedLocale from iOS embedder (flutter/engine…

c9aeb44

…#18519)

engine-flutter-autoroll mentioned this pull request May 26, 2020

Roll Engine from 9ce1e5c5c7e7 to b76ce04d0848 (67 revisions) flutter/flutter#58025

Closed

engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request May 26, 2020

1475c2f Send platformResolvedLocale from iOS embedder (flutter/engine…

1b32014

…#18519)

engine-flutter-autoroll mentioned this pull request May 26, 2020

Roll Engine from 9ce1e5c5c7e7 to 1a8349888e97 (69 revisions) flutter/flutter#58031

Merged

engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request May 26, 2020

1475c2f Send platformResolvedLocale from iOS embedder (flutter/engine…

9fca6d8

…#18519)

liyuqian mentioned this pull request May 26, 2020

Roll Engine from 9ce1e5c5c7e7 to 1a8349888e97 (69 revisions) flutter/flutter#58041

Closed

swift-kim added a commit to swift-kim/engine that referenced this pull request Jul 16, 2021

Remove unnecessary code from the iOS embedder

b7198b5

The code is dead because flutter#17755 has been reverted by flutter#19136 but flutter#18519 has not been properly reverted.

swift-kim added a commit to swift-kim/engine that referenced this pull request Jul 16, 2021

Remove unnecessary code from the iOS embedder

26f79f0

The code is dead because flutter#17755 has been reverted by flutter#19136, although flutter#18519 has not been properly reverted.

swift-kim mentioned this pull request Jul 16, 2021

Remove dead localization code from the iOS embedder #27472

Merged

8 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Send platformResolvedLocale from iOS embedder #18519

Send platformResolvedLocale from iOS embedder #18519

Uh oh!

GaryQian commented May 20, 2020 •

edited

Loading

Uh oh!

shihaohong May 20, 2020

Uh oh!

GaryQian May 20, 2020

Uh oh!

shihaohong May 20, 2020

Uh oh!

shihaohong May 20, 2020

Uh oh!

shihaohong May 20, 2020

Uh oh!

shihaohong May 20, 2020 •

edited

Loading

Uh oh!

shihaohong May 20, 2020

Uh oh!

shihaohong May 20, 2020 •

edited

Loading

Uh oh!

GaryQian May 20, 2020

Uh oh!

shihaohong left a comment

Uh oh!

Uh oh!

	// Get and pass the user's perferred locale list to dart:ui
	// Get and pass the user's preferred locale list to dart:ui

	// The locales recieved by dart:ui are exposed onBeginFrame via semantics label.
	// The locales received by dart:ui are exposed onBeginFrame via semantics label.

Send platformResolvedLocale from iOS embedder #18519

Send platformResolvedLocale from iOS embedder #18519

Uh oh!

Conversation

GaryQian commented May 20, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

shihaohong May 20, 2020

Choose a reason for hiding this comment

Uh oh!

GaryQian May 20, 2020

Choose a reason for hiding this comment

Uh oh!

shihaohong May 20, 2020

Choose a reason for hiding this comment

Uh oh!

shihaohong May 20, 2020

Choose a reason for hiding this comment

Uh oh!

shihaohong May 20, 2020

Choose a reason for hiding this comment

Uh oh!

shihaohong May 20, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

shihaohong May 20, 2020

Choose a reason for hiding this comment

Uh oh!

shihaohong May 20, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

GaryQian May 20, 2020

Choose a reason for hiding this comment

Uh oh!

shihaohong left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

GaryQian commented May 20, 2020 •

edited

Loading

shihaohong May 20, 2020 •

edited

Loading

shihaohong May 20, 2020 •

edited

Loading