phpBB • Free and Open Source Forum Software

Thanks. I'm picking up Git in bits. At some point I will make a release from the 3.2.12 branch.

Guys, still not clear how I should do it...

I modify the required files, then I create a new branch?

Is that it?

Not sure I can give you a tutorial in using Git and GitHub as I stumble through it myself. It's up to you whether you want to create branches or releases. You should be able to create both a branch and a release from the master, if the latest version of your changes are there. Can I assume your master branch is complete for release 3.2.13 so I can include it in my archive?

Nop, you cannot assume it is complete as I don't know how to do it...

Only 3-4 places need to be changed as I saw in your compare, but the problem is github.

There are plenty of YouTube videos on using Git and GitHub. I don't find them very easy.

As version 3.2.13 comes together, aside from fixing the mark forums read issue when a user requests their last visit date updated, I'm also adding a few things:

- In Edit subscribers, the filter fields for "With selected" and "Show" will persist with their previous values if you change it and press GO.
- The Show field will allow you to filter for subscribers getting Daily digests only, Weekly digests only and Monthly digests only
- If you want to mark your private messages read, it will also mark these private message notifications as read
- The manual mailer should not update the database at all, so I moved the mark private message logic so it would not happen with the manual mailer
- I fixed a minor bug where the popularity size was selecting topics only for topics greater than the size set, rather than greater or equal to the size set as it says in the documentation
- All four language translations will be in the archive

I "think" it has worked.

Can you please confirm?

https://github.com/fernandoch777/digest ... 1...3.2.12

Looks like you edited the right lines. As for copyrights, you can claim copyrights for your translations if you want in the comments.

I don't really care about that

Branches and releases

GitHub is still a mystery for me too. From my understanding you needn't create both. I would recommend you just to create the releases from the master branch, after all changes have been incorporated. For me it has historical reasons that I always create branches AND releases. My repository was a fork of Marks repository with his branches. From my understanding branches for every new version are helpful when you develop the new version inside GitHub. Various people can participate in the development process or they can observe and comment it. After reaching the target or the last milestone, you create a release for users who want to download a finished and working product.
In our translations there is often just one single development step. You can do it also inside your master branch, but I would recommend to create a release for users who are searching for a special version of your translation. But everything is fine as long as one can find the correct version of your translation.

When our translations are re-integrated into Marks main branch, we might think of creating new forks, where each of us can update his translation and merge it into the main branch after finishing his work, but I am not shure, what we really have to do then. At the moment it is the best way, that Mark is collecting our translations manually and loads them up into his branch and the link in the readme file to every single translation remains valid.

kamaleon, is your translation on the GitHub master up to date? Does it include the only language change for version 3.2.13? If so I can include it in my archive and package up a 3.2.13 release.

Nop Mark, how do I find the version 3.2.13 in your github?

It's not published to GitHub. There is only one language string change. I think the issue is that I don't have your email address. You might want to send it to me in a PM.

In /language/en/common.php:

Line 65 is:
and should be:

Ok, fixed now.

https://github.com/fernandoch777/digests-es/tree/3.2.13

How can I make the master be now the latest version?

Do you know? The master seems now to not be up to date...

The way I do it is with the GitHub desktop. There is option on the branch menu "Merge into master" when you are focused on a branch. I then press the Sync button to sync it with GitHub.

Thank you for the updated translation. I'll try to get the 3.2.13 release out today.

And do you know how to merge into master via web?