Skip to content

Commit

Permalink
Feedback: Finalize the don't include email address string
Browse files Browse the repository at this point in the history
Screenshot: http://screen/5hVLaFQbMLxRAJo

Bug: b:185624798
Test: browser_tests --gtest_filter=OSFeedbackBrowserTest.*
Change-Id: I3abcdc4c632997ededd3068336c31615a7a2a8e6
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3707770
Reviewed-by: Michael Checo <michaelcheco@google.com>
Reviewed-by: Xiangdong Kong <xiangdongkong@google.com>
Commit-Queue: Danny Wang <wangdanny@google.com>
Cr-Commit-Position: refs/heads/main@{#1016801}
  • Loading branch information
Zihao-Danny authored and Chromium LUCI CQ committed Jun 22, 2022
1 parent 80fd2e2 commit 838287b
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 1 deletion.
1 change: 1 addition & 0 deletions ash/webui/os_feedback_ui/os_feedback_ui.cc
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@ void AddLocalizedStrings(content::WebUIDataSource* source) {
{"userConsentLabel", IDS_FEEDBACK_TOOL_USER_CONSENT_LABEL},
{"includeSystemInfoAndMetricsCheckboxLabel",
IDS_FEEDBACK_TOOL_INCLUDE_SYSTEM_INFO_AND_METRICS_CHECKBOX_LABEL},
{"anonymousUser", IDS_FEEDBACK_TOOL_ANONYMOUS_EMAIL_OPTION},
};

source->AddLocalizedStrings(kLocalizedStrings);
Expand Down
2 changes: 1 addition & 1 deletion ash/webui/os_feedback_ui/resources/share_data_page.html
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ <h2 id="attachFilesLabel">[[i18n('attachFilesLabel')]]</h2>
<h2 id="userEmailLabel">[[i18n('userEmailLabel')]]</h2>
<select id="userEmailDropDown" aria-labelledby="userEmailLabel">
<option value$="[[feedbackContext.email]]">[[feedbackContext.email]]</option>
<option value="">Don't include email address</option>
<option value="" id="anonymousUser">[[i18n('anonymousUser')]]</option>
</select>
</div>
<!-- User consent -->
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,11 @@ export function shareDataPageTestSuite() {
assertTrue(page.i18nExists('userEmailLabel'));
assertEquals('Email', getElementContent('#userEmailLabel'));

// Verify don't include email address is in the page.
assertTrue(page.i18nExists('anonymousUser'));
assertEquals(
`Don't include email address`, getElementContent('#anonymousUser'));

// Verify the share diagnostic data label is in the page.
assertTrue(page.i18nExists('shareDiagnosticDataLabel'));
assertEquals(
Expand Down
3 changes: 3 additions & 0 deletions chromeos/chromeos_strings.grd
Original file line number Diff line number Diff line change
Expand Up @@ -3428,6 +3428,9 @@ Try tapping the mic to ask me anything.
<message name="IDS_FEEDBACK_TOOL_SEND_BUTTON_LABEL" desc="label for the send button to send feedback.">
Send
</message>
<message name="IDS_FEEDBACK_TOOL_ANONYMOUS_EMAIL_OPTION" desc="Option in the drop down menu to let the user send the feedback report without attaching their email.">
Don't include email address
</message>
<message name="IDS_FEEDBACK_TOOL_SHARE_DIAGNOSTIC_DATA_LABEL" desc="Label showing the share diagnostic data.">
Share diagnostic data
</message>
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
69a6a7a003a50f636091fdce1be12ab934bf15af

0 comments on commit 838287b

Please sign in to comment.