From 5720399e49579b422526943cf30e5877aa9e5526 Mon Sep 17 00:00:00 2001 From: Skidder Date: Thu, 5 Dec 2019 21:23:03 +0100 Subject: [PATCH 01/11] Update README.md --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 1ee123b..bf38a3b 100644 --- a/README.md +++ b/README.md @@ -5,6 +5,7 @@ Hadder Discord is a multi-purpose Discord Bot with 100% uptime. [![Build Status](https://github.com/BigBotNetwork/Hadder/workflows/Hadder/badge.svg)](https://github.com/BigBotNetwork/Hadder) [![Codacy Badge](https://api.codacy.com/project/badge/Grade/ddb8cb7ec85f467caa691c175e1f01b5)](https://www.codacy.com/gh/BigBotNetwork/Hadder?utm_source=github.com&utm_medium=referral&utm_content=BigBotNetwork/Hadder&utm_campaign=Badge_Grade) +[![Crowdin]()](https://bbn.crowdin.com/project-name) [![Discord Bots](https://top.gg/api/widget/637002314162372639.svg)](https://top.gg/bot/637002314162372639) From 72f843f757c24d7432cdd2d617e4d964a7af7b0f Mon Sep 17 00:00:00 2001 From: Skidder Date: Thu, 5 Dec 2019 21:23:42 +0100 Subject: [PATCH 02/11] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index bf38a3b..bd25925 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ Hadder Discord is a multi-purpose Discord Bot with 100% uptime. [![Build Status](https://github.com/BigBotNetwork/Hadder/workflows/Hadder/badge.svg)](https://github.com/BigBotNetwork/Hadder) [![Codacy Badge](https://api.codacy.com/project/badge/Grade/ddb8cb7ec85f467caa691c175e1f01b5)](https://www.codacy.com/gh/BigBotNetwork/Hadder?utm_source=github.com&utm_medium=referral&utm_content=BigBotNetwork/Hadder&utm_campaign=Badge_Grade) -[![Crowdin]()](https://bbn.crowdin.com/project-name) +[![Crowdin](https://badges.crowdin.net/e/bc0babde730eb3eada34778502a31b03/localized.svg)](https://bbn.crowdin.com/hadder) [![Discord Bots](https://top.gg/api/widget/637002314162372639.svg)](https://top.gg/bot/637002314162372639) From 4982196fb1d8a1ea12d26c5016fa41f2352245e2 Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Fri, 6 Dec 2019 17:38:23 +0100 Subject: [PATCH 03/11] Role Mention fix --- .../java/com/bbn/hadder/commands/moderation/RulesCommand.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/bbn/hadder/commands/moderation/RulesCommand.java b/src/main/java/com/bbn/hadder/commands/moderation/RulesCommand.java index d6e80f8..244df86 100644 --- a/src/main/java/com/bbn/hadder/commands/moderation/RulesCommand.java +++ b/src/main/java/com/bbn/hadder/commands/moderation/RulesCommand.java @@ -64,7 +64,7 @@ public class RulesCommand implements Command { .setDescription("The channel was successfully set to " + channel.getName() + ". Please send me the rules now.") .build()).queue(); new EventWaiter().newOnMessageEventWaiter(event2 -> { - String message = event2.getMessage().getContentDisplay(); + String message = event2.getMessage().getContentRaw(); event2.getChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO) .setTitle("Role to assign") .setDescription("The rules were successfully set. Please send me the name of the role which the user receives after he accepted the rules.") From 4c42a56518912e5bd4bb1d27024c16ff8534f211 Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Fri, 6 Dec 2019 20:00:50 +0100 Subject: [PATCH 04/11] .de --> .com in the code of conduct --- CODE_OF_CONDUCT.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md index 83d7c35..c6cf5f2 100644 --- a/CODE_OF_CONDUCT.md +++ b/CODE_OF_CONDUCT.md @@ -57,7 +57,7 @@ If a community member engages in unacceptable behavior, the community organizers ## 7. Reporting Guidelines -If you are subject to or witness unacceptable behavior, or have any other concerns, please notify a community organizer as soon as possible. admin@bigbotnetwork.de. +If you are subject to or witness unacceptable behavior, or have any other concerns, please notify a community organizer as soon as possible. admin@bigbotnetwork.com. @@ -77,7 +77,7 @@ This code of conduct and its related procedures also applies to unacceptable beh ## 10. Contact info -admin@bigbotnetwork.de +admin@bigbotnetwork.com ## 11. License and attribution From 32dfcb0269f08d292bd88ac253ae3d1ac622bb6f Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Fri, 6 Dec 2019 20:09:39 +0100 Subject: [PATCH 05/11] Crowdin test --- src/main/Translations/EN/en.json | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 src/main/Translations/EN/en.json diff --git a/src/main/Translations/EN/en.json b/src/main/Translations/EN/en.json new file mode 100644 index 0000000..7abf155 --- /dev/null +++ b/src/main/Translations/EN/en.json @@ -0,0 +1,3 @@ +{ + "Test String": "I am a test string" +} From aa21dd536a663005703c2656ee93c85e27813230 Mon Sep 17 00:00:00 2001 From: Skidder Date: Fri, 6 Dec 2019 11:10:57 -0800 Subject: [PATCH 06/11] Update Crowdin configuration file --- crowdin.yml | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 crowdin.yml diff --git a/crowdin.yml b/crowdin.yml new file mode 100644 index 0000000..91bad35 --- /dev/null +++ b/crowdin.yml @@ -0,0 +1,3 @@ +files: + - source: src/main/Translations/EN/en.json + translation: src/main/Translations/Translated/%two_letters_code%/%original_file_name% From 087535e120a9ff4f7fee90f98a15a867fce18b79 Mon Sep 17 00:00:00 2001 From: Skidder Date: Fri, 6 Dec 2019 11:11:06 -0800 Subject: [PATCH 07/11] New translations en.json (German) --- de/src/main/Translations/Translated/DE/en.json | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 de/src/main/Translations/Translated/DE/en.json diff --git a/de/src/main/Translations/Translated/DE/en.json b/de/src/main/Translations/Translated/DE/en.json new file mode 100644 index 0000000..7abf155 --- /dev/null +++ b/de/src/main/Translations/Translated/DE/en.json @@ -0,0 +1,3 @@ +{ + "Test String": "I am a test string" +} From 77a4ee819e93edfd10a5facf068b29c5438a1c5a Mon Sep 17 00:00:00 2001 From: Skidder Date: Fri, 6 Dec 2019 11:11:07 -0800 Subject: [PATCH 08/11] New translations en.json (English) --- en/src/main/Translations/Translated/en/en.json | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 en/src/main/Translations/Translated/en/en.json diff --git a/en/src/main/Translations/Translated/en/en.json b/en/src/main/Translations/Translated/en/en.json new file mode 100644 index 0000000..7abf155 --- /dev/null +++ b/en/src/main/Translations/Translated/en/en.json @@ -0,0 +1,3 @@ +{ + "Test String": "I am a test string" +} From a3e19b1098ddd6ffb286b209773ec63ffb5eb335 Mon Sep 17 00:00:00 2001 From: Skidder Date: Fri, 6 Dec 2019 11:11:08 -0800 Subject: [PATCH 09/11] New translations en.json (Spanish) --- es/src/main/Translations/Translated/es/en.json | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 es/src/main/Translations/Translated/es/en.json diff --git a/es/src/main/Translations/Translated/es/en.json b/es/src/main/Translations/Translated/es/en.json new file mode 100644 index 0000000..7abf155 --- /dev/null +++ b/es/src/main/Translations/Translated/es/en.json @@ -0,0 +1,3 @@ +{ + "Test String": "I am a test string" +} From 05c31dd884bd798d42a24c5bbd59ba49644470e4 Mon Sep 17 00:00:00 2001 From: Skidder Date: Fri, 6 Dec 2019 11:11:09 -0800 Subject: [PATCH 10/11] New translations en.json (French) --- fr/src/main/Translations/Translated/fr/en.json | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 fr/src/main/Translations/Translated/fr/en.json diff --git a/fr/src/main/Translations/Translated/fr/en.json b/fr/src/main/Translations/Translated/fr/en.json new file mode 100644 index 0000000..7abf155 --- /dev/null +++ b/fr/src/main/Translations/Translated/fr/en.json @@ -0,0 +1,3 @@ +{ + "Test String": "I am a test string" +} From 78d67fccd829899d414cd4ab743998864b909d05 Mon Sep 17 00:00:00 2001 From: Skidder Date: Fri, 6 Dec 2019 11:14:04 -0800 Subject: [PATCH 11/11] New translations en.json (German) --- de/src/main/Translations/Translated/DE/en.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/de/src/main/Translations/Translated/DE/en.json b/de/src/main/Translations/Translated/DE/en.json index 7abf155..4c018be 100644 --- a/de/src/main/Translations/Translated/DE/en.json +++ b/de/src/main/Translations/Translated/DE/en.json @@ -1,3 +1,3 @@ { - "Test String": "I am a test string" + "Test String": "Ich bin cool" }