Translations for Evolution 1.0.5 (Due Wed, Dec 29, 2010)

Thanks Max,

I agree, I don’t see any need to keep a separate version for the language files themselves. The only time they’ll get pushed to the community is with a MODx release.

That said, I also don’t have any problem with translators or language teams putting info in comments if it is helpful to their own workflow.

Quote from: Paprikas at Dec 23, 2010, 08:03 AM

One question about language file versions.
For now we have version number commented in language files.

 * Version:        2.0.5

Do we need them? I think it can be removed\replaced with MODx version number, for which version language file was prepared.
Thoughts?

PS. I removed "weblink_message" language variable, because it’s not used anymore (for now)
https://github.com/Paprikas/evolution/commit/d968dad382e4585129609cfb5d1a0285547c6355

Mike, can you explain how to keep my fork fresh and pull commits without duplicates?
For example, I created new fork, then made some commits, then some commits has been added to original branch, then I sync them with Fork Queue, and after this manipulations I create pull request. And it contains same commits.
I don’t know how to collaborate and keep it fresh without deleting whole fork and forking it again.

What I have done:

On Github:
1/ created my own git repository by forking modxcms/evolution
2/ download the "develop" branch from my git repository

Locally under Windows XP:
1/ unzip the downloaded file => this create a dir named Coroico-evolution-xxxxxxx
2/ rename this directory as "evolution"
3/ with git Gui tool, create a local git repository
4/ create a "develop" branch with git bash => git branch develop
5/ checkout the "develop" branch
6/ change some files
7/ commit the changes
8/ create a remote label. upstream = [email protected]/Coroico/evolution
9/ push the local "develop" branch to github

On Github:

1/ ask for a pull request on modxcms/evolution.

Here, unfortunaly, I forgot to change the base branch. Should be modxcms/evolution@develop
and head branch is set as Coroico/evolution@develop


I dont know if it is correct to do like this. Probably not. But Git tools under XP are not very friendly too.
And now I need to manage these repositories. So I have the same question as Paprikas

Going forward, I’m working on a visual mindmap and will be reviewing and trying to simplify the documentation to make things easier.

Thanks.

Hey Paprikas, coroico, everyone,

I have a high-level mindmap that I’d love to get some feedback on.

My plan is to turn this into a series of simple pages in the wiki that will act as a sort of how-to wizard to easily guide users through this somewhat complex stuff. The pages will contain more detailed explanations and examples of the git commands, but I’m curious to see if this makes sense to everyone at a high level just from this mindmap.

I’ll describe one central concept first though:

The main idea is to keep your local develop branch in sync with the modxcms github repo. Instead of doing your work on your develop branch, you create "feature branches" for whatever you’re working on, be it an actual feature, or a fix, or a language update. When your develop branch is clean and up to date, it makes it easy to rebase your work in your feature branch, and when you push your feature branch to your repo and create a pull request, it’s clean and up to date, and contains just the commits you made. (Then I merge your work into the modxcms develop branch, and next time you pull or fetch from the modxcms repo, your develop branch will have your commits.)

This may seem like a lot of work and/or complicated, but working with branches in git is so easy, once you go through this once or twice, it’ll make a lot of sense (I hope ;-))

Please let me know if you have any questions.

Thanks again

Looks nice. I’ll try that.

Can you make develop branch showed by default? I hate to select from master every time I create pull request.

PS. First bird https://github.com/modxcms/evolution/pull/61