Robertdebrus / ANLEra

ANLEra add-on for Battle for Wesnoth
GNU General Public License v2.0
2 stars 2 forks source link

Incorporate into master #39

Closed sevu closed 6 years ago

sevu commented 6 years ago

Included @Lukc changes, finished translation, the dwarf bug seems to be 10 months old.

@Robertdebrus Ready to be uploaded.

Please, both, configure your editor to save files in utf8 encoding and to use spaces instead of tabs (or run wmlindent before committing). Otherwise this causes huge problems with merging or introduces bugs. If the commits show the file as binary or show a diff where nothing visibly changed in the line, it's likely broken.

Robertdebrus commented 6 years ago

Should I merge this before or after the other one, or does it matter? Sorry for not being able to pay attention much the past few days!

sevu commented 6 years ago

Instead of the other, I already merged the other into this one.

No worries, just please have a look at setting your editor to use utf8 =)

As for releasing, #40 needs to be fixed before (probably trivial), otherwise it looks fine.

Robertdebrus commented 6 years ago

I will look at my editor settings!

Lukc commented 6 years ago

Thanks a lot for fixing the merge!

For the wmllint/(tabs/space) issue, couldn’t things like that be checked automatically with CI? Maybe you know if another UMC project does something similar?

sevu commented 6 years ago

I don't know if there exist continuous integration for that, and how hard it is to set up. Given the size of this project, it's probably easier to set up the editor.

Lukc commented 6 years ago

The editor fix is indeed easier. Having a CI infrastructure setup would be a good start for any kind of additional automated testing, though.

What about adding (Vim?) modelines to the files?

sevu commented 6 years ago

It would be, the tests could be

For modlines, I didn't use them, but I have no objections either, would be ~50 files.