Commit 9ad83735 authored by Sandor Molnar's avatar Sandor Molnar Committed by smolnar@mozilla.com
Browse files

Revert "Bug 1967506. Change the broken site reporter reasons... 

Revert "Bug 1967506. Change the broken site reporter reasons r=android-reviewers,webcompat-reviewers,android-l10n-reviewers,fluent-reviewers,twisniewski,flod,calu" for causing fenix ui test failures

This reverts commit 329c1aaa.
parent 994e0a3c

browser/components/reportbrokensite/content/reportBrokenSitePanel.inc.xhtml

+6 −12
Original line number Diff line number Diff line
@@ -54,22 +54,16 @@ 
                   disabled="true"

                   selected="selected"

                   data-l10n-id="report-broken-site-panel-reason-choose"/>

      <html:option id="report-broken-site-popup-reason-checkout"

                   data-l10n-id="report-broken-site-panel-reason-checkout"/>

      <html:option id="report-broken-site-popup-reason-load"

                   data-l10n-id="report-broken-site-panel-reason-load"/>

      <html:option id="report-broken-site-popup-reason-slow"

                   data-l10n-id="report-broken-site-panel-reason-slow2"/>

                   data-l10n-id="report-broken-site-panel-reason-slow"/>

      <html:option id="report-broken-site-popup-reason-media"

                   data-l10n-id="report-broken-site-panel-reason-media2"/>

                   data-l10n-id="report-broken-site-panel-reason-media"/>

      <html:option id="report-broken-site-popup-reason-content"

                   data-l10n-id="report-broken-site-panel-reason-content2"/>

                   data-l10n-id="report-broken-site-panel-reason-content"/>

      <html:option id="report-broken-site-popup-reason-account"

                   data-l10n-id="report-broken-site-panel-reason-account2"/>

      <html:option id="report-broken-site-popup-reason-adblocker"

                   data-l10n-id="report-broken-site-panel-reason-adblocker2"/>

      <html:option id="report-broken-site-popup-reason-notsupported"

                   data-l10n-id="report-broken-site-panel-reason-notsupported"/>

                   data-l10n-id="report-broken-site-panel-reason-account"/>

      <html:option id="report-broken-site-popup-reason-adblockers"

                   data-l10n-id="report-broken-site-panel-reason-adblockers"/>

      <html:option id="report-broken-site-popup-reason-other"

                   data-l10n-id="report-broken-site-panel-reason-other"/>

    </html:select>

browser/components/reportbrokensite/test/browser/browser_antitracking_data_sent.js

+1 −1
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ add_task(async function testSendButton() { 
  await blockedPromise;



  await testSend(tab, AppMenu(win), {

    breakageCategory: "adblocker",

    breakageCategory: "adblockers",

    description: "another test description",

    antitracking: {

      blockList: "strict",

browser/components/reportbrokensite/test/browser/browser_reason_dropdown.js

+1 −4
Original line number Diff line number Diff line
@@ -90,14 +90,11 @@ add_task(async function testReasonDropdownRandomized() { 
    const rbs = await AppMenu().openReportBrokenSite();

    const defaultOrder = [

      "choose",

      "checkout",

      "load",

      "slow",

      "media",

      "content",

      "account",

      "adblocker",

      "notsupported",

      "adblockers",

      "other",

    ];

    Assert.deepEqual(

browser/locales/en-US/browser/reportBrokenSite.ftl

+10 −17
Original line number Diff line number Diff line
@@ -14,23 +14,16 @@ report-broken-site-panel-reason-optional-label = What’s broken? (optional) 


report-broken-site-panel-reason-choose =

  .label = Choose reason

report-broken-site-panel-reason-load =

  .label = Site doesn’t load

# These terms are referring to ecommerce websites

report-broken-site-panel-reason-checkout =

  .label = Can’t pay, check out or shop

report-broken-site-panel-reason-slow2 =

  .label = Site is slow

report-broken-site-panel-reason-media2 =

  .label = Video isn’t playing or loading

report-broken-site-panel-reason-content2 =

  .label = Missing content

report-broken-site-panel-reason-account2 =

  .label = Can’t sign in or register

report-broken-site-panel-reason-adblocker2 =

  .label = Site asked to turn off ad blocker

report-broken-site-panel-reason-notsupported =

  .label = Browser isn’t supported or blocked

report-broken-site-panel-reason-slow =

  .label = Site slow or not working

report-broken-site-panel-reason-media =

  .label = Images or videos

report-broken-site-panel-reason-content =

  .label = Buttons, links, and other content

report-broken-site-panel-reason-account =

  .label = Sign-in or sign-out

report-broken-site-panel-reason-adblockers =

  .label = Ad blockers

report-broken-site-panel-reason-other =

  .label = Something else

mobile/android/fenix/app/src/main/java/org/mozilla/fenix/webcompat/middleware/WebCompatReporterSubmissionMiddleware.kt

+1 −1
Original line number Diff line number Diff line
@@ -225,7 +225,7 @@ class WebCompatReporterSubmissionMiddleware( 


    private fun setReasonMetrics(reason: WebCompatReporterState.BrokenSiteReason?) {

        reason?.let {

            BrokenSiteReport.breakageCategory.set(reason.name.lowercase())

            BrokenSiteReport.breakageCategory.set(reason.name)

        }

    }