Skip to content
This repository has been archived by the owner on Feb 26, 2021. It is now read-only.

Commit

Permalink
Remove some debug formatting
Browse files Browse the repository at this point in the history
  • Loading branch information
@DiamondIceNS
DiamondIceNS committed Sep 8, 2019
1 parent ec94b83 commit fa8b7ba
Show file tree
Hide file tree
Showing 2 changed files with 117 additions and 118 deletions.
1 change: 0 additions & 1 deletion glimmer.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -224,7 +224,6 @@ async def on_command_error(ctx, error):
await utils.channel_log(bot, "```{}```".format(error))
log.error("An error occurred executing '{}': {}\n{}"
.format(name, error, ''.join(traceback.format_exception(None, error, error.__traceback__))))
print(ctx.s("error.unknown"))
await ctx.send(ctx.s("error.unknown"))


Expand Down
234 changes: 117 additions & 117 deletions lang/en_US.py
View file
Original file line number Diff line number Diff line change
@@ -1,141 +1,141 @@
STRINGS = {
# Global messages
"bot.added_by": "Added By",
"bot.alias": "Alias",
"bot.aliases": "Aliases",
"bot.canvas": "Canvas",
"bot.canvases": "Canvases",
"bot.coordinates": "Coordinates",
"bot.date_added": "Date Added",
"bot.date_modified": "Date Modified",
"bot.dimensions": "Dimensions",
"bot.errors": "Errors",
"bot.examples": "Examples",
"bot.faction": "Faction",
"bot.name": "Name",
"bot.no": "No",
"bot.or_all_caps": "OR",
"bot.page": "Page",
"bot.percent": "Percent",
"bot.private": "Private",
"bot.public": "Public",
"bot.size": "Size",
"bot.subcommands": "Subcommands",
"bot.total": "Total",
"bot.update": "I have updated to version **{0}**! Here's the changelog:",
"bot.added_by": "Added By",
"bot.alias": "Alias",
"bot.aliases": "Aliases",
"bot.canvas": "Canvas",
"bot.canvases": "Canvases",
"bot.coordinates": "Coordinates",
"bot.date_added": "Date Added",
"bot.date_modified": "Date Modified",
"bot.dimensions": "Dimensions",
"bot.errors": "Errors",
"bot.examples": "Examples",
"bot.faction": "Faction",
"bot.name": "Name",
"bot.no": "No",
"bot.or_all_caps": "OR",
"bot.page": "Page",
"bot.percent": "Percent",
"bot.private": "Private",
"bot.public": "Public",
"bot.size": "Size",
"bot.subcommands": "Subcommands",
"bot.total": "Total",
"bot.update": "I have updated to version **{0}**! Here's the changelog:",
"bot.update_no_changelog": "I have updated to version **{0}**! Visit https://github.com/DiamondIceNS/StarlightGlimmer/releases for the full changelog.",
"bot.usage": "Usage",
"bot.visibility": "Visibility",
"bot.yes": "Yes",
"bot.usage": "Usage",
"bot.visibility": "Visibility",
"bot.yes": "Yes",

# Error messages
"error.account_deleted": "[[Account deleted]]",
"error.bad_image": "An error occurred while attempting to open an image. Ensure that the supplied image is not corrupted.",
"error.bad_png": "This image seems to be corrupted. Try re-saving it with an image editor or using `{0}quantize`.",
"error.cannot_fetch_template": "Could not access URL for template '{}'. (Was the original attachment deleted?)", # TODO
"error.cooldown": "That command is on cooldown. Try again in {0:.01f}s.",
"error.faction_not_found": "That faction could not be found.",
"error.http": "There was an error retrieving data from a remote location. Try again later.",
"error.http_canvas": "{0} seems to be having connection issues. Try again later.",
"error.invalid_color": "That is not a valid color.",
"error.invalid_option": "That is not a valid option. Please try again.",
"error.jpeg": "Seriously? A JPEG? Gross! Please create a PNG template instead.",
"error.missing_arg_faction": "Missing argument: The `-f` flag must be followed by a faction name or alias.",
"error.no_attachment": "That command requires an attachment.",
"error.no_dm": "That command only works in guilds.",
"error.no_self_permission": "I do not have the permission to do that in this channel.",
"error.no_templates": "This guild currently has no templates.",
"error.account_deleted": "[[Account deleted]]",
"error.bad_image": "An error occurred while attempting to open an image. Ensure that the supplied image is not corrupted.",
"error.bad_png": "This image seems to be corrupted. Try re-saving it with an image editor or using `{0}quantize`.",
"error.cannot_fetch_template": "Could not access URL for template '{}'. (Was the original attachment deleted?)", # TODO
"error.cooldown": "That command is on cooldown. Try again in {0:.01f}s.",
"error.faction_not_found": "That faction could not be found.",
"error.http": "There was an error retrieving data from a remote location. Try again later.",
"error.http_canvas": "{0} seems to be having connection issues. Try again later.",
"error.invalid_color": "That is not a valid color.",
"error.invalid_option": "That is not a valid option. Please try again.",
"error.jpeg": "Seriously? A JPEG? Gross! Please create a PNG template instead.",
"error.missing_arg_faction": "Missing argument: The `-f` flag must be followed by a faction name or alias.",
"error.no_attachment": "That command requires an attachment.",
"error.no_dm": "That command only works in guilds.",
"error.no_self_permission": "I do not have the permission to do that in this channel.",
"error.no_templates": "This guild currently has no templates.",
"error.no_templates_for_canvas": "This guild currently has no templates for that canvas.",
"error.no_user_permission": "You do not have permission to use that command.",
"error.not_png": "That command requires a PNG image.",
"error.non_discord_url": "I can only accept Discord attachment URLs.",
"error.template_not_found": "That template could not be found.",
"error.timed_out": "Command timed out.",
"error.unknown": "An unknown error occurred. The dev has been notified.",
"error.why": "But... why?",
"error.no_user_permission": "You do not have permission to use that command.",
"error.not_png": "That command requires a PNG image.",
"error.non_discord_url": "I can only accept Discord attachment URLs.",
"error.template_not_found": "That template could not be found.",
"error.timed_out": "Command timed out.",
"error.unknown": "An unknown error occurred. The dev has been notified.",
"error.why": "But... why?",

# Animotes command messages
"animotes.opt_in": "You have successfully **opted-in** to emoji conversion.",
"animotes.opt_in": "You have successfully **opted-in** to emoji conversion.",
"animotes.opt_out": "You have successfully **opted-out** of emoji conversion.",

# Canvas command messages
"canvas.diff": "{0}/{1} | {2} errors | {3} complete",
"canvas.diff_bad_color": "{0}/{1} | {2} errors | {bad} bad color | {3} complete",
"canvas.diff_error_list": "({}, {}) is {}, should be {}",
"canvas.invalid_input": "Invalid input: does not match any template name or supported coordinates format.",
"canvas.large_template": "(Processing large template, this might take a few seconds...)",
"canvas.online": "There are {0} players online on {1}.",
"canvas.online_await": "Waiting for next player count update...",
"canvas.quantize": "Fixed {0} pixels.",
"canvas.diff": "{0}/{1} | {2} errors | {3} complete",
"canvas.diff_bad_color": "{0}/{1} | {2} errors | {bad} bad color | {3} complete",
"canvas.diff_error_list": "({}, {}) is {}, should be {}",
"canvas.invalid_input": "Invalid input: does not match any template name or supported coordinates format.",
"canvas.large_template": "(Processing large template, this might take a few seconds...)",
"canvas.online": "There are {0} players online on {1}.",
"canvas.online_await": "Waiting for next player count update...",
"canvas.quantize": "Fixed {0} pixels.",
"canvas.repeat_not_found": "Could not find a valid command to repeat.",

# Configuration command messages
"configuration.alert_channel_cleared": "Alert channel has been cleared.",
"configuration.alert_channel_set": "Alert channel has been set to {0}.",
"configuration.autoscan_disabled": "Autoscan has been disabled.",
"configuration.autoscan_enabled": "Autoscan has been enabled.",
"configuration.canvas_check_1": "This guild's default canvas is **{0}**.",
"configuration.canvas_check_2": "To change the default canvas, run this command again with a supported canvas. (Use `{0}help canvas` to see a list.)",
"configuration.canvas_set": "Default canvas has been set to **{0}**.",
"configuration.language_check_1": "This guild's current language is **{0}**.",
"configuration.language_check_2": "To set a new language, run this command again with one of the following options:",
"configuration.language_set": "Language has been set to **English (US)**.",
"configuration.prefix_set": "Prefix for this guild has been set to **{0}**.",
"configuration.role_list_header": "Roles List",
"configuration.role_list_botadmin": "Can do anything an Administrator can do",
"configuration.role_list_footer": "Use '{0}role <type>' to view the current linked role.",
"configuration.role_list_templateadder": "Can add templates, and remove templates they added themself",
"configuration.role_list_templateadmin": "Can add and remove any template",
"configuration.role_not_found": "That role could not be found.",
"configuration.role_bot_admin_check": "Bot admin privileges are currently assigned to `@{0}`.",
"configuration.role_bot_admin_cleared": "Bot admin privileges successfully cleared.",
"configuration.role_bot_admin_not_set": "Bot admin privileges have not been assigned to a role.",
"configuration.role_bot_admin_set": "Bot admin privileges assigned to role `@{0}`.",
"configuration.role_template_adder_check": "Template adder privileges are currently assigned to `@{0}`.",
"configuration.alert_channel_cleared": "Alert channel has been cleared.",
"configuration.alert_channel_set": "Alert channel has been set to {0}.",
"configuration.autoscan_disabled": "Autoscan has been disabled.",
"configuration.autoscan_enabled": "Autoscan has been enabled.",
"configuration.canvas_check_1": "This guild's default canvas is **{0}**.",
"configuration.canvas_check_2": "To change the default canvas, run this command again with a supported canvas. (Use `{0}help canvas` to see a list.)",
"configuration.canvas_set": "Default canvas has been set to **{0}**.",
"configuration.language_check_1": "This guild's current language is **{0}**.",
"configuration.language_check_2": "To set a new language, run this command again with one of the following options:",
"configuration.language_set": "Language has been set to **English (US)**.",
"configuration.prefix_set": "Prefix for this guild has been set to **{0}**.",
"configuration.role_list_header": "Roles List",
"configuration.role_list_botadmin": "Can do anything an Administrator can do",
"configuration.role_list_footer": "Use '{0}role <type>' to view the current linked role.",
"configuration.role_list_templateadder": "Can add templates, and remove templates they added themself",
"configuration.role_list_templateadmin": "Can add and remove any template",
"configuration.role_not_found": "That role could not be found.",
"configuration.role_bot_admin_check": "Bot admin privileges are currently assigned to `@{0}`.",
"configuration.role_bot_admin_cleared": "Bot admin privileges successfully cleared.",
"configuration.role_bot_admin_not_set": "Bot admin privileges have not been assigned to a role.",
"configuration.role_bot_admin_set": "Bot admin privileges assigned to role `@{0}`.",
"configuration.role_template_adder_check": "Template adder privileges are currently assigned to `@{0}`.",
"configuration.role_template_adder_cleared": "Template adder privileges successfully cleared.",
"configuration.role_template_adder_not_set": "Template adder privileges have not been assigned to a role.",
"configuration.role_template_adder_set": "Template adder privileges assigned to role `@{0}`.",
"configuration.role_template_admin_check": "Template admin privileges are currently assigned to `@{0}`.",
"configuration.role_template_adder_set": "Template adder privileges assigned to role `@{0}`.",
"configuration.role_template_admin_check": "Template admin privileges are currently assigned to `@{0}`.",
"configuration.role_template_admin_cleared": "Template admin privileges successfully cleared.",
"configuration.role_template_admin_not_set": "Template admin privileges have not been assigned to a role.",
"configuration.role_template_admin_set": "Template admin privileges assigned to role `@{0}`.",
"configuration.role_template_admin_set": "Template admin privileges assigned to role `@{0}`.",

# Faction command messages
"faction.alias_already_exists": "A faction with that alias already exists.",
"faction.already_faction": "This guild is already a faction.",
"faction.assembled": "Faction `{}` assembled.",
"faction.clear_alias": "Faction alias cleared.",
"faction.clear_color": "Faction color cleared.",
"faction.clear_description": "Faction description cleared.",
"faction.clear_emblem": "Faction emblem cleared.",
"faction.clear_hide": "Unhid faction `{}`.",
"faction.clear_invite": "Faction invite cleared. NOTE: Invite link is still active and must be removed manually.",
"faction.currently_hidden": "The following factions are currently hidden:",
"faction.disbanded": "Faction successfully disbanded.",
"faction.err.alias_length": "Faction aliases must be between 1 and 5 characters.",
"faction.err.description_length": "Faction descriptions must be at most 240 characters.",
"faction.err.invalid_invite": "That is not a valid invite.",
"faction.alias_already_exists": "A faction with that alias already exists.",
"faction.already_faction": "This guild is already a faction.",
"faction.assembled": "Faction `{}` assembled.",
"faction.clear_alias": "Faction alias cleared.",
"faction.clear_color": "Faction color cleared.",
"faction.clear_description": "Faction description cleared.",
"faction.clear_emblem": "Faction emblem cleared.",
"faction.clear_hide": "Unhid faction `{}`.",
"faction.clear_invite": "Faction invite cleared. NOTE: Invite link is still active and must be removed manually.",
"faction.currently_hidden": "The following factions are currently hidden:",
"faction.disbanded": "Faction successfully disbanded.",
"faction.err.alias_length": "Faction aliases must be between 1 and 5 characters.",
"faction.err.description_length": "Faction descriptions must be at most 240 characters.",
"faction.err.invalid_invite": "That is not a valid invite.",
"faction.err.invite_not_this_guild": "You must use an invite to this guild.",
"faction.err.name_length": "Faction names must be between 6 and 32 characters.",
"faction.faction_list_footer_1": "Use '{0}faction <page>' to see that page",
"faction.faction_list_footer_2": "Use '{0}faction info <name>' to see more info on a faction",
"faction.list_header": "Faction List",
"faction.must_be_a_faction": "This guild needs to become a faction to use that command.",
"faction.name_already_exists": "A faction with that name already exists.",
"faction.no_alias": "This faction does not have an alias.",
"faction.no_description": "This faction does not have a description.",
"faction.no_emblem": "This faction does not have an emblem.",
"faction.no_invite": "This faction has not set a public invite.",
"faction.no_factions": "There doesn't seem to be any guilds yet...",
"faction.no_factions_hidden": "This guild has not hidden any factions.",
"faction.not_a_faction_yet": "This guild has not created a faction yet.",
"faction.set_alias": "Faction alias set to `{}`.",
"faction.set_color": "Faction color set.",
"faction.set_description": "Faction description set.",
"faction.set_emblem": "Faction emblem set.",
"faction.set_invite": "Faction invite set.",
"faction.set_hide": "Hid faction `{}`.",
"faction.set_name": "Faction renamed to `{}`.",
"faction.err.name_length": "Faction names must be between 6 and 32 characters.",
"faction.faction_list_footer_1": "Use '{0}faction <page>' to see that page",
"faction.faction_list_footer_2": "Use '{0}faction info <name>' to see more info on a faction",
"faction.list_header": "Faction List",
"faction.must_be_a_faction": "This guild needs to become a faction to use that command.",
"faction.name_already_exists": "A faction with that name already exists.",
"faction.no_alias": "This faction does not have an alias.",
"faction.no_description": "This faction does not have a description.",
"faction.no_emblem": "This faction does not have an emblem.",
"faction.no_invite": "This faction has not set a public invite.",
"faction.no_factions": "There doesn't seem to be any guilds yet...",
"faction.no_factions_hidden": "This guild has not hidden any factions.",
"faction.not_a_faction_yet": "This guild has not created a faction yet.",
"faction.set_alias": "Faction alias set to `{}`.",
"faction.set_color": "Faction color set.",
"faction.set_description": "Faction description set.",
"faction.set_emblem": "Faction emblem set.",
"faction.set_invite": "Faction invite set.",
"faction.set_hide": "Hid faction `{}`.",
"faction.set_name": "Faction renamed to `{}`.",

# General command messages
"general.err.cannot_get_changelog": "There was an error fetching the changelog. Visit https://github.com/DiamondIceNS/StarlightGlimmer/releases to see all releases.",
Expand Down

0 comments on commit fa8b7ba

Please sign in to comment.