From 85c0a8fbaf2e95f3729b035efd4bc554bfe04621 Mon Sep 17 00:00:00 2001 From: Skidder Date: Tue, 10 Dec 2019 17:50:44 +0100 Subject: [PATCH 01/35] New translations Translations_en.properties (German) [ci skip] New German translation --- src/main/resources/Translations/Translations_de.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/resources/Translations/Translations_de.properties b/src/main/resources/Translations/Translations_de.properties index b7fd562..e6f8a54 100644 --- a/src/main/resources/Translations/Translations_de.properties +++ b/src/main/resources/Translations/Translations_de.properties @@ -2,12 +2,12 @@ # @author Skidder / GregTCLTK # -Hadder=Hadder +Hadder=Hadderino user/id= <@User>/ searchterm= username= -number= +number= guildprefix= <@User>=<@User> on/off= -- 2.45.3 From aeec99f2e0048329ea9dfa7267bd17add9278eba Mon Sep 17 00:00:00 2001 From: Skidder Date: Tue, 10 Dec 2019 20:29:05 +0100 Subject: [PATCH 02/35] New translations Translations_en.properties (German) [ci skip] New German translation --- .../Translations/Translations_de.properties | 219 +++++++++--------- 1 file changed, 110 insertions(+), 109 deletions(-) diff --git a/src/main/resources/Translations/Translations_de.properties b/src/main/resources/Translations/Translations_de.properties index e6f8a54..134e786 100644 --- a/src/main/resources/Translations/Translations_de.properties +++ b/src/main/resources/Translations/Translations_de.properties @@ -2,118 +2,119 @@ # @author Skidder / GregTCLTK # -Hadder=Hadderino +# +# @author Skidder / GregTCLTK +# -user/id= <@User>/ -searchterm= -username= -number= -guildprefix= -<@User>=<@User> -on/off= -vc-name/id= -user+nickname=<@user> +Hadder = Hadderino -error=Error -none=None -success\!=Success\! +searchterm = +username = +number = +guildprefix = +vc-name/id = +user+nickname = <@user> -commands.fun.avatar.success.title=Avatar of -commands.fun.avatar.help.description=Sends the avatar of the specified member. -commands.fun.gif.error.description=Please try again with another term. -commands.fun.gif.help.description=Look for a GIF on Giphy -commands.fun.meme.success.title=Your random meme -commands.fun.meme.api.error=The request to the meme API could not be processed. Please try it again later. -commands.fun.meme.help.description=Sends you a random meme. +error = Error +none = None +success\! = Success\! -commands.general.about.success.title=Hadder - About -commands.general.about.success.description=Hadder is an open source Discord bot. -commands.general.about.success.field.one.title=Support the Developers -commands.general.about.success.field.one.description=Hadder is completely free for everyone. We would appreciate it you donate some money [here] -commands.general.about.help.description=Shows infos about Hadder -commands.general.equals.string.first.request=Please send me the first String -commands.general.equals.string.second.request=Please send me the second String -commands.general.equals.string.equals.true=Yes\! The first string equals the second string\! -commands.general.equals.string.equals.false=Well yes but actually No. This isn't the same. -commands.general.equals.string.first=First String -commands.general.equals.string.second=Second String -commands.general.equals.string.result=Result -commands.general.equals.help.description=Check if two strings are the same -commands.general.help.error.description=I need the Embed Links Permission to send the Help Menu\! -commands.general.help.help.description=Shows each command or explains its usage -commands.general.help.help.label=[CommandName] -commands.general.invite.success.title=Invite me\! -commands.general.invite.success.description=[Invite me here\!] -commands.general.invite.help.description=Shows the invitation to invite Hadder to your server -commands.general.ping.help.description=Shows the ping to the Discord API +commands.fun.avatar.success.title = Avatar of +commands.fun.avatar.help.description = Sends the avatar of the specified member. +commands.fun.gif.error.description = Please try again with another term. +commands.fun.gif.help.description = Look for a GIF on Giphy +commands.fun.meme.success.title = Your random meme +commands.fun.meme.api.error = The request to the meme API could not be processed. Please try it again later. +commands.fun.meme.help.description = Sends you a random meme. -commands.misc.feedback.title.request.title=Feedback Topic -commands.misc.feedback.title.request.description=Please send me the feedback topic. -commands.misc.feedback.description.request.title=Feedback Description -commands.misc.feedback.description.request.description=Please send me the feedback description now. -commands.misc.feedback.help.description=Sends feedback directly to the developers. -commands.misc.github.link.title=Link your GitHub Account -commands.misc.github.success.title=Information about -commands.misc.github.success.bio=User bio -commands.misc.github.success.location=Location -commands.misc.github.success.website=Website -commands.misc.github.success.repositories=Public repositories -commands.misc.github.success.gists=Public gists -commands.misc.github.success.followers=Followers -commands.misc.github.success.following=Following -commands.misc.github.api.error.description=The GitHub API might be down at the moment\! -commands.misc.github.user.error.description=This user does not exist\! -commands.misc.github.connect.title=Connect you GH account -commands.misc.github.connect.description=Please connect your GitHub account here -commands.misc.github.help.description=Displays information about a GitHub user profile. -commands.misc.screenshare.success.title=Here's your Url to share your Screen -commands.misc.screenshare.id.error.title=Wait that's illegal -commands.misc.screenshare.id.error.description=This ID is invalid. \nMaybe you entered a wrong ID? \n\nNote\: Make sure the Voice Channel is on this Guild. -commands.misc.screenshare.channel.error.title=Please Choose a Voice Channel -commands.misc.screenshare.channel.error.description=There is more than one channel with this name -commands.misc.screenshare.number.error.title=You specified a wrong number\! -commands.misc.screenshare.number.error.description=This isn't a Number. -commands.misc.screenshare.channel.existing.error=Hol' up -commands.misc.screenshare.channel.existing.description=There is no Voice Channel named like this. \n\nNote\: Make sure the Voice Channel is on this Guild. -commands.misc.screenshare.help.description=Shows you the link to share your screen. +commands.general.about.success.title = Hadder - About +commands.general.about.success.description = Hadder is an open source Discord bot. +commands.general.about.success.field.one.title = Support the Developers +commands.general.about.success.field.one.description = Hadder is completely free for everyone. We would appreciate it you donate some money [here] +commands.general.about.help.description = Shows infos about Hadder +commands.general.equals.string.first.request = Please send me the first String +commands.general.equals.string.second.request = Please send me the second String +commands.general.equals.string.equals.true = Yes\! The first string equals the second string\! +commands.general.equals.string.equals.false = Well yes but actually No. This isn't the same. +commands.general.equals.string.first = First String +commands.general.equals.string.second = Second String +commands.general.equals.string.result = Result +commands.general.equals.help.description = Check if two strings are the same +commands.general.help.error.description = I need the Embed Links Permission to send the Help Menu\! +commands.general.help.help.description = Shows each command or explains its usage +commands.general.help.help.label = [CommandName] +commands.general.invite.success.title = Invite me\! +commands.general.invite.success.description = [Invite me here\!] +commands.general.invite.help.description = Shows the invitation to invite Hadder to your server +commands.general.ping.help.description = Shows the ping to the Discord API -commands.moderation.ban.success.title=Successfully banned -commands.moderation.ban.success.description=I successfully baned -commands.moderation.ban.error.title=Not possible -commands.moderation.ban.myself.error.description=I can not ban myself\! -commands.moderation.ban.yourself.error.description=You can't ban yourself\! -commands.moderation.ban.help.description=Bans one ore more user from the server -commands.moderation.clear.number.error.description=You have to choose a number between 1 and 200\! -commands.moderation.clear.success.description=Successfully deleted 69 messages. -commands.moderation.clear.help.description=Deletes the specified number of messages. -commands.moderation.prefix.success.title=Successfully set -commands.moderation.prefix.success.description=I successfully set the new prefix for the guild to -commands.moderation.prefix.error.description=The prefix must not contain **** -commands.moderation.prefix.help.description=Sets the Guild-Prefix. -commands.moderation.invitedetect.activate.success.title=Successfully activated -commands.moderation.invitedetect.activate.success.description=I successfully activated the invite link detection for this guild. -commands.moderation.invitedetect.activate.error.title=Already activated -commands.moderation.invitedetect.activate.error.description=The invite link detection is already activated on this guild. -commands.moderation.invitedetect.deactivate.success.title=Successfully deactivated -commands.moderation.invitedetect.deactivate.success.description=I successfully deactivated the invite link detection for this guild. -commands.moderation.invitedetect.deactivate.error.title=Already deactivated -commands.moderation.invitedetect.deactivate.error.description=The invite link detection is already deactivated on this guild. -commands.moderation.invitedetect.help.description=Activate or deactivate the Discord invite link detection. -commands.moderation.kick.success.title=Successfully kicked -commands.moderation.kick.success.description=I successfully kicked -commands.moderation.kick.myself.error.description=I can not kick myself\! -commands.moderation.kick.yourself.error.description=You can't kick yourself. -commands.moderation.kick.mass.success.description=I successfully kicked 69 Members\! -commands.moderation.kick.help.description=Kicks one or more user from the server. -commands.moderation.link.request.success.description=If i'm on this guild i sent a message to accept the link. -commands.moderation.link.error.title=Wait that's illegal. -commands.moderation.link.request.error.description=You specified the same guild as the guild on which you're reading this -commands.moderation.link.request.accept.title=Skidder wants to link guilds\! -commands.moderation.link.request.accept.description=React with the reactions to accept or decline it -commands.moderation.link.set.title=Set the thing boi -commands.moderation.link.help.description=Links two or more servers. -commands.moderation.nick.success.title=Successfully nicked -commands.moderation.nick.success.description=I successfully nicked -commands.moderation.nick.myself.success.description=I successfully changed my nickname. -commands.moderation.nick.mass.success.description=I successfully nicked 69 Members\! -commands.moderation.nick.help.description=Rename a one or more user. +commands.misc.feedback.title.request.title = Feedback Topic +commands.misc.feedback.title.request.description = Please send me the feedback topic. +commands.misc.feedback.description.request.title = Feedback Description +commands.misc.feedback.description.request.description = Please send me the feedback description now. +commands.misc.feedback.help.description = Sends feedback directly to the developers. +commands.misc.github.link.title = Link your GitHub Account +commands.misc.github.success.title = Information about +commands.misc.github.success.bio = User bio +commands.misc.github.success.location = Location +commands.misc.github.success.website = Website +commands.misc.github.success.repositories = Public repositories +commands.misc.github.success.gists = Public gists +commands.misc.github.success.followers = Followers +commands.misc.github.success.following = Following +commands.misc.github.api.error.description = The GitHub API might be down at the moment\! +commands.misc.github.user.error.description = This user does not exist\! +commands.misc.github.connect.title = Connect you GH account +commands.misc.github.connect.description = [Please connect your GitHub account here] +commands.misc.github.help.description = Displays information about a GitHub user profile. +commands.misc.screenshare.success.title = Here's your Url to share your Screen +commands.misc.screenshare.id.error.title = Wait that's illegal +commands.misc.screenshare.id.error.description = This ID is invalid. \nMaybe you entered a wrong ID? \n\nNote\: Make sure the Voice Channel is on this Guild. +commands.misc.screenshare.channel.error.title = Please Choose a Voice Channel +commands.misc.screenshare.channel.error.description = There is more than one channel with this name +commands.misc.screenshare.number.error.title = You specified a wrong number\! +commands.misc.screenshare.number.error.description = This isn't a Number. +commands.misc.screenshare.channel.existing.error = Hol' up +commands.misc.screenshare.channel.existing.description = There is no Voice Channel named like this. \n\nNote\: Make sure the Voice Channel is on this Guild. +commands.misc.screenshare.help.description = Shows you the link to share your screen. + +commands.moderation.ban.success.title = ? Successfully banned ? +commands.moderation.ban.success.description = I successfully baned +commands.moderation.ban.error.title = Not possible +commands.moderation.ban.myself.error.description = I can not ban myself\! +commands.moderation.ban.yourself.error.description = You can not ban yourself\! +commands.moderation.ban.help.description = Bans one ore more user from the server +commands.moderation.clear.number.error.description = You have to choose a number between 1 and 99\! +commands.moderation.clear.success.description = Successfully deleted +commands.moderation.clear.help.description = Deletes the specified number of messages. +commands.moderation.prefix.success.title = ? Successfully set ? +commands.moderation.prefix.success.description = I successfully set the new prefix for the guild to +commands.moderation.prefix.error.description = The prefix must not contain **"** +commands.moderation.prefix.help.description = Sets the Guild-Prefix. +commands.moderation.invitedetect.activate.success.title = Successfully activated +commands.moderation.invitedetect.activate.success.description = I successfully activated the invite link detection for this guild. +commands.moderation.invitedetect.activate.error.title = Already activated +commands.moderation.invitedetect.activate.error.description = The invite link detection is already activated on this guild. +commands.moderation.invitedetect.deactivate.success.title = Successfully deactivated +commands.moderation.invitedetect.deactivate.success.description = I successfully deactivated the invite link detection for this guild. +commands.moderation.invitedetect.deactivate.error.title = Already deactivated +commands.moderation.invitedetect.deactivate.error.description = The invite link detection is already deactivated on this guild. +commands.moderation.invitedetect.help.description = Activate or deactivate the Discord invite link detection. +commands.moderation.kick.success.title = ? Successfully kicked ? +commands.moderation.kick.success.description = I successfully kicked +commands.moderation.kick.error.title = Not possible +commands.moderation.kick.myself.error.description = I can not kick myself\! +commands.moderation.kick.yourself.error.description = You can't kick yourself. +commands.moderation.kick.mass.success.description = I successfully kicked 69 Members\! +commands.moderation.kick.help.description = Kicks one or more user from the server. +commands.moderation.link.request.success.description = If i'm on this guild i sent a message to accept the link. +commands.moderation.link.error.title = Wait that's illegal. +commands.moderation.link.request.error.description = You specified the same guild as the guild on which you're reading this +commands.moderation.link.request.accept.title = ) wants to link guilds\! +commands.moderation.link.request.accept.description = React with the reactions to accept or decline it +commands.moderation.link.set.title = Set the thing boi +commands.moderation.link.help.description = Links two or more servers. +commands.moderation.nick.success.title = ? Successfully nicked ? +commands.moderation.nick.success.description = I successfully nicked +commands.moderation.nick.myself.success.description = I successfully changed my nickname. +commands.moderation.nick.help.description = Rename a one or more user. \ No newline at end of file -- 2.45.3 From 69bce8cbdb2009da778c47c95c001f064b69d1d7 Mon Sep 17 00:00:00 2001 From: Skidder Date: Tue, 10 Dec 2019 20:29:07 +0100 Subject: [PATCH 03/35] New translations Translations_en.properties (English) [ci skip] New English translation --- .../Translations/Translations_en.properties | 219 +++++++++--------- 1 file changed, 110 insertions(+), 109 deletions(-) diff --git a/src/main/resources/Translations/Translations_en.properties b/src/main/resources/Translations/Translations_en.properties index b7fd562..d76eeb6 100644 --- a/src/main/resources/Translations/Translations_en.properties +++ b/src/main/resources/Translations/Translations_en.properties @@ -2,118 +2,119 @@ # @author Skidder / GregTCLTK # -Hadder=Hadder +# +# @author Skidder / GregTCLTK +# -user/id= <@User>/ -searchterm= -username= -number= -guildprefix= -<@User>=<@User> -on/off= -vc-name/id= -user+nickname=<@user> +Hadder = Hadder -error=Error -none=None -success\!=Success\! +searchterm = +username = +number = +guildprefix = +vc-name/id = +user+nickname = <@user> -commands.fun.avatar.success.title=Avatar of -commands.fun.avatar.help.description=Sends the avatar of the specified member. -commands.fun.gif.error.description=Please try again with another term. -commands.fun.gif.help.description=Look for a GIF on Giphy -commands.fun.meme.success.title=Your random meme -commands.fun.meme.api.error=The request to the meme API could not be processed. Please try it again later. -commands.fun.meme.help.description=Sends you a random meme. +error = Error +none = None +success\! = Success\! -commands.general.about.success.title=Hadder - About -commands.general.about.success.description=Hadder is an open source Discord bot. -commands.general.about.success.field.one.title=Support the Developers -commands.general.about.success.field.one.description=Hadder is completely free for everyone. We would appreciate it you donate some money [here] -commands.general.about.help.description=Shows infos about Hadder -commands.general.equals.string.first.request=Please send me the first String -commands.general.equals.string.second.request=Please send me the second String -commands.general.equals.string.equals.true=Yes\! The first string equals the second string\! -commands.general.equals.string.equals.false=Well yes but actually No. This isn't the same. -commands.general.equals.string.first=First String -commands.general.equals.string.second=Second String -commands.general.equals.string.result=Result -commands.general.equals.help.description=Check if two strings are the same -commands.general.help.error.description=I need the Embed Links Permission to send the Help Menu\! -commands.general.help.help.description=Shows each command or explains its usage -commands.general.help.help.label=[CommandName] -commands.general.invite.success.title=Invite me\! -commands.general.invite.success.description=[Invite me here\!] -commands.general.invite.help.description=Shows the invitation to invite Hadder to your server -commands.general.ping.help.description=Shows the ping to the Discord API +commands.fun.avatar.success.title = Avatar of +commands.fun.avatar.help.description = Sends the avatar of the specified member. +commands.fun.gif.error.description = Please try again with another term. +commands.fun.gif.help.description = Look for a GIF on Giphy +commands.fun.meme.success.title = Your random meme +commands.fun.meme.api.error = The request to the meme API could not be processed. Please try it again later. +commands.fun.meme.help.description = Sends you a random meme. -commands.misc.feedback.title.request.title=Feedback Topic -commands.misc.feedback.title.request.description=Please send me the feedback topic. -commands.misc.feedback.description.request.title=Feedback Description -commands.misc.feedback.description.request.description=Please send me the feedback description now. -commands.misc.feedback.help.description=Sends feedback directly to the developers. -commands.misc.github.link.title=Link your GitHub Account -commands.misc.github.success.title=Information about -commands.misc.github.success.bio=User bio -commands.misc.github.success.location=Location -commands.misc.github.success.website=Website -commands.misc.github.success.repositories=Public repositories -commands.misc.github.success.gists=Public gists -commands.misc.github.success.followers=Followers -commands.misc.github.success.following=Following -commands.misc.github.api.error.description=The GitHub API might be down at the moment\! -commands.misc.github.user.error.description=This user does not exist\! -commands.misc.github.connect.title=Connect you GH account -commands.misc.github.connect.description=Please connect your GitHub account here -commands.misc.github.help.description=Displays information about a GitHub user profile. -commands.misc.screenshare.success.title=Here's your Url to share your Screen -commands.misc.screenshare.id.error.title=Wait that's illegal -commands.misc.screenshare.id.error.description=This ID is invalid. \nMaybe you entered a wrong ID? \n\nNote\: Make sure the Voice Channel is on this Guild. -commands.misc.screenshare.channel.error.title=Please Choose a Voice Channel -commands.misc.screenshare.channel.error.description=There is more than one channel with this name -commands.misc.screenshare.number.error.title=You specified a wrong number\! -commands.misc.screenshare.number.error.description=This isn't a Number. -commands.misc.screenshare.channel.existing.error=Hol' up -commands.misc.screenshare.channel.existing.description=There is no Voice Channel named like this. \n\nNote\: Make sure the Voice Channel is on this Guild. -commands.misc.screenshare.help.description=Shows you the link to share your screen. +commands.general.about.success.title = Hadder - About +commands.general.about.success.description = Hadder is an open source Discord bot. +commands.general.about.success.field.one.title = Support the Developers +commands.general.about.success.field.one.description = Hadder is completely free for everyone. We would appreciate it you donate some money [here] +commands.general.about.help.description = Shows infos about Hadder +commands.general.equals.string.first.request = Please send me the first String +commands.general.equals.string.second.request = Please send me the second String +commands.general.equals.string.equals.true = Yes\! The first string equals the second string\! +commands.general.equals.string.equals.false = Well yes but actually No. This isn't the same. +commands.general.equals.string.first = First String +commands.general.equals.string.second = Second String +commands.general.equals.string.result = Result +commands.general.equals.help.description = Check if two strings are the same +commands.general.help.error.description = I need the Embed Links Permission to send the Help Menu\! +commands.general.help.help.description = Shows each command or explains its usage +commands.general.help.help.label = [CommandName] +commands.general.invite.success.title = Invite me\! +commands.general.invite.success.description = [Invite me here\!] +commands.general.invite.help.description = Shows the invitation to invite Hadder to your server +commands.general.ping.help.description = Shows the ping to the Discord API -commands.moderation.ban.success.title=Successfully banned -commands.moderation.ban.success.description=I successfully baned -commands.moderation.ban.error.title=Not possible -commands.moderation.ban.myself.error.description=I can not ban myself\! -commands.moderation.ban.yourself.error.description=You can't ban yourself\! -commands.moderation.ban.help.description=Bans one ore more user from the server -commands.moderation.clear.number.error.description=You have to choose a number between 1 and 200\! -commands.moderation.clear.success.description=Successfully deleted 69 messages. -commands.moderation.clear.help.description=Deletes the specified number of messages. -commands.moderation.prefix.success.title=Successfully set -commands.moderation.prefix.success.description=I successfully set the new prefix for the guild to -commands.moderation.prefix.error.description=The prefix must not contain **** -commands.moderation.prefix.help.description=Sets the Guild-Prefix. -commands.moderation.invitedetect.activate.success.title=Successfully activated -commands.moderation.invitedetect.activate.success.description=I successfully activated the invite link detection for this guild. -commands.moderation.invitedetect.activate.error.title=Already activated -commands.moderation.invitedetect.activate.error.description=The invite link detection is already activated on this guild. -commands.moderation.invitedetect.deactivate.success.title=Successfully deactivated -commands.moderation.invitedetect.deactivate.success.description=I successfully deactivated the invite link detection for this guild. -commands.moderation.invitedetect.deactivate.error.title=Already deactivated -commands.moderation.invitedetect.deactivate.error.description=The invite link detection is already deactivated on this guild. -commands.moderation.invitedetect.help.description=Activate or deactivate the Discord invite link detection. -commands.moderation.kick.success.title=Successfully kicked -commands.moderation.kick.success.description=I successfully kicked -commands.moderation.kick.myself.error.description=I can not kick myself\! -commands.moderation.kick.yourself.error.description=You can't kick yourself. -commands.moderation.kick.mass.success.description=I successfully kicked 69 Members\! -commands.moderation.kick.help.description=Kicks one or more user from the server. -commands.moderation.link.request.success.description=If i'm on this guild i sent a message to accept the link. -commands.moderation.link.error.title=Wait that's illegal. -commands.moderation.link.request.error.description=You specified the same guild as the guild on which you're reading this -commands.moderation.link.request.accept.title=Skidder wants to link guilds\! -commands.moderation.link.request.accept.description=React with the reactions to accept or decline it -commands.moderation.link.set.title=Set the thing boi -commands.moderation.link.help.description=Links two or more servers. -commands.moderation.nick.success.title=Successfully nicked -commands.moderation.nick.success.description=I successfully nicked -commands.moderation.nick.myself.success.description=I successfully changed my nickname. -commands.moderation.nick.mass.success.description=I successfully nicked 69 Members\! -commands.moderation.nick.help.description=Rename a one or more user. +commands.misc.feedback.title.request.title = Feedback Topic +commands.misc.feedback.title.request.description = Please send me the feedback topic. +commands.misc.feedback.description.request.title = Feedback Description +commands.misc.feedback.description.request.description = Please send me the feedback description now. +commands.misc.feedback.help.description = Sends feedback directly to the developers. +commands.misc.github.link.title = Link your GitHub Account +commands.misc.github.success.title = Information about +commands.misc.github.success.bio = User bio +commands.misc.github.success.location = Location +commands.misc.github.success.website = Website +commands.misc.github.success.repositories = Public repositories +commands.misc.github.success.gists = Public gists +commands.misc.github.success.followers = Followers +commands.misc.github.success.following = Following +commands.misc.github.api.error.description = The GitHub API might be down at the moment\! +commands.misc.github.user.error.description = This user does not exist\! +commands.misc.github.connect.title = Connect you GH account +commands.misc.github.connect.description = [Please connect your GitHub account here] +commands.misc.github.help.description = Displays information about a GitHub user profile. +commands.misc.screenshare.success.title = Here's your Url to share your Screen +commands.misc.screenshare.id.error.title = Wait that's illegal +commands.misc.screenshare.id.error.description = This ID is invalid. \nMaybe you entered a wrong ID? \n\nNote\: Make sure the Voice Channel is on this Guild. +commands.misc.screenshare.channel.error.title = Please Choose a Voice Channel +commands.misc.screenshare.channel.error.description = There is more than one channel with this name +commands.misc.screenshare.number.error.title = You specified a wrong number\! +commands.misc.screenshare.number.error.description = This isn't a Number. +commands.misc.screenshare.channel.existing.error = Hol' up +commands.misc.screenshare.channel.existing.description = There is no Voice Channel named like this. \n\nNote\: Make sure the Voice Channel is on this Guild. +commands.misc.screenshare.help.description = Shows you the link to share your screen. + +commands.moderation.ban.success.title = ? Successfully banned ? +commands.moderation.ban.success.description = I successfully baned +commands.moderation.ban.error.title = Not possible +commands.moderation.ban.myself.error.description = I can not ban myself\! +commands.moderation.ban.yourself.error.description = You can not ban yourself\! +commands.moderation.ban.help.description = Bans one ore more user from the server +commands.moderation.clear.number.error.description = You have to choose a number between 1 and 99\! +commands.moderation.clear.success.description = Successfully deleted +commands.moderation.clear.help.description = Deletes the specified number of messages. +commands.moderation.prefix.success.title = ? Successfully set ? +commands.moderation.prefix.success.description = I successfully set the new prefix for the guild to +commands.moderation.prefix.error.description = The prefix must not contain **"** +commands.moderation.prefix.help.description = Sets the Guild-Prefix. +commands.moderation.invitedetect.activate.success.title = Successfully activated +commands.moderation.invitedetect.activate.success.description = I successfully activated the invite link detection for this guild. +commands.moderation.invitedetect.activate.error.title = Already activated +commands.moderation.invitedetect.activate.error.description = The invite link detection is already activated on this guild. +commands.moderation.invitedetect.deactivate.success.title = Successfully deactivated +commands.moderation.invitedetect.deactivate.success.description = I successfully deactivated the invite link detection for this guild. +commands.moderation.invitedetect.deactivate.error.title = Already deactivated +commands.moderation.invitedetect.deactivate.error.description = The invite link detection is already deactivated on this guild. +commands.moderation.invitedetect.help.description = Activate or deactivate the Discord invite link detection. +commands.moderation.kick.success.title = ? Successfully kicked ? +commands.moderation.kick.success.description = I successfully kicked +commands.moderation.kick.error.title = Not possible +commands.moderation.kick.myself.error.description = I can not kick myself\! +commands.moderation.kick.yourself.error.description = You can't kick yourself. +commands.moderation.kick.mass.success.description = I successfully kicked 69 Members\! +commands.moderation.kick.help.description = Kicks one or more user from the server. +commands.moderation.link.request.success.description = If i'm on this guild i sent a message to accept the link. +commands.moderation.link.error.title = Wait that's illegal. +commands.moderation.link.request.error.description = You specified the same guild as the guild on which you're reading this +commands.moderation.link.request.accept.title = ) wants to link guilds\! +commands.moderation.link.request.accept.description = React with the reactions to accept or decline it +commands.moderation.link.set.title = Set the thing boi +commands.moderation.link.help.description = Links two or more servers. +commands.moderation.nick.success.title = ? Successfully nicked ? +commands.moderation.nick.success.description = I successfully nicked +commands.moderation.nick.myself.success.description = I successfully changed my nickname. +commands.moderation.nick.help.description = Rename a one or more user. \ No newline at end of file -- 2.45.3 From 67100f4a1333de7c59465d2f16a4b038841fc285 Mon Sep 17 00:00:00 2001 From: Skidder Date: Tue, 10 Dec 2019 20:29:08 +0100 Subject: [PATCH 04/35] New translations Translations_en.properties (Spanish) [ci skip] New Spanish translation --- .../Translations/Translations_es.properties | 219 +++++++++--------- 1 file changed, 110 insertions(+), 109 deletions(-) diff --git a/src/main/resources/Translations/Translations_es.properties b/src/main/resources/Translations/Translations_es.properties index b7fd562..d76eeb6 100644 --- a/src/main/resources/Translations/Translations_es.properties +++ b/src/main/resources/Translations/Translations_es.properties @@ -2,118 +2,119 @@ # @author Skidder / GregTCLTK # -Hadder=Hadder +# +# @author Skidder / GregTCLTK +# -user/id= <@User>/ -searchterm= -username= -number= -guildprefix= -<@User>=<@User> -on/off= -vc-name/id= -user+nickname=<@user> +Hadder = Hadder -error=Error -none=None -success\!=Success\! +searchterm = +username = +number = +guildprefix = +vc-name/id = +user+nickname = <@user> -commands.fun.avatar.success.title=Avatar of -commands.fun.avatar.help.description=Sends the avatar of the specified member. -commands.fun.gif.error.description=Please try again with another term. -commands.fun.gif.help.description=Look for a GIF on Giphy -commands.fun.meme.success.title=Your random meme -commands.fun.meme.api.error=The request to the meme API could not be processed. Please try it again later. -commands.fun.meme.help.description=Sends you a random meme. +error = Error +none = None +success\! = Success\! -commands.general.about.success.title=Hadder - About -commands.general.about.success.description=Hadder is an open source Discord bot. -commands.general.about.success.field.one.title=Support the Developers -commands.general.about.success.field.one.description=Hadder is completely free for everyone. We would appreciate it you donate some money [here] -commands.general.about.help.description=Shows infos about Hadder -commands.general.equals.string.first.request=Please send me the first String -commands.general.equals.string.second.request=Please send me the second String -commands.general.equals.string.equals.true=Yes\! The first string equals the second string\! -commands.general.equals.string.equals.false=Well yes but actually No. This isn't the same. -commands.general.equals.string.first=First String -commands.general.equals.string.second=Second String -commands.general.equals.string.result=Result -commands.general.equals.help.description=Check if two strings are the same -commands.general.help.error.description=I need the Embed Links Permission to send the Help Menu\! -commands.general.help.help.description=Shows each command or explains its usage -commands.general.help.help.label=[CommandName] -commands.general.invite.success.title=Invite me\! -commands.general.invite.success.description=[Invite me here\!] -commands.general.invite.help.description=Shows the invitation to invite Hadder to your server -commands.general.ping.help.description=Shows the ping to the Discord API +commands.fun.avatar.success.title = Avatar of +commands.fun.avatar.help.description = Sends the avatar of the specified member. +commands.fun.gif.error.description = Please try again with another term. +commands.fun.gif.help.description = Look for a GIF on Giphy +commands.fun.meme.success.title = Your random meme +commands.fun.meme.api.error = The request to the meme API could not be processed. Please try it again later. +commands.fun.meme.help.description = Sends you a random meme. -commands.misc.feedback.title.request.title=Feedback Topic -commands.misc.feedback.title.request.description=Please send me the feedback topic. -commands.misc.feedback.description.request.title=Feedback Description -commands.misc.feedback.description.request.description=Please send me the feedback description now. -commands.misc.feedback.help.description=Sends feedback directly to the developers. -commands.misc.github.link.title=Link your GitHub Account -commands.misc.github.success.title=Information about -commands.misc.github.success.bio=User bio -commands.misc.github.success.location=Location -commands.misc.github.success.website=Website -commands.misc.github.success.repositories=Public repositories -commands.misc.github.success.gists=Public gists -commands.misc.github.success.followers=Followers -commands.misc.github.success.following=Following -commands.misc.github.api.error.description=The GitHub API might be down at the moment\! -commands.misc.github.user.error.description=This user does not exist\! -commands.misc.github.connect.title=Connect you GH account -commands.misc.github.connect.description=Please connect your GitHub account here -commands.misc.github.help.description=Displays information about a GitHub user profile. -commands.misc.screenshare.success.title=Here's your Url to share your Screen -commands.misc.screenshare.id.error.title=Wait that's illegal -commands.misc.screenshare.id.error.description=This ID is invalid. \nMaybe you entered a wrong ID? \n\nNote\: Make sure the Voice Channel is on this Guild. -commands.misc.screenshare.channel.error.title=Please Choose a Voice Channel -commands.misc.screenshare.channel.error.description=There is more than one channel with this name -commands.misc.screenshare.number.error.title=You specified a wrong number\! -commands.misc.screenshare.number.error.description=This isn't a Number. -commands.misc.screenshare.channel.existing.error=Hol' up -commands.misc.screenshare.channel.existing.description=There is no Voice Channel named like this. \n\nNote\: Make sure the Voice Channel is on this Guild. -commands.misc.screenshare.help.description=Shows you the link to share your screen. +commands.general.about.success.title = Hadder - About +commands.general.about.success.description = Hadder is an open source Discord bot. +commands.general.about.success.field.one.title = Support the Developers +commands.general.about.success.field.one.description = Hadder is completely free for everyone. We would appreciate it you donate some money [here] +commands.general.about.help.description = Shows infos about Hadder +commands.general.equals.string.first.request = Please send me the first String +commands.general.equals.string.second.request = Please send me the second String +commands.general.equals.string.equals.true = Yes\! The first string equals the second string\! +commands.general.equals.string.equals.false = Well yes but actually No. This isn't the same. +commands.general.equals.string.first = First String +commands.general.equals.string.second = Second String +commands.general.equals.string.result = Result +commands.general.equals.help.description = Check if two strings are the same +commands.general.help.error.description = I need the Embed Links Permission to send the Help Menu\! +commands.general.help.help.description = Shows each command or explains its usage +commands.general.help.help.label = [CommandName] +commands.general.invite.success.title = Invite me\! +commands.general.invite.success.description = [Invite me here\!] +commands.general.invite.help.description = Shows the invitation to invite Hadder to your server +commands.general.ping.help.description = Shows the ping to the Discord API -commands.moderation.ban.success.title=Successfully banned -commands.moderation.ban.success.description=I successfully baned -commands.moderation.ban.error.title=Not possible -commands.moderation.ban.myself.error.description=I can not ban myself\! -commands.moderation.ban.yourself.error.description=You can't ban yourself\! -commands.moderation.ban.help.description=Bans one ore more user from the server -commands.moderation.clear.number.error.description=You have to choose a number between 1 and 200\! -commands.moderation.clear.success.description=Successfully deleted 69 messages. -commands.moderation.clear.help.description=Deletes the specified number of messages. -commands.moderation.prefix.success.title=Successfully set -commands.moderation.prefix.success.description=I successfully set the new prefix for the guild to -commands.moderation.prefix.error.description=The prefix must not contain **** -commands.moderation.prefix.help.description=Sets the Guild-Prefix. -commands.moderation.invitedetect.activate.success.title=Successfully activated -commands.moderation.invitedetect.activate.success.description=I successfully activated the invite link detection for this guild. -commands.moderation.invitedetect.activate.error.title=Already activated -commands.moderation.invitedetect.activate.error.description=The invite link detection is already activated on this guild. -commands.moderation.invitedetect.deactivate.success.title=Successfully deactivated -commands.moderation.invitedetect.deactivate.success.description=I successfully deactivated the invite link detection for this guild. -commands.moderation.invitedetect.deactivate.error.title=Already deactivated -commands.moderation.invitedetect.deactivate.error.description=The invite link detection is already deactivated on this guild. -commands.moderation.invitedetect.help.description=Activate or deactivate the Discord invite link detection. -commands.moderation.kick.success.title=Successfully kicked -commands.moderation.kick.success.description=I successfully kicked -commands.moderation.kick.myself.error.description=I can not kick myself\! -commands.moderation.kick.yourself.error.description=You can't kick yourself. -commands.moderation.kick.mass.success.description=I successfully kicked 69 Members\! -commands.moderation.kick.help.description=Kicks one or more user from the server. -commands.moderation.link.request.success.description=If i'm on this guild i sent a message to accept the link. -commands.moderation.link.error.title=Wait that's illegal. -commands.moderation.link.request.error.description=You specified the same guild as the guild on which you're reading this -commands.moderation.link.request.accept.title=Skidder wants to link guilds\! -commands.moderation.link.request.accept.description=React with the reactions to accept or decline it -commands.moderation.link.set.title=Set the thing boi -commands.moderation.link.help.description=Links two or more servers. -commands.moderation.nick.success.title=Successfully nicked -commands.moderation.nick.success.description=I successfully nicked -commands.moderation.nick.myself.success.description=I successfully changed my nickname. -commands.moderation.nick.mass.success.description=I successfully nicked 69 Members\! -commands.moderation.nick.help.description=Rename a one or more user. +commands.misc.feedback.title.request.title = Feedback Topic +commands.misc.feedback.title.request.description = Please send me the feedback topic. +commands.misc.feedback.description.request.title = Feedback Description +commands.misc.feedback.description.request.description = Please send me the feedback description now. +commands.misc.feedback.help.description = Sends feedback directly to the developers. +commands.misc.github.link.title = Link your GitHub Account +commands.misc.github.success.title = Information about +commands.misc.github.success.bio = User bio +commands.misc.github.success.location = Location +commands.misc.github.success.website = Website +commands.misc.github.success.repositories = Public repositories +commands.misc.github.success.gists = Public gists +commands.misc.github.success.followers = Followers +commands.misc.github.success.following = Following +commands.misc.github.api.error.description = The GitHub API might be down at the moment\! +commands.misc.github.user.error.description = This user does not exist\! +commands.misc.github.connect.title = Connect you GH account +commands.misc.github.connect.description = [Please connect your GitHub account here] +commands.misc.github.help.description = Displays information about a GitHub user profile. +commands.misc.screenshare.success.title = Here's your Url to share your Screen +commands.misc.screenshare.id.error.title = Wait that's illegal +commands.misc.screenshare.id.error.description = This ID is invalid. \nMaybe you entered a wrong ID? \n\nNote\: Make sure the Voice Channel is on this Guild. +commands.misc.screenshare.channel.error.title = Please Choose a Voice Channel +commands.misc.screenshare.channel.error.description = There is more than one channel with this name +commands.misc.screenshare.number.error.title = You specified a wrong number\! +commands.misc.screenshare.number.error.description = This isn't a Number. +commands.misc.screenshare.channel.existing.error = Hol' up +commands.misc.screenshare.channel.existing.description = There is no Voice Channel named like this. \n\nNote\: Make sure the Voice Channel is on this Guild. +commands.misc.screenshare.help.description = Shows you the link to share your screen. + +commands.moderation.ban.success.title = ? Successfully banned ? +commands.moderation.ban.success.description = I successfully baned +commands.moderation.ban.error.title = Not possible +commands.moderation.ban.myself.error.description = I can not ban myself\! +commands.moderation.ban.yourself.error.description = You can not ban yourself\! +commands.moderation.ban.help.description = Bans one ore more user from the server +commands.moderation.clear.number.error.description = You have to choose a number between 1 and 99\! +commands.moderation.clear.success.description = Successfully deleted +commands.moderation.clear.help.description = Deletes the specified number of messages. +commands.moderation.prefix.success.title = ? Successfully set ? +commands.moderation.prefix.success.description = I successfully set the new prefix for the guild to +commands.moderation.prefix.error.description = The prefix must not contain **"** +commands.moderation.prefix.help.description = Sets the Guild-Prefix. +commands.moderation.invitedetect.activate.success.title = Successfully activated +commands.moderation.invitedetect.activate.success.description = I successfully activated the invite link detection for this guild. +commands.moderation.invitedetect.activate.error.title = Already activated +commands.moderation.invitedetect.activate.error.description = The invite link detection is already activated on this guild. +commands.moderation.invitedetect.deactivate.success.title = Successfully deactivated +commands.moderation.invitedetect.deactivate.success.description = I successfully deactivated the invite link detection for this guild. +commands.moderation.invitedetect.deactivate.error.title = Already deactivated +commands.moderation.invitedetect.deactivate.error.description = The invite link detection is already deactivated on this guild. +commands.moderation.invitedetect.help.description = Activate or deactivate the Discord invite link detection. +commands.moderation.kick.success.title = ? Successfully kicked ? +commands.moderation.kick.success.description = I successfully kicked +commands.moderation.kick.error.title = Not possible +commands.moderation.kick.myself.error.description = I can not kick myself\! +commands.moderation.kick.yourself.error.description = You can't kick yourself. +commands.moderation.kick.mass.success.description = I successfully kicked 69 Members\! +commands.moderation.kick.help.description = Kicks one or more user from the server. +commands.moderation.link.request.success.description = If i'm on this guild i sent a message to accept the link. +commands.moderation.link.error.title = Wait that's illegal. +commands.moderation.link.request.error.description = You specified the same guild as the guild on which you're reading this +commands.moderation.link.request.accept.title = ) wants to link guilds\! +commands.moderation.link.request.accept.description = React with the reactions to accept or decline it +commands.moderation.link.set.title = Set the thing boi +commands.moderation.link.help.description = Links two or more servers. +commands.moderation.nick.success.title = ? Successfully nicked ? +commands.moderation.nick.success.description = I successfully nicked +commands.moderation.nick.myself.success.description = I successfully changed my nickname. +commands.moderation.nick.help.description = Rename a one or more user. \ No newline at end of file -- 2.45.3 From 72c4554b2cb27424b5e37df44adcc9479bdf8794 Mon Sep 17 00:00:00 2001 From: Skidder Date: Tue, 10 Dec 2019 20:29:10 +0100 Subject: [PATCH 05/35] New translations Translations_en.properties (French) [ci skip] New French translation --- .../Translations/Translations_fr.properties | 219 +++++++++--------- 1 file changed, 110 insertions(+), 109 deletions(-) diff --git a/src/main/resources/Translations/Translations_fr.properties b/src/main/resources/Translations/Translations_fr.properties index b7fd562..d76eeb6 100644 --- a/src/main/resources/Translations/Translations_fr.properties +++ b/src/main/resources/Translations/Translations_fr.properties @@ -2,118 +2,119 @@ # @author Skidder / GregTCLTK # -Hadder=Hadder +# +# @author Skidder / GregTCLTK +# -user/id= <@User>/ -searchterm= -username= -number= -guildprefix= -<@User>=<@User> -on/off= -vc-name/id= -user+nickname=<@user> +Hadder = Hadder -error=Error -none=None -success\!=Success\! +searchterm = +username = +number = +guildprefix = +vc-name/id = +user+nickname = <@user> -commands.fun.avatar.success.title=Avatar of -commands.fun.avatar.help.description=Sends the avatar of the specified member. -commands.fun.gif.error.description=Please try again with another term. -commands.fun.gif.help.description=Look for a GIF on Giphy -commands.fun.meme.success.title=Your random meme -commands.fun.meme.api.error=The request to the meme API could not be processed. Please try it again later. -commands.fun.meme.help.description=Sends you a random meme. +error = Error +none = None +success\! = Success\! -commands.general.about.success.title=Hadder - About -commands.general.about.success.description=Hadder is an open source Discord bot. -commands.general.about.success.field.one.title=Support the Developers -commands.general.about.success.field.one.description=Hadder is completely free for everyone. We would appreciate it you donate some money [here] -commands.general.about.help.description=Shows infos about Hadder -commands.general.equals.string.first.request=Please send me the first String -commands.general.equals.string.second.request=Please send me the second String -commands.general.equals.string.equals.true=Yes\! The first string equals the second string\! -commands.general.equals.string.equals.false=Well yes but actually No. This isn't the same. -commands.general.equals.string.first=First String -commands.general.equals.string.second=Second String -commands.general.equals.string.result=Result -commands.general.equals.help.description=Check if two strings are the same -commands.general.help.error.description=I need the Embed Links Permission to send the Help Menu\! -commands.general.help.help.description=Shows each command or explains its usage -commands.general.help.help.label=[CommandName] -commands.general.invite.success.title=Invite me\! -commands.general.invite.success.description=[Invite me here\!] -commands.general.invite.help.description=Shows the invitation to invite Hadder to your server -commands.general.ping.help.description=Shows the ping to the Discord API +commands.fun.avatar.success.title = Avatar of +commands.fun.avatar.help.description = Sends the avatar of the specified member. +commands.fun.gif.error.description = Please try again with another term. +commands.fun.gif.help.description = Look for a GIF on Giphy +commands.fun.meme.success.title = Your random meme +commands.fun.meme.api.error = The request to the meme API could not be processed. Please try it again later. +commands.fun.meme.help.description = Sends you a random meme. -commands.misc.feedback.title.request.title=Feedback Topic -commands.misc.feedback.title.request.description=Please send me the feedback topic. -commands.misc.feedback.description.request.title=Feedback Description -commands.misc.feedback.description.request.description=Please send me the feedback description now. -commands.misc.feedback.help.description=Sends feedback directly to the developers. -commands.misc.github.link.title=Link your GitHub Account -commands.misc.github.success.title=Information about -commands.misc.github.success.bio=User bio -commands.misc.github.success.location=Location -commands.misc.github.success.website=Website -commands.misc.github.success.repositories=Public repositories -commands.misc.github.success.gists=Public gists -commands.misc.github.success.followers=Followers -commands.misc.github.success.following=Following -commands.misc.github.api.error.description=The GitHub API might be down at the moment\! -commands.misc.github.user.error.description=This user does not exist\! -commands.misc.github.connect.title=Connect you GH account -commands.misc.github.connect.description=Please connect your GitHub account here -commands.misc.github.help.description=Displays information about a GitHub user profile. -commands.misc.screenshare.success.title=Here's your Url to share your Screen -commands.misc.screenshare.id.error.title=Wait that's illegal -commands.misc.screenshare.id.error.description=This ID is invalid. \nMaybe you entered a wrong ID? \n\nNote\: Make sure the Voice Channel is on this Guild. -commands.misc.screenshare.channel.error.title=Please Choose a Voice Channel -commands.misc.screenshare.channel.error.description=There is more than one channel with this name -commands.misc.screenshare.number.error.title=You specified a wrong number\! -commands.misc.screenshare.number.error.description=This isn't a Number. -commands.misc.screenshare.channel.existing.error=Hol' up -commands.misc.screenshare.channel.existing.description=There is no Voice Channel named like this. \n\nNote\: Make sure the Voice Channel is on this Guild. -commands.misc.screenshare.help.description=Shows you the link to share your screen. +commands.general.about.success.title = Hadder - About +commands.general.about.success.description = Hadder is an open source Discord bot. +commands.general.about.success.field.one.title = Support the Developers +commands.general.about.success.field.one.description = Hadder is completely free for everyone. We would appreciate it you donate some money [here] +commands.general.about.help.description = Shows infos about Hadder +commands.general.equals.string.first.request = Please send me the first String +commands.general.equals.string.second.request = Please send me the second String +commands.general.equals.string.equals.true = Yes\! The first string equals the second string\! +commands.general.equals.string.equals.false = Well yes but actually No. This isn't the same. +commands.general.equals.string.first = First String +commands.general.equals.string.second = Second String +commands.general.equals.string.result = Result +commands.general.equals.help.description = Check if two strings are the same +commands.general.help.error.description = I need the Embed Links Permission to send the Help Menu\! +commands.general.help.help.description = Shows each command or explains its usage +commands.general.help.help.label = [CommandName] +commands.general.invite.success.title = Invite me\! +commands.general.invite.success.description = [Invite me here\!] +commands.general.invite.help.description = Shows the invitation to invite Hadder to your server +commands.general.ping.help.description = Shows the ping to the Discord API -commands.moderation.ban.success.title=Successfully banned -commands.moderation.ban.success.description=I successfully baned -commands.moderation.ban.error.title=Not possible -commands.moderation.ban.myself.error.description=I can not ban myself\! -commands.moderation.ban.yourself.error.description=You can't ban yourself\! -commands.moderation.ban.help.description=Bans one ore more user from the server -commands.moderation.clear.number.error.description=You have to choose a number between 1 and 200\! -commands.moderation.clear.success.description=Successfully deleted 69 messages. -commands.moderation.clear.help.description=Deletes the specified number of messages. -commands.moderation.prefix.success.title=Successfully set -commands.moderation.prefix.success.description=I successfully set the new prefix for the guild to -commands.moderation.prefix.error.description=The prefix must not contain **** -commands.moderation.prefix.help.description=Sets the Guild-Prefix. -commands.moderation.invitedetect.activate.success.title=Successfully activated -commands.moderation.invitedetect.activate.success.description=I successfully activated the invite link detection for this guild. -commands.moderation.invitedetect.activate.error.title=Already activated -commands.moderation.invitedetect.activate.error.description=The invite link detection is already activated on this guild. -commands.moderation.invitedetect.deactivate.success.title=Successfully deactivated -commands.moderation.invitedetect.deactivate.success.description=I successfully deactivated the invite link detection for this guild. -commands.moderation.invitedetect.deactivate.error.title=Already deactivated -commands.moderation.invitedetect.deactivate.error.description=The invite link detection is already deactivated on this guild. -commands.moderation.invitedetect.help.description=Activate or deactivate the Discord invite link detection. -commands.moderation.kick.success.title=Successfully kicked -commands.moderation.kick.success.description=I successfully kicked -commands.moderation.kick.myself.error.description=I can not kick myself\! -commands.moderation.kick.yourself.error.description=You can't kick yourself. -commands.moderation.kick.mass.success.description=I successfully kicked 69 Members\! -commands.moderation.kick.help.description=Kicks one or more user from the server. -commands.moderation.link.request.success.description=If i'm on this guild i sent a message to accept the link. -commands.moderation.link.error.title=Wait that's illegal. -commands.moderation.link.request.error.description=You specified the same guild as the guild on which you're reading this -commands.moderation.link.request.accept.title=Skidder wants to link guilds\! -commands.moderation.link.request.accept.description=React with the reactions to accept or decline it -commands.moderation.link.set.title=Set the thing boi -commands.moderation.link.help.description=Links two or more servers. -commands.moderation.nick.success.title=Successfully nicked -commands.moderation.nick.success.description=I successfully nicked -commands.moderation.nick.myself.success.description=I successfully changed my nickname. -commands.moderation.nick.mass.success.description=I successfully nicked 69 Members\! -commands.moderation.nick.help.description=Rename a one or more user. +commands.misc.feedback.title.request.title = Feedback Topic +commands.misc.feedback.title.request.description = Please send me the feedback topic. +commands.misc.feedback.description.request.title = Feedback Description +commands.misc.feedback.description.request.description = Please send me the feedback description now. +commands.misc.feedback.help.description = Sends feedback directly to the developers. +commands.misc.github.link.title = Link your GitHub Account +commands.misc.github.success.title = Information about +commands.misc.github.success.bio = User bio +commands.misc.github.success.location = Location +commands.misc.github.success.website = Website +commands.misc.github.success.repositories = Public repositories +commands.misc.github.success.gists = Public gists +commands.misc.github.success.followers = Followers +commands.misc.github.success.following = Following +commands.misc.github.api.error.description = The GitHub API might be down at the moment\! +commands.misc.github.user.error.description = This user does not exist\! +commands.misc.github.connect.title = Connect you GH account +commands.misc.github.connect.description = [Please connect your GitHub account here] +commands.misc.github.help.description = Displays information about a GitHub user profile. +commands.misc.screenshare.success.title = Here's your Url to share your Screen +commands.misc.screenshare.id.error.title = Wait that's illegal +commands.misc.screenshare.id.error.description = This ID is invalid. \nMaybe you entered a wrong ID? \n\nNote\: Make sure the Voice Channel is on this Guild. +commands.misc.screenshare.channel.error.title = Please Choose a Voice Channel +commands.misc.screenshare.channel.error.description = There is more than one channel with this name +commands.misc.screenshare.number.error.title = You specified a wrong number\! +commands.misc.screenshare.number.error.description = This isn't a Number. +commands.misc.screenshare.channel.existing.error = Hol' up +commands.misc.screenshare.channel.existing.description = There is no Voice Channel named like this. \n\nNote\: Make sure the Voice Channel is on this Guild. +commands.misc.screenshare.help.description = Shows you the link to share your screen. + +commands.moderation.ban.success.title = ? Successfully banned ? +commands.moderation.ban.success.description = I successfully baned +commands.moderation.ban.error.title = Not possible +commands.moderation.ban.myself.error.description = I can not ban myself\! +commands.moderation.ban.yourself.error.description = You can not ban yourself\! +commands.moderation.ban.help.description = Bans one ore more user from the server +commands.moderation.clear.number.error.description = You have to choose a number between 1 and 99\! +commands.moderation.clear.success.description = Successfully deleted +commands.moderation.clear.help.description = Deletes the specified number of messages. +commands.moderation.prefix.success.title = ? Successfully set ? +commands.moderation.prefix.success.description = I successfully set the new prefix for the guild to +commands.moderation.prefix.error.description = The prefix must not contain **"** +commands.moderation.prefix.help.description = Sets the Guild-Prefix. +commands.moderation.invitedetect.activate.success.title = Successfully activated +commands.moderation.invitedetect.activate.success.description = I successfully activated the invite link detection for this guild. +commands.moderation.invitedetect.activate.error.title = Already activated +commands.moderation.invitedetect.activate.error.description = The invite link detection is already activated on this guild. +commands.moderation.invitedetect.deactivate.success.title = Successfully deactivated +commands.moderation.invitedetect.deactivate.success.description = I successfully deactivated the invite link detection for this guild. +commands.moderation.invitedetect.deactivate.error.title = Already deactivated +commands.moderation.invitedetect.deactivate.error.description = The invite link detection is already deactivated on this guild. +commands.moderation.invitedetect.help.description = Activate or deactivate the Discord invite link detection. +commands.moderation.kick.success.title = ? Successfully kicked ? +commands.moderation.kick.success.description = I successfully kicked +commands.moderation.kick.error.title = Not possible +commands.moderation.kick.myself.error.description = I can not kick myself\! +commands.moderation.kick.yourself.error.description = You can't kick yourself. +commands.moderation.kick.mass.success.description = I successfully kicked 69 Members\! +commands.moderation.kick.help.description = Kicks one or more user from the server. +commands.moderation.link.request.success.description = If i'm on this guild i sent a message to accept the link. +commands.moderation.link.error.title = Wait that's illegal. +commands.moderation.link.request.error.description = You specified the same guild as the guild on which you're reading this +commands.moderation.link.request.accept.title = ) wants to link guilds\! +commands.moderation.link.request.accept.description = React with the reactions to accept or decline it +commands.moderation.link.set.title = Set the thing boi +commands.moderation.link.help.description = Links two or more servers. +commands.moderation.nick.success.title = ? Successfully nicked ? +commands.moderation.nick.success.description = I successfully nicked +commands.moderation.nick.myself.success.description = I successfully changed my nickname. +commands.moderation.nick.help.description = Rename a one or more user. \ No newline at end of file -- 2.45.3 From 87ed992d9c8818c6dc5f018169c8c1271b21b335 Mon Sep 17 00:00:00 2001 From: Skidder Date: Tue, 10 Dec 2019 20:29:12 +0100 Subject: [PATCH 06/35] New translations Translations_en.properties (Russian) [ci skip] New Russian translation --- .../Translations/Translations_ru.properties | 219 +++++++++--------- 1 file changed, 110 insertions(+), 109 deletions(-) diff --git a/src/main/resources/Translations/Translations_ru.properties b/src/main/resources/Translations/Translations_ru.properties index b7fd562..d76eeb6 100644 --- a/src/main/resources/Translations/Translations_ru.properties +++ b/src/main/resources/Translations/Translations_ru.properties @@ -2,118 +2,119 @@ # @author Skidder / GregTCLTK # -Hadder=Hadder +# +# @author Skidder / GregTCLTK +# -user/id= <@User>/ -searchterm= -username= -number= -guildprefix= -<@User>=<@User> -on/off= -vc-name/id= -user+nickname=<@user> +Hadder = Hadder -error=Error -none=None -success\!=Success\! +searchterm = +username = +number = +guildprefix = +vc-name/id = +user+nickname = <@user> -commands.fun.avatar.success.title=Avatar of -commands.fun.avatar.help.description=Sends the avatar of the specified member. -commands.fun.gif.error.description=Please try again with another term. -commands.fun.gif.help.description=Look for a GIF on Giphy -commands.fun.meme.success.title=Your random meme -commands.fun.meme.api.error=The request to the meme API could not be processed. Please try it again later. -commands.fun.meme.help.description=Sends you a random meme. +error = Error +none = None +success\! = Success\! -commands.general.about.success.title=Hadder - About -commands.general.about.success.description=Hadder is an open source Discord bot. -commands.general.about.success.field.one.title=Support the Developers -commands.general.about.success.field.one.description=Hadder is completely free for everyone. We would appreciate it you donate some money [here] -commands.general.about.help.description=Shows infos about Hadder -commands.general.equals.string.first.request=Please send me the first String -commands.general.equals.string.second.request=Please send me the second String -commands.general.equals.string.equals.true=Yes\! The first string equals the second string\! -commands.general.equals.string.equals.false=Well yes but actually No. This isn't the same. -commands.general.equals.string.first=First String -commands.general.equals.string.second=Second String -commands.general.equals.string.result=Result -commands.general.equals.help.description=Check if two strings are the same -commands.general.help.error.description=I need the Embed Links Permission to send the Help Menu\! -commands.general.help.help.description=Shows each command or explains its usage -commands.general.help.help.label=[CommandName] -commands.general.invite.success.title=Invite me\! -commands.general.invite.success.description=[Invite me here\!] -commands.general.invite.help.description=Shows the invitation to invite Hadder to your server -commands.general.ping.help.description=Shows the ping to the Discord API +commands.fun.avatar.success.title = Avatar of +commands.fun.avatar.help.description = Sends the avatar of the specified member. +commands.fun.gif.error.description = Please try again with another term. +commands.fun.gif.help.description = Look for a GIF on Giphy +commands.fun.meme.success.title = Your random meme +commands.fun.meme.api.error = The request to the meme API could not be processed. Please try it again later. +commands.fun.meme.help.description = Sends you a random meme. -commands.misc.feedback.title.request.title=Feedback Topic -commands.misc.feedback.title.request.description=Please send me the feedback topic. -commands.misc.feedback.description.request.title=Feedback Description -commands.misc.feedback.description.request.description=Please send me the feedback description now. -commands.misc.feedback.help.description=Sends feedback directly to the developers. -commands.misc.github.link.title=Link your GitHub Account -commands.misc.github.success.title=Information about -commands.misc.github.success.bio=User bio -commands.misc.github.success.location=Location -commands.misc.github.success.website=Website -commands.misc.github.success.repositories=Public repositories -commands.misc.github.success.gists=Public gists -commands.misc.github.success.followers=Followers -commands.misc.github.success.following=Following -commands.misc.github.api.error.description=The GitHub API might be down at the moment\! -commands.misc.github.user.error.description=This user does not exist\! -commands.misc.github.connect.title=Connect you GH account -commands.misc.github.connect.description=Please connect your GitHub account here -commands.misc.github.help.description=Displays information about a GitHub user profile. -commands.misc.screenshare.success.title=Here's your Url to share your Screen -commands.misc.screenshare.id.error.title=Wait that's illegal -commands.misc.screenshare.id.error.description=This ID is invalid. \nMaybe you entered a wrong ID? \n\nNote\: Make sure the Voice Channel is on this Guild. -commands.misc.screenshare.channel.error.title=Please Choose a Voice Channel -commands.misc.screenshare.channel.error.description=There is more than one channel with this name -commands.misc.screenshare.number.error.title=You specified a wrong number\! -commands.misc.screenshare.number.error.description=This isn't a Number. -commands.misc.screenshare.channel.existing.error=Hol' up -commands.misc.screenshare.channel.existing.description=There is no Voice Channel named like this. \n\nNote\: Make sure the Voice Channel is on this Guild. -commands.misc.screenshare.help.description=Shows you the link to share your screen. +commands.general.about.success.title = Hadder - About +commands.general.about.success.description = Hadder is an open source Discord bot. +commands.general.about.success.field.one.title = Support the Developers +commands.general.about.success.field.one.description = Hadder is completely free for everyone. We would appreciate it you donate some money [here] +commands.general.about.help.description = Shows infos about Hadder +commands.general.equals.string.first.request = Please send me the first String +commands.general.equals.string.second.request = Please send me the second String +commands.general.equals.string.equals.true = Yes\! The first string equals the second string\! +commands.general.equals.string.equals.false = Well yes but actually No. This isn't the same. +commands.general.equals.string.first = First String +commands.general.equals.string.second = Second String +commands.general.equals.string.result = Result +commands.general.equals.help.description = Check if two strings are the same +commands.general.help.error.description = I need the Embed Links Permission to send the Help Menu\! +commands.general.help.help.description = Shows each command or explains its usage +commands.general.help.help.label = [CommandName] +commands.general.invite.success.title = Invite me\! +commands.general.invite.success.description = [Invite me here\!] +commands.general.invite.help.description = Shows the invitation to invite Hadder to your server +commands.general.ping.help.description = Shows the ping to the Discord API -commands.moderation.ban.success.title=Successfully banned -commands.moderation.ban.success.description=I successfully baned -commands.moderation.ban.error.title=Not possible -commands.moderation.ban.myself.error.description=I can not ban myself\! -commands.moderation.ban.yourself.error.description=You can't ban yourself\! -commands.moderation.ban.help.description=Bans one ore more user from the server -commands.moderation.clear.number.error.description=You have to choose a number between 1 and 200\! -commands.moderation.clear.success.description=Successfully deleted 69 messages. -commands.moderation.clear.help.description=Deletes the specified number of messages. -commands.moderation.prefix.success.title=Successfully set -commands.moderation.prefix.success.description=I successfully set the new prefix for the guild to -commands.moderation.prefix.error.description=The prefix must not contain **** -commands.moderation.prefix.help.description=Sets the Guild-Prefix. -commands.moderation.invitedetect.activate.success.title=Successfully activated -commands.moderation.invitedetect.activate.success.description=I successfully activated the invite link detection for this guild. -commands.moderation.invitedetect.activate.error.title=Already activated -commands.moderation.invitedetect.activate.error.description=The invite link detection is already activated on this guild. -commands.moderation.invitedetect.deactivate.success.title=Successfully deactivated -commands.moderation.invitedetect.deactivate.success.description=I successfully deactivated the invite link detection for this guild. -commands.moderation.invitedetect.deactivate.error.title=Already deactivated -commands.moderation.invitedetect.deactivate.error.description=The invite link detection is already deactivated on this guild. -commands.moderation.invitedetect.help.description=Activate or deactivate the Discord invite link detection. -commands.moderation.kick.success.title=Successfully kicked -commands.moderation.kick.success.description=I successfully kicked -commands.moderation.kick.myself.error.description=I can not kick myself\! -commands.moderation.kick.yourself.error.description=You can't kick yourself. -commands.moderation.kick.mass.success.description=I successfully kicked 69 Members\! -commands.moderation.kick.help.description=Kicks one or more user from the server. -commands.moderation.link.request.success.description=If i'm on this guild i sent a message to accept the link. -commands.moderation.link.error.title=Wait that's illegal. -commands.moderation.link.request.error.description=You specified the same guild as the guild on which you're reading this -commands.moderation.link.request.accept.title=Skidder wants to link guilds\! -commands.moderation.link.request.accept.description=React with the reactions to accept or decline it -commands.moderation.link.set.title=Set the thing boi -commands.moderation.link.help.description=Links two or more servers. -commands.moderation.nick.success.title=Successfully nicked -commands.moderation.nick.success.description=I successfully nicked -commands.moderation.nick.myself.success.description=I successfully changed my nickname. -commands.moderation.nick.mass.success.description=I successfully nicked 69 Members\! -commands.moderation.nick.help.description=Rename a one or more user. +commands.misc.feedback.title.request.title = Feedback Topic +commands.misc.feedback.title.request.description = Please send me the feedback topic. +commands.misc.feedback.description.request.title = Feedback Description +commands.misc.feedback.description.request.description = Please send me the feedback description now. +commands.misc.feedback.help.description = Sends feedback directly to the developers. +commands.misc.github.link.title = Link your GitHub Account +commands.misc.github.success.title = Information about +commands.misc.github.success.bio = User bio +commands.misc.github.success.location = Location +commands.misc.github.success.website = Website +commands.misc.github.success.repositories = Public repositories +commands.misc.github.success.gists = Public gists +commands.misc.github.success.followers = Followers +commands.misc.github.success.following = Following +commands.misc.github.api.error.description = The GitHub API might be down at the moment\! +commands.misc.github.user.error.description = This user does not exist\! +commands.misc.github.connect.title = Connect you GH account +commands.misc.github.connect.description = [Please connect your GitHub account here] +commands.misc.github.help.description = Displays information about a GitHub user profile. +commands.misc.screenshare.success.title = Here's your Url to share your Screen +commands.misc.screenshare.id.error.title = Wait that's illegal +commands.misc.screenshare.id.error.description = This ID is invalid. \nMaybe you entered a wrong ID? \n\nNote\: Make sure the Voice Channel is on this Guild. +commands.misc.screenshare.channel.error.title = Please Choose a Voice Channel +commands.misc.screenshare.channel.error.description = There is more than one channel with this name +commands.misc.screenshare.number.error.title = You specified a wrong number\! +commands.misc.screenshare.number.error.description = This isn't a Number. +commands.misc.screenshare.channel.existing.error = Hol' up +commands.misc.screenshare.channel.existing.description = There is no Voice Channel named like this. \n\nNote\: Make sure the Voice Channel is on this Guild. +commands.misc.screenshare.help.description = Shows you the link to share your screen. + +commands.moderation.ban.success.title = ? Successfully banned ? +commands.moderation.ban.success.description = I successfully baned +commands.moderation.ban.error.title = Not possible +commands.moderation.ban.myself.error.description = I can not ban myself\! +commands.moderation.ban.yourself.error.description = You can not ban yourself\! +commands.moderation.ban.help.description = Bans one ore more user from the server +commands.moderation.clear.number.error.description = You have to choose a number between 1 and 99\! +commands.moderation.clear.success.description = Successfully deleted +commands.moderation.clear.help.description = Deletes the specified number of messages. +commands.moderation.prefix.success.title = ? Successfully set ? +commands.moderation.prefix.success.description = I successfully set the new prefix for the guild to +commands.moderation.prefix.error.description = The prefix must not contain **"** +commands.moderation.prefix.help.description = Sets the Guild-Prefix. +commands.moderation.invitedetect.activate.success.title = Successfully activated +commands.moderation.invitedetect.activate.success.description = I successfully activated the invite link detection for this guild. +commands.moderation.invitedetect.activate.error.title = Already activated +commands.moderation.invitedetect.activate.error.description = The invite link detection is already activated on this guild. +commands.moderation.invitedetect.deactivate.success.title = Successfully deactivated +commands.moderation.invitedetect.deactivate.success.description = I successfully deactivated the invite link detection for this guild. +commands.moderation.invitedetect.deactivate.error.title = Already deactivated +commands.moderation.invitedetect.deactivate.error.description = The invite link detection is already deactivated on this guild. +commands.moderation.invitedetect.help.description = Activate or deactivate the Discord invite link detection. +commands.moderation.kick.success.title = ? Successfully kicked ? +commands.moderation.kick.success.description = I successfully kicked +commands.moderation.kick.error.title = Not possible +commands.moderation.kick.myself.error.description = I can not kick myself\! +commands.moderation.kick.yourself.error.description = You can't kick yourself. +commands.moderation.kick.mass.success.description = I successfully kicked 69 Members\! +commands.moderation.kick.help.description = Kicks one or more user from the server. +commands.moderation.link.request.success.description = If i'm on this guild i sent a message to accept the link. +commands.moderation.link.error.title = Wait that's illegal. +commands.moderation.link.request.error.description = You specified the same guild as the guild on which you're reading this +commands.moderation.link.request.accept.title = ) wants to link guilds\! +commands.moderation.link.request.accept.description = React with the reactions to accept or decline it +commands.moderation.link.set.title = Set the thing boi +commands.moderation.link.help.description = Links two or more servers. +commands.moderation.nick.success.title = ? Successfully nicked ? +commands.moderation.nick.success.description = I successfully nicked +commands.moderation.nick.myself.success.description = I successfully changed my nickname. +commands.moderation.nick.help.description = Rename a one or more user. \ No newline at end of file -- 2.45.3 From d957d313ea136b85f66e9f050b6ac5cd5b225008 Mon Sep 17 00:00:00 2001 From: Skidder Date: Tue, 10 Dec 2019 20:29:13 +0100 Subject: [PATCH 07/35] New translations Translations_en.properties (Turkish) [ci skip] New Turkish translation --- .../Translations/Translations_tr.properties | 219 +++++++++--------- 1 file changed, 110 insertions(+), 109 deletions(-) diff --git a/src/main/resources/Translations/Translations_tr.properties b/src/main/resources/Translations/Translations_tr.properties index b7fd562..d76eeb6 100644 --- a/src/main/resources/Translations/Translations_tr.properties +++ b/src/main/resources/Translations/Translations_tr.properties @@ -2,118 +2,119 @@ # @author Skidder / GregTCLTK # -Hadder=Hadder +# +# @author Skidder / GregTCLTK +# -user/id= <@User>/ -searchterm= -username= -number= -guildprefix= -<@User>=<@User> -on/off= -vc-name/id= -user+nickname=<@user> +Hadder = Hadder -error=Error -none=None -success\!=Success\! +searchterm = +username = +number = +guildprefix = +vc-name/id = +user+nickname = <@user> -commands.fun.avatar.success.title=Avatar of -commands.fun.avatar.help.description=Sends the avatar of the specified member. -commands.fun.gif.error.description=Please try again with another term. -commands.fun.gif.help.description=Look for a GIF on Giphy -commands.fun.meme.success.title=Your random meme -commands.fun.meme.api.error=The request to the meme API could not be processed. Please try it again later. -commands.fun.meme.help.description=Sends you a random meme. +error = Error +none = None +success\! = Success\! -commands.general.about.success.title=Hadder - About -commands.general.about.success.description=Hadder is an open source Discord bot. -commands.general.about.success.field.one.title=Support the Developers -commands.general.about.success.field.one.description=Hadder is completely free for everyone. We would appreciate it you donate some money [here] -commands.general.about.help.description=Shows infos about Hadder -commands.general.equals.string.first.request=Please send me the first String -commands.general.equals.string.second.request=Please send me the second String -commands.general.equals.string.equals.true=Yes\! The first string equals the second string\! -commands.general.equals.string.equals.false=Well yes but actually No. This isn't the same. -commands.general.equals.string.first=First String -commands.general.equals.string.second=Second String -commands.general.equals.string.result=Result -commands.general.equals.help.description=Check if two strings are the same -commands.general.help.error.description=I need the Embed Links Permission to send the Help Menu\! -commands.general.help.help.description=Shows each command or explains its usage -commands.general.help.help.label=[CommandName] -commands.general.invite.success.title=Invite me\! -commands.general.invite.success.description=[Invite me here\!] -commands.general.invite.help.description=Shows the invitation to invite Hadder to your server -commands.general.ping.help.description=Shows the ping to the Discord API +commands.fun.avatar.success.title = Avatar of +commands.fun.avatar.help.description = Sends the avatar of the specified member. +commands.fun.gif.error.description = Please try again with another term. +commands.fun.gif.help.description = Look for a GIF on Giphy +commands.fun.meme.success.title = Your random meme +commands.fun.meme.api.error = The request to the meme API could not be processed. Please try it again later. +commands.fun.meme.help.description = Sends you a random meme. -commands.misc.feedback.title.request.title=Feedback Topic -commands.misc.feedback.title.request.description=Please send me the feedback topic. -commands.misc.feedback.description.request.title=Feedback Description -commands.misc.feedback.description.request.description=Please send me the feedback description now. -commands.misc.feedback.help.description=Sends feedback directly to the developers. -commands.misc.github.link.title=Link your GitHub Account -commands.misc.github.success.title=Information about -commands.misc.github.success.bio=User bio -commands.misc.github.success.location=Location -commands.misc.github.success.website=Website -commands.misc.github.success.repositories=Public repositories -commands.misc.github.success.gists=Public gists -commands.misc.github.success.followers=Followers -commands.misc.github.success.following=Following -commands.misc.github.api.error.description=The GitHub API might be down at the moment\! -commands.misc.github.user.error.description=This user does not exist\! -commands.misc.github.connect.title=Connect you GH account -commands.misc.github.connect.description=Please connect your GitHub account here -commands.misc.github.help.description=Displays information about a GitHub user profile. -commands.misc.screenshare.success.title=Here's your Url to share your Screen -commands.misc.screenshare.id.error.title=Wait that's illegal -commands.misc.screenshare.id.error.description=This ID is invalid. \nMaybe you entered a wrong ID? \n\nNote\: Make sure the Voice Channel is on this Guild. -commands.misc.screenshare.channel.error.title=Please Choose a Voice Channel -commands.misc.screenshare.channel.error.description=There is more than one channel with this name -commands.misc.screenshare.number.error.title=You specified a wrong number\! -commands.misc.screenshare.number.error.description=This isn't a Number. -commands.misc.screenshare.channel.existing.error=Hol' up -commands.misc.screenshare.channel.existing.description=There is no Voice Channel named like this. \n\nNote\: Make sure the Voice Channel is on this Guild. -commands.misc.screenshare.help.description=Shows you the link to share your screen. +commands.general.about.success.title = Hadder - About +commands.general.about.success.description = Hadder is an open source Discord bot. +commands.general.about.success.field.one.title = Support the Developers +commands.general.about.success.field.one.description = Hadder is completely free for everyone. We would appreciate it you donate some money [here] +commands.general.about.help.description = Shows infos about Hadder +commands.general.equals.string.first.request = Please send me the first String +commands.general.equals.string.second.request = Please send me the second String +commands.general.equals.string.equals.true = Yes\! The first string equals the second string\! +commands.general.equals.string.equals.false = Well yes but actually No. This isn't the same. +commands.general.equals.string.first = First String +commands.general.equals.string.second = Second String +commands.general.equals.string.result = Result +commands.general.equals.help.description = Check if two strings are the same +commands.general.help.error.description = I need the Embed Links Permission to send the Help Menu\! +commands.general.help.help.description = Shows each command or explains its usage +commands.general.help.help.label = [CommandName] +commands.general.invite.success.title = Invite me\! +commands.general.invite.success.description = [Invite me here\!] +commands.general.invite.help.description = Shows the invitation to invite Hadder to your server +commands.general.ping.help.description = Shows the ping to the Discord API -commands.moderation.ban.success.title=Successfully banned -commands.moderation.ban.success.description=I successfully baned -commands.moderation.ban.error.title=Not possible -commands.moderation.ban.myself.error.description=I can not ban myself\! -commands.moderation.ban.yourself.error.description=You can't ban yourself\! -commands.moderation.ban.help.description=Bans one ore more user from the server -commands.moderation.clear.number.error.description=You have to choose a number between 1 and 200\! -commands.moderation.clear.success.description=Successfully deleted 69 messages. -commands.moderation.clear.help.description=Deletes the specified number of messages. -commands.moderation.prefix.success.title=Successfully set -commands.moderation.prefix.success.description=I successfully set the new prefix for the guild to -commands.moderation.prefix.error.description=The prefix must not contain **** -commands.moderation.prefix.help.description=Sets the Guild-Prefix. -commands.moderation.invitedetect.activate.success.title=Successfully activated -commands.moderation.invitedetect.activate.success.description=I successfully activated the invite link detection for this guild. -commands.moderation.invitedetect.activate.error.title=Already activated -commands.moderation.invitedetect.activate.error.description=The invite link detection is already activated on this guild. -commands.moderation.invitedetect.deactivate.success.title=Successfully deactivated -commands.moderation.invitedetect.deactivate.success.description=I successfully deactivated the invite link detection for this guild. -commands.moderation.invitedetect.deactivate.error.title=Already deactivated -commands.moderation.invitedetect.deactivate.error.description=The invite link detection is already deactivated on this guild. -commands.moderation.invitedetect.help.description=Activate or deactivate the Discord invite link detection. -commands.moderation.kick.success.title=Successfully kicked -commands.moderation.kick.success.description=I successfully kicked -commands.moderation.kick.myself.error.description=I can not kick myself\! -commands.moderation.kick.yourself.error.description=You can't kick yourself. -commands.moderation.kick.mass.success.description=I successfully kicked 69 Members\! -commands.moderation.kick.help.description=Kicks one or more user from the server. -commands.moderation.link.request.success.description=If i'm on this guild i sent a message to accept the link. -commands.moderation.link.error.title=Wait that's illegal. -commands.moderation.link.request.error.description=You specified the same guild as the guild on which you're reading this -commands.moderation.link.request.accept.title=Skidder wants to link guilds\! -commands.moderation.link.request.accept.description=React with the reactions to accept or decline it -commands.moderation.link.set.title=Set the thing boi -commands.moderation.link.help.description=Links two or more servers. -commands.moderation.nick.success.title=Successfully nicked -commands.moderation.nick.success.description=I successfully nicked -commands.moderation.nick.myself.success.description=I successfully changed my nickname. -commands.moderation.nick.mass.success.description=I successfully nicked 69 Members\! -commands.moderation.nick.help.description=Rename a one or more user. +commands.misc.feedback.title.request.title = Feedback Topic +commands.misc.feedback.title.request.description = Please send me the feedback topic. +commands.misc.feedback.description.request.title = Feedback Description +commands.misc.feedback.description.request.description = Please send me the feedback description now. +commands.misc.feedback.help.description = Sends feedback directly to the developers. +commands.misc.github.link.title = Link your GitHub Account +commands.misc.github.success.title = Information about +commands.misc.github.success.bio = User bio +commands.misc.github.success.location = Location +commands.misc.github.success.website = Website +commands.misc.github.success.repositories = Public repositories +commands.misc.github.success.gists = Public gists +commands.misc.github.success.followers = Followers +commands.misc.github.success.following = Following +commands.misc.github.api.error.description = The GitHub API might be down at the moment\! +commands.misc.github.user.error.description = This user does not exist\! +commands.misc.github.connect.title = Connect you GH account +commands.misc.github.connect.description = [Please connect your GitHub account here] +commands.misc.github.help.description = Displays information about a GitHub user profile. +commands.misc.screenshare.success.title = Here's your Url to share your Screen +commands.misc.screenshare.id.error.title = Wait that's illegal +commands.misc.screenshare.id.error.description = This ID is invalid. \nMaybe you entered a wrong ID? \n\nNote\: Make sure the Voice Channel is on this Guild. +commands.misc.screenshare.channel.error.title = Please Choose a Voice Channel +commands.misc.screenshare.channel.error.description = There is more than one channel with this name +commands.misc.screenshare.number.error.title = You specified a wrong number\! +commands.misc.screenshare.number.error.description = This isn't a Number. +commands.misc.screenshare.channel.existing.error = Hol' up +commands.misc.screenshare.channel.existing.description = There is no Voice Channel named like this. \n\nNote\: Make sure the Voice Channel is on this Guild. +commands.misc.screenshare.help.description = Shows you the link to share your screen. + +commands.moderation.ban.success.title = ? Successfully banned ? +commands.moderation.ban.success.description = I successfully baned +commands.moderation.ban.error.title = Not possible +commands.moderation.ban.myself.error.description = I can not ban myself\! +commands.moderation.ban.yourself.error.description = You can not ban yourself\! +commands.moderation.ban.help.description = Bans one ore more user from the server +commands.moderation.clear.number.error.description = You have to choose a number between 1 and 99\! +commands.moderation.clear.success.description = Successfully deleted +commands.moderation.clear.help.description = Deletes the specified number of messages. +commands.moderation.prefix.success.title = ? Successfully set ? +commands.moderation.prefix.success.description = I successfully set the new prefix for the guild to +commands.moderation.prefix.error.description = The prefix must not contain **"** +commands.moderation.prefix.help.description = Sets the Guild-Prefix. +commands.moderation.invitedetect.activate.success.title = Successfully activated +commands.moderation.invitedetect.activate.success.description = I successfully activated the invite link detection for this guild. +commands.moderation.invitedetect.activate.error.title = Already activated +commands.moderation.invitedetect.activate.error.description = The invite link detection is already activated on this guild. +commands.moderation.invitedetect.deactivate.success.title = Successfully deactivated +commands.moderation.invitedetect.deactivate.success.description = I successfully deactivated the invite link detection for this guild. +commands.moderation.invitedetect.deactivate.error.title = Already deactivated +commands.moderation.invitedetect.deactivate.error.description = The invite link detection is already deactivated on this guild. +commands.moderation.invitedetect.help.description = Activate or deactivate the Discord invite link detection. +commands.moderation.kick.success.title = ? Successfully kicked ? +commands.moderation.kick.success.description = I successfully kicked +commands.moderation.kick.error.title = Not possible +commands.moderation.kick.myself.error.description = I can not kick myself\! +commands.moderation.kick.yourself.error.description = You can't kick yourself. +commands.moderation.kick.mass.success.description = I successfully kicked 69 Members\! +commands.moderation.kick.help.description = Kicks one or more user from the server. +commands.moderation.link.request.success.description = If i'm on this guild i sent a message to accept the link. +commands.moderation.link.error.title = Wait that's illegal. +commands.moderation.link.request.error.description = You specified the same guild as the guild on which you're reading this +commands.moderation.link.request.accept.title = ) wants to link guilds\! +commands.moderation.link.request.accept.description = React with the reactions to accept or decline it +commands.moderation.link.set.title = Set the thing boi +commands.moderation.link.help.description = Links two or more servers. +commands.moderation.nick.success.title = ? Successfully nicked ? +commands.moderation.nick.success.description = I successfully nicked +commands.moderation.nick.myself.success.description = I successfully changed my nickname. +commands.moderation.nick.help.description = Rename a one or more user. \ No newline at end of file -- 2.45.3 From fbcbf8510fd154f965e4e3b43312661a386072f2 Mon Sep 17 00:00:00 2001 From: Skidder Date: Tue, 10 Dec 2019 20:29:16 +0100 Subject: [PATCH 08/35] New translations Translations_en.properties (Chinese Simplified) [ci skip] New Chinese Simplified translation --- .../Translations/Translations_zh.properties | 219 +++++++++--------- 1 file changed, 110 insertions(+), 109 deletions(-) diff --git a/src/main/resources/Translations/Translations_zh.properties b/src/main/resources/Translations/Translations_zh.properties index b7fd562..d76eeb6 100644 --- a/src/main/resources/Translations/Translations_zh.properties +++ b/src/main/resources/Translations/Translations_zh.properties @@ -2,118 +2,119 @@ # @author Skidder / GregTCLTK # -Hadder=Hadder +# +# @author Skidder / GregTCLTK +# -user/id= <@User>/ -searchterm= -username= -number= -guildprefix= -<@User>=<@User> -on/off= -vc-name/id= -user+nickname=<@user> +Hadder = Hadder -error=Error -none=None -success\!=Success\! +searchterm = +username = +number = +guildprefix = +vc-name/id = +user+nickname = <@user> -commands.fun.avatar.success.title=Avatar of -commands.fun.avatar.help.description=Sends the avatar of the specified member. -commands.fun.gif.error.description=Please try again with another term. -commands.fun.gif.help.description=Look for a GIF on Giphy -commands.fun.meme.success.title=Your random meme -commands.fun.meme.api.error=The request to the meme API could not be processed. Please try it again later. -commands.fun.meme.help.description=Sends you a random meme. +error = Error +none = None +success\! = Success\! -commands.general.about.success.title=Hadder - About -commands.general.about.success.description=Hadder is an open source Discord bot. -commands.general.about.success.field.one.title=Support the Developers -commands.general.about.success.field.one.description=Hadder is completely free for everyone. We would appreciate it you donate some money [here] -commands.general.about.help.description=Shows infos about Hadder -commands.general.equals.string.first.request=Please send me the first String -commands.general.equals.string.second.request=Please send me the second String -commands.general.equals.string.equals.true=Yes\! The first string equals the second string\! -commands.general.equals.string.equals.false=Well yes but actually No. This isn't the same. -commands.general.equals.string.first=First String -commands.general.equals.string.second=Second String -commands.general.equals.string.result=Result -commands.general.equals.help.description=Check if two strings are the same -commands.general.help.error.description=I need the Embed Links Permission to send the Help Menu\! -commands.general.help.help.description=Shows each command or explains its usage -commands.general.help.help.label=[CommandName] -commands.general.invite.success.title=Invite me\! -commands.general.invite.success.description=[Invite me here\!] -commands.general.invite.help.description=Shows the invitation to invite Hadder to your server -commands.general.ping.help.description=Shows the ping to the Discord API +commands.fun.avatar.success.title = Avatar of +commands.fun.avatar.help.description = Sends the avatar of the specified member. +commands.fun.gif.error.description = Please try again with another term. +commands.fun.gif.help.description = Look for a GIF on Giphy +commands.fun.meme.success.title = Your random meme +commands.fun.meme.api.error = The request to the meme API could not be processed. Please try it again later. +commands.fun.meme.help.description = Sends you a random meme. -commands.misc.feedback.title.request.title=Feedback Topic -commands.misc.feedback.title.request.description=Please send me the feedback topic. -commands.misc.feedback.description.request.title=Feedback Description -commands.misc.feedback.description.request.description=Please send me the feedback description now. -commands.misc.feedback.help.description=Sends feedback directly to the developers. -commands.misc.github.link.title=Link your GitHub Account -commands.misc.github.success.title=Information about -commands.misc.github.success.bio=User bio -commands.misc.github.success.location=Location -commands.misc.github.success.website=Website -commands.misc.github.success.repositories=Public repositories -commands.misc.github.success.gists=Public gists -commands.misc.github.success.followers=Followers -commands.misc.github.success.following=Following -commands.misc.github.api.error.description=The GitHub API might be down at the moment\! -commands.misc.github.user.error.description=This user does not exist\! -commands.misc.github.connect.title=Connect you GH account -commands.misc.github.connect.description=Please connect your GitHub account here -commands.misc.github.help.description=Displays information about a GitHub user profile. -commands.misc.screenshare.success.title=Here's your Url to share your Screen -commands.misc.screenshare.id.error.title=Wait that's illegal -commands.misc.screenshare.id.error.description=This ID is invalid. \nMaybe you entered a wrong ID? \n\nNote\: Make sure the Voice Channel is on this Guild. -commands.misc.screenshare.channel.error.title=Please Choose a Voice Channel -commands.misc.screenshare.channel.error.description=There is more than one channel with this name -commands.misc.screenshare.number.error.title=You specified a wrong number\! -commands.misc.screenshare.number.error.description=This isn't a Number. -commands.misc.screenshare.channel.existing.error=Hol' up -commands.misc.screenshare.channel.existing.description=There is no Voice Channel named like this. \n\nNote\: Make sure the Voice Channel is on this Guild. -commands.misc.screenshare.help.description=Shows you the link to share your screen. +commands.general.about.success.title = Hadder - About +commands.general.about.success.description = Hadder is an open source Discord bot. +commands.general.about.success.field.one.title = Support the Developers +commands.general.about.success.field.one.description = Hadder is completely free for everyone. We would appreciate it you donate some money [here] +commands.general.about.help.description = Shows infos about Hadder +commands.general.equals.string.first.request = Please send me the first String +commands.general.equals.string.second.request = Please send me the second String +commands.general.equals.string.equals.true = Yes\! The first string equals the second string\! +commands.general.equals.string.equals.false = Well yes but actually No. This isn't the same. +commands.general.equals.string.first = First String +commands.general.equals.string.second = Second String +commands.general.equals.string.result = Result +commands.general.equals.help.description = Check if two strings are the same +commands.general.help.error.description = I need the Embed Links Permission to send the Help Menu\! +commands.general.help.help.description = Shows each command or explains its usage +commands.general.help.help.label = [CommandName] +commands.general.invite.success.title = Invite me\! +commands.general.invite.success.description = [Invite me here\!] +commands.general.invite.help.description = Shows the invitation to invite Hadder to your server +commands.general.ping.help.description = Shows the ping to the Discord API -commands.moderation.ban.success.title=Successfully banned -commands.moderation.ban.success.description=I successfully baned -commands.moderation.ban.error.title=Not possible -commands.moderation.ban.myself.error.description=I can not ban myself\! -commands.moderation.ban.yourself.error.description=You can't ban yourself\! -commands.moderation.ban.help.description=Bans one ore more user from the server -commands.moderation.clear.number.error.description=You have to choose a number between 1 and 200\! -commands.moderation.clear.success.description=Successfully deleted 69 messages. -commands.moderation.clear.help.description=Deletes the specified number of messages. -commands.moderation.prefix.success.title=Successfully set -commands.moderation.prefix.success.description=I successfully set the new prefix for the guild to -commands.moderation.prefix.error.description=The prefix must not contain **** -commands.moderation.prefix.help.description=Sets the Guild-Prefix. -commands.moderation.invitedetect.activate.success.title=Successfully activated -commands.moderation.invitedetect.activate.success.description=I successfully activated the invite link detection for this guild. -commands.moderation.invitedetect.activate.error.title=Already activated -commands.moderation.invitedetect.activate.error.description=The invite link detection is already activated on this guild. -commands.moderation.invitedetect.deactivate.success.title=Successfully deactivated -commands.moderation.invitedetect.deactivate.success.description=I successfully deactivated the invite link detection for this guild. -commands.moderation.invitedetect.deactivate.error.title=Already deactivated -commands.moderation.invitedetect.deactivate.error.description=The invite link detection is already deactivated on this guild. -commands.moderation.invitedetect.help.description=Activate or deactivate the Discord invite link detection. -commands.moderation.kick.success.title=Successfully kicked -commands.moderation.kick.success.description=I successfully kicked -commands.moderation.kick.myself.error.description=I can not kick myself\! -commands.moderation.kick.yourself.error.description=You can't kick yourself. -commands.moderation.kick.mass.success.description=I successfully kicked 69 Members\! -commands.moderation.kick.help.description=Kicks one or more user from the server. -commands.moderation.link.request.success.description=If i'm on this guild i sent a message to accept the link. -commands.moderation.link.error.title=Wait that's illegal. -commands.moderation.link.request.error.description=You specified the same guild as the guild on which you're reading this -commands.moderation.link.request.accept.title=Skidder wants to link guilds\! -commands.moderation.link.request.accept.description=React with the reactions to accept or decline it -commands.moderation.link.set.title=Set the thing boi -commands.moderation.link.help.description=Links two or more servers. -commands.moderation.nick.success.title=Successfully nicked -commands.moderation.nick.success.description=I successfully nicked -commands.moderation.nick.myself.success.description=I successfully changed my nickname. -commands.moderation.nick.mass.success.description=I successfully nicked 69 Members\! -commands.moderation.nick.help.description=Rename a one or more user. +commands.misc.feedback.title.request.title = Feedback Topic +commands.misc.feedback.title.request.description = Please send me the feedback topic. +commands.misc.feedback.description.request.title = Feedback Description +commands.misc.feedback.description.request.description = Please send me the feedback description now. +commands.misc.feedback.help.description = Sends feedback directly to the developers. +commands.misc.github.link.title = Link your GitHub Account +commands.misc.github.success.title = Information about +commands.misc.github.success.bio = User bio +commands.misc.github.success.location = Location +commands.misc.github.success.website = Website +commands.misc.github.success.repositories = Public repositories +commands.misc.github.success.gists = Public gists +commands.misc.github.success.followers = Followers +commands.misc.github.success.following = Following +commands.misc.github.api.error.description = The GitHub API might be down at the moment\! +commands.misc.github.user.error.description = This user does not exist\! +commands.misc.github.connect.title = Connect you GH account +commands.misc.github.connect.description = [Please connect your GitHub account here] +commands.misc.github.help.description = Displays information about a GitHub user profile. +commands.misc.screenshare.success.title = Here's your Url to share your Screen +commands.misc.screenshare.id.error.title = Wait that's illegal +commands.misc.screenshare.id.error.description = This ID is invalid. \nMaybe you entered a wrong ID? \n\nNote\: Make sure the Voice Channel is on this Guild. +commands.misc.screenshare.channel.error.title = Please Choose a Voice Channel +commands.misc.screenshare.channel.error.description = There is more than one channel with this name +commands.misc.screenshare.number.error.title = You specified a wrong number\! +commands.misc.screenshare.number.error.description = This isn't a Number. +commands.misc.screenshare.channel.existing.error = Hol' up +commands.misc.screenshare.channel.existing.description = There is no Voice Channel named like this. \n\nNote\: Make sure the Voice Channel is on this Guild. +commands.misc.screenshare.help.description = Shows you the link to share your screen. + +commands.moderation.ban.success.title = ? Successfully banned ? +commands.moderation.ban.success.description = I successfully baned +commands.moderation.ban.error.title = Not possible +commands.moderation.ban.myself.error.description = I can not ban myself\! +commands.moderation.ban.yourself.error.description = You can not ban yourself\! +commands.moderation.ban.help.description = Bans one ore more user from the server +commands.moderation.clear.number.error.description = You have to choose a number between 1 and 99\! +commands.moderation.clear.success.description = Successfully deleted +commands.moderation.clear.help.description = Deletes the specified number of messages. +commands.moderation.prefix.success.title = ? Successfully set ? +commands.moderation.prefix.success.description = I successfully set the new prefix for the guild to +commands.moderation.prefix.error.description = The prefix must not contain **"** +commands.moderation.prefix.help.description = Sets the Guild-Prefix. +commands.moderation.invitedetect.activate.success.title = Successfully activated +commands.moderation.invitedetect.activate.success.description = I successfully activated the invite link detection for this guild. +commands.moderation.invitedetect.activate.error.title = Already activated +commands.moderation.invitedetect.activate.error.description = The invite link detection is already activated on this guild. +commands.moderation.invitedetect.deactivate.success.title = Successfully deactivated +commands.moderation.invitedetect.deactivate.success.description = I successfully deactivated the invite link detection for this guild. +commands.moderation.invitedetect.deactivate.error.title = Already deactivated +commands.moderation.invitedetect.deactivate.error.description = The invite link detection is already deactivated on this guild. +commands.moderation.invitedetect.help.description = Activate or deactivate the Discord invite link detection. +commands.moderation.kick.success.title = ? Successfully kicked ? +commands.moderation.kick.success.description = I successfully kicked +commands.moderation.kick.error.title = Not possible +commands.moderation.kick.myself.error.description = I can not kick myself\! +commands.moderation.kick.yourself.error.description = You can't kick yourself. +commands.moderation.kick.mass.success.description = I successfully kicked 69 Members\! +commands.moderation.kick.help.description = Kicks one or more user from the server. +commands.moderation.link.request.success.description = If i'm on this guild i sent a message to accept the link. +commands.moderation.link.error.title = Wait that's illegal. +commands.moderation.link.request.error.description = You specified the same guild as the guild on which you're reading this +commands.moderation.link.request.accept.title = ) wants to link guilds\! +commands.moderation.link.request.accept.description = React with the reactions to accept or decline it +commands.moderation.link.set.title = Set the thing boi +commands.moderation.link.help.description = Links two or more servers. +commands.moderation.nick.success.title = ? Successfully nicked ? +commands.moderation.nick.success.description = I successfully nicked +commands.moderation.nick.myself.success.description = I successfully changed my nickname. +commands.moderation.nick.help.description = Rename a one or more user. \ No newline at end of file -- 2.45.3 From 08a5c556dbdb711b5cce94d0aa6940af5cf7cd7d Mon Sep 17 00:00:00 2001 From: Skidder Date: Wed, 11 Dec 2019 20:20:51 +0100 Subject: [PATCH 09/35] New translations Translations_en.properties (German) New German translation --- .../Translations/Translations_de.properties | 72 +++++++++++++++---- 1 file changed, 57 insertions(+), 15 deletions(-) diff --git a/src/main/resources/Translations/Translations_de.properties b/src/main/resources/Translations/Translations_de.properties index 134e786..cef1145 100644 --- a/src/main/resources/Translations/Translations_de.properties +++ b/src/main/resources/Translations/Translations_de.properties @@ -14,12 +14,13 @@ number = guildprefix = vc-name/id = user+nickname = <@user> +region = error = Error none = None success\! = Success\! -commands.fun.avatar.success.title = Avatar of +commands.fun.avatar.success.title = Avatar of %extra% commands.fun.avatar.help.description = Sends the avatar of the specified member. commands.fun.gif.error.description = Please try again with another term. commands.fun.gif.help.description = Look for a GIF on Giphy @@ -30,7 +31,7 @@ commands.fun.meme.help.description = Sends you a random meme. commands.general.about.success.title = Hadder - About commands.general.about.success.description = Hadder is an open source Discord bot. commands.general.about.success.field.one.title = Support the Developers -commands.general.about.success.field.one.description = Hadder is completely free for everyone. We would appreciate it you donate some money [here] +commands.general.about.success.field.one.description = Hadder is completely free for everyone. We would appreciate it you donate some money [here]%extra% commands.general.about.help.description = Shows infos about Hadder commands.general.equals.string.first.request = Please send me the first String commands.general.equals.string.second.request = Please send me the second String @@ -40,11 +41,12 @@ commands.general.equals.string.first = First String commands.general.equals.string.second = Second String commands.general.equals.string.result = Result commands.general.equals.help.description = Check if two strings are the same +commands.general.help.field.usage = Usage commands.general.help.error.description = I need the Embed Links Permission to send the Help Menu\! commands.general.help.help.description = Shows each command or explains its usage commands.general.help.help.label = [CommandName] commands.general.invite.success.title = Invite me\! -commands.general.invite.success.description = [Invite me here\!] +commands.general.invite.success.description = [Invite me here\!]%extra% commands.general.invite.help.description = Shows the invitation to invite Hadder to your server commands.general.ping.help.description = Shows the ping to the Discord API @@ -53,8 +55,9 @@ commands.misc.feedback.title.request.description = Please send me the feedback t commands.misc.feedback.description.request.title = Feedback Description commands.misc.feedback.description.request.description = Please send me the feedback description now. commands.misc.feedback.help.description = Sends feedback directly to the developers. +commands.misc.feedback.success.title = Feedback successfully sent commands.misc.github.link.title = Link your GitHub Account -commands.misc.github.success.title = Information about +commands.misc.github.success.title = Information about %extra% commands.misc.github.success.bio = User bio commands.misc.github.success.location = Location commands.misc.github.success.website = Website @@ -65,7 +68,7 @@ commands.misc.github.success.following = Following commands.misc.github.api.error.description = The GitHub API might be down at the moment\! commands.misc.github.user.error.description = This user does not exist\! commands.misc.github.connect.title = Connect you GH account -commands.misc.github.connect.description = [Please connect your GitHub account here] +commands.misc.github.connect.description = [Please connect your GitHub account here]%extra% commands.misc.github.help.description = Displays information about a GitHub user profile. commands.misc.screenshare.success.title = Here's your Url to share your Screen commands.misc.screenshare.id.error.title = Wait that's illegal @@ -78,17 +81,18 @@ commands.misc.screenshare.channel.existing.error = Hol' up commands.misc.screenshare.channel.existing.description = There is no Voice Channel named like this. \n\nNote\: Make sure the Voice Channel is on this Guild. commands.misc.screenshare.help.description = Shows you the link to share your screen. -commands.moderation.ban.success.title = ? Successfully banned ? -commands.moderation.ban.success.description = I successfully baned +commands.moderation.ban.success.title = %extra% Successfully banned %extra% +commands.moderation.ban.success.description = I successfully baned %extra% commands.moderation.ban.error.title = Not possible commands.moderation.ban.myself.error.description = I can not ban myself\! commands.moderation.ban.yourself.error.description = You can not ban yourself\! +commands.moderation.ban.massban.success.description = I successfully baned %extra% Members\! commands.moderation.ban.help.description = Bans one ore more user from the server commands.moderation.clear.number.error.description = You have to choose a number between 1 and 99\! -commands.moderation.clear.success.description = Successfully deleted +commands.moderation.clear.success.description = Successfully deleted %extra% messages. commands.moderation.clear.help.description = Deletes the specified number of messages. -commands.moderation.prefix.success.title = ? Successfully set ? -commands.moderation.prefix.success.description = I successfully set the new prefix for the guild to +commands.moderation.prefix.success.title = %extra% Successfully set %extra% +commands.moderation.prefix.success.description = I successfully set the new prefix for the guild to %extra% commands.moderation.prefix.error.description = The prefix must not contain **"** commands.moderation.prefix.help.description = Sets the Guild-Prefix. commands.moderation.invitedetect.activate.success.title = Successfully activated @@ -100,13 +104,14 @@ commands.moderation.invitedetect.deactivate.success.description = I successfully commands.moderation.invitedetect.deactivate.error.title = Already deactivated commands.moderation.invitedetect.deactivate.error.description = The invite link detection is already deactivated on this guild. commands.moderation.invitedetect.help.description = Activate or deactivate the Discord invite link detection. -commands.moderation.kick.success.title = ? Successfully kicked ? -commands.moderation.kick.success.description = I successfully kicked +commands.moderation.kick.success.title = %extra% Successfully kicked %extra% +commands.moderation.kick.success.description = I successfully kicked %extra%. commands.moderation.kick.error.title = Not possible commands.moderation.kick.myself.error.description = I can not kick myself\! commands.moderation.kick.yourself.error.description = You can't kick yourself. commands.moderation.kick.mass.success.description = I successfully kicked 69 Members\! commands.moderation.kick.help.description = Kicks one or more user from the server. +commands.moderation.kick.masskick.success.description = I successfully kicked %extra% members. commands.moderation.link.request.success.description = If i'm on this guild i sent a message to accept the link. commands.moderation.link.error.title = Wait that's illegal. commands.moderation.link.request.error.description = You specified the same guild as the guild on which you're reading this @@ -114,7 +119,44 @@ commands.moderation.link.request.accept.title = ) wants to link guilds\! commands.moderation.link.request.accept.description = React with the reactions to accept or decline it commands.moderation.link.set.title = Set the thing boi commands.moderation.link.help.description = Links two or more servers. -commands.moderation.nick.success.title = ? Successfully nicked ? -commands.moderation.nick.success.description = I successfully nicked +commands.moderation.nick.success.title = %extra% Successfully nicked %extra% +commands.moderation.nick.success.description = I successfully nicked %extra%. commands.moderation.nick.myself.success.description = I successfully changed my nickname. -commands.moderation.nick.help.description = Rename a one or more user. \ No newline at end of file +commands.moderation.nick.massnick.success.description = I successfully nicked %extra% Members. +commands.moderation.nick.help.description = Rename a one or more user. +commands.moderation.regionchange.regions.title = All regions +commands.moderation.regionchange.success.title = Successfully set region +commands.moderation.regionchange.success.description = I successfully set the new server region to %extra%. +commands.moderation.regionchange.help.description = Changes the server region to locked regions. +commands.moderation.role.add.success.title = %extra% Successfully added role(s) %extra% +commands.moderation.role.add.success.description = I successfully added %extra% roles to %extra_two% members. +commands.moderation.role.remove.success.title = %extra% Successfully removed role(s) %extra% +commands.moderation.role.remove.success.description = I successfully removed %extra% roles from %extra_two% members. +commands.moderation.role.help.description = Adds and removes one or more role(s) from one or more user(s) +commands.moderation.rules.setup.title = Set up rules +commands.moderation.rules.setup.description = Welcome to the Hadder rules setup. Please mention the channel in which I should send the rules. Your message should look like\: \#rules or \#verify. +commands.moderation.rules.channel.error.title = Channel not found +commands.moderation.rules.channel.error.description = I can't find the specified channel. Please start the setup again. +commands.moderation.rules.rules.title = Rules +commands.moderation.rules.rules.description = The channel was successfully set to %extra%. Please send me the rules now. +commands.moderation.rules.role.title = Role to assign +commands.moderation.rules.role.description = The rules were successfully set. Please send me the name of the role which the user receives after he accepted the rules. +commands.moderation.rules.role.error.title = Role does not exist +commands.moderation.rules.role.error.description = The specified role does not exist on this guild. +commands.moderation.rules.guild.error.title = Wrong Guild +commands.moderation.rules.guild.error.description = The mentioned channel must be on this guild\! +commands.moderation.rules.emote.accept.title = Custom Accept Emote +commands.moderation.rules.emote.accept.description = The role has been successfully set to %extra%. Now send me the emote on which your user should react to to get verified. +commands.moderation.rules.emote.decline.title = Custom Decline Emote +commands.moderation.rules.emote.decline.description = The first emote has been successfully set to %extra%. Please send me now the decline emote. +commands.moderation.rules.success.title = Successfully set the rules +commands.moderation.rules.success.description = I successfully send the rules in %extra%. +commands.moderation.rules.emote.error.access.description = I can not access the custom emote(s). +commands.moderation.rules.emote.error.equal.title = Emotes are equal +commands.moderation.rules.emote.error.equal.description = The 1st and 2nd emote equals each other. +commands.moderation.rules.emoji.decline.description = The first emote has been successfully set. Please send me now the decline emote. +commands.moderation.rules.emoji.error.description = The given emote can't be used. +commands.moderation.rules.help.description = Setup the rules on your Discord server + +commands.music.join.success.title = Successfully connected +commands.music.join.success.description = I successfully connected to %extra%. -- 2.45.3 From c8903642f68c0d679c5725b5bb284652ba925e1a Mon Sep 17 00:00:00 2001 From: Skidder Date: Wed, 11 Dec 2019 20:20:52 +0100 Subject: [PATCH 10/35] New translations Translations_en.properties (English) New English translation --- .../Translations/Translations_en.properties | 72 +++++++++++++++---- 1 file changed, 57 insertions(+), 15 deletions(-) diff --git a/src/main/resources/Translations/Translations_en.properties b/src/main/resources/Translations/Translations_en.properties index d76eeb6..d446f98 100644 --- a/src/main/resources/Translations/Translations_en.properties +++ b/src/main/resources/Translations/Translations_en.properties @@ -14,12 +14,13 @@ number = guildprefix = vc-name/id = user+nickname = <@user> +region = error = Error none = None success\! = Success\! -commands.fun.avatar.success.title = Avatar of +commands.fun.avatar.success.title = Avatar of %extra% commands.fun.avatar.help.description = Sends the avatar of the specified member. commands.fun.gif.error.description = Please try again with another term. commands.fun.gif.help.description = Look for a GIF on Giphy @@ -30,7 +31,7 @@ commands.fun.meme.help.description = Sends you a random meme. commands.general.about.success.title = Hadder - About commands.general.about.success.description = Hadder is an open source Discord bot. commands.general.about.success.field.one.title = Support the Developers -commands.general.about.success.field.one.description = Hadder is completely free for everyone. We would appreciate it you donate some money [here] +commands.general.about.success.field.one.description = Hadder is completely free for everyone. We would appreciate it you donate some money [here]%extra% commands.general.about.help.description = Shows infos about Hadder commands.general.equals.string.first.request = Please send me the first String commands.general.equals.string.second.request = Please send me the second String @@ -40,11 +41,12 @@ commands.general.equals.string.first = First String commands.general.equals.string.second = Second String commands.general.equals.string.result = Result commands.general.equals.help.description = Check if two strings are the same +commands.general.help.field.usage = Usage commands.general.help.error.description = I need the Embed Links Permission to send the Help Menu\! commands.general.help.help.description = Shows each command or explains its usage commands.general.help.help.label = [CommandName] commands.general.invite.success.title = Invite me\! -commands.general.invite.success.description = [Invite me here\!] +commands.general.invite.success.description = [Invite me here\!]%extra% commands.general.invite.help.description = Shows the invitation to invite Hadder to your server commands.general.ping.help.description = Shows the ping to the Discord API @@ -53,8 +55,9 @@ commands.misc.feedback.title.request.description = Please send me the feedback t commands.misc.feedback.description.request.title = Feedback Description commands.misc.feedback.description.request.description = Please send me the feedback description now. commands.misc.feedback.help.description = Sends feedback directly to the developers. +commands.misc.feedback.success.title = Feedback successfully sent commands.misc.github.link.title = Link your GitHub Account -commands.misc.github.success.title = Information about +commands.misc.github.success.title = Information about %extra% commands.misc.github.success.bio = User bio commands.misc.github.success.location = Location commands.misc.github.success.website = Website @@ -65,7 +68,7 @@ commands.misc.github.success.following = Following commands.misc.github.api.error.description = The GitHub API might be down at the moment\! commands.misc.github.user.error.description = This user does not exist\! commands.misc.github.connect.title = Connect you GH account -commands.misc.github.connect.description = [Please connect your GitHub account here] +commands.misc.github.connect.description = [Please connect your GitHub account here]%extra% commands.misc.github.help.description = Displays information about a GitHub user profile. commands.misc.screenshare.success.title = Here's your Url to share your Screen commands.misc.screenshare.id.error.title = Wait that's illegal @@ -78,17 +81,18 @@ commands.misc.screenshare.channel.existing.error = Hol' up commands.misc.screenshare.channel.existing.description = There is no Voice Channel named like this. \n\nNote\: Make sure the Voice Channel is on this Guild. commands.misc.screenshare.help.description = Shows you the link to share your screen. -commands.moderation.ban.success.title = ? Successfully banned ? -commands.moderation.ban.success.description = I successfully baned +commands.moderation.ban.success.title = %extra% Successfully banned %extra% +commands.moderation.ban.success.description = I successfully baned %extra% commands.moderation.ban.error.title = Not possible commands.moderation.ban.myself.error.description = I can not ban myself\! commands.moderation.ban.yourself.error.description = You can not ban yourself\! +commands.moderation.ban.massban.success.description = I successfully baned %extra% Members\! commands.moderation.ban.help.description = Bans one ore more user from the server commands.moderation.clear.number.error.description = You have to choose a number between 1 and 99\! -commands.moderation.clear.success.description = Successfully deleted +commands.moderation.clear.success.description = Successfully deleted %extra% messages. commands.moderation.clear.help.description = Deletes the specified number of messages. -commands.moderation.prefix.success.title = ? Successfully set ? -commands.moderation.prefix.success.description = I successfully set the new prefix for the guild to +commands.moderation.prefix.success.title = %extra% Successfully set %extra% +commands.moderation.prefix.success.description = I successfully set the new prefix for the guild to %extra% commands.moderation.prefix.error.description = The prefix must not contain **"** commands.moderation.prefix.help.description = Sets the Guild-Prefix. commands.moderation.invitedetect.activate.success.title = Successfully activated @@ -100,13 +104,14 @@ commands.moderation.invitedetect.deactivate.success.description = I successfully commands.moderation.invitedetect.deactivate.error.title = Already deactivated commands.moderation.invitedetect.deactivate.error.description = The invite link detection is already deactivated on this guild. commands.moderation.invitedetect.help.description = Activate or deactivate the Discord invite link detection. -commands.moderation.kick.success.title = ? Successfully kicked ? -commands.moderation.kick.success.description = I successfully kicked +commands.moderation.kick.success.title = %extra% Successfully kicked %extra% +commands.moderation.kick.success.description = I successfully kicked %extra%. commands.moderation.kick.error.title = Not possible commands.moderation.kick.myself.error.description = I can not kick myself\! commands.moderation.kick.yourself.error.description = You can't kick yourself. commands.moderation.kick.mass.success.description = I successfully kicked 69 Members\! commands.moderation.kick.help.description = Kicks one or more user from the server. +commands.moderation.kick.masskick.success.description = I successfully kicked %extra% members. commands.moderation.link.request.success.description = If i'm on this guild i sent a message to accept the link. commands.moderation.link.error.title = Wait that's illegal. commands.moderation.link.request.error.description = You specified the same guild as the guild on which you're reading this @@ -114,7 +119,44 @@ commands.moderation.link.request.accept.title = ) wants to link guilds\! commands.moderation.link.request.accept.description = React with the reactions to accept or decline it commands.moderation.link.set.title = Set the thing boi commands.moderation.link.help.description = Links two or more servers. -commands.moderation.nick.success.title = ? Successfully nicked ? -commands.moderation.nick.success.description = I successfully nicked +commands.moderation.nick.success.title = %extra% Successfully nicked %extra% +commands.moderation.nick.success.description = I successfully nicked %extra%. commands.moderation.nick.myself.success.description = I successfully changed my nickname. -commands.moderation.nick.help.description = Rename a one or more user. \ No newline at end of file +commands.moderation.nick.massnick.success.description = I successfully nicked %extra% Members. +commands.moderation.nick.help.description = Rename a one or more user. +commands.moderation.regionchange.regions.title = All regions +commands.moderation.regionchange.success.title = Successfully set region +commands.moderation.regionchange.success.description = I successfully set the new server region to %extra%. +commands.moderation.regionchange.help.description = Changes the server region to locked regions. +commands.moderation.role.add.success.title = %extra% Successfully added role(s) %extra% +commands.moderation.role.add.success.description = I successfully added %extra% roles to %extra_two% members. +commands.moderation.role.remove.success.title = %extra% Successfully removed role(s) %extra% +commands.moderation.role.remove.success.description = I successfully removed %extra% roles from %extra_two% members. +commands.moderation.role.help.description = Adds and removes one or more role(s) from one or more user(s) +commands.moderation.rules.setup.title = Set up rules +commands.moderation.rules.setup.description = Welcome to the Hadder rules setup. Please mention the channel in which I should send the rules. Your message should look like\: \#rules or \#verify. +commands.moderation.rules.channel.error.title = Channel not found +commands.moderation.rules.channel.error.description = I can't find the specified channel. Please start the setup again. +commands.moderation.rules.rules.title = Rules +commands.moderation.rules.rules.description = The channel was successfully set to %extra%. Please send me the rules now. +commands.moderation.rules.role.title = Role to assign +commands.moderation.rules.role.description = The rules were successfully set. Please send me the name of the role which the user receives after he accepted the rules. +commands.moderation.rules.role.error.title = Role does not exist +commands.moderation.rules.role.error.description = The specified role does not exist on this guild. +commands.moderation.rules.guild.error.title = Wrong Guild +commands.moderation.rules.guild.error.description = The mentioned channel must be on this guild\! +commands.moderation.rules.emote.accept.title = Custom Accept Emote +commands.moderation.rules.emote.accept.description = The role has been successfully set to %extra%. Now send me the emote on which your user should react to to get verified. +commands.moderation.rules.emote.decline.title = Custom Decline Emote +commands.moderation.rules.emote.decline.description = The first emote has been successfully set to %extra%. Please send me now the decline emote. +commands.moderation.rules.success.title = Successfully set the rules +commands.moderation.rules.success.description = I successfully send the rules in %extra%. +commands.moderation.rules.emote.error.access.description = I can not access the custom emote(s). +commands.moderation.rules.emote.error.equal.title = Emotes are equal +commands.moderation.rules.emote.error.equal.description = The 1st and 2nd emote equals each other. +commands.moderation.rules.emoji.decline.description = The first emote has been successfully set. Please send me now the decline emote. +commands.moderation.rules.emoji.error.description = The given emote can't be used. +commands.moderation.rules.help.description = Setup the rules on your Discord server + +commands.music.join.success.title = Successfully connected +commands.music.join.success.description = I successfully connected to %extra%. -- 2.45.3 From d0d1a72b754855bdd16eec2009d933438354dd18 Mon Sep 17 00:00:00 2001 From: Skidder Date: Wed, 11 Dec 2019 20:20:54 +0100 Subject: [PATCH 11/35] New translations Translations_en.properties (Spanish) New Spanish translation --- .../Translations/Translations_es.properties | 72 +++++++++++++++---- 1 file changed, 57 insertions(+), 15 deletions(-) diff --git a/src/main/resources/Translations/Translations_es.properties b/src/main/resources/Translations/Translations_es.properties index d76eeb6..d446f98 100644 --- a/src/main/resources/Translations/Translations_es.properties +++ b/src/main/resources/Translations/Translations_es.properties @@ -14,12 +14,13 @@ number = guildprefix = vc-name/id = user+nickname = <@user> +region = error = Error none = None success\! = Success\! -commands.fun.avatar.success.title = Avatar of +commands.fun.avatar.success.title = Avatar of %extra% commands.fun.avatar.help.description = Sends the avatar of the specified member. commands.fun.gif.error.description = Please try again with another term. commands.fun.gif.help.description = Look for a GIF on Giphy @@ -30,7 +31,7 @@ commands.fun.meme.help.description = Sends you a random meme. commands.general.about.success.title = Hadder - About commands.general.about.success.description = Hadder is an open source Discord bot. commands.general.about.success.field.one.title = Support the Developers -commands.general.about.success.field.one.description = Hadder is completely free for everyone. We would appreciate it you donate some money [here] +commands.general.about.success.field.one.description = Hadder is completely free for everyone. We would appreciate it you donate some money [here]%extra% commands.general.about.help.description = Shows infos about Hadder commands.general.equals.string.first.request = Please send me the first String commands.general.equals.string.second.request = Please send me the second String @@ -40,11 +41,12 @@ commands.general.equals.string.first = First String commands.general.equals.string.second = Second String commands.general.equals.string.result = Result commands.general.equals.help.description = Check if two strings are the same +commands.general.help.field.usage = Usage commands.general.help.error.description = I need the Embed Links Permission to send the Help Menu\! commands.general.help.help.description = Shows each command or explains its usage commands.general.help.help.label = [CommandName] commands.general.invite.success.title = Invite me\! -commands.general.invite.success.description = [Invite me here\!] +commands.general.invite.success.description = [Invite me here\!]%extra% commands.general.invite.help.description = Shows the invitation to invite Hadder to your server commands.general.ping.help.description = Shows the ping to the Discord API @@ -53,8 +55,9 @@ commands.misc.feedback.title.request.description = Please send me the feedback t commands.misc.feedback.description.request.title = Feedback Description commands.misc.feedback.description.request.description = Please send me the feedback description now. commands.misc.feedback.help.description = Sends feedback directly to the developers. +commands.misc.feedback.success.title = Feedback successfully sent commands.misc.github.link.title = Link your GitHub Account -commands.misc.github.success.title = Information about +commands.misc.github.success.title = Information about %extra% commands.misc.github.success.bio = User bio commands.misc.github.success.location = Location commands.misc.github.success.website = Website @@ -65,7 +68,7 @@ commands.misc.github.success.following = Following commands.misc.github.api.error.description = The GitHub API might be down at the moment\! commands.misc.github.user.error.description = This user does not exist\! commands.misc.github.connect.title = Connect you GH account -commands.misc.github.connect.description = [Please connect your GitHub account here] +commands.misc.github.connect.description = [Please connect your GitHub account here]%extra% commands.misc.github.help.description = Displays information about a GitHub user profile. commands.misc.screenshare.success.title = Here's your Url to share your Screen commands.misc.screenshare.id.error.title = Wait that's illegal @@ -78,17 +81,18 @@ commands.misc.screenshare.channel.existing.error = Hol' up commands.misc.screenshare.channel.existing.description = There is no Voice Channel named like this. \n\nNote\: Make sure the Voice Channel is on this Guild. commands.misc.screenshare.help.description = Shows you the link to share your screen. -commands.moderation.ban.success.title = ? Successfully banned ? -commands.moderation.ban.success.description = I successfully baned +commands.moderation.ban.success.title = %extra% Successfully banned %extra% +commands.moderation.ban.success.description = I successfully baned %extra% commands.moderation.ban.error.title = Not possible commands.moderation.ban.myself.error.description = I can not ban myself\! commands.moderation.ban.yourself.error.description = You can not ban yourself\! +commands.moderation.ban.massban.success.description = I successfully baned %extra% Members\! commands.moderation.ban.help.description = Bans one ore more user from the server commands.moderation.clear.number.error.description = You have to choose a number between 1 and 99\! -commands.moderation.clear.success.description = Successfully deleted +commands.moderation.clear.success.description = Successfully deleted %extra% messages. commands.moderation.clear.help.description = Deletes the specified number of messages. -commands.moderation.prefix.success.title = ? Successfully set ? -commands.moderation.prefix.success.description = I successfully set the new prefix for the guild to +commands.moderation.prefix.success.title = %extra% Successfully set %extra% +commands.moderation.prefix.success.description = I successfully set the new prefix for the guild to %extra% commands.moderation.prefix.error.description = The prefix must not contain **"** commands.moderation.prefix.help.description = Sets the Guild-Prefix. commands.moderation.invitedetect.activate.success.title = Successfully activated @@ -100,13 +104,14 @@ commands.moderation.invitedetect.deactivate.success.description = I successfully commands.moderation.invitedetect.deactivate.error.title = Already deactivated commands.moderation.invitedetect.deactivate.error.description = The invite link detection is already deactivated on this guild. commands.moderation.invitedetect.help.description = Activate or deactivate the Discord invite link detection. -commands.moderation.kick.success.title = ? Successfully kicked ? -commands.moderation.kick.success.description = I successfully kicked +commands.moderation.kick.success.title = %extra% Successfully kicked %extra% +commands.moderation.kick.success.description = I successfully kicked %extra%. commands.moderation.kick.error.title = Not possible commands.moderation.kick.myself.error.description = I can not kick myself\! commands.moderation.kick.yourself.error.description = You can't kick yourself. commands.moderation.kick.mass.success.description = I successfully kicked 69 Members\! commands.moderation.kick.help.description = Kicks one or more user from the server. +commands.moderation.kick.masskick.success.description = I successfully kicked %extra% members. commands.moderation.link.request.success.description = If i'm on this guild i sent a message to accept the link. commands.moderation.link.error.title = Wait that's illegal. commands.moderation.link.request.error.description = You specified the same guild as the guild on which you're reading this @@ -114,7 +119,44 @@ commands.moderation.link.request.accept.title = ) wants to link guilds\! commands.moderation.link.request.accept.description = React with the reactions to accept or decline it commands.moderation.link.set.title = Set the thing boi commands.moderation.link.help.description = Links two or more servers. -commands.moderation.nick.success.title = ? Successfully nicked ? -commands.moderation.nick.success.description = I successfully nicked +commands.moderation.nick.success.title = %extra% Successfully nicked %extra% +commands.moderation.nick.success.description = I successfully nicked %extra%. commands.moderation.nick.myself.success.description = I successfully changed my nickname. -commands.moderation.nick.help.description = Rename a one or more user. \ No newline at end of file +commands.moderation.nick.massnick.success.description = I successfully nicked %extra% Members. +commands.moderation.nick.help.description = Rename a one or more user. +commands.moderation.regionchange.regions.title = All regions +commands.moderation.regionchange.success.title = Successfully set region +commands.moderation.regionchange.success.description = I successfully set the new server region to %extra%. +commands.moderation.regionchange.help.description = Changes the server region to locked regions. +commands.moderation.role.add.success.title = %extra% Successfully added role(s) %extra% +commands.moderation.role.add.success.description = I successfully added %extra% roles to %extra_two% members. +commands.moderation.role.remove.success.title = %extra% Successfully removed role(s) %extra% +commands.moderation.role.remove.success.description = I successfully removed %extra% roles from %extra_two% members. +commands.moderation.role.help.description = Adds and removes one or more role(s) from one or more user(s) +commands.moderation.rules.setup.title = Set up rules +commands.moderation.rules.setup.description = Welcome to the Hadder rules setup. Please mention the channel in which I should send the rules. Your message should look like\: \#rules or \#verify. +commands.moderation.rules.channel.error.title = Channel not found +commands.moderation.rules.channel.error.description = I can't find the specified channel. Please start the setup again. +commands.moderation.rules.rules.title = Rules +commands.moderation.rules.rules.description = The channel was successfully set to %extra%. Please send me the rules now. +commands.moderation.rules.role.title = Role to assign +commands.moderation.rules.role.description = The rules were successfully set. Please send me the name of the role which the user receives after he accepted the rules. +commands.moderation.rules.role.error.title = Role does not exist +commands.moderation.rules.role.error.description = The specified role does not exist on this guild. +commands.moderation.rules.guild.error.title = Wrong Guild +commands.moderation.rules.guild.error.description = The mentioned channel must be on this guild\! +commands.moderation.rules.emote.accept.title = Custom Accept Emote +commands.moderation.rules.emote.accept.description = The role has been successfully set to %extra%. Now send me the emote on which your user should react to to get verified. +commands.moderation.rules.emote.decline.title = Custom Decline Emote +commands.moderation.rules.emote.decline.description = The first emote has been successfully set to %extra%. Please send me now the decline emote. +commands.moderation.rules.success.title = Successfully set the rules +commands.moderation.rules.success.description = I successfully send the rules in %extra%. +commands.moderation.rules.emote.error.access.description = I can not access the custom emote(s). +commands.moderation.rules.emote.error.equal.title = Emotes are equal +commands.moderation.rules.emote.error.equal.description = The 1st and 2nd emote equals each other. +commands.moderation.rules.emoji.decline.description = The first emote has been successfully set. Please send me now the decline emote. +commands.moderation.rules.emoji.error.description = The given emote can't be used. +commands.moderation.rules.help.description = Setup the rules on your Discord server + +commands.music.join.success.title = Successfully connected +commands.music.join.success.description = I successfully connected to %extra%. -- 2.45.3 From db3db6d2b2c13c8efb1bd88ce3a8d34e29e93fcb Mon Sep 17 00:00:00 2001 From: Skidder Date: Wed, 11 Dec 2019 20:20:55 +0100 Subject: [PATCH 12/35] New translations Translations_en.properties (French) New French translation --- .../Translations/Translations_fr.properties | 72 +++++++++++++++---- 1 file changed, 57 insertions(+), 15 deletions(-) diff --git a/src/main/resources/Translations/Translations_fr.properties b/src/main/resources/Translations/Translations_fr.properties index d76eeb6..d446f98 100644 --- a/src/main/resources/Translations/Translations_fr.properties +++ b/src/main/resources/Translations/Translations_fr.properties @@ -14,12 +14,13 @@ number = guildprefix = vc-name/id = user+nickname = <@user> +region = error = Error none = None success\! = Success\! -commands.fun.avatar.success.title = Avatar of +commands.fun.avatar.success.title = Avatar of %extra% commands.fun.avatar.help.description = Sends the avatar of the specified member. commands.fun.gif.error.description = Please try again with another term. commands.fun.gif.help.description = Look for a GIF on Giphy @@ -30,7 +31,7 @@ commands.fun.meme.help.description = Sends you a random meme. commands.general.about.success.title = Hadder - About commands.general.about.success.description = Hadder is an open source Discord bot. commands.general.about.success.field.one.title = Support the Developers -commands.general.about.success.field.one.description = Hadder is completely free for everyone. We would appreciate it you donate some money [here] +commands.general.about.success.field.one.description = Hadder is completely free for everyone. We would appreciate it you donate some money [here]%extra% commands.general.about.help.description = Shows infos about Hadder commands.general.equals.string.first.request = Please send me the first String commands.general.equals.string.second.request = Please send me the second String @@ -40,11 +41,12 @@ commands.general.equals.string.first = First String commands.general.equals.string.second = Second String commands.general.equals.string.result = Result commands.general.equals.help.description = Check if two strings are the same +commands.general.help.field.usage = Usage commands.general.help.error.description = I need the Embed Links Permission to send the Help Menu\! commands.general.help.help.description = Shows each command or explains its usage commands.general.help.help.label = [CommandName] commands.general.invite.success.title = Invite me\! -commands.general.invite.success.description = [Invite me here\!] +commands.general.invite.success.description = [Invite me here\!]%extra% commands.general.invite.help.description = Shows the invitation to invite Hadder to your server commands.general.ping.help.description = Shows the ping to the Discord API @@ -53,8 +55,9 @@ commands.misc.feedback.title.request.description = Please send me the feedback t commands.misc.feedback.description.request.title = Feedback Description commands.misc.feedback.description.request.description = Please send me the feedback description now. commands.misc.feedback.help.description = Sends feedback directly to the developers. +commands.misc.feedback.success.title = Feedback successfully sent commands.misc.github.link.title = Link your GitHub Account -commands.misc.github.success.title = Information about +commands.misc.github.success.title = Information about %extra% commands.misc.github.success.bio = User bio commands.misc.github.success.location = Location commands.misc.github.success.website = Website @@ -65,7 +68,7 @@ commands.misc.github.success.following = Following commands.misc.github.api.error.description = The GitHub API might be down at the moment\! commands.misc.github.user.error.description = This user does not exist\! commands.misc.github.connect.title = Connect you GH account -commands.misc.github.connect.description = [Please connect your GitHub account here] +commands.misc.github.connect.description = [Please connect your GitHub account here]%extra% commands.misc.github.help.description = Displays information about a GitHub user profile. commands.misc.screenshare.success.title = Here's your Url to share your Screen commands.misc.screenshare.id.error.title = Wait that's illegal @@ -78,17 +81,18 @@ commands.misc.screenshare.channel.existing.error = Hol' up commands.misc.screenshare.channel.existing.description = There is no Voice Channel named like this. \n\nNote\: Make sure the Voice Channel is on this Guild. commands.misc.screenshare.help.description = Shows you the link to share your screen. -commands.moderation.ban.success.title = ? Successfully banned ? -commands.moderation.ban.success.description = I successfully baned +commands.moderation.ban.success.title = %extra% Successfully banned %extra% +commands.moderation.ban.success.description = I successfully baned %extra% commands.moderation.ban.error.title = Not possible commands.moderation.ban.myself.error.description = I can not ban myself\! commands.moderation.ban.yourself.error.description = You can not ban yourself\! +commands.moderation.ban.massban.success.description = I successfully baned %extra% Members\! commands.moderation.ban.help.description = Bans one ore more user from the server commands.moderation.clear.number.error.description = You have to choose a number between 1 and 99\! -commands.moderation.clear.success.description = Successfully deleted +commands.moderation.clear.success.description = Successfully deleted %extra% messages. commands.moderation.clear.help.description = Deletes the specified number of messages. -commands.moderation.prefix.success.title = ? Successfully set ? -commands.moderation.prefix.success.description = I successfully set the new prefix for the guild to +commands.moderation.prefix.success.title = %extra% Successfully set %extra% +commands.moderation.prefix.success.description = I successfully set the new prefix for the guild to %extra% commands.moderation.prefix.error.description = The prefix must not contain **"** commands.moderation.prefix.help.description = Sets the Guild-Prefix. commands.moderation.invitedetect.activate.success.title = Successfully activated @@ -100,13 +104,14 @@ commands.moderation.invitedetect.deactivate.success.description = I successfully commands.moderation.invitedetect.deactivate.error.title = Already deactivated commands.moderation.invitedetect.deactivate.error.description = The invite link detection is already deactivated on this guild. commands.moderation.invitedetect.help.description = Activate or deactivate the Discord invite link detection. -commands.moderation.kick.success.title = ? Successfully kicked ? -commands.moderation.kick.success.description = I successfully kicked +commands.moderation.kick.success.title = %extra% Successfully kicked %extra% +commands.moderation.kick.success.description = I successfully kicked %extra%. commands.moderation.kick.error.title = Not possible commands.moderation.kick.myself.error.description = I can not kick myself\! commands.moderation.kick.yourself.error.description = You can't kick yourself. commands.moderation.kick.mass.success.description = I successfully kicked 69 Members\! commands.moderation.kick.help.description = Kicks one or more user from the server. +commands.moderation.kick.masskick.success.description = I successfully kicked %extra% members. commands.moderation.link.request.success.description = If i'm on this guild i sent a message to accept the link. commands.moderation.link.error.title = Wait that's illegal. commands.moderation.link.request.error.description = You specified the same guild as the guild on which you're reading this @@ -114,7 +119,44 @@ commands.moderation.link.request.accept.title = ) wants to link guilds\! commands.moderation.link.request.accept.description = React with the reactions to accept or decline it commands.moderation.link.set.title = Set the thing boi commands.moderation.link.help.description = Links two or more servers. -commands.moderation.nick.success.title = ? Successfully nicked ? -commands.moderation.nick.success.description = I successfully nicked +commands.moderation.nick.success.title = %extra% Successfully nicked %extra% +commands.moderation.nick.success.description = I successfully nicked %extra%. commands.moderation.nick.myself.success.description = I successfully changed my nickname. -commands.moderation.nick.help.description = Rename a one or more user. \ No newline at end of file +commands.moderation.nick.massnick.success.description = I successfully nicked %extra% Members. +commands.moderation.nick.help.description = Rename a one or more user. +commands.moderation.regionchange.regions.title = All regions +commands.moderation.regionchange.success.title = Successfully set region +commands.moderation.regionchange.success.description = I successfully set the new server region to %extra%. +commands.moderation.regionchange.help.description = Changes the server region to locked regions. +commands.moderation.role.add.success.title = %extra% Successfully added role(s) %extra% +commands.moderation.role.add.success.description = I successfully added %extra% roles to %extra_two% members. +commands.moderation.role.remove.success.title = %extra% Successfully removed role(s) %extra% +commands.moderation.role.remove.success.description = I successfully removed %extra% roles from %extra_two% members. +commands.moderation.role.help.description = Adds and removes one or more role(s) from one or more user(s) +commands.moderation.rules.setup.title = Set up rules +commands.moderation.rules.setup.description = Welcome to the Hadder rules setup. Please mention the channel in which I should send the rules. Your message should look like\: \#rules or \#verify. +commands.moderation.rules.channel.error.title = Channel not found +commands.moderation.rules.channel.error.description = I can't find the specified channel. Please start the setup again. +commands.moderation.rules.rules.title = Rules +commands.moderation.rules.rules.description = The channel was successfully set to %extra%. Please send me the rules now. +commands.moderation.rules.role.title = Role to assign +commands.moderation.rules.role.description = The rules were successfully set. Please send me the name of the role which the user receives after he accepted the rules. +commands.moderation.rules.role.error.title = Role does not exist +commands.moderation.rules.role.error.description = The specified role does not exist on this guild. +commands.moderation.rules.guild.error.title = Wrong Guild +commands.moderation.rules.guild.error.description = The mentioned channel must be on this guild\! +commands.moderation.rules.emote.accept.title = Custom Accept Emote +commands.moderation.rules.emote.accept.description = The role has been successfully set to %extra%. Now send me the emote on which your user should react to to get verified. +commands.moderation.rules.emote.decline.title = Custom Decline Emote +commands.moderation.rules.emote.decline.description = The first emote has been successfully set to %extra%. Please send me now the decline emote. +commands.moderation.rules.success.title = Successfully set the rules +commands.moderation.rules.success.description = I successfully send the rules in %extra%. +commands.moderation.rules.emote.error.access.description = I can not access the custom emote(s). +commands.moderation.rules.emote.error.equal.title = Emotes are equal +commands.moderation.rules.emote.error.equal.description = The 1st and 2nd emote equals each other. +commands.moderation.rules.emoji.decline.description = The first emote has been successfully set. Please send me now the decline emote. +commands.moderation.rules.emoji.error.description = The given emote can't be used. +commands.moderation.rules.help.description = Setup the rules on your Discord server + +commands.music.join.success.title = Successfully connected +commands.music.join.success.description = I successfully connected to %extra%. -- 2.45.3 From dc976210c6a6fb78003b3b5efa037aeaf9cceb11 Mon Sep 17 00:00:00 2001 From: Skidder Date: Wed, 11 Dec 2019 20:20:57 +0100 Subject: [PATCH 13/35] New translations Translations_en.properties (Russian) New Russian translation --- .../Translations/Translations_ru.properties | 72 +++++++++++++++---- 1 file changed, 57 insertions(+), 15 deletions(-) diff --git a/src/main/resources/Translations/Translations_ru.properties b/src/main/resources/Translations/Translations_ru.properties index d76eeb6..d446f98 100644 --- a/src/main/resources/Translations/Translations_ru.properties +++ b/src/main/resources/Translations/Translations_ru.properties @@ -14,12 +14,13 @@ number = guildprefix = vc-name/id = user+nickname = <@user> +region = error = Error none = None success\! = Success\! -commands.fun.avatar.success.title = Avatar of +commands.fun.avatar.success.title = Avatar of %extra% commands.fun.avatar.help.description = Sends the avatar of the specified member. commands.fun.gif.error.description = Please try again with another term. commands.fun.gif.help.description = Look for a GIF on Giphy @@ -30,7 +31,7 @@ commands.fun.meme.help.description = Sends you a random meme. commands.general.about.success.title = Hadder - About commands.general.about.success.description = Hadder is an open source Discord bot. commands.general.about.success.field.one.title = Support the Developers -commands.general.about.success.field.one.description = Hadder is completely free for everyone. We would appreciate it you donate some money [here] +commands.general.about.success.field.one.description = Hadder is completely free for everyone. We would appreciate it you donate some money [here]%extra% commands.general.about.help.description = Shows infos about Hadder commands.general.equals.string.first.request = Please send me the first String commands.general.equals.string.second.request = Please send me the second String @@ -40,11 +41,12 @@ commands.general.equals.string.first = First String commands.general.equals.string.second = Second String commands.general.equals.string.result = Result commands.general.equals.help.description = Check if two strings are the same +commands.general.help.field.usage = Usage commands.general.help.error.description = I need the Embed Links Permission to send the Help Menu\! commands.general.help.help.description = Shows each command or explains its usage commands.general.help.help.label = [CommandName] commands.general.invite.success.title = Invite me\! -commands.general.invite.success.description = [Invite me here\!] +commands.general.invite.success.description = [Invite me here\!]%extra% commands.general.invite.help.description = Shows the invitation to invite Hadder to your server commands.general.ping.help.description = Shows the ping to the Discord API @@ -53,8 +55,9 @@ commands.misc.feedback.title.request.description = Please send me the feedback t commands.misc.feedback.description.request.title = Feedback Description commands.misc.feedback.description.request.description = Please send me the feedback description now. commands.misc.feedback.help.description = Sends feedback directly to the developers. +commands.misc.feedback.success.title = Feedback successfully sent commands.misc.github.link.title = Link your GitHub Account -commands.misc.github.success.title = Information about +commands.misc.github.success.title = Information about %extra% commands.misc.github.success.bio = User bio commands.misc.github.success.location = Location commands.misc.github.success.website = Website @@ -65,7 +68,7 @@ commands.misc.github.success.following = Following commands.misc.github.api.error.description = The GitHub API might be down at the moment\! commands.misc.github.user.error.description = This user does not exist\! commands.misc.github.connect.title = Connect you GH account -commands.misc.github.connect.description = [Please connect your GitHub account here] +commands.misc.github.connect.description = [Please connect your GitHub account here]%extra% commands.misc.github.help.description = Displays information about a GitHub user profile. commands.misc.screenshare.success.title = Here's your Url to share your Screen commands.misc.screenshare.id.error.title = Wait that's illegal @@ -78,17 +81,18 @@ commands.misc.screenshare.channel.existing.error = Hol' up commands.misc.screenshare.channel.existing.description = There is no Voice Channel named like this. \n\nNote\: Make sure the Voice Channel is on this Guild. commands.misc.screenshare.help.description = Shows you the link to share your screen. -commands.moderation.ban.success.title = ? Successfully banned ? -commands.moderation.ban.success.description = I successfully baned +commands.moderation.ban.success.title = %extra% Successfully banned %extra% +commands.moderation.ban.success.description = I successfully baned %extra% commands.moderation.ban.error.title = Not possible commands.moderation.ban.myself.error.description = I can not ban myself\! commands.moderation.ban.yourself.error.description = You can not ban yourself\! +commands.moderation.ban.massban.success.description = I successfully baned %extra% Members\! commands.moderation.ban.help.description = Bans one ore more user from the server commands.moderation.clear.number.error.description = You have to choose a number between 1 and 99\! -commands.moderation.clear.success.description = Successfully deleted +commands.moderation.clear.success.description = Successfully deleted %extra% messages. commands.moderation.clear.help.description = Deletes the specified number of messages. -commands.moderation.prefix.success.title = ? Successfully set ? -commands.moderation.prefix.success.description = I successfully set the new prefix for the guild to +commands.moderation.prefix.success.title = %extra% Successfully set %extra% +commands.moderation.prefix.success.description = I successfully set the new prefix for the guild to %extra% commands.moderation.prefix.error.description = The prefix must not contain **"** commands.moderation.prefix.help.description = Sets the Guild-Prefix. commands.moderation.invitedetect.activate.success.title = Successfully activated @@ -100,13 +104,14 @@ commands.moderation.invitedetect.deactivate.success.description = I successfully commands.moderation.invitedetect.deactivate.error.title = Already deactivated commands.moderation.invitedetect.deactivate.error.description = The invite link detection is already deactivated on this guild. commands.moderation.invitedetect.help.description = Activate or deactivate the Discord invite link detection. -commands.moderation.kick.success.title = ? Successfully kicked ? -commands.moderation.kick.success.description = I successfully kicked +commands.moderation.kick.success.title = %extra% Successfully kicked %extra% +commands.moderation.kick.success.description = I successfully kicked %extra%. commands.moderation.kick.error.title = Not possible commands.moderation.kick.myself.error.description = I can not kick myself\! commands.moderation.kick.yourself.error.description = You can't kick yourself. commands.moderation.kick.mass.success.description = I successfully kicked 69 Members\! commands.moderation.kick.help.description = Kicks one or more user from the server. +commands.moderation.kick.masskick.success.description = I successfully kicked %extra% members. commands.moderation.link.request.success.description = If i'm on this guild i sent a message to accept the link. commands.moderation.link.error.title = Wait that's illegal. commands.moderation.link.request.error.description = You specified the same guild as the guild on which you're reading this @@ -114,7 +119,44 @@ commands.moderation.link.request.accept.title = ) wants to link guilds\! commands.moderation.link.request.accept.description = React with the reactions to accept or decline it commands.moderation.link.set.title = Set the thing boi commands.moderation.link.help.description = Links two or more servers. -commands.moderation.nick.success.title = ? Successfully nicked ? -commands.moderation.nick.success.description = I successfully nicked +commands.moderation.nick.success.title = %extra% Successfully nicked %extra% +commands.moderation.nick.success.description = I successfully nicked %extra%. commands.moderation.nick.myself.success.description = I successfully changed my nickname. -commands.moderation.nick.help.description = Rename a one or more user. \ No newline at end of file +commands.moderation.nick.massnick.success.description = I successfully nicked %extra% Members. +commands.moderation.nick.help.description = Rename a one or more user. +commands.moderation.regionchange.regions.title = All regions +commands.moderation.regionchange.success.title = Successfully set region +commands.moderation.regionchange.success.description = I successfully set the new server region to %extra%. +commands.moderation.regionchange.help.description = Changes the server region to locked regions. +commands.moderation.role.add.success.title = %extra% Successfully added role(s) %extra% +commands.moderation.role.add.success.description = I successfully added %extra% roles to %extra_two% members. +commands.moderation.role.remove.success.title = %extra% Successfully removed role(s) %extra% +commands.moderation.role.remove.success.description = I successfully removed %extra% roles from %extra_two% members. +commands.moderation.role.help.description = Adds and removes one or more role(s) from one or more user(s) +commands.moderation.rules.setup.title = Set up rules +commands.moderation.rules.setup.description = Welcome to the Hadder rules setup. Please mention the channel in which I should send the rules. Your message should look like\: \#rules or \#verify. +commands.moderation.rules.channel.error.title = Channel not found +commands.moderation.rules.channel.error.description = I can't find the specified channel. Please start the setup again. +commands.moderation.rules.rules.title = Rules +commands.moderation.rules.rules.description = The channel was successfully set to %extra%. Please send me the rules now. +commands.moderation.rules.role.title = Role to assign +commands.moderation.rules.role.description = The rules were successfully set. Please send me the name of the role which the user receives after he accepted the rules. +commands.moderation.rules.role.error.title = Role does not exist +commands.moderation.rules.role.error.description = The specified role does not exist on this guild. +commands.moderation.rules.guild.error.title = Wrong Guild +commands.moderation.rules.guild.error.description = The mentioned channel must be on this guild\! +commands.moderation.rules.emote.accept.title = Custom Accept Emote +commands.moderation.rules.emote.accept.description = The role has been successfully set to %extra%. Now send me the emote on which your user should react to to get verified. +commands.moderation.rules.emote.decline.title = Custom Decline Emote +commands.moderation.rules.emote.decline.description = The first emote has been successfully set to %extra%. Please send me now the decline emote. +commands.moderation.rules.success.title = Successfully set the rules +commands.moderation.rules.success.description = I successfully send the rules in %extra%. +commands.moderation.rules.emote.error.access.description = I can not access the custom emote(s). +commands.moderation.rules.emote.error.equal.title = Emotes are equal +commands.moderation.rules.emote.error.equal.description = The 1st and 2nd emote equals each other. +commands.moderation.rules.emoji.decline.description = The first emote has been successfully set. Please send me now the decline emote. +commands.moderation.rules.emoji.error.description = The given emote can't be used. +commands.moderation.rules.help.description = Setup the rules on your Discord server + +commands.music.join.success.title = Successfully connected +commands.music.join.success.description = I successfully connected to %extra%. -- 2.45.3 From 2b191e83cf615921f94552bd721acacfa1c128dd Mon Sep 17 00:00:00 2001 From: Skidder Date: Wed, 11 Dec 2019 20:20:59 +0100 Subject: [PATCH 14/35] New translations Translations_en.properties (Turkish) New Turkish translation --- .../Translations/Translations_tr.properties | 72 +++++++++++++++---- 1 file changed, 57 insertions(+), 15 deletions(-) diff --git a/src/main/resources/Translations/Translations_tr.properties b/src/main/resources/Translations/Translations_tr.properties index d76eeb6..d446f98 100644 --- a/src/main/resources/Translations/Translations_tr.properties +++ b/src/main/resources/Translations/Translations_tr.properties @@ -14,12 +14,13 @@ number = guildprefix = vc-name/id = user+nickname = <@user> +region = error = Error none = None success\! = Success\! -commands.fun.avatar.success.title = Avatar of +commands.fun.avatar.success.title = Avatar of %extra% commands.fun.avatar.help.description = Sends the avatar of the specified member. commands.fun.gif.error.description = Please try again with another term. commands.fun.gif.help.description = Look for a GIF on Giphy @@ -30,7 +31,7 @@ commands.fun.meme.help.description = Sends you a random meme. commands.general.about.success.title = Hadder - About commands.general.about.success.description = Hadder is an open source Discord bot. commands.general.about.success.field.one.title = Support the Developers -commands.general.about.success.field.one.description = Hadder is completely free for everyone. We would appreciate it you donate some money [here] +commands.general.about.success.field.one.description = Hadder is completely free for everyone. We would appreciate it you donate some money [here]%extra% commands.general.about.help.description = Shows infos about Hadder commands.general.equals.string.first.request = Please send me the first String commands.general.equals.string.second.request = Please send me the second String @@ -40,11 +41,12 @@ commands.general.equals.string.first = First String commands.general.equals.string.second = Second String commands.general.equals.string.result = Result commands.general.equals.help.description = Check if two strings are the same +commands.general.help.field.usage = Usage commands.general.help.error.description = I need the Embed Links Permission to send the Help Menu\! commands.general.help.help.description = Shows each command or explains its usage commands.general.help.help.label = [CommandName] commands.general.invite.success.title = Invite me\! -commands.general.invite.success.description = [Invite me here\!] +commands.general.invite.success.description = [Invite me here\!]%extra% commands.general.invite.help.description = Shows the invitation to invite Hadder to your server commands.general.ping.help.description = Shows the ping to the Discord API @@ -53,8 +55,9 @@ commands.misc.feedback.title.request.description = Please send me the feedback t commands.misc.feedback.description.request.title = Feedback Description commands.misc.feedback.description.request.description = Please send me the feedback description now. commands.misc.feedback.help.description = Sends feedback directly to the developers. +commands.misc.feedback.success.title = Feedback successfully sent commands.misc.github.link.title = Link your GitHub Account -commands.misc.github.success.title = Information about +commands.misc.github.success.title = Information about %extra% commands.misc.github.success.bio = User bio commands.misc.github.success.location = Location commands.misc.github.success.website = Website @@ -65,7 +68,7 @@ commands.misc.github.success.following = Following commands.misc.github.api.error.description = The GitHub API might be down at the moment\! commands.misc.github.user.error.description = This user does not exist\! commands.misc.github.connect.title = Connect you GH account -commands.misc.github.connect.description = [Please connect your GitHub account here] +commands.misc.github.connect.description = [Please connect your GitHub account here]%extra% commands.misc.github.help.description = Displays information about a GitHub user profile. commands.misc.screenshare.success.title = Here's your Url to share your Screen commands.misc.screenshare.id.error.title = Wait that's illegal @@ -78,17 +81,18 @@ commands.misc.screenshare.channel.existing.error = Hol' up commands.misc.screenshare.channel.existing.description = There is no Voice Channel named like this. \n\nNote\: Make sure the Voice Channel is on this Guild. commands.misc.screenshare.help.description = Shows you the link to share your screen. -commands.moderation.ban.success.title = ? Successfully banned ? -commands.moderation.ban.success.description = I successfully baned +commands.moderation.ban.success.title = %extra% Successfully banned %extra% +commands.moderation.ban.success.description = I successfully baned %extra% commands.moderation.ban.error.title = Not possible commands.moderation.ban.myself.error.description = I can not ban myself\! commands.moderation.ban.yourself.error.description = You can not ban yourself\! +commands.moderation.ban.massban.success.description = I successfully baned %extra% Members\! commands.moderation.ban.help.description = Bans one ore more user from the server commands.moderation.clear.number.error.description = You have to choose a number between 1 and 99\! -commands.moderation.clear.success.description = Successfully deleted +commands.moderation.clear.success.description = Successfully deleted %extra% messages. commands.moderation.clear.help.description = Deletes the specified number of messages. -commands.moderation.prefix.success.title = ? Successfully set ? -commands.moderation.prefix.success.description = I successfully set the new prefix for the guild to +commands.moderation.prefix.success.title = %extra% Successfully set %extra% +commands.moderation.prefix.success.description = I successfully set the new prefix for the guild to %extra% commands.moderation.prefix.error.description = The prefix must not contain **"** commands.moderation.prefix.help.description = Sets the Guild-Prefix. commands.moderation.invitedetect.activate.success.title = Successfully activated @@ -100,13 +104,14 @@ commands.moderation.invitedetect.deactivate.success.description = I successfully commands.moderation.invitedetect.deactivate.error.title = Already deactivated commands.moderation.invitedetect.deactivate.error.description = The invite link detection is already deactivated on this guild. commands.moderation.invitedetect.help.description = Activate or deactivate the Discord invite link detection. -commands.moderation.kick.success.title = ? Successfully kicked ? -commands.moderation.kick.success.description = I successfully kicked +commands.moderation.kick.success.title = %extra% Successfully kicked %extra% +commands.moderation.kick.success.description = I successfully kicked %extra%. commands.moderation.kick.error.title = Not possible commands.moderation.kick.myself.error.description = I can not kick myself\! commands.moderation.kick.yourself.error.description = You can't kick yourself. commands.moderation.kick.mass.success.description = I successfully kicked 69 Members\! commands.moderation.kick.help.description = Kicks one or more user from the server. +commands.moderation.kick.masskick.success.description = I successfully kicked %extra% members. commands.moderation.link.request.success.description = If i'm on this guild i sent a message to accept the link. commands.moderation.link.error.title = Wait that's illegal. commands.moderation.link.request.error.description = You specified the same guild as the guild on which you're reading this @@ -114,7 +119,44 @@ commands.moderation.link.request.accept.title = ) wants to link guilds\! commands.moderation.link.request.accept.description = React with the reactions to accept or decline it commands.moderation.link.set.title = Set the thing boi commands.moderation.link.help.description = Links two or more servers. -commands.moderation.nick.success.title = ? Successfully nicked ? -commands.moderation.nick.success.description = I successfully nicked +commands.moderation.nick.success.title = %extra% Successfully nicked %extra% +commands.moderation.nick.success.description = I successfully nicked %extra%. commands.moderation.nick.myself.success.description = I successfully changed my nickname. -commands.moderation.nick.help.description = Rename a one or more user. \ No newline at end of file +commands.moderation.nick.massnick.success.description = I successfully nicked %extra% Members. +commands.moderation.nick.help.description = Rename a one or more user. +commands.moderation.regionchange.regions.title = All regions +commands.moderation.regionchange.success.title = Successfully set region +commands.moderation.regionchange.success.description = I successfully set the new server region to %extra%. +commands.moderation.regionchange.help.description = Changes the server region to locked regions. +commands.moderation.role.add.success.title = %extra% Successfully added role(s) %extra% +commands.moderation.role.add.success.description = I successfully added %extra% roles to %extra_two% members. +commands.moderation.role.remove.success.title = %extra% Successfully removed role(s) %extra% +commands.moderation.role.remove.success.description = I successfully removed %extra% roles from %extra_two% members. +commands.moderation.role.help.description = Adds and removes one or more role(s) from one or more user(s) +commands.moderation.rules.setup.title = Set up rules +commands.moderation.rules.setup.description = Welcome to the Hadder rules setup. Please mention the channel in which I should send the rules. Your message should look like\: \#rules or \#verify. +commands.moderation.rules.channel.error.title = Channel not found +commands.moderation.rules.channel.error.description = I can't find the specified channel. Please start the setup again. +commands.moderation.rules.rules.title = Rules +commands.moderation.rules.rules.description = The channel was successfully set to %extra%. Please send me the rules now. +commands.moderation.rules.role.title = Role to assign +commands.moderation.rules.role.description = The rules were successfully set. Please send me the name of the role which the user receives after he accepted the rules. +commands.moderation.rules.role.error.title = Role does not exist +commands.moderation.rules.role.error.description = The specified role does not exist on this guild. +commands.moderation.rules.guild.error.title = Wrong Guild +commands.moderation.rules.guild.error.description = The mentioned channel must be on this guild\! +commands.moderation.rules.emote.accept.title = Custom Accept Emote +commands.moderation.rules.emote.accept.description = The role has been successfully set to %extra%. Now send me the emote on which your user should react to to get verified. +commands.moderation.rules.emote.decline.title = Custom Decline Emote +commands.moderation.rules.emote.decline.description = The first emote has been successfully set to %extra%. Please send me now the decline emote. +commands.moderation.rules.success.title = Successfully set the rules +commands.moderation.rules.success.description = I successfully send the rules in %extra%. +commands.moderation.rules.emote.error.access.description = I can not access the custom emote(s). +commands.moderation.rules.emote.error.equal.title = Emotes are equal +commands.moderation.rules.emote.error.equal.description = The 1st and 2nd emote equals each other. +commands.moderation.rules.emoji.decline.description = The first emote has been successfully set. Please send me now the decline emote. +commands.moderation.rules.emoji.error.description = The given emote can't be used. +commands.moderation.rules.help.description = Setup the rules on your Discord server + +commands.music.join.success.title = Successfully connected +commands.music.join.success.description = I successfully connected to %extra%. -- 2.45.3 From a2511ed42b8949b4f158dbfade94019834a89eaf Mon Sep 17 00:00:00 2001 From: Skidder Date: Wed, 11 Dec 2019 20:21:00 +0100 Subject: [PATCH 15/35] New translations Translations_en.properties (Chinese Simplified) New Chinese Simplified translation --- .../Translations/Translations_zh.properties | 72 +++++++++++++++---- 1 file changed, 57 insertions(+), 15 deletions(-) diff --git a/src/main/resources/Translations/Translations_zh.properties b/src/main/resources/Translations/Translations_zh.properties index d76eeb6..d446f98 100644 --- a/src/main/resources/Translations/Translations_zh.properties +++ b/src/main/resources/Translations/Translations_zh.properties @@ -14,12 +14,13 @@ number = guildprefix = vc-name/id = user+nickname = <@user> +region = error = Error none = None success\! = Success\! -commands.fun.avatar.success.title = Avatar of +commands.fun.avatar.success.title = Avatar of %extra% commands.fun.avatar.help.description = Sends the avatar of the specified member. commands.fun.gif.error.description = Please try again with another term. commands.fun.gif.help.description = Look for a GIF on Giphy @@ -30,7 +31,7 @@ commands.fun.meme.help.description = Sends you a random meme. commands.general.about.success.title = Hadder - About commands.general.about.success.description = Hadder is an open source Discord bot. commands.general.about.success.field.one.title = Support the Developers -commands.general.about.success.field.one.description = Hadder is completely free for everyone. We would appreciate it you donate some money [here] +commands.general.about.success.field.one.description = Hadder is completely free for everyone. We would appreciate it you donate some money [here]%extra% commands.general.about.help.description = Shows infos about Hadder commands.general.equals.string.first.request = Please send me the first String commands.general.equals.string.second.request = Please send me the second String @@ -40,11 +41,12 @@ commands.general.equals.string.first = First String commands.general.equals.string.second = Second String commands.general.equals.string.result = Result commands.general.equals.help.description = Check if two strings are the same +commands.general.help.field.usage = Usage commands.general.help.error.description = I need the Embed Links Permission to send the Help Menu\! commands.general.help.help.description = Shows each command or explains its usage commands.general.help.help.label = [CommandName] commands.general.invite.success.title = Invite me\! -commands.general.invite.success.description = [Invite me here\!] +commands.general.invite.success.description = [Invite me here\!]%extra% commands.general.invite.help.description = Shows the invitation to invite Hadder to your server commands.general.ping.help.description = Shows the ping to the Discord API @@ -53,8 +55,9 @@ commands.misc.feedback.title.request.description = Please send me the feedback t commands.misc.feedback.description.request.title = Feedback Description commands.misc.feedback.description.request.description = Please send me the feedback description now. commands.misc.feedback.help.description = Sends feedback directly to the developers. +commands.misc.feedback.success.title = Feedback successfully sent commands.misc.github.link.title = Link your GitHub Account -commands.misc.github.success.title = Information about +commands.misc.github.success.title = Information about %extra% commands.misc.github.success.bio = User bio commands.misc.github.success.location = Location commands.misc.github.success.website = Website @@ -65,7 +68,7 @@ commands.misc.github.success.following = Following commands.misc.github.api.error.description = The GitHub API might be down at the moment\! commands.misc.github.user.error.description = This user does not exist\! commands.misc.github.connect.title = Connect you GH account -commands.misc.github.connect.description = [Please connect your GitHub account here] +commands.misc.github.connect.description = [Please connect your GitHub account here]%extra% commands.misc.github.help.description = Displays information about a GitHub user profile. commands.misc.screenshare.success.title = Here's your Url to share your Screen commands.misc.screenshare.id.error.title = Wait that's illegal @@ -78,17 +81,18 @@ commands.misc.screenshare.channel.existing.error = Hol' up commands.misc.screenshare.channel.existing.description = There is no Voice Channel named like this. \n\nNote\: Make sure the Voice Channel is on this Guild. commands.misc.screenshare.help.description = Shows you the link to share your screen. -commands.moderation.ban.success.title = ? Successfully banned ? -commands.moderation.ban.success.description = I successfully baned +commands.moderation.ban.success.title = %extra% Successfully banned %extra% +commands.moderation.ban.success.description = I successfully baned %extra% commands.moderation.ban.error.title = Not possible commands.moderation.ban.myself.error.description = I can not ban myself\! commands.moderation.ban.yourself.error.description = You can not ban yourself\! +commands.moderation.ban.massban.success.description = I successfully baned %extra% Members\! commands.moderation.ban.help.description = Bans one ore more user from the server commands.moderation.clear.number.error.description = You have to choose a number between 1 and 99\! -commands.moderation.clear.success.description = Successfully deleted +commands.moderation.clear.success.description = Successfully deleted %extra% messages. commands.moderation.clear.help.description = Deletes the specified number of messages. -commands.moderation.prefix.success.title = ? Successfully set ? -commands.moderation.prefix.success.description = I successfully set the new prefix for the guild to +commands.moderation.prefix.success.title = %extra% Successfully set %extra% +commands.moderation.prefix.success.description = I successfully set the new prefix for the guild to %extra% commands.moderation.prefix.error.description = The prefix must not contain **"** commands.moderation.prefix.help.description = Sets the Guild-Prefix. commands.moderation.invitedetect.activate.success.title = Successfully activated @@ -100,13 +104,14 @@ commands.moderation.invitedetect.deactivate.success.description = I successfully commands.moderation.invitedetect.deactivate.error.title = Already deactivated commands.moderation.invitedetect.deactivate.error.description = The invite link detection is already deactivated on this guild. commands.moderation.invitedetect.help.description = Activate or deactivate the Discord invite link detection. -commands.moderation.kick.success.title = ? Successfully kicked ? -commands.moderation.kick.success.description = I successfully kicked +commands.moderation.kick.success.title = %extra% Successfully kicked %extra% +commands.moderation.kick.success.description = I successfully kicked %extra%. commands.moderation.kick.error.title = Not possible commands.moderation.kick.myself.error.description = I can not kick myself\! commands.moderation.kick.yourself.error.description = You can't kick yourself. commands.moderation.kick.mass.success.description = I successfully kicked 69 Members\! commands.moderation.kick.help.description = Kicks one or more user from the server. +commands.moderation.kick.masskick.success.description = I successfully kicked %extra% members. commands.moderation.link.request.success.description = If i'm on this guild i sent a message to accept the link. commands.moderation.link.error.title = Wait that's illegal. commands.moderation.link.request.error.description = You specified the same guild as the guild on which you're reading this @@ -114,7 +119,44 @@ commands.moderation.link.request.accept.title = ) wants to link guilds\! commands.moderation.link.request.accept.description = React with the reactions to accept or decline it commands.moderation.link.set.title = Set the thing boi commands.moderation.link.help.description = Links two or more servers. -commands.moderation.nick.success.title = ? Successfully nicked ? -commands.moderation.nick.success.description = I successfully nicked +commands.moderation.nick.success.title = %extra% Successfully nicked %extra% +commands.moderation.nick.success.description = I successfully nicked %extra%. commands.moderation.nick.myself.success.description = I successfully changed my nickname. -commands.moderation.nick.help.description = Rename a one or more user. \ No newline at end of file +commands.moderation.nick.massnick.success.description = I successfully nicked %extra% Members. +commands.moderation.nick.help.description = Rename a one or more user. +commands.moderation.regionchange.regions.title = All regions +commands.moderation.regionchange.success.title = Successfully set region +commands.moderation.regionchange.success.description = I successfully set the new server region to %extra%. +commands.moderation.regionchange.help.description = Changes the server region to locked regions. +commands.moderation.role.add.success.title = %extra% Successfully added role(s) %extra% +commands.moderation.role.add.success.description = I successfully added %extra% roles to %extra_two% members. +commands.moderation.role.remove.success.title = %extra% Successfully removed role(s) %extra% +commands.moderation.role.remove.success.description = I successfully removed %extra% roles from %extra_two% members. +commands.moderation.role.help.description = Adds and removes one or more role(s) from one or more user(s) +commands.moderation.rules.setup.title = Set up rules +commands.moderation.rules.setup.description = Welcome to the Hadder rules setup. Please mention the channel in which I should send the rules. Your message should look like\: \#rules or \#verify. +commands.moderation.rules.channel.error.title = Channel not found +commands.moderation.rules.channel.error.description = I can't find the specified channel. Please start the setup again. +commands.moderation.rules.rules.title = Rules +commands.moderation.rules.rules.description = The channel was successfully set to %extra%. Please send me the rules now. +commands.moderation.rules.role.title = Role to assign +commands.moderation.rules.role.description = The rules were successfully set. Please send me the name of the role which the user receives after he accepted the rules. +commands.moderation.rules.role.error.title = Role does not exist +commands.moderation.rules.role.error.description = The specified role does not exist on this guild. +commands.moderation.rules.guild.error.title = Wrong Guild +commands.moderation.rules.guild.error.description = The mentioned channel must be on this guild\! +commands.moderation.rules.emote.accept.title = Custom Accept Emote +commands.moderation.rules.emote.accept.description = The role has been successfully set to %extra%. Now send me the emote on which your user should react to to get verified. +commands.moderation.rules.emote.decline.title = Custom Decline Emote +commands.moderation.rules.emote.decline.description = The first emote has been successfully set to %extra%. Please send me now the decline emote. +commands.moderation.rules.success.title = Successfully set the rules +commands.moderation.rules.success.description = I successfully send the rules in %extra%. +commands.moderation.rules.emote.error.access.description = I can not access the custom emote(s). +commands.moderation.rules.emote.error.equal.title = Emotes are equal +commands.moderation.rules.emote.error.equal.description = The 1st and 2nd emote equals each other. +commands.moderation.rules.emoji.decline.description = The first emote has been successfully set. Please send me now the decline emote. +commands.moderation.rules.emoji.error.description = The given emote can't be used. +commands.moderation.rules.help.description = Setup the rules on your Discord server + +commands.music.join.success.title = Successfully connected +commands.music.join.success.description = I successfully connected to %extra%. -- 2.45.3 From dc064a746a2e19d7f085fd52f1282dd5ef9cbada Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Thu, 12 Dec 2019 20:26:55 +0100 Subject: [PATCH 16/35] Added new strings --- .../Translations/Translations_en.properties | 30 +++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/src/main/resources/Translations/Translations_en.properties b/src/main/resources/Translations/Translations_en.properties index e233a20..01b86cc 100644 --- a/src/main/resources/Translations/Translations_en.properties +++ b/src/main/resources/Translations/Translations_en.properties @@ -160,3 +160,33 @@ commands.moderation.rules.help.description = Setup the rules on your Discord ser commands.music.join.success.title = Successfully connected commands.music.join.success.description = I successfully connected to %extra%. +commands.music.join.error.connecting.already.title = Already connected +commands.music.join.error.connecting.already.description = I am already connected to your voice channel. +commands.music.join.error.connecting.trying.title = Already trying to connect +commands.music.join.error.connecting.trying.description = Hadder is already trying to connect. Please wait a moment. +commands.music.join.error.channel.title = No Voice Channel +commands.music.join.error.channel.description = You aren't in a Voice Channel. +commands.music.join.help.description = Joins your voice channel +commands.music.leave.success.title = = Successfully disconnected +commands.music.leave.success.description = I successfully disconnected from the Voice Channel +commands.music.leave.error.tile = Not connected +commands.music.leave.error.description = I'm currently in no Voice Channel on this Guild +commands.music.leave.help.description = Leaves a voice channel + +commands.nsfw.gif.error.title = GIF not showing? Click here +commands.nsfw.img.error.title = Image not showing? Click here +commands.nsfw.anal.help.description = Shows a random anal gif. +commands.nsfw.bdsm.help.description = Shows a random BDSM picture. +commands.nsfw.blowjob.help.description = Shows a random Blowjob picture. +commands.nsfw.boobs.help.description = Shows a random boob gif. +commands.nsfw.cum.help.description = Shows a random cum gif. +commands.nsfw.erotic.help.description = Shows a random erotic picture. +commands.nsfw.feet.help.description = Shows a random feet gif. +commands.nsfw.fingering.help.description = Shows a random fingering gif. +commands.nsfw.linking.help.description = Shows a random licking gif. +commands.nsfw.porn.help.description = Shows a random porn gif. +commands.nsfw.pussy.help.description = Shows a random pussy gif. +commands.nsfw.randomporn.help.description = Shows a completely random porn gif. +commands.nsfw.solo.help.description = Shows a random solo gif. +commands.nsfw.spank.help.description = Shows a random spank gif. +commands.nsfw.trans.help.description = Shows a random trans picture. -- 2.45.3 From 6a19ed4d269ca390bdb0aa8de1a97432db469494 Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Thu, 12 Dec 2019 20:46:23 +0100 Subject: [PATCH 17/35] NoNSFW Embed --- .../java/com/bbn/hadder/utils/MessageEditor.java | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/bbn/hadder/utils/MessageEditor.java b/src/main/java/com/bbn/hadder/utils/MessageEditor.java index ece4949..e922322 100644 --- a/src/main/java/com/bbn/hadder/utils/MessageEditor.java +++ b/src/main/java/com/bbn/hadder/utils/MessageEditor.java @@ -50,6 +50,15 @@ public class MessageEditor { .setFooter("Hadder", "https://bigbotnetwork.com/images/Hadder.png") .setTimestamp(Instant.now()); break; + + case NO_NSFW: + builder + .setTitle("⛔ No NSFW ⛔") + .setDescription("You can only execute this command in NSFW channels!") + .setColor(Color.RED) + .setFooter("Hadder", "https://bigbotnetwork.com/images/Hadder.png") + .setTimestamp(Instant.now()); + break; } return builder; } @@ -59,7 +68,8 @@ public class MessageEditor { WARNING, INFO, NO_PERMISSION, - NO_SELF_PERMISSION + NO_SELF_PERMISSION, + NO_NSFW } public static String handle(String language_code, String string) { -- 2.45.3 From b2f73470729f5d12fd31723a498ae91e693341a2 Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Thu, 12 Dec 2019 20:46:57 +0100 Subject: [PATCH 18/35] Music Command Translation --- .../bbn/hadder/commands/music/JoinCommand.java | 18 +++++++++--------- .../hadder/commands/music/LeaveCommand.java | 10 +++++----- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/main/java/com/bbn/hadder/commands/music/JoinCommand.java b/src/main/java/com/bbn/hadder/commands/music/JoinCommand.java index a4f28ad..0189cdd 100644 --- a/src/main/java/com/bbn/hadder/commands/music/JoinCommand.java +++ b/src/main/java/com/bbn/hadder/commands/music/JoinCommand.java @@ -28,27 +28,27 @@ public class JoinCommand implements Command { .build()).queue(); } else { event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.WARNING) - .setTitle("Already connected") - .setDescription("I am already connected to your voice channel.") + .setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.music.join.error.connecting.already.title")) + .setDescription(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.music.join.error.connecting.already.description")) .build()).queue(); } } else { event.getGuild().getAudioManager().openAudioConnection(vc); event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO) - .setTitle("Successfully connected") - .setDescription("I successfully connected to " + vc.getName() + ".") + .setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.music.join.success.title")) + .setDescription(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.music.join.success.description", vc.getName())) .build()).queue(); } } else { event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.WARNING) - .setTitle("Already trying to connect") - .setDescription("Hadder is already trying to connect. Please wait a moment.") + .setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.music.join.error.connecting.trying.title")) + .setDescription(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.music.join.error.connecting.trying.description")) .build()).queue(); } } else { event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.WARNING) - .setTitle("No Voice Channel") - .setDescription("You aren't in a Voice Channel.") + .setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.music.join.error.channel.title")) + .setDescription(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.music.join.error.channel.description")) .build()).queue(); } } @@ -60,7 +60,7 @@ public class JoinCommand implements Command { @Override public String description() { - return "Joins your voice channel"; + return MessageEditor.handle("en", "commands.music.join.help.description"); } @Override diff --git a/src/main/java/com/bbn/hadder/commands/music/LeaveCommand.java b/src/main/java/com/bbn/hadder/commands/music/LeaveCommand.java index cb47830..43bb467 100644 --- a/src/main/java/com/bbn/hadder/commands/music/LeaveCommand.java +++ b/src/main/java/com/bbn/hadder/commands/music/LeaveCommand.java @@ -15,13 +15,13 @@ public class LeaveCommand implements Command { if (event.getGuild().getSelfMember().getVoiceState().inVoiceChannel()) { event.getGuild().getAudioManager().closeAudioConnection(); event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO) - .setTitle("Successfully disconnected") - .setDescription("I successfully disconnected from the Voice Channel") + .setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.music.leave.success.title")) + .setDescription(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.music.leave.success.description")) .build()).queue(); } else { event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.WARNING) - .setTitle("Not connected") - .setDescription("I'm currently in no Voice Channel on this Guild") + .setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.music.leave.error.tile")) + .setDescription(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.music.leave.error.description")) .build()).queue(); } } @@ -33,7 +33,7 @@ public class LeaveCommand implements Command { @Override public String description() { - return "Leaves a voice channel"; + return MessageEditor.handle("en", "commands.music.leave.help.description"); } @Override -- 2.45.3 From 507630b17fa76cfa4b57fe68e1e763084f73fd5d Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Thu, 12 Dec 2019 20:47:04 +0100 Subject: [PATCH 19/35] NSFW Command Translation --- src/main/java/com/bbn/hadder/commands/nsfw/AnalCommand.java | 6 +++--- src/main/java/com/bbn/hadder/commands/nsfw/BDSMCommand.java | 6 +++--- .../java/com/bbn/hadder/commands/nsfw/BlowjobCommand.java | 6 +++--- .../java/com/bbn/hadder/commands/nsfw/BoobsCommand.java | 6 +++--- src/main/java/com/bbn/hadder/commands/nsfw/CumCommand.java | 6 +++--- .../java/com/bbn/hadder/commands/nsfw/EroticCommand.java | 6 +++--- src/main/java/com/bbn/hadder/commands/nsfw/FeetCommand.java | 6 +++--- .../java/com/bbn/hadder/commands/nsfw/FingeringCommand.java | 6 +++--- .../java/com/bbn/hadder/commands/nsfw/LickingCommand.java | 6 +++--- src/main/java/com/bbn/hadder/commands/nsfw/PornCommand.java | 6 +++--- .../java/com/bbn/hadder/commands/nsfw/PussyCommand.java | 6 +++--- .../com/bbn/hadder/commands/nsfw/RandomPornCommand.java | 6 +++--- src/main/java/com/bbn/hadder/commands/nsfw/SoloCommand.java | 6 +++--- .../java/com/bbn/hadder/commands/nsfw/SpankCommand.java | 6 +++--- .../java/com/bbn/hadder/commands/nsfw/TransCommand.java | 6 +++--- 15 files changed, 45 insertions(+), 45 deletions(-) diff --git a/src/main/java/com/bbn/hadder/commands/nsfw/AnalCommand.java b/src/main/java/com/bbn/hadder/commands/nsfw/AnalCommand.java index 74faee4..b7e79a3 100644 --- a/src/main/java/com/bbn/hadder/commands/nsfw/AnalCommand.java +++ b/src/main/java/com/bbn/hadder/commands/nsfw/AnalCommand.java @@ -32,7 +32,7 @@ public class AnalCommand implements Command { String url = response1.toString().replace("{\"url\":\"", ""); event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO) - .setAuthor("GIF not showing? Click here", url.replace("\"}", "")) + .setAuthor(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.nsfw.gif.error.title"), url.replace("\"}", "")) .setImage(url.replace("\"}", "")) .setFooter("Anal") .build()).queue(); @@ -42,7 +42,7 @@ public class AnalCommand implements Command { } } else { - event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.WARNING).setTitle("No NSFW").setDescription("You can only execute this command in NSFW channels!").build()).queue(); + event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.NO_NSFW).build()).queue(); } } @@ -53,7 +53,7 @@ public class AnalCommand implements Command { @Override public String description() { - return "Shows a random anal gif."; + return MessageEditor.handle("en", "commands.nsfw.anal.help.description"); } @Override diff --git a/src/main/java/com/bbn/hadder/commands/nsfw/BDSMCommand.java b/src/main/java/com/bbn/hadder/commands/nsfw/BDSMCommand.java index 602fd22..59abceb 100644 --- a/src/main/java/com/bbn/hadder/commands/nsfw/BDSMCommand.java +++ b/src/main/java/com/bbn/hadder/commands/nsfw/BDSMCommand.java @@ -32,7 +32,7 @@ public class BDSMCommand implements Command { String url = response1.toString().replace("{\"url\":\"", ""); event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO) - .setAuthor("Image not showing? Click here", url.replace("\"}", "")) + .setAuthor(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.nsfw.img.error.title"), url.replace("\"}", "")) .setImage(url.replace("\"}", "")) .setFooter("BDSM") .build()).queue(); @@ -42,7 +42,7 @@ public class BDSMCommand implements Command { } } else { - event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.WARNING).setTitle("No NSFW").setDescription("You can only execute this command in NSFW channels!").build()).queue(); + event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.NO_NSFW).build()).queue(); } } @@ -53,7 +53,7 @@ public class BDSMCommand implements Command { @Override public String description() { - return "Shows a random bdsm picture."; + return MessageEditor.handle("en", "commands.nsfw.bdsm.help.description"); } @Override diff --git a/src/main/java/com/bbn/hadder/commands/nsfw/BlowjobCommand.java b/src/main/java/com/bbn/hadder/commands/nsfw/BlowjobCommand.java index 67bafb8..66b90f6 100644 --- a/src/main/java/com/bbn/hadder/commands/nsfw/BlowjobCommand.java +++ b/src/main/java/com/bbn/hadder/commands/nsfw/BlowjobCommand.java @@ -28,7 +28,7 @@ public class BlowjobCommand implements Command { String url = response.body().string().replace("{\"url\":\"", ""); event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO) - .setAuthor("Image not showing? Click here", url.replace("\"}", "")) + .setAuthor(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.nsfw.img.error.title"), url.replace("\"}", "")) .setImage(url.replace("\"}", "")) .setFooter("Blowjob") .build()).queue(); @@ -38,7 +38,7 @@ public class BlowjobCommand implements Command { } } else { - event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.WARNING).setTitle("No NSFW").setDescription("You can only execute this command in NSFW channels!").build()).queue(); + event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.NO_NSFW).build()).queue(); } } @@ -49,7 +49,7 @@ public class BlowjobCommand implements Command { @Override public String description() { - return "Shows a random Blowjob picture."; + return MessageEditor.handle("en", "commands.nsfw.blowjob.help.description"); } @Override diff --git a/src/main/java/com/bbn/hadder/commands/nsfw/BoobsCommand.java b/src/main/java/com/bbn/hadder/commands/nsfw/BoobsCommand.java index 90625b4..9ecb843 100644 --- a/src/main/java/com/bbn/hadder/commands/nsfw/BoobsCommand.java +++ b/src/main/java/com/bbn/hadder/commands/nsfw/BoobsCommand.java @@ -32,7 +32,7 @@ public class BoobsCommand implements Command { String url = response1.toString().replace("{\"url\":\"", ""); event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO) - .setAuthor("GIF not showing? Click here", url.replace("\"}", "")) + .setAuthor(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.nsfw.gif.error.title"), url.replace("\"}", "")) .setImage(url.replace("\"}", "")) .setFooter("Boobs") .build()).queue(); @@ -42,7 +42,7 @@ public class BoobsCommand implements Command { } } else { - event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.WARNING).setTitle("No NSFW").setDescription("You can only execute this command in NSFW channels!").build()).queue(); + event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.NO_NSFW).build()).queue(); } } @@ -53,7 +53,7 @@ public class BoobsCommand implements Command { @Override public String description() { - return "Shows a random boob gif."; + return MessageEditor.handle("en", "commands.nsfw.boobs.help.description"); } @Override diff --git a/src/main/java/com/bbn/hadder/commands/nsfw/CumCommand.java b/src/main/java/com/bbn/hadder/commands/nsfw/CumCommand.java index 1bfae5e..00f9ea4 100644 --- a/src/main/java/com/bbn/hadder/commands/nsfw/CumCommand.java +++ b/src/main/java/com/bbn/hadder/commands/nsfw/CumCommand.java @@ -32,7 +32,7 @@ public class CumCommand implements Command { String url = response1.toString().replace("{\"url\":\"", ""); event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO) - .setAuthor("GIF not showing? Click here", url.replace("\"}", "")) + .setAuthor(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.nsfw.gif.error.title"), url.replace("\"}", "")) .setImage(url.replace("\"}", "")) .setFooter("Cum") .build()).queue(); @@ -42,7 +42,7 @@ public class CumCommand implements Command { } } else { - event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.WARNING).setTitle("No NSFW").setDescription("You can only execute this command in NSFW channels!").build()).queue(); + event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.NO_NSFW).build()).queue(); } } @@ -53,7 +53,7 @@ public class CumCommand implements Command { @Override public String description() { - return "Shows a random cum gif."; + return MessageEditor.handle("en", "commands.nsfw.cum.help.description"); } @Override diff --git a/src/main/java/com/bbn/hadder/commands/nsfw/EroticCommand.java b/src/main/java/com/bbn/hadder/commands/nsfw/EroticCommand.java index 8247ac6..2f828ab 100644 --- a/src/main/java/com/bbn/hadder/commands/nsfw/EroticCommand.java +++ b/src/main/java/com/bbn/hadder/commands/nsfw/EroticCommand.java @@ -28,7 +28,7 @@ public class EroticCommand implements Command { String url = response.body().string().replace("{\"url\":\"", ""); event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO) - .setAuthor("Image not showing? Click here", url.replace("\"}", "")) + .setAuthor(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.nsfw.img.error.title"), url.replace("\"}", "")) .setImage(url.replace("\"}", "")) .setFooter("Erotic") .build()).queue(); @@ -38,7 +38,7 @@ public class EroticCommand implements Command { } } else { - event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.WARNING).setTitle("No NSFW").setDescription("You can only execute this command in NSFW channels!").build()).queue(); + event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.NO_NSFW).build()).queue(); } } @@ -49,7 +49,7 @@ public class EroticCommand implements Command { @Override public String description() { - return "Shows a random erotic picture."; + return MessageEditor.handle("en", "commands.nsfw.erotic.help.description"); } @Override diff --git a/src/main/java/com/bbn/hadder/commands/nsfw/FeetCommand.java b/src/main/java/com/bbn/hadder/commands/nsfw/FeetCommand.java index 8f99c18..b35d738 100644 --- a/src/main/java/com/bbn/hadder/commands/nsfw/FeetCommand.java +++ b/src/main/java/com/bbn/hadder/commands/nsfw/FeetCommand.java @@ -32,7 +32,7 @@ public class FeetCommand implements Command { String url = response1.toString().replace("{\"url\":\"", ""); event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO) - .setAuthor("GIF not showing? Click here", url.replace("\"}", "")) + .setAuthor(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.nsfw.gif.error.title"), url.replace("\"}", "")) .setImage(url.replace("\"}", "")) .setFooter("Feet") .build()).queue(); @@ -42,7 +42,7 @@ public class FeetCommand implements Command { } } else { - event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.WARNING).setTitle("No NSFW").setDescription("You can only execute this command in NSFW channels!").build()).queue(); + event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.NO_NSFW).build()).queue(); } } @@ -53,7 +53,7 @@ public class FeetCommand implements Command { @Override public String description() { - return "Shows a random feet gif."; + return MessageEditor.handle("en", "commands.nsfw.feet.help.description"); } @Override diff --git a/src/main/java/com/bbn/hadder/commands/nsfw/FingeringCommand.java b/src/main/java/com/bbn/hadder/commands/nsfw/FingeringCommand.java index 2e7f063..6bf3f5a 100644 --- a/src/main/java/com/bbn/hadder/commands/nsfw/FingeringCommand.java +++ b/src/main/java/com/bbn/hadder/commands/nsfw/FingeringCommand.java @@ -32,7 +32,7 @@ public class FingeringCommand implements Command { String url = response1.toString().replace("{\"url\":\"", ""); event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO) - .setAuthor("GIF not showing? Click here", url.replace("\"}", "")) + .setAuthor(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.nsfw.gif.error.title"), url.replace("\"}", "")) .setImage(url.replace("\"}", "")) .setFooter("Fingering") .build()).queue(); @@ -42,7 +42,7 @@ public class FingeringCommand implements Command { } } else { - event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.WARNING).setTitle("No NSFW").setDescription("You can only execute this command in NSFW channels!").build()).queue(); + event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.NO_NSFW).build()).queue(); } } @@ -53,7 +53,7 @@ public class FingeringCommand implements Command { @Override public String description() { - return "Shows a random fingering gif."; + return MessageEditor.handle("en", "commands.nsfw.fingering.help.description"); } @Override diff --git a/src/main/java/com/bbn/hadder/commands/nsfw/LickingCommand.java b/src/main/java/com/bbn/hadder/commands/nsfw/LickingCommand.java index 439af12..0ac7de6 100644 --- a/src/main/java/com/bbn/hadder/commands/nsfw/LickingCommand.java +++ b/src/main/java/com/bbn/hadder/commands/nsfw/LickingCommand.java @@ -32,7 +32,7 @@ public class LickingCommand implements Command { String url = response1.toString().replace("{\"url\":\"", ""); event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO) - .setAuthor("GIF not showing? Click here", url.replace("\"}", "")) + .setAuthor(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.nsfw.gif.error.title"), url.replace("\"}", "")) .setImage(url.replace("\"}", "")) .setFooter("Licking") .build()).queue(); @@ -42,7 +42,7 @@ public class LickingCommand implements Command { } } else { - event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.WARNING).setTitle("No NSFW").setDescription("You can only execute this command in NSFW channels!").build()).queue(); + event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.NO_NSFW).build()).queue(); } } @@ -53,7 +53,7 @@ public class LickingCommand implements Command { @Override public String description() { - return "Shows a random licking gif."; + return MessageEditor.handle("en", "commands.nsfw.linking.help.description"); } @Override diff --git a/src/main/java/com/bbn/hadder/commands/nsfw/PornCommand.java b/src/main/java/com/bbn/hadder/commands/nsfw/PornCommand.java index 53faacd..cb9ae94 100644 --- a/src/main/java/com/bbn/hadder/commands/nsfw/PornCommand.java +++ b/src/main/java/com/bbn/hadder/commands/nsfw/PornCommand.java @@ -32,7 +32,7 @@ public class PornCommand implements Command { String url = response1.toString().replace("{\"url\":\"", ""); event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO) - .setAuthor("GIF not showing? Click here", url.replace("\"}", "")) + .setAuthor(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.nsfw.gif.error.title"), url.replace("\"}", "")) .setImage(url.replace("\"}", "")) .setFooter("Porn") .build()).queue(); @@ -42,7 +42,7 @@ public class PornCommand implements Command { } } else { - event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.WARNING).setTitle("No NSFW").setDescription("You can only execute this command in NSFW channels!").build()).queue(); + event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.NO_NSFW).build()).queue(); } } @@ -53,7 +53,7 @@ public class PornCommand implements Command { @Override public String description() { - return "Shows a random porn gif."; + return MessageEditor.handle("en", "commands.nsfw.porn.help.description"); } @Override diff --git a/src/main/java/com/bbn/hadder/commands/nsfw/PussyCommand.java b/src/main/java/com/bbn/hadder/commands/nsfw/PussyCommand.java index 33f4638..9eefafb 100644 --- a/src/main/java/com/bbn/hadder/commands/nsfw/PussyCommand.java +++ b/src/main/java/com/bbn/hadder/commands/nsfw/PussyCommand.java @@ -28,7 +28,7 @@ public class PussyCommand implements Command { String url = response.body().string().replace("{\"url\":\"", ""); event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO) - .setAuthor("GIF not showing? Click here", url.replace("\"}", "")) + .setAuthor(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.nsfw.gif.error.title"), url.replace("\"}", "")) .setImage(url.replace("\"}", "")) .setFooter("Pussy") .build()).queue(); @@ -38,7 +38,7 @@ public class PussyCommand implements Command { } } else { - event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.WARNING).setTitle("No NSFW").setDescription("You can only execute this command in NSFW channels!").build()).queue(); + event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.NO_NSFW).build()).queue(); } } @@ -49,7 +49,7 @@ public class PussyCommand implements Command { @Override public String description() { - return "Shows a random pussy gif."; + return MessageEditor.handle("en", "commands.nsfw.pussy.help.description"); } @Override diff --git a/src/main/java/com/bbn/hadder/commands/nsfw/RandomPornCommand.java b/src/main/java/com/bbn/hadder/commands/nsfw/RandomPornCommand.java index 2cad8d7..0bbcccc 100644 --- a/src/main/java/com/bbn/hadder/commands/nsfw/RandomPornCommand.java +++ b/src/main/java/com/bbn/hadder/commands/nsfw/RandomPornCommand.java @@ -32,7 +32,7 @@ public class RandomPornCommand implements Command { String url = response1.toString().replace("{\"url\":\"", ""); event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO) - .setAuthor("GIF not showing? Click here", url.replace("\"}", "")) + .setAuthor(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.nsfw.gif.error.title"), url.replace("\"}", "")) .setImage(url.replace("\"}", "")) .setFooter("Random Porn") .build()).queue(); @@ -42,7 +42,7 @@ public class RandomPornCommand implements Command { } } else { - event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.WARNING).setTitle("No NSFW").setDescription("You can only execute this command in NSFW channels!").build()).queue(); + event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.NO_NSFW).build()).queue(); } } @@ -53,7 +53,7 @@ public class RandomPornCommand implements Command { @Override public String description() { - return "Shows a completely random porn gif."; + return MessageEditor.handle("en", "commands.nsfw.randomporn.help.description"); } @Override diff --git a/src/main/java/com/bbn/hadder/commands/nsfw/SoloCommand.java b/src/main/java/com/bbn/hadder/commands/nsfw/SoloCommand.java index acc1b24..7641a83 100644 --- a/src/main/java/com/bbn/hadder/commands/nsfw/SoloCommand.java +++ b/src/main/java/com/bbn/hadder/commands/nsfw/SoloCommand.java @@ -32,7 +32,7 @@ public class SoloCommand implements Command { String url = response1.toString().replace("{\"url\":\"", ""); event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO) - .setAuthor("GIF not showing? Click here", url.replace("\"}", "")) + .setAuthor(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.nsfw.gif.error.title"), url.replace("\"}", "")) .setImage(url.replace("\"}", "")) .setFooter("Solo") .build()).queue(); @@ -42,7 +42,7 @@ public class SoloCommand implements Command { } } else { - event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.WARNING).setTitle("No NSFW").setDescription("You can only execute this command in NSFW channels!").build()).queue(); + event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.NO_NSFW).build()).queue(); } } @@ -53,7 +53,7 @@ public class SoloCommand implements Command { @Override public String description() { - return "Shows a random solo gif."; + return MessageEditor.handle("en", "commands.nsfw.solo.help.description"); } @Override diff --git a/src/main/java/com/bbn/hadder/commands/nsfw/SpankCommand.java b/src/main/java/com/bbn/hadder/commands/nsfw/SpankCommand.java index a9362eb..e70a021 100644 --- a/src/main/java/com/bbn/hadder/commands/nsfw/SpankCommand.java +++ b/src/main/java/com/bbn/hadder/commands/nsfw/SpankCommand.java @@ -32,7 +32,7 @@ public class SpankCommand implements Command { String url = response1.toString().replace("{\"url\":\"", ""); event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO) - .setAuthor("GIF not showing? Click here", url.replace("\"}", "")) + .setAuthor(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.nsfw.gif.error.title"), url.replace("\"}", "")) .setImage(url.replace("\"}", "")) .setFooter("Spank") .build()).queue(); @@ -42,7 +42,7 @@ public class SpankCommand implements Command { } } else { - event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.WARNING).setTitle("No NSFW").setDescription("You can only execute this command in NSFW channels!").build()).queue(); + event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.NO_NSFW).build()).queue(); } } @@ -53,7 +53,7 @@ public class SpankCommand implements Command { @Override public String description() { - return "Shows a random spank gif."; + return MessageEditor.handle("en", "commands.nsfw.spank.help.description"); } @Override diff --git a/src/main/java/com/bbn/hadder/commands/nsfw/TransCommand.java b/src/main/java/com/bbn/hadder/commands/nsfw/TransCommand.java index 9c2b316..ac2cba3 100644 --- a/src/main/java/com/bbn/hadder/commands/nsfw/TransCommand.java +++ b/src/main/java/com/bbn/hadder/commands/nsfw/TransCommand.java @@ -28,7 +28,7 @@ public class TransCommand implements Command { String url = response.body().string().replace("{\"url\":\"", ""); event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO) - .setAuthor("Image not showing? Click here", url.replace("\"}", "")) + .setAuthor(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.nsfw.img.error.title"), url.replace("\"}", "")) .setImage(url.replace("\"}", "")) .setFooter("Trans") .build()).queue(); @@ -38,7 +38,7 @@ public class TransCommand implements Command { } } else { - event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.WARNING).setTitle("No NSFW").setDescription("You can only execute this command in NSFW channels!").build()).queue(); + event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.NO_NSFW).build()).queue(); } } @@ -49,7 +49,7 @@ public class TransCommand implements Command { @Override public String description() { - return "Shows a random trans picture."; + return MessageEditor.handle("en", "commands.nsfw.trans.help.description"); } @Override -- 2.45.3 From ff67f45b4c62636aa6c47ec751010ccb33cb57c2 Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Thu, 12 Dec 2019 20:53:16 +0100 Subject: [PATCH 20/35] Merge @someone into MentionListener --- src/main/java/com/bbn/hadder/Hadder.java | 3 +-- .../bbn/hadder/listener/MentionListener.java | 6 +++++ .../bbn/hadder/listener/SomeoneListener.java | 24 ------------------- 3 files changed, 7 insertions(+), 26 deletions(-) delete mode 100644 src/main/java/com/bbn/hadder/listener/SomeoneListener.java diff --git a/src/main/java/com/bbn/hadder/Hadder.java b/src/main/java/com/bbn/hadder/Hadder.java index 45506be..b4f0ad9 100644 --- a/src/main/java/com/bbn/hadder/Hadder.java +++ b/src/main/java/com/bbn/hadder/Hadder.java @@ -98,8 +98,7 @@ public class Hadder { new ReadyListener(rethink, config), // new LinkListener(rethink), new InviteLinkListener(rethink), - new RulesListener(rethink), - new SomeoneListener()); + new RulesListener(rethink)); try { shardManager = builder.build(); diff --git a/src/main/java/com/bbn/hadder/listener/MentionListener.java b/src/main/java/com/bbn/hadder/listener/MentionListener.java index 3d46a3d..f5089e0 100644 --- a/src/main/java/com/bbn/hadder/listener/MentionListener.java +++ b/src/main/java/com/bbn/hadder/listener/MentionListener.java @@ -7,6 +7,7 @@ import net.dv8tion.jda.api.events.message.MessageReceivedEvent; import net.dv8tion.jda.api.hooks.ListenerAdapter; import javax.annotation.Nonnull; +import java.util.Random; public class MentionListener extends ListenerAdapter { @@ -27,6 +28,11 @@ public class MentionListener extends ListenerAdapter { .addField("Prefix (User)", rethink.getUserPrefix(event.getAuthor().getId()), false) .addField("Prefix (Guild)", rethink.getGuildPrefix(event.getGuild().getId()), false) .build()).queue(); + } else if (event.getMessage().getContentRaw().equalsIgnoreCase("@someone")) { + int member = new Random().nextInt(event.getGuild().getMembers().size()-1); + if (member>0&&member0&&member Date: Thu, 12 Dec 2019 20:55:22 +0100 Subject: [PATCH 21/35] New translations Translations_en.properties (German) New German translation --- .../Translations/Translations_de.properties | 30 +++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/src/main/resources/Translations/Translations_de.properties b/src/main/resources/Translations/Translations_de.properties index cef1145..d4591fd 100644 --- a/src/main/resources/Translations/Translations_de.properties +++ b/src/main/resources/Translations/Translations_de.properties @@ -160,3 +160,33 @@ commands.moderation.rules.help.description = Setup the rules on your Discord ser commands.music.join.success.title = Successfully connected commands.music.join.success.description = I successfully connected to %extra%. +commands.music.join.error.connecting.already.title = Already connected +commands.music.join.error.connecting.already.description = I am already connected to your voice channel. +commands.music.join.error.connecting.trying.title = Already trying to connect +commands.music.join.error.connecting.trying.description = Hadder is already trying to connect. Please wait a moment. +commands.music.join.error.channel.title = No Voice Channel +commands.music.join.error.channel.description = You aren't in a Voice Channel. +commands.music.join.help.description = Joins your voice channel +commands.music.leave.success.title = \= Successfully disconnected +commands.music.leave.success.description = I successfully disconnected from the Voice Channel +commands.music.leave.error.tile = Not connected +commands.music.leave.error.description = I'm currently in no Voice Channel on this Guild +commands.music.leave.help.description = Leaves a voice channel + +commands.nsfw.gif.error.title = GIF not showing? Click here +commands.nsfw.img.error.title = Image not showing? Click here +commands.nsfw.anal.help.description = Shows a random anal gif. +commands.nsfw.bdsm.help.description = Shows a random BDSM picture. +commands.nsfw.blowjob.help.description = Shows a random Blowjob picture. +commands.nsfw.boobs.help.description = Shows a random boob gif. +commands.nsfw.cum.help.description = Shows a random cum gif. +commands.nsfw.erotic.help.description = Shows a random erotic picture. +commands.nsfw.feet.help.description = Shows a random feet gif. +commands.nsfw.fingering.help.description = Shows a random fingering gif. +commands.nsfw.linking.help.description = Shows a random licking gif. +commands.nsfw.porn.help.description = Shows a random porn gif. +commands.nsfw.pussy.help.description = Shows a random pussy gif. +commands.nsfw.randomporn.help.description = Shows a completely random porn gif. +commands.nsfw.solo.help.description = Shows a random solo gif. +commands.nsfw.spank.help.description = Shows a random spank gif. +commands.nsfw.trans.help.description = Shows a random trans picture. -- 2.45.3 From 7c27defa4f7c93b7d0e9409da97d229adb61333f Mon Sep 17 00:00:00 2001 From: Skidder Date: Thu, 12 Dec 2019 20:55:24 +0100 Subject: [PATCH 22/35] New translations Translations_en.properties (English) New English translation --- .../Translations/Translations_en.properties | 30 +++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/src/main/resources/Translations/Translations_en.properties b/src/main/resources/Translations/Translations_en.properties index d446f98..6bd35a2 100644 --- a/src/main/resources/Translations/Translations_en.properties +++ b/src/main/resources/Translations/Translations_en.properties @@ -160,3 +160,33 @@ commands.moderation.rules.help.description = Setup the rules on your Discord ser commands.music.join.success.title = Successfully connected commands.music.join.success.description = I successfully connected to %extra%. +commands.music.join.error.connecting.already.title = Already connected +commands.music.join.error.connecting.already.description = I am already connected to your voice channel. +commands.music.join.error.connecting.trying.title = Already trying to connect +commands.music.join.error.connecting.trying.description = Hadder is already trying to connect. Please wait a moment. +commands.music.join.error.channel.title = No Voice Channel +commands.music.join.error.channel.description = You aren't in a Voice Channel. +commands.music.join.help.description = Joins your voice channel +commands.music.leave.success.title = \= Successfully disconnected +commands.music.leave.success.description = I successfully disconnected from the Voice Channel +commands.music.leave.error.tile = Not connected +commands.music.leave.error.description = I'm currently in no Voice Channel on this Guild +commands.music.leave.help.description = Leaves a voice channel + +commands.nsfw.gif.error.title = GIF not showing? Click here +commands.nsfw.img.error.title = Image not showing? Click here +commands.nsfw.anal.help.description = Shows a random anal gif. +commands.nsfw.bdsm.help.description = Shows a random BDSM picture. +commands.nsfw.blowjob.help.description = Shows a random Blowjob picture. +commands.nsfw.boobs.help.description = Shows a random boob gif. +commands.nsfw.cum.help.description = Shows a random cum gif. +commands.nsfw.erotic.help.description = Shows a random erotic picture. +commands.nsfw.feet.help.description = Shows a random feet gif. +commands.nsfw.fingering.help.description = Shows a random fingering gif. +commands.nsfw.linking.help.description = Shows a random licking gif. +commands.nsfw.porn.help.description = Shows a random porn gif. +commands.nsfw.pussy.help.description = Shows a random pussy gif. +commands.nsfw.randomporn.help.description = Shows a completely random porn gif. +commands.nsfw.solo.help.description = Shows a random solo gif. +commands.nsfw.spank.help.description = Shows a random spank gif. +commands.nsfw.trans.help.description = Shows a random trans picture. -- 2.45.3 From f59d80a19a8faa87266a33a4be14a48c3c628bfa Mon Sep 17 00:00:00 2001 From: Skidder Date: Thu, 12 Dec 2019 20:55:25 +0100 Subject: [PATCH 23/35] New translations Translations_en.properties (Spanish) New Spanish translation --- .../Translations/Translations_es.properties | 30 +++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/src/main/resources/Translations/Translations_es.properties b/src/main/resources/Translations/Translations_es.properties index d446f98..6bd35a2 100644 --- a/src/main/resources/Translations/Translations_es.properties +++ b/src/main/resources/Translations/Translations_es.properties @@ -160,3 +160,33 @@ commands.moderation.rules.help.description = Setup the rules on your Discord ser commands.music.join.success.title = Successfully connected commands.music.join.success.description = I successfully connected to %extra%. +commands.music.join.error.connecting.already.title = Already connected +commands.music.join.error.connecting.already.description = I am already connected to your voice channel. +commands.music.join.error.connecting.trying.title = Already trying to connect +commands.music.join.error.connecting.trying.description = Hadder is already trying to connect. Please wait a moment. +commands.music.join.error.channel.title = No Voice Channel +commands.music.join.error.channel.description = You aren't in a Voice Channel. +commands.music.join.help.description = Joins your voice channel +commands.music.leave.success.title = \= Successfully disconnected +commands.music.leave.success.description = I successfully disconnected from the Voice Channel +commands.music.leave.error.tile = Not connected +commands.music.leave.error.description = I'm currently in no Voice Channel on this Guild +commands.music.leave.help.description = Leaves a voice channel + +commands.nsfw.gif.error.title = GIF not showing? Click here +commands.nsfw.img.error.title = Image not showing? Click here +commands.nsfw.anal.help.description = Shows a random anal gif. +commands.nsfw.bdsm.help.description = Shows a random BDSM picture. +commands.nsfw.blowjob.help.description = Shows a random Blowjob picture. +commands.nsfw.boobs.help.description = Shows a random boob gif. +commands.nsfw.cum.help.description = Shows a random cum gif. +commands.nsfw.erotic.help.description = Shows a random erotic picture. +commands.nsfw.feet.help.description = Shows a random feet gif. +commands.nsfw.fingering.help.description = Shows a random fingering gif. +commands.nsfw.linking.help.description = Shows a random licking gif. +commands.nsfw.porn.help.description = Shows a random porn gif. +commands.nsfw.pussy.help.description = Shows a random pussy gif. +commands.nsfw.randomporn.help.description = Shows a completely random porn gif. +commands.nsfw.solo.help.description = Shows a random solo gif. +commands.nsfw.spank.help.description = Shows a random spank gif. +commands.nsfw.trans.help.description = Shows a random trans picture. -- 2.45.3 From b00d622e7b487573448b4fa98c0e3fe7668d8861 Mon Sep 17 00:00:00 2001 From: Skidder Date: Thu, 12 Dec 2019 20:55:27 +0100 Subject: [PATCH 24/35] New translations Translations_en.properties (French) New French translation --- .../Translations/Translations_fr.properties | 30 +++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/src/main/resources/Translations/Translations_fr.properties b/src/main/resources/Translations/Translations_fr.properties index d446f98..6bd35a2 100644 --- a/src/main/resources/Translations/Translations_fr.properties +++ b/src/main/resources/Translations/Translations_fr.properties @@ -160,3 +160,33 @@ commands.moderation.rules.help.description = Setup the rules on your Discord ser commands.music.join.success.title = Successfully connected commands.music.join.success.description = I successfully connected to %extra%. +commands.music.join.error.connecting.already.title = Already connected +commands.music.join.error.connecting.already.description = I am already connected to your voice channel. +commands.music.join.error.connecting.trying.title = Already trying to connect +commands.music.join.error.connecting.trying.description = Hadder is already trying to connect. Please wait a moment. +commands.music.join.error.channel.title = No Voice Channel +commands.music.join.error.channel.description = You aren't in a Voice Channel. +commands.music.join.help.description = Joins your voice channel +commands.music.leave.success.title = \= Successfully disconnected +commands.music.leave.success.description = I successfully disconnected from the Voice Channel +commands.music.leave.error.tile = Not connected +commands.music.leave.error.description = I'm currently in no Voice Channel on this Guild +commands.music.leave.help.description = Leaves a voice channel + +commands.nsfw.gif.error.title = GIF not showing? Click here +commands.nsfw.img.error.title = Image not showing? Click here +commands.nsfw.anal.help.description = Shows a random anal gif. +commands.nsfw.bdsm.help.description = Shows a random BDSM picture. +commands.nsfw.blowjob.help.description = Shows a random Blowjob picture. +commands.nsfw.boobs.help.description = Shows a random boob gif. +commands.nsfw.cum.help.description = Shows a random cum gif. +commands.nsfw.erotic.help.description = Shows a random erotic picture. +commands.nsfw.feet.help.description = Shows a random feet gif. +commands.nsfw.fingering.help.description = Shows a random fingering gif. +commands.nsfw.linking.help.description = Shows a random licking gif. +commands.nsfw.porn.help.description = Shows a random porn gif. +commands.nsfw.pussy.help.description = Shows a random pussy gif. +commands.nsfw.randomporn.help.description = Shows a completely random porn gif. +commands.nsfw.solo.help.description = Shows a random solo gif. +commands.nsfw.spank.help.description = Shows a random spank gif. +commands.nsfw.trans.help.description = Shows a random trans picture. -- 2.45.3 From c00faa2f55cf9e223910a758ade4ad111fb184a4 Mon Sep 17 00:00:00 2001 From: Skidder Date: Thu, 12 Dec 2019 20:55:28 +0100 Subject: [PATCH 25/35] New translations Translations_en.properties (Russian) New Russian translation --- .../Translations/Translations_ru.properties | 30 +++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/src/main/resources/Translations/Translations_ru.properties b/src/main/resources/Translations/Translations_ru.properties index d446f98..6bd35a2 100644 --- a/src/main/resources/Translations/Translations_ru.properties +++ b/src/main/resources/Translations/Translations_ru.properties @@ -160,3 +160,33 @@ commands.moderation.rules.help.description = Setup the rules on your Discord ser commands.music.join.success.title = Successfully connected commands.music.join.success.description = I successfully connected to %extra%. +commands.music.join.error.connecting.already.title = Already connected +commands.music.join.error.connecting.already.description = I am already connected to your voice channel. +commands.music.join.error.connecting.trying.title = Already trying to connect +commands.music.join.error.connecting.trying.description = Hadder is already trying to connect. Please wait a moment. +commands.music.join.error.channel.title = No Voice Channel +commands.music.join.error.channel.description = You aren't in a Voice Channel. +commands.music.join.help.description = Joins your voice channel +commands.music.leave.success.title = \= Successfully disconnected +commands.music.leave.success.description = I successfully disconnected from the Voice Channel +commands.music.leave.error.tile = Not connected +commands.music.leave.error.description = I'm currently in no Voice Channel on this Guild +commands.music.leave.help.description = Leaves a voice channel + +commands.nsfw.gif.error.title = GIF not showing? Click here +commands.nsfw.img.error.title = Image not showing? Click here +commands.nsfw.anal.help.description = Shows a random anal gif. +commands.nsfw.bdsm.help.description = Shows a random BDSM picture. +commands.nsfw.blowjob.help.description = Shows a random Blowjob picture. +commands.nsfw.boobs.help.description = Shows a random boob gif. +commands.nsfw.cum.help.description = Shows a random cum gif. +commands.nsfw.erotic.help.description = Shows a random erotic picture. +commands.nsfw.feet.help.description = Shows a random feet gif. +commands.nsfw.fingering.help.description = Shows a random fingering gif. +commands.nsfw.linking.help.description = Shows a random licking gif. +commands.nsfw.porn.help.description = Shows a random porn gif. +commands.nsfw.pussy.help.description = Shows a random pussy gif. +commands.nsfw.randomporn.help.description = Shows a completely random porn gif. +commands.nsfw.solo.help.description = Shows a random solo gif. +commands.nsfw.spank.help.description = Shows a random spank gif. +commands.nsfw.trans.help.description = Shows a random trans picture. -- 2.45.3 From 2d427c0bdf0b227a039b570a544e4aa60d740b3f Mon Sep 17 00:00:00 2001 From: Skidder Date: Thu, 12 Dec 2019 20:55:29 +0100 Subject: [PATCH 26/35] New translations Translations_en.properties (Turkish) New Turkish translation --- .../Translations/Translations_tr.properties | 30 +++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/src/main/resources/Translations/Translations_tr.properties b/src/main/resources/Translations/Translations_tr.properties index d446f98..6bd35a2 100644 --- a/src/main/resources/Translations/Translations_tr.properties +++ b/src/main/resources/Translations/Translations_tr.properties @@ -160,3 +160,33 @@ commands.moderation.rules.help.description = Setup the rules on your Discord ser commands.music.join.success.title = Successfully connected commands.music.join.success.description = I successfully connected to %extra%. +commands.music.join.error.connecting.already.title = Already connected +commands.music.join.error.connecting.already.description = I am already connected to your voice channel. +commands.music.join.error.connecting.trying.title = Already trying to connect +commands.music.join.error.connecting.trying.description = Hadder is already trying to connect. Please wait a moment. +commands.music.join.error.channel.title = No Voice Channel +commands.music.join.error.channel.description = You aren't in a Voice Channel. +commands.music.join.help.description = Joins your voice channel +commands.music.leave.success.title = \= Successfully disconnected +commands.music.leave.success.description = I successfully disconnected from the Voice Channel +commands.music.leave.error.tile = Not connected +commands.music.leave.error.description = I'm currently in no Voice Channel on this Guild +commands.music.leave.help.description = Leaves a voice channel + +commands.nsfw.gif.error.title = GIF not showing? Click here +commands.nsfw.img.error.title = Image not showing? Click here +commands.nsfw.anal.help.description = Shows a random anal gif. +commands.nsfw.bdsm.help.description = Shows a random BDSM picture. +commands.nsfw.blowjob.help.description = Shows a random Blowjob picture. +commands.nsfw.boobs.help.description = Shows a random boob gif. +commands.nsfw.cum.help.description = Shows a random cum gif. +commands.nsfw.erotic.help.description = Shows a random erotic picture. +commands.nsfw.feet.help.description = Shows a random feet gif. +commands.nsfw.fingering.help.description = Shows a random fingering gif. +commands.nsfw.linking.help.description = Shows a random licking gif. +commands.nsfw.porn.help.description = Shows a random porn gif. +commands.nsfw.pussy.help.description = Shows a random pussy gif. +commands.nsfw.randomporn.help.description = Shows a completely random porn gif. +commands.nsfw.solo.help.description = Shows a random solo gif. +commands.nsfw.spank.help.description = Shows a random spank gif. +commands.nsfw.trans.help.description = Shows a random trans picture. -- 2.45.3 From bb8f4350915c3d36b16819a35402d4150eda099f Mon Sep 17 00:00:00 2001 From: Skidder Date: Thu, 12 Dec 2019 20:55:31 +0100 Subject: [PATCH 27/35] New translations Translations_en.properties (Chinese Simplified) New Chinese Simplified translation --- .../Translations/Translations_zh.properties | 30 +++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/src/main/resources/Translations/Translations_zh.properties b/src/main/resources/Translations/Translations_zh.properties index d446f98..6bd35a2 100644 --- a/src/main/resources/Translations/Translations_zh.properties +++ b/src/main/resources/Translations/Translations_zh.properties @@ -160,3 +160,33 @@ commands.moderation.rules.help.description = Setup the rules on your Discord ser commands.music.join.success.title = Successfully connected commands.music.join.success.description = I successfully connected to %extra%. +commands.music.join.error.connecting.already.title = Already connected +commands.music.join.error.connecting.already.description = I am already connected to your voice channel. +commands.music.join.error.connecting.trying.title = Already trying to connect +commands.music.join.error.connecting.trying.description = Hadder is already trying to connect. Please wait a moment. +commands.music.join.error.channel.title = No Voice Channel +commands.music.join.error.channel.description = You aren't in a Voice Channel. +commands.music.join.help.description = Joins your voice channel +commands.music.leave.success.title = \= Successfully disconnected +commands.music.leave.success.description = I successfully disconnected from the Voice Channel +commands.music.leave.error.tile = Not connected +commands.music.leave.error.description = I'm currently in no Voice Channel on this Guild +commands.music.leave.help.description = Leaves a voice channel + +commands.nsfw.gif.error.title = GIF not showing? Click here +commands.nsfw.img.error.title = Image not showing? Click here +commands.nsfw.anal.help.description = Shows a random anal gif. +commands.nsfw.bdsm.help.description = Shows a random BDSM picture. +commands.nsfw.blowjob.help.description = Shows a random Blowjob picture. +commands.nsfw.boobs.help.description = Shows a random boob gif. +commands.nsfw.cum.help.description = Shows a random cum gif. +commands.nsfw.erotic.help.description = Shows a random erotic picture. +commands.nsfw.feet.help.description = Shows a random feet gif. +commands.nsfw.fingering.help.description = Shows a random fingering gif. +commands.nsfw.linking.help.description = Shows a random licking gif. +commands.nsfw.porn.help.description = Shows a random porn gif. +commands.nsfw.pussy.help.description = Shows a random pussy gif. +commands.nsfw.randomporn.help.description = Shows a completely random porn gif. +commands.nsfw.solo.help.description = Shows a random solo gif. +commands.nsfw.spank.help.description = Shows a random spank gif. +commands.nsfw.trans.help.description = Shows a random trans picture. -- 2.45.3 From 49864cece8e2ebf9e64225bdf37b6edea352f4d7 Mon Sep 17 00:00:00 2001 From: Skidder Date: Thu, 12 Dec 2019 21:27:43 +0100 Subject: [PATCH 28/35] Revert "Translation" --- .../Translations/Translations_de.properties | 291 +++++++----------- .../Translations/Translations_en.properties | 42 +-- .../Translations/Translations_es.properties | 291 +++++++----------- .../Translations/Translations_fr.properties | 291 +++++++----------- .../Translations/Translations_ru.properties | 291 +++++++----------- .../Translations/Translations_tr.properties | 291 +++++++----------- .../Translations/Translations_zh.properties | 291 +++++++----------- 7 files changed, 675 insertions(+), 1113 deletions(-) diff --git a/src/main/resources/Translations/Translations_de.properties b/src/main/resources/Translations/Translations_de.properties index d4591fd..b7fd562 100644 --- a/src/main/resources/Translations/Translations_de.properties +++ b/src/main/resources/Translations/Translations_de.properties @@ -2,191 +2,118 @@ # @author Skidder / GregTCLTK # -# -# @author Skidder / GregTCLTK -# +Hadder=Hadder -Hadder = Hadderino +user/id= <@User>/ +searchterm= +username= +number= +guildprefix= +<@User>=<@User> +on/off= +vc-name/id= +user+nickname=<@user> -searchterm = -username = -number = -guildprefix = -vc-name/id = -user+nickname = <@user> -region = +error=Error +none=None +success\!=Success\! -error = Error -none = None -success\! = Success\! +commands.fun.avatar.success.title=Avatar of +commands.fun.avatar.help.description=Sends the avatar of the specified member. +commands.fun.gif.error.description=Please try again with another term. +commands.fun.gif.help.description=Look for a GIF on Giphy +commands.fun.meme.success.title=Your random meme +commands.fun.meme.api.error=The request to the meme API could not be processed. Please try it again later. +commands.fun.meme.help.description=Sends you a random meme. -commands.fun.avatar.success.title = Avatar of %extra% -commands.fun.avatar.help.description = Sends the avatar of the specified member. -commands.fun.gif.error.description = Please try again with another term. -commands.fun.gif.help.description = Look for a GIF on Giphy -commands.fun.meme.success.title = Your random meme -commands.fun.meme.api.error = The request to the meme API could not be processed. Please try it again later. -commands.fun.meme.help.description = Sends you a random meme. +commands.general.about.success.title=Hadder - About +commands.general.about.success.description=Hadder is an open source Discord bot. +commands.general.about.success.field.one.title=Support the Developers +commands.general.about.success.field.one.description=Hadder is completely free for everyone. We would appreciate it you donate some money [here] +commands.general.about.help.description=Shows infos about Hadder +commands.general.equals.string.first.request=Please send me the first String +commands.general.equals.string.second.request=Please send me the second String +commands.general.equals.string.equals.true=Yes\! The first string equals the second string\! +commands.general.equals.string.equals.false=Well yes but actually No. This isn't the same. +commands.general.equals.string.first=First String +commands.general.equals.string.second=Second String +commands.general.equals.string.result=Result +commands.general.equals.help.description=Check if two strings are the same +commands.general.help.error.description=I need the Embed Links Permission to send the Help Menu\! +commands.general.help.help.description=Shows each command or explains its usage +commands.general.help.help.label=[CommandName] +commands.general.invite.success.title=Invite me\! +commands.general.invite.success.description=[Invite me here\!] +commands.general.invite.help.description=Shows the invitation to invite Hadder to your server +commands.general.ping.help.description=Shows the ping to the Discord API -commands.general.about.success.title = Hadder - About -commands.general.about.success.description = Hadder is an open source Discord bot. -commands.general.about.success.field.one.title = Support the Developers -commands.general.about.success.field.one.description = Hadder is completely free for everyone. We would appreciate it you donate some money [here]%extra% -commands.general.about.help.description = Shows infos about Hadder -commands.general.equals.string.first.request = Please send me the first String -commands.general.equals.string.second.request = Please send me the second String -commands.general.equals.string.equals.true = Yes\! The first string equals the second string\! -commands.general.equals.string.equals.false = Well yes but actually No. This isn't the same. -commands.general.equals.string.first = First String -commands.general.equals.string.second = Second String -commands.general.equals.string.result = Result -commands.general.equals.help.description = Check if two strings are the same -commands.general.help.field.usage = Usage -commands.general.help.error.description = I need the Embed Links Permission to send the Help Menu\! -commands.general.help.help.description = Shows each command or explains its usage -commands.general.help.help.label = [CommandName] -commands.general.invite.success.title = Invite me\! -commands.general.invite.success.description = [Invite me here\!]%extra% -commands.general.invite.help.description = Shows the invitation to invite Hadder to your server -commands.general.ping.help.description = Shows the ping to the Discord API +commands.misc.feedback.title.request.title=Feedback Topic +commands.misc.feedback.title.request.description=Please send me the feedback topic. +commands.misc.feedback.description.request.title=Feedback Description +commands.misc.feedback.description.request.description=Please send me the feedback description now. +commands.misc.feedback.help.description=Sends feedback directly to the developers. +commands.misc.github.link.title=Link your GitHub Account +commands.misc.github.success.title=Information about +commands.misc.github.success.bio=User bio +commands.misc.github.success.location=Location +commands.misc.github.success.website=Website +commands.misc.github.success.repositories=Public repositories +commands.misc.github.success.gists=Public gists +commands.misc.github.success.followers=Followers +commands.misc.github.success.following=Following +commands.misc.github.api.error.description=The GitHub API might be down at the moment\! +commands.misc.github.user.error.description=This user does not exist\! +commands.misc.github.connect.title=Connect you GH account +commands.misc.github.connect.description=Please connect your GitHub account here +commands.misc.github.help.description=Displays information about a GitHub user profile. +commands.misc.screenshare.success.title=Here's your Url to share your Screen +commands.misc.screenshare.id.error.title=Wait that's illegal +commands.misc.screenshare.id.error.description=This ID is invalid. \nMaybe you entered a wrong ID? \n\nNote\: Make sure the Voice Channel is on this Guild. +commands.misc.screenshare.channel.error.title=Please Choose a Voice Channel +commands.misc.screenshare.channel.error.description=There is more than one channel with this name +commands.misc.screenshare.number.error.title=You specified a wrong number\! +commands.misc.screenshare.number.error.description=This isn't a Number. +commands.misc.screenshare.channel.existing.error=Hol' up +commands.misc.screenshare.channel.existing.description=There is no Voice Channel named like this. \n\nNote\: Make sure the Voice Channel is on this Guild. +commands.misc.screenshare.help.description=Shows you the link to share your screen. -commands.misc.feedback.title.request.title = Feedback Topic -commands.misc.feedback.title.request.description = Please send me the feedback topic. -commands.misc.feedback.description.request.title = Feedback Description -commands.misc.feedback.description.request.description = Please send me the feedback description now. -commands.misc.feedback.help.description = Sends feedback directly to the developers. -commands.misc.feedback.success.title = Feedback successfully sent -commands.misc.github.link.title = Link your GitHub Account -commands.misc.github.success.title = Information about %extra% -commands.misc.github.success.bio = User bio -commands.misc.github.success.location = Location -commands.misc.github.success.website = Website -commands.misc.github.success.repositories = Public repositories -commands.misc.github.success.gists = Public gists -commands.misc.github.success.followers = Followers -commands.misc.github.success.following = Following -commands.misc.github.api.error.description = The GitHub API might be down at the moment\! -commands.misc.github.user.error.description = This user does not exist\! -commands.misc.github.connect.title = Connect you GH account -commands.misc.github.connect.description = [Please connect your GitHub account here]%extra% -commands.misc.github.help.description = Displays information about a GitHub user profile. -commands.misc.screenshare.success.title = Here's your Url to share your Screen -commands.misc.screenshare.id.error.title = Wait that's illegal -commands.misc.screenshare.id.error.description = This ID is invalid. \nMaybe you entered a wrong ID? \n\nNote\: Make sure the Voice Channel is on this Guild. -commands.misc.screenshare.channel.error.title = Please Choose a Voice Channel -commands.misc.screenshare.channel.error.description = There is more than one channel with this name -commands.misc.screenshare.number.error.title = You specified a wrong number\! -commands.misc.screenshare.number.error.description = This isn't a Number. -commands.misc.screenshare.channel.existing.error = Hol' up -commands.misc.screenshare.channel.existing.description = There is no Voice Channel named like this. \n\nNote\: Make sure the Voice Channel is on this Guild. -commands.misc.screenshare.help.description = Shows you the link to share your screen. - -commands.moderation.ban.success.title = %extra% Successfully banned %extra% -commands.moderation.ban.success.description = I successfully baned %extra% -commands.moderation.ban.error.title = Not possible -commands.moderation.ban.myself.error.description = I can not ban myself\! -commands.moderation.ban.yourself.error.description = You can not ban yourself\! -commands.moderation.ban.massban.success.description = I successfully baned %extra% Members\! -commands.moderation.ban.help.description = Bans one ore more user from the server -commands.moderation.clear.number.error.description = You have to choose a number between 1 and 99\! -commands.moderation.clear.success.description = Successfully deleted %extra% messages. -commands.moderation.clear.help.description = Deletes the specified number of messages. -commands.moderation.prefix.success.title = %extra% Successfully set %extra% -commands.moderation.prefix.success.description = I successfully set the new prefix for the guild to %extra% -commands.moderation.prefix.error.description = The prefix must not contain **"** -commands.moderation.prefix.help.description = Sets the Guild-Prefix. -commands.moderation.invitedetect.activate.success.title = Successfully activated -commands.moderation.invitedetect.activate.success.description = I successfully activated the invite link detection for this guild. -commands.moderation.invitedetect.activate.error.title = Already activated -commands.moderation.invitedetect.activate.error.description = The invite link detection is already activated on this guild. -commands.moderation.invitedetect.deactivate.success.title = Successfully deactivated -commands.moderation.invitedetect.deactivate.success.description = I successfully deactivated the invite link detection for this guild. -commands.moderation.invitedetect.deactivate.error.title = Already deactivated -commands.moderation.invitedetect.deactivate.error.description = The invite link detection is already deactivated on this guild. -commands.moderation.invitedetect.help.description = Activate or deactivate the Discord invite link detection. -commands.moderation.kick.success.title = %extra% Successfully kicked %extra% -commands.moderation.kick.success.description = I successfully kicked %extra%. -commands.moderation.kick.error.title = Not possible -commands.moderation.kick.myself.error.description = I can not kick myself\! -commands.moderation.kick.yourself.error.description = You can't kick yourself. -commands.moderation.kick.mass.success.description = I successfully kicked 69 Members\! -commands.moderation.kick.help.description = Kicks one or more user from the server. -commands.moderation.kick.masskick.success.description = I successfully kicked %extra% members. -commands.moderation.link.request.success.description = If i'm on this guild i sent a message to accept the link. -commands.moderation.link.error.title = Wait that's illegal. -commands.moderation.link.request.error.description = You specified the same guild as the guild on which you're reading this -commands.moderation.link.request.accept.title = ) wants to link guilds\! -commands.moderation.link.request.accept.description = React with the reactions to accept or decline it -commands.moderation.link.set.title = Set the thing boi -commands.moderation.link.help.description = Links two or more servers. -commands.moderation.nick.success.title = %extra% Successfully nicked %extra% -commands.moderation.nick.success.description = I successfully nicked %extra%. -commands.moderation.nick.myself.success.description = I successfully changed my nickname. -commands.moderation.nick.massnick.success.description = I successfully nicked %extra% Members. -commands.moderation.nick.help.description = Rename a one or more user. -commands.moderation.regionchange.regions.title = All regions -commands.moderation.regionchange.success.title = Successfully set region -commands.moderation.regionchange.success.description = I successfully set the new server region to %extra%. -commands.moderation.regionchange.help.description = Changes the server region to locked regions. -commands.moderation.role.add.success.title = %extra% Successfully added role(s) %extra% -commands.moderation.role.add.success.description = I successfully added %extra% roles to %extra_two% members. -commands.moderation.role.remove.success.title = %extra% Successfully removed role(s) %extra% -commands.moderation.role.remove.success.description = I successfully removed %extra% roles from %extra_two% members. -commands.moderation.role.help.description = Adds and removes one or more role(s) from one or more user(s) -commands.moderation.rules.setup.title = Set up rules -commands.moderation.rules.setup.description = Welcome to the Hadder rules setup. Please mention the channel in which I should send the rules. Your message should look like\: \#rules or \#verify. -commands.moderation.rules.channel.error.title = Channel not found -commands.moderation.rules.channel.error.description = I can't find the specified channel. Please start the setup again. -commands.moderation.rules.rules.title = Rules -commands.moderation.rules.rules.description = The channel was successfully set to %extra%. Please send me the rules now. -commands.moderation.rules.role.title = Role to assign -commands.moderation.rules.role.description = The rules were successfully set. Please send me the name of the role which the user receives after he accepted the rules. -commands.moderation.rules.role.error.title = Role does not exist -commands.moderation.rules.role.error.description = The specified role does not exist on this guild. -commands.moderation.rules.guild.error.title = Wrong Guild -commands.moderation.rules.guild.error.description = The mentioned channel must be on this guild\! -commands.moderation.rules.emote.accept.title = Custom Accept Emote -commands.moderation.rules.emote.accept.description = The role has been successfully set to %extra%. Now send me the emote on which your user should react to to get verified. -commands.moderation.rules.emote.decline.title = Custom Decline Emote -commands.moderation.rules.emote.decline.description = The first emote has been successfully set to %extra%. Please send me now the decline emote. -commands.moderation.rules.success.title = Successfully set the rules -commands.moderation.rules.success.description = I successfully send the rules in %extra%. -commands.moderation.rules.emote.error.access.description = I can not access the custom emote(s). -commands.moderation.rules.emote.error.equal.title = Emotes are equal -commands.moderation.rules.emote.error.equal.description = The 1st and 2nd emote equals each other. -commands.moderation.rules.emoji.decline.description = The first emote has been successfully set. Please send me now the decline emote. -commands.moderation.rules.emoji.error.description = The given emote can't be used. -commands.moderation.rules.help.description = Setup the rules on your Discord server - -commands.music.join.success.title = Successfully connected -commands.music.join.success.description = I successfully connected to %extra%. -commands.music.join.error.connecting.already.title = Already connected -commands.music.join.error.connecting.already.description = I am already connected to your voice channel. -commands.music.join.error.connecting.trying.title = Already trying to connect -commands.music.join.error.connecting.trying.description = Hadder is already trying to connect. Please wait a moment. -commands.music.join.error.channel.title = No Voice Channel -commands.music.join.error.channel.description = You aren't in a Voice Channel. -commands.music.join.help.description = Joins your voice channel -commands.music.leave.success.title = \= Successfully disconnected -commands.music.leave.success.description = I successfully disconnected from the Voice Channel -commands.music.leave.error.tile = Not connected -commands.music.leave.error.description = I'm currently in no Voice Channel on this Guild -commands.music.leave.help.description = Leaves a voice channel - -commands.nsfw.gif.error.title = GIF not showing? Click here -commands.nsfw.img.error.title = Image not showing? Click here -commands.nsfw.anal.help.description = Shows a random anal gif. -commands.nsfw.bdsm.help.description = Shows a random BDSM picture. -commands.nsfw.blowjob.help.description = Shows a random Blowjob picture. -commands.nsfw.boobs.help.description = Shows a random boob gif. -commands.nsfw.cum.help.description = Shows a random cum gif. -commands.nsfw.erotic.help.description = Shows a random erotic picture. -commands.nsfw.feet.help.description = Shows a random feet gif. -commands.nsfw.fingering.help.description = Shows a random fingering gif. -commands.nsfw.linking.help.description = Shows a random licking gif. -commands.nsfw.porn.help.description = Shows a random porn gif. -commands.nsfw.pussy.help.description = Shows a random pussy gif. -commands.nsfw.randomporn.help.description = Shows a completely random porn gif. -commands.nsfw.solo.help.description = Shows a random solo gif. -commands.nsfw.spank.help.description = Shows a random spank gif. -commands.nsfw.trans.help.description = Shows a random trans picture. +commands.moderation.ban.success.title=Successfully banned +commands.moderation.ban.success.description=I successfully baned +commands.moderation.ban.error.title=Not possible +commands.moderation.ban.myself.error.description=I can not ban myself\! +commands.moderation.ban.yourself.error.description=You can't ban yourself\! +commands.moderation.ban.help.description=Bans one ore more user from the server +commands.moderation.clear.number.error.description=You have to choose a number between 1 and 200\! +commands.moderation.clear.success.description=Successfully deleted 69 messages. +commands.moderation.clear.help.description=Deletes the specified number of messages. +commands.moderation.prefix.success.title=Successfully set +commands.moderation.prefix.success.description=I successfully set the new prefix for the guild to +commands.moderation.prefix.error.description=The prefix must not contain **** +commands.moderation.prefix.help.description=Sets the Guild-Prefix. +commands.moderation.invitedetect.activate.success.title=Successfully activated +commands.moderation.invitedetect.activate.success.description=I successfully activated the invite link detection for this guild. +commands.moderation.invitedetect.activate.error.title=Already activated +commands.moderation.invitedetect.activate.error.description=The invite link detection is already activated on this guild. +commands.moderation.invitedetect.deactivate.success.title=Successfully deactivated +commands.moderation.invitedetect.deactivate.success.description=I successfully deactivated the invite link detection for this guild. +commands.moderation.invitedetect.deactivate.error.title=Already deactivated +commands.moderation.invitedetect.deactivate.error.description=The invite link detection is already deactivated on this guild. +commands.moderation.invitedetect.help.description=Activate or deactivate the Discord invite link detection. +commands.moderation.kick.success.title=Successfully kicked +commands.moderation.kick.success.description=I successfully kicked +commands.moderation.kick.myself.error.description=I can not kick myself\! +commands.moderation.kick.yourself.error.description=You can't kick yourself. +commands.moderation.kick.mass.success.description=I successfully kicked 69 Members\! +commands.moderation.kick.help.description=Kicks one or more user from the server. +commands.moderation.link.request.success.description=If i'm on this guild i sent a message to accept the link. +commands.moderation.link.error.title=Wait that's illegal. +commands.moderation.link.request.error.description=You specified the same guild as the guild on which you're reading this +commands.moderation.link.request.accept.title=Skidder wants to link guilds\! +commands.moderation.link.request.accept.description=React with the reactions to accept or decline it +commands.moderation.link.set.title=Set the thing boi +commands.moderation.link.help.description=Links two or more servers. +commands.moderation.nick.success.title=Successfully nicked +commands.moderation.nick.success.description=I successfully nicked +commands.moderation.nick.myself.success.description=I successfully changed my nickname. +commands.moderation.nick.mass.success.description=I successfully nicked 69 Members\! +commands.moderation.nick.help.description=Rename a one or more user. diff --git a/src/main/resources/Translations/Translations_en.properties b/src/main/resources/Translations/Translations_en.properties index 6bd35a2..01b86cc 100644 --- a/src/main/resources/Translations/Translations_en.properties +++ b/src/main/resources/Translations/Translations_en.properties @@ -18,7 +18,7 @@ region = error = Error none = None -success\! = Success\! +success! = Success! commands.fun.avatar.success.title = Avatar of %extra% commands.fun.avatar.help.description = Sends the avatar of the specified member. @@ -35,18 +35,18 @@ commands.general.about.success.field.one.description = Hadder is completely free commands.general.about.help.description = Shows infos about Hadder commands.general.equals.string.first.request = Please send me the first String commands.general.equals.string.second.request = Please send me the second String -commands.general.equals.string.equals.true = Yes\! The first string equals the second string\! +commands.general.equals.string.equals.true = Yes! The first string equals the second string! commands.general.equals.string.equals.false = Well yes but actually No. This isn't the same. commands.general.equals.string.first = First String commands.general.equals.string.second = Second String commands.general.equals.string.result = Result commands.general.equals.help.description = Check if two strings are the same commands.general.help.field.usage = Usage -commands.general.help.error.description = I need the Embed Links Permission to send the Help Menu\! +commands.general.help.error.description = I need the Embed Links Permission to send the Help Menu! commands.general.help.help.description = Shows each command or explains its usage commands.general.help.help.label = [CommandName] -commands.general.invite.success.title = Invite me\! -commands.general.invite.success.description = [Invite me here\!]%extra% +commands.general.invite.success.title = Invite me! +commands.general.invite.success.description = [Invite me here!]%extra% commands.general.invite.help.description = Shows the invitation to invite Hadder to your server commands.general.ping.help.description = Shows the ping to the Discord API @@ -65,35 +65,35 @@ commands.misc.github.success.repositories = Public repositories commands.misc.github.success.gists = Public gists commands.misc.github.success.followers = Followers commands.misc.github.success.following = Following -commands.misc.github.api.error.description = The GitHub API might be down at the moment\! -commands.misc.github.user.error.description = This user does not exist\! +commands.misc.github.api.error.description = The GitHub API might be down at the moment! +commands.misc.github.user.error.description = This user does not exist! commands.misc.github.connect.title = Connect you GH account commands.misc.github.connect.description = [Please connect your GitHub account here]%extra% commands.misc.github.help.description = Displays information about a GitHub user profile. commands.misc.screenshare.success.title = Here's your Url to share your Screen commands.misc.screenshare.id.error.title = Wait that's illegal -commands.misc.screenshare.id.error.description = This ID is invalid. \nMaybe you entered a wrong ID? \n\nNote\: Make sure the Voice Channel is on this Guild. +commands.misc.screenshare.id.error.description = This ID is invalid. \nMaybe you entered a wrong ID? \n\nNote: Make sure the Voice Channel is on this Guild. commands.misc.screenshare.channel.error.title = Please Choose a Voice Channel commands.misc.screenshare.channel.error.description = There is more than one channel with this name -commands.misc.screenshare.number.error.title = You specified a wrong number\! +commands.misc.screenshare.number.error.title = You specified a wrong number! commands.misc.screenshare.number.error.description = This isn't a Number. commands.misc.screenshare.channel.existing.error = Hol' up -commands.misc.screenshare.channel.existing.description = There is no Voice Channel named like this. \n\nNote\: Make sure the Voice Channel is on this Guild. +commands.misc.screenshare.channel.existing.description = There is no Voice Channel named like this. \n\nNote: Make sure the Voice Channel is on this Guild. commands.misc.screenshare.help.description = Shows you the link to share your screen. commands.moderation.ban.success.title = %extra% Successfully banned %extra% commands.moderation.ban.success.description = I successfully baned %extra% commands.moderation.ban.error.title = Not possible -commands.moderation.ban.myself.error.description = I can not ban myself\! -commands.moderation.ban.yourself.error.description = You can not ban yourself\! -commands.moderation.ban.massban.success.description = I successfully baned %extra% Members\! +commands.moderation.ban.myself.error.description = I can not ban myself! +commands.moderation.ban.yourself.error.description = You can not ban yourself! +commands.moderation.ban.massban.success.description = I successfully baned %extra% Members! commands.moderation.ban.help.description = Bans one ore more user from the server -commands.moderation.clear.number.error.description = You have to choose a number between 1 and 99\! +commands.moderation.clear.number.error.description = You have to choose a number between 1 and 99! commands.moderation.clear.success.description = Successfully deleted %extra% messages. commands.moderation.clear.help.description = Deletes the specified number of messages. commands.moderation.prefix.success.title = %extra% Successfully set %extra% commands.moderation.prefix.success.description = I successfully set the new prefix for the guild to %extra% -commands.moderation.prefix.error.description = The prefix must not contain **"** +commands.moderation.prefix.error.description = The prefix must not contain **\"** commands.moderation.prefix.help.description = Sets the Guild-Prefix. commands.moderation.invitedetect.activate.success.title = Successfully activated commands.moderation.invitedetect.activate.success.description = I successfully activated the invite link detection for this guild. @@ -107,15 +107,15 @@ commands.moderation.invitedetect.help.description = Activate or deactivate the D commands.moderation.kick.success.title = %extra% Successfully kicked %extra% commands.moderation.kick.success.description = I successfully kicked %extra%. commands.moderation.kick.error.title = Not possible -commands.moderation.kick.myself.error.description = I can not kick myself\! +commands.moderation.kick.myself.error.description = I can not kick myself! commands.moderation.kick.yourself.error.description = You can't kick yourself. -commands.moderation.kick.mass.success.description = I successfully kicked 69 Members\! +commands.moderation.kick.mass.success.description = I successfully kicked 69 Members! commands.moderation.kick.help.description = Kicks one or more user from the server. commands.moderation.kick.masskick.success.description = I successfully kicked %extra% members. commands.moderation.link.request.success.description = If i'm on this guild i sent a message to accept the link. commands.moderation.link.error.title = Wait that's illegal. commands.moderation.link.request.error.description = You specified the same guild as the guild on which you're reading this -commands.moderation.link.request.accept.title = ) wants to link guilds\! +commands.moderation.link.request.accept.title = ) wants to link guilds! commands.moderation.link.request.accept.description = React with the reactions to accept or decline it commands.moderation.link.set.title = Set the thing boi commands.moderation.link.help.description = Links two or more servers. @@ -134,7 +134,7 @@ commands.moderation.role.remove.success.title = %extra% Successfully removed rol commands.moderation.role.remove.success.description = I successfully removed %extra% roles from %extra_two% members. commands.moderation.role.help.description = Adds and removes one or more role(s) from one or more user(s) commands.moderation.rules.setup.title = Set up rules -commands.moderation.rules.setup.description = Welcome to the Hadder rules setup. Please mention the channel in which I should send the rules. Your message should look like\: \#rules or \#verify. +commands.moderation.rules.setup.description = Welcome to the Hadder rules setup. Please mention the channel in which I should send the rules. Your message should look like: #rules or #verify. commands.moderation.rules.channel.error.title = Channel not found commands.moderation.rules.channel.error.description = I can't find the specified channel. Please start the setup again. commands.moderation.rules.rules.title = Rules @@ -144,7 +144,7 @@ commands.moderation.rules.role.description = The rules were successfully set. Pl commands.moderation.rules.role.error.title = Role does not exist commands.moderation.rules.role.error.description = The specified role does not exist on this guild. commands.moderation.rules.guild.error.title = Wrong Guild -commands.moderation.rules.guild.error.description = The mentioned channel must be on this guild\! +commands.moderation.rules.guild.error.description = The mentioned channel must be on this guild! commands.moderation.rules.emote.accept.title = Custom Accept Emote commands.moderation.rules.emote.accept.description = The role has been successfully set to %extra%. Now send me the emote on which your user should react to to get verified. commands.moderation.rules.emote.decline.title = Custom Decline Emote @@ -167,7 +167,7 @@ commands.music.join.error.connecting.trying.description = Hadder is already tryi commands.music.join.error.channel.title = No Voice Channel commands.music.join.error.channel.description = You aren't in a Voice Channel. commands.music.join.help.description = Joins your voice channel -commands.music.leave.success.title = \= Successfully disconnected +commands.music.leave.success.title = = Successfully disconnected commands.music.leave.success.description = I successfully disconnected from the Voice Channel commands.music.leave.error.tile = Not connected commands.music.leave.error.description = I'm currently in no Voice Channel on this Guild diff --git a/src/main/resources/Translations/Translations_es.properties b/src/main/resources/Translations/Translations_es.properties index 6bd35a2..b7fd562 100644 --- a/src/main/resources/Translations/Translations_es.properties +++ b/src/main/resources/Translations/Translations_es.properties @@ -2,191 +2,118 @@ # @author Skidder / GregTCLTK # -# -# @author Skidder / GregTCLTK -# +Hadder=Hadder -Hadder = Hadder +user/id= <@User>/ +searchterm= +username= +number= +guildprefix= +<@User>=<@User> +on/off= +vc-name/id= +user+nickname=<@user> -searchterm = -username = -number = -guildprefix = -vc-name/id = -user+nickname = <@user> -region = +error=Error +none=None +success\!=Success\! -error = Error -none = None -success\! = Success\! +commands.fun.avatar.success.title=Avatar of +commands.fun.avatar.help.description=Sends the avatar of the specified member. +commands.fun.gif.error.description=Please try again with another term. +commands.fun.gif.help.description=Look for a GIF on Giphy +commands.fun.meme.success.title=Your random meme +commands.fun.meme.api.error=The request to the meme API could not be processed. Please try it again later. +commands.fun.meme.help.description=Sends you a random meme. -commands.fun.avatar.success.title = Avatar of %extra% -commands.fun.avatar.help.description = Sends the avatar of the specified member. -commands.fun.gif.error.description = Please try again with another term. -commands.fun.gif.help.description = Look for a GIF on Giphy -commands.fun.meme.success.title = Your random meme -commands.fun.meme.api.error = The request to the meme API could not be processed. Please try it again later. -commands.fun.meme.help.description = Sends you a random meme. +commands.general.about.success.title=Hadder - About +commands.general.about.success.description=Hadder is an open source Discord bot. +commands.general.about.success.field.one.title=Support the Developers +commands.general.about.success.field.one.description=Hadder is completely free for everyone. We would appreciate it you donate some money [here] +commands.general.about.help.description=Shows infos about Hadder +commands.general.equals.string.first.request=Please send me the first String +commands.general.equals.string.second.request=Please send me the second String +commands.general.equals.string.equals.true=Yes\! The first string equals the second string\! +commands.general.equals.string.equals.false=Well yes but actually No. This isn't the same. +commands.general.equals.string.first=First String +commands.general.equals.string.second=Second String +commands.general.equals.string.result=Result +commands.general.equals.help.description=Check if two strings are the same +commands.general.help.error.description=I need the Embed Links Permission to send the Help Menu\! +commands.general.help.help.description=Shows each command or explains its usage +commands.general.help.help.label=[CommandName] +commands.general.invite.success.title=Invite me\! +commands.general.invite.success.description=[Invite me here\!] +commands.general.invite.help.description=Shows the invitation to invite Hadder to your server +commands.general.ping.help.description=Shows the ping to the Discord API -commands.general.about.success.title = Hadder - About -commands.general.about.success.description = Hadder is an open source Discord bot. -commands.general.about.success.field.one.title = Support the Developers -commands.general.about.success.field.one.description = Hadder is completely free for everyone. We would appreciate it you donate some money [here]%extra% -commands.general.about.help.description = Shows infos about Hadder -commands.general.equals.string.first.request = Please send me the first String -commands.general.equals.string.second.request = Please send me the second String -commands.general.equals.string.equals.true = Yes\! The first string equals the second string\! -commands.general.equals.string.equals.false = Well yes but actually No. This isn't the same. -commands.general.equals.string.first = First String -commands.general.equals.string.second = Second String -commands.general.equals.string.result = Result -commands.general.equals.help.description = Check if two strings are the same -commands.general.help.field.usage = Usage -commands.general.help.error.description = I need the Embed Links Permission to send the Help Menu\! -commands.general.help.help.description = Shows each command or explains its usage -commands.general.help.help.label = [CommandName] -commands.general.invite.success.title = Invite me\! -commands.general.invite.success.description = [Invite me here\!]%extra% -commands.general.invite.help.description = Shows the invitation to invite Hadder to your server -commands.general.ping.help.description = Shows the ping to the Discord API +commands.misc.feedback.title.request.title=Feedback Topic +commands.misc.feedback.title.request.description=Please send me the feedback topic. +commands.misc.feedback.description.request.title=Feedback Description +commands.misc.feedback.description.request.description=Please send me the feedback description now. +commands.misc.feedback.help.description=Sends feedback directly to the developers. +commands.misc.github.link.title=Link your GitHub Account +commands.misc.github.success.title=Information about +commands.misc.github.success.bio=User bio +commands.misc.github.success.location=Location +commands.misc.github.success.website=Website +commands.misc.github.success.repositories=Public repositories +commands.misc.github.success.gists=Public gists +commands.misc.github.success.followers=Followers +commands.misc.github.success.following=Following +commands.misc.github.api.error.description=The GitHub API might be down at the moment\! +commands.misc.github.user.error.description=This user does not exist\! +commands.misc.github.connect.title=Connect you GH account +commands.misc.github.connect.description=Please connect your GitHub account here +commands.misc.github.help.description=Displays information about a GitHub user profile. +commands.misc.screenshare.success.title=Here's your Url to share your Screen +commands.misc.screenshare.id.error.title=Wait that's illegal +commands.misc.screenshare.id.error.description=This ID is invalid. \nMaybe you entered a wrong ID? \n\nNote\: Make sure the Voice Channel is on this Guild. +commands.misc.screenshare.channel.error.title=Please Choose a Voice Channel +commands.misc.screenshare.channel.error.description=There is more than one channel with this name +commands.misc.screenshare.number.error.title=You specified a wrong number\! +commands.misc.screenshare.number.error.description=This isn't a Number. +commands.misc.screenshare.channel.existing.error=Hol' up +commands.misc.screenshare.channel.existing.description=There is no Voice Channel named like this. \n\nNote\: Make sure the Voice Channel is on this Guild. +commands.misc.screenshare.help.description=Shows you the link to share your screen. -commands.misc.feedback.title.request.title = Feedback Topic -commands.misc.feedback.title.request.description = Please send me the feedback topic. -commands.misc.feedback.description.request.title = Feedback Description -commands.misc.feedback.description.request.description = Please send me the feedback description now. -commands.misc.feedback.help.description = Sends feedback directly to the developers. -commands.misc.feedback.success.title = Feedback successfully sent -commands.misc.github.link.title = Link your GitHub Account -commands.misc.github.success.title = Information about %extra% -commands.misc.github.success.bio = User bio -commands.misc.github.success.location = Location -commands.misc.github.success.website = Website -commands.misc.github.success.repositories = Public repositories -commands.misc.github.success.gists = Public gists -commands.misc.github.success.followers = Followers -commands.misc.github.success.following = Following -commands.misc.github.api.error.description = The GitHub API might be down at the moment\! -commands.misc.github.user.error.description = This user does not exist\! -commands.misc.github.connect.title = Connect you GH account -commands.misc.github.connect.description = [Please connect your GitHub account here]%extra% -commands.misc.github.help.description = Displays information about a GitHub user profile. -commands.misc.screenshare.success.title = Here's your Url to share your Screen -commands.misc.screenshare.id.error.title = Wait that's illegal -commands.misc.screenshare.id.error.description = This ID is invalid. \nMaybe you entered a wrong ID? \n\nNote\: Make sure the Voice Channel is on this Guild. -commands.misc.screenshare.channel.error.title = Please Choose a Voice Channel -commands.misc.screenshare.channel.error.description = There is more than one channel with this name -commands.misc.screenshare.number.error.title = You specified a wrong number\! -commands.misc.screenshare.number.error.description = This isn't a Number. -commands.misc.screenshare.channel.existing.error = Hol' up -commands.misc.screenshare.channel.existing.description = There is no Voice Channel named like this. \n\nNote\: Make sure the Voice Channel is on this Guild. -commands.misc.screenshare.help.description = Shows you the link to share your screen. - -commands.moderation.ban.success.title = %extra% Successfully banned %extra% -commands.moderation.ban.success.description = I successfully baned %extra% -commands.moderation.ban.error.title = Not possible -commands.moderation.ban.myself.error.description = I can not ban myself\! -commands.moderation.ban.yourself.error.description = You can not ban yourself\! -commands.moderation.ban.massban.success.description = I successfully baned %extra% Members\! -commands.moderation.ban.help.description = Bans one ore more user from the server -commands.moderation.clear.number.error.description = You have to choose a number between 1 and 99\! -commands.moderation.clear.success.description = Successfully deleted %extra% messages. -commands.moderation.clear.help.description = Deletes the specified number of messages. -commands.moderation.prefix.success.title = %extra% Successfully set %extra% -commands.moderation.prefix.success.description = I successfully set the new prefix for the guild to %extra% -commands.moderation.prefix.error.description = The prefix must not contain **"** -commands.moderation.prefix.help.description = Sets the Guild-Prefix. -commands.moderation.invitedetect.activate.success.title = Successfully activated -commands.moderation.invitedetect.activate.success.description = I successfully activated the invite link detection for this guild. -commands.moderation.invitedetect.activate.error.title = Already activated -commands.moderation.invitedetect.activate.error.description = The invite link detection is already activated on this guild. -commands.moderation.invitedetect.deactivate.success.title = Successfully deactivated -commands.moderation.invitedetect.deactivate.success.description = I successfully deactivated the invite link detection for this guild. -commands.moderation.invitedetect.deactivate.error.title = Already deactivated -commands.moderation.invitedetect.deactivate.error.description = The invite link detection is already deactivated on this guild. -commands.moderation.invitedetect.help.description = Activate or deactivate the Discord invite link detection. -commands.moderation.kick.success.title = %extra% Successfully kicked %extra% -commands.moderation.kick.success.description = I successfully kicked %extra%. -commands.moderation.kick.error.title = Not possible -commands.moderation.kick.myself.error.description = I can not kick myself\! -commands.moderation.kick.yourself.error.description = You can't kick yourself. -commands.moderation.kick.mass.success.description = I successfully kicked 69 Members\! -commands.moderation.kick.help.description = Kicks one or more user from the server. -commands.moderation.kick.masskick.success.description = I successfully kicked %extra% members. -commands.moderation.link.request.success.description = If i'm on this guild i sent a message to accept the link. -commands.moderation.link.error.title = Wait that's illegal. -commands.moderation.link.request.error.description = You specified the same guild as the guild on which you're reading this -commands.moderation.link.request.accept.title = ) wants to link guilds\! -commands.moderation.link.request.accept.description = React with the reactions to accept or decline it -commands.moderation.link.set.title = Set the thing boi -commands.moderation.link.help.description = Links two or more servers. -commands.moderation.nick.success.title = %extra% Successfully nicked %extra% -commands.moderation.nick.success.description = I successfully nicked %extra%. -commands.moderation.nick.myself.success.description = I successfully changed my nickname. -commands.moderation.nick.massnick.success.description = I successfully nicked %extra% Members. -commands.moderation.nick.help.description = Rename a one or more user. -commands.moderation.regionchange.regions.title = All regions -commands.moderation.regionchange.success.title = Successfully set region -commands.moderation.regionchange.success.description = I successfully set the new server region to %extra%. -commands.moderation.regionchange.help.description = Changes the server region to locked regions. -commands.moderation.role.add.success.title = %extra% Successfully added role(s) %extra% -commands.moderation.role.add.success.description = I successfully added %extra% roles to %extra_two% members. -commands.moderation.role.remove.success.title = %extra% Successfully removed role(s) %extra% -commands.moderation.role.remove.success.description = I successfully removed %extra% roles from %extra_two% members. -commands.moderation.role.help.description = Adds and removes one or more role(s) from one or more user(s) -commands.moderation.rules.setup.title = Set up rules -commands.moderation.rules.setup.description = Welcome to the Hadder rules setup. Please mention the channel in which I should send the rules. Your message should look like\: \#rules or \#verify. -commands.moderation.rules.channel.error.title = Channel not found -commands.moderation.rules.channel.error.description = I can't find the specified channel. Please start the setup again. -commands.moderation.rules.rules.title = Rules -commands.moderation.rules.rules.description = The channel was successfully set to %extra%. Please send me the rules now. -commands.moderation.rules.role.title = Role to assign -commands.moderation.rules.role.description = The rules were successfully set. Please send me the name of the role which the user receives after he accepted the rules. -commands.moderation.rules.role.error.title = Role does not exist -commands.moderation.rules.role.error.description = The specified role does not exist on this guild. -commands.moderation.rules.guild.error.title = Wrong Guild -commands.moderation.rules.guild.error.description = The mentioned channel must be on this guild\! -commands.moderation.rules.emote.accept.title = Custom Accept Emote -commands.moderation.rules.emote.accept.description = The role has been successfully set to %extra%. Now send me the emote on which your user should react to to get verified. -commands.moderation.rules.emote.decline.title = Custom Decline Emote -commands.moderation.rules.emote.decline.description = The first emote has been successfully set to %extra%. Please send me now the decline emote. -commands.moderation.rules.success.title = Successfully set the rules -commands.moderation.rules.success.description = I successfully send the rules in %extra%. -commands.moderation.rules.emote.error.access.description = I can not access the custom emote(s). -commands.moderation.rules.emote.error.equal.title = Emotes are equal -commands.moderation.rules.emote.error.equal.description = The 1st and 2nd emote equals each other. -commands.moderation.rules.emoji.decline.description = The first emote has been successfully set. Please send me now the decline emote. -commands.moderation.rules.emoji.error.description = The given emote can't be used. -commands.moderation.rules.help.description = Setup the rules on your Discord server - -commands.music.join.success.title = Successfully connected -commands.music.join.success.description = I successfully connected to %extra%. -commands.music.join.error.connecting.already.title = Already connected -commands.music.join.error.connecting.already.description = I am already connected to your voice channel. -commands.music.join.error.connecting.trying.title = Already trying to connect -commands.music.join.error.connecting.trying.description = Hadder is already trying to connect. Please wait a moment. -commands.music.join.error.channel.title = No Voice Channel -commands.music.join.error.channel.description = You aren't in a Voice Channel. -commands.music.join.help.description = Joins your voice channel -commands.music.leave.success.title = \= Successfully disconnected -commands.music.leave.success.description = I successfully disconnected from the Voice Channel -commands.music.leave.error.tile = Not connected -commands.music.leave.error.description = I'm currently in no Voice Channel on this Guild -commands.music.leave.help.description = Leaves a voice channel - -commands.nsfw.gif.error.title = GIF not showing? Click here -commands.nsfw.img.error.title = Image not showing? Click here -commands.nsfw.anal.help.description = Shows a random anal gif. -commands.nsfw.bdsm.help.description = Shows a random BDSM picture. -commands.nsfw.blowjob.help.description = Shows a random Blowjob picture. -commands.nsfw.boobs.help.description = Shows a random boob gif. -commands.nsfw.cum.help.description = Shows a random cum gif. -commands.nsfw.erotic.help.description = Shows a random erotic picture. -commands.nsfw.feet.help.description = Shows a random feet gif. -commands.nsfw.fingering.help.description = Shows a random fingering gif. -commands.nsfw.linking.help.description = Shows a random licking gif. -commands.nsfw.porn.help.description = Shows a random porn gif. -commands.nsfw.pussy.help.description = Shows a random pussy gif. -commands.nsfw.randomporn.help.description = Shows a completely random porn gif. -commands.nsfw.solo.help.description = Shows a random solo gif. -commands.nsfw.spank.help.description = Shows a random spank gif. -commands.nsfw.trans.help.description = Shows a random trans picture. +commands.moderation.ban.success.title=Successfully banned +commands.moderation.ban.success.description=I successfully baned +commands.moderation.ban.error.title=Not possible +commands.moderation.ban.myself.error.description=I can not ban myself\! +commands.moderation.ban.yourself.error.description=You can't ban yourself\! +commands.moderation.ban.help.description=Bans one ore more user from the server +commands.moderation.clear.number.error.description=You have to choose a number between 1 and 200\! +commands.moderation.clear.success.description=Successfully deleted 69 messages. +commands.moderation.clear.help.description=Deletes the specified number of messages. +commands.moderation.prefix.success.title=Successfully set +commands.moderation.prefix.success.description=I successfully set the new prefix for the guild to +commands.moderation.prefix.error.description=The prefix must not contain **** +commands.moderation.prefix.help.description=Sets the Guild-Prefix. +commands.moderation.invitedetect.activate.success.title=Successfully activated +commands.moderation.invitedetect.activate.success.description=I successfully activated the invite link detection for this guild. +commands.moderation.invitedetect.activate.error.title=Already activated +commands.moderation.invitedetect.activate.error.description=The invite link detection is already activated on this guild. +commands.moderation.invitedetect.deactivate.success.title=Successfully deactivated +commands.moderation.invitedetect.deactivate.success.description=I successfully deactivated the invite link detection for this guild. +commands.moderation.invitedetect.deactivate.error.title=Already deactivated +commands.moderation.invitedetect.deactivate.error.description=The invite link detection is already deactivated on this guild. +commands.moderation.invitedetect.help.description=Activate or deactivate the Discord invite link detection. +commands.moderation.kick.success.title=Successfully kicked +commands.moderation.kick.success.description=I successfully kicked +commands.moderation.kick.myself.error.description=I can not kick myself\! +commands.moderation.kick.yourself.error.description=You can't kick yourself. +commands.moderation.kick.mass.success.description=I successfully kicked 69 Members\! +commands.moderation.kick.help.description=Kicks one or more user from the server. +commands.moderation.link.request.success.description=If i'm on this guild i sent a message to accept the link. +commands.moderation.link.error.title=Wait that's illegal. +commands.moderation.link.request.error.description=You specified the same guild as the guild on which you're reading this +commands.moderation.link.request.accept.title=Skidder wants to link guilds\! +commands.moderation.link.request.accept.description=React with the reactions to accept or decline it +commands.moderation.link.set.title=Set the thing boi +commands.moderation.link.help.description=Links two or more servers. +commands.moderation.nick.success.title=Successfully nicked +commands.moderation.nick.success.description=I successfully nicked +commands.moderation.nick.myself.success.description=I successfully changed my nickname. +commands.moderation.nick.mass.success.description=I successfully nicked 69 Members\! +commands.moderation.nick.help.description=Rename a one or more user. diff --git a/src/main/resources/Translations/Translations_fr.properties b/src/main/resources/Translations/Translations_fr.properties index 6bd35a2..b7fd562 100644 --- a/src/main/resources/Translations/Translations_fr.properties +++ b/src/main/resources/Translations/Translations_fr.properties @@ -2,191 +2,118 @@ # @author Skidder / GregTCLTK # -# -# @author Skidder / GregTCLTK -# +Hadder=Hadder -Hadder = Hadder +user/id= <@User>/ +searchterm= +username= +number= +guildprefix= +<@User>=<@User> +on/off= +vc-name/id= +user+nickname=<@user> -searchterm = -username = -number = -guildprefix = -vc-name/id = -user+nickname = <@user> -region = +error=Error +none=None +success\!=Success\! -error = Error -none = None -success\! = Success\! +commands.fun.avatar.success.title=Avatar of +commands.fun.avatar.help.description=Sends the avatar of the specified member. +commands.fun.gif.error.description=Please try again with another term. +commands.fun.gif.help.description=Look for a GIF on Giphy +commands.fun.meme.success.title=Your random meme +commands.fun.meme.api.error=The request to the meme API could not be processed. Please try it again later. +commands.fun.meme.help.description=Sends you a random meme. -commands.fun.avatar.success.title = Avatar of %extra% -commands.fun.avatar.help.description = Sends the avatar of the specified member. -commands.fun.gif.error.description = Please try again with another term. -commands.fun.gif.help.description = Look for a GIF on Giphy -commands.fun.meme.success.title = Your random meme -commands.fun.meme.api.error = The request to the meme API could not be processed. Please try it again later. -commands.fun.meme.help.description = Sends you a random meme. +commands.general.about.success.title=Hadder - About +commands.general.about.success.description=Hadder is an open source Discord bot. +commands.general.about.success.field.one.title=Support the Developers +commands.general.about.success.field.one.description=Hadder is completely free for everyone. We would appreciate it you donate some money [here] +commands.general.about.help.description=Shows infos about Hadder +commands.general.equals.string.first.request=Please send me the first String +commands.general.equals.string.second.request=Please send me the second String +commands.general.equals.string.equals.true=Yes\! The first string equals the second string\! +commands.general.equals.string.equals.false=Well yes but actually No. This isn't the same. +commands.general.equals.string.first=First String +commands.general.equals.string.second=Second String +commands.general.equals.string.result=Result +commands.general.equals.help.description=Check if two strings are the same +commands.general.help.error.description=I need the Embed Links Permission to send the Help Menu\! +commands.general.help.help.description=Shows each command or explains its usage +commands.general.help.help.label=[CommandName] +commands.general.invite.success.title=Invite me\! +commands.general.invite.success.description=[Invite me here\!] +commands.general.invite.help.description=Shows the invitation to invite Hadder to your server +commands.general.ping.help.description=Shows the ping to the Discord API -commands.general.about.success.title = Hadder - About -commands.general.about.success.description = Hadder is an open source Discord bot. -commands.general.about.success.field.one.title = Support the Developers -commands.general.about.success.field.one.description = Hadder is completely free for everyone. We would appreciate it you donate some money [here]%extra% -commands.general.about.help.description = Shows infos about Hadder -commands.general.equals.string.first.request = Please send me the first String -commands.general.equals.string.second.request = Please send me the second String -commands.general.equals.string.equals.true = Yes\! The first string equals the second string\! -commands.general.equals.string.equals.false = Well yes but actually No. This isn't the same. -commands.general.equals.string.first = First String -commands.general.equals.string.second = Second String -commands.general.equals.string.result = Result -commands.general.equals.help.description = Check if two strings are the same -commands.general.help.field.usage = Usage -commands.general.help.error.description = I need the Embed Links Permission to send the Help Menu\! -commands.general.help.help.description = Shows each command or explains its usage -commands.general.help.help.label = [CommandName] -commands.general.invite.success.title = Invite me\! -commands.general.invite.success.description = [Invite me here\!]%extra% -commands.general.invite.help.description = Shows the invitation to invite Hadder to your server -commands.general.ping.help.description = Shows the ping to the Discord API +commands.misc.feedback.title.request.title=Feedback Topic +commands.misc.feedback.title.request.description=Please send me the feedback topic. +commands.misc.feedback.description.request.title=Feedback Description +commands.misc.feedback.description.request.description=Please send me the feedback description now. +commands.misc.feedback.help.description=Sends feedback directly to the developers. +commands.misc.github.link.title=Link your GitHub Account +commands.misc.github.success.title=Information about +commands.misc.github.success.bio=User bio +commands.misc.github.success.location=Location +commands.misc.github.success.website=Website +commands.misc.github.success.repositories=Public repositories +commands.misc.github.success.gists=Public gists +commands.misc.github.success.followers=Followers +commands.misc.github.success.following=Following +commands.misc.github.api.error.description=The GitHub API might be down at the moment\! +commands.misc.github.user.error.description=This user does not exist\! +commands.misc.github.connect.title=Connect you GH account +commands.misc.github.connect.description=Please connect your GitHub account here +commands.misc.github.help.description=Displays information about a GitHub user profile. +commands.misc.screenshare.success.title=Here's your Url to share your Screen +commands.misc.screenshare.id.error.title=Wait that's illegal +commands.misc.screenshare.id.error.description=This ID is invalid. \nMaybe you entered a wrong ID? \n\nNote\: Make sure the Voice Channel is on this Guild. +commands.misc.screenshare.channel.error.title=Please Choose a Voice Channel +commands.misc.screenshare.channel.error.description=There is more than one channel with this name +commands.misc.screenshare.number.error.title=You specified a wrong number\! +commands.misc.screenshare.number.error.description=This isn't a Number. +commands.misc.screenshare.channel.existing.error=Hol' up +commands.misc.screenshare.channel.existing.description=There is no Voice Channel named like this. \n\nNote\: Make sure the Voice Channel is on this Guild. +commands.misc.screenshare.help.description=Shows you the link to share your screen. -commands.misc.feedback.title.request.title = Feedback Topic -commands.misc.feedback.title.request.description = Please send me the feedback topic. -commands.misc.feedback.description.request.title = Feedback Description -commands.misc.feedback.description.request.description = Please send me the feedback description now. -commands.misc.feedback.help.description = Sends feedback directly to the developers. -commands.misc.feedback.success.title = Feedback successfully sent -commands.misc.github.link.title = Link your GitHub Account -commands.misc.github.success.title = Information about %extra% -commands.misc.github.success.bio = User bio -commands.misc.github.success.location = Location -commands.misc.github.success.website = Website -commands.misc.github.success.repositories = Public repositories -commands.misc.github.success.gists = Public gists -commands.misc.github.success.followers = Followers -commands.misc.github.success.following = Following -commands.misc.github.api.error.description = The GitHub API might be down at the moment\! -commands.misc.github.user.error.description = This user does not exist\! -commands.misc.github.connect.title = Connect you GH account -commands.misc.github.connect.description = [Please connect your GitHub account here]%extra% -commands.misc.github.help.description = Displays information about a GitHub user profile. -commands.misc.screenshare.success.title = Here's your Url to share your Screen -commands.misc.screenshare.id.error.title = Wait that's illegal -commands.misc.screenshare.id.error.description = This ID is invalid. \nMaybe you entered a wrong ID? \n\nNote\: Make sure the Voice Channel is on this Guild. -commands.misc.screenshare.channel.error.title = Please Choose a Voice Channel -commands.misc.screenshare.channel.error.description = There is more than one channel with this name -commands.misc.screenshare.number.error.title = You specified a wrong number\! -commands.misc.screenshare.number.error.description = This isn't a Number. -commands.misc.screenshare.channel.existing.error = Hol' up -commands.misc.screenshare.channel.existing.description = There is no Voice Channel named like this. \n\nNote\: Make sure the Voice Channel is on this Guild. -commands.misc.screenshare.help.description = Shows you the link to share your screen. - -commands.moderation.ban.success.title = %extra% Successfully banned %extra% -commands.moderation.ban.success.description = I successfully baned %extra% -commands.moderation.ban.error.title = Not possible -commands.moderation.ban.myself.error.description = I can not ban myself\! -commands.moderation.ban.yourself.error.description = You can not ban yourself\! -commands.moderation.ban.massban.success.description = I successfully baned %extra% Members\! -commands.moderation.ban.help.description = Bans one ore more user from the server -commands.moderation.clear.number.error.description = You have to choose a number between 1 and 99\! -commands.moderation.clear.success.description = Successfully deleted %extra% messages. -commands.moderation.clear.help.description = Deletes the specified number of messages. -commands.moderation.prefix.success.title = %extra% Successfully set %extra% -commands.moderation.prefix.success.description = I successfully set the new prefix for the guild to %extra% -commands.moderation.prefix.error.description = The prefix must not contain **"** -commands.moderation.prefix.help.description = Sets the Guild-Prefix. -commands.moderation.invitedetect.activate.success.title = Successfully activated -commands.moderation.invitedetect.activate.success.description = I successfully activated the invite link detection for this guild. -commands.moderation.invitedetect.activate.error.title = Already activated -commands.moderation.invitedetect.activate.error.description = The invite link detection is already activated on this guild. -commands.moderation.invitedetect.deactivate.success.title = Successfully deactivated -commands.moderation.invitedetect.deactivate.success.description = I successfully deactivated the invite link detection for this guild. -commands.moderation.invitedetect.deactivate.error.title = Already deactivated -commands.moderation.invitedetect.deactivate.error.description = The invite link detection is already deactivated on this guild. -commands.moderation.invitedetect.help.description = Activate or deactivate the Discord invite link detection. -commands.moderation.kick.success.title = %extra% Successfully kicked %extra% -commands.moderation.kick.success.description = I successfully kicked %extra%. -commands.moderation.kick.error.title = Not possible -commands.moderation.kick.myself.error.description = I can not kick myself\! -commands.moderation.kick.yourself.error.description = You can't kick yourself. -commands.moderation.kick.mass.success.description = I successfully kicked 69 Members\! -commands.moderation.kick.help.description = Kicks one or more user from the server. -commands.moderation.kick.masskick.success.description = I successfully kicked %extra% members. -commands.moderation.link.request.success.description = If i'm on this guild i sent a message to accept the link. -commands.moderation.link.error.title = Wait that's illegal. -commands.moderation.link.request.error.description = You specified the same guild as the guild on which you're reading this -commands.moderation.link.request.accept.title = ) wants to link guilds\! -commands.moderation.link.request.accept.description = React with the reactions to accept or decline it -commands.moderation.link.set.title = Set the thing boi -commands.moderation.link.help.description = Links two or more servers. -commands.moderation.nick.success.title = %extra% Successfully nicked %extra% -commands.moderation.nick.success.description = I successfully nicked %extra%. -commands.moderation.nick.myself.success.description = I successfully changed my nickname. -commands.moderation.nick.massnick.success.description = I successfully nicked %extra% Members. -commands.moderation.nick.help.description = Rename a one or more user. -commands.moderation.regionchange.regions.title = All regions -commands.moderation.regionchange.success.title = Successfully set region -commands.moderation.regionchange.success.description = I successfully set the new server region to %extra%. -commands.moderation.regionchange.help.description = Changes the server region to locked regions. -commands.moderation.role.add.success.title = %extra% Successfully added role(s) %extra% -commands.moderation.role.add.success.description = I successfully added %extra% roles to %extra_two% members. -commands.moderation.role.remove.success.title = %extra% Successfully removed role(s) %extra% -commands.moderation.role.remove.success.description = I successfully removed %extra% roles from %extra_two% members. -commands.moderation.role.help.description = Adds and removes one or more role(s) from one or more user(s) -commands.moderation.rules.setup.title = Set up rules -commands.moderation.rules.setup.description = Welcome to the Hadder rules setup. Please mention the channel in which I should send the rules. Your message should look like\: \#rules or \#verify. -commands.moderation.rules.channel.error.title = Channel not found -commands.moderation.rules.channel.error.description = I can't find the specified channel. Please start the setup again. -commands.moderation.rules.rules.title = Rules -commands.moderation.rules.rules.description = The channel was successfully set to %extra%. Please send me the rules now. -commands.moderation.rules.role.title = Role to assign -commands.moderation.rules.role.description = The rules were successfully set. Please send me the name of the role which the user receives after he accepted the rules. -commands.moderation.rules.role.error.title = Role does not exist -commands.moderation.rules.role.error.description = The specified role does not exist on this guild. -commands.moderation.rules.guild.error.title = Wrong Guild -commands.moderation.rules.guild.error.description = The mentioned channel must be on this guild\! -commands.moderation.rules.emote.accept.title = Custom Accept Emote -commands.moderation.rules.emote.accept.description = The role has been successfully set to %extra%. Now send me the emote on which your user should react to to get verified. -commands.moderation.rules.emote.decline.title = Custom Decline Emote -commands.moderation.rules.emote.decline.description = The first emote has been successfully set to %extra%. Please send me now the decline emote. -commands.moderation.rules.success.title = Successfully set the rules -commands.moderation.rules.success.description = I successfully send the rules in %extra%. -commands.moderation.rules.emote.error.access.description = I can not access the custom emote(s). -commands.moderation.rules.emote.error.equal.title = Emotes are equal -commands.moderation.rules.emote.error.equal.description = The 1st and 2nd emote equals each other. -commands.moderation.rules.emoji.decline.description = The first emote has been successfully set. Please send me now the decline emote. -commands.moderation.rules.emoji.error.description = The given emote can't be used. -commands.moderation.rules.help.description = Setup the rules on your Discord server - -commands.music.join.success.title = Successfully connected -commands.music.join.success.description = I successfully connected to %extra%. -commands.music.join.error.connecting.already.title = Already connected -commands.music.join.error.connecting.already.description = I am already connected to your voice channel. -commands.music.join.error.connecting.trying.title = Already trying to connect -commands.music.join.error.connecting.trying.description = Hadder is already trying to connect. Please wait a moment. -commands.music.join.error.channel.title = No Voice Channel -commands.music.join.error.channel.description = You aren't in a Voice Channel. -commands.music.join.help.description = Joins your voice channel -commands.music.leave.success.title = \= Successfully disconnected -commands.music.leave.success.description = I successfully disconnected from the Voice Channel -commands.music.leave.error.tile = Not connected -commands.music.leave.error.description = I'm currently in no Voice Channel on this Guild -commands.music.leave.help.description = Leaves a voice channel - -commands.nsfw.gif.error.title = GIF not showing? Click here -commands.nsfw.img.error.title = Image not showing? Click here -commands.nsfw.anal.help.description = Shows a random anal gif. -commands.nsfw.bdsm.help.description = Shows a random BDSM picture. -commands.nsfw.blowjob.help.description = Shows a random Blowjob picture. -commands.nsfw.boobs.help.description = Shows a random boob gif. -commands.nsfw.cum.help.description = Shows a random cum gif. -commands.nsfw.erotic.help.description = Shows a random erotic picture. -commands.nsfw.feet.help.description = Shows a random feet gif. -commands.nsfw.fingering.help.description = Shows a random fingering gif. -commands.nsfw.linking.help.description = Shows a random licking gif. -commands.nsfw.porn.help.description = Shows a random porn gif. -commands.nsfw.pussy.help.description = Shows a random pussy gif. -commands.nsfw.randomporn.help.description = Shows a completely random porn gif. -commands.nsfw.solo.help.description = Shows a random solo gif. -commands.nsfw.spank.help.description = Shows a random spank gif. -commands.nsfw.trans.help.description = Shows a random trans picture. +commands.moderation.ban.success.title=Successfully banned +commands.moderation.ban.success.description=I successfully baned +commands.moderation.ban.error.title=Not possible +commands.moderation.ban.myself.error.description=I can not ban myself\! +commands.moderation.ban.yourself.error.description=You can't ban yourself\! +commands.moderation.ban.help.description=Bans one ore more user from the server +commands.moderation.clear.number.error.description=You have to choose a number between 1 and 200\! +commands.moderation.clear.success.description=Successfully deleted 69 messages. +commands.moderation.clear.help.description=Deletes the specified number of messages. +commands.moderation.prefix.success.title=Successfully set +commands.moderation.prefix.success.description=I successfully set the new prefix for the guild to +commands.moderation.prefix.error.description=The prefix must not contain **** +commands.moderation.prefix.help.description=Sets the Guild-Prefix. +commands.moderation.invitedetect.activate.success.title=Successfully activated +commands.moderation.invitedetect.activate.success.description=I successfully activated the invite link detection for this guild. +commands.moderation.invitedetect.activate.error.title=Already activated +commands.moderation.invitedetect.activate.error.description=The invite link detection is already activated on this guild. +commands.moderation.invitedetect.deactivate.success.title=Successfully deactivated +commands.moderation.invitedetect.deactivate.success.description=I successfully deactivated the invite link detection for this guild. +commands.moderation.invitedetect.deactivate.error.title=Already deactivated +commands.moderation.invitedetect.deactivate.error.description=The invite link detection is already deactivated on this guild. +commands.moderation.invitedetect.help.description=Activate or deactivate the Discord invite link detection. +commands.moderation.kick.success.title=Successfully kicked +commands.moderation.kick.success.description=I successfully kicked +commands.moderation.kick.myself.error.description=I can not kick myself\! +commands.moderation.kick.yourself.error.description=You can't kick yourself. +commands.moderation.kick.mass.success.description=I successfully kicked 69 Members\! +commands.moderation.kick.help.description=Kicks one or more user from the server. +commands.moderation.link.request.success.description=If i'm on this guild i sent a message to accept the link. +commands.moderation.link.error.title=Wait that's illegal. +commands.moderation.link.request.error.description=You specified the same guild as the guild on which you're reading this +commands.moderation.link.request.accept.title=Skidder wants to link guilds\! +commands.moderation.link.request.accept.description=React with the reactions to accept or decline it +commands.moderation.link.set.title=Set the thing boi +commands.moderation.link.help.description=Links two or more servers. +commands.moderation.nick.success.title=Successfully nicked +commands.moderation.nick.success.description=I successfully nicked +commands.moderation.nick.myself.success.description=I successfully changed my nickname. +commands.moderation.nick.mass.success.description=I successfully nicked 69 Members\! +commands.moderation.nick.help.description=Rename a one or more user. diff --git a/src/main/resources/Translations/Translations_ru.properties b/src/main/resources/Translations/Translations_ru.properties index 6bd35a2..b7fd562 100644 --- a/src/main/resources/Translations/Translations_ru.properties +++ b/src/main/resources/Translations/Translations_ru.properties @@ -2,191 +2,118 @@ # @author Skidder / GregTCLTK # -# -# @author Skidder / GregTCLTK -# +Hadder=Hadder -Hadder = Hadder +user/id= <@User>/ +searchterm= +username= +number= +guildprefix= +<@User>=<@User> +on/off= +vc-name/id= +user+nickname=<@user> -searchterm = -username = -number = -guildprefix = -vc-name/id = -user+nickname = <@user> -region = +error=Error +none=None +success\!=Success\! -error = Error -none = None -success\! = Success\! +commands.fun.avatar.success.title=Avatar of +commands.fun.avatar.help.description=Sends the avatar of the specified member. +commands.fun.gif.error.description=Please try again with another term. +commands.fun.gif.help.description=Look for a GIF on Giphy +commands.fun.meme.success.title=Your random meme +commands.fun.meme.api.error=The request to the meme API could not be processed. Please try it again later. +commands.fun.meme.help.description=Sends you a random meme. -commands.fun.avatar.success.title = Avatar of %extra% -commands.fun.avatar.help.description = Sends the avatar of the specified member. -commands.fun.gif.error.description = Please try again with another term. -commands.fun.gif.help.description = Look for a GIF on Giphy -commands.fun.meme.success.title = Your random meme -commands.fun.meme.api.error = The request to the meme API could not be processed. Please try it again later. -commands.fun.meme.help.description = Sends you a random meme. +commands.general.about.success.title=Hadder - About +commands.general.about.success.description=Hadder is an open source Discord bot. +commands.general.about.success.field.one.title=Support the Developers +commands.general.about.success.field.one.description=Hadder is completely free for everyone. We would appreciate it you donate some money [here] +commands.general.about.help.description=Shows infos about Hadder +commands.general.equals.string.first.request=Please send me the first String +commands.general.equals.string.second.request=Please send me the second String +commands.general.equals.string.equals.true=Yes\! The first string equals the second string\! +commands.general.equals.string.equals.false=Well yes but actually No. This isn't the same. +commands.general.equals.string.first=First String +commands.general.equals.string.second=Second String +commands.general.equals.string.result=Result +commands.general.equals.help.description=Check if two strings are the same +commands.general.help.error.description=I need the Embed Links Permission to send the Help Menu\! +commands.general.help.help.description=Shows each command or explains its usage +commands.general.help.help.label=[CommandName] +commands.general.invite.success.title=Invite me\! +commands.general.invite.success.description=[Invite me here\!] +commands.general.invite.help.description=Shows the invitation to invite Hadder to your server +commands.general.ping.help.description=Shows the ping to the Discord API -commands.general.about.success.title = Hadder - About -commands.general.about.success.description = Hadder is an open source Discord bot. -commands.general.about.success.field.one.title = Support the Developers -commands.general.about.success.field.one.description = Hadder is completely free for everyone. We would appreciate it you donate some money [here]%extra% -commands.general.about.help.description = Shows infos about Hadder -commands.general.equals.string.first.request = Please send me the first String -commands.general.equals.string.second.request = Please send me the second String -commands.general.equals.string.equals.true = Yes\! The first string equals the second string\! -commands.general.equals.string.equals.false = Well yes but actually No. This isn't the same. -commands.general.equals.string.first = First String -commands.general.equals.string.second = Second String -commands.general.equals.string.result = Result -commands.general.equals.help.description = Check if two strings are the same -commands.general.help.field.usage = Usage -commands.general.help.error.description = I need the Embed Links Permission to send the Help Menu\! -commands.general.help.help.description = Shows each command or explains its usage -commands.general.help.help.label = [CommandName] -commands.general.invite.success.title = Invite me\! -commands.general.invite.success.description = [Invite me here\!]%extra% -commands.general.invite.help.description = Shows the invitation to invite Hadder to your server -commands.general.ping.help.description = Shows the ping to the Discord API +commands.misc.feedback.title.request.title=Feedback Topic +commands.misc.feedback.title.request.description=Please send me the feedback topic. +commands.misc.feedback.description.request.title=Feedback Description +commands.misc.feedback.description.request.description=Please send me the feedback description now. +commands.misc.feedback.help.description=Sends feedback directly to the developers. +commands.misc.github.link.title=Link your GitHub Account +commands.misc.github.success.title=Information about +commands.misc.github.success.bio=User bio +commands.misc.github.success.location=Location +commands.misc.github.success.website=Website +commands.misc.github.success.repositories=Public repositories +commands.misc.github.success.gists=Public gists +commands.misc.github.success.followers=Followers +commands.misc.github.success.following=Following +commands.misc.github.api.error.description=The GitHub API might be down at the moment\! +commands.misc.github.user.error.description=This user does not exist\! +commands.misc.github.connect.title=Connect you GH account +commands.misc.github.connect.description=Please connect your GitHub account here +commands.misc.github.help.description=Displays information about a GitHub user profile. +commands.misc.screenshare.success.title=Here's your Url to share your Screen +commands.misc.screenshare.id.error.title=Wait that's illegal +commands.misc.screenshare.id.error.description=This ID is invalid. \nMaybe you entered a wrong ID? \n\nNote\: Make sure the Voice Channel is on this Guild. +commands.misc.screenshare.channel.error.title=Please Choose a Voice Channel +commands.misc.screenshare.channel.error.description=There is more than one channel with this name +commands.misc.screenshare.number.error.title=You specified a wrong number\! +commands.misc.screenshare.number.error.description=This isn't a Number. +commands.misc.screenshare.channel.existing.error=Hol' up +commands.misc.screenshare.channel.existing.description=There is no Voice Channel named like this. \n\nNote\: Make sure the Voice Channel is on this Guild. +commands.misc.screenshare.help.description=Shows you the link to share your screen. -commands.misc.feedback.title.request.title = Feedback Topic -commands.misc.feedback.title.request.description = Please send me the feedback topic. -commands.misc.feedback.description.request.title = Feedback Description -commands.misc.feedback.description.request.description = Please send me the feedback description now. -commands.misc.feedback.help.description = Sends feedback directly to the developers. -commands.misc.feedback.success.title = Feedback successfully sent -commands.misc.github.link.title = Link your GitHub Account -commands.misc.github.success.title = Information about %extra% -commands.misc.github.success.bio = User bio -commands.misc.github.success.location = Location -commands.misc.github.success.website = Website -commands.misc.github.success.repositories = Public repositories -commands.misc.github.success.gists = Public gists -commands.misc.github.success.followers = Followers -commands.misc.github.success.following = Following -commands.misc.github.api.error.description = The GitHub API might be down at the moment\! -commands.misc.github.user.error.description = This user does not exist\! -commands.misc.github.connect.title = Connect you GH account -commands.misc.github.connect.description = [Please connect your GitHub account here]%extra% -commands.misc.github.help.description = Displays information about a GitHub user profile. -commands.misc.screenshare.success.title = Here's your Url to share your Screen -commands.misc.screenshare.id.error.title = Wait that's illegal -commands.misc.screenshare.id.error.description = This ID is invalid. \nMaybe you entered a wrong ID? \n\nNote\: Make sure the Voice Channel is on this Guild. -commands.misc.screenshare.channel.error.title = Please Choose a Voice Channel -commands.misc.screenshare.channel.error.description = There is more than one channel with this name -commands.misc.screenshare.number.error.title = You specified a wrong number\! -commands.misc.screenshare.number.error.description = This isn't a Number. -commands.misc.screenshare.channel.existing.error = Hol' up -commands.misc.screenshare.channel.existing.description = There is no Voice Channel named like this. \n\nNote\: Make sure the Voice Channel is on this Guild. -commands.misc.screenshare.help.description = Shows you the link to share your screen. - -commands.moderation.ban.success.title = %extra% Successfully banned %extra% -commands.moderation.ban.success.description = I successfully baned %extra% -commands.moderation.ban.error.title = Not possible -commands.moderation.ban.myself.error.description = I can not ban myself\! -commands.moderation.ban.yourself.error.description = You can not ban yourself\! -commands.moderation.ban.massban.success.description = I successfully baned %extra% Members\! -commands.moderation.ban.help.description = Bans one ore more user from the server -commands.moderation.clear.number.error.description = You have to choose a number between 1 and 99\! -commands.moderation.clear.success.description = Successfully deleted %extra% messages. -commands.moderation.clear.help.description = Deletes the specified number of messages. -commands.moderation.prefix.success.title = %extra% Successfully set %extra% -commands.moderation.prefix.success.description = I successfully set the new prefix for the guild to %extra% -commands.moderation.prefix.error.description = The prefix must not contain **"** -commands.moderation.prefix.help.description = Sets the Guild-Prefix. -commands.moderation.invitedetect.activate.success.title = Successfully activated -commands.moderation.invitedetect.activate.success.description = I successfully activated the invite link detection for this guild. -commands.moderation.invitedetect.activate.error.title = Already activated -commands.moderation.invitedetect.activate.error.description = The invite link detection is already activated on this guild. -commands.moderation.invitedetect.deactivate.success.title = Successfully deactivated -commands.moderation.invitedetect.deactivate.success.description = I successfully deactivated the invite link detection for this guild. -commands.moderation.invitedetect.deactivate.error.title = Already deactivated -commands.moderation.invitedetect.deactivate.error.description = The invite link detection is already deactivated on this guild. -commands.moderation.invitedetect.help.description = Activate or deactivate the Discord invite link detection. -commands.moderation.kick.success.title = %extra% Successfully kicked %extra% -commands.moderation.kick.success.description = I successfully kicked %extra%. -commands.moderation.kick.error.title = Not possible -commands.moderation.kick.myself.error.description = I can not kick myself\! -commands.moderation.kick.yourself.error.description = You can't kick yourself. -commands.moderation.kick.mass.success.description = I successfully kicked 69 Members\! -commands.moderation.kick.help.description = Kicks one or more user from the server. -commands.moderation.kick.masskick.success.description = I successfully kicked %extra% members. -commands.moderation.link.request.success.description = If i'm on this guild i sent a message to accept the link. -commands.moderation.link.error.title = Wait that's illegal. -commands.moderation.link.request.error.description = You specified the same guild as the guild on which you're reading this -commands.moderation.link.request.accept.title = ) wants to link guilds\! -commands.moderation.link.request.accept.description = React with the reactions to accept or decline it -commands.moderation.link.set.title = Set the thing boi -commands.moderation.link.help.description = Links two or more servers. -commands.moderation.nick.success.title = %extra% Successfully nicked %extra% -commands.moderation.nick.success.description = I successfully nicked %extra%. -commands.moderation.nick.myself.success.description = I successfully changed my nickname. -commands.moderation.nick.massnick.success.description = I successfully nicked %extra% Members. -commands.moderation.nick.help.description = Rename a one or more user. -commands.moderation.regionchange.regions.title = All regions -commands.moderation.regionchange.success.title = Successfully set region -commands.moderation.regionchange.success.description = I successfully set the new server region to %extra%. -commands.moderation.regionchange.help.description = Changes the server region to locked regions. -commands.moderation.role.add.success.title = %extra% Successfully added role(s) %extra% -commands.moderation.role.add.success.description = I successfully added %extra% roles to %extra_two% members. -commands.moderation.role.remove.success.title = %extra% Successfully removed role(s) %extra% -commands.moderation.role.remove.success.description = I successfully removed %extra% roles from %extra_two% members. -commands.moderation.role.help.description = Adds and removes one or more role(s) from one or more user(s) -commands.moderation.rules.setup.title = Set up rules -commands.moderation.rules.setup.description = Welcome to the Hadder rules setup. Please mention the channel in which I should send the rules. Your message should look like\: \#rules or \#verify. -commands.moderation.rules.channel.error.title = Channel not found -commands.moderation.rules.channel.error.description = I can't find the specified channel. Please start the setup again. -commands.moderation.rules.rules.title = Rules -commands.moderation.rules.rules.description = The channel was successfully set to %extra%. Please send me the rules now. -commands.moderation.rules.role.title = Role to assign -commands.moderation.rules.role.description = The rules were successfully set. Please send me the name of the role which the user receives after he accepted the rules. -commands.moderation.rules.role.error.title = Role does not exist -commands.moderation.rules.role.error.description = The specified role does not exist on this guild. -commands.moderation.rules.guild.error.title = Wrong Guild -commands.moderation.rules.guild.error.description = The mentioned channel must be on this guild\! -commands.moderation.rules.emote.accept.title = Custom Accept Emote -commands.moderation.rules.emote.accept.description = The role has been successfully set to %extra%. Now send me the emote on which your user should react to to get verified. -commands.moderation.rules.emote.decline.title = Custom Decline Emote -commands.moderation.rules.emote.decline.description = The first emote has been successfully set to %extra%. Please send me now the decline emote. -commands.moderation.rules.success.title = Successfully set the rules -commands.moderation.rules.success.description = I successfully send the rules in %extra%. -commands.moderation.rules.emote.error.access.description = I can not access the custom emote(s). -commands.moderation.rules.emote.error.equal.title = Emotes are equal -commands.moderation.rules.emote.error.equal.description = The 1st and 2nd emote equals each other. -commands.moderation.rules.emoji.decline.description = The first emote has been successfully set. Please send me now the decline emote. -commands.moderation.rules.emoji.error.description = The given emote can't be used. -commands.moderation.rules.help.description = Setup the rules on your Discord server - -commands.music.join.success.title = Successfully connected -commands.music.join.success.description = I successfully connected to %extra%. -commands.music.join.error.connecting.already.title = Already connected -commands.music.join.error.connecting.already.description = I am already connected to your voice channel. -commands.music.join.error.connecting.trying.title = Already trying to connect -commands.music.join.error.connecting.trying.description = Hadder is already trying to connect. Please wait a moment. -commands.music.join.error.channel.title = No Voice Channel -commands.music.join.error.channel.description = You aren't in a Voice Channel. -commands.music.join.help.description = Joins your voice channel -commands.music.leave.success.title = \= Successfully disconnected -commands.music.leave.success.description = I successfully disconnected from the Voice Channel -commands.music.leave.error.tile = Not connected -commands.music.leave.error.description = I'm currently in no Voice Channel on this Guild -commands.music.leave.help.description = Leaves a voice channel - -commands.nsfw.gif.error.title = GIF not showing? Click here -commands.nsfw.img.error.title = Image not showing? Click here -commands.nsfw.anal.help.description = Shows a random anal gif. -commands.nsfw.bdsm.help.description = Shows a random BDSM picture. -commands.nsfw.blowjob.help.description = Shows a random Blowjob picture. -commands.nsfw.boobs.help.description = Shows a random boob gif. -commands.nsfw.cum.help.description = Shows a random cum gif. -commands.nsfw.erotic.help.description = Shows a random erotic picture. -commands.nsfw.feet.help.description = Shows a random feet gif. -commands.nsfw.fingering.help.description = Shows a random fingering gif. -commands.nsfw.linking.help.description = Shows a random licking gif. -commands.nsfw.porn.help.description = Shows a random porn gif. -commands.nsfw.pussy.help.description = Shows a random pussy gif. -commands.nsfw.randomporn.help.description = Shows a completely random porn gif. -commands.nsfw.solo.help.description = Shows a random solo gif. -commands.nsfw.spank.help.description = Shows a random spank gif. -commands.nsfw.trans.help.description = Shows a random trans picture. +commands.moderation.ban.success.title=Successfully banned +commands.moderation.ban.success.description=I successfully baned +commands.moderation.ban.error.title=Not possible +commands.moderation.ban.myself.error.description=I can not ban myself\! +commands.moderation.ban.yourself.error.description=You can't ban yourself\! +commands.moderation.ban.help.description=Bans one ore more user from the server +commands.moderation.clear.number.error.description=You have to choose a number between 1 and 200\! +commands.moderation.clear.success.description=Successfully deleted 69 messages. +commands.moderation.clear.help.description=Deletes the specified number of messages. +commands.moderation.prefix.success.title=Successfully set +commands.moderation.prefix.success.description=I successfully set the new prefix for the guild to +commands.moderation.prefix.error.description=The prefix must not contain **** +commands.moderation.prefix.help.description=Sets the Guild-Prefix. +commands.moderation.invitedetect.activate.success.title=Successfully activated +commands.moderation.invitedetect.activate.success.description=I successfully activated the invite link detection for this guild. +commands.moderation.invitedetect.activate.error.title=Already activated +commands.moderation.invitedetect.activate.error.description=The invite link detection is already activated on this guild. +commands.moderation.invitedetect.deactivate.success.title=Successfully deactivated +commands.moderation.invitedetect.deactivate.success.description=I successfully deactivated the invite link detection for this guild. +commands.moderation.invitedetect.deactivate.error.title=Already deactivated +commands.moderation.invitedetect.deactivate.error.description=The invite link detection is already deactivated on this guild. +commands.moderation.invitedetect.help.description=Activate or deactivate the Discord invite link detection. +commands.moderation.kick.success.title=Successfully kicked +commands.moderation.kick.success.description=I successfully kicked +commands.moderation.kick.myself.error.description=I can not kick myself\! +commands.moderation.kick.yourself.error.description=You can't kick yourself. +commands.moderation.kick.mass.success.description=I successfully kicked 69 Members\! +commands.moderation.kick.help.description=Kicks one or more user from the server. +commands.moderation.link.request.success.description=If i'm on this guild i sent a message to accept the link. +commands.moderation.link.error.title=Wait that's illegal. +commands.moderation.link.request.error.description=You specified the same guild as the guild on which you're reading this +commands.moderation.link.request.accept.title=Skidder wants to link guilds\! +commands.moderation.link.request.accept.description=React with the reactions to accept or decline it +commands.moderation.link.set.title=Set the thing boi +commands.moderation.link.help.description=Links two or more servers. +commands.moderation.nick.success.title=Successfully nicked +commands.moderation.nick.success.description=I successfully nicked +commands.moderation.nick.myself.success.description=I successfully changed my nickname. +commands.moderation.nick.mass.success.description=I successfully nicked 69 Members\! +commands.moderation.nick.help.description=Rename a one or more user. diff --git a/src/main/resources/Translations/Translations_tr.properties b/src/main/resources/Translations/Translations_tr.properties index 6bd35a2..b7fd562 100644 --- a/src/main/resources/Translations/Translations_tr.properties +++ b/src/main/resources/Translations/Translations_tr.properties @@ -2,191 +2,118 @@ # @author Skidder / GregTCLTK # -# -# @author Skidder / GregTCLTK -# +Hadder=Hadder -Hadder = Hadder +user/id= <@User>/ +searchterm= +username= +number= +guildprefix= +<@User>=<@User> +on/off= +vc-name/id= +user+nickname=<@user> -searchterm = -username = -number = -guildprefix = -vc-name/id = -user+nickname = <@user> -region = +error=Error +none=None +success\!=Success\! -error = Error -none = None -success\! = Success\! +commands.fun.avatar.success.title=Avatar of +commands.fun.avatar.help.description=Sends the avatar of the specified member. +commands.fun.gif.error.description=Please try again with another term. +commands.fun.gif.help.description=Look for a GIF on Giphy +commands.fun.meme.success.title=Your random meme +commands.fun.meme.api.error=The request to the meme API could not be processed. Please try it again later. +commands.fun.meme.help.description=Sends you a random meme. -commands.fun.avatar.success.title = Avatar of %extra% -commands.fun.avatar.help.description = Sends the avatar of the specified member. -commands.fun.gif.error.description = Please try again with another term. -commands.fun.gif.help.description = Look for a GIF on Giphy -commands.fun.meme.success.title = Your random meme -commands.fun.meme.api.error = The request to the meme API could not be processed. Please try it again later. -commands.fun.meme.help.description = Sends you a random meme. +commands.general.about.success.title=Hadder - About +commands.general.about.success.description=Hadder is an open source Discord bot. +commands.general.about.success.field.one.title=Support the Developers +commands.general.about.success.field.one.description=Hadder is completely free for everyone. We would appreciate it you donate some money [here] +commands.general.about.help.description=Shows infos about Hadder +commands.general.equals.string.first.request=Please send me the first String +commands.general.equals.string.second.request=Please send me the second String +commands.general.equals.string.equals.true=Yes\! The first string equals the second string\! +commands.general.equals.string.equals.false=Well yes but actually No. This isn't the same. +commands.general.equals.string.first=First String +commands.general.equals.string.second=Second String +commands.general.equals.string.result=Result +commands.general.equals.help.description=Check if two strings are the same +commands.general.help.error.description=I need the Embed Links Permission to send the Help Menu\! +commands.general.help.help.description=Shows each command or explains its usage +commands.general.help.help.label=[CommandName] +commands.general.invite.success.title=Invite me\! +commands.general.invite.success.description=[Invite me here\!] +commands.general.invite.help.description=Shows the invitation to invite Hadder to your server +commands.general.ping.help.description=Shows the ping to the Discord API -commands.general.about.success.title = Hadder - About -commands.general.about.success.description = Hadder is an open source Discord bot. -commands.general.about.success.field.one.title = Support the Developers -commands.general.about.success.field.one.description = Hadder is completely free for everyone. We would appreciate it you donate some money [here]%extra% -commands.general.about.help.description = Shows infos about Hadder -commands.general.equals.string.first.request = Please send me the first String -commands.general.equals.string.second.request = Please send me the second String -commands.general.equals.string.equals.true = Yes\! The first string equals the second string\! -commands.general.equals.string.equals.false = Well yes but actually No. This isn't the same. -commands.general.equals.string.first = First String -commands.general.equals.string.second = Second String -commands.general.equals.string.result = Result -commands.general.equals.help.description = Check if two strings are the same -commands.general.help.field.usage = Usage -commands.general.help.error.description = I need the Embed Links Permission to send the Help Menu\! -commands.general.help.help.description = Shows each command or explains its usage -commands.general.help.help.label = [CommandName] -commands.general.invite.success.title = Invite me\! -commands.general.invite.success.description = [Invite me here\!]%extra% -commands.general.invite.help.description = Shows the invitation to invite Hadder to your server -commands.general.ping.help.description = Shows the ping to the Discord API +commands.misc.feedback.title.request.title=Feedback Topic +commands.misc.feedback.title.request.description=Please send me the feedback topic. +commands.misc.feedback.description.request.title=Feedback Description +commands.misc.feedback.description.request.description=Please send me the feedback description now. +commands.misc.feedback.help.description=Sends feedback directly to the developers. +commands.misc.github.link.title=Link your GitHub Account +commands.misc.github.success.title=Information about +commands.misc.github.success.bio=User bio +commands.misc.github.success.location=Location +commands.misc.github.success.website=Website +commands.misc.github.success.repositories=Public repositories +commands.misc.github.success.gists=Public gists +commands.misc.github.success.followers=Followers +commands.misc.github.success.following=Following +commands.misc.github.api.error.description=The GitHub API might be down at the moment\! +commands.misc.github.user.error.description=This user does not exist\! +commands.misc.github.connect.title=Connect you GH account +commands.misc.github.connect.description=Please connect your GitHub account here +commands.misc.github.help.description=Displays information about a GitHub user profile. +commands.misc.screenshare.success.title=Here's your Url to share your Screen +commands.misc.screenshare.id.error.title=Wait that's illegal +commands.misc.screenshare.id.error.description=This ID is invalid. \nMaybe you entered a wrong ID? \n\nNote\: Make sure the Voice Channel is on this Guild. +commands.misc.screenshare.channel.error.title=Please Choose a Voice Channel +commands.misc.screenshare.channel.error.description=There is more than one channel with this name +commands.misc.screenshare.number.error.title=You specified a wrong number\! +commands.misc.screenshare.number.error.description=This isn't a Number. +commands.misc.screenshare.channel.existing.error=Hol' up +commands.misc.screenshare.channel.existing.description=There is no Voice Channel named like this. \n\nNote\: Make sure the Voice Channel is on this Guild. +commands.misc.screenshare.help.description=Shows you the link to share your screen. -commands.misc.feedback.title.request.title = Feedback Topic -commands.misc.feedback.title.request.description = Please send me the feedback topic. -commands.misc.feedback.description.request.title = Feedback Description -commands.misc.feedback.description.request.description = Please send me the feedback description now. -commands.misc.feedback.help.description = Sends feedback directly to the developers. -commands.misc.feedback.success.title = Feedback successfully sent -commands.misc.github.link.title = Link your GitHub Account -commands.misc.github.success.title = Information about %extra% -commands.misc.github.success.bio = User bio -commands.misc.github.success.location = Location -commands.misc.github.success.website = Website -commands.misc.github.success.repositories = Public repositories -commands.misc.github.success.gists = Public gists -commands.misc.github.success.followers = Followers -commands.misc.github.success.following = Following -commands.misc.github.api.error.description = The GitHub API might be down at the moment\! -commands.misc.github.user.error.description = This user does not exist\! -commands.misc.github.connect.title = Connect you GH account -commands.misc.github.connect.description = [Please connect your GitHub account here]%extra% -commands.misc.github.help.description = Displays information about a GitHub user profile. -commands.misc.screenshare.success.title = Here's your Url to share your Screen -commands.misc.screenshare.id.error.title = Wait that's illegal -commands.misc.screenshare.id.error.description = This ID is invalid. \nMaybe you entered a wrong ID? \n\nNote\: Make sure the Voice Channel is on this Guild. -commands.misc.screenshare.channel.error.title = Please Choose a Voice Channel -commands.misc.screenshare.channel.error.description = There is more than one channel with this name -commands.misc.screenshare.number.error.title = You specified a wrong number\! -commands.misc.screenshare.number.error.description = This isn't a Number. -commands.misc.screenshare.channel.existing.error = Hol' up -commands.misc.screenshare.channel.existing.description = There is no Voice Channel named like this. \n\nNote\: Make sure the Voice Channel is on this Guild. -commands.misc.screenshare.help.description = Shows you the link to share your screen. - -commands.moderation.ban.success.title = %extra% Successfully banned %extra% -commands.moderation.ban.success.description = I successfully baned %extra% -commands.moderation.ban.error.title = Not possible -commands.moderation.ban.myself.error.description = I can not ban myself\! -commands.moderation.ban.yourself.error.description = You can not ban yourself\! -commands.moderation.ban.massban.success.description = I successfully baned %extra% Members\! -commands.moderation.ban.help.description = Bans one ore more user from the server -commands.moderation.clear.number.error.description = You have to choose a number between 1 and 99\! -commands.moderation.clear.success.description = Successfully deleted %extra% messages. -commands.moderation.clear.help.description = Deletes the specified number of messages. -commands.moderation.prefix.success.title = %extra% Successfully set %extra% -commands.moderation.prefix.success.description = I successfully set the new prefix for the guild to %extra% -commands.moderation.prefix.error.description = The prefix must not contain **"** -commands.moderation.prefix.help.description = Sets the Guild-Prefix. -commands.moderation.invitedetect.activate.success.title = Successfully activated -commands.moderation.invitedetect.activate.success.description = I successfully activated the invite link detection for this guild. -commands.moderation.invitedetect.activate.error.title = Already activated -commands.moderation.invitedetect.activate.error.description = The invite link detection is already activated on this guild. -commands.moderation.invitedetect.deactivate.success.title = Successfully deactivated -commands.moderation.invitedetect.deactivate.success.description = I successfully deactivated the invite link detection for this guild. -commands.moderation.invitedetect.deactivate.error.title = Already deactivated -commands.moderation.invitedetect.deactivate.error.description = The invite link detection is already deactivated on this guild. -commands.moderation.invitedetect.help.description = Activate or deactivate the Discord invite link detection. -commands.moderation.kick.success.title = %extra% Successfully kicked %extra% -commands.moderation.kick.success.description = I successfully kicked %extra%. -commands.moderation.kick.error.title = Not possible -commands.moderation.kick.myself.error.description = I can not kick myself\! -commands.moderation.kick.yourself.error.description = You can't kick yourself. -commands.moderation.kick.mass.success.description = I successfully kicked 69 Members\! -commands.moderation.kick.help.description = Kicks one or more user from the server. -commands.moderation.kick.masskick.success.description = I successfully kicked %extra% members. -commands.moderation.link.request.success.description = If i'm on this guild i sent a message to accept the link. -commands.moderation.link.error.title = Wait that's illegal. -commands.moderation.link.request.error.description = You specified the same guild as the guild on which you're reading this -commands.moderation.link.request.accept.title = ) wants to link guilds\! -commands.moderation.link.request.accept.description = React with the reactions to accept or decline it -commands.moderation.link.set.title = Set the thing boi -commands.moderation.link.help.description = Links two or more servers. -commands.moderation.nick.success.title = %extra% Successfully nicked %extra% -commands.moderation.nick.success.description = I successfully nicked %extra%. -commands.moderation.nick.myself.success.description = I successfully changed my nickname. -commands.moderation.nick.massnick.success.description = I successfully nicked %extra% Members. -commands.moderation.nick.help.description = Rename a one or more user. -commands.moderation.regionchange.regions.title = All regions -commands.moderation.regionchange.success.title = Successfully set region -commands.moderation.regionchange.success.description = I successfully set the new server region to %extra%. -commands.moderation.regionchange.help.description = Changes the server region to locked regions. -commands.moderation.role.add.success.title = %extra% Successfully added role(s) %extra% -commands.moderation.role.add.success.description = I successfully added %extra% roles to %extra_two% members. -commands.moderation.role.remove.success.title = %extra% Successfully removed role(s) %extra% -commands.moderation.role.remove.success.description = I successfully removed %extra% roles from %extra_two% members. -commands.moderation.role.help.description = Adds and removes one or more role(s) from one or more user(s) -commands.moderation.rules.setup.title = Set up rules -commands.moderation.rules.setup.description = Welcome to the Hadder rules setup. Please mention the channel in which I should send the rules. Your message should look like\: \#rules or \#verify. -commands.moderation.rules.channel.error.title = Channel not found -commands.moderation.rules.channel.error.description = I can't find the specified channel. Please start the setup again. -commands.moderation.rules.rules.title = Rules -commands.moderation.rules.rules.description = The channel was successfully set to %extra%. Please send me the rules now. -commands.moderation.rules.role.title = Role to assign -commands.moderation.rules.role.description = The rules were successfully set. Please send me the name of the role which the user receives after he accepted the rules. -commands.moderation.rules.role.error.title = Role does not exist -commands.moderation.rules.role.error.description = The specified role does not exist on this guild. -commands.moderation.rules.guild.error.title = Wrong Guild -commands.moderation.rules.guild.error.description = The mentioned channel must be on this guild\! -commands.moderation.rules.emote.accept.title = Custom Accept Emote -commands.moderation.rules.emote.accept.description = The role has been successfully set to %extra%. Now send me the emote on which your user should react to to get verified. -commands.moderation.rules.emote.decline.title = Custom Decline Emote -commands.moderation.rules.emote.decline.description = The first emote has been successfully set to %extra%. Please send me now the decline emote. -commands.moderation.rules.success.title = Successfully set the rules -commands.moderation.rules.success.description = I successfully send the rules in %extra%. -commands.moderation.rules.emote.error.access.description = I can not access the custom emote(s). -commands.moderation.rules.emote.error.equal.title = Emotes are equal -commands.moderation.rules.emote.error.equal.description = The 1st and 2nd emote equals each other. -commands.moderation.rules.emoji.decline.description = The first emote has been successfully set. Please send me now the decline emote. -commands.moderation.rules.emoji.error.description = The given emote can't be used. -commands.moderation.rules.help.description = Setup the rules on your Discord server - -commands.music.join.success.title = Successfully connected -commands.music.join.success.description = I successfully connected to %extra%. -commands.music.join.error.connecting.already.title = Already connected -commands.music.join.error.connecting.already.description = I am already connected to your voice channel. -commands.music.join.error.connecting.trying.title = Already trying to connect -commands.music.join.error.connecting.trying.description = Hadder is already trying to connect. Please wait a moment. -commands.music.join.error.channel.title = No Voice Channel -commands.music.join.error.channel.description = You aren't in a Voice Channel. -commands.music.join.help.description = Joins your voice channel -commands.music.leave.success.title = \= Successfully disconnected -commands.music.leave.success.description = I successfully disconnected from the Voice Channel -commands.music.leave.error.tile = Not connected -commands.music.leave.error.description = I'm currently in no Voice Channel on this Guild -commands.music.leave.help.description = Leaves a voice channel - -commands.nsfw.gif.error.title = GIF not showing? Click here -commands.nsfw.img.error.title = Image not showing? Click here -commands.nsfw.anal.help.description = Shows a random anal gif. -commands.nsfw.bdsm.help.description = Shows a random BDSM picture. -commands.nsfw.blowjob.help.description = Shows a random Blowjob picture. -commands.nsfw.boobs.help.description = Shows a random boob gif. -commands.nsfw.cum.help.description = Shows a random cum gif. -commands.nsfw.erotic.help.description = Shows a random erotic picture. -commands.nsfw.feet.help.description = Shows a random feet gif. -commands.nsfw.fingering.help.description = Shows a random fingering gif. -commands.nsfw.linking.help.description = Shows a random licking gif. -commands.nsfw.porn.help.description = Shows a random porn gif. -commands.nsfw.pussy.help.description = Shows a random pussy gif. -commands.nsfw.randomporn.help.description = Shows a completely random porn gif. -commands.nsfw.solo.help.description = Shows a random solo gif. -commands.nsfw.spank.help.description = Shows a random spank gif. -commands.nsfw.trans.help.description = Shows a random trans picture. +commands.moderation.ban.success.title=Successfully banned +commands.moderation.ban.success.description=I successfully baned +commands.moderation.ban.error.title=Not possible +commands.moderation.ban.myself.error.description=I can not ban myself\! +commands.moderation.ban.yourself.error.description=You can't ban yourself\! +commands.moderation.ban.help.description=Bans one ore more user from the server +commands.moderation.clear.number.error.description=You have to choose a number between 1 and 200\! +commands.moderation.clear.success.description=Successfully deleted 69 messages. +commands.moderation.clear.help.description=Deletes the specified number of messages. +commands.moderation.prefix.success.title=Successfully set +commands.moderation.prefix.success.description=I successfully set the new prefix for the guild to +commands.moderation.prefix.error.description=The prefix must not contain **** +commands.moderation.prefix.help.description=Sets the Guild-Prefix. +commands.moderation.invitedetect.activate.success.title=Successfully activated +commands.moderation.invitedetect.activate.success.description=I successfully activated the invite link detection for this guild. +commands.moderation.invitedetect.activate.error.title=Already activated +commands.moderation.invitedetect.activate.error.description=The invite link detection is already activated on this guild. +commands.moderation.invitedetect.deactivate.success.title=Successfully deactivated +commands.moderation.invitedetect.deactivate.success.description=I successfully deactivated the invite link detection for this guild. +commands.moderation.invitedetect.deactivate.error.title=Already deactivated +commands.moderation.invitedetect.deactivate.error.description=The invite link detection is already deactivated on this guild. +commands.moderation.invitedetect.help.description=Activate or deactivate the Discord invite link detection. +commands.moderation.kick.success.title=Successfully kicked +commands.moderation.kick.success.description=I successfully kicked +commands.moderation.kick.myself.error.description=I can not kick myself\! +commands.moderation.kick.yourself.error.description=You can't kick yourself. +commands.moderation.kick.mass.success.description=I successfully kicked 69 Members\! +commands.moderation.kick.help.description=Kicks one or more user from the server. +commands.moderation.link.request.success.description=If i'm on this guild i sent a message to accept the link. +commands.moderation.link.error.title=Wait that's illegal. +commands.moderation.link.request.error.description=You specified the same guild as the guild on which you're reading this +commands.moderation.link.request.accept.title=Skidder wants to link guilds\! +commands.moderation.link.request.accept.description=React with the reactions to accept or decline it +commands.moderation.link.set.title=Set the thing boi +commands.moderation.link.help.description=Links two or more servers. +commands.moderation.nick.success.title=Successfully nicked +commands.moderation.nick.success.description=I successfully nicked +commands.moderation.nick.myself.success.description=I successfully changed my nickname. +commands.moderation.nick.mass.success.description=I successfully nicked 69 Members\! +commands.moderation.nick.help.description=Rename a one or more user. diff --git a/src/main/resources/Translations/Translations_zh.properties b/src/main/resources/Translations/Translations_zh.properties index 6bd35a2..b7fd562 100644 --- a/src/main/resources/Translations/Translations_zh.properties +++ b/src/main/resources/Translations/Translations_zh.properties @@ -2,191 +2,118 @@ # @author Skidder / GregTCLTK # -# -# @author Skidder / GregTCLTK -# +Hadder=Hadder -Hadder = Hadder +user/id= <@User>/ +searchterm= +username= +number= +guildprefix= +<@User>=<@User> +on/off= +vc-name/id= +user+nickname=<@user> -searchterm = -username = -number = -guildprefix = -vc-name/id = -user+nickname = <@user> -region = +error=Error +none=None +success\!=Success\! -error = Error -none = None -success\! = Success\! +commands.fun.avatar.success.title=Avatar of +commands.fun.avatar.help.description=Sends the avatar of the specified member. +commands.fun.gif.error.description=Please try again with another term. +commands.fun.gif.help.description=Look for a GIF on Giphy +commands.fun.meme.success.title=Your random meme +commands.fun.meme.api.error=The request to the meme API could not be processed. Please try it again later. +commands.fun.meme.help.description=Sends you a random meme. -commands.fun.avatar.success.title = Avatar of %extra% -commands.fun.avatar.help.description = Sends the avatar of the specified member. -commands.fun.gif.error.description = Please try again with another term. -commands.fun.gif.help.description = Look for a GIF on Giphy -commands.fun.meme.success.title = Your random meme -commands.fun.meme.api.error = The request to the meme API could not be processed. Please try it again later. -commands.fun.meme.help.description = Sends you a random meme. +commands.general.about.success.title=Hadder - About +commands.general.about.success.description=Hadder is an open source Discord bot. +commands.general.about.success.field.one.title=Support the Developers +commands.general.about.success.field.one.description=Hadder is completely free for everyone. We would appreciate it you donate some money [here] +commands.general.about.help.description=Shows infos about Hadder +commands.general.equals.string.first.request=Please send me the first String +commands.general.equals.string.second.request=Please send me the second String +commands.general.equals.string.equals.true=Yes\! The first string equals the second string\! +commands.general.equals.string.equals.false=Well yes but actually No. This isn't the same. +commands.general.equals.string.first=First String +commands.general.equals.string.second=Second String +commands.general.equals.string.result=Result +commands.general.equals.help.description=Check if two strings are the same +commands.general.help.error.description=I need the Embed Links Permission to send the Help Menu\! +commands.general.help.help.description=Shows each command or explains its usage +commands.general.help.help.label=[CommandName] +commands.general.invite.success.title=Invite me\! +commands.general.invite.success.description=[Invite me here\!] +commands.general.invite.help.description=Shows the invitation to invite Hadder to your server +commands.general.ping.help.description=Shows the ping to the Discord API -commands.general.about.success.title = Hadder - About -commands.general.about.success.description = Hadder is an open source Discord bot. -commands.general.about.success.field.one.title = Support the Developers -commands.general.about.success.field.one.description = Hadder is completely free for everyone. We would appreciate it you donate some money [here]%extra% -commands.general.about.help.description = Shows infos about Hadder -commands.general.equals.string.first.request = Please send me the first String -commands.general.equals.string.second.request = Please send me the second String -commands.general.equals.string.equals.true = Yes\! The first string equals the second string\! -commands.general.equals.string.equals.false = Well yes but actually No. This isn't the same. -commands.general.equals.string.first = First String -commands.general.equals.string.second = Second String -commands.general.equals.string.result = Result -commands.general.equals.help.description = Check if two strings are the same -commands.general.help.field.usage = Usage -commands.general.help.error.description = I need the Embed Links Permission to send the Help Menu\! -commands.general.help.help.description = Shows each command or explains its usage -commands.general.help.help.label = [CommandName] -commands.general.invite.success.title = Invite me\! -commands.general.invite.success.description = [Invite me here\!]%extra% -commands.general.invite.help.description = Shows the invitation to invite Hadder to your server -commands.general.ping.help.description = Shows the ping to the Discord API +commands.misc.feedback.title.request.title=Feedback Topic +commands.misc.feedback.title.request.description=Please send me the feedback topic. +commands.misc.feedback.description.request.title=Feedback Description +commands.misc.feedback.description.request.description=Please send me the feedback description now. +commands.misc.feedback.help.description=Sends feedback directly to the developers. +commands.misc.github.link.title=Link your GitHub Account +commands.misc.github.success.title=Information about +commands.misc.github.success.bio=User bio +commands.misc.github.success.location=Location +commands.misc.github.success.website=Website +commands.misc.github.success.repositories=Public repositories +commands.misc.github.success.gists=Public gists +commands.misc.github.success.followers=Followers +commands.misc.github.success.following=Following +commands.misc.github.api.error.description=The GitHub API might be down at the moment\! +commands.misc.github.user.error.description=This user does not exist\! +commands.misc.github.connect.title=Connect you GH account +commands.misc.github.connect.description=Please connect your GitHub account here +commands.misc.github.help.description=Displays information about a GitHub user profile. +commands.misc.screenshare.success.title=Here's your Url to share your Screen +commands.misc.screenshare.id.error.title=Wait that's illegal +commands.misc.screenshare.id.error.description=This ID is invalid. \nMaybe you entered a wrong ID? \n\nNote\: Make sure the Voice Channel is on this Guild. +commands.misc.screenshare.channel.error.title=Please Choose a Voice Channel +commands.misc.screenshare.channel.error.description=There is more than one channel with this name +commands.misc.screenshare.number.error.title=You specified a wrong number\! +commands.misc.screenshare.number.error.description=This isn't a Number. +commands.misc.screenshare.channel.existing.error=Hol' up +commands.misc.screenshare.channel.existing.description=There is no Voice Channel named like this. \n\nNote\: Make sure the Voice Channel is on this Guild. +commands.misc.screenshare.help.description=Shows you the link to share your screen. -commands.misc.feedback.title.request.title = Feedback Topic -commands.misc.feedback.title.request.description = Please send me the feedback topic. -commands.misc.feedback.description.request.title = Feedback Description -commands.misc.feedback.description.request.description = Please send me the feedback description now. -commands.misc.feedback.help.description = Sends feedback directly to the developers. -commands.misc.feedback.success.title = Feedback successfully sent -commands.misc.github.link.title = Link your GitHub Account -commands.misc.github.success.title = Information about %extra% -commands.misc.github.success.bio = User bio -commands.misc.github.success.location = Location -commands.misc.github.success.website = Website -commands.misc.github.success.repositories = Public repositories -commands.misc.github.success.gists = Public gists -commands.misc.github.success.followers = Followers -commands.misc.github.success.following = Following -commands.misc.github.api.error.description = The GitHub API might be down at the moment\! -commands.misc.github.user.error.description = This user does not exist\! -commands.misc.github.connect.title = Connect you GH account -commands.misc.github.connect.description = [Please connect your GitHub account here]%extra% -commands.misc.github.help.description = Displays information about a GitHub user profile. -commands.misc.screenshare.success.title = Here's your Url to share your Screen -commands.misc.screenshare.id.error.title = Wait that's illegal -commands.misc.screenshare.id.error.description = This ID is invalid. \nMaybe you entered a wrong ID? \n\nNote\: Make sure the Voice Channel is on this Guild. -commands.misc.screenshare.channel.error.title = Please Choose a Voice Channel -commands.misc.screenshare.channel.error.description = There is more than one channel with this name -commands.misc.screenshare.number.error.title = You specified a wrong number\! -commands.misc.screenshare.number.error.description = This isn't a Number. -commands.misc.screenshare.channel.existing.error = Hol' up -commands.misc.screenshare.channel.existing.description = There is no Voice Channel named like this. \n\nNote\: Make sure the Voice Channel is on this Guild. -commands.misc.screenshare.help.description = Shows you the link to share your screen. - -commands.moderation.ban.success.title = %extra% Successfully banned %extra% -commands.moderation.ban.success.description = I successfully baned %extra% -commands.moderation.ban.error.title = Not possible -commands.moderation.ban.myself.error.description = I can not ban myself\! -commands.moderation.ban.yourself.error.description = You can not ban yourself\! -commands.moderation.ban.massban.success.description = I successfully baned %extra% Members\! -commands.moderation.ban.help.description = Bans one ore more user from the server -commands.moderation.clear.number.error.description = You have to choose a number between 1 and 99\! -commands.moderation.clear.success.description = Successfully deleted %extra% messages. -commands.moderation.clear.help.description = Deletes the specified number of messages. -commands.moderation.prefix.success.title = %extra% Successfully set %extra% -commands.moderation.prefix.success.description = I successfully set the new prefix for the guild to %extra% -commands.moderation.prefix.error.description = The prefix must not contain **"** -commands.moderation.prefix.help.description = Sets the Guild-Prefix. -commands.moderation.invitedetect.activate.success.title = Successfully activated -commands.moderation.invitedetect.activate.success.description = I successfully activated the invite link detection for this guild. -commands.moderation.invitedetect.activate.error.title = Already activated -commands.moderation.invitedetect.activate.error.description = The invite link detection is already activated on this guild. -commands.moderation.invitedetect.deactivate.success.title = Successfully deactivated -commands.moderation.invitedetect.deactivate.success.description = I successfully deactivated the invite link detection for this guild. -commands.moderation.invitedetect.deactivate.error.title = Already deactivated -commands.moderation.invitedetect.deactivate.error.description = The invite link detection is already deactivated on this guild. -commands.moderation.invitedetect.help.description = Activate or deactivate the Discord invite link detection. -commands.moderation.kick.success.title = %extra% Successfully kicked %extra% -commands.moderation.kick.success.description = I successfully kicked %extra%. -commands.moderation.kick.error.title = Not possible -commands.moderation.kick.myself.error.description = I can not kick myself\! -commands.moderation.kick.yourself.error.description = You can't kick yourself. -commands.moderation.kick.mass.success.description = I successfully kicked 69 Members\! -commands.moderation.kick.help.description = Kicks one or more user from the server. -commands.moderation.kick.masskick.success.description = I successfully kicked %extra% members. -commands.moderation.link.request.success.description = If i'm on this guild i sent a message to accept the link. -commands.moderation.link.error.title = Wait that's illegal. -commands.moderation.link.request.error.description = You specified the same guild as the guild on which you're reading this -commands.moderation.link.request.accept.title = ) wants to link guilds\! -commands.moderation.link.request.accept.description = React with the reactions to accept or decline it -commands.moderation.link.set.title = Set the thing boi -commands.moderation.link.help.description = Links two or more servers. -commands.moderation.nick.success.title = %extra% Successfully nicked %extra% -commands.moderation.nick.success.description = I successfully nicked %extra%. -commands.moderation.nick.myself.success.description = I successfully changed my nickname. -commands.moderation.nick.massnick.success.description = I successfully nicked %extra% Members. -commands.moderation.nick.help.description = Rename a one or more user. -commands.moderation.regionchange.regions.title = All regions -commands.moderation.regionchange.success.title = Successfully set region -commands.moderation.regionchange.success.description = I successfully set the new server region to %extra%. -commands.moderation.regionchange.help.description = Changes the server region to locked regions. -commands.moderation.role.add.success.title = %extra% Successfully added role(s) %extra% -commands.moderation.role.add.success.description = I successfully added %extra% roles to %extra_two% members. -commands.moderation.role.remove.success.title = %extra% Successfully removed role(s) %extra% -commands.moderation.role.remove.success.description = I successfully removed %extra% roles from %extra_two% members. -commands.moderation.role.help.description = Adds and removes one or more role(s) from one or more user(s) -commands.moderation.rules.setup.title = Set up rules -commands.moderation.rules.setup.description = Welcome to the Hadder rules setup. Please mention the channel in which I should send the rules. Your message should look like\: \#rules or \#verify. -commands.moderation.rules.channel.error.title = Channel not found -commands.moderation.rules.channel.error.description = I can't find the specified channel. Please start the setup again. -commands.moderation.rules.rules.title = Rules -commands.moderation.rules.rules.description = The channel was successfully set to %extra%. Please send me the rules now. -commands.moderation.rules.role.title = Role to assign -commands.moderation.rules.role.description = The rules were successfully set. Please send me the name of the role which the user receives after he accepted the rules. -commands.moderation.rules.role.error.title = Role does not exist -commands.moderation.rules.role.error.description = The specified role does not exist on this guild. -commands.moderation.rules.guild.error.title = Wrong Guild -commands.moderation.rules.guild.error.description = The mentioned channel must be on this guild\! -commands.moderation.rules.emote.accept.title = Custom Accept Emote -commands.moderation.rules.emote.accept.description = The role has been successfully set to %extra%. Now send me the emote on which your user should react to to get verified. -commands.moderation.rules.emote.decline.title = Custom Decline Emote -commands.moderation.rules.emote.decline.description = The first emote has been successfully set to %extra%. Please send me now the decline emote. -commands.moderation.rules.success.title = Successfully set the rules -commands.moderation.rules.success.description = I successfully send the rules in %extra%. -commands.moderation.rules.emote.error.access.description = I can not access the custom emote(s). -commands.moderation.rules.emote.error.equal.title = Emotes are equal -commands.moderation.rules.emote.error.equal.description = The 1st and 2nd emote equals each other. -commands.moderation.rules.emoji.decline.description = The first emote has been successfully set. Please send me now the decline emote. -commands.moderation.rules.emoji.error.description = The given emote can't be used. -commands.moderation.rules.help.description = Setup the rules on your Discord server - -commands.music.join.success.title = Successfully connected -commands.music.join.success.description = I successfully connected to %extra%. -commands.music.join.error.connecting.already.title = Already connected -commands.music.join.error.connecting.already.description = I am already connected to your voice channel. -commands.music.join.error.connecting.trying.title = Already trying to connect -commands.music.join.error.connecting.trying.description = Hadder is already trying to connect. Please wait a moment. -commands.music.join.error.channel.title = No Voice Channel -commands.music.join.error.channel.description = You aren't in a Voice Channel. -commands.music.join.help.description = Joins your voice channel -commands.music.leave.success.title = \= Successfully disconnected -commands.music.leave.success.description = I successfully disconnected from the Voice Channel -commands.music.leave.error.tile = Not connected -commands.music.leave.error.description = I'm currently in no Voice Channel on this Guild -commands.music.leave.help.description = Leaves a voice channel - -commands.nsfw.gif.error.title = GIF not showing? Click here -commands.nsfw.img.error.title = Image not showing? Click here -commands.nsfw.anal.help.description = Shows a random anal gif. -commands.nsfw.bdsm.help.description = Shows a random BDSM picture. -commands.nsfw.blowjob.help.description = Shows a random Blowjob picture. -commands.nsfw.boobs.help.description = Shows a random boob gif. -commands.nsfw.cum.help.description = Shows a random cum gif. -commands.nsfw.erotic.help.description = Shows a random erotic picture. -commands.nsfw.feet.help.description = Shows a random feet gif. -commands.nsfw.fingering.help.description = Shows a random fingering gif. -commands.nsfw.linking.help.description = Shows a random licking gif. -commands.nsfw.porn.help.description = Shows a random porn gif. -commands.nsfw.pussy.help.description = Shows a random pussy gif. -commands.nsfw.randomporn.help.description = Shows a completely random porn gif. -commands.nsfw.solo.help.description = Shows a random solo gif. -commands.nsfw.spank.help.description = Shows a random spank gif. -commands.nsfw.trans.help.description = Shows a random trans picture. +commands.moderation.ban.success.title=Successfully banned +commands.moderation.ban.success.description=I successfully baned +commands.moderation.ban.error.title=Not possible +commands.moderation.ban.myself.error.description=I can not ban myself\! +commands.moderation.ban.yourself.error.description=You can't ban yourself\! +commands.moderation.ban.help.description=Bans one ore more user from the server +commands.moderation.clear.number.error.description=You have to choose a number between 1 and 200\! +commands.moderation.clear.success.description=Successfully deleted 69 messages. +commands.moderation.clear.help.description=Deletes the specified number of messages. +commands.moderation.prefix.success.title=Successfully set +commands.moderation.prefix.success.description=I successfully set the new prefix for the guild to +commands.moderation.prefix.error.description=The prefix must not contain **** +commands.moderation.prefix.help.description=Sets the Guild-Prefix. +commands.moderation.invitedetect.activate.success.title=Successfully activated +commands.moderation.invitedetect.activate.success.description=I successfully activated the invite link detection for this guild. +commands.moderation.invitedetect.activate.error.title=Already activated +commands.moderation.invitedetect.activate.error.description=The invite link detection is already activated on this guild. +commands.moderation.invitedetect.deactivate.success.title=Successfully deactivated +commands.moderation.invitedetect.deactivate.success.description=I successfully deactivated the invite link detection for this guild. +commands.moderation.invitedetect.deactivate.error.title=Already deactivated +commands.moderation.invitedetect.deactivate.error.description=The invite link detection is already deactivated on this guild. +commands.moderation.invitedetect.help.description=Activate or deactivate the Discord invite link detection. +commands.moderation.kick.success.title=Successfully kicked +commands.moderation.kick.success.description=I successfully kicked +commands.moderation.kick.myself.error.description=I can not kick myself\! +commands.moderation.kick.yourself.error.description=You can't kick yourself. +commands.moderation.kick.mass.success.description=I successfully kicked 69 Members\! +commands.moderation.kick.help.description=Kicks one or more user from the server. +commands.moderation.link.request.success.description=If i'm on this guild i sent a message to accept the link. +commands.moderation.link.error.title=Wait that's illegal. +commands.moderation.link.request.error.description=You specified the same guild as the guild on which you're reading this +commands.moderation.link.request.accept.title=Skidder wants to link guilds\! +commands.moderation.link.request.accept.description=React with the reactions to accept or decline it +commands.moderation.link.set.title=Set the thing boi +commands.moderation.link.help.description=Links two or more servers. +commands.moderation.nick.success.title=Successfully nicked +commands.moderation.nick.success.description=I successfully nicked +commands.moderation.nick.myself.success.description=I successfully changed my nickname. +commands.moderation.nick.mass.success.description=I successfully nicked 69 Members\! +commands.moderation.nick.help.description=Rename a one or more user. -- 2.45.3 From 200454e3fa0311a3dba30bd2b2a2d2e2192872cc Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Fri, 13 Dec 2019 13:05:30 +0100 Subject: [PATCH 29/35] Owner Commands translation --- .../bbn/hadder/commands/owner/EvalCommand.java | 18 +++++++++--------- .../commands/owner/GuildLeaveCommand.java | 8 ++++---- .../hadder/commands/owner/RebootCommand.java | 2 +- .../hadder/commands/owner/ShutdownCommand.java | 2 +- .../bbn/hadder/commands/owner/TestCommand.java | 5 +++-- .../Translations/Translations_en.properties | 16 ++++++++++++++++ 6 files changed, 34 insertions(+), 17 deletions(-) diff --git a/src/main/java/com/bbn/hadder/commands/owner/EvalCommand.java b/src/main/java/com/bbn/hadder/commands/owner/EvalCommand.java index d2e9894..4824cca 100644 --- a/src/main/java/com/bbn/hadder/commands/owner/EvalCommand.java +++ b/src/main/java/com/bbn/hadder/commands/owner/EvalCommand.java @@ -59,16 +59,16 @@ public class EvalCommand implements Command { out = engine.eval(script); event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO) - .setTitle("Eval Command") - .addField("Input", "```java\n\n" + script + "```", false) - .addField("Output", "```java\n\n" + out.toString() + "```", false) - .addField("Timing", System.currentTimeMillis()-startExec + " milliseconds", false) + .setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.owner.eval.success.title")) + .addField(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.owner.eval.success.input"), "```java\n\n" + script + "```", false) + .addField(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.owner.eval.success.output"), "```java\n\n" + out.toString() + "```", false) + .addField(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.owner.eval.success.timing"), System.currentTimeMillis()-startExec + " milliseconds", false) .build()).queue(); } catch (Exception ex) { event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO) - .setTitle("Eval Command") - .addField("Error", "```java\n\n" + ex.getMessage() + "```", false) - .addField("Timing", System.currentTimeMillis()-startExec + " milliseconds", false) + .setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.owner.eval.success.title")) + .addField(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "error"), "```java\n\n" + ex.getMessage() + "```", false) + .addField(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.owner.eval.success.timing"), System.currentTimeMillis()-startExec + " milliseconds", false) .build()).queue(); } @@ -92,11 +92,11 @@ public class EvalCommand implements Command { @Override public String description() { - return "Execute the given code"; + return MessageEditor.handle("en", "commands.owner.eval.help.description"); } @Override public String usage() { - return ""; + return MessageEditor.handle("en", "commands.owner.eval.help.usage"); } } diff --git a/src/main/java/com/bbn/hadder/commands/owner/GuildLeaveCommand.java b/src/main/java/com/bbn/hadder/commands/owner/GuildLeaveCommand.java index 90d1318..1c86d88 100644 --- a/src/main/java/com/bbn/hadder/commands/owner/GuildLeaveCommand.java +++ b/src/main/java/com/bbn/hadder/commands/owner/GuildLeaveCommand.java @@ -18,8 +18,8 @@ public class GuildLeaveCommand implements Command { Guild guild = event.getJDA().getGuildById(args[0]); guild.leave().queue(); event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO) - .setTitle("Successfully left") - .setDescription("I successfully left " + guild.getName()) + .setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.owner.guildleave.success.title")) + .setDescription(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.owner.guildleave.success.description", guild.getName())) .build()).queue(); } else { event.getHelpCommand().sendHelp(this, event); @@ -36,11 +36,11 @@ public class GuildLeaveCommand implements Command { @Override public String description() { - return "Quit from a guild"; + return MessageEditor.handle("en", "commands.owner.guildleave.help.description"); } @Override public String usage() { - return ""; + return MessageEditor.handle("en", "guildid"); } } diff --git a/src/main/java/com/bbn/hadder/commands/owner/RebootCommand.java b/src/main/java/com/bbn/hadder/commands/owner/RebootCommand.java index cb37c27..dd1a98b 100644 --- a/src/main/java/com/bbn/hadder/commands/owner/RebootCommand.java +++ b/src/main/java/com/bbn/hadder/commands/owner/RebootCommand.java @@ -27,7 +27,7 @@ public class RebootCommand implements Command { @Override public String description() { - return "Restart the bot"; + return MessageEditor.handle("en", "commands.owner.reboot.help.description"); } @Override diff --git a/src/main/java/com/bbn/hadder/commands/owner/ShutdownCommand.java b/src/main/java/com/bbn/hadder/commands/owner/ShutdownCommand.java index 14cfdd2..d197aab 100644 --- a/src/main/java/com/bbn/hadder/commands/owner/ShutdownCommand.java +++ b/src/main/java/com/bbn/hadder/commands/owner/ShutdownCommand.java @@ -29,7 +29,7 @@ public class ShutdownCommand implements Command { @Override public String description() { - return "Shuts the Bot down"; + return MessageEditor.handle("en", "commands.owner.shutdown.help.description"); } @Override diff --git a/src/main/java/com/bbn/hadder/commands/owner/TestCommand.java b/src/main/java/com/bbn/hadder/commands/owner/TestCommand.java index e50a638..e9219d6 100644 --- a/src/main/java/com/bbn/hadder/commands/owner/TestCommand.java +++ b/src/main/java/com/bbn/hadder/commands/owner/TestCommand.java @@ -2,6 +2,7 @@ package com.bbn.hadder.commands.owner; import com.bbn.hadder.commands.Command; import com.bbn.hadder.commands.CommandEvent; +import com.bbn.hadder.utils.MessageEditor; /* * @author Skidder / GregTCLTK @@ -11,7 +12,7 @@ public class TestCommand implements Command { @Override public void executed(String[] args, CommandEvent event) { - event.getTextChannel().sendMessage("TEST my friends").queue(); + event.getTextChannel().sendMessage(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.owner.test.success")).queue(); } @Override @@ -21,7 +22,7 @@ public class TestCommand implements Command { @Override public String description() { - return "Just a little Test Command"; + return MessageEditor.handle("en", "commands.owner.test.help.description"); } @Override diff --git a/src/main/resources/Translations/Translations_en.properties b/src/main/resources/Translations/Translations_en.properties index 01b86cc..b50e412 100644 --- a/src/main/resources/Translations/Translations_en.properties +++ b/src/main/resources/Translations/Translations_en.properties @@ -15,6 +15,7 @@ guildprefix = vc-name/id = user+nickname = <@user> region = +guildid = error = Error none = None @@ -190,3 +191,18 @@ commands.nsfw.randomporn.help.description = Shows a completely random porn gif. commands.nsfw.solo.help.description = Shows a random solo gif. commands.nsfw.spank.help.description = Shows a random spank gif. commands.nsfw.trans.help.description = Shows a random trans picture. + +commands.owner.eval.success.title = Eval Command +commands.owner.eval.success.input = Input +commands.owner.eval.success.output = Output +commands.owner.eval.success.timing = Timing +commands.owner.eval.help.description = Execute the given code +commands.owner.eval.help.usage = +commands.owner.guildleave.success.title = Successfully left +commands.owner.guildleave.success.description = I successfully left %extra%. +commands.owner.guildleave.help.description = Quit from a guild +commands.owner.reboot.help.description = Restart the bot +commands.owner.shutdown.success.title = Shutdown +commands.owner.shutdown.help.description = Shuts the Bot down +commands.owner.test.success = TEST my friends +commands.owner.test.help.description = Just a little Test Command -- 2.45.3 From 93e93f8f05db9d4cf7d033c7c9141f5983039aaa Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Fri, 13 Dec 2019 13:32:04 +0100 Subject: [PATCH 30/35] Translate Settings --- .../bbn/hadder/commands/settings/LanguageCommand.java | 8 ++++---- .../com/bbn/hadder/commands/settings/PrefixCommand.java | 9 ++++++--- .../resources/Translations/Translations_en.properties | 9 +++++++++ 3 files changed, 19 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/bbn/hadder/commands/settings/LanguageCommand.java b/src/main/java/com/bbn/hadder/commands/settings/LanguageCommand.java index 4faa2c6..c902fa4 100644 --- a/src/main/java/com/bbn/hadder/commands/settings/LanguageCommand.java +++ b/src/main/java/com/bbn/hadder/commands/settings/LanguageCommand.java @@ -44,8 +44,8 @@ public class LanguageCommand implements Command { public void setLanguage(String language_code, String language , CommandEvent event) { event.getRethink().setLanguage(event.getAuthor().getId(), language_code); event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO) - .setTitle("Language set") - .setDescription(language + " is your new language now.") + .setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.settings.language.success.title")) + .setDescription(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.settings.language.success.description", language)) .build()).queue(); } @@ -56,11 +56,11 @@ public class LanguageCommand implements Command { @Override public String description() { - return "Sets the new primary language for a user."; + return MessageEditor.handle("en", "commands.settings.language.help.description"); } @Override public String usage() { - return ""; + return MessageEditor.handle("en", "commands.settings.language.help.usage"); } } diff --git a/src/main/java/com/bbn/hadder/commands/settings/PrefixCommand.java b/src/main/java/com/bbn/hadder/commands/settings/PrefixCommand.java index 4de3e84..6e3b3ee 100644 --- a/src/main/java/com/bbn/hadder/commands/settings/PrefixCommand.java +++ b/src/main/java/com/bbn/hadder/commands/settings/PrefixCommand.java @@ -14,7 +14,10 @@ public class PrefixCommand implements Command { public void executed(String[] args, CommandEvent event) { if (args.length == 1) { event.getRethink().setUserPrefix(args[0], event.getAuthor().getId()); - event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO).setTitle("✅ Successfully set ✅").setDescription("I successfully set the new prefix for you to " + args[0]).build()).queue(); + event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO) + .setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.settings.prefix.success.title")) + .setDescription(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.settings.prefix.success.description", args[0])) + .build()).queue(); } else { event.getHelpCommand().sendHelp(this, event); } @@ -27,11 +30,11 @@ public class PrefixCommand implements Command { @Override public String description() { - return "Sets a new Prefix"; + return MessageEditor.handle("en", "commands.settings.prefix.help.description"); } @Override public String usage() { - return ""; + return MessageEditor.handle("en", "prefix"); } } diff --git a/src/main/resources/Translations/Translations_en.properties b/src/main/resources/Translations/Translations_en.properties index b50e412..dec548c 100644 --- a/src/main/resources/Translations/Translations_en.properties +++ b/src/main/resources/Translations/Translations_en.properties @@ -12,6 +12,7 @@ searchterm = username = number = guildprefix = +prefix = vc-name/id = user+nickname = <@user> region = @@ -206,3 +207,11 @@ commands.owner.shutdown.success.title = Shutdown commands.owner.shutdown.help.description = Shuts the Bot down commands.owner.test.success = TEST my friends commands.owner.test.help.description = Just a little Test Command + +commands.settings.language.success.title = Language set +commands.settings.language.success.description = %extra% is your new language now. +commands.settings.language.help.description = Sets the new primary language for a user. +commands.settings.language.help.usage = +commands.settings.prefix.success.title = %extra% Successfully set %extra% +commands.settings.prefix.success.description = I successfully set the new prefix for you to %extra%. +commands.settings.prefix.help.description = Sets a new Prefix -- 2.45.3 From 805ac1975e0dd4d2b6612e7f399af0d0523f2da2 Mon Sep 17 00:00:00 2001 From: Hax Date: Fri, 13 Dec 2019 20:20:01 +0100 Subject: [PATCH 31/35] Added StarBoard --- src/main/java/com/bbn/hadder/Hadder.java | 6 +- src/main/java/com/bbn/hadder/Rethink.java | 49 +++++++++++++- .../moderation/SetStarBoardCommand.java | 32 +++++++++ .../hadder/listener/StarboardListener.java | 67 +++++++++++++++++++ 4 files changed, 149 insertions(+), 5 deletions(-) create mode 100644 src/main/java/com/bbn/hadder/commands/moderation/SetStarBoardCommand.java create mode 100644 src/main/java/com/bbn/hadder/listener/StarboardListener.java diff --git a/src/main/java/com/bbn/hadder/Hadder.java b/src/main/java/com/bbn/hadder/Hadder.java index 45506be..9f21606 100644 --- a/src/main/java/com/bbn/hadder/Hadder.java +++ b/src/main/java/com/bbn/hadder/Hadder.java @@ -88,7 +88,8 @@ public class Hadder { new RegionChangeCommand(), new AboutCommand(), new LanguageCommand(), - new LinkCommand()), config, helpCommand); + new LinkCommand(), + new SetStarBoardCommand()), config, helpCommand); builder.addEventListeners( new MentionListener(rethink), @@ -99,7 +100,8 @@ public class Hadder { // new LinkListener(rethink), new InviteLinkListener(rethink), new RulesListener(rethink), - new SomeoneListener()); + new SomeoneListener(), + new StarboardListener(rethink)); try { shardManager = builder.build(); diff --git a/src/main/java/com/bbn/hadder/Rethink.java b/src/main/java/com/bbn/hadder/Rethink.java index cdb08e4..dacd717 100644 --- a/src/main/java/com/bbn/hadder/Rethink.java +++ b/src/main/java/com/bbn/hadder/Rethink.java @@ -55,7 +55,12 @@ public class Rethink { } public Object get(String table, String where, String value, String column) { - return this.getAsArray(table, where, value).getJSONObject(0).get(column); + JSONArray array = this.getAsArray(table, where, value); + if (array.length()>0) + if (array.getJSONObject(0).has(column)) + return array.getJSONObject(0).get(column); + else return null; + else return null; } public String update(String table, String wherevalue, String what, String whatvalue) { @@ -92,7 +97,11 @@ public class Rethink { } catch (ReqlOpFailedError e) { System.out.println(e.getMessage()); } - + try { + r.tableCreate("stars").run(conn); + } catch (ReqlOpFailedError e) { + System.out.println(e.getMessage()); + } } public void setUserPrefix(String prefix, String userid) { @@ -143,13 +152,47 @@ public class Rethink { } public void insertGuild(String id) { - this.insert("server", r.hashMap("id", id).with("prefix", "h.").with("links", "[]").with("linkchannel", "").with("message_id", "").with("role_id", "").with("invite_detect", false)); + this.insert("server", r.hashMap("id", id) + .with("prefix", "h.") + .with("links", "[]") + .with("linkchannel", "") + .with("message_id", "") + .with("role_id", "") + .with("invite_detect", false) + .with("starboard", "") + ); } public void insertUser(String id) { this.insert("user", r.hashMap("id", id).with("prefix", "h.").with("language", "en")); } + // TODO: Write Command to set + public void setStarboardChannel(String guildid, String channelid) { + this.update("server", guildid, "starboard", channelid); + } + + public String getStarboardChannel(String guildid) { + return (String) this.get("server", "id", guildid, "starboard"); + } + + public boolean hasStarboardChannel(String guildid) { + return !this.get("server", "id", guildid, "starboard").equals(""); + } + + // TODO: Create Starboardlistener + public void insertStarboardMessage(String messageid, String guildid, String starboardmessageid) { + this.insert("stars", r.hashMap("msg", messageid).with("guild", guildid).with("starboardmsg", starboardmessageid)); + } + + public String getStarboardMessage(String messageid) { + return (String) this.get("stars", "msg", messageid, "starboardmsg"); + } + + public boolean hasStarboardMessage(String messageid) { + return this.get("stars", "msg", messageid, "guild") != null; + } + public void updateRules(String guild_id, String message_id, String role_id, String accept_emote, String decline_emote) { this.update("server", guild_id, "message_id", message_id); this.update("server", guild_id, "role_id", role_id); diff --git a/src/main/java/com/bbn/hadder/commands/moderation/SetStarBoardCommand.java b/src/main/java/com/bbn/hadder/commands/moderation/SetStarBoardCommand.java new file mode 100644 index 0000000..b0ab96f --- /dev/null +++ b/src/main/java/com/bbn/hadder/commands/moderation/SetStarBoardCommand.java @@ -0,0 +1,32 @@ +package com.bbn.hadder.commands.moderation; + +import com.bbn.hadder.commands.Command; +import com.bbn.hadder.commands.CommandEvent; +import net.dv8tion.jda.api.EmbedBuilder; + +public class SetStarBoardCommand implements Command { + @Override + public void executed(String[] args, CommandEvent event) { + if (event.getMessage().getMentionedChannels().size()==1) { + event.getRethink().setStarboardChannel(event.getGuild().getId(), event.getMessage().getMentionedChannels().get(0).getId()); + event.getChannel().sendMessage(new EmbedBuilder().setTitle("Successfully set the Channel!").build()).queue(); + } else { + event.getHelpCommand().sendHelp(this, event); + } + } + + @Override + public String[] labels() { + return new String[]{"setstarboard"}; + } + + @Override + public String description() { + return "Sets the starboard channel"; + } + + @Override + public String usage() { + return ""; + } +} diff --git a/src/main/java/com/bbn/hadder/listener/StarboardListener.java b/src/main/java/com/bbn/hadder/listener/StarboardListener.java new file mode 100644 index 0000000..f5438a7 --- /dev/null +++ b/src/main/java/com/bbn/hadder/listener/StarboardListener.java @@ -0,0 +1,67 @@ +package com.bbn.hadder.listener; + +import com.bbn.hadder.Rethink; +import net.dv8tion.jda.api.EmbedBuilder; +import net.dv8tion.jda.api.MessageBuilder; +import net.dv8tion.jda.api.events.message.react.GenericMessageReactionEvent; +import net.dv8tion.jda.api.events.message.react.MessageReactionAddEvent; +import net.dv8tion.jda.api.events.message.react.MessageReactionRemoveEvent; +import net.dv8tion.jda.api.hooks.ListenerAdapter; + +import javax.annotation.Nonnull; +import java.time.format.DateTimeFormatter; + +public class StarboardListener extends ListenerAdapter { + + private Rethink rethink; + + public StarboardListener(Rethink rethink) { + this.rethink = rethink; + } + + @Override + public void onMessageReactionAdd(@Nonnull MessageReactionAddEvent event) { + update(event); + } + + @Override + public void onMessageReactionRemove(@Nonnull MessageReactionRemoveEvent event) { + update(event); + } + + public void update(GenericMessageReactionEvent event) { + if (event.getReaction().getReactionEmote().getName().equals("⭐")) { + if (!rethink.hasStarboardMessage(event.getMessageId())) { + if (rethink.hasStarboardChannel(event.getGuild().getId())) { + event.getChannel().retrieveMessageById(event.getMessageId()).queue(msg -> { + event.getGuild().getTextChannelById(rethink.getStarboardChannel(event.getGuild().getId())) + .sendMessage(new MessageBuilder() + .setContent("⭐1" + " " + event.getTextChannel().getAsMention()) + .setEmbed( + new EmbedBuilder() + .setAuthor(event.getUser().getAsTag()) + .setDescription(msg.getContentRaw()) + .setTimestamp(msg.getTimeCreated()).build()).build()).queue( + starboardmsg -> { + rethink.insertStarboardMessage(msg.getId(), event.getGuild().getId(), starboardmsg.getId()); + } + ); + }); + } + } else { + event.getGuild().getTextChannelById(rethink.getStarboardChannel(event.getGuild().getId())) + .retrieveMessageById(rethink.getStarboardMessage(event.getMessageId())).queue( + msg -> { + msg.editMessage(new MessageBuilder() + .setContent("⭐" + event.getReaction().getCount() + " " + event.getTextChannel().getAsMention()) + .setEmbed( + new EmbedBuilder() + .setAuthor(event.getUser().getAsTag()) + .setDescription(msg.getContentRaw()) + .setTimestamp(msg.getTimeCreated()).build()).build()).queue(); + } + ); + } + } + } +} -- 2.45.3 From 5009937fe287329ce4c8184b6b9d68c69bd7b445 Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Sat, 14 Dec 2019 11:55:14 +0100 Subject: [PATCH 32/35] Clear Command improvements --- .../commands/moderation/ClearCommand.java | 42 +++++++++++-------- .../hadder/commands/owner/EvalCommand.java | 1 - .../Translations/Translations_en.properties | 2 + 3 files changed, 27 insertions(+), 18 deletions(-) diff --git a/src/main/java/com/bbn/hadder/commands/moderation/ClearCommand.java b/src/main/java/com/bbn/hadder/commands/moderation/ClearCommand.java index d19ea55..a1f643e 100644 --- a/src/main/java/com/bbn/hadder/commands/moderation/ClearCommand.java +++ b/src/main/java/com/bbn/hadder/commands/moderation/ClearCommand.java @@ -22,25 +22,33 @@ public class ClearCommand implements Command { if (args.length > 0) { if (event.getGuild().getMemberById(event.getAuthor().getId()).hasPermission(Permission.MESSAGE_MANAGE) || event.getConfig().getOwners().toString().contains(event.getAuthor().getId())) { if (event.getGuild().getMemberById(event.getJDA().getSelfUser().getId()).hasPermission(Permission.MESSAGE_MANAGE)) { - try { - int nbToDelete = Integer.parseInt(args[0]); - if(nbToDelete < 1 || nbToDelete > 99) { - event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.WARNING).setDescription(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.clear.number.error.description")).build()).queue(); - return; - } - List history = event.getTextChannel().getHistory().retrievePast(nbToDelete +1).complete(); - List msgToDelete = new ArrayList<>(); - msgToDelete.addAll(history); - event.getTextChannel().deleteMessages(msgToDelete).queue(); - Message msg = event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO).setDescription(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.clear.success.description", String.valueOf(nbToDelete))).build()).complete(); + if (args[0].equals("all")) { + event.getMessage().delete().queue(); + } else { try { - TimeUnit.SECONDS.sleep(2); - } catch (InterruptedException e) { - e.printStackTrace(); + int nbToDelete = Integer.parseInt(args[0]); + if (nbToDelete < 1 || nbToDelete > 99) { + event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.WARNING).setDescription(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.clear.number.error.description")).build()).queue(); + } else { + List history = event.getTextChannel().getHistory().retrievePast(nbToDelete + 1).complete(); + List msgToDelete = new ArrayList<>(history); + event.getTextChannel().deleteMessages(msgToDelete).queue(); + Message msg = event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO).setDescription(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.clear.success.description", String.valueOf(nbToDelete))).build()).complete(); + try { + TimeUnit.SECONDS.sleep(2); + } catch (InterruptedException e) { + e.printStackTrace(); + } + msg.delete().queue(); + } + } catch (NumberFormatException e) { + event.getHelpCommand().sendHelp(this, event); + } catch (IllegalArgumentException e) { + event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.WARNING) + .setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.clear.message.error.title")) + .setDescription(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.clear.message.error.description")) + .build()).queue(); } - msg.delete().queue(); - } catch (NumberFormatException e) { - event.getHelpCommand().sendHelp(this, event); } } else { event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.NO_SELF_PERMISSION).build()).queue(); diff --git a/src/main/java/com/bbn/hadder/commands/owner/EvalCommand.java b/src/main/java/com/bbn/hadder/commands/owner/EvalCommand.java index 4824cca..1d79ac8 100644 --- a/src/main/java/com/bbn/hadder/commands/owner/EvalCommand.java +++ b/src/main/java/com/bbn/hadder/commands/owner/EvalCommand.java @@ -41,7 +41,6 @@ public class EvalCommand implements Command { engine.put("author", event.getAuthor()); engine.put("member", event.getMember()); engine.put("self", event.getGuild().getSelfMember()); - engine.put("System.out", System.out); ScheduledExecutorService service = Executors.newScheduledThreadPool(1); diff --git a/src/main/resources/Translations/Translations_en.properties b/src/main/resources/Translations/Translations_en.properties index dec548c..edb8cae 100644 --- a/src/main/resources/Translations/Translations_en.properties +++ b/src/main/resources/Translations/Translations_en.properties @@ -92,6 +92,8 @@ commands.moderation.ban.massban.success.description = I successfully baned %extr commands.moderation.ban.help.description = Bans one ore more user from the server commands.moderation.clear.number.error.description = You have to choose a number between 1 and 99! commands.moderation.clear.success.description = Successfully deleted %extra% messages. +commands.moderation.clear.message.error.title = No messages! +commands.moderation.clear.message.error.description = There are no messages in this channel. commands.moderation.clear.help.description = Deletes the specified number of messages. commands.moderation.prefix.success.title = %extra% Successfully set %extra% commands.moderation.prefix.success.description = I successfully set the new prefix for the guild to %extra% -- 2.45.3 From fe3c0aee7788feeda1d96ad58eb6e7f8c6f2e8a4 Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Sat, 14 Dec 2019 12:06:46 +0100 Subject: [PATCH 33/35] Rules Command 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 5f08a8d..3054102 100644 --- a/src/main/java/com/bbn/hadder/commands/moderation/RulesCommand.java +++ b/src/main/java/com/bbn/hadder/commands/moderation/RulesCommand.java @@ -61,7 +61,7 @@ public class RulesCommand implements Command { if (event.getGuild().getSelfMember().hasPermission(channel, Permission.MESSAGE_WRITE)) { event1.getChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO) .setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.rules.rules.title")) - .setDescription(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.rules.rules.title", channel.getName())) + .setDescription(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.rules.rules.description", channel.getName())) .build()).queue(); new EventWaiter().newOnMessageEventWaiter(event2 -> { String message = event2.getMessage().getContentRaw(); -- 2.45.3 From f8e438d295cfd03b1f57af799d3695e275d98dca Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Sat, 14 Dec 2019 13:03:01 +0100 Subject: [PATCH 34/35] Clear All --- .../hadder/commands/moderation/ClearCommand.java | 15 ++++++++++++++- .../Translations/Translations_en.properties | 4 +++- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/bbn/hadder/commands/moderation/ClearCommand.java b/src/main/java/com/bbn/hadder/commands/moderation/ClearCommand.java index a1f643e..98e0599 100644 --- a/src/main/java/com/bbn/hadder/commands/moderation/ClearCommand.java +++ b/src/main/java/com/bbn/hadder/commands/moderation/ClearCommand.java @@ -23,7 +23,20 @@ public class ClearCommand implements Command { if (event.getGuild().getMemberById(event.getAuthor().getId()).hasPermission(Permission.MESSAGE_MANAGE) || event.getConfig().getOwners().toString().contains(event.getAuthor().getId())) { if (event.getGuild().getMemberById(event.getJDA().getSelfUser().getId()).hasPermission(Permission.MESSAGE_MANAGE)) { if (args[0].equals("all")) { - event.getMessage().delete().queue(); + List msg = event.getTextChannel().getIterableHistory().complete(); + for (Message message : msg) { + message.delete().queue(); + } + Message message = event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO) + .setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.lear.all.success.title")) + .setDescription(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.lear.all.success.description", String.valueOf(msg.size()))) + .build()).complete(); + try { + TimeUnit.SECONDS.sleep(2); + } catch (InterruptedException e) { + e.printStackTrace(); + } + message.delete().queue(); } else { try { int nbToDelete = Integer.parseInt(args[0]); diff --git a/src/main/resources/Translations/Translations_en.properties b/src/main/resources/Translations/Translations_en.properties index edb8cae..16ae60d 100644 --- a/src/main/resources/Translations/Translations_en.properties +++ b/src/main/resources/Translations/Translations_en.properties @@ -10,7 +10,7 @@ Hadder = Hadder searchterm = username = -number = +number = /all guildprefix = prefix = vc-name/id = @@ -90,6 +90,8 @@ commands.moderation.ban.myself.error.description = I can not ban myself! commands.moderation.ban.yourself.error.description = You can not ban yourself! commands.moderation.ban.massban.success.description = I successfully baned %extra% Members! commands.moderation.ban.help.description = Bans one ore more user from the server +commands.moderation.lear.all.success.title = Successfully deleted +commands.moderation.lear.all.success.description = I successfully deleted %extra% messages. commands.moderation.clear.number.error.description = You have to choose a number between 1 and 99! commands.moderation.clear.success.description = Successfully deleted %extra% messages. commands.moderation.clear.message.error.title = No messages! -- 2.45.3 From 5ee5f3186007b6c1794ba413bf9f8ab5de534819 Mon Sep 17 00:00:00 2001 From: Hax Date: Sat, 14 Dec 2019 15:40:46 +0100 Subject: [PATCH 35/35] Bruh moment --- src/main/java/com/bbn/hadder/Hadder.java | 5 +- src/main/java/com/bbn/hadder/Rethink.java | 44 ++---- .../com/bbn/hadder/commands/CommandEvent.java | 19 ++- .../hadder/commands/fun/AvatarCommand.java | 27 +++- .../bbn/hadder/commands/fun/GifCommand.java | 8 +- .../bbn/hadder/commands/fun/MemeCommand.java | 15 +- .../hadder/commands/general/AboutCommand.java | 12 +- .../commands/general/EqualsCommand.java | 25 +-- .../hadder/commands/general/HelpCommand.java | 23 +-- .../commands/general/InviteCommand.java | 14 +- .../hadder/commands/general/PingCommand.java | 6 +- .../hadder/commands/misc/FeedbackCommand.java | 26 ++-- .../hadder/commands/misc/GitHubCommand.java | 51 ++++-- .../commands/misc/ScreenShareCommand.java | 95 ----------- .../commands/moderation/BanCommand.java | 45 ++++-- .../commands/moderation/ClearCommand.java | 22 ++- .../moderation/GuildPrefixCommand.java | 20 ++- .../moderation/InviteDetectCommand.java | 33 ++-- .../commands/moderation/KickCommand.java | 28 ++-- .../commands/moderation/LinkCommand.java | 94 ----------- .../commands/moderation/NickCommand.java | 51 ++++-- .../moderation/RegionChangeCommand.java | 32 ++-- .../commands/moderation/RoleCommand.java | 38 +++-- .../commands/moderation/RulesCommand.java | 147 +++++++++++------- .../moderation/SetStarBoardCommand.java | 24 ++- .../hadder/commands/music/JoinCommand.java | 18 ++- .../hadder/commands/music/LeaveCommand.java | 4 +- .../bbn/hadder/commands/nsfw/AnalCommand.java | 4 +- .../bbn/hadder/commands/nsfw/BDSMCommand.java | 4 +- .../hadder/commands/nsfw/BlowjobCommand.java | 4 +- .../hadder/commands/nsfw/BoobsCommand.java | 4 +- .../bbn/hadder/commands/nsfw/CumCommand.java | 4 +- .../hadder/commands/nsfw/EroticCommand.java | 4 +- .../bbn/hadder/commands/nsfw/FeetCommand.java | 4 +- .../commands/nsfw/FingeringCommand.java | 4 +- .../hadder/commands/nsfw/LickingCommand.java | 4 +- .../bbn/hadder/commands/nsfw/PornCommand.java | 4 +- .../hadder/commands/nsfw/PussyCommand.java | 4 +- .../commands/nsfw/RandomPornCommand.java | 4 +- .../bbn/hadder/commands/nsfw/SoloCommand.java | 4 +- .../hadder/commands/nsfw/SpankCommand.java | 4 +- .../hadder/commands/nsfw/TransCommand.java | 4 +- .../hadder/commands/owner/EvalCommand.java | 8 +- .../commands/owner/GuildLeaveCommand.java | 4 +- .../hadder/commands/owner/RebootCommand.java | 2 +- .../commands/owner/ShutdownCommand.java | 4 +- .../commands/settings/LanguageCommand.java | 2 +- .../commands/settings/PrefixCommand.java | 2 +- .../com/bbn/hadder/core/CommandHandler.java | 6 +- .../java/com/bbn/hadder/core/LinkUtils.java | 95 ----------- .../bbn/hadder/listener/GuildListener.java | 4 +- .../com/bbn/hadder/listener/LinkListener.java | 73 --------- .../bbn/hadder/listener/MentionListener.java | 3 +- .../listener/PrivateMessageListener.java | 11 +- .../com/bbn/hadder/utils/MessageEditor.java | 69 ++++++-- .../Translations/Translations_de.properties | 1 + .../Translations/Translations_en.properties | 1 + 57 files changed, 581 insertions(+), 690 deletions(-) delete mode 100644 src/main/java/com/bbn/hadder/commands/misc/ScreenShareCommand.java delete mode 100644 src/main/java/com/bbn/hadder/commands/moderation/LinkCommand.java delete mode 100644 src/main/java/com/bbn/hadder/core/LinkUtils.java delete mode 100644 src/main/java/com/bbn/hadder/listener/LinkListener.java diff --git a/src/main/java/com/bbn/hadder/Hadder.java b/src/main/java/com/bbn/hadder/Hadder.java index 9f21606..bbdfcb1 100644 --- a/src/main/java/com/bbn/hadder/Hadder.java +++ b/src/main/java/com/bbn/hadder/Hadder.java @@ -54,7 +54,6 @@ public class Hadder { new GifCommand(), new ClearCommand(), new GitHubCommand(), - new ScreenShareCommand(), new RebootCommand(), new EqualsCommand(), new InviteCommand(), @@ -88,16 +87,14 @@ public class Hadder { new RegionChangeCommand(), new AboutCommand(), new LanguageCommand(), - new LinkCommand(), new SetStarBoardCommand()), config, helpCommand); builder.addEventListeners( new MentionListener(rethink), - new PrivateMessageListener(), + new PrivateMessageListener(rethink), new CommandListener(rethink, commandHandler), new GuildListener(rethink, config), new ReadyListener(rethink, config), - // new LinkListener(rethink), new InviteLinkListener(rethink), new RulesListener(rethink), new SomeoneListener(), diff --git a/src/main/java/com/bbn/hadder/Rethink.java b/src/main/java/com/bbn/hadder/Rethink.java index dacd717..9d3ce64 100644 --- a/src/main/java/com/bbn/hadder/Rethink.java +++ b/src/main/java/com/bbn/hadder/Rethink.java @@ -120,46 +120,14 @@ public class Rethink { return (String) this.get("server", "id", id, "prefix"); } - public JSONArray getLinks(String id) { - return new JSONArray((String) this.get("server", "id", id, "links")); - } - - public void addLinkedGuild(String guildid, String linkid) { - JSONArray links = getLinks(guildid); - for (int i = 0; links.length()>i; i++) { - if (links.getString(i).equals(linkid)) return; - } - this.update("server", guildid, "links", this.getLinks(guildid).put(linkid).toString()); - } - - public String removeLinkedGuild(String guildid, String linkid) { - JSONArray linkedguildslist = this.getLinks(guildid); - for (int i = 0; linkedguildslist.length()>i; i++) { - if (linkedguildslist.getString(i).equals(linkid)) { - linkedguildslist.remove(i); - break; - } - } - return this.update("server", guildid, "links", linkedguildslist.toString()); - } - - public void setLinkChannel(String guildid, String channelid) { - this.update("server", guildid, "linkchannel", channelid); - } - - public String getLinkChannel(String guildid) { - return (String) this.get("server", "id", guildid, "linkchannel"); - } - public void insertGuild(String id) { this.insert("server", r.hashMap("id", id) .with("prefix", "h.") - .with("links", "[]") - .with("linkchannel", "") .with("message_id", "") .with("role_id", "") .with("invite_detect", false) .with("starboard", "") + .with("neededstars", "4") ); } @@ -167,7 +135,14 @@ public class Rethink { this.insert("user", r.hashMap("id", id).with("prefix", "h.").with("language", "en")); } - // TODO: Write Command to set + public void setNeededstars(String stars, String guildid) { + this.update("server", guildid, "neededstars", stars); + } + + public String getNeededstars(String guildid) { + return (String) this.get("server", "id", guildid, "neededstars"); + } + public void setStarboardChannel(String guildid, String channelid) { this.update("server", guildid, "starboard", channelid); } @@ -180,7 +155,6 @@ public class Rethink { return !this.get("server", "id", guildid, "starboard").equals(""); } - // TODO: Create Starboardlistener public void insertStarboardMessage(String messageid, String guildid, String starboardmessageid) { this.insert("stars", r.hashMap("msg", messageid).with("guild", guildid).with("starboardmsg", starboardmessageid)); } diff --git a/src/main/java/com/bbn/hadder/commands/CommandEvent.java b/src/main/java/com/bbn/hadder/commands/CommandEvent.java index 577cda3..7ea21a7 100644 --- a/src/main/java/com/bbn/hadder/commands/CommandEvent.java +++ b/src/main/java/com/bbn/hadder/commands/CommandEvent.java @@ -4,6 +4,7 @@ import com.bbn.hadder.Rethink; import com.bbn.hadder.commands.general.HelpCommand; import com.bbn.hadder.core.CommandHandler; import com.bbn.hadder.core.Config; +import com.bbn.hadder.utils.MessageEditor; import net.dv8tion.jda.api.JDA; import net.dv8tion.jda.api.entities.Message; import net.dv8tion.jda.api.events.message.MessageReceivedEvent; @@ -16,21 +17,15 @@ public class CommandEvent extends MessageReceivedEvent { private Config config; private CommandHandler commandHandler; private HelpCommand helpCommand; + private MessageEditor messageEditor; - public CommandEvent(@Nonnull JDA api, long responseNumber, @Nonnull Message message, Config config, Rethink rethink, CommandHandler commandHandler, HelpCommand helpCommand) { + public CommandEvent(@Nonnull JDA api, long responseNumber, @Nonnull Message message, Rethink rethink, Config config, CommandHandler commandHandler, HelpCommand helpCommand, MessageEditor messageEditor) { super(api, responseNumber, message); - this.config = config; - this.rethink = rethink; - this.commandHandler = commandHandler; - this.helpCommand = helpCommand; - } - - public CommandEvent(@Nonnull MessageReceivedEvent event, Config config, Rethink rethink, CommandHandler commandHandler, HelpCommand helpCommand) { - super(event.getJDA(), event.getResponseNumber(), event.getMessage()); - this.config = config; this.rethink = rethink; + this.config = config; this.commandHandler = commandHandler; this.helpCommand = helpCommand; + this.messageEditor = messageEditor; } public Rethink getRethink() { @@ -48,4 +43,8 @@ public class CommandEvent extends MessageReceivedEvent { public CommandHandler getCommandHandler() { return commandHandler; } + + public MessageEditor getMessageEditor() { + return messageEditor; + } } diff --git a/src/main/java/com/bbn/hadder/commands/fun/AvatarCommand.java b/src/main/java/com/bbn/hadder/commands/fun/AvatarCommand.java index cf5813d..8f3f420 100644 --- a/src/main/java/com/bbn/hadder/commands/fun/AvatarCommand.java +++ b/src/main/java/com/bbn/hadder/commands/fun/AvatarCommand.java @@ -15,22 +15,35 @@ public class AvatarCommand implements Command { public void executed(String[] args, CommandEvent event) { if (args.length == 0) { Member member = event.getMember(); - event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO) - .setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.fun.avatar.success.title", member.getUser().getAsTag())) + event.getTextChannel().sendMessage( + event.getMessageEditor().getMessage( + MessageEditor.MessageType.INFO, + "commands.fun.avatar.success.title", + member.getUser().getAsTag()) .setImage(member.getUser().getAvatarUrl()) .setFooter(member.getUser().getAsTag()) .build()).queue(); } else if (event.getMessage().getMentionedMembers().size() == 1) { Member member = event.getMessage().getMentionedMembers().get(0); - event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO) - .setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.fun.avatar.success.title", member.getUser().getAsTag())) + event.getTextChannel().sendMessage( + event.getMessageEditor().getMessage( + MessageEditor.MessageType.INFO, + "commands.fun.avatar.success.title", + member.getUser().getAsTag(), + "", + "") .setImage(member.getUser().getAvatarUrl()) .setFooter(member.getUser().getAsTag()) .build()).queue(); } else if (args[0].length() == 18){ Member member = event.getGuild().getMemberById(args[0]); - event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO) - .setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.fun.avatar.success.title", member.getUser().getAsTag())) + event.getTextChannel().sendMessage( + event.getMessageEditor().getMessage( + MessageEditor.MessageType.INFO, + "commands.fun.avatar.success.title", + member.getUser().getAsTag(), + "", + "") .setImage(member.getUser().getAvatarUrl()) .setFooter(member.getUser().getAsTag()) .build()).queue(); @@ -46,7 +59,7 @@ public class AvatarCommand implements Command { @Override public String description() { - return MessageEditor.handle("en", "commands.fun.avatar.help.description"); + return "commands.fun.avatar.help.description"; } @Override diff --git a/src/main/java/com/bbn/hadder/commands/fun/GifCommand.java b/src/main/java/com/bbn/hadder/commands/fun/GifCommand.java index 4de31b3..ecd14d1 100644 --- a/src/main/java/com/bbn/hadder/commands/fun/GifCommand.java +++ b/src/main/java/com/bbn/hadder/commands/fun/GifCommand.java @@ -37,7 +37,11 @@ public class GifCommand implements Command { String url = array.getJSONObject(gifIndex).get("url").toString(); event.getTextChannel().sendMessage(url).queue(); } catch (Exception e) { - event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.ERROR).setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "error")).setDescription(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.fun.gif.error.description")).build()).queue(); + event.getTextChannel().sendMessage( + event.getMessageEditor().getMessage( + MessageEditor.MessageType.ERROR, + "error", + "commands.fun.gif.error.description").build()).queue(); } } else event.getHelpCommand().sendHelp(this, event); } @@ -49,7 +53,7 @@ public class GifCommand implements Command { @Override public String description() { - return MessageEditor.handle("en", "commands.fun.gif.help.description"); + return "commands.fun.gif.help.description"; } @Override diff --git a/src/main/java/com/bbn/hadder/commands/fun/MemeCommand.java b/src/main/java/com/bbn/hadder/commands/fun/MemeCommand.java index 143c9b6..93b7749 100644 --- a/src/main/java/com/bbn/hadder/commands/fun/MemeCommand.java +++ b/src/main/java/com/bbn/hadder/commands/fun/MemeCommand.java @@ -27,15 +27,18 @@ public class MemeCommand implements Command { Response response = client.newCall(request).execute(); JSONObject json = new JSONObject(response.body().string()); String url = json.get("image").toString(); - event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO) - .setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.fun.meme.success.title")) + event.getTextChannel().sendMessage( + event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO, + "commands.fun.meme.success.title", "") .setImage(url) .build()).queue(); } catch (IOException e) { e.printStackTrace(); - event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.ERROR) - .setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "error")) - .setDescription(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.fun.meme.api.error")) + event.getTextChannel().sendMessage( + event.getMessageEditor().getMessage( + MessageEditor.MessageType.ERROR, + "error", + "commands.fun.meme.api.error") .setColor(Color.RED) .build()).queue(); } @@ -48,7 +51,7 @@ public class MemeCommand implements Command { @Override public String description() { - return MessageEditor.handle("en", "commands.fun.meme.help.description"); + return "commands.fun.meme.help.description"; } @Override diff --git a/src/main/java/com/bbn/hadder/commands/general/AboutCommand.java b/src/main/java/com/bbn/hadder/commands/general/AboutCommand.java index 2050712..82d17eb 100644 --- a/src/main/java/com/bbn/hadder/commands/general/AboutCommand.java +++ b/src/main/java/com/bbn/hadder/commands/general/AboutCommand.java @@ -12,10 +12,12 @@ public class AboutCommand implements Command { @Override public void executed(String[] args, CommandEvent event) { - event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO) - .setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.general.about.success.title")) - .setDescription(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.general.about.success.description")) - .addField(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.general.about.success.field.one.title"), MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.general.about.success.field.one.description", "(https://donatebot.io/checkout/448554629282922527?buyer=" + event.getAuthor().getId() + "). :smiley:"), true) + event.getTextChannel().sendMessage( + event.getMessageEditor().getMessage( + MessageEditor.MessageType.INFO, + "commands.general.about.success.title", + "commands.general.about.success.description") + .addField(event.getMessageEditor().getTerm("commands.general.about.success.field.one.title"), event.getMessageEditor().getTerm("commands.general.about.success.field.one.description", "(https://donatebot.io/checkout/448554629282922527?buyer=" + event.getAuthor().getId() + "). :smiley:", ""), true) .setThumbnail("https://bigbotnetwork.com/images/Hadder.png") .build()).queue(); } @@ -27,7 +29,7 @@ public class AboutCommand implements Command { @Override public String description() { - return MessageEditor.handle("en", "commands.general.about.help.description"); + return "commands.general.about.help.description"; } @Override diff --git a/src/main/java/com/bbn/hadder/commands/general/EqualsCommand.java b/src/main/java/com/bbn/hadder/commands/general/EqualsCommand.java index e5d2b90..f2772e3 100644 --- a/src/main/java/com/bbn/hadder/commands/general/EqualsCommand.java +++ b/src/main/java/com/bbn/hadder/commands/general/EqualsCommand.java @@ -14,24 +14,25 @@ public class EqualsCommand implements Command { @Override public void executed(String[] args, CommandEvent event) { event.getChannel().sendMessage( - new MessageEditor() - .setDefaultSettings(MessageEditor.MessageType.INFO) - .setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.general.equals.string.first.request")) + event.getMessageEditor().getMessage( + MessageEditor.MessageType.INFO, + "commands.general.equals.string.first.request", "") .build()).queue(); new EventWaiter().newOnMessageEventWaiter(msgevent -> { String firstString = msgevent.getMessage().getContentRaw(); event.getChannel().sendMessage( - new MessageEditor() - .setDefaultSettings( - MessageEditor.MessageType.INFO).setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.general.equals.string.second.request")).build()).queue(); + event.getMessageEditor().getMessage( + MessageEditor.MessageType.INFO, + "commands.general.equals.string.second.request", + "").build()).queue(); new EventWaiter().newOnMessageEventWaiter(msgevent2 -> { String secondString = msgevent2.getMessage().getContentRaw(); event.getChannel().sendMessage( - new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO) - .setTitle((firstString.equals(secondString)) ? MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.general.equals.string.equals.true") : MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.general.equals.string.equals.false")) - .addField(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.general.equals.string.first"), firstString, false) - .addField(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.general.equals.string.second"), secondString, false) - .addField(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.general.equals.string.result"), String.valueOf(firstString.equals(secondString)), false) + event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO) + .setTitle((firstString.equals(secondString)) ? event.getMessageEditor().getTerm( "commands.general.equals.string.equals.true") : event.getMessageEditor().getTerm( "commands.general.equals.string.equals.false")) + .addField(event.getMessageEditor().getTerm( "commands.general.equals.string.first"), firstString, false) + .addField(event.getMessageEditor().getTerm( "commands.general.equals.string.second"), secondString, false) + .addField(event.getMessageEditor().getTerm( "commands.general.equals.string.result"), String.valueOf(firstString.equals(secondString)), false) .build()).queue(); }, event.getJDA(), event.getAuthor()); }, event.getJDA(), event.getAuthor()); @@ -44,7 +45,7 @@ public class EqualsCommand implements Command { @Override public String description() { - return MessageEditor.handle("en", "commands.general.equals.help.description"); + return "commands.general.equals.help.description"; } @Override diff --git a/src/main/java/com/bbn/hadder/commands/general/HelpCommand.java b/src/main/java/com/bbn/hadder/commands/general/HelpCommand.java index 14934aa..c564410 100644 --- a/src/main/java/com/bbn/hadder/commands/general/HelpCommand.java +++ b/src/main/java/com/bbn/hadder/commands/general/HelpCommand.java @@ -28,7 +28,8 @@ public class HelpCommand implements Command { } EmbedBuilder eb = new EmbedBuilder(); for (Map.Entry> entry : hashMap.entrySet()) { - if (!entry.getKey().endsWith("owner") || (entry.getKey().endsWith("owner") && (event.getAuthor().getId().equals("477141528981012511") || event.getAuthor().getId().equals("261083609148948488")))) { + if (!entry.getKey().endsWith("owner") || (entry.getKey().endsWith("owner") && (event.getAuthor().getId().equals("477141528981012511") || + event.getAuthor().getId().equals("261083609148948488")))) { StringBuilder sb = new StringBuilder(); for (int i = 0; i < entry.getValue().size(); i++) { Command cmd = entry.getValue().get(i); @@ -39,7 +40,7 @@ public class HelpCommand implements Command { eb.addField(ps[ps.length - 1], sb.toString(), false); } } - new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO); + event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO); event.getChannel().sendMessage(eb.build()).queue(); } else { for (Command cmd : event.getCommandHandler().getCommandList()) { @@ -51,19 +52,21 @@ public class HelpCommand implements Command { } } } else { - event.getTextChannel().sendMessage(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.general.help.error.description")).queue(); + event.getTextChannel().sendMessage(event.getMessageEditor().getTerm("commands.general.help.error.description")).queue(); } } public void sendHelp(Command cmd, CommandEvent event) { if (!cmd.getClass().getPackageName().endsWith("owner") || (cmd.getClass().getPackageName().endsWith("owner") && (event.getAuthor().getId().equals("477141528981012511") || event.getAuthor().getId().equals("261083609148948488")))) { - EmbedBuilder eb = new EmbedBuilder(); String name = cmd.labels()[0]; - eb.setDescription(cmd.description()).setTitle(name.replaceFirst(String.valueOf(name.charAt(0)), String.valueOf(name.charAt(0)).toUpperCase())); - eb.addField(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.general.help.field.usage"), event.getRethink().getUserPrefix(event.getAuthor().getId()) + cmd.labels()[0] + " " + cmd.usage(), false); - new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO); - event.getChannel().sendMessage(eb.build()).queue(); + event.getChannel().sendMessage(event.getMessageEditor().getMessage( + MessageEditor.MessageType.INFO, "", cmd.description()) + .setTitle(name.replaceFirst(String.valueOf(name.charAt(0)), String.valueOf(name.charAt(0)).toUpperCase())) + .addField(MessageEditor.getTerm(event, "commands.general.help.field.usage", "", ""), + event.getRethink().getUserPrefix(event.getAuthor().getId()) + cmd.labels()[0] + " " + event.getMessageEditor().getTerm(cmd.usage()), false) + .build()).queue(); + } } @@ -74,11 +77,11 @@ public class HelpCommand implements Command { @Override public String description() { - return MessageEditor.handle("en", "commands.general.help.help.description"); + return "commands.general.help.help.description"; } @Override public String usage() { - return MessageEditor.handle("en", "commands.general.help.help.label"); + return "commands.general.help.help.label"; } } diff --git a/src/main/java/com/bbn/hadder/commands/general/InviteCommand.java b/src/main/java/com/bbn/hadder/commands/general/InviteCommand.java index 7b17bb7..cac20c5 100644 --- a/src/main/java/com/bbn/hadder/commands/general/InviteCommand.java +++ b/src/main/java/com/bbn/hadder/commands/general/InviteCommand.java @@ -13,9 +13,15 @@ public class InviteCommand implements Command { @Override public void executed(String[] args, CommandEvent event) { - event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO) - .setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.general.invite.success.title")) - .setDescription(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.general.invite.success.description", "(https://discordapp.com/oauth2/authorize?client_id=" + Hadder.shardManager.getGuilds().get(0).getSelfMember().getId() + "&scope=bot&permissions=470133879)")) + event.getTextChannel().sendMessage( + event.getMessageEditor().getMessage( + MessageEditor.MessageType.INFO, + "commands.general.invite.success.title", + "", + "commands.general.invite.success.description", + "(https://discordapp.com/oauth2/authorize?client_id=" + + Hadder.shardManager.getGuilds().get(0).getSelfMember().getId() + + "&scope=bot&permissions=470133879)") .build()).queue(); } @@ -26,7 +32,7 @@ public class InviteCommand implements Command { @Override public String description() { - return MessageEditor.handle("en", "commands.general.invite.help.description"); + return "commands.general.invite.help.description"; } @Override diff --git a/src/main/java/com/bbn/hadder/commands/general/PingCommand.java b/src/main/java/com/bbn/hadder/commands/general/PingCommand.java index b5e8c01..8317a45 100644 --- a/src/main/java/com/bbn/hadder/commands/general/PingCommand.java +++ b/src/main/java/com/bbn/hadder/commands/general/PingCommand.java @@ -12,8 +12,8 @@ public class PingCommand implements Command { @Override public void executed(String[] args, CommandEvent event) { - event.getJDA().getRestPing().queue(ping -> event.getTextChannel().sendMessage(new MessageEditor() - .setDefaultSettings(MessageEditor.MessageType.INFO) + event.getJDA().getRestPing().queue(ping -> event.getTextChannel().sendMessage(event.getMessageEditor() + .getMessage(MessageEditor.MessageType.INFO) .setTitle("Ping") .setDescription(String.valueOf(ping)) .build()).queue()); @@ -26,7 +26,7 @@ public class PingCommand implements Command { @Override public String description() { - return MessageEditor.handle("en", "commands.general.ping.help.description"); + return "commands.general.ping.help.description"; } @Override diff --git a/src/main/java/com/bbn/hadder/commands/misc/FeedbackCommand.java b/src/main/java/com/bbn/hadder/commands/misc/FeedbackCommand.java index 50394a4..d081a46 100644 --- a/src/main/java/com/bbn/hadder/commands/misc/FeedbackCommand.java +++ b/src/main/java/com/bbn/hadder/commands/misc/FeedbackCommand.java @@ -18,15 +18,18 @@ public class FeedbackCommand implements Command { @Override public void executed(String[] args, CommandEvent event) { - event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO) - .setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.misc.feedback.title.request.title")) - .setDescription(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.misc.feedback.title.request.description")) + event.getTextChannel().sendMessage( + event.getMessageEditor().getMessage( + MessageEditor.MessageType.INFO, + "commands.misc.feedback.title.request.title", + "commands.misc.feedback.title.request.description") .build()).queue(); new EventWaiter().newOnMessageEventWaiter(event1 -> { String title = event1.getMessage().getContentDisplay(); - event1.getChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO) - .setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.misc.feedback.description.request.title")) - .setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.misc.feedback.description.request.description")) + event1.getChannel().sendMessage(event.getMessageEditor().getMessage( + MessageEditor.MessageType.INFO, + "commands.misc.feedback.description.request.title", + "commands.misc.feedback.description.request.description") .build()).queue(); new EventWaiter().newOnMessageEventWaiter(event2 -> { String description = event2.getMessage().getContentDisplay(); @@ -34,9 +37,12 @@ public class FeedbackCommand implements Command { GitHub connection = GitHub.connectUsingOAuth(event.getConfig().getGitHubToken()); GHRepository Hadder = connection.getOrganization("BigBotNetwork").getRepository("Hadder"); GHIssue issue = Hadder.createIssue(title).body("Feedback by " + event.getAuthor().getAsTag() + "
" + description).label("feedback").create(); - event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO) - .setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.misc.feedback.success.title")) - .setDescription(issue.getHtmlUrl().toString()) + event.getTextChannel().sendMessage( + event.getMessageEditor().getMessage( + MessageEditor.MessageType.INFO, + "commands.misc.feedback.success.title", + "") + .setDescription(issue.getHtmlUrl().toString()) .build()).queue(); } catch (IOException e) { e.printStackTrace(); @@ -53,7 +59,7 @@ public class FeedbackCommand implements Command { @Override public String description() { - return MessageEditor.handle("en", "commands.misc.feedback.help.description"); + return "commands.misc.feedback.help.description"; } @Override diff --git a/src/main/java/com/bbn/hadder/commands/misc/GitHubCommand.java b/src/main/java/com/bbn/hadder/commands/misc/GitHubCommand.java index 8640f1b..6547861 100644 --- a/src/main/java/com/bbn/hadder/commands/misc/GitHubCommand.java +++ b/src/main/java/com/bbn/hadder/commands/misc/GitHubCommand.java @@ -21,7 +21,14 @@ public class GitHubCommand implements Command { public void executed(String[] args, CommandEvent event) { if (args.length > 0) { if (args[0].equals("link")) { - event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO).setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.misc.github.link.title")).setDescription("https://github.com/login/oauth/authorize?client_id=25321f690bb1b6952942").build()).queue(); + event.getTextChannel().sendMessage( + event.getMessageEditor().getMessage( + MessageEditor.MessageType.INFO, + "commands.misc.github.link.title", + "") + .setDescription("https://github.com/login/oauth/authorize?client_id=25321f690bb1b6952942") + .build() + ).queue(); } else { Request request = new Request.Builder().url("https://api.github.com/users/" + args[0]).build(); try { @@ -44,28 +51,38 @@ public class GitHubCommand implements Command { if (!json.getString("blog").equals("")) website = json.getString("blog"); - event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO) - .setAuthor(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.misc.github.success.title", nickname + " (" + args[0] + ")"), "https://github.com/" + args[0] + "", "https://github.githubassets.com/images/modules/logos_page/GitHub-Mark.png") + event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO) + .setAuthor(event.getMessageEditor().getTerm("commands.misc.github.success.title", nickname + " (" + args[0] + ")", ""), "https://github.com/" + args[0] + "", "https://github.githubassets.com/images/modules/logos_page/GitHub-Mark.png") .setThumbnail(json.getString("avatar_url")) - .addField(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.misc.github.success.bio"), bio, false) - .addField(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.misc.github.success.location"), location, true) - .addField(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.misc.github.success.website"), website, true) - .addField(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.misc.github.success.repositories"), String.valueOf(json.getInt("public_repos")), true) - .addField(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.misc.github.success.gists"), String.valueOf(json.getInt("public_gists")), true) - .addField(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.misc.github.success.followers"), String.valueOf(json.getInt("followers")), true) - .addField(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.misc.github.success.following"), String.valueOf(json.getInt("following")), true) + .addField(event.getMessageEditor().getTerm("commands.misc.github.success.bio"), bio, false) + .addField(event.getMessageEditor().getTerm("commands.misc.github.success.location"), location, true) + .addField(event.getMessageEditor().getTerm("commands.misc.github.success.website"), website, true) + .addField(event.getMessageEditor().getTerm("commands.misc.github.success.repositories"), String.valueOf(json.getInt("public_repos")), true) + .addField(event.getMessageEditor().getTerm("commands.misc.github.success.gists"), String.valueOf(json.getInt("public_gists")), true) + .addField(event.getMessageEditor().getTerm("commands.misc.github.success.followers"), String.valueOf(json.getInt("followers")), true) + .addField(event.getMessageEditor().getTerm("commands.misc.github.success.following"), String.valueOf(json.getInt("following")), true) .build()).queue(); } catch (IOException | NullPointerException e) { - event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.ERROR).setDescription(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.misc.github.api.error.description")).build()).queue(); + event.getTextChannel().sendMessage( + event.getMessageEditor().getMessage( + MessageEditor.MessageType.ERROR, + "", + "commands.misc.github.api.error.description") + .build() + ).queue(); } catch (JSONException e) { - event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.WARNING).setDescription(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.misc.github.user.error.description")).build()).queue(); + event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.WARNING, "","commands.misc.github.user.error.description").build()).queue(); } } } else { - event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO) - .setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.misc.github.connect.title")) - .setDescription(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.misc.github.connect.description", "(https://github.com/login/oauth/authorize?client_id=25321f690bb1b6952942)")) + event.getTextChannel().sendMessage( + event.getMessageEditor().getMessage( + MessageEditor.MessageType.INFO, + "commands.misc.github.connect.title", + "", + "commands.misc.github.connect.description", + "(https://github.com/login/oauth/authorize?client_id=25321f690bb1b6952942)") .build()).queue(); } } @@ -77,11 +94,11 @@ public class GitHubCommand implements Command { @Override public String description() { - return MessageEditor.handle("en", "commands.misc.github.help.description"); + return "commands.misc.github.help.description"; } @Override public String usage() { - return MessageEditor.handle("en", "username"); + return "username"; } } diff --git a/src/main/java/com/bbn/hadder/commands/misc/ScreenShareCommand.java b/src/main/java/com/bbn/hadder/commands/misc/ScreenShareCommand.java deleted file mode 100644 index 7e694c0..0000000 --- a/src/main/java/com/bbn/hadder/commands/misc/ScreenShareCommand.java +++ /dev/null @@ -1,95 +0,0 @@ -package com.bbn.hadder.commands.misc; - -import com.bbn.hadder.commands.Command; -import com.bbn.hadder.commands.CommandEvent; -import com.bbn.hadder.utils.EventWaiter; -import com.bbn.hadder.utils.MessageEditor; -import net.dv8tion.jda.api.EmbedBuilder; -import net.dv8tion.jda.api.entities.VoiceChannel; - -import java.util.List; - -public class ScreenShareCommand implements Command { - - @Override - public void executed(String[] args, CommandEvent event) { - if (args.length>0) { - if (args[0].matches("[0-9]*")&&args.length==1) { - for (VoiceChannel vc : event.getGuild().getVoiceChannels()) { - try { - if (vc.getIdLong() == Long.parseLong(args[0])) { - event.getChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO) - .setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.misc.screenshare.success.title")) - .setDescription("http://discordapp.com/channels/" + event.getGuild().getId() + "/" + vc.getId() + "/").build()).queue(); - return; - } - } catch (NumberFormatException e) { - event.getChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.ERROR) - .setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.misc.screenshare.id.error.title")) - .setDescription(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.misc.screenshare.id.error.description")).build()).queue(); - event.getHelpCommand().sendHelp(this, event); - return; - } - } - } else { - List vcs = event.getGuild().getVoiceChannelsByName(String.join(" ", args), true); - if (vcs.size() > 1) { - EmbedBuilder eb = new EmbedBuilder() - .setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.misc.screenshare.channel.error.title")) - .setDescription(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.misc.screenshare.channel.error.description")); - for (int i = 0; i < vcs.size(); i++) { - VoiceChannel voiceChannel = vcs.get(i); - eb.addField(i + ": " + voiceChannel.getName(), voiceChannel.getId(), false); - } - event.getChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.WARNING).build()).queue(); - new EventWaiter().newOnMessageEventWaiter(msgevent -> { - try { - int i = Integer.parseInt(msgevent.getMessage().getContentRaw()); - if (vcs.size() > i) { - event.getChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO) - .setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.misc.screenshare.success.title")) - .setDescription("http://discordapp.com/channels/" + event.getGuild().getId() + "/" + vcs.get(i).getId() + "/").build()).queue(); - } else { - - event.getChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.ERROR) - .setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.misc.screenshare.number.error.title")).build()).queue(); - event.getHelpCommand().sendHelp(this, event); - } - } catch (NumberFormatException e) { - event.getChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.ERROR) - .setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.misc.screenshare.id.error.title")) - .setDescription(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.misc.screenshare.number.error.description")).build()).queue(); - event.getHelpCommand().sendHelp(this, event); - } - }, event.getJDA(), event.getAuthor()); - } else if (vcs.size()==0) { - event.getChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.ERROR) - .setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.misc.screenshare.channel.existing.error")) - .setDescription(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.misc.screenshare.channel.existing.description")).build()).queue(); - event.getHelpCommand().sendHelp(this, event); - } else { - event.getChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO) - .setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.misc.screenshare.success.title")) - .setDescription("http://discordapp.com/channels/" + event.getGuild().getId() + "/" + vcs.get(0).getId() + "/").build()).queue(); - } - } - } else { - event.getHelpCommand().sendHelp(this, event); - } - } - - @Override - public String[] labels() { - return new String[]{"screenshare"}; - } - - @Override - public String description() { - return MessageEditor.handle("en", "commands.misc.screenshare.help.description"); - } - - @Override - public String usage() { - return MessageEditor.handle("en", "vc-name/id"); - } -} diff --git a/src/main/java/com/bbn/hadder/commands/moderation/BanCommand.java b/src/main/java/com/bbn/hadder/commands/moderation/BanCommand.java index 2d1e831..01c76c2 100644 --- a/src/main/java/com/bbn/hadder/commands/moderation/BanCommand.java +++ b/src/main/java/com/bbn/hadder/commands/moderation/BanCommand.java @@ -21,15 +21,29 @@ public class BanCommand implements Command { if (!event.getJDA().getSelfUser().getId().equals(victim.getId())) { if (event.getGuild().getSelfMember().canInteract(victim)) { event.getGuild().ban(victim, 0, "Banned by " + event.getAuthor().getAsTag()).queue(); - event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO).setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.ban.success.title"), "✅").setDescription(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.ban.success.description", victim.getUser().getName() + ".")).build()).queue(); + event.getTextChannel().sendMessage( + event.getMessageEditor().getMessage( + MessageEditor.MessageType.INFO, + "commands.moderation.ban.success.title", + "✅", + "commands.moderation.ban.success.description", + victim.getUser().getName() + ".").build()).queue(); } else { - event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.NO_SELF_PERMISSION).build()).queue(); + event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.NO_SELF_PERMISSION).build()).queue(); } } else { - event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.WARNING).setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.ban.error.title")).setDescription(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.ban.myself.error.description")).build()).queue(); + event.getTextChannel().sendMessage( + event.getMessageEditor().getMessage( + MessageEditor.MessageType.WARNING, + "commands.moderation.ban.error.title", + "commands.moderation.ban.myself.error.description").build()).queue(); } } else { - event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.WARNING).setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.ban.error.title")).setDescription(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.ban.yourself.error.description")).build()).queue(); + event.getTextChannel().sendMessage + (event.getMessageEditor().getMessage( + MessageEditor.MessageType.WARNING, + "commands.moderation.ban.error.title", + "commands.moderation.ban.yourself.error.description").build()).queue(); } } else if (event.getMessage().getMentionedMembers().size() == 0) { event.getHelpCommand().sendHelp(this, event); @@ -41,19 +55,30 @@ public class BanCommand implements Command { if (event.getGuild().getSelfMember().canInteract(member)) { event.getGuild().ban(member, 0).reason("Mass Ban by " + event.getAuthor().getAsTag()).queue(); } else { - event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.NO_SELF_PERMISSION).build()).queue(); + event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.NO_SELF_PERMISSION).build()).queue(); } } else { - event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.WARNING).setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.ban.error.title")).setDescription(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.ban.myself.error.description")).build()).queue(); + event.getTextChannel().sendMessage( + event.getMessageEditor().getMessage( + MessageEditor.MessageType.WARNING, + "commands.moderation.ban.error.title", + "commands.moderation.ban.myself.error.description").build()).queue(); } } else { - event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.WARNING).setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.ban.error.title")).setDescription(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.ban.yourself.error.description")).build()).queue(); + event.getTextChannel().sendMessage(event.getMessageEditor().getMessage( + MessageEditor.MessageType.WARNING, + "commands.moderation.ban.error.title", + "commands.moderation.ban.yourself.error.description").build()).queue(); } } - event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO).setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.ban.success.title", "✅")).setDescription(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.ban.massban.success.description", String.valueOf(event.getMessage().getMentionedMembers().size()))).build()).queue(); + event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO, + "commands.moderation.ban.success.title", + "✅", + "commands.moderation.ban.massban.success.description", + String.valueOf(event.getMessage().getMentionedMembers().size())).build()).queue(); } } else { - event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.NO_PERMISSION).build()).queue(); + event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.NO_PERMISSION).build()).queue(); } } @@ -64,7 +89,7 @@ public class BanCommand implements Command { @Override public String description() { - return MessageEditor.handle("en", "commands.moderation.ban.help.description"); + return "commands.moderation.ban.help.description"; } @Override diff --git a/src/main/java/com/bbn/hadder/commands/moderation/ClearCommand.java b/src/main/java/com/bbn/hadder/commands/moderation/ClearCommand.java index d19ea55..684e5a6 100644 --- a/src/main/java/com/bbn/hadder/commands/moderation/ClearCommand.java +++ b/src/main/java/com/bbn/hadder/commands/moderation/ClearCommand.java @@ -25,14 +25,24 @@ public class ClearCommand implements Command { try { int nbToDelete = Integer.parseInt(args[0]); if(nbToDelete < 1 || nbToDelete > 99) { - event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.WARNING).setDescription(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.clear.number.error.description")).build()).queue(); + event.getTextChannel().sendMessage( + event.getMessageEditor().getMessage( + MessageEditor.MessageType.WARNING, + "", + "commands.moderation.clear.number.error.description").build()).queue(); return; } List history = event.getTextChannel().getHistory().retrievePast(nbToDelete +1).complete(); List msgToDelete = new ArrayList<>(); msgToDelete.addAll(history); event.getTextChannel().deleteMessages(msgToDelete).queue(); - Message msg = event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO).setDescription(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.clear.success.description", String.valueOf(nbToDelete))).build()).complete(); + Message msg = event.getTextChannel().sendMessage( + event.getMessageEditor().getMessage( + MessageEditor.MessageType.INFO, + "", + "", + "commands.moderation.clear.success.description", + String.valueOf(nbToDelete)).build()).complete(); try { TimeUnit.SECONDS.sleep(2); } catch (InterruptedException e) { @@ -43,10 +53,10 @@ public class ClearCommand implements Command { event.getHelpCommand().sendHelp(this, event); } } else { - event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.NO_SELF_PERMISSION).build()).queue(); + event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.NO_SELF_PERMISSION).build()).queue(); } } else { - event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.NO_PERMISSION).build()).queue(); + event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.NO_PERMISSION).build()).queue(); } } else { event.getHelpCommand().sendHelp(this, event); @@ -60,11 +70,11 @@ public class ClearCommand implements Command { @Override public String description() { - return MessageEditor.handle("en", "commands.moderation.clear.help.description"); + return "commands.moderation.clear.help.description"; } @Override public String usage() { - return MessageEditor.handle("en", "number"); + return "number"; } } diff --git a/src/main/java/com/bbn/hadder/commands/moderation/GuildPrefixCommand.java b/src/main/java/com/bbn/hadder/commands/moderation/GuildPrefixCommand.java index b978d95..35bfb2b 100644 --- a/src/main/java/com/bbn/hadder/commands/moderation/GuildPrefixCommand.java +++ b/src/main/java/com/bbn/hadder/commands/moderation/GuildPrefixCommand.java @@ -14,15 +14,25 @@ public class GuildPrefixCommand implements Command { if (!args[0].contains("\"")) { event.getRethink().setGuildPrefix(args[0], event.getGuild().getId()); - event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO).setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.prefix.success.title"), "✅").setDescription(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.prefix.success.description", args[0])).build()).queue(); + event.getTextChannel().sendMessage(event.getMessageEditor().getMessage( + MessageEditor.MessageType.INFO, + "commands.moderation.prefix.success.title", + "✅", + "commands.moderation.prefix.success.description", + args[0]).build() + ).queue(); } else { - event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.WARNING).setDescription(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.prefix.error.description")).build()).queue(); + event.getTextChannel().sendMessage( + event.getMessageEditor().getMessage( + MessageEditor.MessageType.WARNING, + "", + "commands.moderation.prefix.error.description").build()).queue(); } } else { event.getHelpCommand().sendHelp(this, event); } } else { - event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.NO_PERMISSION).build()).queue(); + event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.NO_PERMISSION).build()).queue(); } } @@ -33,11 +43,11 @@ public class GuildPrefixCommand implements Command { @Override public String description() { - return MessageEditor.handle("en", "commands.moderation.prefix.help.description"); + return "commands.moderation.prefix.help.description"; } @Override public String usage() { - return MessageEditor.handle("en", "guildprefix"); + return "guildprefix"; } } diff --git a/src/main/java/com/bbn/hadder/commands/moderation/InviteDetectCommand.java b/src/main/java/com/bbn/hadder/commands/moderation/InviteDetectCommand.java index 849cbc5..5bc0981 100644 --- a/src/main/java/com/bbn/hadder/commands/moderation/InviteDetectCommand.java +++ b/src/main/java/com/bbn/hadder/commands/moderation/InviteDetectCommand.java @@ -20,14 +20,17 @@ public class InviteDetectCommand implements Command { case "on": if (!event.getRethink().getInviteDetection(event.getGuild().getId())) { event.getRethink().setInviteDetection(event.getGuild().getId(), true); - event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO) - .setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.invitedetect.activate.success.title")) - .setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.invitedetect.activate.success.description")) + event.getTextChannel().sendMessage( + event.getMessageEditor().getMessage( + MessageEditor.MessageType.INFO, + "commands.moderation.invitedetect.activate.success.title", + "commands.moderation.invitedetect.activate.success.description") .build()).queue(); } else { - event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.WARNING) - .setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.invitedetect.activate.error.title")) - .setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.invitedetect.activate.error.description")) + event.getTextChannel().sendMessage(event.getMessageEditor().getMessage( + MessageEditor.MessageType.WARNING, + "commands.moderation.invitedetect.activate.error.title", + "commands.moderation.invitedetect.activate.error.description") .build()).queue(); } break; @@ -35,20 +38,22 @@ public class InviteDetectCommand implements Command { case "off": if (event.getRethink().getInviteDetection(event.getGuild().getId())) { event.getRethink().setInviteDetection(event.getGuild().getId(), false); - event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO) - .setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.invitedetect.deactivate.success.title")) - .setDescription(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.invitedetect.deactivate.success.description")) + event.getTextChannel().sendMessage(event.getMessageEditor().getMessage( + MessageEditor.MessageType.INFO, + "commands.moderation.invitedetect.deactivate.success.title", + "commands.moderation.invitedetect.deactivate.success.description") .build()).queue(); } else { - event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.WARNING) - .setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.invitedetect.deactivate.error.title")) - .setDescription(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.invitedetect.deactivate.error.description")) + event.getTextChannel().sendMessage(event.getMessageEditor().getMessage( + MessageEditor.MessageType.WARNING, + "commands.moderation.invitedetect.deactivate.error.title", + "commands.moderation.invitedetect.deactivate.error.description") .build()).queue(); } break; } } else { - event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.NO_PERMISSION).build()).queue(); + event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.NO_PERMISSION).build()).queue(); } } else { event.getHelpCommand().sendHelp(this, event); @@ -62,7 +67,7 @@ public class InviteDetectCommand implements Command { @Override public String description() { - return MessageEditor.handle("en", "commands.moderation.invitedetect.help.description"); + return "commands.moderation.invitedetect.help.description"; } @Override diff --git a/src/main/java/com/bbn/hadder/commands/moderation/KickCommand.java b/src/main/java/com/bbn/hadder/commands/moderation/KickCommand.java index 31a2e8a..a894608 100644 --- a/src/main/java/com/bbn/hadder/commands/moderation/KickCommand.java +++ b/src/main/java/com/bbn/hadder/commands/moderation/KickCommand.java @@ -22,15 +22,25 @@ public class KickCommand implements Command { if (!event.getJDA().getSelfUser().getId().equals(victim.getId())) { if (event.getGuild().getSelfMember().canInteract(victim)) { event.getGuild().kick(victim, "Kicked by " + event.getAuthor().getAsTag()).queue(); - event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO).setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.kick.success.title", "✅")).setDescription(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.kick.success.description", victim.getUser().getName())).build()).queue(); + event.getTextChannel().sendMessage( + event.getMessageEditor().getMessage( + MessageEditor.MessageType.INFO, + "commands.moderation.kick.success.title", + "✅", + "commands.moderation.kick.success.description", + victim.getUser().getName()).build()).queue(); } else { - event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.NO_SELF_PERMISSION).build()).queue(); + event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.NO_SELF_PERMISSION).build()).queue(); } } else { - event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.WARNING).setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.kick.error.title")).setDescription(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.kick.myself.error.description")).build()).queue(); + event.getTextChannel().sendMessage( + event.getMessageEditor().getMessage( + MessageEditor.MessageType.WARNING, + "commands.moderation.kick.error.title", + "commands.moderation.kick.myself.error.description").build()).queue(); } } else { - event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.WARNING).setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.kick.error.title")).setDescription(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.kick.yourself.error.description")).build()).queue(); + event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.WARNING, "commands.moderation.kick.error.title", "commands.moderation.kick.yourself.error.description").build()).queue(); } } else if (event.getMessage().getMentionedMembers().size() == 0) { event.getHelpCommand().sendHelp(this, event); @@ -42,16 +52,16 @@ public class KickCommand implements Command { if (event.getGuild().getSelfMember().canInteract(member)) { event.getGuild().kick(member).reason("Mass Kicked by " + event.getAuthor().getAsTag()).queue(); } else { - event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.NO_SELF_PERMISSION).build()).queue(); + event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.NO_SELF_PERMISSION).build()).queue(); } } else { - event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.WARNING).setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.kick.error.title")).setDescription(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.kick.myself.error.description")).build()).queue(); + event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.WARNING, "commands.moderation.kick.error.title","commands.moderation.kick.myself.error.description").build()).queue(); } } else { - event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.WARNING).setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.kick.error.title")).setDescription(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.kick.yourself.error.description")).build()).queue(); + event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.WARNING, "commands.moderation.kick.error.title", "commands.moderation.kick.yourself.error.description").build()).queue(); } } - event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO).setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.kick.success.title", "✅")).setDescription(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.kick.masskick.success.description", String.valueOf(event.getMessage().getMentionedMembers().size()))).build()).queue(); + event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO,"commands.moderation.kick.success.title", "✅","commands.moderation.kick.masskick.success.description", String.valueOf(event.getMessage().getMentionedMembers().size())).build()).queue(); } } } @@ -63,7 +73,7 @@ public class KickCommand implements Command { @Override public String description() { - return MessageEditor.handle("en", "commands.moderation.kick.help.description"); + return "commands.moderation.kick.help.description"; } @Override diff --git a/src/main/java/com/bbn/hadder/commands/moderation/LinkCommand.java b/src/main/java/com/bbn/hadder/commands/moderation/LinkCommand.java deleted file mode 100644 index a6c20f2..0000000 --- a/src/main/java/com/bbn/hadder/commands/moderation/LinkCommand.java +++ /dev/null @@ -1,94 +0,0 @@ -package com.bbn.hadder.commands.moderation; - -import com.bbn.hadder.commands.Command; -import com.bbn.hadder.commands.CommandEvent; -import com.bbn.hadder.utils.MessageEditor; -import net.dv8tion.jda.api.EmbedBuilder; -import net.dv8tion.jda.api.entities.Guild; - -public class LinkCommand implements Command { - @Override - public void executed(String[] args, CommandEvent event) { - if (args.length == 0) event.getHelpCommand().sendHelp(this, event); - switch (args[0].toLowerCase()) { - case "add": - if (args.length != 2) return; - String linkid = args[1]; - - // Check if guild exists - boolean found = false; - Guild linkguild = null; - for (Guild g : event.getJDA().getGuilds()) { - if (g.getId().equals(linkid)) { - found = true; - linkguild = g; - } - } - if (!found) { - event.getChannel().sendMessage( - new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO) - .setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "success!")).setDescription(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.link.request.success.description")) - .build()).queue(); - return; - } - - // Check if the guild is the same - if (event.getGuild().getId().equals(args[1])) { - event.getChannel().sendMessage( - new MessageEditor().setDefaultSettings(MessageEditor.MessageType.ERROR) - .setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.link.error.title")).setDescription(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.link.request.error.description")).build()).queue(); - return; - } - - // Send poll to all connected guilds - Guild finalLinkguild = linkguild; - new Thread(() -> { - if (event.getRethink().getLinkChannel(linkid).isEmpty()) { - event.getRethink().setLinkChannel(linkid, finalLinkguild.createTextChannel("linkchannel").complete().getId()); - } - // Send Request to link Guild - event.getJDA().getTextChannelById(event.getRethink().getLinkChannel(linkid)).sendMessage( - new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO) - .setTitle(event.getGuild().getName() + " (" + event.getGuild().getId() + MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.link.request.accept.title")) - .setDescription(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.link.request.accept.description")).build() - ).queue( - msg -> { - msg.addReaction("✅").queue(); - msg.addReaction("❌").queue(); - } - ); - }).start(); - - - event.getChannel().sendMessage( - new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO) - .setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "success!")).setDescription(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.link.request.success.description")) - .build()).queue(); - - break; - - case "channel": - if (args.length == 2) { - event.getRethink().setLinkChannel(event.getGuild().getId(), args[1]); - event.getChannel().sendMessage(new EmbedBuilder().setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "success!")).setDescription(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.link.set.title")).build()).queue(); - } - - break; - } - } - - @Override - public String[] labels() { - return new String[]{"link"}; - } - - @Override - public String description() { - return MessageEditor.handle("en", "commands.moderation.link.help.description"); - } - - @Override - public String usage() { - return ""; - } -} diff --git a/src/main/java/com/bbn/hadder/commands/moderation/NickCommand.java b/src/main/java/com/bbn/hadder/commands/moderation/NickCommand.java index 1e4d45d..3b04bcf 100644 --- a/src/main/java/com/bbn/hadder/commands/moderation/NickCommand.java +++ b/src/main/java/com/bbn/hadder/commands/moderation/NickCommand.java @@ -22,24 +22,49 @@ public class NickCommand implements Command { if (args.length > 1) { if (event.getMessage().getContentRaw().startsWith(event.getRethink().getUserPrefix(event.getMember().getId()))) { event.getGuild().modifyNickname(event.getMessage().getMentionedMembers().get(0), event.getMessage().getContentRaw().replaceFirst(event.getRethink().getUserPrefix(event.getMember().getId()) + "nick " + args[0], "")).reason("Nicked by " + event.getAuthor().getAsTag()).queue(); - event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO).setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.nick.success.title", "✅")).setDescription(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.nick.success.description", event.getMessage().getMentionedMembers().get(0).getUser().getAsTag())).build()).queue(); + event.getTextChannel().sendMessage( + event.getMessageEditor().getMessage( + MessageEditor.MessageType.INFO, + "commands.moderation.nick.success.title", + "✅", + "commands.moderation.nick.success.description", + event.getMessage().getMentionedMembers().get(0).getUser().getAsTag() + ).build()).queue(); } else if (event.getMessage().getContentRaw().startsWith(event.getRethink().getGuildPrefix(event.getGuild().getId()))) { event.getGuild().modifyNickname(event.getMessage().getMentionedMembers().get(0), event.getMessage().getContentRaw().replaceFirst(event.getRethink().getGuildPrefix(event.getGuild().getId()) + "nick " + args[0], "")).reason("Nicked by " + event.getAuthor().getAsTag()).queue(); - event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO).setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.nick.success.title", "✅")).setDescription(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.nick.success.description", event.getMessage().getMentionedMembers().get(0).getUser().getAsTag())).build()).queue(); + event.getTextChannel().sendMessage( + event.getMessageEditor().getMessage( + MessageEditor.MessageType.INFO, + "commands.moderation.nick.success.title", + "✅", + "commands.moderation.nick.success.description", event.getMessage().getMentionedMembers().get(0).getUser().getAsTag() + ).build()).queue(); } } else { event.getHelpCommand().sendHelp(this, event); } } else { - event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.NO_SELF_PERMISSION).build()).queue(); + event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.NO_SELF_PERMISSION).build()).queue(); } } else { if (event.getMessage().getContentRaw().startsWith(event.getRethink().getUserPrefix(event.getMember().getId()))) { event.getGuild().getSelfMember().modifyNickname(event.getMessage().getContentRaw().replaceFirst(event.getRethink().getUserPrefix(event.getMember().getId()) + "nick " + args[0], "")).reason("Nicked by " + event.getAuthor().getAsTag()).queue(); - event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO).setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.nick.success.title", "✅")).setDescription(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.nick.myself.success.description")).build()).queue(); + event.getTextChannel().sendMessage( + event.getMessageEditor().getMessage( + MessageEditor.MessageType.INFO, + "commands.moderation.nick.success.title", + "✅", + "commands.moderation.nick.myself.success.description", + "").build()).queue(); } else if (event.getMessage().getContentRaw().startsWith(event.getRethink().getGuildPrefix(event.getGuild().getId()))) { event.getGuild().getSelfMember().modifyNickname(event.getMessage().getContentRaw().replaceFirst(event.getRethink().getGuildPrefix(event.getGuild().getId()) + "nick " + args[0], "")).reason("Nicked by " + event.getAuthor().getAsTag()).queue(); - event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO).setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.nick.success.title", "✅")).setDescription(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.nick.myself.success.description")).build()).queue(); + event.getTextChannel().sendMessage( + event.getMessageEditor().getMessage( + MessageEditor.MessageType.INFO, + "commands.moderation.nick.success.title", + "✅", + "commands.moderation.nick.myself.success.description", "" + ).build()).queue(); } } } else if (event.getMessage().getMentionedMembers().size() == 0) { @@ -53,13 +78,19 @@ public class NickCommand implements Command { event.getGuild().getSelfMember().modifyNickname(args[args.length - 1]).reason("Mass Nicked by " + event.getAuthor().getAsTag()).queue(); } } - event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO).setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.nick.success.title", "✅")).setDescription(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.nick.myself.success.description", String.valueOf(event.getMessage().getMentionedMembers().size()))).build()).queue(); + event.getTextChannel().sendMessage( + event.getMessageEditor().getMessage( + MessageEditor.MessageType.INFO, + "commands.moderation.nick.success.title", + "✅", + "commands.moderation.nick.myself.success.description", String.valueOf(event.getMessage().getMentionedMembers().size()) + ).build()).queue(); } } else { - event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.NO_SELF_PERMISSION).build()).queue(); + event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.NO_SELF_PERMISSION).build()).queue(); } } else { - event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.NO_PERMISSION).build()).queue(); + event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.NO_PERMISSION).build()).queue(); } } @@ -70,11 +101,11 @@ public class NickCommand implements Command { @Override public String description() { - return MessageEditor.handle("en", "commands.moderation.nick.help.description"); + return "commands.moderation.nick.help.description"; } @Override public String usage() { - return MessageEditor.handle("en", "user+nickname"); + return "user+nickname"; } } diff --git a/src/main/java/com/bbn/hadder/commands/moderation/RegionChangeCommand.java b/src/main/java/com/bbn/hadder/commands/moderation/RegionChangeCommand.java index e196b5a..ee6af87 100644 --- a/src/main/java/com/bbn/hadder/commands/moderation/RegionChangeCommand.java +++ b/src/main/java/com/bbn/hadder/commands/moderation/RegionChangeCommand.java @@ -73,25 +73,33 @@ public class RegionChangeCommand implements Command { setRegion(Region.US_SOUTH, "US South", event); break; case "list": - event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO) - .setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.regionchange.regions.title")) + event.getTextChannel().sendMessage( + event.getMessageEditor().getMessage( + MessageEditor.MessageType.INFO, + "commands.moderation.regionchange.regions.title", + "") .setDescription("**LOCKED:**\n`amsterdam` `frankfurt` `eu-west` `eu-central` `london`\n\n**UNLOCKED:**\n`europe` `brazil` `hongkong` `india` `japan` `singapore` `south-africa` `sydney` `us-central` `us-east` `us-west` `us-south`") .build()).queue(); break; } - } else event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.NO_PERMISSION).build()).queue(); - } else event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.NO_SELF_PERMISSION).build()).queue(); - } else event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO) - .setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.regionchange.regions.title")) - .setDescription("**LOCKED:**\n`amsterdam` `frankfurt` `eu-west` `eu-central` `london`\n\n**UNLOCKED:**\n`europe` `brazil` `hongkong` `india` `japan` `singapore` `south-africa` `sydney` `us-central` `us-east` `us-west` `us-south`") + } else event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.NO_PERMISSION).build()).queue(); + } else event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.NO_SELF_PERMISSION).build()).queue(); + } else event.getTextChannel().sendMessage( + event.getMessageEditor().getMessage( + MessageEditor.MessageType.INFO, + "commands.moderation.regionchange.regions.title", + "") + .setDescription("**LOCKED:**\n`amsterdam` `frankfurt` `eu-west` `eu-central` `london`\n\n**UNLOCKED:**\n`europe` `brazil` `hongkong` `india` `japan` `singapore` `south-africa` `sydney` `us-central` `us-east` `us-west` `us-south`") .build()).queue(); } public void setRegion (Region region, String region_name, CommandEvent event) { event.getGuild().getManager().setRegion(region).reason("Region changed by " + event.getAuthor().getAsTag()).queue(); - event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO) - .setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.regionchange.success.title")) - .setDescription(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.regionchange.success.description", region_name)) + event.getTextChannel().sendMessage( + event.getMessageEditor().getMessage( + MessageEditor.MessageType.INFO, + "commands.moderation.regionchange.success.title", "", + "commands.moderation.regionchange.success.description", region_name) .build()).queue(); } @@ -102,11 +110,11 @@ public class RegionChangeCommand implements Command { @Override public String description() { - return MessageEditor.handle("en", "commands.moderation.regionchange.help.description"); + return "commands.moderation.regionchange.help.description"; } @Override public String usage() { - return MessageEditor.handle("en", "region"); + return "region"; } } diff --git a/src/main/java/com/bbn/hadder/commands/moderation/RoleCommand.java b/src/main/java/com/bbn/hadder/commands/moderation/RoleCommand.java index 1097dd0..f8fac2a 100644 --- a/src/main/java/com/bbn/hadder/commands/moderation/RoleCommand.java +++ b/src/main/java/com/bbn/hadder/commands/moderation/RoleCommand.java @@ -24,16 +24,22 @@ public class RoleCommand implements Command { if (event.getGuild().getSelfMember().canInteract(role)) { event.getGuild().addRoleToMember(member, role).reason("Role added by " + event.getAuthor().getAsTag()).queue(); } else { - event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.NO_SELF_PERMISSION).build()).queue(); + event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.NO_SELF_PERMISSION).build()).queue(); } } else { - event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.NO_SELF_PERMISSION).build()).queue(); + event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.NO_SELF_PERMISSION).build()).queue(); } } } - event.getChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO) - .setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.role.add.success.title", "✅")) - .setDescription(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.role.add.success.description", String.valueOf(event.getMessage().getMentionedRoles().size()), String.valueOf(event.getMessage().getMentionedMembers().size()))) + event.getChannel().sendMessage( + event.getMessageEditor().getMessage( + MessageEditor.MessageType.INFO, + "commands.moderation.role.add.success.title", + "✅", + "", + "commands.moderation.role.add.success.description", + String.valueOf(event.getMessage().getMentionedRoles().size()), + String.valueOf(event.getMessage().getMentionedMembers().size())) .build()).queue(); } break; @@ -46,25 +52,31 @@ public class RoleCommand implements Command { if (event.getGuild().getSelfMember().canInteract(role)) { event.getGuild().removeRoleFromMember(member, role).reason("Role removed by " + event.getAuthor().getAsTag()).queue(); } else { - event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.NO_SELF_PERMISSION).build()).queue(); + event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.NO_SELF_PERMISSION).build()).queue(); } } else { - event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.NO_SELF_PERMISSION).build()).queue(); + event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.NO_SELF_PERMISSION).build()).queue(); } } } - event.getChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO) - .setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.role.remove.success.title", "✅")) - .setDescription(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.role.remove.success.description", String.valueOf(event.getMessage().getMentionedRoles().size()), String.valueOf(event.getMessage().getMentionedMembers().size()))) + event.getChannel().sendMessage( + event.getMessageEditor().getMessage( + MessageEditor.MessageType.INFO, + "commands.moderation.role.remove.success.title", + "✅", + "", + "commands.moderation.role.remove.success.description", + String.valueOf(event.getMessage().getMentionedRoles().size()), + String.valueOf(event.getMessage().getMentionedMembers().size())) .build()).queue(); } break; } } else { - event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.NO_SELF_PERMISSION).build()).queue(); + event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.NO_SELF_PERMISSION).build()).queue(); } } else { - event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.NO_PERMISSION).build()).queue(); + event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.NO_PERMISSION).build()).queue(); } } else { event.getHelpCommand().sendHelp(this, event); @@ -78,7 +90,7 @@ public class RoleCommand implements Command { @Override public String description() { - return MessageEditor.handle("en", "commands.moderation.role.help.description"); + return "commands.moderation.role.help.description"; } @Override 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 5f08a8d..71a7b9f 100644 --- a/src/main/java/com/bbn/hadder/commands/moderation/RulesCommand.java +++ b/src/main/java/com/bbn/hadder/commands/moderation/RulesCommand.java @@ -21,9 +21,11 @@ public class RulesCommand implements Command { public void executed(String[] args, CommandEvent event) { if (event.getMember().hasPermission(Permission.MANAGE_SERVER) || event.getConfig().getOwners().toString().contains(event.getAuthor().getId())) { if (event.getGuild().getSelfMember().hasPermission(Permission.MANAGE_ROLES)) { - event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO) - .setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.rules.setup.title")) - .setDescription(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.rules.setup.description")) + event.getTextChannel().sendMessage( + event.getMessageEditor().getMessage( + MessageEditor.MessageType.INFO, + "commands.moderation.rules.setup.title", + "commands.moderation.rules.setup.description") .build()).queue(); new EventWaiter().newOnMessageEventWaiter(event1 -> { if (event1.getMessage().getMentionedChannels().size() == 1) { @@ -31,9 +33,9 @@ public class RulesCommand implements Command { TextChannel channel = event1.getMessage().getMentionedChannels().get(0); createRules(event, event1, channel); } catch (Exception e) { - event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.ERROR) - .setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.rules.channel.error.title")) - .setDescription(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.rules.channel.error.description")) + event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.ERROR, + "commands.moderation.rules.channel.error.title", + "commands.moderation.rules.channel.error.description") .build()).queue(); } } else { @@ -41,33 +43,41 @@ public class RulesCommand implements Command { TextChannel channel = event1.getGuild().getTextChannelsByName(event1.getMessage().getContentRaw(), true).get(0); createRules(event, event1, channel); } catch (Exception e) { - event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.ERROR) - .setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.rules.channel.error.title")) - .setDescription(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.rules.channel.error.description")) + event.getTextChannel().sendMessage( + event.getMessageEditor().getMessage( + MessageEditor.MessageType.ERROR, + "commands.moderation.rules.channel.error.title", + "commands.moderation.rules.channel.error.description") .build()).queue(); } } }, event.getJDA(), event.getAuthor()); } else { - event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.NO_SELF_PERMISSION).build()).queue(); + event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.NO_SELF_PERMISSION).build()).queue(); } } else { - event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.NO_PERMISSION).build()).queue(); + event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.NO_PERMISSION).build()).queue(); } } public void createRules(CommandEvent event, GuildMessageReceivedEvent event1, TextChannel channel) { if (channel.getGuild().getId().equals(event1.getGuild().getId())) { if (event.getGuild().getSelfMember().hasPermission(channel, Permission.MESSAGE_WRITE)) { - event1.getChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO) - .setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.rules.rules.title")) - .setDescription(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.rules.rules.title", channel.getName())) + event1.getChannel().sendMessage( + event.getMessageEditor().getMessage( + MessageEditor.MessageType.INFO, + "commands.moderation.rules.rules.title", + "", + "commands.moderation.rules.rules.title", + channel.getName()) .build()).queue(); new EventWaiter().newOnMessageEventWaiter(event2 -> { String message = event2.getMessage().getContentRaw(); - event2.getChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO) - .setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.rules.role.title")) - .setDescription(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.rules.role.description")) + event2.getChannel().sendMessage( + event.getMessageEditor().getMessage( + MessageEditor.MessageType.INFO, + "commands.moderation.rules.role.title", + "commands.moderation.rules.role.description") .build()).queue(); new EventWaiter().newOnMessageEventWaiter(event3 -> { if (event3.getMessage().getMentionedRoles().size() == 1) { @@ -77,106 +87,133 @@ public class RulesCommand implements Command { Role role = event3.getGuild().getRolesByName(event3.getMessage().getContentStripped(), true).get(0); setRole(event, channel, message, event3, role); } else { - event3.getChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.WARNING) - .setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.rules.role.error.title")) - .setDescription(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.rules.role.error.description")) + event3.getChannel().sendMessage( + event.getMessageEditor().getMessage( + MessageEditor.MessageType.WARNING, + "commands.moderation.rules.role.error.title", + "commands.moderation.rules.role.error.description") .build()).queue(); } }, event.getJDA(), event.getAuthor()); }, event.getJDA(), event.getAuthor()); } else { - event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.NO_PERMISSION) + event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.NO_PERMISSION) .build()).queue(); } } else { - event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.WARNING) - .setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.rules.guild.error.title")) - .setDescription(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.rules.guild.error.description")) + event.getTextChannel().sendMessage( + event.getMessageEditor().getMessage( + MessageEditor.MessageType.WARNING, + "commands.moderation.rules.guild.error.title", + "commands.moderation.rules.guild.error.description") .build()).queue(); } } public void setRole(CommandEvent event, TextChannel channel, String message, GuildMessageReceivedEvent event3, Role role) { if (event3.getGuild().getSelfMember().canInteract(role)) { - event3.getChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO) - .setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.rules.emote.accept.title")) - .setDescription(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.rules.emote.accept.description", role.getName())) + event3.getChannel().sendMessage( + event.getMessageEditor().getMessage( + MessageEditor.MessageType.INFO, + "commands.moderation.rules.emote.accept.title", + "", + "commands.moderation.rules.emote.accept.description", role.getName()) .build()).queue(); new EventWaiter().newOnMessageEventWaiter(event4 -> { if (event4.getMessage().getEmotes().size() == 1) { Emote aemote = event4.getMessage().getEmotes().get(0); - event4.getChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO) - .setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.rules.emote.decline.title")) - .setDescription(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.rules.emote.decline.title", String.valueOf(aemote))) + event4.getChannel().sendMessage( + event.getMessageEditor().getMessage( + MessageEditor.MessageType.INFO, + "commands.moderation.rules.emote.decline.title", "", + "commands.moderation.rules.emote.decline.title", String.valueOf(aemote)) .build()).queue(); new EventWaiter().newOnMessageEventWaiter(event5 -> { Emote demote = event5.getMessage().getEmotes().get(0); if (!aemote.equals(demote)) { - Message rules = channel.sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO) + Message rules = channel.sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO) .setTitle("Rules") .setDescription(message) .build()).complete(); try { rules.addReaction(aemote).queue(); rules.addReaction(demote).queue(); - event5.getChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO) - .setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.rules.success.title")) - .setDescription(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.rules.success.description", channel.getAsMention())) + event5.getChannel().sendMessage( + event.getMessageEditor().getMessage( + MessageEditor.MessageType.INFO, + "commands.moderation.rules.success.title", + "", + "commands.moderation.rules.success.description", + channel.getAsMention()) .build()).queue(); } catch (Exception e) { - event5.getChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.ERROR) - .setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "error")) - .setDescription(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.rules.emote.error.access.description")) + event5.getChannel().sendMessage( + event.getMessageEditor().getMessage( + MessageEditor.MessageType.ERROR, + "error", + "commands.moderation.rules.emote.error.access.description") .build()).queue(); e.printStackTrace(); } event.getRethink().updateRules(event.getGuild().getId(), rules.getId(), role.getId(), aemote.toString(), demote.toString()); } else { - event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.WARNING) - .setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.rules.emote.error.equal.title")) - .setDescription(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.rules.emote.error.equal.description")) + event.getTextChannel().sendMessage( + event.getMessageEditor().getMessage( + MessageEditor.MessageType.WARNING, + "commands.moderation.rules.emote.error.equal.title", + "commands.moderation.rules.emote.error.equal.description") .build()).queue(); } }, event.getJDA(), event.getAuthor()); } else { String aemote = event4.getMessage().getContentRaw(); - event4.getChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO) - .setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.rules.emote.decline.title")) - .setDescription(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.rules.emoji.decline.description")) + event4.getChannel().sendMessage( + event.getMessageEditor().getMessage( + MessageEditor.MessageType.INFO, + "commands.moderation.rules.emote.decline.title", + "commands.moderation.rules.emoji.decline.description") .build()).queue(); new EventWaiter().newOnMessageEventWaiter(event5 -> { String demote = event5.getMessage().getContentRaw(); if (!aemote.equals(demote)) { - Message rules = channel.sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO) + Message rules = channel.sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO) .setTitle("Rules") .setDescription(message) .build()).complete(); try { rules.addReaction(aemote).queue(); rules.addReaction(demote).queue(); - event5.getChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO) - .setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.rules.success.title")) - .setDescription(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.rules.success.description", channel.getAsMention())) + event5.getChannel().sendMessage( + event.getMessageEditor().getMessage( + MessageEditor.MessageType.INFO, + "commands.moderation.rules.success.title", + "", + "commands.moderation.rules.success.description", + channel.getAsMention()) .build()).queue(); } catch (Exception e) { - event5.getChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.ERROR) - .setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "error")) - .setDescription(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.rules.emoji.error.description")) + event5.getChannel().sendMessage( + event.getMessageEditor().getMessage( + MessageEditor.MessageType.ERROR, + "error", + "commands.moderation.rules.emoji.error.description") .build()).queue(); e.printStackTrace(); } event.getRethink().updateRules(event.getGuild().getId(), rules.getId(), role.getId(), aemote, demote); } else { - event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.WARNING) - .setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.rules.emote.error.equal.title")) - .setDescription(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.rules.emote.error.equal.description")) + event.getTextChannel().sendMessage( + event.getMessageEditor().getMessage( + MessageEditor.MessageType.WARNING, + "commands.moderation.rules.emote.error.equal.title", + "commands.moderation.rules.emote.error.equal.description") .build()).queue(); } }, event.getJDA(), event.getAuthor()); } }, event.getJDA(), event.getAuthor()); } else { - event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.NO_SELF_PERMISSION).build()).queue(); + event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.NO_SELF_PERMISSION).build()).queue(); } } @@ -187,7 +224,7 @@ public class RulesCommand implements Command { @Override public String description() { - return MessageEditor.handle("en", "commands.moderation.rules.help.description"); + return "commands.moderation.rules.help.description"; } @Override diff --git a/src/main/java/com/bbn/hadder/commands/moderation/SetStarBoardCommand.java b/src/main/java/com/bbn/hadder/commands/moderation/SetStarBoardCommand.java index b0ab96f..bfd32c6 100644 --- a/src/main/java/com/bbn/hadder/commands/moderation/SetStarBoardCommand.java +++ b/src/main/java/com/bbn/hadder/commands/moderation/SetStarBoardCommand.java @@ -2,16 +2,34 @@ package com.bbn.hadder.commands.moderation; import com.bbn.hadder.commands.Command; import com.bbn.hadder.commands.CommandEvent; +import com.bbn.hadder.utils.MessageEditor; import net.dv8tion.jda.api.EmbedBuilder; +import net.dv8tion.jda.api.entities.TextChannel; public class SetStarBoardCommand implements Command { @Override public void executed(String[] args, CommandEvent event) { if (event.getMessage().getMentionedChannels().size()==1) { event.getRethink().setStarboardChannel(event.getGuild().getId(), event.getMessage().getMentionedChannels().get(0).getId()); - event.getChannel().sendMessage(new EmbedBuilder().setTitle("Successfully set the Channel!").build()).queue(); + event.getChannel().sendMessage( + event.getMessageEditor().getMessage( + MessageEditor.MessageType.INFO, + "commands.moderation.starboard.successchannel","") + .build()) + .queue(); } else { - event.getHelpCommand().sendHelp(this, event); + if (args.length>0) { + TextChannel channel = event.getGuild().getTextChannelById(args[0]); + if (channel!=null) { + event.getRethink().setStarboardChannel(event.getGuild().getId(), channel.getId()); + } + } else { + event.getHelpCommand().sendHelp(this, event); + } + } + + if (args.length==2) { + event.getRethink().setNeededstars(args[1], event.getGuild().getId()); } } @@ -27,6 +45,6 @@ public class SetStarBoardCommand implements Command { @Override public String usage() { - return ""; + return " [Needed stars]"; } } diff --git a/src/main/java/com/bbn/hadder/commands/music/JoinCommand.java b/src/main/java/com/bbn/hadder/commands/music/JoinCommand.java index a4f28ad..cc1f267 100644 --- a/src/main/java/com/bbn/hadder/commands/music/JoinCommand.java +++ b/src/main/java/com/bbn/hadder/commands/music/JoinCommand.java @@ -22,31 +22,35 @@ public class JoinCommand implements Command { if (event.getGuild().getSelfMember().getVoiceState().inVoiceChannel()) { if (!event.getGuild().getSelfMember().getVoiceState().getChannel().getId().equals(vc.getId())) { event.getGuild().getAudioManager().openAudioConnection(vc); - event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO) - .setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.music.join.success.title")) - .setDescription(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.music.join.success.description", vc.getName())) + event.getTextChannel().sendMessage( + event.getMessageEditor().getMessage( + MessageEditor.MessageType.INFO, + "commands.music.join.success.title", + "", + "commands.music.join.success.description", + vc.getName()) .build()).queue(); } else { - event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.WARNING) + event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.WARNING) .setTitle("Already connected") .setDescription("I am already connected to your voice channel.") .build()).queue(); } } else { event.getGuild().getAudioManager().openAudioConnection(vc); - event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO) + event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO) .setTitle("Successfully connected") .setDescription("I successfully connected to " + vc.getName() + ".") .build()).queue(); } } else { - event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.WARNING) + event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.WARNING) .setTitle("Already trying to connect") .setDescription("Hadder is already trying to connect. Please wait a moment.") .build()).queue(); } } else { - event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.WARNING) + event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.WARNING) .setTitle("No Voice Channel") .setDescription("You aren't in a Voice Channel.") .build()).queue(); diff --git a/src/main/java/com/bbn/hadder/commands/music/LeaveCommand.java b/src/main/java/com/bbn/hadder/commands/music/LeaveCommand.java index cb47830..82d3769 100644 --- a/src/main/java/com/bbn/hadder/commands/music/LeaveCommand.java +++ b/src/main/java/com/bbn/hadder/commands/music/LeaveCommand.java @@ -14,12 +14,12 @@ public class LeaveCommand implements Command { public void executed(String[] args, CommandEvent event) { if (event.getGuild().getSelfMember().getVoiceState().inVoiceChannel()) { event.getGuild().getAudioManager().closeAudioConnection(); - event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO) + event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO) .setTitle("Successfully disconnected") .setDescription("I successfully disconnected from the Voice Channel") .build()).queue(); } else { - event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.WARNING) + event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.WARNING) .setTitle("Not connected") .setDescription("I'm currently in no Voice Channel on this Guild") .build()).queue(); diff --git a/src/main/java/com/bbn/hadder/commands/nsfw/AnalCommand.java b/src/main/java/com/bbn/hadder/commands/nsfw/AnalCommand.java index 74faee4..5216954 100644 --- a/src/main/java/com/bbn/hadder/commands/nsfw/AnalCommand.java +++ b/src/main/java/com/bbn/hadder/commands/nsfw/AnalCommand.java @@ -31,7 +31,7 @@ public class AnalCommand implements Command { JSONObject response1 = data.getJSONObject("response"); String url = response1.toString().replace("{\"url\":\"", ""); - event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO) + event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO) .setAuthor("GIF not showing? Click here", url.replace("\"}", "")) .setImage(url.replace("\"}", "")) .setFooter("Anal") @@ -42,7 +42,7 @@ public class AnalCommand implements Command { } } else { - event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.WARNING).setTitle("No NSFW").setDescription("You can only execute this command in NSFW channels!").build()).queue(); + event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.WARNING).setTitle("No NSFW").setDescription("You can only execute this command in NSFW channels!").build()).queue(); } } diff --git a/src/main/java/com/bbn/hadder/commands/nsfw/BDSMCommand.java b/src/main/java/com/bbn/hadder/commands/nsfw/BDSMCommand.java index 602fd22..9b25b5c 100644 --- a/src/main/java/com/bbn/hadder/commands/nsfw/BDSMCommand.java +++ b/src/main/java/com/bbn/hadder/commands/nsfw/BDSMCommand.java @@ -31,7 +31,7 @@ public class BDSMCommand implements Command { JSONObject response1 = data.getJSONObject("response"); String url = response1.toString().replace("{\"url\":\"", ""); - event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO) + event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO) .setAuthor("Image not showing? Click here", url.replace("\"}", "")) .setImage(url.replace("\"}", "")) .setFooter("BDSM") @@ -42,7 +42,7 @@ public class BDSMCommand implements Command { } } else { - event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.WARNING).setTitle("No NSFW").setDescription("You can only execute this command in NSFW channels!").build()).queue(); + event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.WARNING).setTitle("No NSFW").setDescription("You can only execute this command in NSFW channels!").build()).queue(); } } diff --git a/src/main/java/com/bbn/hadder/commands/nsfw/BlowjobCommand.java b/src/main/java/com/bbn/hadder/commands/nsfw/BlowjobCommand.java index 67bafb8..7d554a1 100644 --- a/src/main/java/com/bbn/hadder/commands/nsfw/BlowjobCommand.java +++ b/src/main/java/com/bbn/hadder/commands/nsfw/BlowjobCommand.java @@ -27,7 +27,7 @@ public class BlowjobCommand implements Command { Response response = caller.newCall(request).execute(); String url = response.body().string().replace("{\"url\":\"", ""); - event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO) + event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO) .setAuthor("Image not showing? Click here", url.replace("\"}", "")) .setImage(url.replace("\"}", "")) .setFooter("Blowjob") @@ -38,7 +38,7 @@ public class BlowjobCommand implements Command { } } else { - event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.WARNING).setTitle("No NSFW").setDescription("You can only execute this command in NSFW channels!").build()).queue(); + event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.WARNING).setTitle("No NSFW").setDescription("You can only execute this command in NSFW channels!").build()).queue(); } } diff --git a/src/main/java/com/bbn/hadder/commands/nsfw/BoobsCommand.java b/src/main/java/com/bbn/hadder/commands/nsfw/BoobsCommand.java index 90625b4..b8e35b5 100644 --- a/src/main/java/com/bbn/hadder/commands/nsfw/BoobsCommand.java +++ b/src/main/java/com/bbn/hadder/commands/nsfw/BoobsCommand.java @@ -31,7 +31,7 @@ public class BoobsCommand implements Command { JSONObject response1 = data.getJSONObject("response"); String url = response1.toString().replace("{\"url\":\"", ""); - event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO) + event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO) .setAuthor("GIF not showing? Click here", url.replace("\"}", "")) .setImage(url.replace("\"}", "")) .setFooter("Boobs") @@ -42,7 +42,7 @@ public class BoobsCommand implements Command { } } else { - event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.WARNING).setTitle("No NSFW").setDescription("You can only execute this command in NSFW channels!").build()).queue(); + event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.WARNING).setTitle("No NSFW").setDescription("You can only execute this command in NSFW channels!").build()).queue(); } } diff --git a/src/main/java/com/bbn/hadder/commands/nsfw/CumCommand.java b/src/main/java/com/bbn/hadder/commands/nsfw/CumCommand.java index 1bfae5e..52c6b86 100644 --- a/src/main/java/com/bbn/hadder/commands/nsfw/CumCommand.java +++ b/src/main/java/com/bbn/hadder/commands/nsfw/CumCommand.java @@ -31,7 +31,7 @@ public class CumCommand implements Command { JSONObject response1 = data.getJSONObject("response"); String url = response1.toString().replace("{\"url\":\"", ""); - event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO) + event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO) .setAuthor("GIF not showing? Click here", url.replace("\"}", "")) .setImage(url.replace("\"}", "")) .setFooter("Cum") @@ -42,7 +42,7 @@ public class CumCommand implements Command { } } else { - event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.WARNING).setTitle("No NSFW").setDescription("You can only execute this command in NSFW channels!").build()).queue(); + event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.WARNING).setTitle("No NSFW").setDescription("You can only execute this command in NSFW channels!").build()).queue(); } } diff --git a/src/main/java/com/bbn/hadder/commands/nsfw/EroticCommand.java b/src/main/java/com/bbn/hadder/commands/nsfw/EroticCommand.java index 8247ac6..1cce20d 100644 --- a/src/main/java/com/bbn/hadder/commands/nsfw/EroticCommand.java +++ b/src/main/java/com/bbn/hadder/commands/nsfw/EroticCommand.java @@ -27,7 +27,7 @@ public class EroticCommand implements Command { Response response = caller.newCall(request).execute(); String url = response.body().string().replace("{\"url\":\"", ""); - event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO) + event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO) .setAuthor("Image not showing? Click here", url.replace("\"}", "")) .setImage(url.replace("\"}", "")) .setFooter("Erotic") @@ -38,7 +38,7 @@ public class EroticCommand implements Command { } } else { - event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.WARNING).setTitle("No NSFW").setDescription("You can only execute this command in NSFW channels!").build()).queue(); + event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.WARNING).setTitle("No NSFW").setDescription("You can only execute this command in NSFW channels!").build()).queue(); } } diff --git a/src/main/java/com/bbn/hadder/commands/nsfw/FeetCommand.java b/src/main/java/com/bbn/hadder/commands/nsfw/FeetCommand.java index 8f99c18..b042c7e 100644 --- a/src/main/java/com/bbn/hadder/commands/nsfw/FeetCommand.java +++ b/src/main/java/com/bbn/hadder/commands/nsfw/FeetCommand.java @@ -31,7 +31,7 @@ public class FeetCommand implements Command { JSONObject response1 = data.getJSONObject("response"); String url = response1.toString().replace("{\"url\":\"", ""); - event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO) + event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO) .setAuthor("GIF not showing? Click here", url.replace("\"}", "")) .setImage(url.replace("\"}", "")) .setFooter("Feet") @@ -42,7 +42,7 @@ public class FeetCommand implements Command { } } else { - event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.WARNING).setTitle("No NSFW").setDescription("You can only execute this command in NSFW channels!").build()).queue(); + event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.WARNING).setTitle("No NSFW").setDescription("You can only execute this command in NSFW channels!").build()).queue(); } } diff --git a/src/main/java/com/bbn/hadder/commands/nsfw/FingeringCommand.java b/src/main/java/com/bbn/hadder/commands/nsfw/FingeringCommand.java index 2e7f063..0debf80 100644 --- a/src/main/java/com/bbn/hadder/commands/nsfw/FingeringCommand.java +++ b/src/main/java/com/bbn/hadder/commands/nsfw/FingeringCommand.java @@ -31,7 +31,7 @@ public class FingeringCommand implements Command { JSONObject response1 = data.getJSONObject("response"); String url = response1.toString().replace("{\"url\":\"", ""); - event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO) + event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO) .setAuthor("GIF not showing? Click here", url.replace("\"}", "")) .setImage(url.replace("\"}", "")) .setFooter("Fingering") @@ -42,7 +42,7 @@ public class FingeringCommand implements Command { } } else { - event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.WARNING).setTitle("No NSFW").setDescription("You can only execute this command in NSFW channels!").build()).queue(); + event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.WARNING).setTitle("No NSFW").setDescription("You can only execute this command in NSFW channels!").build()).queue(); } } diff --git a/src/main/java/com/bbn/hadder/commands/nsfw/LickingCommand.java b/src/main/java/com/bbn/hadder/commands/nsfw/LickingCommand.java index 439af12..76d44ee 100644 --- a/src/main/java/com/bbn/hadder/commands/nsfw/LickingCommand.java +++ b/src/main/java/com/bbn/hadder/commands/nsfw/LickingCommand.java @@ -31,7 +31,7 @@ public class LickingCommand implements Command { JSONObject response1 = data.getJSONObject("response"); String url = response1.toString().replace("{\"url\":\"", ""); - event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO) + event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO) .setAuthor("GIF not showing? Click here", url.replace("\"}", "")) .setImage(url.replace("\"}", "")) .setFooter("Licking") @@ -42,7 +42,7 @@ public class LickingCommand implements Command { } } else { - event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.WARNING).setTitle("No NSFW").setDescription("You can only execute this command in NSFW channels!").build()).queue(); + event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.WARNING).setTitle("No NSFW").setDescription("You can only execute this command in NSFW channels!").build()).queue(); } } diff --git a/src/main/java/com/bbn/hadder/commands/nsfw/PornCommand.java b/src/main/java/com/bbn/hadder/commands/nsfw/PornCommand.java index 53faacd..04b616a 100644 --- a/src/main/java/com/bbn/hadder/commands/nsfw/PornCommand.java +++ b/src/main/java/com/bbn/hadder/commands/nsfw/PornCommand.java @@ -31,7 +31,7 @@ public class PornCommand implements Command { JSONObject response1 = data.getJSONObject("response"); String url = response1.toString().replace("{\"url\":\"", ""); - event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO) + event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO) .setAuthor("GIF not showing? Click here", url.replace("\"}", "")) .setImage(url.replace("\"}", "")) .setFooter("Porn") @@ -42,7 +42,7 @@ public class PornCommand implements Command { } } else { - event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.WARNING).setTitle("No NSFW").setDescription("You can only execute this command in NSFW channels!").build()).queue(); + event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.WARNING).setTitle("No NSFW").setDescription("You can only execute this command in NSFW channels!").build()).queue(); } } diff --git a/src/main/java/com/bbn/hadder/commands/nsfw/PussyCommand.java b/src/main/java/com/bbn/hadder/commands/nsfw/PussyCommand.java index 33f4638..5049770 100644 --- a/src/main/java/com/bbn/hadder/commands/nsfw/PussyCommand.java +++ b/src/main/java/com/bbn/hadder/commands/nsfw/PussyCommand.java @@ -27,7 +27,7 @@ public class PussyCommand implements Command { Response response = caller.newCall(request).execute(); String url = response.body().string().replace("{\"url\":\"", ""); - event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO) + event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO) .setAuthor("GIF not showing? Click here", url.replace("\"}", "")) .setImage(url.replace("\"}", "")) .setFooter("Pussy") @@ -38,7 +38,7 @@ public class PussyCommand implements Command { } } else { - event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.WARNING).setTitle("No NSFW").setDescription("You can only execute this command in NSFW channels!").build()).queue(); + event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.WARNING).setTitle("No NSFW").setDescription("You can only execute this command in NSFW channels!").build()).queue(); } } diff --git a/src/main/java/com/bbn/hadder/commands/nsfw/RandomPornCommand.java b/src/main/java/com/bbn/hadder/commands/nsfw/RandomPornCommand.java index 2cad8d7..15028dc 100644 --- a/src/main/java/com/bbn/hadder/commands/nsfw/RandomPornCommand.java +++ b/src/main/java/com/bbn/hadder/commands/nsfw/RandomPornCommand.java @@ -31,7 +31,7 @@ public class RandomPornCommand implements Command { JSONObject response1 = data.getJSONObject("response"); String url = response1.toString().replace("{\"url\":\"", ""); - event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO) + event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO) .setAuthor("GIF not showing? Click here", url.replace("\"}", "")) .setImage(url.replace("\"}", "")) .setFooter("Random Porn") @@ -42,7 +42,7 @@ public class RandomPornCommand implements Command { } } else { - event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.WARNING).setTitle("No NSFW").setDescription("You can only execute this command in NSFW channels!").build()).queue(); + event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.WARNING).setTitle("No NSFW").setDescription("You can only execute this command in NSFW channels!").build()).queue(); } } diff --git a/src/main/java/com/bbn/hadder/commands/nsfw/SoloCommand.java b/src/main/java/com/bbn/hadder/commands/nsfw/SoloCommand.java index acc1b24..398077b 100644 --- a/src/main/java/com/bbn/hadder/commands/nsfw/SoloCommand.java +++ b/src/main/java/com/bbn/hadder/commands/nsfw/SoloCommand.java @@ -31,7 +31,7 @@ public class SoloCommand implements Command { JSONObject response1 = data.getJSONObject("response"); String url = response1.toString().replace("{\"url\":\"", ""); - event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO) + event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO) .setAuthor("GIF not showing? Click here", url.replace("\"}", "")) .setImage(url.replace("\"}", "")) .setFooter("Solo") @@ -42,7 +42,7 @@ public class SoloCommand implements Command { } } else { - event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.WARNING).setTitle("No NSFW").setDescription("You can only execute this command in NSFW channels!").build()).queue(); + event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.WARNING).setTitle("No NSFW").setDescription("You can only execute this command in NSFW channels!").build()).queue(); } } diff --git a/src/main/java/com/bbn/hadder/commands/nsfw/SpankCommand.java b/src/main/java/com/bbn/hadder/commands/nsfw/SpankCommand.java index a9362eb..8d7ef5a 100644 --- a/src/main/java/com/bbn/hadder/commands/nsfw/SpankCommand.java +++ b/src/main/java/com/bbn/hadder/commands/nsfw/SpankCommand.java @@ -31,7 +31,7 @@ public class SpankCommand implements Command { JSONObject response1 = data.getJSONObject("response"); String url = response1.toString().replace("{\"url\":\"", ""); - event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO) + event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO) .setAuthor("GIF not showing? Click here", url.replace("\"}", "")) .setImage(url.replace("\"}", "")) .setFooter("Spank") @@ -42,7 +42,7 @@ public class SpankCommand implements Command { } } else { - event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.WARNING).setTitle("No NSFW").setDescription("You can only execute this command in NSFW channels!").build()).queue(); + event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.WARNING).setTitle("No NSFW").setDescription("You can only execute this command in NSFW channels!").build()).queue(); } } diff --git a/src/main/java/com/bbn/hadder/commands/nsfw/TransCommand.java b/src/main/java/com/bbn/hadder/commands/nsfw/TransCommand.java index 9c2b316..da93fa4 100644 --- a/src/main/java/com/bbn/hadder/commands/nsfw/TransCommand.java +++ b/src/main/java/com/bbn/hadder/commands/nsfw/TransCommand.java @@ -27,7 +27,7 @@ public class TransCommand implements Command { Response response = caller.newCall(request).execute(); String url = response.body().string().replace("{\"url\":\"", ""); - event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO) + event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO) .setAuthor("Image not showing? Click here", url.replace("\"}", "")) .setImage(url.replace("\"}", "")) .setFooter("Trans") @@ -38,7 +38,7 @@ public class TransCommand implements Command { } } else { - event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.WARNING).setTitle("No NSFW").setDescription("You can only execute this command in NSFW channels!").build()).queue(); + event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.WARNING).setTitle("No NSFW").setDescription("You can only execute this command in NSFW channels!").build()).queue(); } } diff --git a/src/main/java/com/bbn/hadder/commands/owner/EvalCommand.java b/src/main/java/com/bbn/hadder/commands/owner/EvalCommand.java index d2e9894..ad40d50 100644 --- a/src/main/java/com/bbn/hadder/commands/owner/EvalCommand.java +++ b/src/main/java/com/bbn/hadder/commands/owner/EvalCommand.java @@ -31,7 +31,7 @@ public class EvalCommand implements Command { } engine.put("msg", event.getMessage()); - engine.put("shradmanager", Hadder.shardManager); + engine.put("shardmanager", Hadder.shardManager); engine.put("rethink", event.getRethink()); engine.put("event", event); engine.put("jda", event.getJDA()); @@ -58,14 +58,14 @@ public class EvalCommand implements Command { } out = engine.eval(script); - event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO) + event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO) .setTitle("Eval Command") .addField("Input", "```java\n\n" + script + "```", false) .addField("Output", "```java\n\n" + out.toString() + "```", false) .addField("Timing", System.currentTimeMillis()-startExec + " milliseconds", false) .build()).queue(); } catch (Exception ex) { - event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO) + event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO) .setTitle("Eval Command") .addField("Error", "```java\n\n" + ex.getMessage() + "```", false) .addField("Timing", System.currentTimeMillis()-startExec + " milliseconds", false) @@ -81,7 +81,7 @@ public class EvalCommand implements Command { event.getHelpCommand().sendHelp(this, event); } } else { - event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.NO_PERMISSION).build()).queue(); + event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.NO_PERMISSION).build()).queue(); } } diff --git a/src/main/java/com/bbn/hadder/commands/owner/GuildLeaveCommand.java b/src/main/java/com/bbn/hadder/commands/owner/GuildLeaveCommand.java index 90d1318..21cc17a 100644 --- a/src/main/java/com/bbn/hadder/commands/owner/GuildLeaveCommand.java +++ b/src/main/java/com/bbn/hadder/commands/owner/GuildLeaveCommand.java @@ -17,7 +17,7 @@ public class GuildLeaveCommand implements Command { if (args.length > 0) { Guild guild = event.getJDA().getGuildById(args[0]); guild.leave().queue(); - event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO) + event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO) .setTitle("Successfully left") .setDescription("I successfully left " + guild.getName()) .build()).queue(); @@ -25,7 +25,7 @@ public class GuildLeaveCommand implements Command { event.getHelpCommand().sendHelp(this, event); } } else { - event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.NO_PERMISSION).build()).queue(); + event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.NO_PERMISSION).build()).queue(); } } diff --git a/src/main/java/com/bbn/hadder/commands/owner/RebootCommand.java b/src/main/java/com/bbn/hadder/commands/owner/RebootCommand.java index cb37c27..739cf83 100644 --- a/src/main/java/com/bbn/hadder/commands/owner/RebootCommand.java +++ b/src/main/java/com/bbn/hadder/commands/owner/RebootCommand.java @@ -16,7 +16,7 @@ public class RebootCommand implements Command { if (event.getConfig().getOwners().toString().contains(event.getAuthor().getId())) { Runtime.getRuntime().exit(69); } else { - event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.NO_PERMISSION).build()).queue(); + event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.NO_PERMISSION).build()).queue(); } } diff --git a/src/main/java/com/bbn/hadder/commands/owner/ShutdownCommand.java b/src/main/java/com/bbn/hadder/commands/owner/ShutdownCommand.java index 14cfdd2..26a29e8 100644 --- a/src/main/java/com/bbn/hadder/commands/owner/ShutdownCommand.java +++ b/src/main/java/com/bbn/hadder/commands/owner/ShutdownCommand.java @@ -13,12 +13,12 @@ public class ShutdownCommand implements Command { @Override public void executed(String[] args, CommandEvent event) { if (event.getConfig().getOwners().toString().contains(event.getAuthor().getId())) { - event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO).setTitle("Shutdown").build()).queue(); + event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO).setTitle("Shutdown").build()).queue(); event.getJDA().getShardManager().shutdown(); System.out.println("Bot shut down via Command..."); Runtime.getRuntime().exit(69); } else { - event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.NO_PERMISSION).build()).queue(); + event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.NO_PERMISSION).build()).queue(); } } diff --git a/src/main/java/com/bbn/hadder/commands/settings/LanguageCommand.java b/src/main/java/com/bbn/hadder/commands/settings/LanguageCommand.java index 4faa2c6..7e428a5 100644 --- a/src/main/java/com/bbn/hadder/commands/settings/LanguageCommand.java +++ b/src/main/java/com/bbn/hadder/commands/settings/LanguageCommand.java @@ -43,7 +43,7 @@ public class LanguageCommand implements Command { public void setLanguage(String language_code, String language , CommandEvent event) { event.getRethink().setLanguage(event.getAuthor().getId(), language_code); - event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO) + event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO) .setTitle("Language set") .setDescription(language + " is your new language now.") .build()).queue(); diff --git a/src/main/java/com/bbn/hadder/commands/settings/PrefixCommand.java b/src/main/java/com/bbn/hadder/commands/settings/PrefixCommand.java index 4de3e84..e1767cb 100644 --- a/src/main/java/com/bbn/hadder/commands/settings/PrefixCommand.java +++ b/src/main/java/com/bbn/hadder/commands/settings/PrefixCommand.java @@ -14,7 +14,7 @@ public class PrefixCommand implements Command { public void executed(String[] args, CommandEvent event) { if (args.length == 1) { event.getRethink().setUserPrefix(args[0], event.getAuthor().getId()); - event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO).setTitle("✅ Successfully set ✅").setDescription("I successfully set the new prefix for you to " + args[0]).build()).queue(); + event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO).setTitle("✅ Successfully set ✅").setDescription("I successfully set the new prefix for you to " + args[0]).build()).queue(); } else { event.getHelpCommand().sendHelp(this, event); } diff --git a/src/main/java/com/bbn/hadder/core/CommandHandler.java b/src/main/java/com/bbn/hadder/core/CommandHandler.java index 0fc435e..fef5f60 100644 --- a/src/main/java/com/bbn/hadder/core/CommandHandler.java +++ b/src/main/java/com/bbn/hadder/core/CommandHandler.java @@ -4,6 +4,7 @@ import com.bbn.hadder.Rethink; import com.bbn.hadder.commands.Command; import com.bbn.hadder.commands.CommandEvent; import com.bbn.hadder.commands.general.HelpCommand; +import com.bbn.hadder.utils.MessageEditor; import net.dv8tion.jda.api.events.message.MessageReceivedEvent; import java.util.List; @@ -30,7 +31,10 @@ public class CommandHandler { if (argString.startsWith(" ")) argString = argString.replaceFirst(" ", ""); String[] args = argString.split(" "); if (args.length>0&&args[0].equals("")) args = new String[0]; - cmd.executed(args, new CommandEvent(event, config, rethink, this, helpCommand)); + cmd.executed(args, + new CommandEvent(event.getJDA(), event.getResponseNumber(), event.getMessage(), rethink, + config, this, helpCommand, new MessageEditor(rethink, event.getAuthor())) + ); return; } } diff --git a/src/main/java/com/bbn/hadder/core/LinkUtils.java b/src/main/java/com/bbn/hadder/core/LinkUtils.java deleted file mode 100644 index ea6bd6c..0000000 --- a/src/main/java/com/bbn/hadder/core/LinkUtils.java +++ /dev/null @@ -1,95 +0,0 @@ -package com.bbn.hadder.core; - -import club.minnced.discord.webhook.WebhookClient; -import club.minnced.discord.webhook.WebhookClientBuilder; -import club.minnced.discord.webhook.send.WebhookEmbed; -import club.minnced.discord.webhook.send.WebhookMessageBuilder; -import com.bbn.hadder.Rethink; -import net.dv8tion.jda.api.EmbedBuilder; -import net.dv8tion.jda.api.JDA; -import net.dv8tion.jda.api.Permission; -import net.dv8tion.jda.api.entities.*; -import org.json.JSONArray; - -import java.util.ArrayList; -import java.util.List; -import java.util.concurrent.ExecutionException; - -public class LinkUtils { - - public void sendAll(JSONArray jsonArray, JDA jda, Message message, User user, List reactions, Rethink rethink, boolean usedmessagebuilder) { - for (int i = 0; jsonArray.length() > i; i++) { - this.send(message, jda.getTextChannelById(rethink.getLinkChannel(jsonArray.getString(i))), user, reactions, usedmessagebuilder); - } - } - - private void send(Message message, TextChannel channel, User user, List reactions, boolean usedmessagebuilder) { - if (!channel.getGuild().getSelfMember().hasPermission(Permission.MANAGE_WEBHOOKS)) { - channel.sendMessage(new EmbedBuilder().setTitle("Wait a sec").setDescription("Please contact the owner of the server to give me the Manage Webhooks permission").build()).queue(); - } else { - channel.retrieveWebhooks().queue( - webhooks -> { - Webhook webhook = null; - for (Webhook webhooktemp : webhooks) { - if (webhooktemp.getOwner().equals(channel.getGuild().getSelfMember())) { - webhook = webhooktemp; - } - } - - if (webhook == null) { - channel.createWebhook("Hadder GuildLink").queue( - webhook1 -> sendMessage(webhook1, channel, user, message, reactions, usedmessagebuilder) - ); - } else sendMessage(webhook, channel, user, message, reactions, usedmessagebuilder); - } - ); - } - - } - - private void sendMessage(Webhook webhook, TextChannel channel, User user, Message message, List reactions, boolean usedmessagebuilder) { - WebhookClientBuilder builder = new WebhookClientBuilder(webhook.getUrl()); - WebhookClient client = builder.build(); - WebhookMessageBuilder mb = new WebhookMessageBuilder(); - mb.setUsername(user.getName()) - .setAvatarUrl((user.getAvatarUrl()!=null) ? user.getAvatarUrl() : user.getDefaultAvatarUrl()) - .setContent(message.getContentRaw()); - if (!usedmessagebuilder) { - for (Message.Attachment attachment : message.getAttachments()) { - try { - mb.addFile(attachment.getFileName(), attachment.retrieveInputStream().get()); - } catch (InterruptedException | ExecutionException e) { - e.printStackTrace(); - } - } - } - for (MessageEmbed embed : message.getEmbeds()) { - List fields = new ArrayList<>(); - for (MessageEmbed.Field field : embed.getFields()) { - fields.add(new WebhookEmbed.EmbedField(field.isInline(), field.getName(), field.getValue())); - } - mb.addEmbeds(new WebhookEmbed( - embed.getTimestamp(), embed.getColorRaw(), embed.getDescription(), - (embed.getThumbnail()!=null) ? embed.getThumbnail().getUrl() : "", (embed.getImage()!=null) ? embed.getImage().getUrl() : "", - new WebhookEmbed.EmbedFooter((embed.getFooter()!=null) ? (embed.getFooter().getText()!=null) ? embed.getFooter().getText() : "" : "", - (embed.getFooter()!=null) ? embed.getFooter().getIconUrl():""), - new WebhookEmbed.EmbedTitle((embed.getTitle()!=null) ? embed.getTitle() : "", embed.getUrl()), - new WebhookEmbed.EmbedAuthor((embed.getAuthor()!=null) ? (embed.getAuthor().getName() != null) ? embed.getAuthor().getName() : "" : "", - (embed.getAuthor()!=null) ? (embed.getAuthor().getIconUrl()!=null) ? embed.getAuthor().getIconUrl(): "" : "", - (embed.getAuthor()!=null) ? embed.getAuthor().getUrl() : ""), fields)); - } - try { - long msgid = client.send(mb.build()).get().getId(); - channel.retrieveMessageById(msgid).queue( - msg -> { - for (String reaction: reactions) { - msg.addReaction(reaction).queue(); - } - } - ); - } catch (InterruptedException | ExecutionException e) { - e.printStackTrace(); - } - } - -} diff --git a/src/main/java/com/bbn/hadder/listener/GuildListener.java b/src/main/java/com/bbn/hadder/listener/GuildListener.java index 920f10c..25dfb0b 100644 --- a/src/main/java/com/bbn/hadder/listener/GuildListener.java +++ b/src/main/java/com/bbn/hadder/listener/GuildListener.java @@ -36,7 +36,7 @@ public class GuildListener extends ListenerAdapter { }).start(); rethink.insertGuild(event.getGuild().getId()); - event.getJDA().getTextChannelById("475722540140986369").sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO) + event.getJDA().getTextChannelById("475722540140986369").sendMessage(new MessageEditor(null, null).getMessage(MessageEditor.MessageType.INFO) .setTitle("Joined Server") .setThumbnail(event.getGuild().getIconUrl()) .addField("Name", event.getGuild().getName(), true) @@ -51,7 +51,7 @@ public class GuildListener extends ListenerAdapter { } public void onGuildLeave(GuildLeaveEvent event) { - event.getJDA().getTextChannelById("475722540140986369").sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO) + event.getJDA().getTextChannelById("475722540140986369").sendMessage(new MessageEditor(null, null).getMessage(MessageEditor.MessageType.INFO) .setTitle("Left Server") .setThumbnail(event.getGuild().getIconUrl()) .addField("Name", event.getGuild().getName(), true) diff --git a/src/main/java/com/bbn/hadder/listener/LinkListener.java b/src/main/java/com/bbn/hadder/listener/LinkListener.java deleted file mode 100644 index d678b8d..0000000 --- a/src/main/java/com/bbn/hadder/listener/LinkListener.java +++ /dev/null @@ -1,73 +0,0 @@ -package com.bbn.hadder.listener; - -import com.bbn.hadder.Rethink; -import com.bbn.hadder.core.LinkUtils; -import com.bbn.hadder.utils.MessageEditor; -import net.dv8tion.jda.api.Permission; -import net.dv8tion.jda.api.entities.ChannelType; -import net.dv8tion.jda.api.entities.MessageEmbed; -import net.dv8tion.jda.api.events.message.MessageReceivedEvent; -import net.dv8tion.jda.api.events.message.react.MessageReactionAddEvent; -import net.dv8tion.jda.api.hooks.ListenerAdapter; - -import javax.annotation.Nonnull; -import java.util.ArrayList; - -public class LinkListener extends ListenerAdapter { - - private Rethink rethink; - - public LinkListener(Rethink rethink) { - this.rethink = rethink; - } - - @Override - public void onMessageReactionAdd(@Nonnull MessageReactionAddEvent event) { - event.getChannel().retrieveMessageById(event.getMessageId()).queue( - msg -> { - if (!event.getMember().getUser().equals(event.getJDA().getSelfUser()) && msg.getAuthor().equals(event.getJDA().getSelfUser()) && msg.getEmbeds().size() == 1 && msg.getEmbeds().get(0).getFooter() == null && msg.getEmbeds().get(0).getTitle().endsWith(") wants to link guilds!")) { - if (event.getMember().hasPermission(Permission.MANAGE_CHANNEL)) { - String requestguild = msg.getEmbeds().get(0).getTitle().replaceAll("\\) wants to link guilds!", ""); - String requestguildid = null; - for (int i = requestguild.length() - 1; i >= 0; i--) { - if (String.valueOf(requestguild.charAt(i)).equals("(")) { - requestguildid = requestguild.substring(i + 1); - break; - } - } - if (requestguildid != null) { - if (event.getReactionEmote().getName().equals("✅")) { - rethink.addLinkedGuild(event.getGuild().getId(), requestguildid); - rethink.addLinkedGuild(requestguildid, event.getGuild().getId()); - - msg.delete().queue(); - - MessageEmbed msgembed = new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO) - .setTitle("Guilds linked!").setDescription("The Guild allowed the link. Have fun!").build(); - event.getChannel().sendMessage(msgembed).queue(); - event.getJDA().getTextChannelById(rethink.getLinkChannel(requestguildid)).sendMessage(msgembed).queue(); - } else if (event.getReactionEmote().getName().equals("❌")) { - msg.delete().queue(); - - MessageEmbed msgembed = new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO) - .setTitle("Guild linking denied.").setDescription("The Guild denied the linking. :(").build(); - event.getChannel().sendMessage(msgembed).queue(); - event.getJDA().getTextChannelById(rethink.getLinkChannel(requestguildid)).sendMessage(msgembed).queue(); - } - } - } else { - event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.NO_PERMISSION).build()).queue(); - } - } - } - ); - } - - @Override - public void onMessageReceived(@Nonnull MessageReceivedEvent event) { - if (!event.isWebhookMessage() && event.getChannel().getId().equals(rethink.getLinkChannel(event.getGuild().getId())) && event.isFromType(ChannelType.TEXT)) { - new LinkUtils().sendAll(rethink.getLinks(event.getGuild().getId()), event.getJDA(), event.getMessage(), event.getAuthor(), new ArrayList<>() { - }, rethink, false); - } - } -} diff --git a/src/main/java/com/bbn/hadder/listener/MentionListener.java b/src/main/java/com/bbn/hadder/listener/MentionListener.java index e07bf9b..f207faf 100644 --- a/src/main/java/com/bbn/hadder/listener/MentionListener.java +++ b/src/main/java/com/bbn/hadder/listener/MentionListener.java @@ -13,6 +13,7 @@ public class MentionListener extends ListenerAdapter { private Rethink rethink; + public MentionListener(Rethink rethink) { this.rethink = rethink; } @@ -21,7 +22,7 @@ public class MentionListener extends ListenerAdapter { public void onMessageReceived(@Nonnull MessageReceivedEvent event) { if (event.isFromType(ChannelType.TEXT) && (event.getMessage().getContentRaw().equals(event.getGuild().getSelfMember().getAsMention())|| event.getMessage().getContentRaw().equals(event.getGuild().getSelfMember().getAsMention().replace("@", "@!")))) { - event.getChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO) + event.getChannel().sendMessage(new MessageEditor(rethink, event.getAuthor()).getMessage(MessageEditor.MessageType.INFO) .setTitle("Hello I'm Hadder.") .setAuthor(event.getJDA().getSelfUser().getName(), event.getJDA().getSelfUser().getAvatarUrl(), event.getJDA().getSelfUser().getAvatarUrl()) .addField("Users", String.valueOf(event.getJDA().getUsers().size()), false) diff --git a/src/main/java/com/bbn/hadder/listener/PrivateMessageListener.java b/src/main/java/com/bbn/hadder/listener/PrivateMessageListener.java index 8672e28..b9ab722 100644 --- a/src/main/java/com/bbn/hadder/listener/PrivateMessageListener.java +++ b/src/main/java/com/bbn/hadder/listener/PrivateMessageListener.java @@ -4,6 +4,7 @@ package com.bbn.hadder.listener; * @author Skidder / GregTCLTK */ +import com.bbn.hadder.Rethink; import com.bbn.hadder.utils.MessageEditor; import net.dv8tion.jda.api.entities.ChannelType; import net.dv8tion.jda.api.entities.PrivateChannel; @@ -14,18 +15,24 @@ import java.time.Instant; public class PrivateMessageListener extends ListenerAdapter { + private Rethink rethink; + + public PrivateMessageListener(Rethink rethink) { + this.rethink = rethink; + } + public void onMessageReceived(MessageReceivedEvent event) { if (event.isFromType(ChannelType.PRIVATE) && !event.getAuthor().getId().equals(event.getJDA().getSelfUser().getId())) { PrivateChannel Skidder = event.getJDA().getUserById("477141528981012511").openPrivateChannel().complete(); PrivateChannel Hax = event.getJDA().getUserById("261083609148948488").openPrivateChannel().complete(); - Skidder.sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO) + Skidder.sendMessage(new MessageEditor(rethink, event.getJDA().getUserById("261083609148948488")).getMessage(MessageEditor.MessageType.INFO) .setTitle("New DM by " + event.getAuthor().getAsTag()) .setAuthor(event.getAuthor().getName(), event.getAuthor().getAvatarUrl(), event.getAuthor().getAvatarUrl()) .setDescription(event.getMessage().getContentRaw()) .setTimestamp(Instant.now()) .build()).queue(); - Hax.sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO) + Hax.sendMessage(new MessageEditor(rethink, event.getJDA().getUserById("261083609148948488")).getMessage(MessageEditor.MessageType.INFO) .setTitle("New DM by " + event.getAuthor().getAsTag()) .setAuthor(event.getAuthor().getName(), event.getAuthor().getAvatarUrl(), event.getAuthor().getAvatarUrl()) .setDescription(event.getMessage().getContentRaw()) diff --git a/src/main/java/com/bbn/hadder/utils/MessageEditor.java b/src/main/java/com/bbn/hadder/utils/MessageEditor.java index ece4949..7178589 100644 --- a/src/main/java/com/bbn/hadder/utils/MessageEditor.java +++ b/src/main/java/com/bbn/hadder/utils/MessageEditor.java @@ -1,6 +1,9 @@ package com.bbn.hadder.utils; +import com.bbn.hadder.Rethink; +import com.bbn.hadder.commands.CommandEvent; import net.dv8tion.jda.api.EmbedBuilder; +import net.dv8tion.jda.api.entities.User; import java.awt.*; import java.time.Instant; @@ -9,7 +12,45 @@ import java.util.ResourceBundle; public class MessageEditor { - public EmbedBuilder setDefaultSettings(MessageType type) { + private Rethink rethink; + private User user; + + public MessageEditor(Rethink rethink, User user) { + this.rethink = rethink; + this.user = user; + } + + public EmbedBuilder getMessage(MessageType type) { + return this.getMessage(type, "", "", "", "", "", ""); + } + + public EmbedBuilder getMessage(MessageType type, String title_language_string, String description_language_string) { + return this.getMessage(type, title_language_string, "", "", description_language_string, "", ""); + } + + public EmbedBuilder getMessage(MessageType type, String title_language_string, String title_extra, + String description_language_string, String description_extra) { + return this.getMessage(type, title_language_string, title_extra, "", description_language_string, description_extra, ""); + } + + public EmbedBuilder getMessage(MessageType type, String title_language_string, String title_extra, String title_extra_two, + String description_language_string, String description_extra, String description_extra_two) { + String language = rethink.getLanguage(this.user.getId()); + EmbedBuilder eb = this.getDefaultSettings(type); + if (!title_language_string.equals("")) eb.setTitle(this.handle(language, title_language_string, title_extra, title_extra_two)); + if (!description_language_string.equals("")) eb.setDescription(this.handle(language, description_language_string, description_extra, description_extra_two)); + return eb; + } + + public enum MessageType { + ERROR, + WARNING, + INFO, + NO_PERMISSION, + NO_SELF_PERMISSION + } + + private EmbedBuilder getDefaultSettings(MessageType type) { EmbedBuilder builder = new EmbedBuilder(); switch (type) { case INFO: @@ -54,26 +95,24 @@ public class MessageEditor { return builder; } - public enum MessageType { - ERROR, - WARNING, - INFO, - NO_PERMISSION, - NO_SELF_PERMISSION + public String getTerm(String string) { + return this.handle(rethink.getLanguage(user.getId()), string, "", ""); } - public static String handle(String language_code, String string) { - Locale locale = new Locale(language_code); - return ResourceBundle.getBundle("Translations/Translations", locale).getString(string).replaceAll("%prefix%", "h."); + public String getTerm(String string, String extra, String extra_two) { + return this.handle(rethink.getLanguage(user.getId()), string, extra, extra_two); } - public static String handle(String language_code, String string, String extra) { - Locale locale = new Locale(language_code); - return ResourceBundle.getBundle("Translations/Translations", locale).getString(string).replaceAll("%prefix%", "h.").replaceAll("%extra%", extra); + public static String getTerm(CommandEvent event, String string, String extra, String extra_two) { + return new MessageEditor(null, null) + .handle(event.getRethink().getLanguage(event.getAuthor().getId()), string, extra, extra_two); } - public static String handle(String language_code, String string, String extra, String extra_two) { + private String handle(String language_code, String string, String extra, String extra_two) { Locale locale = new Locale(language_code); - return ResourceBundle.getBundle("Translations/Translations", locale).getString(string).replaceAll("%prefix%", "h.").replaceAll("%extra%", extra).replaceAll("%extra_two%", extra_two); + ResourceBundle resourceBundle = ResourceBundle.getBundle("Translations/Translations", locale); + if (resourceBundle.containsKey(string)) + return resourceBundle.getString(string).replaceAll("%prefix%", "h.").replaceAll("%extra%", extra).replaceAll("%extra_two%", extra_two); + else return "This key doesn't exist. Please report this to the Bot Developers. Key: "+string+" Language_code: "+language_code; } } diff --git a/src/main/resources/Translations/Translations_de.properties b/src/main/resources/Translations/Translations_de.properties index b7fd562..7929e62 100644 --- a/src/main/resources/Translations/Translations_de.properties +++ b/src/main/resources/Translations/Translations_de.properties @@ -117,3 +117,4 @@ commands.moderation.nick.success.description=I successfully nicked commands.moderation.nick.myself.success.description=I successfully changed my nickname. commands.moderation.nick.mass.success.description=I successfully nicked 69 Members\! commands.moderation.nick.help.description=Rename a one or more user. +commands.moderation.starboard.successchannel= diff --git a/src/main/resources/Translations/Translations_en.properties b/src/main/resources/Translations/Translations_en.properties index e233a20..3dd100e 100644 --- a/src/main/resources/Translations/Translations_en.properties +++ b/src/main/resources/Translations/Translations_en.properties @@ -160,3 +160,4 @@ commands.moderation.rules.help.description = Setup the rules on your Discord ser commands.music.join.success.title = Successfully connected commands.music.join.success.description = I successfully connected to %extra%. +commands.moderation.starboard.successchannel=Successfully set the Channel! -- 2.45.3