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

[Translation][Form][choice] Placeholder shouldn't be translated when empty #14997

Closed
wants to merge 5 commits into from

Conversation

Restless-ET
Copy link
Contributor

Q A
Bug fix? yes
New feature? no
BC breaks? no
Deprecations? no
Tests pass? yes
Fixed tickets -
License MIT
Doc PR -
  • fix the tests

Without this I keep on getting the "missing messages" for an empty string at the Translation Profiler (like shown below) for every non-required choice Field Type.
missing_message

PS - I'm aware that the Translation profiler is only available for SF 2.7+ but since the placeholder option is available for SF 2.6+ I'm creating this PR against branch 2.6

@webmozart webmozart added the Form label Jun 16, 2015
@Restless-ET
Copy link
Contributor Author

@webmozart I believe it's all ok now, but could you please take a look?

Regards,

@webmozart
Copy link
Contributor

Thanks for working on this @Restless-ET. Looks good! :) Could you please rebase this onto 2.3 and open a new PR for the 2.3 branch? We need to fix this in the earliest supported version.

@Tobion
Copy link
Member

Tobion commented Jun 26, 2015

Closing for #15048

@Tobion Tobion closed this Jun 26, 2015
@xabbuh
Copy link
Member

xabbuh commented Jun 26, 2015

@Tobion The Bootstrap form theme is not part of Symfony 2.3. So we need this PR to at least update that test class.

@xabbuh xabbuh reopened this Jun 26, 2015
@Tobion
Copy link
Member

Tobion commented Jun 26, 2015

@xabbuh such things must be done when merging. The naming is different in this branch anyway (placeholder instead of empty_value). So you need to resolve conflicts.

@Tobion
Copy link
Member

Tobion commented Jun 26, 2015

There is no point in having PRs for the same thing.

@xabbuh
Copy link
Member

xabbuh commented Jun 26, 2015

@Tobion Will the merge take care of updating a test file that is (on a first glance) totally unrelated to the things fixed by the first PR? I understand that you will have to deal with the conflicts when merging branches. But I thought this PR should be kept for the 2.6 specific changes and could simply be rebased when the 2.3 branch has been merged up.

@Restless-ET
Copy link
Contributor Author

@Tobion @xabbuh
What exactly should I do here? Wait for the other PR to be merged and then updated this one?

Tobion added a commit that referenced this pull request Jun 27, 2015
…lated when it has an empty value (Restless-ET)

This PR was squashed before being merged into the 2.3 branch (closes #15048).

Discussion
----------

[Translation][Form][choice] empty_value shouldn't be translated when it has an empty value

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

The same fix provided at #14997 but against ```2.3``` branch.

@webmozart As requested. :)

Commits
-------

1a5c4c6 [Translation][Form][choice] empty_value shouldn't be translated when it has an empty value
@Tobion
Copy link
Member

Tobion commented Jun 27, 2015

Fixed as part of the merge.

@Tobion Tobion closed this Jun 27, 2015
@Restless-ET Restless-ET deleted the patch-1 branch June 27, 2015 22:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants