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: i18n of gtk msgbox buttons #20007

Merged
merged 3 commits into from Aug 29, 2019

Conversation

@ckerr
Copy link
Member

commented Aug 28, 2019

Manually backport #19904.

See that PR for details.

Notes: Fixed i18n of GTK messageboxes' stock buttons.

fix: i18n of gtk msgbox buttons
Manually backport #19904. See that PR for details.
@trop trop bot referenced this pull request Aug 28, 2019
4 of 4 tasks complete
@codebytere

This comment has been minimized.

Copy link
Member

commented Aug 28, 2019

@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

This comment has been minimized.

Copy link
Member Author

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.

ckerr added 2 commits Aug 28, 2019

@codebytere codebytere added 6-0-x backport and removed new-pr 🌱 labels Aug 28, 2019

@zcbenz
zcbenz approved these changes Aug 29, 2019

@zcbenz zcbenz merged commit 0039e60 into 6-0-x Aug 29, 2019

13 of 14 checks passed

build-mac Workflow: build-mac
Details
Artifact Comparison No Changes
Details
Semantic Pull Request ready to be squashed
Details
Valid Backport Valid Backport
Details
WIP Ready for review
Details
appveyor: win-ia32-testing AppVeyor build succeeded
Details
appveyor: win-ia32-testing-pr AppVeyor build succeeded
Details
appveyor: win-x64-testing AppVeyor build succeeded
Details
appveyor: win-x64-testing-pr AppVeyor build succeeded
Details
build-linux Workflow: build-linux
Details
electron-arm-testing Build #20190828.42 succeeded
Details
electron-arm64-testing Build #20190828.41 succeeded
Details
lint Workflow: lint
Details
release-notes Release notes found
@release-clerk

This comment has been minimized.

Copy link

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 Aug 29, 2019

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
3 participants
You can’t perform that action at this time.