🔀 Merge branch 'master' of github.com:n8n-io/n8n

This commit is contained in:
Jan Oberhauser 2020-10-08 08:40:30 +02:00
commit 97efc0b910
4 changed files with 19 additions and 0 deletions

View file

@ -6,6 +6,7 @@ import {
export class MindeeInvoiceApi implements ICredentialType {
name = 'mindeeInvoiceApi';
displayName = 'Mindee Invoice API';
documentationUrl = 'mindee';
properties = [
{
displayName: 'API Key',

View file

@ -6,6 +6,7 @@ import {
export class MindeeReceiptApi implements ICredentialType {
name = 'mindeeReceiptApi';
displayName = 'Mindee Receipt API';
documentationUrl = 'mindee';
properties = [
{
displayName: 'API Key',

View file

@ -6,6 +6,7 @@ import {
export class WufooApi implements ICredentialType {
name = 'wufooApi';
displayName = 'Wufoo API';
documentationUrl = 'wufoo';
properties = [
{
displayName: 'API Key',

View file

@ -188,6 +188,16 @@ export class OpenWeatherMap implements INodeType {
description: 'The id of city to return the weather of. List can be downloaded here: http://bulk.openweathermap.org/sample/',
},
{
displayName: 'Language',
name: 'language',
type: 'string',
default: '',
placeholder: 'en',
required: false,
description: 'The two letter language code to get your output in (eg. en, de, ...).',
},
],
};
@ -206,6 +216,7 @@ export class OpenWeatherMap implements INodeType {
let endpoint = '';
let locationSelection;
let language;
let qs: IDataObject;
@ -231,6 +242,11 @@ export class OpenWeatherMap implements INodeType {
throw new Error(`The locationSelection "${locationSelection}" is not known!`);
}
// Get the language
language = this.getNodeParameter('language', i) as string;
if (language) {
qs.lang = language;
}
if (operation === 'currentWeather') {
// ----------------------------------