8000 [Security][Translation] duplicate translations · Issue #14920 · symfony/symfony · GitHub
[go: up one dir, main page]
Skip to content

[Security][Translation] duplicate translations #14920

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
MatTheCat opened this issue Jun 9, 2015 · 6 comments
Closed

[Security][Translation] duplicate translations #14920

MatTheCat opened this issue Jun 9, 2015 · 6 comments
Labels
Security

Comments

@MatTheCat
Copy link
Contributor

After updating Symfony I thought I could see the effect of #14601 but it doesn't happen because there is two translations folders into the security component.

I updated Security/Resources/translations/security.fr.xlf but Security/Core/Resources/translations/security.fr.xlf is used.

I don't know if it's legit but now that translations have diverged I think something must be done.
@stof
Copy link
Member
stof commented Jun 9, 2015

The translations should be kept in sync. If they are not, we need to fix it (we have moved translations inside Security/Core because of the split of the security component into several components for subtree splits, but keeping them in the old location too for BC reasons)

@xabbuh xabbuh added the Security label Jun 9, 2015
@MatTheCat
Copy link
Contributor Author

There is only two translations files in Security/Core/Resources/translations on the 2.3 branch. Shouldn't translations already be in sync on 2.3?

@stof
Copy link
Member
stof commented Jun 11, 2015

This is because Security/Core/Resources/translations was not used on 2.3 yet. but new translations added after that as PR to newer branches were backported to 2.3 without removing the files and adding them again later when merging into newer branches for simplicity. Symfony 2.3 does not use this folder at all.

@MatTheCat
Copy link
Contributor Author

Does it mean the sync should be done on the 2.7 branch?

vincentaubert added a commit to vincentaubert/symfony that referenced this issue Jun 14, 2015
@vincentaubert
[2.6][Security][Translation] symfony#14920 update translations
dfd3e62
@vincentaubert
Copy link
Contributor

For me it should be fixed in the 2.6 branch.
As this branch is the oldest already maintained version of the security-core component.

@vincentaubert vincentaubert mentioned this issue Jun 14, 2015
Merged
fabpot added a commit that referenced this issue Jun 14, 2015
@fabpot
bug #14974 [2.6][Security][Translation] #14920 update translations (v…
94c7b25 
…incentaubert)

This PR was merged into the 2.6 branch.

Discussion
----------

[2.6][Security][Translation] #14920 update translations

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | #14920
| License       | MIT
| Doc PR        |

Commits
-------

dfd3e62 [2.6][Security][Translation] #14920 update translations
@fabpot fabpot closed this as completed Jun 14, 2015
@fabpot
Copy link
Member
fabpot commented Jun 14, 2015

#14977 adds the missing changelog entry (FI, it has been changed for Symfony 2.4).
#14979 removes the obsolete translations in 3.0.

nicolas-grekas added a commit that referenced this issue Jun 18, 2015
@nicolas-grekas
Merge branch '2.6' into 2.7
b1fabf5 
* 2.6:
  [Debug] Fix log level of stacked errors
  [VarDumper] Fix uninitialized id in HtmlDumper
  Fixed fluent interface
  [Debug] fix debug class loader case test on windows
  [Debug+VarDumper] Fix handling of PHP7 exception/error model
  [2.6][Security][Translation] #14920 update translations
  [VarDumper] Cherry-pick code style fixes from 2.7
  Bug #14836 [HttpFoundation] Moves default JSON encoding assignment from constructor to property

Conflicts:
	src/Symfony/Component/Debug/Tests/DebugClassLoaderTest.php
	src/Symfony/Component/VarDumper/Caster/DOMCaster.php
	src/Symfony/Component/VarDumper/Caster/ExceptionCaster.php
	src/Symfony/Component/VarDumper/Caster/PdoCaster.php
	src/Symfony/Component/VarDumper/Caster/SplCaster.php
This was referenced Oct 2, 2015
Closed
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees
No one assigned
Labels
Security
Projects
None yet
Milestone
No milestone
Development

No branches or pull requests
5 participants
@fabpot @vincentaubert @stof @MatTheCat @xabbuh
0