Movatterモバイル変換


[0]ホーム

URL:


Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

some tweaks for #3190#3195

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 ourterms of service andprivacy statement. We’ll occasionally send you account related emails.

Already on GitHub?Sign in to your account

Closed
xabbuh wants to merge1 commit intosymfony:masterfromxabbuh:tweaks-3190
Closed

Conversation

xabbuh
Copy link
Member

QA
Doc fix?yes
New docs?no
Applies toall
Fixed tickets#3190

@@ -349,7 +351,7 @@ The filename of the translation files is also important: each message file
must be named according to the following path: ``domain.locale.loader``:

* **domain**: An optional way to organize messages into groups (e.g. ``admin``,
``navigation`` or the default ``messages``) - see":ref:`using-message-domains`";
``navigation`` or the default ``messages``) - see :ref:`using-message-domains`;
Copy link
Member

Choose a reason for hiding this comment

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

-1

Copy link
MemberAuthor

Choose a reason for hiding this comment

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

Maybe we should discuss whether we generally want to enclose references to other sections in quotes. Is there some convention we used throughout the docs?

Copy link
Member

Choose a reason for hiding this comment

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

I prefer to always enclose them in quotes, except for the cases in which we provide the link name explicietly.

Copy link
Member

Choose a reason for hiding this comment

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

Sometimes quotes seem necessary to me and other times they seem less necessary. I usually take it on a case-by-case basis - I don't care too much either way :).

@weaverryan
Copy link
Member

@xabbuh can you rebase this? I need to patch it into the 2.2 branch, but the conflicts will mess all of that up :). You don't have to re-do it against 2.2, just rebasing against master should be good enough.

Thanks!

@xabbuh
Copy link
MemberAuthor

Rebased it against 2.2. Can you check again@weaverryan? Thanks!

@wouterj
Copy link
Member

It's still causing conflicts...

@xabbuh
Copy link
MemberAuthor

Did you try to merge it into 2.2 or master?

@wouterj
Copy link
Member

Just looked at github indicating if this can be merged, so master

@xabbuh
Copy link
MemberAuthor

That might be the reason. I accidentally opened the pull request against master. But since this should be merge into 2.2 I chose to rebase it on 2.2 instead of master.

@wouterj
Copy link
Member

"You don't have to re-do it against 2.2, just rebasing against master should be good enough." 😉

@xabbuh
Copy link
MemberAuthor

Yeah, I read that. ;-) Thought it spares@weaverryan some time as it goes to 2.2 first. Let's wait What he thinks. Otherwise, I'd be happy to rebase this onto master. ;-)

@weaverryan
Copy link
Member

Rebased against 2.2? Ah, even better! I easily patched this into the 2.2 branch at sha:0c1c2ce ;)

Thanks!

@xabbuhxabbuh deleted the tweaks-3190 branchNovember 29, 2013 21:37
@xabbuh
Copy link
MemberAuthor

It was not that hard. :) Thanks!

Sign up for freeto join this conversation on GitHub. Already have an account?Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

4 participants
@xabbuh@weaverryan@wouterj@cordoval

[8]ページ先頭

©2009-2025 Movatter.jp