Merge release/26.8 into trunk (#25461)

* Show more detailed application password login errors (#25454)

* Fix colors in post inline comment section (#25456)

* Revert a localizable string change (#25460)

Introduced in #25454, and caused trouble in the release process:

> Inconsistencies found between 'en' and 'zh-Hant':
> `addSite.selfHosted.loadingSiteInfoFailure` expected placeholders for [String] but found [] instead.

* Update strings for localization

* Update app translations – `Localizable.strings`

* Update WordPress metadata translations

* Update Jetpack metadata translations

* Bump version number

---------

Co-authored-by: Tony Li <tony.li@automattic.com>
Co-authored-by: Alex Grebenyuk <alex.grebenyuk@automattic.com>

Author: 3 people

Modules/Sources/WordPressReader/Comments/Views/CommentContentRenderer.swift

@@ -5,6 +5,8 @@ import UIKit
 public protocol CommentContentRenderer: AnyObject {
     var delegate: CommentContentRendererDelegate? { get set }
 
+    var displaySettings: ReaderDisplaySettings { get set }
+
     /// A view for rendering the comments.
     var view: UIView { get }
 

Modules/Sources/WordPressReader/Comments/Views/CommentWebView.swift

@@ -6,14 +6,15 @@ final class CommentWebView: UIView, CommentContentRendererDelegate {
     let renderer = WebCommentContentRenderer()
     lazy var heightConstraint = renderer.view.heightAnchor.constraint(equalToConstant: 20)
 
-    init(comment: String) {
+    init(comment: String, displaySettings: ReaderDisplaySettings = .standard) {
         super.init(frame: .zero)
 
         addSubview(renderer.view)
         renderer.view.pinEdges()
 
         heightConstraint.isActive = true
 
+        renderer.displaySettings = displaySettings
         renderer.delegate = self
         renderer.render(comment: comment)
     }
@@ -43,19 +44,27 @@ final class CommentWebView: UIView, CommentContentRendererDelegate {
     """)
 }
 
+#Preview("Sepia") {
+    makeView(
+        comment: "<p>Thank you so much! You should <a href=\"https:://wordpress.com/\">see it now</a> &#8211; people are losing their minds!</p>\n",
+        displaySettings: ReaderDisplaySettings(color: .sepia, font: .sans, size: .normal)
+    )
+}
+
 #Preview("Media") {
     makeView(comment: """
     <p>Test image in the middle.</p>\n<figure class=\"wp-block-image size-medium\"><img src=\"https://fastly.picsum.photos/id/31/3264/4912.jpg?hmac=lfmmWE3h_aXmRwDDZ7pZb6p0Foq6u86k_PpaFMnq0r8\" alt=\"\" /></figure>\n<p>Text below.</p>\n
     """)
 }
 
 @MainActor
-private func makeView(comment: String) -> UIView {
-    let webView = CommentWebView(comment: comment)
+private func makeView(comment: String, displaySettings: ReaderDisplaySettings = .standard) -> UIView {
+    let webView = CommentWebView(comment: comment, displaySettings: displaySettings)
     webView.layer.borderColor = UIColor.opaqueSeparator.withAlphaComponent(0.66).cgColor
     webView.layer.borderWidth = 0.5
 
     let container = UIView()
+    container.backgroundColor = displaySettings.color.background
     container.addSubview(webView)
     webView.pinEdges(insets: UIEdgeInsets(.all, 16))
 

Modules/Sources/WordPressReader/Comments/Views/WebCommentContentRenderer.swift

@@ -20,7 +20,7 @@ public final class WebCommentContentRenderer: NSObject, CommentContentRenderer {
 
     /// It can't be changed at the moment, but this capability was included from the
     /// start, and this implementation continues supporting it.
-    private var displaySetting = ReaderDisplaySettings.standard
+    public var displaySettings = ReaderDisplaySettings.standard
 
     /// - warning: This has to be configured _before_ you render.
     public var tintColor: UIColor {
@@ -109,7 +109,7 @@ extension WebCommentContentRenderer: WKNavigationDelegate {
                 /// The display setting's custom size is applied through the HTML's initial-scale property
                 /// in the meta tag. The `scrollHeight` value seems to return the height as if it's at 1.0 scale,
                 /// so we'll need to add the custom scale into account.
-                let actualHeight = round(height * self.displaySetting.size.scale)
+                let actualHeight = round(height * self.displaySettings.size.scale)
                 self.delegate?.renderer(self, asyncRenderCompletedWithHeight: actualHeight, comment: comment)
             }
         }
@@ -175,8 +175,8 @@ private extension WebCommentContentRenderer {
     }
 
     private func actuallyMakeHead() -> String {
-        let meta = "width=device-width,initial-scale=\(displaySetting.size.scale),maximum-scale=\(displaySetting.size.scale),user-scalable=no,shrink-to-fit=no"
-        let styles = displaySetting.makeStyles(tintColor: webView.tintColor)
+        let meta = "width=device-width,initial-scale=\(displaySettings.size.scale),maximum-scale=\(displaySettings.size.scale),user-scalable=no,shrink-to-fit=no"
+        let styles = displaySettings.makeStyles(tintColor: webView.tintColor)
         return String(format: Self.headTemplate, meta, styles)
     }
 

Modules/Sources/WordPressReader/Settings/ReaderDisplaySettings+WebKit.swift

@@ -26,7 +26,7 @@ extension ReaderDisplaySettings {
         :root {
             --text-font: \(font.cssString);
             --link-font-weight: \(color == .system ? "inherit" : "600");
-            --link-text-decoration: \(color == .system ? "inherit" : "underline");
+            --link-text-decoration: underline;
         }
 
         @media(prefers-color-scheme: light) {
@@ -44,6 +44,7 @@ extension ReaderDisplaySettings {
     /// - parameter interfaceStyle: The current `UIUserInterfaceStyle` value.
     private func makeColors(interfaceStyle: UIUserInterfaceStyle, tintColor: UIColor) -> String {
         let trait = UITraitCollection(userInterfaceStyle: interfaceStyle)
+        let tintColor = color == .system ? tintColor : color.foreground
         return """
         :root {
             --text-color: \(color.foreground.color(for: trait).cssHex);

Modules/Sources/WordPressReader/Settings/ReaderDisplaySettings.swift

@@ -166,9 +166,9 @@ public struct ReaderDisplaySettings: Codable, Equatable, Hashable, Sendable {
             case .system:
                 return .tertiaryLabel
             case .evening, .oled, .hacker:
-                return foreground.withAlphaComponent(0.8) // slightly higher contrast for dark themes.
+                return foreground.withAlphaComponent(0.45) // slightly higher contrast for dark themes.
             default:
-                return foreground.withAlphaComponent(0.6)
+                return foreground.withAlphaComponent(0.33)
             }
         }
 

WordPress/Classes/Login/SelfHostedSiteAuthenticator.swift

@@ -65,7 +65,8 @@ struct SelfHostedSiteAuthenticator {
     enum SignInError: Error, LocalizedError {
         case authentication(Error)
         case xmlrpcDisabled(Error)
-        case loadingSiteInfoFailure
+        case xmlrpcEndpointNotFound
+        case loadingSiteInfoFailure(Error)
         case savingSiteFailure
         case mismatchedUser(expectedUsername: String)
         case cancelled
@@ -74,6 +75,8 @@ struct SelfHostedSiteAuthenticator {
             switch self {
             case .authentication(let error):
                 return error.localizedDescription
+            case .xmlrpcEndpointNotFound:
+                return NSLocalizedString("addSite.selfHosted.xmlrpcEndpointNotFound", value: "Could not determine the site's XML-RPC endpoint", comment: "Error message when the app cannot find the XML-RPC endpoint of a self-hosted WordPress site")
             case .loadingSiteInfoFailure:
                 return NSLocalizedString("addSite.selfHosted.loadingSiteInfoFailure", value: "Cannot load the WordPress site details", comment: "Error message shown when failing to load details from a self-hosted WordPress site")
             case .savingSiteFailure:
@@ -264,7 +267,7 @@ struct SelfHostedSiteAuthenticator {
         let xmlrpc = (try? await discoverXMLRPCEndpoint(site: credentials.siteUrl))
             ?? URL(string: credentials.siteUrl)?.appending(component: "xmlrpc.php")
         guard let xmlrpc else {
-            throw .loadingSiteInfoFailure
+            throw .xmlrpcEndpointNotFound
         }
 
         let api = WordPressAPI(
@@ -273,13 +276,15 @@ struct SelfHostedSiteAuthenticator {
             authentication: WpAuthentication(username: credentials.userLogin, password: credentials.password)
         )
 
-        let siteSettings: SiteSettingsWithViewContext
+        let siteSettings: SiteSettingsWithViewContext?
         let isAdmin: Bool
         let jetpackSite: RemoteBlog?
         let jetpackConnection: JetpackConnectionData?
         let xmlrpcOptions: [AnyHashable: Any]?
         do {
-            async let siteSettings_ = api.siteSettings.retrieveWithViewContext().data
+            // site settings is only available to admin users. Ignore errors for now,
+            // since we need to allow other users to sign in to the app too.
+            async let siteSettings_ = try? api.siteSettings.retrieveWithViewContext().data
             async let isAdmin_ = api.users.retrieveMeWithEditContext().data.roles.contains(.administrator)
             async let jetpackSite_ = fetchJetpackSite(apiRootURL: apiRootURL, credentials: credentials)
             async let jetpackConnection_ = fetchJetpackConnectionData(apiRootURL: apiRootURL, credentials: credentials)
@@ -288,7 +293,7 @@ struct SelfHostedSiteAuthenticator {
             (siteSettings, isAdmin, jetpackSite, jetpackConnection, xmlrpcOptions) =
                 try await (siteSettings_, isAdmin_, jetpackSite_, jetpackConnection_, xmlrpcOptions_)
         } catch {
-            throw .loadingSiteInfoFailure
+            throw .loadingSiteInfoFailure(error)
         }
 
         let blog: TaggedManagedObjectID<Blog>
@@ -306,7 +311,7 @@ struct SelfHostedSiteAuthenticator {
 
                 blog.isAdmin = isAdmin
                 blog.addSettingsIfNecessary()
-                blog.settings?.name = siteSettings.title
+                blog.settings?.name = siteSettings?.title
 
                 blog.options = (xmlrpcOptions ?? [:])
                     .merging(
@@ -327,12 +332,12 @@ struct SelfHostedSiteAuthenticator {
                     }
                 }
 
-                if blog.getOptionString(name: "blog_title") == nil {
-                    blog.setValue(siteSettings.title, forOption: "blog_title")
+                if blog.getOptionString(name: "blog_title") == nil, let title = siteSettings?.title {
+                    blog.setValue(title, forOption: "blog_title")
                 }
 
-                if blog.getOptionString(name: "timezone") == nil {
-                    blog.setValue(siteSettings.timezone, forOption: "timezone")
+                if blog.getOptionString(name: "timezone") == nil, let timezone = siteSettings?.timezone {
+                    blog.setValue(timezone, forOption: "timezone")
                 }
 
                 if blog.getOptionString(name: "gmt_offset") == nil, let offset = apiDetails.gmtOffset() {

WordPress/Classes/ViewRelated/Comments/Views/Detail/CommentContentTableViewCell.swift

@@ -113,7 +113,7 @@ final class CommentContentTableViewCell: UITableViewCell, NibReusable {
     /// can be scoped by using the "legacy" style when the passed parameter is nil.
     private var style: CellStyle = .init(displaySetting: nil)
 
-    var displaySetting: ReaderDisplaySettings? = nil {
+    var displaySetting: ReaderDisplaySettings = .standard {
         didSet {
             style = CellStyle(displaySetting: displaySetting)
             applyStyles()
@@ -377,20 +377,17 @@ private extension CommentContentTableViewCell {
         dateLabel?.font = style.dateFont
         dateLabel?.textColor = style.dateTextColor
 
-        accessoryButton?.tintColor = .secondaryLabel
         accessoryButton?.setImage(accessoryButtonImage, for: .normal)
         accessoryButton?.addTarget(self, action: #selector(accessoryButtonTapped), for: .touchUpInside)
 
         replyButton.configuration = makeReactionButtonConfiguration(image: UIImage(named: "icon-reader-comment-reply"))
         replyButton.configuration?.contentInsets.leading = 0
-        replyButton.tintColor = .secondaryLabel
         replyButton.setTitle(.reply, for: .normal)
         replyButton.addTarget(self, action: #selector(replyButtonTapped), for: .touchUpInside)
         replyButton.maximumContentSizeCategory = .accessibilityMedium
         replyButton.accessibilityIdentifier = .replyButtonAccessibilityId
 
         likeButton.configuration = makeReactionButtonConfiguration(image: WPStyleGuide.ReaderDetail.likeToolbarIcon)
-        likeButton.tintColor = .secondaryLabel
 
         likeButton.addTarget(self, action: #selector(likeButtonTapped), for: .touchUpInside)
         likeButton.maximumContentSizeCategory = .accessibilityMedium
@@ -422,6 +419,11 @@ private extension CommentContentTableViewCell {
 
         dateLabel?.font = style.dateFont
         dateLabel?.textColor = style.dateTextColor
+
+        replyButton?.tintColor = displaySetting.color.secondaryForeground
+        likeButton?.tintColor = displaySetting.color.secondaryForeground
+
+        accessoryButton?.tintColor = displaySetting.color.secondaryForeground
     }
 
     private func getShowMoreOverlay() -> UIView {
@@ -461,7 +463,7 @@ private extension CommentContentTableViewCell {
     }
 
     func updateLikeButton(isLiked: Bool, likeCount: Int) {
-        likeButton.tintColor = isLiked ? UIAppColor.primary : .secondaryLabel
+        likeButton.tintColor = isLiked ? UIAppColor.primary : displaySetting.color.secondaryForeground
         if var configuration = likeButton.configuration {
             configuration.image = isLiked ? WPStyleGuide.ReaderDetail.likeSelectedToolbarIcon : WPStyleGuide.ReaderDetail.likeToolbarIcon
             configuration.title = likeCount > 0 ? "\(likeCount)" : String.noLikes
@@ -489,6 +491,8 @@ private extension CommentContentTableViewCell {
             return renderer
         }()
 
+        renderer.displaySettings = displaySetting
+
         configureContentView(contentHeight: helper.getCachedContentHeight(for: content))
 
         let contentView = renderer.view

WordPress/Classes/ViewRelated/Reader/Detail/Views/ReaderDetailCommentsTableViewDelegate.swift

@@ -167,6 +167,7 @@ private extension ReaderDetailCommentsTableViewDelegate {
         }
 
         cell.displaySetting = displaySetting
+
         cell.configureForPostDetails(with: comment, helper: helper) { _ in
             do {
                 try WPException.objcTry {
@@ -215,12 +216,13 @@ private extension ReaderDetailCommentsTableViewDelegate {
         configuration.title = Constants.viewAllButtonTitle.localizedCapitalized + "   \(totalComments)"
         configuration.image = UIImage(systemName: "chevron.right")
         configuration.imagePlacement = .trailing
-        configuration.titleTextAttributesTransformer = .init {
+        configuration.titleTextAttributesTransformer = .init { [displaySetting] in
             var container = $0
+            container.foregroundColor = displaySetting.color.foreground
             container.font = UIFont.preferredFont(forTextStyle: .headline).withWeight(.medium)
             return container
         }
-        configuration.preferredSymbolConfigurationForImage = UIImage.SymbolConfiguration(paletteColors: [.tertiaryLabel])
+        configuration.preferredSymbolConfigurationForImage = UIImage.SymbolConfiguration(paletteColors: [displaySetting.color.tertiatyForeground])
             .applying(UIImage.SymbolConfiguration(font: UIFont.preferredFont(forTextStyle: .caption2).withWeight(.bold)))
         configuration.imagePadding = 4
         configuration.contentInsets = .init(top: 9, leading: 12, bottom: 9, trailing: 12)

WordPress/Resources/ar.lproj/Localizable.strings

@@ -1,4 +1,4 @@
-/* Translation-Revision-Date: 2026-03-24 13:58:13+0000 */
+/* Translation-Revision-Date: 2026-03-25 19:54:39+0000 */
 /* Plural-Forms: nplurals=6; plural=(n == 0) ? 0 : ((n == 1) ? 1 : ((n == 2) ? 2 : ((n % 100 >= 3 && n % 100 <= 10) ? 3 : ((n % 100 >= 11 && n % 100 <= 99) ? 4 : 5)))); */
 /* Generator: GlotPress/4.0.3 */
 /* Language: ar */
@@ -10154,6 +10154,42 @@ Example: Reply to Pamela Nguyen */
 /* Menu title for the visit site option */
 "mySite.siteActions.visitSite" = "زيارة الموقع";
 
+/* Button to confirm to switch to the New Stats announcement screen */
+"newStats.announcement.continueButton" = "ابدأ الآن";
+
+/* Disclosure at the bottom of the New Stats announcement screen, informing users they can opt out */
+"newStats.announcement.disclosure" = "لست مستعدًا للتبديل؟ يمكنك إيقاف تشغيل الإحصائيات الجديدة من قائمة \"المزيد\" في تبويب الإحصائيات.";
+
+/* Feature description: navigation moved to the bottom for thumb-friendly access */
+"newStats.announcement.feature.bottomNav.description" = "أصبح التنقل وأداة اختيار التاريخ الآن في أسفل الشاشة - تمامًا حيث يوجد إبهامك.";
+
+/* Feature title: navigation moved to the bottom */
+"newStats.announcement.feature.bottomNav.title" = "وصول أسهل";
+
+/* Feature description: flexible date picker with presets, custom ranges, and comparisons */
+"newStats.announcement.feature.datePicker.description" = "اختر من الإعدادات المسبقة الشائعة أو حدد نطاقًا زمنيًا مخصصًا مع فترة مقارنة - كل ذلك بنقرة واحدة.";
+
+/* Feature title: flexible date picker */
+"newStats.announcement.feature.datePicker.title" = "أي فترة، أي نطاق";
+
+/* Feature description: feature parity with the web version of Stats */
+"newStats.announcement.feature.parity.description" = "الأجهزة، وUTM، والمواقع، وWordAds - نفس البيانات التي تحصل عليها في WordPress.com.";
+
+/* Feature title: feature parity with the web version of Stats */
+"newStats.announcement.feature.parity.title" = "مماثلة لنسخة الويب";
+
+/* Feature description: trends shown for all metrics with comparison to previous period */
+"newStats.announcement.feature.trends.description" = "يوضح كل مقياس اتجاهه مقارنة بالفترة السابقة، لتعرف دائمًا ما إذا كنت تحقق نموًا.";
+
+/* Feature title: trends visible for all metrics */
+"newStats.announcement.feature.trends.title" = "لمحة عن الاتجاهات";
+
+/* Subtitle for the New Stats announcement screen */
+"newStats.announcement.subtitle" = "طريقة أفضل لفهم أداء موقعك الإلكتروني - مفعلة الآن افتراضيًا.";
+
+/* Title for the New Stats announcement screen */
+"newStats.announcement.title" = "إحصاءات جديدة";
+
 /* A no results message displayed on the atomic logs screen. */
 "noLogs.empty" = "لا توجد إدخالات سجل في هذا النطاق الزمني";
 

WordPress/Resources/cs.lproj/Localizable.strings

@@ -1,4 +1,4 @@
-/* Translation-Revision-Date: 2026-03-24 10:13:49+0000 */
+/* Translation-Revision-Date: 2026-03-24 22:05:34+0000 */
 /* Plural-Forms: nplurals=3; plural=(n == 1) ? 0 : ((n >= 2 && n <= 4) ? 1 : 2); */
 /* Generator: GlotPress/4.0.3 */
 /* Language: cs_CZ */
@@ -7976,6 +7976,9 @@ Example: Reply to Pamela Nguyen */
 /* Tab title for trashed posts */
 "customPostTab.trash" = "Koš";
 
+/* Badge label indicating that custom post type support is a beta feature. Displayed next to the navigation title. */
+"customPostType.navigation.betaBadge" = "BETA";
+
 /* Empty state message when there are no custom post types to display */
 "customPostTypes.emptyState.message" = "Žádné vlastní typy příspěvků";