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

Support for i18n in mailers views #427

Merged
merged 3 commits into from
Nov 23, 2015

Conversation

joeesteves
Copy link
Contributor

With the english and spanish respective translations.

I've included the translation for mails subjects in the es.yml (this translation is usually included in devise translations 'cause ir seems natural to keep al mails views translations together but i'm not sure if is a good practice. Anyway, it's only 3 lines so i've can delete them if request.

bye

@joeesteves joeesteves force-pushed the master branch 2 times, most recently from 13c92b1 to 9edefc4 Compare November 2, 2015 19:17
@joeesteves
Copy link
Contributor Author

HI @booleanbetrayal @lynndylanhurley ,
Must I update my PR to be updated with master branch or normally you take care of that stuff. If i must, wich is the best practice to do so. Merge master into my fork master branch, resolve conflicts and push it again?

thanks,

@ValentinTrinque
Copy link
Contributor

I would advise to do a rebase in order to make it cleaner.

@joeesteves
Copy link
Contributor Author

Thanks @ValentinTrinque for your advice

I've done the rebase and its clean for merging know.

@booleanbetrayal
Copy link
Collaborator

@ponyesteves - This looks great, but I can't merge without complete translations. Could you provide Google Translate translations for all the other currently supported locales? Also, I see there's 3 commits, 1 a revert of another. Could you possible squash those in another rebase? Thanks!

…slations. Also included rusian, polish, french, portuguese (portugal and br) translations by Google Translate.
@joeesteves
Copy link
Contributor Author

@booleanbetrayal i've fixed the commits mess, now there is only one commit with all the changes (including the translations to all supported locales). Hopefully Google have done a good job on those translations, but i wouldn't risk my neck. So i think it should be checked by someone how actually knows those languages!

@booleanbetrayal
Copy link
Collaborator

thanks @ponyesteves !

booleanbetrayal added a commit that referenced this pull request Nov 23, 2015
Support for i18n in mailers views
@booleanbetrayal booleanbetrayal merged commit df960d9 into lynndylanhurley:master Nov 23, 2015
@joeesteves
Copy link
Contributor Author

You're welcome!
Glad to colaborate

El lun., 23 de nov. de 2015 a la(s) 1:46 p. m., Brent <
[email protected]> escribió:

Merged #427
#427.


Reply to this email directly or view it on GitHub
#427 (comment)
.

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.

3 participants