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: correct default text for button labels in gtk dialogs (#31822)

Browse Source
This commit is contained in:
trop[bot]
2021-11-15 16:24:14 +01:00
committed by GitHub
parent 484c90d4eb
commit e60d3a7d27
2 changed files with 5 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
shell/browser/ui/gtk_util.cc
View File

@@ -17,10 +17,11 @@
#include "third_party/skia/include/core/SkUnPreMultiply.h"
#include "ui/gtk/gtk_compat.h" // nogncheck
namespace gtk_util {
// The following utilities are pulled from
// https://source.chromium.org/chromium/chromium/src/+/main:ui/gtk/select_file_dialog_impl_gtk.cc;l=43-74
namespace gtk_util {
namespace {
const char* GettextPackage() {
static base::NoDestructor<std::string> gettext_package(
@@ -32,44 +33,34 @@ const char* GtkGettext(const char* str) {
return g_dgettext(GettextPackage(), str);
}
} // namespace
const char* GetCancelLabel() {
if (!gtk::GtkCheckVersion(4))
return "gtk-cancel"; // In GTK3, this is GTK_STOCK_CANCEL.
static const char* cancel = GtkGettext("_Cancel");
return cancel;
}
const char* GetOpenLabel() {
if (!gtk::GtkCheckVersion(4))
return "gtk-open"; // In GTK3, this is GTK_STOCK_OPEN.
static const char* open = GtkGettext("_Open");
return open;
}
const char* GetSaveLabel() {
if (!gtk::GtkCheckVersion(4))
return "gtk-save"; // In GTK3, this is GTK_STOCK_SAVE.
static const char* save = GtkGettext("_Save");
return save;
}
const char* GetOkLabel() {
if (!gtk::GtkCheckVersion(4))
return "gtk-ok"; // In GTK3, this is GTK_STOCK_OK.
static const char* ok = GtkGettext("_Ok");
return ok;
}
const char* GetNoLabel() {
if (!gtk::GtkCheckVersion(4))
return "gtk-no"; // In GTK3, this is GTK_STOCK_NO.
static const char* no = GtkGettext("_No");
return no;
}
const char* GetYesLabel() {
if (!gtk::GtkCheckVersion(4))
return "gtk-yes"; // In GTK3, this is GTK_STOCK_YES.
static const char* yes = GtkGettext("_Yes");
return yes;
}

3
shell/browser/ui/gtk_util.h
View File

@@ -11,9 +11,6 @@ class SkBitmap;
namespace gtk_util {
const char* GettextPackage();
const char* GtkGettext(const char* str);
const char* GetCancelLabel();
const char* GetOpenLabel();
const char* GetSaveLabel();