diff options
| author | thomasvl@chromium.org <thomasvl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-28 18:17:15 +0000 |
|---|---|---|
| committer | thomasvl@chromium.org <thomasvl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-28 18:17:15 +0000 |
| commit | 886cce1d3e5dbfc68d5908b18471d2631c76f6ec (patch) | |
| tree | f82fa05c2df8a1f6fac5e8712beb35d68ed9ae59 | |
| parent | 4c9ab62bfc9eace0c21944b0e82dad20b3614f0d (diff) | |
| download | chromium_src-886cce1d3e5dbfc68d5908b18471d2631c76f6ec.zip chromium_src-886cce1d3e5dbfc68d5908b18471d2631c76f6ec.tar.gz chromium_src-886cce1d3e5dbfc68d5908b18471d2631c76f6ec.tar.bz2 | |
Make the default ok/cancel button come from the pak files.
BUG=20496
TEST=more alerts should get localized strings.
Review URL: http://codereview.chromium.org/181006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@24752 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/app_modal_dialog_mac.mm | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/chrome/browser/app_modal_dialog_mac.mm b/chrome/browser/app_modal_dialog_mac.mm index db7bd6d04..faddb4c4 100644 --- a/chrome/browser/app_modal_dialog_mac.mm +++ b/chrome/browser/app_modal_dialog_mac.mm @@ -6,9 +6,10 @@ #import <Cocoa/Cocoa.h> -#include "app/l10n_util.h" +#include "app/l10n_util_mac.h" #include "app/message_box_flags.h" #include "base/sys_string_conversions.h" +#include "grit/app_strings.h" #include "grit/generated_resources.h" // Helper object that receives the notification that the dialog/sheet is @@ -78,9 +79,8 @@ void AppModalDialog::CreateAndShowDialog() { // Determine the names of the dialog buttons based on the flags. "Default" // is the OK button. "Other" is the cancel button. We don't use the // "Alternate" button in NSRunAlertPanel. - // TODO(pinkerton): Need to find the right localized strings for these. - NSString* default_button = NSLocalizedString(@"OK", nil); - NSString* other_button = NSLocalizedString(@"Cancel", nil); + NSString* default_button = l10n_util::GetNSStringWithFixup(IDS_APP_OK); + NSString* other_button = l10n_util::GetNSStringWithFixup(IDS_APP_CANCEL); bool text_field = false; bool one_button = false; switch (dialog_flags_) { @@ -89,12 +89,10 @@ void AppModalDialog::CreateAndShowDialog() { break; case MessageBoxFlags::kIsJavascriptConfirm: if (is_before_unload_dialog_) { - std::string button_text = l10n_util::GetStringUTF8( + default_button = l10n_util::GetNSStringWithFixup( IDS_BEFOREUNLOAD_MESSAGEBOX_OK_BUTTON_LABEL); - default_button = base::SysUTF8ToNSString(button_text); - button_text = l10n_util::GetStringUTF8( + other_button = l10n_util::GetNSStringWithFixup( IDS_BEFOREUNLOAD_MESSAGEBOX_CANCEL_BUTTON_LABEL); - other_button = base::SysUTF8ToNSString(button_text); } break; case MessageBoxFlags::kIsJavascriptPrompt: |