trim placeholder to remove whitespaces #7056
Closed
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
{% trans %} message.label {% endtrans %}
| @@ -77,7 +77,8 @@ protected function extractTemplate($template, MessageCatalogue $catalogue) | |||
| $this->twig->parse($this->twig->tokenize($template)); | |||
|
|
|||
| foreach ($visitor->getMessages() as $message) { | |||
| $catalogue->set($message[0], $this->prefix.$message[0], $message[1] ? $message[1] : $this->defaultDomain); | |||
| $placeholder = trim($message[0]); | |||
| $catalogue->set($placeholder, $this->prefix.$placeholder, $message[1] ? $message[1] : $this->defaultDomain); | |||
There was a problem hiding this comment.
Just do $catalogue->set(trim($message[0]), .... Placeholder is not the best name anyway.
fabpot
added a commit
that referenced
this pull request
Feb 27, 2013
…e text in trans tags (closes #7056) Trimming was not done by the extractor but it was the default behavior of the TransNode class. Now, things are consistent between the two.
fabpot
added a commit
that referenced
this pull request
Mar 1, 2013
* 2.1: Options small typo [Console] fixed unparsed StringInput tokens [TwigBridge] fixed trans twig extractor [DomCrawler] fix handling of schemes by Link::getUri() [Console] Fixed comment [TwigBridge] fixed the translator extractor that were not trimming the text in trans tags (closes #7056) Fixed handling absent href attribute in base tag added a DebuClassLoader::findFile() method to make the wrapping less invasive fixed CHANGELOG bumped Symfony version to 2.1.9-DEV updated VERSION for 2.1.8 updated CHANGELOG for 2.1.8 StringInput resets the given options. Conflicts: src/Symfony/Component/HttpKernel/Kernel.php
fabpot
added a commit
that referenced
this pull request
Mar 1, 2013
* 2.2: (24 commits) Options small typo [Console] fixed unparsed StringInput tokens Mask PHP_AUTH_PW header in profiler [TwigBridge] fixed trans twig extractor [Finder] adds adapter selection/unselection capabilities [DomCrawler] fix handling of schemes by Link::getUri() [Console] Fixed comment [TwigBridge] fixed the translator extractor that were not trimming the text in trans tags (closes #7056) Fixed handling absent href attribute in base tag fixed paths/notPaths regex for shell adapters fix issue 4911 Adds expandable globs support to shell adapters [HttpFoundation] Fixed messed up headers Fixes AppCache + ESI + Stopwatch problem added a DebuClassLoader::findFile() method to make the wrapping less invasive bumped Symfony version to 2.2.0-RC4-DEV updated VERSION for 2.2.0-RC3 updated CHANGELOG for 2.2.0-RC3 fixed CHANGELOG bumped Symfony version to 2.1.9-DEV ...
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Just another try to explain why my changes are required ;-)
in the template we can write {% trans %}placeholder{% endtrans %} or {% trans %} placeholder {% endtrans %}
it would both match witch the string 'placeholder' in the translation file
when we call the console script translation:update the first would be created to 'placeholder' and the second to ' placeholder ', which are two different values, but the first one is correct and work with both trans tags.