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 translations #2185

Merged
merged 1 commit into from Jan 16, 2017
Merged

Fix translations #2185

merged 1 commit into from Jan 16, 2017

Conversation

oterral
Copy link
Contributor

@oterral oterral commented Jan 12, 2017

This PR replace uses of gettextCatalog by gettext to fix the translation and also remove use of tranlsate filter when it's unneeded.

@oterral oterral mentioned this pull request Jan 12, 2017
13 tasks
ng-click="loading ? cancel() : handleFile()">
<span>{{userMessage | translate }}</span>
ng-click="loading ? cancel() : handleFile()"
translate>
Copy link
Member

Choose a reason for hiding this comment

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

You need to keep using the translate filter. Why is this change needed?

ng-click="loading ? cancel() : handleFileUrl()">
{{userMessage | translate}}
ng-click="loading ? cancel() : handleFileUrl()"
translate>
Copy link
Member

Choose a reason for hiding this comment

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

Idem

Copy link
Member

@gberaudo gberaudo left a comment

Choose a reason for hiding this comment

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

Please remove the part about the translate filter and I will merge it.

@oterral
Copy link
Contributor Author

oterral commented Jan 16, 2017

According to angular-gettext doc it should work. But ok if it's necessary.

@oterral
Copy link
Contributor Author

oterral commented Jan 16, 2017

@gberaudo filter re-added

@gberaudo
Copy link
Member

According to angular-gettext doc it should work. But ok if it's necessary.
Really? I tried both and the behaviour were differents.

@gberaudo
Copy link
Member

Waiting for the build to finish. Will merge as soon as Travis is green.

@gberaudo gberaudo merged commit 3ecccd0 into camptocamp:master Jan 16, 2017
@gberaudo
Copy link
Member

Thanks @oterral.

@sbrunner sbrunner added this to the Older milestone Aug 23, 2019
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

3 participants