mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

fix: proper l10n on Linux dialog buttons (#19725)

Browse source 
* fix: proper l10n on linux dialog

* switch string
This commit is contained in:
Erick Zhao 2019-08-13 20:22:25 -07:00 committed by Shelley Vohr
parent 49fe2604b3
commit 5d892a557f
1 changed files with 13 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
shell/browser/ui/file_dialog_gtk.cc
View file

@ -4,8 +4,6 @@
#include "shell/browser/ui/file_dialog.h" #include "shell/browser/ui/file_dialog.h"
#include <glib/gi18n.h> // _() macro
#include "base/callback.h" #include "base/callback.h"
#include "base/files/file_util.h" #include "base/files/file_util.h"
#include "base/strings/string_util.h" #include "base/strings/string_util.h"
@ -13,6 +11,8 @@
#include "shell/browser/native_window_views.h" #include "shell/browser/native_window_views.h"
#include "shell/browser/unresponsive_suppressor.h" #include "shell/browser/unresponsive_suppressor.h"
#include "ui/base/glib/glib_signal.h" #include "ui/base/glib/glib_signal.h"
#include "ui/base/l10n/l10n_util.h"
#include "ui/strings/grit/ui_strings.h"
#include "ui/views/widget/desktop_aura/x11_desktop_handler.h" #include "ui/views/widget/desktop_aura/x11_desktop_handler.h"
namespace file_dialog { namespace file_dialog {
@ -47,17 +47,21 @@ class FileChooserDialog {
: parent_( : parent_(
static_cast<electron::NativeWindowViews*>(settings.parent_window)), static_cast<electron::NativeWindowViews*>(settings.parent_window)),
filters_(settings.filters) { filters_(settings.filters) {
const char* confirm_text = _("_OK"); const char* confirm_text = l10n_util::GetStringUTF8(IDS_APP_OK).c_str();
if (!settings.button_label.empty()) if (!settings.button_label.empty()) {
confirm_text = settings.button_label.c_str(); confirm_text = settings.button_label.c_str();
else if (action == GTK_FILE_CHOOSER_ACTION_SAVE) } else if (action == GTK_FILE_CHOOSER_ACTION_SAVE) {
confirm_text = _("_Save"); confirm_text = l10n_util::GetStringUTF8(IDS_SAVE_AS_DIALOG_TITLE).c_str();
else if (action == GTK_FILE_CHOOSER_ACTION_OPEN) } else if (action == GTK_FILE_CHOOSER_ACTION_OPEN) {
confirm_text = _("_Open"); confirm_text =
l10n_util::GetStringUTF8(IDS_SEND_TAB_TO_SELF_INFOBAR_MESSAGE_URL)
.c_str();
}
dialog_ = gtk_file_chooser_dialog_new( dialog_ = gtk_file_chooser_dialog_new(
settings.title.c_str(), NULL, action, _("_Cancel"), GTK_RESPONSE_CANCEL, settings.title.c_str(), NULL, action,
l10n_util::GetStringUTF8(IDS_APP_CANCEL).c_str(), GTK_RESPONSE_CANCEL,
confirm_text, GTK_RESPONSE_ACCEPT, NULL); confirm_text, GTK_RESPONSE_ACCEPT, NULL);
if (parent_) { if (parent_) {
parent_->SetEnabled(false); parent_->SetEnabled(false);