Commit graph

5892 commits

Author SHA1 Message Date
Cardinal System
0ea8e1563a
New Crowdin updates (#2746)
* New translations template.pot (Russian)
[skip actions]

* New translations template.pot (Chinese Simplified)
[skip actions]

* New translations template.pot (Russian)
[skip actions]

* New translations template.pot (Chinese Simplified)
[skip actions]

* New translations template.pot (Russian, Ukraine)
[skip actions]

* New translations template.pot (Turkish)
[skip actions]

* New translations template.pot (Spanish)
[skip actions]

* New translations template.pot (Japanese)
[skip actions]

* New translations template.pot (toki pona)
[skip actions]

* New translations template.pot (German)
[skip actions]

* New translations template.pot (French)
[skip actions]

* New translations template.pot (French, Quebec)
[skip actions]

* New translations template.pot (Chinese Simplified)
[skip actions]

* New translations template.pot (French)
[skip actions]

* New translations template.pot (Spanish)
[skip actions]

* New translations template.pot (Japanese)
[skip actions]

* New translations template.pot (Russian)
[skip actions]

* New translations template.pot (Turkish)
[skip actions]

* New translations template.pot (Chinese Simplified)
[skip actions]
2022-10-22 10:47:43 -07:00
Luke
0c2d194d02 Include geoip.dat file again
This should allow the GeoIP.dat file to be found, and used the same way it used to on TShock 4.
It appears I had missed including this in the upgrade, and simply allowing it to copy to the output will allow the system to start working again.
Confirmed by enabling in config and joining via mobile (external network) and my country has appeared, N/A otherwise (local network)
Note: only ipv4 was tested.
2022-10-22 21:45:31 +10:00
Cardinal System
272ad941bd
Update translation template 2022-10-22 08:09:53 +00:00
Cardinal System
7bbdd75fba
New Crowdin updates (#2742)
* New translations template.pot (Russian)
[skip actions]

* New translations template.pot (Chinese Simplified)
[skip actions]

* New translations template.pot (Spanish)
[skip actions]

* New translations template.pot (German)
[skip actions]

* New translations template.pot (Chinese Simplified)
[skip actions]

* New translations template.pot (French)
[skip actions]

* New translations template.pot (French, Quebec)
[skip actions]

* New translations template.pot (French)
[skip actions]

* New translations template.pot (Russian)
[skip actions]

* New translations template.pot (Chinese Simplified)
[skip actions]

* New translations template.pot (Russian, Ukraine)
[skip actions]

* New translations template.pot (Turkish)
[skip actions]

* New translations template.pot (Spanish)
[skip actions]

* New translations template.pot (Japanese)
[skip actions]

* New translations template.pot (toki pona)
[skip actions]

* New translations template.pot (German)
[skip actions]

* New translations template.pot (French)
[skip actions]

* New translations template.pot (French, Quebec)
[skip actions]

* New translations template.pot (Spanish)
[skip actions]

* New translations template.pot (Russian)
[skip actions]

* New translations template.pot (Spanish)
[skip actions]

* New translations template.pot (Russian)
[skip actions]

* New translations template.pot (Chinese Simplified)
[skip actions]

* New translations template.pot (Chinese Simplified)
[skip actions]

* New translations template.pot (Chinese Simplified)
[skip actions]

* New translations template.pot (Chinese Simplified)
[skip actions]

* New translations template.pot (Russian)
[skip actions]

* New translations template.pot (Chinese Simplified)
[skip actions]
2022-10-22 01:09:16 -07:00
Lucas Nicodemus
4632536efb
i18nify some commands
This replaces several strings with i18n-friendly variants so that they
can be internationalized.

Sometimes, the command in English has been reworded, because it was
dumb.

I stopped at GrabUserUserInfo, mostly because I was tired. My
rationale/thinking is that rather than doing a huge commit with the
entire file (which may take a while to build up) it would be better to
get more strings to translators faster. This is because these strings,
in particular, are some of the most important ones to translate.
2022-10-22 01:03:30 -07:00
Lucas Nicodemus
32b2441efc
Add tile benchmark results from @SignatureBeef's 2022-10-21 22:56:53 -07:00
Lucas Nicodemus
9ff108b333
Update documentation a tiny bit on languages, changelog 2022-10-21 21:32:18 -07:00
Lucas Nicodemus
52a23cb634
Update TSAPI for Constileation benchmarks 2022-10-21 21:20:56 -07:00
Lucas Nicodemus
bf7c067f8f
Merge pull request #2744 from Pryaxis/renovate/otapi-things
Update OTAPI things
2022-10-21 17:24:32 -07:00
renovate[bot]
dc505474b0
Update OTAPI things 2022-10-22 00:05:00 +00:00
Cardinal System
f335abc53b
Update translation template 2022-10-21 22:39:30 +00:00
Lucas Nicodemus
d22975448f
Merge pull request #2743 from pontaoski/work/janb/i18nify
Some i18nifiying
2022-10-21 15:38:33 -07:00
Janet Blackquill
f63b26ac76 Some i18nifiying 2022-10-21 16:12:04 -04:00
Lucas Nicodemus
39576e3180
Merge pull request #2737 from pontaoski/work/janb/global-using-static
Use global using static for ICatalog methods
2022-10-21 10:41:01 -07:00
Janet Blackquill
5549cfeded Use global using static for ICatalog methods 2022-10-21 13:25:02 -04:00
Lucas Nicodemus
22d8dd90fa
Merge branch 'general-devel' of github.com:Pryaxis/TShock into general-devel 2022-10-21 09:40:29 -07:00
Lucas Nicodemus
aa8873f792
Add crowdin badge [skip ci] 2022-10-21 09:40:00 -07:00
Cardinal System
d3727e0644
New Crowdin updates (#2740)
* New translations template.pot (Russian)

* New translations template.pot (Chinese Simplified)

* New translations template.pot (Russian, Ukraine)

* New translations template.pot (Russian)

* New translations template.pot (Chinese Simplified)

* New translations template.pot (Russian, Ukraine)

* Remove ru and zh folders

* New translations template.pot (Russian)

* New translations template.pot (Chinese Simplified)

* New translations template.pot (Russian, Ukraine)

* New translations template.pot (Turkish)

* New translations template.pot (Turkish)

* New translations template.pot (Spanish)

* New translations template.pot (Japanese)

* New translations template.pot (toki pona)
[skip actions]

* New translations template.pot (Spanish)
[skip actions]

* New translations template.pot (toki pona)
[skip actions]

Co-authored-by: Lucas Nicodemus <shank@shanked.me>
2022-10-21 09:28:16 -07:00
Lucas Nicodemus
ddfddff17f
Tell crowdin to skip actions [skip actions] 2022-10-21 09:07:06 -07:00
Cardinal System
02fca9018b
Update translation template 2022-10-21 08:25:42 +00:00
Lucas Nicodemus
1646c5e5fd
Use localized "too many login attempts" string
This is primarily a test of the rube goldberg machine but also,
productive work.
2022-10-21 01:23:39 -07:00
Cardinal System
959b3cca24 Update Crowdin configuration file 2022-10-21 00:24:48 -07:00
Lucas Nicodemus
24159d1bb1 Update Crowdin configuration file 2022-10-21 00:08:31 -07:00
Lucas Nicodemus
58fa827e39
Update i18n workflow files
Now, this requires some explanation.

Initially, we had the extract workflow, which did work. The problem is
that it can't commit to general-devel due to branch protection. If we
added a bypass that let it, though, it would enable anyone with write
access to this repository to write to general-devel (you can privilege
escalate easily).

Since we don't want that, this machine is setup:

1. TShock now triggers a workflow execution on a separate repo,
   hakusaro/tshock_i18n.
2. On hakusaro/tshock_i18n, a modified extraction script exists.
3. The modified extraction script, targeting tshock, downloads and runs
   itself.
4. @cardinal-system, a github user I control, creates and signs a commit
   and pushes it back to tshock, bypassing branch protection (because is
allowed to).

Now, nobody except me can modify the code that controls the system that
enables @cardinal-system to commit to tshock, preserving that security
element.

But how is the workflow in hakusaro/tshock_i18n triggered? Through
another workflow of course.

The issue is that triggering requires using...a PAT. Who's PAT? My PAT.
Github just launched fine-grained PATs, so I created a fine-grained PAT
scoped to only the hakusaro/tshock_i18n repo, and only workflow
dispatches.

There are other methods that could be used to technically perform this
triggering using a classic PAT, but they require the `repo` scope, which
would give anyone with write-access the ability to write to
hakusaro/tshock_i18n, which is clearly not-desired.

I was originally kinda stuck, thinking I'd have to make a fine-grained
PAT on @cardinal-system but that isn't supported yet (you can't scope a
fine-grained PAT to another user's repo yet -- only all of your repos or
the org's repos, not a collaborator's repo). But the new fine-grained
PAT system enables creating a PAT that just has a small, isolated set of
things tied to one user.

This is the safest option, I think.

The only catch is that the trigger PAT will expire on October 20, 2023,
so it has to be rotated yearly, like the nuget token
(https://github.com/Pryaxis/TShock/issues/2669).

Fun stuff.
2022-10-20 23:38:26 -07:00
Lucas Nicodemus
8a57190056
Merge branch 'h/test-actions' into general-devel 2022-10-20 23:21:45 -07:00
Lucas Nicodemus
fe71e9ce9f
Add remote trigger pat action 2022-10-20 23:21:27 -07:00
Cardinal System
9a856094c5
Update translation template 2022-10-21 05:59:36 +00:00
Lucas Nicodemus
c297b4523e
Add i18n support to one string
This is mainly to test the extract CI routine that should automatically
commit after this and add the updated extracted string to the .po
template.
2022-10-20 02:21:59 -07:00
Lucas Nicodemus
28838454f5
Attempt to fix i18n script 2022-10-20 02:17:56 -07:00
Lucas Nicodemus
a10bff1018
Update documentation on i18n system. 2022-10-20 02:10:31 -07:00
Lucas Nicodemus
fda1de52a9
Merge pull request #2736 from pontaoski/work/janb/i18n
Add i18n system
2022-10-20 01:25:33 -07:00
Janet Blackquill
77be338e46 Add i18n system 2022-10-20 02:09:29 -04:00
Lucas Nicodemus
d5f46925a3
Merge remote-tracking branch 'kawaiiyuyu/readme' into general-devel 2022-10-19 10:14:08 -07:00
Lucas Nicodemus
be4c33cff5
Merge pull request #2733 from KawaiiYuyu/general-devel
Add localization support for console spam reduction
2022-10-19 10:10:46 -07:00
yuyu
86ed7e21de
Update README_cn.md 2022-10-20 00:12:50 +08:00
yuyu
9e4028fb9d
Change strings to instanced;
Move the changelog to bottom;
2022-10-19 23:20:41 +08:00
yuyu
69e5e202de
Add localization support for console spam reduction
Signed-off-by: yuyu <kawaiiyuyu@outlook.com>
2022-10-19 22:27:11 +08:00
Lucas Nicodemus
ee2d9de205
Add SSC docs 2022-10-19 01:56:27 -07:00
Lucas Nicodemus
449d573aab
Add Apple Silicon notes 2022-10-19 01:05:06 -07:00
Lucas Nicodemus
adbca6a99b
Modernize REST field dumper
Dumps to markdown, formatted for docsify instead of readme.io, and also
puts it in the right folder.
2022-10-19 00:46:02 -07:00
Lucas Nicodemus
b6d4243d72
Document REST fields on new docs system 2022-10-19 00:45:23 -07:00
Lucas Nicodemus
270794ee69
Add field dump descriptions to docs
This adds the newly dumped field descriptions to the docs. In
particular, this adds field descriptions for the config file,
permissions, and ssc config. This also updates the sidebar with this
information.

The dumper formats have also been revamped for markdown.
2022-10-18 23:50:01 -07:00
Lucas Nicodemus
1b306ff39d
Fix SSC dumper not working
Dumper was being called on the wrong thing (the config and not the
settings).
2022-10-18 23:50:01 -07:00
Lucas Nicodemus
fa9717debf
Change dumper to dump to markdown-ish files 2022-10-18 23:50:01 -07:00
Lucas Nicodemus
78087d1dc9
Add MOTD docs 2022-10-18 22:31:06 -07:00
Lucas Nicodemus
83154eac06
Add minor changes to changelog (command line params) 2022-10-18 22:18:08 -07:00
Lucas Nicodemus
cde2d5c3d5
Add changelog for -additionalplugins (@pontaoski) 2022-10-18 22:08:40 -07:00
Lucas Nicodemus
6d61d0ebb6
Merge pull request #2732 from Pryaxis/renovate/otapi-things
Update TerrariaServerAPI digest to bc8e7fc
2022-10-18 21:01:13 -07:00
Lucas Nicodemus
77461f9f15
Merge branch 'general-devel' into renovate/otapi-things 2022-10-18 20:54:59 -07:00
Lucas Nicodemus
1612c4db30
Merge pull request #2731 from punchready/patch-1
Fix grass mowing keeping hanging vines intact
2022-10-18 20:54:16 -07:00