Skip to content

GitLab

T
tangled
Commit 2528d49a authored by Miriam Zimmerman's avatar Miriam Zimmerman Committed by Commit Bot
Browse files
Options

feedback: Use internationalized title. 

The title was previously set to "Feedback" because of the untranslatable
manifest.json. Instead, use a translatable title string.

BUG=chromium:977523
TEST=set IDS_FEEDBACK_REPORT_APP_TITLE to a unique string, deployed to \
     a VM, opened feedback window, verified that: <title> was expected \
     string; mouseover text in system tray was expected string; name   \
     of app in chrome://inspect was expected string


Change-Id: Iecaf57e704c49dbab499de2cd7404cba5cfdb122
Fixed: chromium:977523
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2248465Reviewed-by: default avatarIan Barkley-Yeung <iby@chromium.org>
Reviewed-by: default avatarIstiaque Ahmed <lazyboy@chromium.org>
Commit-Queue: Miriam Zimmerman <mutexlox@chromium.org>
Cr-Commit-Position: refs/heads/master@{#779901}
parent e78dc587
Hide whitespace changes
Inline Side-by-side
Showing with 30 additions and 19 deletions
chrome/app/generated_resources.grd
View file @ 2528d49a
...@@ -6091,6 +6091,9 @@ the Bookmarks menu."> ...@@ -6091,6 +6091,9 @@ the Bookmarks menu.">
<if expr="enable_extensions"> <if expr="enable_extensions">
<!-- Feedback Dialog --> <!-- Feedback Dialog -->
<message name="IDS_FEEDBACK_REPORT_APP_TITLE" desc="The title of the feedback app as shown in the app switcher and system tray">
Feedback
</message>
<if expr="use_titlecase"> <if expr="use_titlecase">
<message name="IDS_FEEDBACK_REPORT_PAGE_TITLE" desc="Label showing the title of the page that will be reported"> <message name="IDS_FEEDBACK_REPORT_PAGE_TITLE" desc="Label showing the title of the page that will be reported">
Send Feedback to Google Send Feedback to Google
......
chrome/app/generated_resources_grd/IDS_FEEDBACK_REPORT_APP_TITLE.png.sha1 0 → 100644
View file @ 2528d49a
a60245965809c5997540f1264ce91d9022301a1a
\ No newline at end of file
chrome/browser/extensions/api/feedback_private/chrome_feedback_private_delegate.cc
View file @ 2528d49a
...@@ -70,9 +70,10 @@ ChromeFeedbackPrivateDelegate::GetStrings( ...@@ -70,9 +70,10 @@ ChromeFeedbackPrivateDelegate::GetStrings(
std::make_unique<base::DictionaryValue>(); std::make_unique<base::DictionaryValue>();
#define SET_STRING(id, idr) dict->SetString(id, l10n_util::GetStringUTF16(idr)) #define SET_STRING(id, idr) dict->SetString(id, l10n_util::GetStringUTF16(idr))
SET_STRING("page-title", from_crash SET_STRING("pageTitle", from_crash
? IDS_FEEDBACK_REPORT_PAGE_TITLE_SAD_TAB_FLOW ? IDS_FEEDBACK_REPORT_PAGE_TITLE_SAD_TAB_FLOW
: IDS_FEEDBACK_REPORT_PAGE_TITLE); : IDS_FEEDBACK_REPORT_PAGE_TITLE);
SET_STRING("appTitle", IDS_FEEDBACK_REPORT_APP_TITLE);
SET_STRING("additionalInfo", IDS_FEEDBACK_ADDITIONAL_INFO_LABEL); SET_STRING("additionalInfo", IDS_FEEDBACK_ADDITIONAL_INFO_LABEL);
SET_STRING("minimizeBtnLabel", IDS_FEEDBACK_MINIMIZE_BUTTON_LABEL); SET_STRING("minimizeBtnLabel", IDS_FEEDBACK_MINIMIZE_BUTTON_LABEL);
SET_STRING("closeBtnLabel", IDS_FEEDBACK_CLOSE_BUTTON_LABEL); SET_STRING("closeBtnLabel", IDS_FEEDBACK_CLOSE_BUTTON_LABEL);
......
chrome/browser/extensions/component_loader.cc
View file @ 2528d49a
...@@ -533,8 +533,13 @@ void ComponentLoader::AddDefaultComponentExtensionsWithBackgroundPages( ...@@ -533,8 +533,13 @@ void ComponentLoader::AddDefaultComponentExtensionsWithBackgroundPages(
#if BUILDFLAG(GOOGLE_CHROME_BRANDING) #if BUILDFLAG(GOOGLE_CHROME_BRANDING)
install_feedback = true; install_feedback = true;
#endif // BUILDFLAG(GOOGLE_CHROME_BRANDING) #endif // BUILDFLAG(GOOGLE_CHROME_BRANDING)
if (install_feedback) if (install_feedback) {
Add(IDR_FEEDBACK_MANIFEST, base::FilePath(FILE_PATH_LITERAL("feedback"))); AddWithNameAndDescription(
IDR_FEEDBACK_MANIFEST, base::FilePath(FILE_PATH_LITERAL("feedback")),
l10n_util::GetStringUTF8(IDS_FEEDBACK_REPORT_APP_TITLE),
// Description string
l10n_util::GetStringUTF8(IDS_FEEDBACK_REPORT_PAGE_TITLE));
}
#if defined(OS_CHROMEOS) #if defined(OS_CHROMEOS)
AddChromeCameraApp(); AddChromeCameraApp();
......
chrome/browser/resources/feedback/html/default.html
View file @ 2528d49a
<!doctype html> <!doctype html>
<html i18n-values="dir:textdirection;lang:language"> <html i18n-values="dir:textdirection;lang:language">
<head> <head>
<meta charset="utf-8"> <title i18n-content="appTitle"> </title>
<link rel="stylesheet" href="chrome://resources/css/text_defaults.css"> <meta charset="utf-8">
<link rel="stylesheet" href="chrome://resources/css/apps/common.css"></link> <link rel="stylesheet" href="chrome://resources/css/text_defaults.css">
<link rel="stylesheet" href="chrome://resources/css/apps/topbutton_bar.css"> <link rel="stylesheet" href="chrome://resources/css/apps/common.css"></link>
</link> <link rel="stylesheet" href="chrome://resources/css/apps/topbutton_bar.css">
<link rel="stylesheet" href="../css/feedback.css"> </link>
<link rel="stylesheet" href="../css/feedback.css">
<script src="chrome://resources/js/load_time_data.js"></script> <script src="chrome://resources/js/load_time_data.js"></script>
<script src="chrome://resources/js/i18n_template_no_process.js"></script> <script src="chrome://resources/js/i18n_template_no_process.js"></script>
<script src="chrome://resources/js/util.js"></script> <script src="chrome://resources/js/util.js"></script>
<script src="../js/feedback_util.js"></script> <script src="../js/feedback_util.js"></script>
<script src="../js/take_screenshot.js"></script> <script src="../js/take_screenshot.js"></script>
<script src="../js/topbar_handlers.js"></script> <script src="../js/topbar_handlers.js"></script>
<script src="../js/feedback.js"></script> <script src="../js/feedback.js"></script>
</head> </head>
<body> <body>
<div id="title-bar" class="title-bar"> <div id="title-bar" class="title-bar">
<span id="page-title" i18n-content="page-title"></span> <span id="page-title" i18n-content="pageTitle"></span>
<span class="topbutton-bar"> <span class="topbutton-bar">
<button class="minimize-button" id="minimize-button" tabindex="-1" <button class="minimize-button" id="minimize-button" tabindex="-1"
i18n-values="aria-label:minimizeBtnLabel"> i18n-values="aria-label:minimizeBtnLabel">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment