Merge pull request #475 from Kill4Free/develop

Parsing multiple languages for signature type (German + English)
This commit is contained in:
Mark Friedrich
2017-07-21 18:23:53 +02:00
committed by GitHub
2 changed files with 14 additions and 9 deletions

View File

@@ -334,31 +334,31 @@ define(['jquery'], function($) {
// signature groups
signatureGroups: {
1: {
name: 'combat site', //*
name: '(combat site|kampfgebiet|site de combat)', //*
label: 'Combat'
},
2: {
name: 'relic site', //*
name: '(relic site|reliktgebiet|site de reliques)', //*
label: 'Relic'
},
3: {
name: 'data site',
name: '(data site|datengebiet|site de données)',
label: 'Data'
},
4: {
name: 'gas site',
name: '(gas site|gasgebiet|site de collecte de gaz)',
label: 'Gas'
},
5: {
name: 'wormhole',
name: '(wormhole|wurmloch|trou de ver)',
label: 'Wormhole'
},
6: {
name: 'ore site',
name: '(ore site|mineraliengebiet|site de minerai)',
label: 'Ore'
},
7: {
name: 'ghost',
name: '(ghost)',
label: 'Ghost'
}
},

View File

@@ -98,6 +98,10 @@ define([
let validSignatureNames = [ // allowed signature type/names
'Cosmic Anomaly',
'Cosmic Signature',
'Kosmische Anomalie',
'Kosmische Signatur',
'Anomalie cosmique',
'Signature cosmique',
'Космическая аномалия', // == "Cosmic Anomaly"
'Источники сигналов' // == "Cosmic Signature"
];
@@ -658,7 +662,8 @@ define([
// get groupId by groupName
for (let prop in signatureGroupOptions) {
if(signatureGroupOptions.hasOwnProperty(prop)){
if(signatureGroupOptions[prop] === sigGroup){
let reg = new RegExp(signatureGroupOptions[prop], 'i');
if (reg.test(sigGroup)) {
sigGroupId = parseInt( prop );
break;
}
@@ -2453,4 +2458,4 @@ define([
getAllSignatureNamesBySystem: getAllSignatureNamesBySystem
};
});
});