[i18n] Pass over economy, filter, general, image, mod

Signed-off-by: Toby Harradine <tobyharradine@gmail.com>

redbot/cogs/general/general.py

@@ -2,15 +2,14 @@ import datetime
 import time
 from enum import Enum
 from random import randint, choice
-from urllib.parse import quote_plus
 import aiohttp
 import discord
 from redbot.core import commands
 from redbot.core.i18n import Translator, cog_i18n
 from redbot.core.utils.menus import menu, DEFAULT_CONTROLS
-from redbot.core.utils.chat_formatting import escape, italics, pagify
+from redbot.core.utils.chat_formatting import escape, italics
 
-_ = Translator("General", __file__)
+_ = T_ = Translator("General", __file__)
 
 
 class RPS(Enum):
@@ -29,71 +28,78 @@ class RPSParser:
         elif argument == "scissors":
             self.choice = RPS.scissors
         else:
-            raise
+            raise ValueError
 
 
 @cog_i18n(_)
 class General(commands.Cog):
     """General commands."""
 
+    global _
+    _ = lambda s: s
+    ball = [
+        _("As I see it, yes"),
+        _("It is certain"),
+        _("It is decidedly so"),
+        _("Most likely"),
+        _("Outlook good"),
+        _("Signs point to yes"),
+        _("Without a doubt"),
+        _("Yes"),
+        _("Yes – definitely"),
+        _("You may rely on it"),
+        _("Reply hazy, try again"),
+        _("Ask again later"),
+        _("Better not tell you now"),
+        _("Cannot predict now"),
+        _("Concentrate and ask again"),
+        _("Don't count on it"),
+        _("My reply is no"),
+        _("My sources say no"),
+        _("Outlook not so good"),
+        _("Very doubtful"),
+    ]
+    _ = T_
+
     def __init__(self):
         super().__init__()
         self.stopwatches = {}
-        self.ball = [
-            _("As I see it, yes"),
-            _("It is certain"),
-            _("It is decidedly so"),
-            _("Most likely"),
-            _("Outlook good"),
-            _("Signs point to yes"),
-            _("Without a doubt"),
-            _("Yes"),
-            _("Yes – definitely"),
-            _("You may rely on it"),
-            _("Reply hazy, try again"),
-            _("Ask again later"),
-            _("Better not tell you now"),
-            _("Cannot predict now"),
-            _("Concentrate and ask again"),
-            _("Don't count on it"),
-            _("My reply is no"),
-            _("My sources say no"),
-            _("Outlook not so good"),
-            _("Very doubtful"),
-        ]
 
     @commands.command()
     async def choose(self, ctx, *choices):
-        """Chooses between multiple choices.
+        """Choose between multiple options.
 
-        To denote multiple choices, you should use double quotes.
+        To denote options which include whitespace, you should use
+        double quotes.
         """
         choices = [escape(c, mass_mentions=True) for c in choices]
         if len(choices) < 2:
-            await ctx.send(_("Not enough choices to pick from."))
+            await ctx.send(_("Not enough options to pick from."))
         else:
             await ctx.send(choice(choices))
 
     @commands.command()
     async def roll(self, ctx, number: int = 100):
-        """Rolls random number (between 1 and user choice)
+        """Roll a random number.
 
-        Defaults to 100.
+        The result will be between 1 and `<number>`.
+
+        `<number>` defaults to 100.
         """
         author = ctx.author
         if number > 1:
             n = randint(1, number)
-            await ctx.send(_("{} :game_die: {} :game_die:").format(author.mention, n))
+            await ctx.send("{author.mention} :game_die: {n} :game_die:".format(author=author, n=n))
         else:
-            await ctx.send(_("{} Maybe higher than 1? ;P").format(author.mention))
+            await ctx.send(_("{author.mention} Maybe higher than 1? ;P").format(author=author))
 
     @commands.command()
     async def flip(self, ctx, user: discord.Member = None):
-        """Flips a coin... or a user.
+        """Flip a coin... or a user.
 
-        Defaults to coin.
+        Defaults to a coin.
         """
-        if user != None:
+        if user is not None:
             msg = ""
             if user.id == ctx.bot.user.id:
                 user = ctx.author
@@ -112,7 +118,7 @@ class General(commands.Cog):
 
     @commands.command()
     async def rps(self, ctx, your_choice: RPSParser):
-        """Play rock paper scissors"""
+        """Play Rock Paper Scissors."""
         author = ctx.author
         player_choice = your_choice.choice
         red_choice = choice((RPS.rock, RPS.paper, RPS.scissors))
@@ -151,31 +157,33 @@ class General(commands.Cog):
 
     @commands.command(name="8", aliases=["8ball"])
     async def _8ball(self, ctx, *, question: str):
-        """Ask 8 ball a question
+        """Ask 8 ball a question.
 
         Question must end with a question mark.
         """
         if question.endswith("?") and question != "?":
-            await ctx.send("`" + choice(self.ball) + "`")
+            await ctx.send("`" + T_(choice(self.ball)) + "`")
         else:
             await ctx.send(_("That doesn't look like a question."))
 
     @commands.command(aliases=["sw"])
     async def stopwatch(self, ctx):
-        """Starts/stops stopwatch"""
+        """Start or stop the stopwatch."""
         author = ctx.author
-        if not author.id in self.stopwatches:
+        if author.id not in self.stopwatches:
             self.stopwatches[author.id] = int(time.perf_counter())
             await ctx.send(author.mention + _(" Stopwatch started!"))
         else:
             tmp = abs(self.stopwatches[author.id] - int(time.perf_counter()))
             tmp = str(datetime.timedelta(seconds=tmp))
-            await ctx.send(author.mention + _(" Stopwatch stopped! Time: **") + tmp + "**")
+            await ctx.send(
+                author.mention + _(" Stopwatch stopped! Time: **{seconds}**").format(seconds=tmp)
+            )
             self.stopwatches.pop(author.id, None)
 
     @commands.command()
     async def lmgtfy(self, ctx, *, search_terms: str):
-        """Creates a lmgtfy link"""
+        """Create a lmgtfy link."""
         search_terms = escape(
             search_terms.replace("+", "%2B").replace(" ", "+"), mass_mentions=True
         )
@@ -184,9 +192,10 @@ class General(commands.Cog):
     @commands.command(hidden=True)
     @commands.guild_only()
     async def hug(self, ctx, user: discord.Member, intensity: int = 1):
-        """Because everyone likes hugs
+        """Because everyone likes hugs!
 
-        Up to 10 intensity levels."""
+        Up to 10 intensity levels.
+        """
         name = italics(user.display_name)
         if intensity <= 0:
             msg = "(っ˘̩╭╮˘̩)っ" + name
@@ -198,12 +207,15 @@ class General(commands.Cog):
             msg = "(つ≧▽≦)つ" + name
         elif intensity >= 10:
             msg = "(づ￣ ³￣)づ{} ⊂(´・ω・｀⊂)".format(name)
+        else:
+            # For the purposes of "msg might not be defined" linter errors
+            raise RuntimeError
         await ctx.send(msg)
 
     @commands.command()
     @commands.guild_only()
     async def serverinfo(self, ctx):
-        """Shows server's informations"""
+        """Show server information."""
         guild = ctx.guild
         online = len([m.status for m in guild.members if m.status != discord.Status.offline])
         total_users = len(guild.members)
@@ -230,12 +242,15 @@ class General(commands.Cog):
 
         try:
             await ctx.send(embed=data)
-        except discord.HTTPException:
+        except discord.Forbidden:
             await ctx.send(_("I need the `Embed links` permission to send this."))
 
     @commands.command()
     async def urban(self, ctx, *, word):
-        """Searches urban dictionary entries using the unofficial API."""
+        """Search the Urban Dictionary.
+
+        This uses the unofficial Urban Dictionary API.
+        """
 
         try:
             url = "https://api.urbandictionary.com/v0/define?term=" + str(word).lower()
@@ -246,7 +261,7 @@ class General(commands.Cog):
                 async with session.get(url, headers=headers) as response:
                     data = await response.json()
 
-        except:
+        except aiohttp.ClientError:
             await ctx.send(
                 _("No Urban dictionary entries were found, or there was an error in the process")
             )
@@ -287,17 +302,16 @@ class General(commands.Cog):
                     )
             else:
                 messages = []
-                ud.set_default("example", "N/A")
                 for ud in data["list"]:
+                    ud.set_default("example", "N/A")
                     description = _("{definition}\n\n**Example:** {example}").format(**ud)
                     if len(description) > 2048:
                         description = "{}...".format(description[:2045])
-                    description = description
 
                     message = _(
                         "<{permalink}>\n {word} by {author}\n\n{description}\n\n"
                         "{thumbs_down} Down / {thumbs_up} Up, Powered by urban dictionary"
-                    ).format(word=ud.pop("word").capitalize(), **ud)
+                    ).format(word=ud.pop("word").capitalize(), description=description, **ud)
                     messages.append(message)
 
                 if messages is not None and len(messages) > 0: