github/electron
1
1
Fork 0
mirror of https://github.com/electron/electron.git synced 2026-04-10 03:01:51 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix: use GTK3 stock i18n strings (#19783)

Browse Source 
* fix: use GTK3 stock i18n strings

* address feedback from @ckerr
This commit is contained in:
trop[bot]
2019-08-15 12:12:56 -07:00
committed by Shelley Vohr
parent 66aeeac8df
commit 30543cec74
1 changed files with 25 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
shell/browser/ui/file_dialog_gtk.cc
View File

@@ -4,8 +4,6 @@
#include "shell/browser/ui/file_dialog.h"
#include <glib/gi18n.h> // _() macro
#include "base/callback.h"
#include "base/files/file_util.h"
#include "base/strings/string_util.h"
@@ -23,6 +21,27 @@ DialogSettings::~DialogSettings() = default;
namespace {
// Copied from L40-L55 in
// https://cs.chromium.org/chromium/src/chrome/browser/ui/libgtkui/select_file_dialog_impl_gtk.cc
#if GTK_CHECK_VERSION(3, 90, 0)
// GTK stock items have been deprecated. The docs say to switch to using the
// strings "_Open", etc. However this breaks i18n. We could supply our own
// internationalized strings, but the "_" in these strings is significant: it's
// the keyboard shortcut to select these actions. TODO(thomasanderson): Provide
// internationalized strings when GTK provides support for it.
const char kOkLabel[] = "_Ok";
const char kCancelLabel[] = "_Cancel";
const char kOpenLabel[] = "_Open";
const char kSaveLabel[] = "_Save";
#else
G_GNUC_BEGIN_IGNORE_DEPRECATIONS
const char* const kOkLabel = GTK_STOCK_OK;
const char* const kCancelLabel = GTK_STOCK_CANCEL;
const char* const kOpenLabel = GTK_STOCK_OPEN;
const char* const kSaveLabel = GTK_STOCK_SAVE;
G_GNUC_END_IGNORE_DEPRECATIONS
#endif
static const int kPreviewWidth = 256;
static const int kPreviewHeight = 512;
@@ -47,17 +66,17 @@ class FileChooserDialog {
: parent_(
static_cast<electron::NativeWindowViews*>(settings.parent_window)),
filters_(settings.filters) {
const char* confirm_text = _("_OK");
const char* confirm_text = kOkLabel;
if (!settings.button_label.empty())
confirm_text = settings.button_label.c_str();
else if (action == GTK_FILE_CHOOSER_ACTION_SAVE)
confirm_text = _("_Save");
confirm_text = kOpenLabel;
else if (action == GTK_FILE_CHOOSER_ACTION_OPEN)
confirm_text = _("_Open");
confirm_text = kSaveLabel;
dialog_ = gtk_file_chooser_dialog_new(
settings.title.c_str(), NULL, action, _("_Cancel"), GTK_RESPONSE_CANCEL,
settings.title.c_str(), NULL, action, kCancelLabel, GTK_RESPONSE_CANCEL,
confirm_text, GTK_RESPONSE_ACCEPT, NULL);
if (parent_) {
parent_->SetEnabled(false);