Merge pull request #5527 from wikimedia/T402696_fix

Fix YIR issues

Author: mazevedofs

WMFComponents/Sources/WMFComponents/Components/Year in Review/View Models/WMFYearInReviewViewModel.swift

@@ -1084,6 +1084,11 @@ public class WMFYearInReviewViewModel: ObservableObject {
 
         let slide = currentSlide
         switch slide {
+        case .contribution(let viewModel):
+            if viewModel.contributionStatus == .noncontributor {
+                return false
+            }
+            break
         default:
             break
         }

Wikipedia/Code/YearInReviewCoordinator.swift

@@ -147,10 +147,10 @@ final class YearInReviewCoordinator: NSObject, Coordinator {
             personalizedYourEditsViewedSlideSubtitle: personalizedYourEditsViewedSlideSubtitle(views:),
             personalizedThankYouTitle: WMFLocalizedString("year-in-review-personalized-donate-title", value: "Your generosity helped keep Wikipedia thriving", comment: "Year in review, personalized donate slide title for users that donated at least once that year. "),
             personalizedThankYouSubtitle: personalizedThankYouSubtitle(languageCode:),
-            personalizedMostReadCategoriesSlideTitle: "Your most interesting categories", // TODO: Localize when we have final product requirements,
-            personalizedMostReadCategoriesSlideSubtitle: personalizedListSlideSubtitle(items:),
+            personalizedMostReadCategoriesSlideTitle: WMFLocalizedString("year-in-review-most-read-categories-title", value: "Your most interesting categories", comment: "Year in review, personalized categories slide title"),
+            personalizedMostReadCategoriesSlideSubtitle: personalizedMostReadCategoriesSlideSubtitle(items:),
             personalizedMostReadArticlesSlideTitle: WMFLocalizedString("year-in-review-personalized-most-read-articles-title", value: "Your top articles", comment: "Year in review, personalized most read articles slide title"),
-            personalizedMostReadArticlesSlideSubtitle: personalizedListSlideSubtitle(items:),
+            personalizedMostReadArticlesSlideSubtitle: personalizedMostReadArticlesSlideSubtitle(items:),
             personalizedLocationSlideTitle: personalizedLocationSlideTitle(countryOrOcean:),
             personalizedLocationSlideSubtitle: personalizedLocationSlideSubtitle(articleNames:),
             noncontributorTitle: noncontributorTitle(),
@@ -744,6 +744,16 @@ final class YearInReviewCoordinator: NSObject, Coordinator {
         return "\(listItems)"
     }
 
+    func personalizedMostReadCategoriesSlideSubtitle(items: [String]) -> String {
+        let format = WMFLocalizedString("year-in-review-categories-slide-subtitle", value: "Categories group articles on similar subjects together. In 2025, you visited articles in these interesting categories multiple times\n%1$@", comment: "Year in review categories slide subtitle, $1 is the list of top categories.")
+        return String.localizedStringWithFormat(format, personalizedListSlideSubtitle(items: items))
+    }
+    
+    func personalizedMostReadArticlesSlideSubtitle(items: [String]) -> String {
+        let format = WMFLocalizedString("year-in-review-articles-slide-subtitle", value: "Here were the articles you visited the most in 2025:\n%1$@", comment: "Year in review articles slide subtitle, $1 is the list of top articles.")
+        return String.localizedStringWithFormat(format, personalizedListSlideSubtitle(items: items))
+    }
+    
     func personalizedLocationSlideTitle(countryOrOcean: String) -> String {
         let format = WMFLocalizedString("year-in-review-personalized-location-title-format", value: "Articles you read are closest to %1$@", comment: "Year in review, personalized location slide title. %1$@ is replaced with a country or ocean name.")
         return String.localizedStringWithFormat(format, countryOrOcean)

Wikipedia/Localizations/en.lproj/Localizable.strings

@@ -1464,6 +1464,7 @@
 "wikitext-upload-save-sign-in" = "Log in";
 "wikitext-upload-save-terms-and-licenses-ccsa4" = "By publishing changes, you agree to the $1Terms of Use$2, and you irrevocably agree to release your contribution under the $3CC BY-SA 4.0$4 License and the $5GFDL$6. You agree that a hyperlink or URL is sufficient attribution under the Creative Commons license.";
 "wikitext-upload-save-terms-name" = "Terms of Use";
+"year-in-review-articles-slide-subtitle" = "Here were the articles you visited the most in 2025:\n$1";
 "year-in-review-base-editors-subtitle" = "The heart and soul of Wikipedia is our global community of volunteer contributors, donors, and billions of readers like yourself – all united to share unlimited access to reliable information.";
 "year-in-review-base-editors-title" = "Editors on the official Wikipedia apps made {{PLURAL:$1|$1 edit|$1 edits}}";
 "year-in-review-base-edits-subtitle" = "Articles are collaboratively created and improved using reliable sources. All of us have knowledge to share, [learn how to participate]($1).";
@@ -1475,6 +1476,7 @@
 "year-in-review-base-viewed-subtitle" = "For people around the world, Wikipedia is the first stop when answering a question, looking up information for school or work, or learning a new fact.";
 "year-in-review-base-viewed-title" = "App users viewed Wikipedia articles {{PLURAL:$1|$1 time|$1 times}}";
 "year-in-review-button-title" = "Year in Review";
+"year-in-review-categories-slide-subtitle" = "Categories group articles on similar subjects together. In 2025, you visited articles in these interesting categories multiple times\n$1";
 "year-in-review-collective-article-views" = "An animated illustration of a computer screen with a web browser open, actively navigating through a Wikipedia article.";
 "year-in-review-collective-edits" = "An illustration of two Wikipedia puzzle pieces, each carrying a piece of information.";
 "year-in-review-collective-edits-per-minute" = "A clock ticking, symbolizing the time spent by people reading Wikipedia.";
@@ -1526,6 +1528,7 @@
 "year-in-review-highlights-title" = "Thank you for spending your year with Wikipedia";
 "year-in-review-intro-exit-toast-title" = "You can access your Year in Review later in Profile.";
 "year-in-review-intro-login-title" = "Log in for personalization";
+"year-in-review-most-read-categories-title" = "Your most interesting categories";
 "year-in-review-non-contributor-slide-title" = "Unlock your contributor reward for next year!";
 "year-in-review-noncontributor-slide-subtitle" = "We’re glad Wikipedia was part of your $1! Unlock a special reward in your $2 Year in Review by becoming a contributor—whether by [editing Wikipedia]($3) or by donating to the [Wikimedia Foundation]($4), the non-profit behind it. If Wikipedia is useful to you, please consider donating to help sustain its future and keep it free, ad-free, trustworthy, and accessible to all.";
 "year-in-review-personalized-date-day-footer-v3" = "Favorite day to read";

Wikipedia/Localizations/qqq.lproj/Localizable.strings

@@ -1464,6 +1464,7 @@
 "wikitext-upload-save-sign-in" = "{{Identical|Log in}}";
 "wikitext-upload-save-terms-and-licenses-ccsa4" = "Text for information about the Terms of Use and edit licenses. Parameters:\n* $1 - app-specific non-text formatting, $2 - app-specific non-text formatting, $3 - app-specific non-text formatting, $4 - app-specific non-text formatting, $5 - app-specific non-text formatting,  $6 - app-specific non-text formatting.";
 "wikitext-upload-save-terms-name" = "This message is used in the message [[Wikimedia:Wikipedia-ios-wikitext-upload-save-terms-and-license]].";
+"year-in-review-articles-slide-subtitle" = "Year in review articles slide subtitle, $1 is the list of top articles.";
 "year-in-review-base-editors-subtitle" = "Year in review, collective edits count slide subtitle.";
 "year-in-review-base-editors-title" = "Year in review, collective edits count slide title, $1 is replaced with the number of edits made on apps, shown in numeric form (e.g. 124,356).";
 "year-in-review-base-edits-subtitle" = "Year in review, collective edits per minute slide subtitle, $1 is replaced with a link to the Mediawiki Apps team FAQ about editing.";
@@ -1475,6 +1476,7 @@
 "year-in-review-base-viewed-subtitle" = "Year in review, collective article view count subtitle.";
 "year-in-review-base-viewed-title" = "Year in review, collective article view count slide title. $1 is replaced with the text representing the number of article views across Wikipedia on apps, shown in numeric form (e.g. 1,000,000,000).";
 "year-in-review-button-title" = "Year in review title. Appears on buttons in the profile and settings menu.";
+"year-in-review-categories-slide-subtitle" = "Year in review categories slide subtitle, $1 is the list of top categories.";
 "year-in-review-collective-article-views" = "Accessibility description for the collective article views slide.";
 "year-in-review-collective-edits" = "Accessibility description for the collective edits slide.";
 "year-in-review-collective-edits-per-minute" = "Accessibility description for the collective edits per minute slide.";
@@ -1526,6 +1528,7 @@
 "year-in-review-highlights-title" = "Title for year in review highlights slide";
 "year-in-review-intro-exit-toast-title" = "Toast displayed to user after the exit Year in Review on the intro slide.";
 "year-in-review-intro-login-title" = "Title of alert that asks user to login if they want to view the personalized feature.";
+"year-in-review-most-read-categories-title" = "Year in review, personalized categories slide title";
 "year-in-review-non-contributor-slide-title" = "Year in review, non contributor slide title";
 "year-in-review-noncontributor-slide-subtitle" = "Year in review, noncontributor slide subtitle. $1 is replaced with the Year in Review target year (e.g. 2025). $2 is replaced with the Year in Review target year + 1 (e.g. 2026). $3 is replaced with a MediaWiki url with more information about editing. $4 is replaced with a MediaWiki url with more information about the Wikimedia Foundation. Do not alter markdown when translating.";
 "year-in-review-personalized-date-day-footer-v3" = "Year in review, personalized slide footer text below the day-of-week that users read the most.";