What are the combined commits without PRs ?

[Zexaron]

Hello

For this, it's necessary to read the comments on this page first: https://github.com/dolphin-emu/dolphin/commit/c51c044142fd0c91839ddc242d9da6efcbb4a526

I wanted to better explain myself what I meant to ask there, but before I could the conversation was locked, looks like that's not the place to talk about, because I didn't get any info where to find more, I defaulted coming and asking here.

The additional post I wanted to make is this:

Quote:So in short, #6331 was merged 2 days ago, if that one did it, how could it do it if I still saw them just hours ago in the afternoon, then in the evening after pulling latest upstream they gone, so I traced it back here (this commit). I guess I just wish to know how this works, merges of PR aren't commited to the public repo immediately? Or where should I read about it if this isn't the place?

If I'm wrong, and it's not that PR, which one then, because I can't find it, so if anyone knows, thanks.

So in essence, is the merging of a PR not the final step? Or how does it work. Thanks

EDIT: Because I was on-deck all day, I saw all the events happening all day, while I didn't really open each one up, there was just nothing remotely close to language files being merged around the time.

Maybe I had something wrong here, I actually was just expanding with git and learning more things, as to with merging and fast forward, so I did a hard reset on my local repo, and a ff-only merge, so it's all up to date again in the evening, in the morning when I started with the language files I did a normal merge, I'm not sure what git did under the hood there, it just was all up to date, I used normal merge for months without issues with not being latest to upstream otherwise none of my PR would make sense.

[AnyOldName3]

To me, it looks like one or more recent commits updated the strings in Dolphin. Once they'd been merged, either because someone did it manually or because we've set up Transifex to do it automatically, these updated strings ended up on Transifex. Once they had, various users translated them. Once they were translated, they needed copying from Transifex back into Dolphin's repo so people could actually use Dolphin in those other languages. This is the commit which adds the updated translations back into Dolphin's repo. This couldn't have been done all at once as the person who created the commit which changed the strings probably doesn't speak all of the zillion languages that Dolphin supports, so we had to wait for other people to finish the job.

Other projects I've worked on don't hold the translated texts in their repo, but instead use the Transifex client to download the translated texts as part of the build process. This avoids commits like this which lag behind the code changes which caused them.

[Zexaron]

Is that not confusing to anyone else?

[AnyOldName3]

Just in case it's not clear from the post I made which probably happened while you were making a post into an image, the commit needs to have the original English text which is being translated as otherwise the translation system doesn't know which English phrase each translated phrase corresponds to.

[MayImilae]

The text you are pointing out is from the in-development warning which was entirely removed from Dolphin in 5.0-6562.

This looks like this is just a transifex update removing the language strings that are no longer going to be used anywhere.

[Zexaron]

Update: Now I noticed this, what github made:



Okay I'm not upset or anything, I actually am happy that those experimental strings got cut out just as I noticed them and thought before I continue I should get those removed.

Secondairly, I was just trying to let you guys know, It may not be a big deal but I thought someone else might be doing a PR to remove those experimental tags, just to tell you they were already gone.


EDIT:

(04-24-2018, 08:40 AM)MayImilae Wrote: The text you are pointing out is from the in-development warning which was entirely removed from Dolphin in 5.0-6562.

This looks like this is just a transifex update removing the language strings that are no longer going to be used anywhere.

Allright, so is it what I speculated that there's a system where you can modify pot from the code as it looks like in DolphinQt2/InDevelopmentWarning.cpp - But then the actual pot and language files get updatel later separately?

Oh sorry, I didn't see any posts while making these 2 images.

(04-24-2018, 08:29 AM)AnyOldName3 Wrote: To me, it looks like one or more recent commits updated the strings in Dolphin. Once they'd been merged, either because someone did it manually or because we've set up Transifex to do it automatically, these updated strings ended up on Transifex. Once they had, various users translated them. Once they were translated, they needed copying from Transifex back into Dolphin's repo so people could actually use Dolphin in those other languages. This is the commit which adds the updated translations back into Dolphin's repo. This couldn't have been done all at once as the person who created the commit which changed the strings probably doesn't speak all of the zillion languages that Dolphin supports, so we had to wait for other people to finish the job.

Other projects I've worked on don't hold the translated texts in their repo, but instead use the Transifex client to download the translated texts as part of the build process. This avoids commits like this which lag behind the code changes which caused them.

Oh, thanks for that, so it was a rare or a special thing, I thought it was some part or feature of git/github I didn't knew about, or maybe it's github that doesn't properly support from merge-to-Transifex-to-public-repo kind of back and forth action?

The root of this how it started was I was making a new po file and I came down to where I saw DolphinQt experimental, remembering the PR about being default merged, I first decided to make a bug report, I got on the github repo and found the srings, an hour or so passed doing offtopic work, then I decided just to make a PR myself to remove experimental tags, but I couldn't find the strings anymore, what should be a good thing (it is) turned into this wild goose chase what happened, but It's just my thing my mind isn't satisfied and determined to get to the bottom of it hehe.

[JosJuice]

(04-24-2018, 08:30 AM)Renazor Wrote: I assume this is some kind of a direct commit that people with direct write access to the public repo can do, correct?

Yes. I use a script to sync the copies of English strings in the translation files with the actual English strings in the source code and to push and pull all strings to and from Transifex, and then those changes get committed directly to the repo without a PR being made.

(04-24-2018, 08:54 AM)Renazor Wrote: Allright, so is it what I speculated that there's a system where you can modify pot from the code as it looks like in DolphinQt2/InDevelopmentWarning.cpp - But then the actual pot and language files get updatel later separately?

The reference to a pot file in PR 6331 is completely unrelated to the translation syncing commit. As long as a PR edits any string that's marked as translatable, it will be reflected in the next translation syncing commit.

(04-24-2018, 08:54 AM)Renazor Wrote: The root of this how it started was I was making a new po file

Please never do this manually, because we're not going to merge anything like that.

[Zexaron]

I was also figuring out more how git works during the time, changing the master branch tracking, reseting it hard, and using --ff-only from now on, so I used that for the first time that evening, that has compounded the confusion, it was just a freak coincidence.

(04-24-2018, 03:56 PM)JosJuice Wrote: Please never do this manually, because we're not going to merge anything like that.

So I'm forced to go through Transifex? It's not free. I've never heard of it until yesterday. I see the link in the readme.md now.

If Transifex uses .po files, what's wrong with making it separately, it's the same kind of file, no?

[JosJuice]

(04-24-2018, 05:25 PM)Renazor Wrote: So I'm forced to go through Transifex?

Yes. (Though I would suggest not trying, because I don't see you getting accepted into any of the Dolphin translation teams.)

(04-24-2018, 05:25 PM)Renazor Wrote: It's not free.

It's free of charge for open source projects. Besides, the one who would have to pay is the project maintainer, not the translators.

(04-24-2018, 05:25 PM)Renazor Wrote: If Transifex uses .po files, what's wrong with making it separately, it's the same kind of file, no?

It would be a maintenance pain for us. If this is something you want to do just on your own, you can make a po file manually, but we're not going to merge anything like that.

[Zexaron]

Allright, I sent a request, says it has to be accepted or not.

(04-24-2018, 06:02 PM)JosJuice Wrote: (Though I would suggest not trying, because I don't see you getting accepted into any of the Dolphin translation teams.)

I will pretend I didn't hear that - I did not change any of my nicknames after that debacle on purpose, to see how much unfair discrimination I will continue to get :p

I guess it's all payback, but I'll get over that as well. Changing nicknames would be too easy way out.