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

NetP: Fix server location formatting #2099

Merged
merged 1 commit into from
Oct 17, 2023

Conversation

graeme
Copy link
Contributor

@graeme graeme commented Oct 16, 2023

Task/Issue URL: https://app.asana.com/0/0/1205732209997242/f

Description:

The way I was formatting the localised string was definitely the wrong way to do it and stopped working as soon as the actual strings file was generated. I’ve fixed that.

Steps to test this PR:

  1. Launch the app, make sure you’re internal and go to Settings -> Network Protection
  2. Enabled Network protection (disable it first if it’s already enabled)
  3. Check the notification and make sure it’s got the actual server location in it.

Copy Testing:

  • Use of correct apostrophes in new copy, ie rather than

Orientation Testing:

  • Portrait
  • Landscape

Device Testing:

  • iPhone SE (1st Gen)
  • iPhone 8
  • iPhone X
  • iPhone 14 Pro
  • iPad

OS Testing:

  • iOS 14
  • iOS 15
  • iOS 16

Theme Testing:

  • Light theme
  • Dark theme

Internal references:

Software Engineering Expectations
Technical Design Template

Copy link
Contributor

@samsymons samsymons left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, thanks @graeme!

@graeme graeme merged commit 8f6107d into develop Oct 17, 2023
11 checks passed
@graeme graeme deleted the graeme/fix-server-location-formatting branch October 17, 2023 09:27
samsymons added a commit that referenced this pull request Oct 23, 2023
* develop:
  bump BSK (changed dashboard API) (#2111)
  Integrate BSK changes (#2101)
  bump bsk for duckplayer fixes on BigSur (#2106)
  iOS VPN Settings part 1 (#2109)
  Release 7.94.0 (#2107)
  Append build number to metricKit crash version (#2100)
  Disable NetP errors temporarily (#2102)
  NetP: Fix server location formatting (#2099)
  Release 7.93.0 (#2096)
samsymons added a commit that referenced this pull request Oct 27, 2023
* develop: (28 commits)
  Update BSK with autofill 9.0.0 (#2103)
  Add an “Open VPN Settings” quick action (#2089)
  bump BSK (changed dashboard API) (#2111)
  Integrate BSK changes (#2101)
  bump bsk for duckplayer fixes on BigSur (#2106)
  iOS VPN Settings part 1 (#2109)
  Release 7.94.0 (#2107)
  Append build number to metricKit crash version (#2100)
  Disable NetP errors temporarily (#2102)
  NetP: Fix server location formatting (#2099)
  address bar position (#2072)
  Fix privacy tests (#2097)
  Add note about Danger matching rules (#2087)
  Release 7.93.0 (#2096)
  Release 7.93.0 (#2096)
  Update tabs tests (#2088)
  Ignore form factor specific favorites if they're received in Sync response (#2083)
  Update BSK with autofill 8.4.2 (#2084)
  Bump C-S-S to 4.39.0 (#2085)
  BSK hotfix 80.3.0-1 merged to the main branch (#2079)
  ...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants