Skip to content

Commit b479d95

Browse files
marco-cmarco-c
committed
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 329c1aaa59321d55bb89d45936e1d3c5bbef1832. UltraBlame original commit: 6df2a83c48b6e4f344e519bebd049dc74c115692
1 parent 77d611a commit b479d95

File tree

7 files changed

+29
-70
lines changed

7 files changed

+29
-70
lines changed

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

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -54,22 +54,16 @@
5454
disabled="true"
5555
selected="selected"
5656
data-l10n-id="report-broken-site-panel-reason-choose"/>
57-
<html:option id="report-broken-site-popup-reason-checkout"
58-
data-l10n-id="report-broken-site-panel-reason-checkout"/>
59-
<html:option id="report-broken-site-popup-reason-load"
60-
data-l10n-id="report-broken-site-panel-reason-load"/>
6157
<html:option id="report-broken-site-popup-reason-slow"
62-
data-l10n-id="report-broken-site-panel-reason-slow2"/>
58+
data-l10n-id="report-broken-site-panel-reason-slow"/>
6359
<html:option id="report-broken-site-popup-reason-media"
64-
data-l10n-id="report-broken-site-panel-reason-media2"/>
60+
data-l10n-id="report-broken-site-panel-reason-media"/>
6561
<html:option id="report-broken-site-popup-reason-content"
66-
data-l10n-id="report-broken-site-panel-reason-content2"/>
62+
data-l10n-id="report-broken-site-panel-reason-content"/>
6763
<html:option id="report-broken-site-popup-reason-account"
68-
data-l10n-id="report-broken-site-panel-reason-account2"/>
69-
<html:option id="report-broken-site-popup-reason-adblocker"
70-
data-l10n-id="report-broken-site-panel-reason-adblocker2"/>
71-
<html:option id="report-broken-site-popup-reason-notsupported"
72-
data-l10n-id="report-broken-site-panel-reason-notsupported"/>
64+
data-l10n-id="report-broken-site-panel-reason-account"/>
65+
<html:option id="report-broken-site-popup-reason-adblockers"
66+
data-l10n-id="report-broken-site-panel-reason-adblockers"/>
7367
<html:option id="report-broken-site-popup-reason-other"
7468
data-l10n-id="report-broken-site-panel-reason-other"/>
7569
</html:select>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ add_task(async function testSendButton() {
2929
await blockedPromise;
3030

3131
await testSend(tab, AppMenu(win), {
32-
breakageCategory: "adblocker",
32+
breakageCategory: "adblockers",
3333
description: "another test description",
3434
antitracking: {
3535
blockList: "strict",

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

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -90,14 +90,11 @@ add_task(async function testReasonDropdownRandomized() {
9090
const rbs = await AppMenu().openReportBrokenSite();
9191
const defaultOrder = [
9292
"choose",
93-
"checkout",
94-
"load",
9593
"slow",
9694
"media",
9795
"content",
9896
"account",
99-
"adblocker",
100-
"notsupported",
97+
"adblockers",
10198
"other",
10299
];
103100
Assert.deepEqual(

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

Lines changed: 10 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -14,23 +14,16 @@ report-broken-site-panel-reason-optional-label = What’s broken? (optional)
1414
1515
report-broken-site-panel-reason-choose =
1616
.label = Choose reason
17-
report-broken-site-panel-reason-load =
18-
.label = Site doesn’t load
19-
# These terms are referring to ecommerce websites
20-
report-broken-site-panel-reason-checkout =
21-
.label = Can’t pay, check out or shop
22-
report-broken-site-panel-reason-slow2 =
23-
.label = Site is slow
24-
report-broken-site-panel-reason-media2 =
25-
.label = Video isn’t playing or loading
26-
report-broken-site-panel-reason-content2 =
27-
.label = Missing content
28-
report-broken-site-panel-reason-account2 =
29-
.label = Can’t sign in or register
30-
report-broken-site-panel-reason-adblocker2 =
31-
.label = Site asked to turn off ad blocker
32-
report-broken-site-panel-reason-notsupported =
33-
.label = Browser isn’t supported or blocked
17+
report-broken-site-panel-reason-slow =
18+
.label = Site slow or not working
19+
report-broken-site-panel-reason-media =
20+
.label = Images or videos
21+
report-broken-site-panel-reason-content =
22+
.label = Buttons, links, and other content
23+
report-broken-site-panel-reason-account =
24+
.label = Sign-in or sign-out
25+
report-broken-site-panel-reason-adblockers =
26+
.label = Ad blockers
3427
report-broken-site-panel-reason-other =
3528
.label = Something else
3629

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,7 @@ class WebCompatReporterSubmissionMiddleware(
225225

226226
private fun setReasonMetrics(reason: WebCompatReporterState.BrokenSiteReason?) {
227227
reason?.let {
228-
BrokenSiteReport.breakageCategory.set(reason.name.lowercase())
228+
BrokenSiteReport.breakageCategory.set(reason.name)
229229
}
230230
}
231231

‎mobile/android/fenix/app/src/main/java/org/mozilla/fenix/webcompat/store/WebCompatReporterStore.kt

Lines changed: 5 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -36,29 +36,20 @@ data class WebCompatReporterState(
3636
* @property displayStringId The string ID corresponding to the reason.
3737
*/
3838
enum class BrokenSiteReason(@StringRes val displayStringId: Int) {
39-
Load(
40-
displayStringId = R.string.webcompat_reporter_reason_load,
41-
),
42-
Checkout(
43-
displayStringId = R.string.webcompat_reporter_reason_checkout,
44-
),
4539
Slow(
46-
displayStringId = R.string.webcompat_reporter_reason_slow2,
40+
displayStringId = R.string.webcompat_reporter_reason_slow,
4741
),
4842
Media(
49-
displayStringId = R.string.webcompat_reporter_reason_media2,
43+
displayStringId = R.string.webcompat_reporter_reason_media,
5044
),
5145
Content(
52-
displayStringId = R.string.webcompat_reporter_reason_content2,
46+
displayStringId = R.string.webcompat_reporter_reason_content,
5347
),
5448
Account(
55-
displayStringId = R.string.webcompat_reporter_reason_account2,
49+
displayStringId = R.string.webcompat_reporter_reason_account,
5650
),
5751
AdBlocker(
58-
displayStringId = R.string.webcompat_reporter_reason_turn_off_adblocker,
59-
),
60-
NotSupported(
61-
displayStringId = R.string.webcompat_reporter_reason_notsupported,
52+
displayStringId = R.string.webcompat_reporter_reason_ad_blocker,
6253
),
6354
Other(
6455
displayStringId = R.string.webcompat_reporter_reason_other,

‎mobile/android/fenix/app/src/main/res/values/strings.xml

Lines changed: 5 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1486,31 +1486,15 @@
14861486

14871487
<!-- These reason strings are dropdown options on a WebCompat reporter form, indicating what is broken on the site. -->
14881488
<!-- Broken site reason text for site slow or not working -->
1489-
<string name="webcompat_reporter_reason_slow" moz:removedIn="140" tools:ignore="UnusedResources">Site slow or not working</string>
1490-
<!-- Broken site reason text for site doesn’t load -->
1491-
<string name="webcompat_reporter_reason_load">Site doesn’t load</string>
1492-
<!-- Broken site reason text for can’t pay, check out or shop -->
1493-
<string name="webcompat_reporter_reason_checkout">Can’t pay, check out or shop</string>
1489+
<string name="webcompat_reporter_reason_slow">Site slow or not working</string>
14941490
<!-- Broken site reason text for images or videos -->
1495-
<string name="webcompat_reporter_reason_media" moz:removedIn="140" tools:ignore="UnusedResources">Images or videos</string>
1491+
<string name="webcompat_reporter_reason_media">Images or videos</string>
14961492
<!-- Broken site reason text for buttons, links, and other content -->
1497-
<string name="webcompat_reporter_reason_content" moz:removedIn="140" tools:ignore="UnusedResources">Buttons, links, and other content</string>
1493+
<string name="webcompat_reporter_reason_content">Buttons, links, and other content</string>
14981494
<!-- Broken site reason text for sign in or sign out -->
1499-
<string name="webcompat_reporter_reason_account" moz:removedIn="140" tools:ignore="UnusedResources">Sign-in or sign-out</string>
1500-
<!-- Broken site reason text for site is slow -->
1501-
<string name="webcompat_reporter_reason_slow2">Site is slow</string>
1502-
<!-- Broken site reason text for video isn’t playing or loading -->
1503-
<string name="webcompat_reporter_reason_media2">Video isn’t playing or loading</string>
1504-
<!-- Broken site reason text for missing content -->
1505-
<string name="webcompat_reporter_reason_content2">Missing content</string>
1506-
<!-- Broken site reason text for can’t sign in or register -->
1507-
<string name="webcompat_reporter_reason_account2">Can’t sign in or register</string>
1495+
<string name="webcompat_reporter_reason_account">Sign-in or sign-out</string>
15081496
<!-- Broken site reason text for ad blocker -->
1509-
<string name="webcompat_reporter_reason_ad_blocker" moz:removedIn="140" tools:ignore="UnusedResources">Ad blocker</string>
1510-
<!-- Broken site reason text for site asked to turn off ad blocker -->
1511-
<string name="webcompat_reporter_reason_turn_off_adblocker">Site asked to turn off ad blocker</string>
1512-
<!-- Broken site reason text for browser isn’t supported or blocked -->
1513-
<string name="webcompat_reporter_reason_notsupported">Browser isn’t supported or blocked</string>
1497+
<string name="webcompat_reporter_reason_ad_blocker">Ad blocker</string>
15141498
<!-- Broken site reason text for something else -->
15151499
<string name="webcompat_reporter_reason_other">Something else</string>
15161500

0 commit comments

Comments
 (0)