Skip to content

[Translation] remove duplicate code for loading catalogue. #14341

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
Closed
wants to merge 1 commit into from
Closed

[Translation] remove duplicate code for loading catalogue. #14341

wants to merge 1 commit into from

Conversation

aitboudad
Copy link
Contributor

Q A
Bug fix? no
New feature? no
BC breaks? no
Deprecations? no
Fixed tickets ~
Tests pass? yes
License MIT

@aitboudad aitboudad force-pushed the translation_rm_dup branch from bf86171 to 944759d Compare April 13, 2015 18:32
stof
stof reviewed Apr 13, 2015
View reviewed changes
src/Symfony/Component/Translation/LoggingTranslator.php
if (null === $locale) {
$locale = $this->getLocale();
}
$catalogue = $this->translator->getCatalogue($locale);
Copy link
Member

Choose a reason for hiding this comment

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

I would keep the line where it was, to minimize the diff between branches

Copy link
Contributor Author

Choose a reason for hiding this comment

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

fixed

@aitboudad aitboudad force-pushed the translation_rm_dup branch from 944759d to f36430d Compare April 13, 2015 21:26
Tobion
Tobion reviewed Apr 13, 2015
View reviewed changes
src/Symfony/Component/Translation/Translator.php
@@ -282,6 +262,8 @@ public function getCatalogue($locale = null)
{
if (null === $locale) {
$locale = $this->getLocale();
} else {
$this->assertValidLocale($locale);
Copy link
Contributor

Choose a reason for hiding this comment

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

getCatalog Interface needs to be updated

Copy link
Contributor Author

Choose a reason for hiding this comment

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

fixed

@aitboudad aitboudad force-pushed the translation_rm_dup branch from f36430d to 192f3d8 Compare April 14, 2015 06:36
@Tobion
Copy link
Contributor

Tobion commented Apr 14, 2015

👍

@aitboudad aitboudad force-pushed the translation_rm_dup branch from 192f3d8 to d742a24 Compare April 15, 2015 09:37
@fabpot
Copy link
Member

fabpot commented Apr 16, 2015

Why is it done in 2.8 and not in 2.7?

@aitboudad
Copy link
Contributor Author

@fabpot well then I split it into 2 PR:

@aitboudad aitboudad closed this Apr 16, 2015
@aitboudad aitboudad deleted the translation_rm_dup branch April 19, 2015 18:09
@aitboudad aitboudad mentioned this pull request Apr 21, 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
Translation
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@aitboudad @Tobion @fabpot @stof