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

Merge release/24.2 to trigger strings.xml update in GlotPress #20177

Merged
merged 26 commits into from
Feb 12, 2024
Merged

Conversation

mokagio
Copy link
Contributor

@mokagio mokagio commented Feb 12, 2024

#20138 added a new string which we need to upload to GlotPress for localization. This requires:

  1. Updating the frozen strings file, via bundle exec fastlane update_frozen_strings_for_translation
  2. Merging the release branch into trunk so that our bot notices the strings change and uploads to GlotPress.

84f2668 is step 1, merging this PR will be step 2.

There are other changes in the release branch that will land on trunk, it would be appropriate to ship a new beta just for consistency. I'll see if I can get to it later.

Gerardo and others added 26 commits February 7, 2024 10:51
The current implementation only ever expects to receive a single category but
to keep most of the old code we are still using a List of categories for the
sub filter logic. That is not needed on the roo SubfilterBottomSheetFragment
though and the presence of the list was causing a crash since the Parcelable
implementation of the SubfilterCategory was not working as expected.

Removing the list from that Fragment and using a single category lets us remove
the `Parcelable` requirement from the SubfilterCategory enum since we can now
deal with a simple Serializable class, therefore fixing the crash.
… the tag in the list when unsubscribed, and only change the follow button status
…ash-subfilter-sheet

[Reader][Crash] Fix Subfilter sheet crash when restoring instance
…llow-tags-logic-manage-screen

[Reader] Update follow tags logic in "Manage Tags & Blogs" screen
…oregroundServiceNotificationException

Create the transient channel used for upload notification when notifications are disabled
…ression

Fix sharing image regression and add support for heic and heif files
@wpmobilebot
Copy link
Contributor

Found 1 violations:

The PR caused the following dependency changes:

-\--- org.wordpress:utils:{strictly 3.12.0} -> 3.12.0
+\--- org.wordpress:utils:{strictly 3.13.0} -> 3.13.0

Please review and act accordingly

@mokagio mokagio added this to the 24.2 ❄️ milestone Feb 12, 2024
@mokagio mokagio added the Releases Label related to managing releases label Feb 12, 2024
@wpmobilebot
Copy link
Contributor

Jetpack📲 You can test the changes from this Pull Request in Jetpack by scanning the QR code below to install the corresponding build.
App NameJetpack Jetpack
FlavorJalapeno
Build TypeDebug
Versionpr20177-84f2668
Commit84f2668
Direct Downloadjetpack-prototype-build-pr20177-84f2668.apk
Note: Google Login is not supported on these builds.

@wpmobilebot
Copy link
Contributor

WordPress📲 You can test the changes from this Pull Request in WordPress by scanning the QR code below to install the corresponding build.
App NameWordPress WordPress
FlavorJalapeno
Build TypeDebug
Versionpr20177-84f2668
Commit84f2668
Direct Downloadwordpress-prototype-build-pr20177-84f2668.apk
Note: Google Login is not supported on these builds.

Copy link

codecov bot commented Feb 12, 2024

Codecov Report

Attention: 45 lines in your changes are missing coverage. Please review.

Comparison is base (15782b1) 40.21% compared to head (84f2668) 40.20%.
Report is 26 commits behind head on trunk.

Files Patch % Lines
.../main/java/org/wordpress/android/AppInitializer.kt 0.00% 45 Missing ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##            trunk   #20177      +/-   ##
==========================================
- Coverage   40.21%   40.20%   -0.01%     
==========================================
  Files        1469     1469              
  Lines       67573    67584      +11     
  Branches    11191    11196       +5     
==========================================
- Hits        27175    27174       -1     
- Misses      37906    37918      +12     
  Partials     2492     2492              

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@mokagio mokagio merged commit b7538b8 into trunk Feb 12, 2024
21 of 23 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Releases Label related to managing releases
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants