Localize strings, speeds.

BUG=86527
TEST=run in non-English. For European languages, during a download the decimal separators should be commas (e.g. "0,0 MB"). (The speeds are in strings files and might take a little time to run through the translation machinery.)

Review URL: http://codereview.chromium.org/7189076

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@90092 0039d316-1c4b-4281-b951-d872f2087c98

5 files changed, 10 insertions, 16 deletions

diff --git a/chrome/browser/ui/views/appcache_info_view.cc b/chrome/browser/ui/views/appcache_info_view.cc
index 199d256..b4add97 100644
--- a/chrome/browser/ui/views/appcache_info_view.cc
+++ b/chrome/browser/ui/views/appcache_info_view.cc
@@ -8,6 +8,7 @@
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "grit/generated_resources.h"
+#include "ui/base/text/bytes_formatting.h"
 
 namespace {
 const int kInfoLabelIds[] = {
@@ -27,7 +28,7 @@ void AppCacheInfoView::SetAppCacheInfo(const appcache::AppCacheInfo* info) {
   string16 manifest_url =
       UTF8ToUTF16(info->manifest_url.spec());
   string16 size =
-      FormatBytes(info->size, GetByteDisplayUnits(info->size), true);
+      ui::FormatBytes(info->size);
   string16 creation_date =
       base::TimeFormatFriendlyDateAndTime(info->creation_time);
   string16 last_access_date =
diff --git a/chrome/browser/ui/views/database_info_view.cc b/chrome/browser/ui/views/database_info_view.cc
index 0f0d6e4..8f1e7c2 100644
--- a/chrome/browser/ui/views/database_info_view.cc
+++ b/chrome/browser/ui/views/database_info_view.cc
@@ -10,6 +10,7 @@
 #include "base/utf_string_conversions.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
+#include "ui/base/text/bytes_formatting.h"
 #include "ui/gfx/color_utils.h"
 #include "views/controls/label.h"
 #include "views/controls/textfield/textfield.h"
@@ -39,10 +40,7 @@ void DatabaseInfoView::SetDatabaseInfo(
           l10n_util::GetStringUTF16(IDS_COOKIES_WEB_DATABASE_UNNAMED_NAME)) :
       UTF8ToWide(database_info.database_name));
   description_value_field_->SetText(UTF8ToWide(database_info.description));
-  size_value_field_->SetText(
-      FormatBytes(database_info.size,
-                  GetByteDisplayUnits(database_info.size),
-                  true));
+  size_value_field_->SetText(ui::FormatBytes(database_info.size));
   last_modified_value_field_->SetText(
       base::TimeFormatFriendlyDateAndTime(database_info.last_modified));
   EnableDatabaseDisplay(true);
diff --git a/chrome/browser/ui/views/database_open_info_view.cc b/chrome/browser/ui/views/database_open_info_view.cc
index 7bdbbef..4d23a95 100644
--- a/chrome/browser/ui/views/database_open_info_view.cc
+++ b/chrome/browser/ui/views/database_open_info_view.cc
@@ -7,6 +7,7 @@
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "grit/generated_resources.h"
+#include "ui/base/text/bytes_formatting.h"
 
 namespace {
 const int kInfoLabelIds[] = {
@@ -29,9 +30,7 @@ void DatabaseOpenInfoView::SetFields(const std::string& host,
                                      const string16& display_name,
                                      unsigned long estimated_size) {
   string16 url = UTF8ToUTF16(host);
-  string16 size = FormatBytes(estimated_size,
-                              GetByteDisplayUnits(estimated_size),
-                              true);
+  string16 size = ui::FormatBytes(estimated_size);
   int row = 0;
   SetValue(row++, url);
   SetValue(row++, database_name);
diff --git a/chrome/browser/ui/views/indexed_db_info_view.cc b/chrome/browser/ui/views/indexed_db_info_view.cc
index 34fd9eb6..d033dca 100644
--- a/chrome/browser/ui/views/indexed_db_info_view.cc
+++ b/chrome/browser/ui/views/indexed_db_info_view.cc
@@ -10,6 +10,7 @@
 #include "base/utf_string_conversions.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
+#include "ui/base/text/bytes_formatting.h"
 #include "ui/gfx/color_utils.h"
 #include "views/controls/label.h"
 #include "views/controls/textfield/textfield.h"
@@ -34,10 +35,7 @@ IndexedDBInfoView::~IndexedDBInfoView() {
 void IndexedDBInfoView::SetIndexedDBInfo(
     const BrowsingDataIndexedDBHelper::IndexedDBInfo& indexed_db_info) {
   origin_value_field_->SetText(UTF8ToWide(indexed_db_info.origin));
-  size_value_field_->SetText(
-      FormatBytes(indexed_db_info.size,
-                  GetByteDisplayUnits(indexed_db_info.size),
-                  true));
+  size_value_field_->SetText(ui::FormatBytes(indexed_db_info.size));
   last_modified_value_field_->SetText(
       base::TimeFormatFriendlyDateAndTime(indexed_db_info.last_modified));
   EnableIndexedDBDisplay(true);
diff --git a/chrome/browser/ui/views/local_storage_info_view.cc b/chrome/browser/ui/views/local_storage_info_view.cc
index 894d7c9..8bbc580 100644
--- a/chrome/browser/ui/views/local_storage_info_view.cc
+++ b/chrome/browser/ui/views/local_storage_info_view.cc
@@ -10,6 +10,7 @@
 #include "base/utf_string_conversions.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
+#include "ui/base/text/bytes_formatting.h"
 #include "ui/gfx/color_utils.h"
 #include "views/controls/label.h"
 #include "views/controls/textfield/textfield.h"
@@ -35,10 +36,7 @@ void LocalStorageInfoView::SetLocalStorageInfo(
     const BrowsingDataLocalStorageHelper::LocalStorageInfo&
     local_storage_info) {
   origin_value_field_->SetText(UTF8ToWide(local_storage_info.origin));
-  size_value_field_->SetText(
-      FormatBytes(local_storage_info.size,
-                  GetByteDisplayUnits(local_storage_info.size),
-                  true));
+  size_value_field_->SetText(ui::FormatBytes(local_storage_info.size));
   last_modified_value_field_->SetText(
       base::TimeFormatFriendlyDateAndTime(local_storage_info.last_modified));
   EnableLocalStorageDisplay(true);