Merge release/25.5 into trunk (#23892)

* Fix layout of cross-post cells

* Replace VERSION_FILE with PUBLIC_VERSION_FILE in current_version_hotfix?

* Update app translations – `Localizable.strings`

* Update WordPress metadata translations

* Update Jetpack metadata translations

* Bump version number

---------

Co-authored-by: kean <[email protected]>
Co-authored-by: Oguz Kocer <[email protected]>

Author: 3 people

WordPress/Classes/ViewRelated/Reader/Cards/ReaderCrossPostCell.swift

@@ -1,8 +1,49 @@
 import Foundation
 import AutomatticTracks
 import WordPressShared
+import WordPressUI
 
 final class ReaderCrossPostCell: ReaderStreamBaseCell {
+    private let view = ReaderCrossPostView()
+    private var contentViewConstraints: [NSLayoutConstraint] = []
+
+    override init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) {
+        super.init(style: style, reuseIdentifier: reuseIdentifier)
+
+        contentView.addSubview(view)
+        view.translatesAutoresizingMaskIntoConstraints = false
+        NSLayoutConstraint.activate([
+            view.topAnchor.constraint(equalTo: contentView.topAnchor),
+            view.bottomAnchor.constraint(equalTo: contentView.bottomAnchor).withPriority(999),
+        ])
+    }
+
+    required init?(coder: NSCoder) {
+        fatalError("Not implemented")
+    }
+
+    override func prepareForReuse() {
+        super.prepareForReuse()
+
+        view.prepareForReuse()
+    }
+
+    func configure(with post: ReaderPost) {
+        view.configure(with: post)
+    }
+
+    override func didUpdateCompact(_ isCompact: Bool) {
+        setNeedsUpdateConstraints()
+    }
+
+    override func updateConstraints() {
+        NSLayoutConstraint.deactivate(contentViewConstraints)
+        contentViewConstraints = view.pinEdges(.horizontal, to: isCompact ? contentView : contentView.readableContentGuide)
+        super.updateConstraints()
+    }
+}
+
+private final class ReaderCrossPostView: UIView {
     private let avatarView = ReaderAvatarView()
     private let iconView = ReaderAvatarView()
     private let headerLabel = UILabel()
@@ -27,22 +68,18 @@ final class ReaderCrossPostCell: ReaderStreamBaseCell {
         .foregroundColor: UIColor.secondaryLabel
     ]
 
-    override init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) {
-        super.init(style: style, reuseIdentifier: reuseIdentifier)
+    override init(frame: CGRect) {
+        super.init(frame: frame)
 
         setupStyle()
         setupLayout()
-
-        selectedBackgroundView = ReaderPostCell.makeSelectedBackgroundView()
     }
 
     required init?(coder: NSCoder) {
         fatalError("Not implemented")
     }
 
-    override func prepareForReuse() {
-        super.prepareForReuse()
-
+    func prepareForReuse() {
         avatarView.prepareForReuse()
     }
 

WordPress/Classes/ViewRelated/Reader/Cards/ReaderPostCell.swift

@@ -5,7 +5,6 @@ import WordPressShared
 
 final class ReaderPostCell: ReaderStreamBaseCell {
     private let view = ReaderPostCellView()
-
     private var contentViewConstraints: [NSLayoutConstraint] = []
 
     static let avatarSize: CGFloat = SiteIconViewModel.Size.small.width
@@ -23,12 +22,6 @@ final class ReaderPostCell: ReaderStreamBaseCell {
         ])
     }
 
-    static func makeSelectedBackgroundView() -> UIView {
-        let view = UIView()
-        view.backgroundColor = UIColor.opaqueSeparator.withAlphaComponent(0.2)
-        return view
-    }
-
     required init?(coder: NSCoder) {
         fatalError("Not implemented")
     }

WordPress/Resources/ar.lproj/Localizable.strings

@@ -319,7 +319,6 @@
 /* Alert dismissal title
    Button label that dismisses the qr log in flow and returns the user back to the previous screen
    Button title, cancel fixing all threats
-   Button title. Cancels a pending action.
    Button title. Tapping it cancels the login flow.
    Cancel a prompt
    Cancel Action
@@ -354,7 +353,6 @@
    Menus cancel button within text bar while editing items.
    Menus: Cancel button title for canceling an edited menu item.
    Option to cancel the email app selection when logging in with magic links
-   The title of a cancel button.
    Title for cancel action. Dismisses the action sheet.
    Title of a button that dismisses the permissions alert
    Title. Title of a cancel button. Tapping disnisses an alert.
@@ -409,12 +407,6 @@
 /* No comment provided by engineer. */
 "Clear Old Activity Logs" = "Изтриване на старата история на активността";
 
-/* Title of an alert prompt. */
-"Clear Search History" = "Изчисти историята на търсенията";
-
-/* Title of a button. */
-"Clear search history" = "Изчистване на историята на търсенията";
-
 /* Label for size of media while it's being cleared. */
 "Clearing..." = "Изчистване...";
 
@@ -638,7 +630,6 @@
 /* Delete
    Delete button title for the warning shown to the user when he refuses to re-login when the authToken is missing.
    Title for button that permanently deletes a media item (photo / video)
-   Title of a delete button
    Title of the trash confirmation alert. */
 "Delete" = "Изтриване";
 
@@ -1186,9 +1177,6 @@
 /* Menus label text displayed when a menu is loading. */
 "Loading menu..." = "Зареждане на менюто...";
 
-/* A short message to inform the user the requested stream is being loaded. */
-"Loading stream..." = "Зареждане на поток...";
-
 /* Loading tags
    Loading. Verb
    Suggestions loading message
@@ -1238,9 +1226,7 @@
 "Main Navigation" = "Основна навигация";
 
 /* Button leading to a screen where users can manage their installed plugins
-   Page title for the screen to manage your list of followed sites.
    Screen title, where users can see all their installed plugins.
-   Title for the Reader Manage screen.
    Verb. Text label. Tapping displays a screen where the user can configure 'share' buttons for third-party services.
    Verb. Title of the screen for managing sharing buttons and settings related to sharing. */
 "Manage" = "Управление";
@@ -1305,7 +1291,6 @@
 /* Accessibility label for more button in dashboard quick start card.
    Accessibility label for the More button in Post List (compact view).
    Accessibility label for the More button on formatting toolbar.
-   Accessibility label for the More button on Reader's post details
    Action button to display more available options */
 "More" = "Още";
 
@@ -1454,7 +1439,6 @@
    A button title.
    Accept Action
    Alert dismissal title
-   Button title. Acknowledges a prompt.
    Button title. An acknowledgement of the message displayed in a prompt.
    Default action
    Dismisses the alert
@@ -1613,9 +1597,6 @@
 /* No comment provided by engineer. */
 "Please enter a username." = "Моля, въведете потребителско име.";
 
-/* Title of a prompt. */
-"Please enter a valid URL" = "Моля въведете валиден адрес";
-
 /* Error message displayed when the user attempts use an invalid email address. */
 "Please enter a valid email address." = "Моля, въвете валиден имейл адрес.";
 
@@ -1660,7 +1641,6 @@
 /* All Time Stats 'Posts' label
    Insights 'Posts' header
    Noun. Title. Links to the blog's Posts screen.
-   Title of a Reader tab showing Posts matching a user's search query
    Title of the screen showing the list of posts for a blog. */
 "Posts" = "Публикации";
 
@@ -1729,10 +1709,7 @@
 
 /* Name of the Reader feature.
    Noun. Name of the Reader feature
-   The accessibility value of the Reader tab.
-   The accessibility value of the reader tab.
-   The default title of the Reader
-   Title of the 'Reader' tab - used for spotlight indexing on iOS. */
+   The accessibility value of the Reader tab. */
 "Reader" = "Четец";
 
 /* Text for the 'Reblog' button. */
@@ -1890,8 +1867,7 @@
    Title of the scheduled filter. This filter shows a list of posts that are scheduled to be published at a future date. */
 "Scheduled" = "Насрочена";
 
-/* Title of Stats section that shows search engine referrer traffic.
-   Title of the Reader's search feature */
+/* Title of Stats section that shows search engine referrer traffic. */
 "Search" = "Търсене";
 
 /* Period Stats 'Search Terms' header */
@@ -1943,8 +1919,7 @@
    Button label to share a web page
    Shares the comment URL
    Spoken accessibility label
-   Title for a button that allows the user to share their answer to the prompt.
-   Verb. Title of a button. Pressing lets the user share a post to others. */
+   Title for a button that allows the user to share their answer to the prompt. */
 "Share" = "Споделяне";
 
 /* Aztec's Text Placeholder
@@ -2373,8 +2348,7 @@
    Button title. Reverts a comment moderation action.
    Button title. Reverts the previous notification operation
    Revert an operation
-   Revert enabling notification after successfully subcribing to the comments for the post.
-   Undo action */
+   Revert enabling notification after successfully subcribing to the comments for the post. */
 "Undo" = "Връщане";
 
 /* Label for size of media when it's not possible to calculate it. */
@@ -2453,7 +2427,8 @@
 /* No comment provided by engineer. */
 "Username must be at least 4 characters." = "Потребителското име трябва да съдържа поне 4 символа.";
 
-/* Blog Users */
+/* Blog Users
+   Noun. Title. Links to the user management feature. */
 "Users" = "Потребители";
 
 /* two factor code placeholder */
@@ -2497,9 +2472,6 @@
 /* The visibility settings of the post. Should be the same as in core WP. */
 "Visibility" = "Достъпност";
 
-/* An option to visit the site to which a specific post belongs */
-"Visit" = "Преглед";
-
 /* A call to action to visit the specified blog.  The '%@' characters are a placholder for the blog name. */
 "Visit %@" = "Преглед %@";
 
@@ -2578,17 +2550,13 @@
 /* WordPress.com Notification Settings Title */
 "WordPress.com Updates" = "Известия от WordPress.com";
 
-/* Asks the user if they would like to clear their search history. */
-"Would you like to clear your search history?" = "Искате ли да изтриете вашата история на търсене?";
-
 /* Placeholder text for inline compose view */
 "Write a reply…" = "Отговор...";
 
 /* Title for the writing section in site settings screen */
 "Writing" = "Писане";
 
-/* Button title. Confirms that the user wants to proceed with a pending action.
-   Label for a button that clears all old activity logs
+/* Label for a button that clears all old activity logs
    Yes */
 "Yes" = "Да";