Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 4 additions & 5 deletions index.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ function translate(text, opts) {

var e;
[opts.from, opts.to].forEach(function (lang) {
if (lang && !languages.isSupported(lang)) {
if (lang && !translate.languages.isSupported(lang)) {
e = new Error();
e.code = 400;
e.message = 'The language \'' + lang + '\' is not supported';
Expand All @@ -26,8 +26,8 @@ function translate(text, opts) {
opts.from = opts.from || 'auto';
opts.to = opts.to || 'en';

opts.from = languages.getCode(opts.from);
opts.to = languages.getCode(opts.to);
opts.from = translate.languages.getCode(opts.from);
opts.to = translate.languages.getCode(opts.to);

return token.get(text).then(function (token) {
var url = 'https://translate.google.com/translate_a/single';
Expand Down Expand Up @@ -112,6 +112,5 @@ function translate(text, opts) {
});
});
}

translate.languages = languages;
module.exports = translate;
module.exports.languages = languages;
5 changes: 5 additions & 0 deletions languages.js
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,11 @@ function getCode(desiredLang) {
if (!desiredLang) {
return false;
}

if (langs[desiredLang]) {
return desiredLang;
}

desiredLang = desiredLang.toLowerCase();

if (langs[desiredLang]) {
Expand Down
6 changes: 5 additions & 1 deletion test.js
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ test('translate some misspelled english text to dutch', async t => {
}
});

test.todo('try to translate some text without an internet connection');
// test.todo('try to translate some text without an internet connection');

test('translate some text and get the raw output alongside', async t => {
try {
Expand Down Expand Up @@ -97,6 +97,10 @@ test('get a supported language code by code', t => {
t.is(languages.getCode('en'), 'en');
});

test('get a supported language code by uppercase code', t => {
t.is(languages.getCode('EN'), 'en');
});

test('call getCode with \'undefined\'', t => {
t.is(languages.getCode(undefined), false);
});
Expand Down