diff options
| author | sdefresne <sdefresne@chromium.org> | 2016-01-15 07:39:08 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-01-15 15:40:06 +0000 |
| commit | 395b039719c3594151d18bfd4231048353c1564b (patch) | |
| tree | b607518bd0919d9d7d624f40316896b4ad19e0b9 /ios/chrome/browser/translate/never_translate_infobar_controller.mm | |
| parent | e923740b2b3b65dffe86ecce49579f9121396ab0 (diff) | |
| download | chromium_src-395b039719c3594151d18bfd4231048353c1564b.zip chromium_src-395b039719c3594151d18bfd4231048353c1564b.tar.gz chromium_src-395b039719c3594151d18bfd4231048353c1564b.tar.bz2 | |
Fix placeholder numbering in iOS specific strings.
The string IDS_TRANSLATE_INFOBAR_NEVER_MESSAGE_IOS only used a single
placeholder but used "$2" instead of "$1" causing a DCHECK. Use the
correct value.
Rename the constant IDS_IOS_TRANSLATE_INFOBAR_NEVER_MESSAGE and move
the string to ios/chrome/app/ios_${branding}_strings.grd as it is
only used on iOS.
BUG=None
Review URL: https://codereview.chromium.org/1585923007
Cr-Commit-Position: refs/heads/master@{#369751}
Diffstat (limited to 'ios/chrome/browser/translate/never_translate_infobar_controller.mm')
| -rw-r--r-- | ios/chrome/browser/translate/never_translate_infobar_controller.mm | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/ios/chrome/browser/translate/never_translate_infobar_controller.mm b/ios/chrome/browser/translate/never_translate_infobar_controller.mm index 0758dd0..0eefa07 100644 --- a/ios/chrome/browser/translate/never_translate_infobar_controller.mm +++ b/ios/chrome/browser/translate/never_translate_infobar_controller.mm @@ -9,6 +9,8 @@ #include "components/translate/core/browser/translate_infobar_delegate.h" #include "grit/components_strings.h" #include "ios/chrome/browser/translate/translate_infobar_tags.h" +#include "ios/chrome/grit/ios_chromium_strings.h" +#include "ios/chrome/grit/ios_google_chrome_strings.h" #include "ios/public/provider/chrome/browser/chrome_browser_provider.h" #import "ios/public/provider/chrome/browser/ui/infobar_view_delegate.h" #import "ios/public/provider/chrome/browser/ui/infobar_view_protocol.h" @@ -42,9 +44,9 @@ // Main text. base::string16 originalLanguage = translateInfoBarDelegate->original_language_name(); - [infoBarView addLabel:l10n_util::GetNSStringF( - IDS_TRANSLATE_INFOBAR_NEVER_MESSAGE_IOS, - originalLanguage)]; + [infoBarView + addLabel:l10n_util::GetNSStringF(IDS_IOS_TRANSLATE_INFOBAR_NEVER_MESSAGE, + originalLanguage)]; // Close button. [infoBarView addCloseButtonWithTag:TranslateInfoBarIOSTag::CLOSE target:self |