Skip to content

Conversation

@gruberb
Copy link
Contributor

@gruberb gruberb commented Dec 10, 2025

Add Strings for v148, as a base for the split of studies toggle in #30988

📜 Tickets

Jira ticket
Bugzilla issue

💡 Description

See #30988 for full changes.

📝 Checklist

  • I filled in the ticket numbers and a description of my work
  • I updated the PR name to follow our PR naming guidelines
  • I ensured unit tests pass and wrote tests for new code
  • If working on UI, I checked and implemented accessibility (Dynamic Text and VoiceOver)
  • If adding telemetry, I read the data stewardship requirements and will request a data review
  • If adding or modifying strings, I read the guidelines and will request a string review from l10n
  • If needed, I updated documentation and added comments to complex code

@gruberb gruberb force-pushed the EXP-5874-strings-v148 branch 2 times, most recently from af44d74 to a17d194 Compare December 10, 2025 13:20
@gruberb gruberb force-pushed the EXP-5874-strings-v148 branch from a17d194 to 2bd1ffd Compare December 10, 2025 23:46
@gruberb
Copy link
Contributor Author

gruberb commented Dec 10, 2025

Should be ready for the final review! Thanks @razvanlitianu for helping with this!

Copy link
Collaborator

@razvanlitianu razvanlitianu left a comment

Choose a reason for hiding this comment

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

lgtm!

@razvanlitianu
Copy link
Collaborator

Oops, moving the strings caused a compilation error because the structure change. I think in this case it's ok to keep them side by side, and move them to the deprecation section only when we actually replace them and they are no longer needed.

@gruberb gruberb force-pushed the EXP-5874-strings-v148 branch from 2bd1ffd to d7e6457 Compare December 11, 2025 11:58
@gruberb
Copy link
Contributor Author

gruberb commented Dec 11, 2025

I can't merge I believe! I added the changes!

value: "Close",
comment: "This is the swipe action title for closing an inactive tab by swiping, located in the Inactive Tabs section of the Tabs Tray")
}
struct v148 {
Copy link
Collaborator

Choose a reason for hiding this comment

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

Build still failing. Can we also move these back?

@gruberb gruberb force-pushed the EXP-5874-strings-v148 branch from d7e6457 to c6d2bbb Compare December 11, 2025 13:57
@mobiletest-ci-bot
Copy link

mobiletest-ci-bot commented Dec 11, 2025

✍️ Strings Updated

Detected changes in Shared/Strings.swift.
To keep strings up to standards, please add a member of the firefox-ios-l10n team as reviewer. 🌍

🧹 Tidy commit

Just 5 file(s) touched. Thanks for keeping it clean and review-friendly!

🙌 Friday high-five

Thanks for pushing us across the finish line this week! 🙌

❌ Per-file test coverage gate

The following changed file(s) are below 35.0% coverage:

File Coverage Required
focus-ios/Blockzilla/UIComponents/UIConstants.swift 0.0% 35.0%

Generated by 🚫 Danger Swift against ec30185

@gruberb
Copy link
Contributor Author

gruberb commented Dec 11, 2025

This swiftlint error looks.... suspicious? 🛑 2383 out of 2383 tests have failed!. Seems like this has nothing to do with my changes?

Also, seems like the IDE I am using is handling " and ' differently. What do you usually use to make sure to get the right ones?

@gruberb gruberb force-pushed the EXP-5874-strings-v148 branch from c6d2bbb to 598e950 Compare December 11, 2025 15:07
@razvanlitianu
Copy link
Collaborator

I just use the default straight quotes from Xcode. If your editor converts them, check the Smart Quotes setting in Xcode or macOS.

@gruberb gruberb force-pushed the EXP-5874-strings-v148 branch from 598e950 to 00b6b6e Compare December 11, 2025 16:34
@gruberb
Copy link
Contributor Author

gruberb commented Dec 11, 2025

Not sure why this fails again...

FATA[16:39:39] [ENVMAN] Failed to add env var: env var (SHOW_WARNING_COUNT_XCUI) value is too large (305.08984375 KB), max allowed size: 256 KB.

@razvanlitianu
Copy link
Collaborator

@mergify rebase

@mergify
Copy link
Contributor

mergify bot commented Dec 11, 2025

rebase

✅ Branch has been successfully rebased

@gruberb
Copy link
Contributor Author

gruberb commented Dec 11, 2025

Seems like Glean can't be pulled:


failed downloading 'https://github.com/mozilla/glean/releases/download/v66.0.1/Glean.xcframework.zip' which is required by binary target 'Glean': /Users/[REDACTED]/Library/Caches/org.swift.swiftpm/artifacts/https___github_com_mozilla_glean_releases_download_v66_0_1_Glean_xcframework_zip already exists in file systemfatalError
Resolved source packages:
  BrowserKit: (null)
  BlockzillaPackage: (null)

2025-12-11 17:44:15.627 xcodebuild[7399:22290] Writing error result bundle to /var/folders/f6/wf2hj3cj75qdwmt5rn814r_00000gn/T/ResultBundle_2025-11-12_17-44-0015.xcresult
xcodebuild: error: Could not resolve package dependencies:
  failed downloading 'https://github.com/mozilla/glean/releases/download/v66.0.1/Glean.xcframework.zip' which is required by binary target 'Glean': /Users/[REDACTED]/Library/Caches/org.swift.swiftpm/artifacts/https___github_com_mozilla_glean_releases_download_v66_0_1_Glean_xcframework_zip already exists in file system
  fatalError

@razvanlitianu
Copy link
Collaborator

@mergify rebase

@mergify
Copy link
Contributor

mergify bot commented Dec 12, 2025

rebase

✅ Branch has been successfully rebased

@razvanlitianu razvanlitianu merged commit 90d2ea0 into mozilla-mobile:main Dec 12, 2025
11 checks passed
@github-actions
Copy link
Contributor

🚀 PR merged to main, targeting version: 147.0

@razvanlitianu
Copy link
Collaborator

@gruberb, thanks for your patience. It seems like some systems were malfunctioning. Finally, the checks passed, and I was able to merge the changes.

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.

3 participants