Merge changes from beta 19.5.0.1 and editorialized release notes #18201
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
As expected when merging the branch for the release currently in code freeze into an hotfix branch with the purpose of opening a PR to track the hotfix process into the latest release branch, we got conflicts in `config/Version.internal.xcconfig` and `config/Version.public.xcconfig` because both hotfix 19.4.1 and release 19.5 change the version compared to their common ancestor. I resolved the conflict, as usual, by keeping the value from 19.5 which is the latest.
Remove log messages that could crash the app due to missing params.
They are the same between WordPress and Jetpack.
Generated by 🚫 dangerJS |
4 tasks
mokagio
commented
Mar 24, 2022
There was a problem hiding this comment.
- Updates to the localization files (
.stringsand Fastlane metadata) automatically pulled for the new translations that have already been approved in GlotPress – With the caveat from the PR description - Version update in
.xcconfig -
AppStoreStrings.pochanged with editorialized release notes - Diffs from the PRs that made it into this beta
| <!--Warning: Auto-generated file, do not edit.--> | ||
| <plist version="1.0"> | ||
| <dict/> | ||
| </plist> |
There was a problem hiding this comment.
See #18061 for why this and all the other .strings in this diff changed in such a way.
AliSoftware
approved these changes
Mar 24, 2022
There was a problem hiding this comment.
- Changes from bugfix PRs which landed in the release branch
- Version bump in
.xcconfigfiles - Latest app and metadata translations pulled from Glotpress
- As you mentioned, no update to
Localizable.stringsbut that's because of the issue you encountered with them not being properly committed with the new actions; will follow up on that in Ensure all downloaded translations and metadata are committed #18199 InfoPlist.stringsandSites.stringsfiles updated with latest translations, thanks to the new actions and process now properly handling them 🎉
- As you mentioned, no update to
- Editorialized Release Notes for WP+JP are in
Comment on lines
+6
to
+15
| <key>NSCameraUsageDescription</key> | ||
| <string>Um Fotos oder Videos für deine Beiträge aufzunehmen.</string> | ||
| <key>NSLocationUsageDescription</key> | ||
| <string>Darf WordPress zu Beiträgen auf Websites, auf denen du Geotagging aktiviert hast, deinen Standort hinzufügen?</string> | ||
| <key>NSLocationWhenInUseUsageDescription</key> | ||
| <string>Darf WordPress zu Beiträgen auf Websites, auf denen du Geotagging aktiviert hast, deinen Standort hinzufügen?</string> | ||
| <key>NSMicrophoneUsageDescription</key> | ||
| <string>Aktiviere den Mikrofonzugriff, um in deinen Videos Ton aufzeichnen zu können.</string> | ||
| <key>NSPhotoLibraryUsageDescription</key> | ||
| <string>Um deinen Beiträgen Fotos oder Videos hinzuzufügen.</string> |
There was a problem hiding this comment.
Nice to see some translations slowly coming in for those 🎉
Comment on lines
+5
to
+10
| <dict> | ||
| <key>CFBundleDisplayName</key> | ||
| <string>Als Entwurf speichern</string> | ||
| <key>CFBundleName</key> | ||
| <string>Als Entwurf speichern</string> | ||
| </dict> |
Comment on lines
+5
to
+18
| <dict> | ||
| <key>BOl9KQ</key> | ||
| <string>Es gibt ${count} Optionen, die zu „${site}“ passen.</string> | ||
| <key>ILcGmf</key> | ||
| <string>Website</string> | ||
| <key>cyajMn</key> | ||
| <string>Website</string> | ||
| <key>gpCwrM</key> | ||
| <string>Website auswählen</string> | ||
| <key>s4dJhx</key> | ||
| <string>Nur um sicherzugehen, du willst „${site}“?</string> | ||
| <key>tVvJ9c</key> | ||
| <string>Website-Intent auswählen</string> | ||
| </dict> |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Includes:
Notice that the diff doesn't include the usual set of translations. The reason is explained in #18199.
When I noticed that some
.stringswere not committed, I decided not to cancel the build and to still open this PR because:trunkand the beta lane commits on the release branch itself, and since that's protected, I couldn't rewrite the history and try again after Ensure all downloaded translations and metadata are committed #18199 is merged.