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

Use Devise translations when inheriting from core controllers #3407

Merged
merged 2 commits into from Jan 26, 2015
Merged

Use Devise translations when inheriting from core controllers #3407

merged 2 commits into from Jan 26, 2015

Conversation

rosenfeld
Copy link
Contributor

closes #3367

I will now start working in the tests but you can already review the changes. I've tested it with my application manually already.

@rosenfeld
Copy link
Contributor Author

@josevalim, my idea is to spy on I18n.t after calling find_message. Where can I find the documentation for test/unit (I'm assuming this is what Devise uses as the testing framework, but this name is not easy to search in Google)?

@rosenfeld
Copy link
Contributor Author

@josevalim I've found out this is handled by mocha and tried this approach in a new test file. Please let me know if there's a better way to test this.

@lucasmazza
Copy link
Contributor

@rosenfeld can you please rebase your branch? Looks like we got some conflicts from #3405 here.

@rosenfeld rosenfeld force-pushed the inherited-controllers-translations branch from 5ce9674 to 25f076c Compare January 12, 2015 19:25
@rosenfeld
Copy link
Contributor Author

@lucasmazza done

@rosenfeld rosenfeld force-pushed the inherited-controllers-translations branch from 25f076c to 7e5d0ac Compare January 12, 2015 19:28
@lucasmazza
Copy link
Contributor

❤️ 💚 💙 💛 💜

lucasmazza added a commit that referenced this pull request Jan 26, 2015
@lucasmazza
Merge pull request #3407 from rosenfeld/inherited-controllers-transla…
394d69d 
…tions

Use Devise translations when inheriting from core controllers
@lucasmazza lucasmazza merged commit 394d69d into heartcombo:master Jan 26, 2015
@rosenfeld
Copy link
Contributor Author

Thanks :-)

@bradleypriest bradleypriest mentioned this pull request Nov 22, 2015
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Overriding a controller shouldn't mess with Devise translation rules
2 participants
@rosenfeld @lucasmazza