Merge pull request #48 from ldilley/master

Player event and mention fixes, README.md localization instructions
FragLand · Jan 18, 2020 · 23d806a · 23d806a
2 parents 564c0f1 + c232d09
commit 23d806a
Show file tree

Hide file tree

Showing 16 changed files with 246 additions and 104 deletions.
diff --git a/.github/README.md b/.github/README.md
@@ -20,9 +20,14 @@ the [GPLv3](http://www.gnu.org/licenses/gpl-3.0.en.html). This project makes use
 1. Simply copy `Terracord.dll` and its dependencies into your TShock `ServerPlugins` directory. The dependencies should
 be contained in any release zip archive and includes the following files: `Discord.Net.Core.dll`, `Discord.Net.Rest.dll`,
 `Discord.Net.WebSocket.dll`, `Newtonsoft.Json.dll`, `System.Collections.Immutable.dll`, and `System.Interactive.Async.dll`.
-Ensure that the version of `Newtonsoft.Json.dll` copied to the `ServerPlugins` directory is >=11.0.2. This is a required 
-dependency of Discord.Net. The instance of this DLL included with TShock 4.3.26 is older (10.0.3) and using it results in
-not being able to establish a connection to a Discord server.
+
+   Ensure that the version of `Newtonsoft.Json.dll` copied to the `ServerPlugins` directory is >=11.0.2. This is a required 
+   dependency of Discord.Net. The instance of this DLL included with TShock 4.3.26 is older (10.0.3) and using it results in
+   not being able to establish a connection to a Discord server.
+
+   For localization support, copy any or all language directories (`de`, `en`, `ru`, etc.), each containing
+   `Terracord.resources.dll`, to the top-level directory where `TerrariaServer.exe` resides. You may then set the preferred
+   locale in `terracord.xml` to make any supported language active.
 
 2. Edit `terracord.xml` to set your bot token and Discord channel ID. This file should be saved to the `tshock` directory.
 Other settings in this configuration file may also be changed to your liking. The channel ID can be obtained by enabling 
@@ -41,7 +46,8 @@ not supporting Mono.
 ### Building
 #### Visual Studio
 1. Download and install [Visual Studio](https://visualstudio.microsoft.com/) if you do not have the software. The community
-edition is free and contains the essentials to build Terracord. In particular, you want the ".NET desktop development" workload. The "NuGet package manager" is also required to pull in the Discord.Net dependencies. Other individual components such as
+edition is free and contains the essentials to build Terracord. In particular, you want the ".NET desktop development" workload.
+The "NuGet package manager" is also required to pull in the Discord.Net dependencies. Other individual components such as
 debuggers, profilers, "Git for Windows", and the "GitHub extension for Visual Studio" may be useful.
 
 2. Obtain a copy of the Terracord source code if you have not already. This can be performed with
@@ -68,8 +74,8 @@ install `Discord.Net.Core` and `Discord.Net.WebSocket` via NuGet. You may also a
 
 #### .NET Core
 1. Install [.NET Core SDK](https://dotnet.microsoft.com/download/dotnet-core/3.1). .NET Core SDK 3.1.100 is known to
-successfully build Terracord. You can also [configure various Linux package managers](https://docs.microsoft.com/en-us/dotnet/core/install/linux-package-manager-debian10) to install .NET core. This has the
-added benefit of being able to easily update the software.
+successfully build Terracord. You can also [configure various Linux package managers](https://docs.microsoft.com/en-us/dotnet/core/install/linux-package-manager-debian10)
+to install .NET core. This has the added benefit of being able to easily update the software.
 
 2. Obtain a copy of the Terracord source code:
 

diff --git a/Terracord/Properties/Strings.Designer.cs b/Terracord/Properties/Strings.Designer.cs
diff --git a/Terracord/Properties/Strings.ar.resx b/Terracord/Properties/Strings.ar.resx
@@ -117,6 +117,14 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
+  <data name="PlayerJoinedString" xml:space="preserve">
+    <value>انضم إلى الخادم</value>
+    <comment>تم إرسال الرسالة إلى قناة Discord النصية عندما انضم اللاعب إلى خادم Terraria</comment>
+  </data>
+  <data name="PlayerLeftString" xml:space="preserve">
+    <value>الخادم الأيسر</value>
+    <comment>يتم إرسال الرسالة إلى قناة Discord النصية عندما يترك اللاعب خادم Terraria</comment>
+  </data>
   <data name="RelayAvailableString" xml:space="preserve">
     <value>**:white_check_mark: التتابع المتاحة**</value>
     <comment>تم إرسال الرسالة إلى قناة Discord النصية عندما كانت الترحيل متاحة</comment>

diff --git a/Terracord/Properties/Strings.de.resx b/Terracord/Properties/Strings.de.resx
@@ -117,6 +117,14 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
+  <data name="PlayerJoinedString" xml:space="preserve">
+    <value>ist dem Server beigetreten.</value>
+    <comment>Nachricht, die an den Discord-Textkanal gesendet wird, wenn ein Spieler dem Terraria-Server beitritt</comment>
+  </data>
+  <data name="PlayerLeftString" xml:space="preserve">
+    <value>hat den Server verlassen.</value>
+    <comment>Nachricht, die an den Discord-Textkanal gesendet wird, wenn ein Spieler den Terraria-Server verlässt</comment>
+  </data>
   <data name="RelayAvailableString" xml:space="preserve">
     <value>**:white_check_mark: Relais vorhanden.**</value>
     <comment>Nachricht, die an den Discord-Textkanal gesendet wird, wenn das Relais verfügbar wird</comment>

diff --git a/Terracord/Properties/Strings.en.resx b/Terracord/Properties/Strings.en.resx
@@ -117,6 +117,14 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
+  <data name="PlayerJoinedString" xml:space="preserve">
+    <value>has joined the server.</value>
+    <comment>Message sent to Discord text channel when a player joins the Terraria server</comment>
+  </data>
+  <data name="PlayerLeftString" xml:space="preserve">
+    <value>has left the server.</value>
+    <comment>Message sent to Discord text channel when a player leaves the Terraria server</comment>
+  </data>
   <data name="RelayAvailableString" xml:space="preserve">
     <value>**:white_check_mark: Relay available.**</value>
     <comment>Message sent to Discord text channel when relay becomes available</comment>

diff --git a/Terracord/Properties/Strings.es.resx b/Terracord/Properties/Strings.es.resx
@@ -117,6 +117,14 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
+  <data name="PlayerJoinedString" xml:space="preserve">
+    <value>se ha unido al servidor.</value>
+    <comment>Mensaje enviado al canal de texto de Discord cuando un jugador se une al servidor Terraria</comment>
+  </data>
+  <data name="PlayerLeftString" xml:space="preserve">
+    <value>ha dejado el servidor.</value>
+    <comment>Mensaje enviado al canal de texto de Discord cuando un jugador abandona el servidor Terraria</comment>
+  </data>
   <data name="RelayAvailableString" xml:space="preserve">
     <value>**:white_check_mark: Relé disponible.**</value>
     <comment>Mensaje enviado al canal de texto de Discord cuando el relé está disponible</comment>

diff --git a/Terracord/Properties/Strings.fr.resx b/Terracord/Properties/Strings.fr.resx
@@ -117,6 +117,14 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
+  <data name="PlayerJoinedString" xml:space="preserve">
+    <value>rejoint le serveur.</value>
+    <comment>Message envoyé à la chaîne de texte Discord lorsqu'un joueur rejoint le serveur Terraria</comment>
+  </data>
+  <data name="PlayerLeftString" xml:space="preserve">
+    <value>a quitté le serveur.</value>
+    <comment>Message envoyé à la chaîne de texte Discord lorsqu'un joueur quitte le serveur Terraria</comment>
+  </data>
   <data name="RelayAvailableString" xml:space="preserve">
     <value>**:white_check_mark: Relais disponible.**</value>
     <comment>Message envoyé au canal texte Discord lorsque le relais devient disponible</comment>

diff --git a/Terracord/Properties/Strings.it.resx b/Terracord/Properties/Strings.it.resx
@@ -117,6 +117,14 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
+  <data name="PlayerJoinedString" xml:space="preserve">
+    <value>si è unito al server.</value>
+    <comment>Messaggio inviato al canale di testo Discord quando un giocatore si unisce al server Terraria</comment>
+  </data>
+  <data name="PlayerLeftString" xml:space="preserve">
+    <value>ha lasciato il server.</value>
+    <comment>Messaggio inviato al canale di testo Discord quando un giocatore lascia il server Terraria</comment>
+  </data>
   <data name="RelayAvailableString" xml:space="preserve">
     <value>**:white_check_mark: Relè disponibile.**</value>
     <comment>Messaggio inviato al canale di testo Discord quando l'inoltro diventa disponibile</comment>

diff --git a/Terracord/Properties/Strings.ja.resx b/Terracord/Properties/Strings.ja.resx
@@ -117,6 +117,14 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
+  <data name="PlayerJoinedString" xml:space="preserve">
+    <value>サーバーに参加します。</value>
+    <comment>プレイヤーがTerrariaサーバーに参加すると、Discordテキストチャネルに送信されるメッセージ</comment>
+  </data>
+  <data name="PlayerLeftString" xml:space="preserve">
+    <value>サーバーを離れます。</value>
+    <comment>プレイヤーがTerrariaサーバーを離れたときにDiscordテキストチャネルに送信されるメッセージ</comment>
+  </data>
   <data name="RelayAvailableString" xml:space="preserve">
     <value>**:white_check_mark: リレーが利用可能です。**</value>
     <comment>リレーが使用可能になったときにDiscordテキストチャネルに送信されるメッセージ</comment>

diff --git a/Terracord/Properties/Strings.ko.resx b/Terracord/Properties/Strings.ko.resx
@@ -117,6 +117,14 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
+  <data name="PlayerJoinedString" xml:space="preserve">
+    <value>서버에 가입하십시오.</value>
+    <comment>플레이어가 Terraria 서버에 가입 할 때 Discord 텍스트 채널로 전송되는 메시지</comment>
+  </data>
+  <data name="PlayerLeftString" xml:space="preserve">
+    <value>서버를 떠났습니다.</value>
+    <comment>플레이어가 Terraria 서버를 떠날 때 Discord 텍스트 채널로 전송되는 메시지</comment>
+  </data>
   <data name="RelayAvailableString" xml:space="preserve">
     <value>**:white_check_mark: 릴레이 가능.**</value>
     <comment>릴레이가 활성화 될 때 텍스트 채널로 전송 된 메시지</comment>

diff --git a/Terracord/Properties/Strings.nl.resx b/Terracord/Properties/Strings.nl.resx
@@ -117,6 +117,14 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
+  <data name="PlayerJoinedString" xml:space="preserve">
+    <value>is lid geworden van de server.</value>
+    <comment>Bericht verzonden naar Discord-tekstkanaal wanneer een speler lid wordt van de Terraria-server</comment>
+  </data>
+  <data name="PlayerLeftString" xml:space="preserve">
+    <value>heeft de server verlaten.</value>
+    <comment>Bericht verzonden naar Discord-tekstkanaal wanneer een speler de Terraria-server verlaat</comment>
+  </data>
   <data name="RelayAvailableString" xml:space="preserve">
     <value>**:white_check_mark: Relais beschikbaar.**</value>
     <comment>Bericht verzonden naar Discord-tekstkanaal wanneer relay beschikbaar komt</comment>

diff --git a/Terracord/Properties/Strings.pl.resx b/Terracord/Properties/Strings.pl.resx
@@ -117,6 +117,14 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
+  <data name="PlayerJoinedString" xml:space="preserve">
+    <value>dołączył do serwera.</value>
+    <comment>Wiadomość wysłana do kanału tekstowego Discord, gdy gracz dołącza do serwera Terraria</comment>
+  </data>
+  <data name="PlayerLeftString" xml:space="preserve">
+    <value>opuścił serwer.</value>
+    <comment>Wiadomość wysłana do kanału tekstowego Discord, gdy gracz opuści serwer Terraria</comment>
+  </data>
   <data name="RelayAvailableString" xml:space="preserve">
     <value>**:white_check_mark: Przekaźnik dostępny.**</value>
     <comment>Wiadomość wysłana do kanału tekstowego Discord, gdy przekaźnik stanie się dostępny</comment>