0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
84495 commits 51 branches 369 tags 4.7 GiB
Commit graph

2440 commits

Author SHA1 Message Date
pentarctagon
7034c8f97b Run WML schema validation in travis. Fixes #3709 
This adds running the WML schema validation in travis.  It also updates the schema itself and fixes a few WML errors so that core and all campaigns under all difficulties pass the schema validation.
 2018-11-24 10:35:22 -06:00
Nils Kneuper
752919e5c3 removed entry that leads to duplicate strings and breaks po files 2018-11-03 00:01:08 +01:00
Michał Janiszewski
9d333bc95a Compare to None using identity is operator 
This is a trivial change that replaces `==` operator with `is` operator, following PEP 8 guideline:

> Comparisons to singletons like None should always be done with is or is not, never the equality operators.

https://legacy.python.org/dev/peps/pep-0008/#programming-recommendations
 2018-10-31 12:21:01 +11:00
Celtic Minstrel
63d0aa3356 Fix pofix 
Two of these strings were not a fix, just a removed string, so no need for pofix.
The other was not specific enough for pofix to match unambiguously.
Also, someone forgot a comma somewhere, causing a syntax error.

(cherry picked from commit 4331c7f4e9)
 2018-10-28 02:52:56 +00:00
Charles Dang
6ecca66c23 Pofix entry for fc6c3ac04b 
[ci skip]

(cherry picked from commit f64f51c10e)
 2018-10-28 02:52:55 +00:00
Charles Dang
6ef8599f0b Pofix entry for b86a2968fe 
[ci skip]

(cherry picked from commit 9f6b66c738)
 2018-10-28 02:52:55 +00:00
Charles Dang
c6595d6f84 Pofix entry for ab9f29a7a4 
[ci skip]

(cherry picked from commit 697216e8ea)
 2018-10-28 02:52:55 +00:00
Victor Sergienko
8716b8f9d0 #3634, #3557: Port from iOS: Compile with Apple crypto framework instead of OpenSSL. 2018-10-25 23:20:04 -07:00
Iris Morelle
7e4d12e10d pofix: 1.14 announcement rules for 1.14.5 
[ci skip]

(cherry-picked from commit 2ea2a4da49)
 2018-10-07 03:25:18 +00:00
Celtic Minstrel
42c48d1483 Move wmlxgettext to the data/tools directory so that it's automatically included in official packages 
(cherry-picked from commit 59e78e5565)
 2018-10-07 03:24:58 +00:00
Jyrki Vesterinen
1166bfb485 Pofix: fix incorrect removal of a space 
Thanks to @jostephd for pointing out that it shouldn't be removed.

[ci skip]

(cherry-picked from commit c59ae5204a)
 2018-10-07 03:24:37 +00:00
Jyrki Vesterinen
7cfd220976 Fix another pofix mistake 
That comma wasn't supposed to be replaced with a period, and I didn't
notice the mistake before pushing the commit.

[ci skip]

(cherry-picked from commit 20bfb35bdd)
 2018-10-07 03:24:27 +00:00
Jyrki Vesterinen
9a3084fbd5 Pofix fixes 
The tool that generates .po files splits lines in order to limit line
length, and pofix can't track split strings. Thus, pofix search rules need
to be shorter so that pofix finds the affected strings.

I also moved the replacements to the right text domains, placed wesnoth-l
to the right spot, and removed the "Asheviere is the Queen of Wesnoth"
replacement because it isn't pofixable. (The second part of the string
becomes just "Queen of Wesnoth." and "queen of Wesnoth." with lowercase Q
is used legitimately elsewhere.)

[ci skip]

(cherry-picked from commit 3df91c9fc1)
 2018-10-07 03:24:26 +00:00
Jyrki Vesterinen
2d8f8ea53a Add pofix entries for the recent typo fixes (resolves #3377) 
Manual merge of pull request #3490. I also ran pofix.

[ci skip]

(cherry-picked from commit 217eba5f97)
 2018-10-07 03:24:24 +00:00
Nobun
90956117ab wmlxgettext: fix #3469: lua plural strings not recognized in some context (#3481) 
* bugfix: https://github.com/wesnoth/wesnoth/issues/3469

* wmlxgettext: removed a debug comment forgotten on the previous bugfix

(cherry-picked from commit 4b79c263d3)
 2018-10-07 03:24:20 +00:00
Iris Morelle
79fd02cd0f pofix: Genericize the Lua version number for the 1.14 announcement 
Otherwise people will keep complaining that it doesn't reflect the
latest 1.14 version since the original number was valid for 1.14.0 and
1.14.4.

[ci skip]

(cherry-picked from commit c589e39098)
 2018-10-07 03:24:20 +00:00
Jyrki Vesterinen
cdd9a902a7 Fix #3436: pot-update failing 
(cherry-picked from commit 5bbc7fedca)
 2018-10-07 03:24:03 +00:00
Iris Morelle
768f400516 pofix: 1.14 announcement rules for 1.14.4 
Also fixes a mistake from the 1.14.3 rules that caused "xxx MiB" to be
replaced with "xxx MB MiB" for all platforms. Oops. Nobody noticed
anyway (?).

[ci skip]

(cherry-picked from commit 12a3b973b9)
 2018-10-07 03:23:53 +00:00
Jyrki Vesterinen
945a386c25 check_utf8.sh: don't check the second Lua bytecode test scenario 
This avoids the other file with binary data.

(cherry-picked from commit 212601deab)
 2018-10-07 03:23:47 +00:00
Jyrki Vesterinen
81d6970195 check_utf8.sh: don't check the Lua bytecode file 
This avoids one of the two files which are currently causing macOS SCons
builds to fail in the master branch.

(cherry-picked from commit 8dc60ae98f)
 2018-10-07 03:23:46 +00:00
Iris Morelle
b62886d7a9 pofix: Rule for an http:// → https:// conversion in translatable strings 
(cherry-picked from commit 74cbae01c4)
 2018-10-07 03:23:40 +00:00
Martin Hrubý (hrubymar10)
674fda85b7 Migrate links to https if available - Fwd c18537edc0 
(cherry-picked from commit bc4d22dc72)
 2018-10-07 03:23:36 +00:00
Charles Dang
39ff3e9114 Remove reference to players_changelog 
(cherry-picked from commit 5bb72d7c89)
 2018-10-07 03:23:25 +00:00
Iris Morelle
373437ec70 pofix: Add rules for whitespace/dot count-changing commits 
[ci skip]

(cherry-picked from commit aa1976f090)
 2018-10-07 03:23:18 +00:00
Severin Glöckner
31e26a4215 wmlxgettext: insert links which use ssl 
[ci skip]

(cherry-picked from commit a66b30312b)
 2018-10-07 03:23:09 +00:00
Iris Morelle
aaa055a6ac pofix: Add rules to address typographical fixes to race descriptions 
NOTE: the rule for the "true orc" case does not work. The string in
question will just have to be fuzzied.

[ci skip]

(cherry-picked from commit 7294878745)
 2018-10-07 03:22:45 +00:00
Iris Morelle
90ad7f51ca pofix: Update with 1.14.3 -> 1.14.3a (macOS) rules for the website 
[ci skip]

(cherry-picked from commit e636549497)
 2018-10-07 03:22:35 +00:00
Iris Morelle
b524c05e04 pofix: Update with 1.14.2 -> 1.14.3 rules for the website 
[ci skip]

(cherry-picked from commit 73680ed764)
 2018-10-07 03:22:34 +00:00
Iris Morelle
b7823147e5 pofix: Update with 1.14.1 -> 1.14.2 rules for the website 
[ci skip]

(cherry-picked from commit 0ca8227959)
 2018-10-07 03:21:54 +00:00
Martin Hrubý (hrubymar10)
e6e8e20551 Switch travis Xcode to DEBUG scheme 
(cherry-picked from commit dee670d2b5)
 2018-10-07 03:21:34 +00:00
Wedge009
90f9fb9ea5 Revert "Revert "'moreso' isn't a word in any dialect of English."" 
This reverts commit 4d5a3de4e6.

Restoring correction at @Vultraz's request.

[ci skip]

(cherry-picked from commit e161d59536)
 2018-10-07 03:21:17 +00:00
Pentarctagon
f262321864 Fix building with osx+cmake on travis. 
(cherry-picked from commit f5d74cd5ed)
 2018-10-07 03:20:49 +00:00
Pentarctagon
b53e875bc6 Add osx+cmake support to travis. 
(cherry-picked from commit f53c6b84cd)
 2018-10-07 03:20:49 +00:00
Iris Morelle
a2bbed728d pofix: Update with 1.14.0 -> 1.14.1 file size rules for the website 
[ci skip]

(cherry-picked from commit fc002f49a9)
 2018-10-07 03:20:44 +00:00
Iris Morelle
c4235d0306 pofix: Update with 1.14.0 -> 1.14.1 rules for the website 
[ci skip]

(cherry-picked from commit c517abb122)
 2018-10-07 03:20:44 +00:00
Wedge009
0b98ddd96b Update text to match changes in dialogues (fixes #2882). 
[ci skip]

(cherry-picked from commit f1bcdc7f1b)
 2018-10-07 03:20:34 +00:00
Iris Morelle
ff61a878c8 pofix: Add 1.14 announcement typo fix 
[ci skip]

(cherry-picked from commit d39d1b87fd)
 2018-10-07 03:20:28 +00:00
pentarctagon
a040d521a4 Updates cmake and scons to be able to compile with OGL. 
Scons OpenGL/GLEW test taken mostly verbatim from 3e2eba22a9

(cherry-picked from commit 5e36a90039)
 2018-10-07 03:20:04 +00:00
pentarctagon
ff0009aa52 Don't copy the po/ directory into the docker image for non-NLS jobs. 
(cherry-picked from commit 3effecdb06)
 2018-10-07 03:19:57 +00:00
pentarctagon
6da9f62685 Running the translations is short, so do them through scons and cmake. 
(cherry-picked from commit ea4d85a06e)
 2018-10-07 03:19:56 +00:00
pentarctagon
5045c09fd5 Put the docker image on its own line. 
(cherry-picked from commit eb0a290ca1)
 2018-10-07 03:19:56 +00:00
Iris Morelle
456ddb8770 pofix changes for UtBS S10 typo fix 
[ci skip]

(cherry-picked from commit f52828db88)
 2018-10-07 03:19:50 +00:00
Celtic Minstrel
d2bc5eb2f1 Fix pofix 
Two of these strings were not a fix, just a removed string, so no need for pofix.
The other was not specific enough for pofix to match unambiguously.
Also, someone forgot a comma somewhere, causing a syntax error.

(cherry-picked from commit 3768dc687d)
 2018-10-07 03:19:47 +00:00
Charles Dang
568b351ccb Pofix entry for fc6c3ac04b 
[ci skip]

(cherry-picked from commit 087d9bb5af)
 2018-10-07 03:19:47 +00:00
Charles Dang
1fabe23ab4 Pofix entry for b86a2968fe 
[ci skip]

(cherry-picked from commit c638d71bf9)
 2018-10-07 03:19:47 +00:00
Charles Dang
a9ebd3f19a Pofix entry for ab9f29a7a4 
[ci skip]

(cherry-picked from commit 9531e29b5d)
 2018-10-07 03:19:47 +00:00
Iris Morelle
85bf47990a Revert "'moreso' isn't a word in any dialect of English." 
This reverts commit fb866c6d13.

This fix is specific to master and translators aren't supposed to be
touching master at this time. There is no point to its existence.

(cherry-picked from commit 4d5a3de4e6)
 2018-10-07 03:19:47 +00:00
pentarctagon
c75a083541 Allow specifying a sanitizer with cmake. 
(cherry-picked from commit 5b94101975)
 2018-10-07 03:19:37 +00:00
pentarctagon
c07b8ca798 Enable building with mysql support on travis. 
(cherry-picked from commit 4157251f11)
 2018-10-07 03:19:36 +00:00
pentarctagon
754b8a6221 Print the value of STRICT and build_timeout. 
(cherry-picked from commit 96c41271d8)
 2018-10-07 03:19:35 +00:00