Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: use GTK3 stock i18n strings #19756

Merged
merged 3 commits into from Aug 15, 2019
Merged

fix: use GTK3 stock i18n strings #19756

merged 3 commits into from Aug 15, 2019

Conversation

codebytere
Copy link
Member

@codebytere codebytere commented Aug 14, 2019

Description of Change

Fixes #19755.

We should be using GTK stock labels on GTK3; the translations will be broken for those using GTK4 but it's in our best interest for now to wait and provide internationalized strings when GTK provides support for it.

cc @ckerr @erickzhao

Checklist

Release Notes

Notes: Correctly internationalize i18n in GTK-based Linux dialogs.

@electron-cation electron-cation bot added the new-pr 🌱 PR opened in the last 24 hours label Aug 14, 2019
Copy link
Member

@ckerr ckerr left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

NB: I'm not sure about not wrapping the strings with _(). What I'm thinking about here is that Chromium ships with code that doesn't wrap them, so I think it's worthwhile to test & see if this works without the gettext call.

Tested & WfM; see #19756 (comment) below

shell/browser/ui/file_dialog_gtk.cc Show resolved Hide resolved
shell/browser/ui/file_dialog_gtk.cc Show resolved Hide resolved
shell/browser/ui/file_dialog_gtk.cc Outdated Show resolved Hide resolved
shell/browser/ui/file_dialog_gtk.cc Outdated Show resolved Hide resolved
shell/browser/ui/file_dialog_gtk.cc Outdated Show resolved Hide resolved
shell/browser/ui/file_dialog_gtk.cc Outdated Show resolved Hide resolved
shell/browser/ui/file_dialog_gtk.cc Outdated Show resolved Hide resolved
@codebytere codebytere requested a review from ckerr August 14, 2019 21:15
@ckerr
Copy link
Member

ckerr commented Aug 14, 2019

screenshot-i18n-dialog-buttons

0816e6c seems to be working 👍

Copy link
Member

@ckerr ckerr left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for the fast turnaround on this issue!

ckerr added a commit that referenced this pull request Aug 14, 2019
@trop
Copy link
Contributor

trop bot commented Aug 14, 2019

A maintainer has manually backported this PR to "6-0-x", please check out #19760

@electron-cation electron-cation bot removed the new-pr 🌱 PR opened in the last 24 hours label Aug 15, 2019
@codebytere codebytere merged commit 12df0e8 into master Aug 15, 2019
@release-clerk
Copy link

release-clerk bot commented Aug 15, 2019

Release Notes Persisted

Correctly internationalize i18n in GTK-based Linux dialogs.

@trop
Copy link
Contributor

trop bot commented Aug 15, 2019

I was unable to backport this PR to "4-2-x" cleanly;
you will need to perform this backport manually.

@trop
Copy link
Contributor

trop bot commented Aug 15, 2019

I was unable to backport this PR to "5-0-x" cleanly;
you will need to perform this backport manually.

@trop
Copy link
Contributor

trop bot commented Aug 15, 2019

I was unable to backport this PR to "3-1-x" cleanly;
you will need to perform this backport manually.

@trop
Copy link
Contributor

trop bot commented Aug 15, 2019

I have automatically backported this PR to "7-0-x", please check out #19783

ckerr added a commit that referenced this pull request Aug 16, 2019
ckerr added a commit that referenced this pull request Aug 16, 2019
@trop
Copy link
Contributor

trop bot commented Aug 16, 2019

A maintainer has manually backported this PR to "5-0-x", please check out #19801

codebytere pushed a commit that referenced this pull request Aug 16, 2019
@sofianguy sofianguy added this to 6.0.3 in 6.1.x Aug 20, 2019
@sofianguy sofianguy added this to Fixed in 5.0.10 in 5.0.x Aug 20, 2019
ckerr added a commit that referenced this pull request Aug 23, 2019
similar to #19756 (12df0e8) but for messageboxes
@ckerr ckerr mentioned this pull request Aug 23, 2019
4 tasks
ckerr added a commit that referenced this pull request Aug 27, 2019
* fix: i18n of gtk msgbox buttons

similar to #19756 (12df0e8) but for messageboxes

* refactor: DRY the gtk+ button mnemonics

* fix: don't compile gtk_util on non-Linux platforms

rename from `gtk_util.[cc,h]` to `util_gtk.[cc,h]` so that it gets
picked up by the `extra_source_filters` rule in `BUILD.gn`.

* fix: make linter happy

It really shows that I cannot build locally atm... :P
trop bot pushed a commit that referenced this pull request Aug 27, 2019
similar to #19756 (12df0e8) but for messageboxes
zcbenz pushed a commit that referenced this pull request Aug 29, 2019
* fix: i18n of gtk msgbox buttons

similar to #19756 (12df0e8) but for messageboxes

* refactor: DRY the gtk+ button mnemonics

* fix: don't compile gtk_util on non-Linux platforms

rename from `gtk_util.[cc,h]` to `util_gtk.[cc,h]` so that it gets
picked up by the `extra_source_filters` rule in `BUILD.gn`.

* fix: make linter happy

It really shows that I cannot build locally atm... :P
@sofianguy sofianguy added this to Fixed in 7.0.0-beta.4 in 7.2.x Sep 3, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
No open projects
5.0.x
Fixed in 5.0.10
6.1.x
6.0.3
7.2.x
Fixed in 7.0.0-beta.4
Development

Successfully merging this pull request may close these issues.

Keyboard shortcuts broken in GTK+ dialogs
2 participants