From 0eb08b0c4c6e00236712362a08e6e5b24185c2cd Mon Sep 17 00:00:00 2001 From: Kill4Free Date: Wed, 12 Apr 2017 23:33:05 +0200 Subject: [PATCH 1/4] Parsing multiple languages (German + English) --- js/app/init.js | 14 +++++++------- js/app/ui/system_signature.js | 7 +++++-- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/js/app/init.js b/js/app/init.js index bb85d928..04c487cb 100644 --- a/js/app/init.js +++ b/js/app/init.js @@ -333,31 +333,31 @@ define(['jquery'], function($) { // signature groups signatureGroups: { 1: { - name: 'combat site', //* + name: '(combat site|kampfgebiet)', //* label: 'Combat' }, 2: { - name: 'relic site', //* + name: '(relic site|reliktgebiet)', //* label: 'Relic' }, 3: { - name: 'data site', + name: '(data site|datengebiet)', label: 'Data' }, 4: { - name: 'gas site', + name: '(gas site)', label: 'Gas' }, 5: { - name: 'wormhole', + name: '(wormhole|wurmloch)', label: 'Wormhole' }, 6: { - name: 'ore site', + name: '(ore site|mineraliengebiet)', label: 'Ore' }, 7: { - name: 'ghost', + name: '(ghost)', label: 'Ghost' } }, diff --git a/js/app/ui/system_signature.js b/js/app/ui/system_signature.js index 66ae8d80..990de655 100644 --- a/js/app/ui/system_signature.js +++ b/js/app/ui/system_signature.js @@ -98,6 +98,8 @@ define([ let validSignatureNames = [ // allowed signature type/names 'Cosmic Anomaly', 'Cosmic Signature', + 'Kosmische Anomalie', + 'Kosmische Signatur', 'Космическая аномалия', // == "Cosmic Anomaly" 'Источники сигналов' // == "Cosmic Signature" ]; @@ -658,7 +660,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 +2456,4 @@ define([ getAllSignatureNamesBySystem: getAllSignatureNamesBySystem }; -}); \ No newline at end of file +}); From 261b3591036fc92561df50e479a175d9bd83dc13 Mon Sep 17 00:00:00 2001 From: Kill4Free Date: Sat, 15 Apr 2017 11:50:26 +0200 Subject: [PATCH 2/4] Added german name for gas sites. --- js/app/init.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/app/init.js b/js/app/init.js index 04c487cb..697b5472 100644 --- a/js/app/init.js +++ b/js/app/init.js @@ -345,7 +345,7 @@ define(['jquery'], function($) { label: 'Data' }, 4: { - name: '(gas site)', + name: '(gas site|gasgebiet)', label: 'Gas' }, 5: { From d6b3d2e472666bca16d5895ef53ad8a706fc5ee3 Mon Sep 17 00:00:00 2001 From: Kill4Free Date: Mon, 1 May 2017 23:50:28 +0200 Subject: [PATCH 3/4] Added french language. (With help from Pseude) --- js/app/init.js | 12 ++++++------ js/app/ui/system_signature.js | 2 ++ 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/js/app/init.js b/js/app/init.js index 697b5472..e1c2f1f1 100644 --- a/js/app/init.js +++ b/js/app/init.js @@ -333,27 +333,27 @@ define(['jquery'], function($) { // signature groups signatureGroups: { 1: { - name: '(combat site|kampfgebiet)', //* + name: '(combat site|kampfgebiet|site de combat)', //* label: 'Combat' }, 2: { - name: '(relic site|reliktgebiet)', //* + name: '(relic site|reliktgebiet|site de reliques)', //* label: 'Relic' }, 3: { - name: '(data site|datengebiet)', + name: '(data site|datengebiet|site de donnes)', label: 'Data' }, 4: { - name: '(gas site|gasgebiet)', + name: '(gas site|gasgebiet|site de collecte de gaz)', label: 'Gas' }, 5: { - name: '(wormhole|wurmloch)', + name: '(wormhole|wurmloch|trou de ver)', label: 'Wormhole' }, 6: { - name: '(ore site|mineraliengebiet)', + name: '(ore site|mineraliengebiet|site de minerai)', label: 'Ore' }, 7: { diff --git a/js/app/ui/system_signature.js b/js/app/ui/system_signature.js index 990de655..00561f20 100644 --- a/js/app/ui/system_signature.js +++ b/js/app/ui/system_signature.js @@ -100,6 +100,8 @@ define([ 'Cosmic Signature', 'Kosmische Anomalie', 'Kosmische Signatur', + 'Anomalie cosmique', + 'Signature cosmique', 'Космическая аномалия', // == "Cosmic Anomaly" 'Источники сигналов' // == "Cosmic Signature" ]; From 9c79f7e052c790dd1a8640376e52b5618ec64e72 Mon Sep 17 00:00:00 2001 From: Kill4Free Date: Tue, 2 May 2017 22:11:43 +0200 Subject: [PATCH 4/4] Fixed typing error. --- js/app/init.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/app/init.js b/js/app/init.js index e1c2f1f1..a58a1fe3 100644 --- a/js/app/init.js +++ b/js/app/init.js @@ -341,7 +341,7 @@ define(['jquery'], function($) { label: 'Relic' }, 3: { - name: '(data site|datengebiet|site de donnes)', + name: '(data site|datengebiet|site de données)', label: 'Data' }, 4: {