diff options
| author | thomasvl@chromium.org <thomasvl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-19 18:48:12 +0000 |
|---|---|---|
| committer | thomasvl@chromium.org <thomasvl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-19 18:48:12 +0000 |
| commit | 1a2640f9d5c535f2caae2964a0afc510b978d341 (patch) | |
| tree | a1aaad6239484d9d10736784984a423450b505e7 /chrome | |
| parent | eddcbc7b146889292e12e82c4fac0339eff37300 (diff) | |
| download | chromium_src-1a2640f9d5c535f2caae2964a0afc510b978d341.zip chromium_src-1a2640f9d5c535f2caae2964a0afc510b978d341.tar.gz chromium_src-1a2640f9d5c535f2caae2964a0afc510b978d341.tar.bz2 | |
Support the Bookmark bar and Other bookmarks titles in titlecase.
TEST=the bookmark bubble menu should have title case items for the two.
BUG=24912
Review URL: http://codereview.chromium.org/297004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@29431 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/app/generated_resources.grd | 22 | ||||
| -rw-r--r-- | chrome/browser/bookmarks/bookmark_html_writer_unittest.cc | 6 |
2 files changed, 22 insertions, 6 deletions
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd index e1afa0a..b98d957 100644 --- a/chrome/app/generated_resources.grd +++ b/chrome/app/generated_resources.grd @@ -3365,12 +3365,22 @@ Keep your key file in a safe place. You will need it to create new versions of y <message name="IDS_BOOMARK_EDITOR_TITLE" desc="Title of the window the bookmark editor is in."> Edit Bookmark </message> - <message name="IDS_BOOMARK_BAR_FOLDER_NAME" desc="Name shown in the tree for the bookmarks bar folder"> - Bookmarks bar - </message> - <message name="IDS_BOOMARK_BAR_OTHER_FOLDER_NAME" desc="Name shown in the tree for the other bookmarks folder"> - Other bookmarks - </message> + <if expr="not pp_ifdef('use_titlecase')"> + <message name="IDS_BOOMARK_BAR_FOLDER_NAME" desc="Name shown in the tree for the bookmarks bar folder"> + Bookmarks bar + </message> + <message name="IDS_BOOMARK_BAR_OTHER_FOLDER_NAME" desc="Name shown in the tree for the other bookmarks folder"> + Other bookmarks + </message> + </if> + <if expr="pp_ifdef('use_titlecase')"> + <message name="IDS_BOOMARK_BAR_FOLDER_NAME" desc="In Title Case: Name shown in the tree for the bookmarks bar folder"> + Bookmarks Bar + </message> + <message name="IDS_BOOMARK_BAR_OTHER_FOLDER_NAME" desc="In Title Case: Name shown in the tree for the other bookmarks folder"> + Other Bookmarks + </message> + </if> <message name="IDS_BOOMARK_EDITOR_NEW_FOLDER_NAME" desc="Name for newly created groups"> New folder </message> diff --git a/chrome/browser/bookmarks/bookmark_html_writer_unittest.cc b/chrome/browser/bookmarks/bookmark_html_writer_unittest.cc index 49cf699..720c31d 100644 --- a/chrome/browser/bookmarks/bookmark_html_writer_unittest.cc +++ b/chrome/browser/bookmarks/bookmark_html_writer_unittest.cc @@ -159,7 +159,13 @@ TEST_F(BookmarkHTMLWriterTest, Test) { ASSERT_EQ(7U, parsed_bookmarks.size()); // Hardcode the value of IDS_BOOKMARK_BAR_FOLDER_NAME in en-US locale // because all the unit tests are run in en-US locale. +#if defined(OS_WIN) || defined(TOOLKIT_VIEWS) + // Windows and ChromeOS builds use Sentence case. const wchar_t* kBookmarkBarFolderName = L"Bookmarks bar"; +#else + // Mac and Linux + GTK uses Title Case. + const wchar_t* kBookmarkBarFolderName = L"Bookmarks Bar"; +#endif AssertBookmarkEntryEquals(parsed_bookmarks[0], false, url1, url1_title, t1, kBookmarkBarFolderName, f1_title, std::wstring()); AssertBookmarkEntryEquals(parsed_bookmarks[1], false, url2, url2_title, t2, |