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.

Sign up for GitHub

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

Jump to bottom

fix: i18n of gtk msgbox buttons #20007

Merged
merged 3 commits into from Aug 29, 2019
Merged

fix: i18n of gtk msgbox buttons #20007

merged 3 commits into from Aug 29, 2019

Conversation

ckerr
Copy link
Member

@ckerr ckerr commented Aug 28, 2019

Manually backport #19904.

See that PR for details.

Notes: Fixed i18n of GTK messageboxes' stock buttons.

@ckerr
fix: i18n of gtk msgbox buttons
0665b1b 
Manually backport #19904. See that PR for details.
@electron-cation electron-cation bot added the new-pr 🌱 PR opened in the last 24 hours label Aug 28, 2019
@trop trop bot mentioned this pull request Aug 28, 2019
Merged
4 tasks
@codebytere
Copy link
Member

@ckerr hmm, seeing:

atom/browser/ui/util_gtk.h:5:  #ifndef header guard has wrong style, please use: ATOM_BROWSER_UI_UTIL_GTK_H_  [build/header_guard] [5]
atom/browser/ui/util_gtk.h:21:  #endif line should be "#endif  // ATOM_BROWSER_UI_UTIL_GTK_H_"  [build/header_guard] [5]

did this not occur in the original PR?

@ckerr
Copy link
Member Author

ckerr commented Aug 28, 2019

did this not occur in the original PR?

Ahhh, my bad. No it didn't occur in the original PR because SHELL_BROWSER_UI_UTIL_GTK_H_ is correct in the original PR. This new lint warning is happening because I forgot to rename the #ifndef block to match the directory renaming that happened between atom/shell.

5-0-x probably has the same issue; I'll check there too.

@codebytere codebytere added 6-0-x backport This is a backport PR and removed new-pr 🌱 PR opened in the last 24 hours labels Aug 28, 2019
@zcbenz zcbenz merged commit 0039e60 into 6-0-x Aug 29, 2019
@release-clerk
Copy link

release-clerk bot commented Aug 29, 2019

Release Notes Persisted

Fixed i18n of GTK messageboxes' stock buttons.

@zcbenz zcbenz deleted the fix-gtk-msgbox-button-i18n_6-0-x branch August 29, 2019 06:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@zcbenz zcbenz zcbenz approved these changes

@codebytere codebytere codebytere approved these changes

Assignees
No one assigned
Labels
6-0-x backport This is a backport PR
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@ckerr @codebytere @zcbenz