8000 Allow new lines in Messages translated with transchoice() (replacement for #14867) by azine · Pull Request #14897 · symfony/symfony · GitHub
[go: up one dir, main page]
Skip to content

Allow new lines in Messages translated with transchoice() (replacement for #14867) #14897

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

Closed
wants to merge 8 commits into from
Closed

Allow new lines in Messages translated with transchoice() (replacement for #14867) #14897

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
e717942
Added test for message-selector with new-lines
azine Jun 6, 2015
7ac2732
allow new-lines in messages with pluralization
azine Jun 6, 2015
ddf37c9
removed spaces
azine Jun 6, 2015
b9a0156
fixed test
azine Jun 8, 2015
dde45d0
replaced \n with actual line-breaks
azine Jun 9, 2015
ccf6eac
next try to fix tests with newlines
azine Jun 9, 2015
d0cd777
fixed double-/single-quote issue in tests
azine Jun 9, 2015
5ded97e
fix coding-style-issues with newlines
azine Jun 9, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fixed double-/single-quote issue in tests 
As long as the interpreted string is the same, the new-lines work fine. But the following combination does not work:

key: "some text \n with a new line"
text: 'some text \n with a new line"

But I would say this is expected behavior.
  • Loading branch information
@azine
azine committed Jun 9, 2015
commit d0cd7777cacd123a38c49f6d7064df432475a7e1
28 changes: 23 additions & 5 deletions src/Symfony/Component/Translation/Tests/MessageSelectorTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,20 +93,38 @@ public function getChooseTests()
array('There are no apples', '{0} There are no apples|]0,1[There are %count% apples|{1} There is one apple|[1,Inf] There is more than one apple', 0),
array('There are no apples', '{0} There are no apples|]0,1[There are %count% apples|{1} There is one apple|[1,Inf] There is more than one apple', 0.0),
array('There are no apples', '{0.0} There are no apples|]0,1[There are %count% apples|{1} There is one apple|[1,Inf] There is more than one apple', 0),

// Test texts with new-lines
array("This is text with a\n new-line in it. Selector = 0.", '{0}This is a text with a
// with double-quotes and \n in id and double-quotes and actual newlines in text
array("This is a text with a\n new-line in it. Selector = 0.", "{0}This is a text with a
new-line in it. Selector = 0.|{1}This is a text with a
new-line in it. Selector = 1.|[1,Inf]This is a text with a
new-line in it. Selector > 1.", 0),
// with double-quotes and \n in id and single-quotes and actual newlines in text
array("This is a text with a\n new-line in it. Selector = 1.", '{0}This is a text with a
new-line in it. Selector = 0.|{1}This is a text with a
new-line in it. Selector = 1.|[1,Inf]This is a text with a
new-line in it. Selector > 1.', 0),
array("This is text with a\n new-line in it. Selector = 1.", '{0}This is a text with a
new-line in it. Selector > 1.', 1),
array("This is a text with a\n new-line in it. Selector > 1.", '{0}This is a text with a
new-line in it. Selector = 0.|{1}This is a text with a
new-line in it. Selector = 1.|[1,Inf]This is a text with a
new-line in it. Selector > 1.', 5),
// with double-quotes and id split accros lines
array("This is a text with a
new-line in it. Selector = 1.", '{0}This is a text with a
new-line in it. Selector = 0.|{1}This is a text with a
new-line in it. Selector = 1.|[1,Inf]This is a text with a
new-line in it. Selector > 1.', 1),
array("This is text with a\n new-line in it. Selector > 1.", '{0}This is a text with a
// with single-quotes and id split accros lines
Copy link
Member

Choose a reason for hiding this comment

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

this case is strictly the same than the previous one (the quote style being used does not change the string value here)

array('This is a text with a
new-line in it. Selector > 1.', '{0}This is a text with a
new-line in it. Selector = 0.|{1}This is a text with a
new-line in it. Selector = 1.|[1,Inf]This is a text with a
new-line in it. Selector > 1.', 5),
// with single-quotes and \n in text
array('This is a text with a\nnew-line in it. Selector = 0.', '{0}This is a text with a\nnew-line in it. Selector = 0.|{1}This is a text with a\nnew-line in it. Selector = 1.|[1,Inf]This is a text with a\nnew-line in it. Selector > 1.', 0),
Copy link
Member

Choose a reason for hiding this comment

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

I don't see the goal of this test. It is a single-line string, which is already covered by other tests

// with double-quotes and id split accros lines
array("This is a text with a\nnew-line in it. Selector = 1.", "{0}This is a text with a\nnew-line in it. Selector = 0.|{1}This is a text with a\nnew-line in it. Selector = 1.|[1,Inf]This is a text with a\nnew-line in it. Selector > 1.", 1),
);
}
}
0