diff options
| author | glen@chromium.org <glen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-14 00:42:39 +0000 |
|---|---|---|
| committer | glen@chromium.org <glen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-14 00:42:39 +0000 |
| commit | 7746aca763ca441dc956c81443239040ffe54c2a (patch) | |
| tree | 5b14921e439ef80f41bfff8b650d21363914bd82 /app/l10n_util.cc | |
| parent | 0078ffb91ddeea8c35cdd75ffe161623030d8dbf (diff) | |
| download | chromium_src-7746aca763ca441dc956c81443239040ffe54c2a.zip chromium_src-7746aca763ca441dc956c81443239040ffe54c2a.tar.gz chromium_src-7746aca763ca441dc956c81443239040ffe54c2a.tar.bz2 | |
Undo 16020
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@16021 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'app/l10n_util.cc')
| -rw-r--r-- | app/l10n_util.cc | 24 |
1 files changed, 1 insertions, 23 deletions
diff --git a/app/l10n_util.cc b/app/l10n_util.cc index 15b4211..285b8ab 100644 --- a/app/l10n_util.cc +++ b/app/l10n_util.cc @@ -312,12 +312,7 @@ static string16 GetStringF(int message_id, std::vector<size_t>* offsets) { ResourceBundle& rb = ResourceBundle::GetSharedInstance(); const string16& format_string = rb.GetLocalizedString(message_id); - std::vector<const string16> subst; - subst.push_back(a); - subst.push_back(b); - subst.push_back(c); - subst.push_back(d); - string16 formatted = ReplaceStringPlaceholders(format_string, subst, + string16 formatted = ReplaceStringPlaceholders(format_string, a, b, c, d, offsets); return formatted; } @@ -342,15 +337,6 @@ std::wstring GetStringF(int message_id, WideToUTF16(c), string16(), NULL)); } -std::wstring GetStringF(int message_id, - const std::wstring& a, - const std::wstring& b, - const std::wstring& c, - const std::wstring& d) { - return UTF16ToWide(GetStringF(message_id, WideToUTF16(a), WideToUTF16(b), - WideToUTF16(c), WideToUTF16(d), NULL)); -} - std::string GetStringFUTF8(int message_id, const string16& a) { return UTF16ToUTF8(GetStringF(message_id, a, string16(), string16(), @@ -371,14 +357,6 @@ std::string GetStringFUTF8(int message_id, return UTF16ToUTF8(GetStringF(message_id, a, b, c, string16(), NULL)); } -std::string GetStringFUTF8(int message_id, - const string16& a, - const string16& b, - const string16& c, - const string16& d) { - return UTF16ToUTF8(GetStringF(message_id, a, b, c, d, NULL)); -} - std::wstring GetStringF(int message_id, const std::wstring& a, size_t* offset) { DCHECK(offset); std::vector<size_t> offsets; |