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

Translate reception states and fix translation key #2283

Merged

Conversation

rbngzlv
Copy link
Contributor

@rbngzlv rbngzlv commented Oct 13, 2017

Screen capture:

captura de pantalla 2017-10-13 a las 8 11 27

And the translation key for Canceled state is with double l: https://github.com/solidusio/solidus/blob/master/core/app/models/spree/return_item.rb#L83

Copy link
Member

@tvdeyen tvdeyen left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks. Could you also change the translation itself?

@rbngzlv rbngzlv force-pushed the fix-reception-state-translations branch from 5d2dee6 to c5edbc9 Compare October 13, 2017 08:14
@rbngzlv
Copy link
Contributor Author

rbngzlv commented Oct 13, 2017

Done!

@swcraig
Copy link
Contributor

swcraig commented Oct 13, 2017

Just as a note, we use the (generally) American spelling of canceled throughout most of our English translations. Should an issue be made to transition into using cancelled with two ls? It's sort of a nitpick, but we may as well make all of the uses uniform.

Both spellings seem to be acceptable and correct.

@tvdeyen
Copy link
Member

tvdeyen commented Oct 13, 2017

The problem is that the state is called cancelled in the source code and therefore the translation key also has to be cancelled. But we could revert that translation change for sure.

@rbngzlv rbngzlv force-pushed the fix-reception-state-translations branch from c5edbc9 to 43362c0 Compare October 16, 2017 07:23
@rbngzlv
Copy link
Contributor Author

rbngzlv commented Oct 16, 2017

Reverted the translation change.

@rbngzlv rbngzlv force-pushed the fix-reception-state-translations branch 2 times, most recently from 45a7682 to 871ace7 Compare November 25, 2017 23:45
@rbngzlv
Copy link
Contributor Author

rbngzlv commented Nov 25, 2017

@tvdeyen Rebased on master and changed Spree.t(:key) to I18n.t('spree.key')

Copy link
Member

@tvdeyen tvdeyen left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks

@rbngzlv rbngzlv force-pushed the fix-reception-state-translations branch from 871ace7 to aaa2897 Compare March 8, 2018 10:46
@rbngzlv rbngzlv force-pushed the fix-reception-state-translations branch from aaa2897 to 5e8664f Compare March 8, 2018 11:07
@rbngzlv
Copy link
Contributor Author

rbngzlv commented Mar 8, 2018

@tvdeyen rebased on master. More than three months have passed, is something blocking this small PR from being merged?

@tvdeyen
Copy link
Member

tvdeyen commented Mar 8, 2018

@rbngzlv we need a second approval. From @kennyadsl maybe?

Sorry, that this took so long and thanks for reminding.

Copy link
Member

@kennyadsl kennyadsl left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry for taking too long to approve

@rbngzlv
Copy link
Contributor Author

rbngzlv commented Apr 10, 2018

@kennyadsl and @tvdeyen I'm doing a friendly reminder about this PR.

@kennyadsl kennyadsl merged commit f3dd1a3 into solidusio:master Apr 10, 2018
@kennyadsl
Copy link
Member

This just needed someone to press the button, sorry again for taking so long to merge!

@rbngzlv rbngzlv deleted the fix-reception-state-translations branch April 10, 2018 15:12
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.

None yet

4 participants