From fcfaa842d10dcceccc53862e6044f6e22664dc0d Mon Sep 17 00:00:00 2001 From: Matthew Cech Date: Sun, 14 Apr 2019 00:52:29 -0700 Subject: [PATCH] = Fixed PollManageInfo lookup default --- locStrings.config | 75 ++++++++++++++--------------- src/commands/CommandPollManage.java | 2 +- 2 files changed, 38 insertions(+), 39 deletions(-) diff --git a/locStrings.config b/locStrings.config index 4a616c7..d0ce6f8 100644 --- a/locStrings.config +++ b/locStrings.config @@ -2,8 +2,8 @@ PollManageInfo='start' will start a new poll with the query of the line you put after, 'choice' will add a choice to the poll, 'stop' will end the poll [CommandBeansShow] -BeansShowInfo=Displays how many beans you have BeansShowDisplay=You have %s beans! +BeansShowInfo=Displays how many beans you have [CommandHelp] HelpInfo=Lets you look up specific commands, or get a link to a list of all commands. @@ -21,15 +21,15 @@ TweetInfo=Kitty will tweet to her personal twitter account TweetError=Tweet command failed! [CommandRole] -RoleNeededRole=Please enter `general`, `mod`, or `admin`! -RoleError=You aren't allowed to do that! You must have the KittyRole '%' or higher! RoleInfo=Will show the current role you have, Admins can change others roles with input of 'role x @y' with x being blacklist, general, mod, or admin. Blacklist will not allow the user to interact with kitty anymore, general mod and admin will give the user access to those commands. RoleStandardResponse=Your role is +RoleError=You aren't allowed to do that! You must have the KittyRole '%' or higher! RoleChanged=Changed %s to role `%s`! +RoleNeededRole=Please enter `general`, `mod`, or `admin`! [CommandColiru] -ColiruInfo=Will try to compile any c++ code you put in! Supports up to C++14 standard, uses g++. ColiruError=Please provide some c++ code to attempt to compile! +ColiruInfo=Will try to compile any c++ code you put in! Supports up to C++14 standard, uses g++. [CommandJDoodle] JDoodleInfo=Will compile any java code you put in! Supports Java 1.8 @@ -37,8 +37,8 @@ JDoodleError=Please provide some java code to get it compiled! [CommandChangeIndicator] ChangeIndicatorInfo=Changes the command indicator to any single character. By default, it's '!'. If more than one character is provided, the first one is used! -ChangeIndicatorChanged=Indicator changed to `%s` ChangeIndicatorError=Please specify a letter or symbol to use! +ChangeIndicatorChanged=Indicator changed to `%s` [CommandPerish] PerishInfo=Adds a red, 'a n g e r y' overlay to your icon or the icon of a friend you mentioned @@ -50,20 +50,23 @@ StarkInfo=Snaps your icon or the icon of a friend you mentioned YeetInfo=Yeet yourself or yeet a friend with @! [CommandPollVote] +PollVoteNotValidNumber=That's not a vaild number! +PollVoteInfo=Vote in a poll with the choice number, won't work if no poll is running, you can't change your vote once you have cast it! Be careful! PollVoteNoPoll=There is no poll running! PollVoteAlreadyVoted=You already voted PollVoteNotValidVote=%s That's not a vaild vote! -PollVoteNotValidNumber=That's not a vaild number! -PollVoteInfo=Vote in a poll with the choice number, won't work if no poll is running, you can't change your vote once you have cast it! Be careful! PollVoteSuccess=You successfully voted for [CommandShutdown] ShutdownInfo=Stops kitty. `-s` or `safe` as an argument attempts to sync off the database before shutdown. +[CommandTeey] +TeeyInfo=Teey yourself back into existance, or teey a friend with @! + [CommandBetBeans] -BetBeansNotValid=That's not a valid bet! BetBeansLowBet=Please bet with at least 50 beans! BetBeansInfo=Allows you to bet your beans, set your amount after the command! Warning! House always wins!\nSets of 3 will get 2x, 4 will get 10x, and 5 will get 1000x +BetBeansNotValid=That's not a valid bet! BetBeansLose=Sorry, you didn't win, try again! BetBeansNotEnough=You don't have enough beans! BetBeansWin=You won %s beans! @@ -79,38 +82,38 @@ RPStartInfo=Starts an rp, add people to it by mentioning them! BlurryInfo=Blurs your icon or the icon of a friend you mentioned [CommandPollResults] -PollResultsInfo=Will show current results of a poll and percentages of votes per choice PollResultsResponse=%s people voted for %s `%s` with `%s%` !\n +PollResultsInfo=Will show current results of a poll and percentages of votes per choice [CommandRating] RatingInfo='0' is fully sfw (Derpi and e621 searches are disabled), '1' is filtered (kitty auto appends a sfw tag on any searches), '2' is nsfw (any search will go through). Some other words are supported for setting filter as well. -RatingChanged=Kittybot content set to RatingWarning=Warning: NSFW may slip through, images are only based on tags on their respective sites! +RatingChanged=Kittybot content set to RatingInvalid=Invalid content rating [CommandGiveBeans] -GiveBeansInvalid=That's not a valid number! -GiveBeansSuccess=Gave %s %s beans! -GiveBeansInfo=Gives beans to the mentioned users! GiveBeansNoneMentioned=You didn't mention anyone! +GiveBeansSuccess=Gave %s %s beans! +GiveBeansInvalid=That's not a valid number! +GiveBeansInfo=Gives beans to the mentioned users! [CommandPollShow] PollShowNoPoll=There is no poll running! -PollShowChoices=And the choices are:\n PollShowInfo=Will show the current poll running PollShowPoll=The current poll is `%s`\n +PollShowChoices=And the choices are:\n [CommandHelpBuilder] HelpBuilderInfo=Emit help for all commands as formatted HTML [CommandRPEnd] -RPEndFileOut=Here's your file! RPEndError=You can't end this RP! RPEndInfo=Ends RP in channel and gives you a .txt file! +RPEndFileOut=Here's your file! [CommandRPG] -RPGInvalid=Invalid RPG Command! RPGInfo=Admin+ command only right now - experimental text RPG! Format is !rpg +RPGInvalid=Invalid RPG Command! [CommandBoop] BoopPerson=%s booped %s! @@ -119,44 +122,41 @@ BoopStandard=Woah! %s booped me! That's %s total! BoopMultiple=%s booped several others - %s! [CommandInfo] -InfoInfo=Provides author info and a link to Kitty's website InfoResponse=I'm made by `Rin#8904` and `Reverie Wisp#3703`!\nYou can find more info about me along with a Patreon link to support us and GitHub link for filing bugs https://www.rinsnowmew.com/bot/ +InfoInfo=Provides author info and a link to Kitty's website [CommandPing] PingResponse=Pong! PingInfo=Will respond with Pong! [CommandChoose] -ChooseInfo=With an input of x,y,z where x y and z are all choices, kitty will choose one -ChooseOne=I can't choose from *one* thing! ChooseChoice=I chooooooose %s! +ChooseOne=I can't choose from *one* thing! +ChooseInfo=With an input of x,y,z where x y and z are all choices, kitty will choose one [CommandEightBall] -EightBallInfo=Answers a yes or no question! Warning: Kitty can not actually tell the future, she claims no responsibility for any lion mauling, lack of lottery wins, or felony charges. -EightBallError=Hmm? You'll need to ask a question! - -EightBallYes1=It is certain. -EightBallYes2=It is decidedly so. -EightBallYes3=Without a doubt. EightBallYes4=Yes - definitely. -EightBallYes5=You may rely on it. -EightBallYes6=As I see it, yes. -EightBallYes7=Most likely. +EightBallYes3=Without a doubt. +EightBallYes2=It is decidedly so. +EightBallYes1=It is certain. EightBallYes8=Outlook good. -EightBallYes9=Yes. -EightBallYes10=Signs point to yes. - +EightBallYes7=Most likely. +EightBallYes6=As I see it, yes. +EightBallYes5=You may rely on it. EightBallMaybe1=Reply hazy, try again. EightBallMaybe2=Ask again later. +EightBallError=Hmm? You'll need to ask a question! EightBallMaybe3=Better not tell you now. EightBallMaybe4=Cannot predict now. EightBallMaybe5=Concentrate and ask again. - -EightBallNo1=Don't count on it. -EightBallNo2=My reply is no. +EightBallInfo=Answers a yes or no question! Warning: Kitty can not actually tell the future, she claims no responsibility for any lion mauling, lack of lottery wins, or felony charges. +EightBallNo5=Very doubtful. EightBallNo3=My sources say no. EightBallNo4=Outlook not so good. -EightBallNo5=Very doubtful. +EightBallNo1=Don't count on it. +EightBallNo2=My reply is no. +EightBallYes9=Yes. +EightBallYes10=Signs point to yes. [CommandInvite] InviteInfo=Provides a direct invite link for KittyBot @@ -170,9 +170,8 @@ WolframNoArgs=You need to provide some arguments! MapInfo=Generates a map! You can pass additional information if you want with the flags `-s-w-h`. If one of the fields isn't provided, its default will be used. Note that adjusting the width and height impacts the map outcomes.\n\nDefault seed: Random,\nDefault Width: 35(max %s),\nDefault Height: 25(max %s) MapSeed=Seed MapInvalid=Invalid arguments provided! -MapHeight=Height MapVersion=Using mapgen v0.1 MapWidth=Width +MapHeight=Height + -[CommandTeey] -TeeyInfo=Teey yourself back into existance, or teey a friend with @! \ No newline at end of file diff --git a/src/commands/CommandPollManage.java b/src/commands/CommandPollManage.java index 2432e19..1a0114d 100644 --- a/src/commands/CommandPollManage.java +++ b/src/commands/CommandPollManage.java @@ -14,7 +14,7 @@ public class CommandPollManage extends Command public CommandPollManage(KittyRole level, KittyRating rating) { super(level, rating); } @Override - public String HelpText() { return LocStrings.Stub("PollMangeInfo"); } + public String HelpText() { return LocStrings.Stub("PollManageInfo"); } @Override public void OnRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res)