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

Move punctuation inside translations #6520

Merged
merged 4 commits into from
Oct 31, 2016

Conversation

patrick-mcdougle
Copy link
Contributor

Q A
Bug fix? yes
New feature? no
BC breaks? yes (technically)
Related tickets fixes #6513
License MIT

I only modified translation files in which I knew the language sufficiently well. Translators for this software will have to do whatever is required of the other languages to denote questions and exclamations.

I used the following case insensitive regex to search for the occurrences:

\|trans.*?\}\}.*?(\?|\!)

I also added quotes to all the strings in the english file. Figured I'd enforce consistency while I was in there.

NOTE: There was a tricky place in the code that I didn't replace which was where the translation was in the database. I wasn't sure what to do so I left it. REF: https://github.com/Sylius/Sylius/blob/master/src/Sylius/Bundle/ShopBundle/Resources/views/Homepage/Menu/_security.html.twig#L3

Perhaps these need to be translation blocks instead?

@patrick-mcdougle
Copy link
Contributor Author

@pjedrzejewski

@pjedrzejewski
Copy link
Member

Spanish translations should not be modified here as they will not be synced.

/cc @pamil WDYT?

@pamil
Copy link
Contributor

pamil commented Oct 24, 2016

They need to be changed on CrowdIn.

@patrick-mcdougle
Copy link
Contributor Author

Updated.

@michalmarcinkowski
Copy link
Contributor

@patrick-mcdougle please rebase

Conflicts:
	src/Sylius/Bundle/UiBundle/Resources/translations/messages.en.yml
@patrick-mcdougle
Copy link
Contributor Author

@michalmarcinkowski merge quick before someone adds another translation! Also, I have the maintainer box checked, so you can merge master into this branch to resolve the merge conflicts. (I only work on open source on the weekends, and I know that that can slow things down).

@michalmarcinkowski michalmarcinkowski merged commit 2dfe720 into Sylius:master Oct 31, 2016
@michalmarcinkowski
Copy link
Contributor

Thanks Patrick! 👍

@patrick-mcdougle patrick-mcdougle deleted the fixes-6513 branch October 31, 2016 03:36
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.

Question and exclamation marks in translations for spanish language
4 participants