Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/trunk' into bug/aztec-headings
Browse files Browse the repository at this point in the history
  • Loading branch information
twstokes committed Jan 31, 2022
2 parents 56ad96f + a678dad commit 4c771b4
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 2 deletions.
2 changes: 1 addition & 1 deletion RELEASE-NOTES.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
-----
* [**] Some of the screens of the app has a new, fresh and more modern visual, including the initial one: My Site. [#17812]
* [*] Block editor: Autocorrected text in headings could become bold for some themes. [#17844]

* [**] Notifications: added a button to mark all notifications in the selected filter as read. [#17840]

19.1
-----
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ enum FeatureFlag: Int, CaseIterable, OverrideableFlag {
case .mySiteDashboard:
return false
case .markAllNotificationsAsRead:
return BuildConfiguration.current ~= [.localDeveloper, .a8cBranchTest, .a8cPrereleaseTesting]
return true
case .followConversationPostDetails:
return true
case .mediaPickerPermissionsNotice:
Expand Down
9 changes: 9 additions & 0 deletions WordPress/Classes/ViewRelated/Reader/WPImageViewController.m
Original file line number Diff line number Diff line change
Expand Up @@ -246,6 +246,7 @@ - (void)updateImageView
[self.imageView sizeToFit];
self.scrollView.contentSize = self.imageView.image.size;
[self centerImage];

}

- (void)loadImageFromURL
Expand Down Expand Up @@ -568,6 +569,14 @@ - (void)setupAccessibility
{
self.imageView.isAccessibilityElement = YES;
self.imageView.accessibilityTraits = UIAccessibilityTraitImage;

if (self.media != nil && self.media.title != nil) {
self.imageView.accessibilityLabel = [NSString stringWithFormat:NSLocalizedString(@"Fullscreen view of image %@. Double tap to dismiss", @"Accessibility label for when image is shown to user in full screen, with instructions on how to dismiss the screen. Placeholder is the title of the image"), self.media.title];
}
else {
self.imageView.accessibilityLabel = NSLocalizedString(@"Fullscreen view of image. Double tap to dismiss", @"Accessibility label for when image is shown to user in full screen, with instructions on how to dismiss the screen");
}

}

- (BOOL)accessibilityPerformEscape
Expand Down

0 comments on commit 4c771b4

Please sign in to comment.