Skip to content

Commit

Permalink
bugFix #62
Browse files Browse the repository at this point in the history
  • Loading branch information
BastLast committed Jun 24, 2020
1 parent 13ede10 commit 548fa44
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 11 deletions.
2 changes: 1 addition & 1 deletion src/commands/guild/GuildCommand.js
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ const GuildCommand = async (language, message, args) => {
message.author,
message.channel,
language,
JsonReader.commands.guildAdd.getTranslation(language).noGuildException);
JsonReader.commands.guild.getTranslation(language).noGuildException);
}
let members = await Entities.getByGuild(guild.id);

Expand Down
8 changes: 4 additions & 4 deletions src/commands/guild/GuildCreateCommand.js
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ const GuildCreateCommand = async (language, message, args) => {
message.author,
message.channel,
language,
JsonReader.commands.guildAdd.getTranslation(language).alreadyInAGuild);
JsonReader.commands.guildCreate.getTranslation(language).alreadyInAGuild);
}

let askedName = args.join(" ");
Expand All @@ -33,7 +33,7 @@ const GuildCreateCommand = async (language, message, args) => {
message.author,
message.channel,
language,
JsonReader.commands.guildAdd.getTranslation(language).noNameProvided);
JsonReader.commands.guildCreate.getTranslation(language).noNameProvided);
}

const regexAllowed = RegExp(/^[A-Za-z0-9 ÇçÜüÉéÂâÄäÀàÊêËëÈèÏïÎîÔôÖöÛû]+$/);
Expand Down Expand Up @@ -61,7 +61,7 @@ const GuildCreateCommand = async (language, message, args) => {
message.author,
message.channel,
language,
JsonReader.commands.guildAdd.getTranslation(language).nameAlreadyUsed);
JsonReader.commands.guildCreate.getTranslation(language).nameAlreadyUsed);
}

embed.setAuthor(format(JsonReader.commands.guildCreate.getTranslation(language).buyTitle, {
Expand Down Expand Up @@ -126,7 +126,7 @@ const GuildCreateCommand = async (language, message, args) => {
message.author,
message.channel,
language,
JsonReader.commands.guildAdd.getTranslation(language).creationCancelled);
JsonReader.commands.guildCreate.getTranslation(language).creationCancelled);
});

await msg.react(MENU_REACTION.ACCEPT);
Expand Down
10 changes: 5 additions & 5 deletions src/commands/guild/GuildKickCommand.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ const GuildKickCommand = async (language, message, args) => {
message.author,
message.channel,
language,
JsonReader.commands.guildAdd.getTranslation(language).cannotGetKickedUser);
JsonReader.commands.guildKick.getTranslation(language).cannotGetKickedUser);
}

// search for a user's guild
Expand All @@ -37,15 +37,15 @@ const GuildKickCommand = async (language, message, args) => {
message.author,
message.channel,
language,
JsonReader.commands.guildAdd.getTranslation(language).notInAguild);
JsonReader.commands.guildKick.getTranslation(language).notInAguild);
}

if (guild.chief_id != entity.id) {
return sendErrorMessage(
message.author,
message.channel,
language,
JsonReader.commands.guildAdd.getTranslation(language).notChiefError);
JsonReader.commands.guildKick.getTranslation(language).notChiefError);
}

// search for a user's guild
Expand All @@ -60,15 +60,15 @@ const GuildKickCommand = async (language, message, args) => {
message.author,
message.channel,
language,
JsonReader.commands.guildAdd.getTranslation(language).notInTheGuild);
JsonReader.commands.guildKick.getTranslation(language).notInTheGuild);
}

if (kickedEntity.id === entity.id) {
return sendErrorMessage(
message.author,
message.channel,
language,
JsonReader.commands.guildAdd.getTranslation(language).excludeHimself);
JsonReader.commands.guildKick.getTranslation(language).excludeHimself);
}


Expand Down
2 changes: 1 addition & 1 deletion src/commands/guild/GuildLeaveCommand.js
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ const GuildLeaveCommand = async (language, message, args) => {
message.author,
message.channel,
language,
JsonReader.commands.guildAdd.getTranslation(language).notInAGuild);
JsonReader.commands.guildLeave.getTranslation(language).notInAGuild);
}

//generate confirmation embed
Expand Down

0 comments on commit 548fa44

Please sign in to comment.