From 38fbd406ac8ae40fe77d69ae78b3853cda422230 Mon Sep 17 00:00:00 2001 From: imtherealF1 <168587794+imtherealF1@users.noreply.github.com> Date: Sun, 15 Sep 2024 12:52:55 +0300 Subject: [PATCH] [settings] changing from collectible_name+s to plural (#413) * changing collectible_name to plural_collectible_name * changing collectible_name to plural_collectible_name * changing collectible_name to plural_collectible_name * appeasing pre-commit --- ballsdex/packages/balls/cog.py | 2 +- ballsdex/packages/players/cog.py | 2 +- ballsdex/packages/trade/menu.py | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ballsdex/packages/balls/cog.py b/ballsdex/packages/balls/cog.py index 8323933d..8359bc10 100644 --- a/ballsdex/packages/balls/cog.py +++ b/ballsdex/packages/balls/cog.py @@ -350,7 +350,7 @@ def fill_fields(title: str, emoji_ids: set[int]): set(bot_countryballs[x] for x in owned_countryballs), ) else: - entries.append((f"__**Owned {settings.collectible_name}s**__", "Nothing yet.")) + entries.append((f"__**Owned {settings.plural_collectible_name}**__", "Nothing yet.")) if missing := set(y for x, y in bot_countryballs.items() if x not in owned_countryballs): fill_fields(f"Missing {settings.plural_collectible_name}", missing) diff --git a/ballsdex/packages/players/cog.py b/ballsdex/packages/players/cog.py index 261acb0d..fa16e9a7 100644 --- a/ballsdex/packages/players/cog.py +++ b/ballsdex/packages/players/cog.py @@ -111,7 +111,7 @@ async def donation_policy(self, interaction: discord.Interaction, policy: Donati elif policy.value == DonationPolicy.FRIENDS_ONLY: await interaction.response.send_message( "Setting updated, you will now only receive donated " - f"{settings.collectible_name}s from players you have " + f"{settings.plural_collectible_name} from players you have " "added as friends in the bot.", ephemeral=True, ) diff --git a/ballsdex/packages/trade/menu.py b/ballsdex/packages/trade/menu.py index d1badf37..440f3df2 100644 --- a/ballsdex/packages/trade/menu.py +++ b/ballsdex/packages/trade/menu.py @@ -172,8 +172,8 @@ def _generate_embed(self): self.embed.title = f"{settings.plural_collectible_name.title()} trading" self.embed.color = discord.Colour.blurple() self.embed.description = ( - f"Add or remove {settings.collectible_name}s you want to propose to the other player " - f"using the {add_command} and {remove_command} commands.\n" + f"Add or remove {settings.plural_collectible_name} you want to propose " + f"to the other player using the {add_command} and {remove_command} commands.\n" "Once you're finished, click the lock button below to confirm your proposal.\n" "You can also lock with nothing if you're receiving a gift.\n\n" "*This trade will timeout "