Issue185 v2

[saidllen]

No description provided.

[kparal]

I think this should be better called smsId or messageId, so that it's not confused with Record ID.

[kparal]

Next time please modify just src/esmska/resources/l10n.properties, you don't need to rebuild other properties files (and even if you do, you don't need to include them in your commit).

For some reason I haven't received an email notification about your new patch, I'll have a look at it shortly.

[kparal]

Nothing in the source code uses this constructor, so there's no reason to keep this "legacy" constructor around.

[kparal]

Your patch can't be merged with master, there are conflicts in LegacyUpdater.java. Please update master and rebase your branch on top of it. Like this:

git checkout master
git pull
git checkout issue185_v2
git rebase master
# fix conflicts
git commit
git push

Please exclude l10n_* files.

[kparal]

So, information number 1: If you add some commits but don't add any new comment, I'm not notified by github. That means you should add a new comment if you want to notify me :-) I didn't know either.

Information number 2: It seems you haven't rebased your branch on top of current master, there are still merge conflicts. I can deal with it of course, but it's slightly inconvenient and it makes it harder to try out the code. Please rebase the branch (see above) or at least merge it (might be a bit easier):

git checkout master
git pull
git checkout issue185_v2
git merge master
# fix conflicts
git commit
git push

If there are no updates when running git pull, it means you need to sync your forked repository from my repository. Here's how:
https://help.github.com/articles/syncing-a-fork

[kparal]

It's preferable if you don't reformat lines that don't need to be reformatted.

[kparal]

All in all, it looks good. If you correct the small issues, rebase it on current master, and ideally also manage to exclude l10n_*.properties files, it's ready to be merged. I can do the last two things mentioned, if you have big troubles working with git. I understand it needs some experience and it's not particularly easy for beginners.

[saidllen]

Hopefully all problems are fixed, but I am trying and trying to rebase the branches and exlude the files, but it is not working :( When I modify the file and run rebase --continue, it says the same and show the same version as before, so I modify it again and again and still not working... Sorry for that

[saidllen]

I hope I did not make it worse, there are so many commits :-D

[kparal]

Yes, you did it correctly. As for the excluding files, don't worry, that will come with time :-)

Thank you for your patch! I committed it as 211ce82.