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 for boolean filter (updates the fix for #2170) #2221

Merged

Conversation

dmfrancisco
Copy link
Contributor

Same as PR #2206 but squashes commits into a single commit. Updates 47fe4c5 that initially fixed #2170 but introduced a regression.

Similar to commit 47fe4c5 but fixes regression that caused untranslated
labels for boolean filters.
@seanlinsley
Copy link
Contributor

Okay, thanks for squashing the commits. For future reference, if you used interactive git rebase you would have been able to update #2206 instead of opening a new pull request.

seanlinsley added a commit that referenced this pull request May 22, 2013
Fix i18n for boolean filter (updates the fix for #2170)
@seanlinsley seanlinsley merged commit 30a465d into activeadmin:master May 22, 2013
@seanlinsley
Copy link
Contributor

Thanks for the contribution! 💙

@dmfrancisco
Copy link
Contributor Author

Oh I see, I actually used git rebase -i master but I though GitHub wouldn't let me push to the same branch, since it rewrites history. I'll try it next time 😉

@seanlinsley
Copy link
Contributor

Yeah you can do this to force history rewrite on GitHub:

git push --force origin your_branch_name # -f is the short version of --force

@dmfrancisco
Copy link
Contributor Author

Awesome! Much cleaner. Thanks 👍

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

check_box_checked? gone in rails 4
2 participants