[i18n] components directory to $i18n{}

chrome/browser/ui/webui/version_ui.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/webui/version_ui.h"
 
 #include "base/command_line.h"
 #include "base/i18n/message_formatter.h"
 #include "base/memory/ptr_util.h"
 #include "base/time/time.h"
@@ skipping 140 matching lines @@
   html_source->AddString(version_ui::kCompiler, "MSVC 2017");
 #endif
 #elif defined(_MSC_VER)
 #error "Unsupported version of MSVC."
 #else
   html_source->AddString(version_ui::kCompiler, "Unknown");
 #endif
 
   base::string16 update_cohort_name =
       install_static::InstallDetails::Get().update_cohort_name();
   if (!update_cohort_name.empty()) {

[Lei Zhang, 2017/06/17 06:23:15]

How about:

base::string16 display_cohort_name;
if (!update_cohort_name.empty()) {
  display_cohort_name = l10n_util::GetStringFUTF16(IDS_VERSION_UI_COHORT_NAME,
                                                   update_cohort_name);
}
html_source->AddString(version_ui::kUpdateCohortName, display_cohort_name);


I noted as is, one branch is using base::string16 and the other is using
std::string.

     html_source->AddString(version_ui::kUpdateCohortName,
                            l10n_util::GetStringFUTF16(
                                IDS_VERSION_UI_COHORT_NAME, update_cohort_name));
+  } else {
+    html_source->AddString(version_ui::kUpdateCohortName, std::string());

[Lei Zhang, 2017/06/17 06:23:15]

Is this because $i18n{update_cohort_name} cannot tolerate a non-existent string,
whereas i18n-content="update_cohort_name" can?

[dschuyler, 2017/06/19 19:24:53]

It is by design that $i18n won't allow the mistake of leaving out a translation
string, while i18n-content provides no such developer support.

   }
 #endif  // defined(OS_WIN)
 
   html_source->SetJsonPath("strings.js");
   html_source->AddResourcePath(version_ui::kVersionJS, IDR_VERSION_UI_JS);
   html_source->AddResourcePath(version_ui::kAboutVersionCSS,
                                IDR_VERSION_UI_CSS);
   html_source->SetDefaultResource(IDR_VERSION_UI_HTML);
   return html_source;
 }
@@ skipping 14 matching lines @@
   // Set up the chrome://theme/ source.
   ThemeSource* theme = new ThemeSource(profile);
   content::URLDataSource::Add(profile, theme);
 #endif
 
   WebUIDataSource::Add(profile, CreateVersionUIDataSource());
 }
 
 VersionUI::~VersionUI() {
 }