Revert Google Translate Change

This commit is contained in:
Daniel Odendahl Jr
2017-11-06 14:20:01 +00:00
parent f9e23375ba
commit 9ced807a1e
2 changed files with 70 additions and 83 deletions
+53 -65
View File
@@ -1,107 +1,95 @@
{ {
"auto": "Automatic", "az": "Azerbaijan",
"af": "Afrikaans",
"sq": "Albanian", "sq": "Albanian",
"am": "Amharic", "am": "Amharic",
"en": "English",
"ar": "Arabic", "ar": "Arabic",
"hy": "Armenian", "hy": "Armenian",
"az": "Azerbaijani", "af": "Afrikaans",
"eu": "Basque", "eu": "Basque",
"ba": "Bashkir",
"be": "Belarusian", "be": "Belarusian",
"bn": "Bengali", "bn": "Bengali",
"bs": "Bosnian", "my": "Burmese",
"bg": "Bulgarian", "bg": "Bulgarian",
"ca": "Catalan", "bs": "Bosnian",
"ceb": "Cebuano", "cy": "Welsh",
"ny": "Chichewa",
"zh-cn": "Chinese Simplified",
"zh-tw": "Chinese Traditional",
"co": "Corsican",
"hr": "Croatian",
"cs": "Czech",
"da": "Danish",
"nl": "Dutch",
"en": "English",
"eo": "Esperanto",
"et": "Estonian",
"tl": "Filipino",
"fi": "Finnish",
"fr": "French",
"fy": "Frisian",
"gl": "Galician",
"ka": "Georgian",
"de": "German",
"el": "Greek",
"gu": "Gujarati",
"ht": "Haitian Creole",
"ha": "Hausa",
"haw": "Hawaiian",
"iw": "Hebrew",
"hi": "Hindi",
"hmn": "Hmong",
"hu": "Hungarian", "hu": "Hungarian",
"is": "Icelandic", "vi": "Vietnamese",
"ig": "Igbo", "ht": "Haitian (Creole)",
"gl": "Galician",
"nl": "Dutch",
"mrj": "Hill Mari",
"el": "Greek",
"ka": "Georgian",
"gu": "Gujarati",
"da": "Danish",
"he": "Hebrew",
"yi": "Yiddish",
"id": "Indonesian", "id": "Indonesian",
"ga": "Irish", "ga": "Irish",
"it": "Italian", "it": "Italian",
"ja": "Japanese", "is": "Icelandic",
"jw": "Javanese", "es": "Spanish",
"kn": "Kannada",
"kk": "Kazakh", "kk": "Kazakh",
"km": "Khmer", "kn": "Kannada",
"ko": "Korean", "ca": "Catalan",
"ku": "Kurdish (Kurmanji)",
"ky": "Kyrgyz", "ky": "Kyrgyz",
"lo": "Lao", "zh": "Chinese",
"ko": "Korean",
"xh": "Xhosa",
"km": "Khmer",
"lo": "Laotian",
"la": "Latin", "la": "Latin",
"lv": "Latvian", "lv": "Latvian",
"lt": "Lithuanian", "lt": "Lithuanian",
"lb": "Luxembourgish", "lb": "Luxembourgish",
"mk": "Macedonian",
"mg": "Malagasy", "mg": "Malagasy",
"ms": "Malay", "ms": "Malay",
"ml": "Malayalam", "ml": "Malayalam",
"mt": "Maltese", "mt": "Maltese",
"mk": "Macedonian",
"mi": "Maori", "mi": "Maori",
"mr": "Marathi", "mr": "Marathi",
"mhr": "Mari",
"mn": "Mongolian", "mn": "Mongolian",
"my": "Myanmar (Burmese)", "de": "German",
"ne": "Nepali", "ne": "Nepali",
"no": "Norwegian", "no": "Norwegian",
"ps": "Pashto", "pa": "Punjabi",
"pap": "Papiamento",
"fa": "Persian", "fa": "Persian",
"pl": "Polish", "pl": "Polish",
"pt": "Portuguese", "pt": "Portuguese",
"ma": "Punjabi",
"ro": "Romanian", "ro": "Romanian",
"ru": "Russian", "ru": "Russian",
"sm": "Samoan", "ceb": "Cebuano",
"gd": "Scots Gaelic",
"sr": "Serbian", "sr": "Serbian",
"st": "Sesotho",
"sn": "Shona",
"sd": "Sindhi",
"si": "Sinhala", "si": "Sinhala",
"sk": "Slovak", "sk": "Slovakian",
"sl": "Slovenian", "sl": "Slovenian",
"so": "Somali",
"es": "Spanish",
"su": "Sundanese",
"sw": "Swahili", "sw": "Swahili",
"sv": "Swedish", "su": "Sundanese",
"tg": "Tajik", "tg": "Tajik",
"ta": "Tamil",
"te": "Telugu",
"th": "Thai", "th": "Thai",
"tl": "Tagalog",
"ta": "Tamil",
"tt": "Tatar",
"te": "Telugu",
"tr": "Turkish", "tr": "Turkish",
"uk": "Ukrainian", "udm": "Udmurt",
"ur": "Urdu",
"uz": "Uzbek", "uz": "Uzbek",
"vi": "Vietnamese", "uk": "Ukranian",
"cy": "Welsh", "ur": "Urdu",
"xh": "Xhosa", "fi": "Finnish",
"yi": "Yiddish", "fr": "French",
"yo": "Yoruba", "hi": "Hindi",
"zu": "Zulu" "hr": "Croatian",
"cs": "Czech",
"sv": "Swedish",
"gd": "Scottish",
"et": "Estonian",
"eo": "Esperanto",
"jv": "Javanese",
"ja": "Japanese"
} }
+17 -18
View File
@@ -3,12 +3,13 @@ const { MessageEmbed } = require('discord.js');
const snekfetch = require('snekfetch'); const snekfetch = require('snekfetch');
const { list } = require('../../util/Util'); const { list } = require('../../util/Util');
const codes = require('../../assets/json/translate'); const codes = require('../../assets/json/translate');
const { YANDEX_KEY } = process.env;
module.exports = class TranslateCommand extends Command { module.exports = class TranslateCommand extends Command {
constructor(client) { constructor(client) {
super(client, { super(client, {
name: 'translate', name: 'translate',
aliases: ['google-translate'], aliases: ['yandex', 'yandex-translate', 'translate-yandex'],
group: 'text-edit', group: 'text-edit',
memberName: 'translate', memberName: 'translate',
description: 'Translates text to a specified language.', description: 'Translates text to a specified language.',
@@ -16,8 +17,7 @@ module.exports = class TranslateCommand extends Command {
clientPermissions: ['EMBED_LINKS'], clientPermissions: ['EMBED_LINKS'],
args: [ args: [
{ {
key: 'content', key: 'text',
label: 'text',
prompt: 'What text would you like to translate?', prompt: 'What text would you like to translate?',
type: 'string', type: 'string',
max: 500 max: 500
@@ -41,7 +41,7 @@ module.exports = class TranslateCommand extends Command {
key: 'base', key: 'base',
prompt: `Which language would you like to use as the base? Either ${list(Object.keys(codes), 'or')}.`, prompt: `Which language would you like to use as the base? Either ${list(Object.keys(codes), 'or')}.`,
type: 'string', type: 'string',
default: 'auto', default: '',
validate: base => { validate: base => {
const value = base.toLowerCase(); const value = base.toLowerCase();
if (codes[value] || Object.keys(codes).find(key => codes[key].toLowerCase() === value)) return true; if (codes[value] || Object.keys(codes).find(key => codes[key].toLowerCase() === value)) return true;
@@ -57,24 +57,23 @@ module.exports = class TranslateCommand extends Command {
}); });
} }
async run(msg, { content, target, base }) { async run(msg, { text, target, base }) {
try { try {
const { text } = await snekfetch const { body } = await snekfetch
.get('https://translate.googleapis.com/translate_a/single') .get('https://translate.yandex.net/api/v1.5/tr.json/translate')
.query({ .query({
client: 'gtx', key: YANDEX_KEY,
sl: base, text,
tl: target, lang: base ? `${base}-${target}` : target
dt: 't',
q: content
}); });
const body = JSON.parse(text); const lang = body.lang.split('-');
const embed = new MessageEmbed() const embed = new MessageEmbed()
.setColor(0x3174F1) .setColor(0xFF0000)
.addField(` From: ${codes[body[2]]}`, .setFooter('Powered by Yandex.Translate', 'https://i.imgur.com/HMpH9sq.png')
content) .addField(`❯ From: ${codes[lang[0]]}`,
.addField(` To: ${codes[target]}`, text)
body[0][0][0]); .addField(`❯ To: ${codes[lang[1]]}`,
body.text[0]);
return msg.embed(embed); return msg.embed(embed);
} catch (err) { } catch (err) {
return msg.reply(`Oh no, an error occurred: \`${err.message}\`. Try again later!`); return msg.reply(`Oh no, an error occurred: \`${err.message}\`. Try again later!`);