arthur/xiao
1
0
Fork 0
mirror of https://github.com/arthur-pbty/xiao.git synced 2026-06-03 23:36:43 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix translate bug in resolving languages

Browse Source
This commit is contained in:
Dragon Fire
2020-06-20 11:57:57 -04:00
parent 49504fa3d6
commit 76a2154a90
2 changed files with 12 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
commands/edit-text/translate.js
+11 -21
View File
@@ -2,7 +2,7 @@ const Command = require('../../structures/Command');
const { MessageEmbed } = require('discord.js');
const translate = require('@vitalets/google-translate-api');
const { list } = require('../../util/Util');
const codes = translate.languages;
const codes = Object.keys(translate.languages).filter(code => typeof translate.languages[code] !== 'function');
module.exports = class TranslateCommand extends Command {
constructor(client) {
@@ -12,7 +12,7 @@ module.exports = class TranslateCommand extends Command {
group: 'edit-text',
memberName: 'translate',
description: 'Translates text to a specific language.',
details: `**Codes:** ${Object.keys(codes).join(', ')}`,
details: `**Codes:** ${codes.join(', ')}`,
clientPermissions: ['EMBED_LINKS'],
credit: [
{
@@ -31,18 +31,13 @@ module.exports = class TranslateCommand extends Command {
},
{
key: 'target',
prompt: `Which language would you like to translate to? Either ${list(Object.keys(codes), 'or')}.`,
prompt: `Which language would you like to translate to? Either ${list(codes, 'or')}.`,
type: 'string',
validate: target => {
const value = target.toLowerCase();
if (codes[value] || Object.keys(codes).find(key => codes[key].toLowerCase() === value)) return true;
return `Invalid target, please enter either ${list(Object.keys(codes), 'or')}.`;
if (translate.languages.isSupported(target)) return true;
return `Invalid target, please enter either ${list(codes, 'or')}.`;
},
parse: target => {
const value = target.toLowerCase();
if (codes[value]) return value;
return Object.keys(codes).find(key => codes[key].toLowerCase() === value);
}
parse: target => translate.languages.getCode(target)
},
{
key: 'base',
@@ -50,15 +45,10 @@ module.exports = class TranslateCommand extends Command {
type: 'string',
default: 'auto',
validate: base => {
const value = base.toLowerCase();
if (codes[value] || Object.keys(codes).find(key => codes[key].toLowerCase() === value)) return true;
return `Invalid base, please enter either ${list(Object.keys(codes), 'or')}.`;
if (translate.languages.isSupported(base)) return true;
return `Invalid base, please enter either ${list(codes, 'or')}.`;
},
parse: base => {
const value = base.toLowerCase();
if (codes[value]) return value;
return Object.keys(codes).find(key => codes[key].toLowerCase() === value);
}
parse: base => translate.languages.getCode(base)
}
]
});
@@ -70,8 +60,8 @@ module.exports = class TranslateCommand extends Command {
const embed = new MessageEmbed()
.setColor(0x4285F4)
.setFooter('Powered by Google Translate', 'https://i.imgur.com/h3RoHyp.png')
.addField(`❯ From: ${codes[from.language.iso]}`, from.text.value || text)
.addField(`❯ To: ${codes[target]}`, result);
.addField(`❯ From: ${translate.languages[from.language.iso]}`, from.text.value || text)
.addField(`❯ To: ${translate.languages[target]}`, result);
return msg.embed(embed);
} catch (err) {
return msg.reply(`Oh no, an error occurred: \`${err.message}\`. Try again later!`);
package.json
+1 -1
View File
@@ -1,6 +1,6 @@
{
"name": "xiao",
"version": "116.34.3",
"version": "116.34.4",
"description": "Your personal server companion.",
"main": "Xiao.js",
"scripts": {