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

Fix translation of literal code #140

Merged
merged 2 commits into from
Jul 15, 2023
Merged

Conversation

joshuaruesweg
Copy link
Member

See a6a3ac0

@msamesch Is there a way to communicate with you about what things you're translating next? Was the problem currently simply not there, because you translated practically alone?

We unfortunately overlapped and I had also (started) translating the attributes. This is vexing and (hopefully) avoidable.

@msamesch
Copy link
Contributor

@joshuaruesweg I'm sorry about that and I knew this would probably happen sooner or later. That's why as for that file it's perfectly fine for me to replace it with your version. What I intended to suggest (should have also done so) is that when somebody starts a new translation, the first thing to do is to push the file with the EN-Revision line and "status wip" or alternatively send an email.

@joshuaruesweg
Copy link
Member Author

I hadn't finished the translation yet, so it fits for me to have your translation in it. No worries :)

I will then in the future simply open a draft PR before, which starts with the English version of the file, before I start to translate. Then the whole thing is completely obvious for everyone and probably easier than sending any emails.

@msamesch
Copy link
Contributor

OK, good idea, so will I. Do you know how to do it on the commandline?

@joshuaruesweg
Copy link
Member Author

Do you know how to do it on the commandline?

You mean opening Pull-Request with the commandline [1]? Or what exactly do you mean?

[1] I know, there is a command like git request-pull within git, but I have never used such a command and basically create a pull request within the web version of Github.

@msamesch
Copy link
Contributor

Thanks. I'll do some RTFM. ;)

@@ -323,7 +323,7 @@ class MyAttribute
<para>
Um den Typ der Deklaration einzuschränken, dem ein Attribut zugeordnet
werden kann, kann eine Bitmaske als erstes Argument an die
<literal>#[Attribut]</literal>-Deklaration übergeben werden.
<literal>#[Attribute]</literal>-Deklaration übergeben werden.
Copy link
Contributor

Choose a reason for hiding this comment

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

Fixed with review.

@@ -367,7 +367,7 @@ class MyAttribute
<para>
Standardmäßig kann ein Attribut nur einmal pro Deklaration verwendet
werden. Wenn das Attribut bei Deklarationen wiederholbar sein soll, muss
dies als Teil der Bitmaske der <literal>#[Attribut]</literal>-Deklaration
dies als Teil der Bitmaske der <literal>#[Attribute]</literal>-Deklaration
Copy link
Contributor

Choose a reason for hiding this comment

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

Fixed with review.

@msamesch
Copy link
Contributor

This file was tagged as "wip" for a review. With this review I already fixed some of the above.

@joshuaruesweg
Copy link
Member Author

This file was tagged as "wip" for a review. With this review I already fixed some of the above.

Thanks, yes, I had overlooked the WIP within the comment. That still takes a lot of getting used to for me, because intuitively I would work with own branches for things that aren't ready yet (and draft pull requests accordingly, if needed). If the documentation is ready, it will be merged with an Pull-Request into master. This also makes a review easier, because it is much easier to note things in PRs (if you want, I am happy to make sich reviews, too).

But yes, I'll keep in mind how you guys do it here and adapt accordingly.

Thanks for the clarification!

@msamesch
Copy link
Contributor

I don't know, how others do this and probably there are better ways (e.g. the afore mentioned draft PRs). I just installed gh, the official github commandline tool. Up until now I've used git commands.

@msamesch
Copy link
Contributor

msamesch commented Jul 15, 2023

Should I fix this or do uptate your PR with the latest base branch so this can be committed directly?

Fix personalisation.
@joshuaruesweg
Copy link
Member Author

Should I fix this or do uptate your PR with the latest base branch so this can be committed directly?

I have rebased the commit accordingly. If you want, you can merge it together with yours! :)

@msamesch
Copy link
Contributor

Again thanks a lot.

@msamesch msamesch merged commit 03fbca2 into php:master Jul 15, 2023
1 check passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants