Skip to content

Update debug.rst #10403

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

Merged
merged 1 commit into from
Sep 24, 2019
Merged

Update debug.rst #10403

merged 1 commit into from
Sep 24, 2019

Conversation

wish-master
Copy link

This is a correction of messages for "fr" block after described steps (as it tested for v4.1)

@Seb33300
Copy link
Contributor

Mmmh this PR is related to #10399 and my PR was already merged...

But this PR also fixes another issue in the text related to the issue.
This PR should be merged in 2.8 not 4.1

@@ -143,7 +143,7 @@ for the ``fr`` locale and run the command, you will get:
--------- ------------------ ---------------------- -------------------------------
State Id Message Preview (fr) Fallback Message Preview (en)
--------- ------------------ ---------------------- -------------------------------
missing Symfony is great J'aime Symfony Symfony is great
missing Symfony is great Symfony is great Symfony is great
Copy link
Contributor

Choose a reason for hiding this comment

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

  State      Id                  Message Preview (fr)    Fallback Message Preview (en)
  ---------  ------------------  ----------------------  -------------------------------
- missing    Symfony is great    Symfony is great         Symfony is great
+ missing    Symfony is great    Symfony is great        Symfony is great

Copy link
Contributor

@OskarStark OskarStark Oct 11, 2018

Choose a reason for hiding this comment

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

To be more clear, it looks like you need to remove 2 spaces before the second occurrence of „Symfony is great“ to match the table, or does it already work?

cc @javiereguiluz

@@ -162,12 +162,12 @@ translation file in the ``fr`` locale and run the command, you will get:
---------- ------------------ ---------------------- -------------------------------
State Id Message Preview (fr) Fallback Message Preview (en)
---------- ------------------ ---------------------- -------------------------------
fallback Symfony is great J'aime Symfony Symfony is great
fallback Symfony is great Symfony is great Symfony is great
Copy link
Contributor

Choose a reason for hiding this comment

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

same as above

Copy link
Author

Choose a reason for hiding this comment

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

Exactly! That's all I've done, this messages must be the same!

Copy link
Contributor

Choose a reason for hiding this comment

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

This part is in conflict with the other merged PR.

@xabbuh
Copy link
Member

xabbuh commented Mar 8, 2019

@wish-master Would you be able to rebase and resolve the conflicts here?

This is a correction of messages for "fr" block after described steps
@javiereguiluz javiereguiluz changed the base branch from 4.1 to 3.4 September 24, 2019 07:39
javiereguiluz added a commit that referenced this pull request Sep 24, 2019
This PR was submitted for the 4.1 branch but it was merged into the 3.4 branch instead (closes #10403).

Discussion
----------

Update debug.rst

This is a correction of messages for "fr" block after described steps (as it tested for v4.1)

Commits
-------

61f7a9b Update debug.rst
@javiereguiluz javiereguiluz merged commit 61f7a9b into symfony:3.4 Sep 24, 2019
@javiereguiluz
Copy link
Member

Sorry it took us so long ... but this is finally merged (in 3.4, 4.3, 4.4 and master).

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants