Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(140)

Side by Side Diff: chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc

Issue 2663083002: MD Settings: Migrate enable-translation toggle from non-MD settings page. (Closed)
Patch Set: fix tests Created 3 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/ui/webui/settings/md_settings_localized_strings_provide r.h" 5 #include "chrome/browser/ui/webui/settings/md_settings_localized_strings_provide r.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/i18n/number_formatting.h" 10 #include "base/i18n/number_formatting.h"
(...skipping 922 matching lines...) Expand 10 before | Expand all | Expand 10 after
933 {"addLanguagesDialogTitle", 933 {"addLanguagesDialogTitle",
934 IDS_SETTINGS_LANGUAGES_MANAGE_LANGUAGES_TITLE}, 934 IDS_SETTINGS_LANGUAGES_MANAGE_LANGUAGES_TITLE},
935 {"allLanguages", IDS_SETTINGS_LANGUAGES_ALL_LANGUAGES}, 935 {"allLanguages", IDS_SETTINGS_LANGUAGES_ALL_LANGUAGES},
936 {"enabledLanguages", IDS_SETTINGS_LANGUAGES_ENABLED_LANGUAGES}, 936 {"enabledLanguages", IDS_SETTINGS_LANGUAGES_ENABLED_LANGUAGES},
937 {"isDisplayedInThisLanguage", 937 {"isDisplayedInThisLanguage",
938 IDS_SETTINGS_LANGUAGES_IS_DISPLAYED_IN_THIS_LANGUAGE}, 938 IDS_SETTINGS_LANGUAGES_IS_DISPLAYED_IN_THIS_LANGUAGE},
939 {"displayInThisLanguage", 939 {"displayInThisLanguage",
940 IDS_SETTINGS_LANGUAGES_DISPLAY_IN_THIS_LANGUAGE}, 940 IDS_SETTINGS_LANGUAGES_DISPLAY_IN_THIS_LANGUAGE},
941 {"offerToTranslateInThisLanguage", 941 {"offerToTranslateInThisLanguage",
942 IDS_SETTINGS_LANGUAGES_OFFER_TO_TRANSLATE_IN_THIS_LANGUAGE}, 942 IDS_SETTINGS_LANGUAGES_OFFER_TO_TRANSLATE_IN_THIS_LANGUAGE},
943 {"offerToEnableTranslate",
944 IDS_SETTINGS_LANGUAGES_OFFER_TO_ENABLE_TRANSLATE},
943 #if !defined(OS_MACOSX) 945 #if !defined(OS_MACOSX)
944 {"spellCheckListTitle", IDS_SETTINGS_LANGUAGES_SPELL_CHECK_LIST_TITLE}, 946 {"spellCheckListTitle", IDS_SETTINGS_LANGUAGES_SPELL_CHECK_LIST_TITLE},
945 {"spellCheckExpandA11yLabel", 947 {"spellCheckExpandA11yLabel",
946 IDS_SETTINGS_LANGUAGES_SPELL_CHECK_EXPAND_ACCESSIBILITY_LABEL}, 948 IDS_SETTINGS_LANGUAGES_SPELL_CHECK_EXPAND_ACCESSIBILITY_LABEL},
947 {"spellCheckSummaryTwoLanguages", 949 {"spellCheckSummaryTwoLanguages",
948 IDS_SETTINGS_LANGUAGES_SPELL_CHECK_SUMMARY_TWO_LANGUAGES}, 950 IDS_SETTINGS_LANGUAGES_SPELL_CHECK_SUMMARY_TWO_LANGUAGES},
949 // TODO(michaelpg): Use ICU plural format when available to properly 951 // TODO(michaelpg): Use ICU plural format when available to properly
950 // translate "and [n] other(s)". 952 // translate "and [n] other(s)".
951 {"spellCheckSummaryThreeLanguages", 953 {"spellCheckSummaryThreeLanguages",
952 IDS_SETTINGS_LANGUAGES_SPELL_CHECK_SUMMARY_THREE_LANGUAGES}, 954 IDS_SETTINGS_LANGUAGES_SPELL_CHECK_SUMMARY_THREE_LANGUAGES},
(...skipping 928 matching lines...) Expand 10 before | Expand all | Expand 10 after
1881 1883
1882 #if defined(OS_CHROMEOS) 1884 #if defined(OS_CHROMEOS)
1883 chromeos::network_element::AddLocalizedStrings(html_source); 1885 chromeos::network_element::AddLocalizedStrings(html_source);
1884 #endif 1886 #endif
1885 policy_indicator::AddLocalizedStrings(html_source); 1887 policy_indicator::AddLocalizedStrings(html_source);
1886 1888
1887 html_source->SetJsonPath(kLocalizedStringsFile); 1889 html_source->SetJsonPath(kLocalizedStringsFile);
1888 } 1890 }
1889 1891
1890 } // namespace settings 1892 } // namespace settings
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698