Skip to content

Restore internationalization functionality in toolbars #10787

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
Merged
martinpovolny merged 1 commit into from
Aug 30, 2016
Merged

Restore internationalization functionality in toolbars #10787

martinpovolny merged 1 commit into from
Aug 30, 2016

Conversation

@mzazrivec
Copy link
Contributor

@mzazrivec mzazrivec commented Aug 25, 2016 •
edited
Loading

Broken since #9753

Fixes: #10748

@mzazrivec mzazrivec force-pushed the restore_i18n_in_toolbars branch 3 times, most recently from fb691df to 8dbdfdb Compare August 26, 2016 13:56
@mzazrivec mzazrivec removed the wip label Aug 26, 2016
@himdel
Copy link
Contributor

himdel commented Aug 28, 2016

(Test failure should be resolved now, as of #10813)

@mzazrivec mzazrivec force-pushed the restore_i18n_in_toolbars branch from 8dbdfdb to 098826c Compare August 29, 2016 08:05
@quarckster quarckster mentioned this pull request Aug 29, 2016
Closed
@himdel
Copy link
Contributor

himdel commented Aug 29, 2016 •
edited
Loading

Hmm, why does this fix that issue? Seems like it shouldn't affect anything but i18n..

Either way, re-kicked the test and hoping :)

Though, I'm not quite sure this is the right place, seems like this should be called when generating the toolbar - which is either already being done in toolbar_helper, or that file is dead and it is done on the angular side .. but then again, buttons_to_html is still called from javascript_pf_toolbar_reload.. so maybe the conversion is not quite complete.. looking into it :) (EDIT: aaaah, that's being addressed in #10827)

@martinpovolny
Copy link
Member

martinpovolny commented Aug 30, 2016

Code looks good.

toolbar_helper has to go or all the toolbar rendering routines can be moved there from application_helper.

@mzazrivec : please, rebase and fix tests so that I can test this in the UI.

@mzazrivec mzazrivec force-pushed the restore_i18n_in_toolbars branch 2 times, most recently from bafd521 to b43ca55 Compare August 30, 2016 12:45
@miq-bot
Copy link
Member

miq-bot commented Aug 30, 2016

Checked commit mzazrivec@b43ca55 with ruby 2.2.5, rubocop 0.37.2, and haml-lint 0.16.1
3 files checked, 0 offenses detected
Everything looks good. 🍰

@mzazrivec
Copy link
Contributor Author

mzazrivec commented Aug 30, 2016

@martinpovolny Rebased & fixed tests.

@martinpovolny martinpovolny added this to the Sprint 46 Ending Sep 12, 2016 milestone Aug 30, 2016
@martinpovolny
Copy link
Member

martinpovolny commented Aug 30, 2016

code looks good, tested in the UI

@martinpovolny martinpovolny merged commit b3d92e3 into ManageIQ:master Aug 30, 2016
@mzazrivec mzazrivec deleted the restore_i18n_in_toolbars branch September 22, 2016 13:29
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

@himdel himdel

Labels

bug internationalization ui

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@mzazrivec @himdel @martinpovolny @miq-bot