Bugfix FXIOS-15330 #32907 Suspension marks missing on multi language flow (#32980)

Author: razvanlitianu

firefox-ios/Client/Frontend/Browser/MainMenu/MainMenuConfigurationUtility.swift

@@ -421,7 +421,7 @@ struct MainMenuConfigurationUtility: Equatable, FeatureFlaggable {
               translationConfig.isTranslationFeatureEnabled,
               translationConfig.state != nil
         else { return nil }
-
+        let isMultiLanguageFlow = translationConfig.isMultiLanguageFlow
         let isActive = translationConfig.state == .active
         let infoTitle: String
         if isActive, let langCode = translationConfig.translatedToLanguage {
@@ -437,10 +437,17 @@ struct MainMenuConfigurationUtility: Equatable, FeatureFlaggable {
               )
             : .MainMenu.ToolsSection.Translation.TranslatePageTitle
 
+        let title: String
+        if isActive {
+            title = isMultiLanguageFlow ? .MainMenu.ToolsSection.Translation.TranslatedPageTitleMultiLanguage
+                                        : .MainMenu.ToolsSection.Translation.TranslatedPageTitle
+        } else {
+            title = isMultiLanguageFlow ? .MainMenu.ToolsSection.Translation.TranslatePageTitleMultiLanguage
+                                        : .MainMenu.ToolsSection.Translation.TranslatePageTitle
+        }
+
         return MenuElement(
-            title: isActive
-                ? .MainMenu.ToolsSection.Translation.TranslatedPageTitle
-                : .MainMenu.ToolsSection.Translation.TranslatePageTitle,
+            title: title,
             iconName: Icons.translate,
             isEnabled: true,
             isActive: isActive,

firefox-ios/Client/Frontend/Browser/MainMenu/MainMenuCoordinator.swift

@@ -168,18 +168,31 @@ class MainMenuCoordinator: BaseCoordinator, FeatureFlaggable {
             let translationConfig = toolbarState?.addressToolbar.translationConfiguration
             let isTranslated = translationConfig?.state == .active
             let translatedLanguage = translationConfig?.translatedToLanguage
+            let isSingleLanguageFlow = if let translationConfig {
+                !translationConfig.isMultiLanguageFlow
+            } else {
+                false
+            }
             let prefs = profile.prefs
             Task {
                 let manager = PreferredTranslationLanguagesManager(prefs: prefs)
                 let supported = await ASTranslationModelsFetcher.shared.fetchSupportedTargetLanguages()
                 let languages = manager.preferredLanguages(supportedTargetLanguages: supported)
-                store.dispatch(GeneralBrowserAction(
-                    translationLanguages: languages,
-                    isPageTranslated: isTranslated,
-                    translatedToLanguage: translatedLanguage,
-                    windowUUID: windowUUID,
-                    actionType: GeneralBrowserActionType.showTranslationLanguagePicker
-                ))
+                if isSingleLanguageFlow, let language = languages.first, !isTranslated {
+                    store.dispatch(TranslationLanguageSelectedAction(
+                        windowUUID: windowUUID,
+                        targetLanguage: language,
+                        actionType: TranslationsActionType.didSelectTargetLanguage
+                    ))
+                } else {
+                    store.dispatch(GeneralBrowserAction(
+                        translationLanguages: languages,
+                        isPageTranslated: isTranslated,
+                        translatedToLanguage: translatedLanguage,
+                        windowUUID: windowUUID,
+                        actionType: GeneralBrowserActionType.showTranslationLanguagePicker
+                    ))
+                }
             }
         }
     }

firefox-ios/Client/Frontend/Browser/Toolbars/Redux/TranslationsConfiguration.swift

@@ -65,6 +65,13 @@ struct TranslationConfiguration: Equatable, FeatureFlaggable {
         self.translatedToLanguage = translatedToLanguage
     }
 
+    var isMultiLanguageFlow: Bool {
+        guard featureFlags.isFeatureEnabled(.translationLanguagePicker, checking: .buildOnly) else { return false }
+        guard let stored = prefs.stringForKey(PrefsKeys.Settings.translationPreferredLanguages),
+              !stored.isEmpty else { return false }
+        return stored.components(separatedBy: ",").count != 1
+    }
+
     /// Determines whether to show the translate icon on the toolbar
     /// The experiment needs to be turned on and the user settings needs to be enabled
     /// If user has not toggled the settings, then we enable the feature by default

firefox-ios/Shared/Strings.swift

@@ -5652,6 +5652,18 @@ extension String {
                     value: "Translated",
                     comment: "On the main menu, the title for the action that shows that the content of the webpage is already translated.")
 
+                public static let TranslatePageTitleMultiLanguage = MZLocalizedString(
+                    key: "MainMenu.ToolsSection.Translation.Title.v151",
+                    tableName: "MainMenu",
+                    value: "Translate Page…",
+                    comment: "On the main menu, in the multi-language translation flow, the title for the action that will open a language picker to choose a language and translate the content of the webpage. The ellipsis indicates that a language picker will open.")
+
+                public static let TranslatedPageTitleMultiLanguage = MZLocalizedString(
+                    key: "MainMenu.ToolsSection.Translation.Translated.Title.v151",
+                    tableName: "MainMenu",
+                    value: "Translated…",
+                    comment: "On the main menu, in the multi-language translation flow, the title for the action that shows the content of the webpage has been translated. Tapping opens a language picker to change the language. The ellipsis indicates that a language picker will open.")
+
                 public static let Off = MZLocalizedString(
                     key: "MainMenu.ToolsSection.Translation.Off.v151",
                     tableName: "MainMenu",

firefox-ios/firefox-ios-tests/Tests/ClientTests/MainMenu/MainMenuConfigurationUtilityTests.swift

@@ -95,7 +95,7 @@ final class MainMenuConfigurationUtilityTests: XCTestCase {
         )
         let allTitles = sections.flatMap { $0.options }.map { $0.title }
 
-        XCTAssertFalse(allTitles.contains(.MainMenu.ToolsSection.Translation.TranslatePageTitle))
+        XCTAssertFalse(allTitles.contains(.MainMenu.ToolsSection.Translation.TranslatePageTitleMultiLanguage))
     }
 
     func test_translateItem_inactive_whenStateIsInactive() {
@@ -122,6 +122,45 @@ final class MainMenuConfigurationUtilityTests: XCTestCase {
         let config = TranslationConfiguration(prefs: mockProfile.prefs, state: .active, translatedToLanguage: "fr")
         let tabInfo = getTabInfo(translationConfiguration: config)
 
+        let sections = configUtility.generateMenuElements(
+            with: tabInfo,
+            and: windowUUID,
+            isExpanded: true,
+            localeProvider: MockLocaleProvider(current: Locale(identifier: "en"))
+        )
+        let allItems = sections.flatMap { $0.options }
+        let title = String.MainMenu.ToolsSection.Translation.TranslatedPageTitle
+        let translateItem = allItems.first { $0.title == title }
+
+        XCTAssertNotNil(translateItem)
+    }
+
+    func test_translateItem_singleLanguage_inactive_showsNoEllipsis() {
+        setLanguagePickerEnabled(true)
+        let mockProfile = MockProfile()
+        mockProfile.prefs.setString("en", forKey: PrefsKeys.Settings.translationPreferredLanguages)
+        let config = TranslationConfiguration(prefs: mockProfile.prefs, state: .inactive)
+        let tabInfo = getTabInfo(translationConfiguration: config)
+
+        let sections = configUtility.generateMenuElements(
+            with: tabInfo,
+            and: windowUUID,
+            isExpanded: true,
+            localeProvider: MockLocaleProvider(current: Locale(identifier: "en"))
+        )
+        let allItems = sections.flatMap { $0.options }
+        let translateItem = allItems.first { $0.title == .MainMenu.ToolsSection.Translation.TranslatePageTitle }
+
+        XCTAssertNotNil(translateItem)
+    }
+
+    func test_translateItem_singleLanguage_active_showsNoEllipsis() {
+        setLanguagePickerEnabled(true)
+        let mockProfile = MockProfile()
+        mockProfile.prefs.setString("en", forKey: PrefsKeys.Settings.translationPreferredLanguages)
+        let config = TranslationConfiguration(prefs: mockProfile.prefs, state: .active, translatedToLanguage: "en")
+        let tabInfo = getTabInfo(translationConfiguration: config)
+
         let sections = configUtility.generateMenuElements(
             with: tabInfo,
             and: windowUUID,