diff --git a/www/i18n/locale-en-GB.json b/www/i18n/locale-en-GB.json
index 8704a380c1b7e888b2c8fa090272d415d5d1c936..36d2a4cbd63d907ddefec458ac1a0c0fe8b0619c 100644
--- a/www/i18n/locale-en-GB.json
+++ b/www/i18n/locale-en-GB.json
@@ -719,7 +719,8 @@
"INVALID_COMMENT": "Field 'reference' has a bad format.",
"INVALID_PUBKEY": "Public key has a bad format.",
"INVALID_PUBKEY_CHECKSUM": "Invalid checksum.",
- "IDENTITY_REVOKED": "This identity <b>has been revoked {{revocationTime|medianFromNow}}</b> ({{revocationTime|medianDate}}). It can no longer become a member.",
+ "IDENTITY_REVOKED": "This identity <b>has been revoked</b>. It can no longer become a member.",
+ "IDENTITY_REVOKED_WITH_TIME": "This identity <b>has been revoked {{revocationTime|medianFromNow}}</b> ({{revocationTime|medianDate}}). It can no longer become a member.",
"IDENTITY_PENDING_REVOCATION": "The <b>revocation of this identity</b> has been requested and is awaiting processing. Certification is therefore disabled.",
"IDENTITY_INVALID_BLOCK_HASH": "This membership application is no longer valid (because it references a block that network peers are cancelled): the person must renew its application for membership <b>before</b> being certified.",
"IDENTITY_EXPIRED": "This identity has expired: this person must re-apply <b>before</b> being certified.",
diff --git a/www/i18n/locale-en.json b/www/i18n/locale-en.json
index 13310cd1c256c0b9272dca52f7d0e43ae67f8dc0..6456027684297d2325d1252f5c3afa21c95d8994 100644
--- a/www/i18n/locale-en.json
+++ b/www/i18n/locale-en.json
@@ -719,7 +719,8 @@
"INVALID_COMMENT": "Field 'reference' has a bad format.",
"INVALID_PUBKEY": "Public key has a bad format.",
"INVALID_PUBKEY_CHECKSUM": "Invalid checksum.",
- "IDENTITY_REVOKED": "This identity <b>has been revoked {{revocationTime|medianFromNow}}</b> ({{revocationTime|medianDate}}). It can no longer become a member.",
+ "IDENTITY_REVOKED": "This identity <b>has been revoked</b>. It can no longer become a member.",
+ "IDENTITY_REVOKED_WITH_TIME": "This identity <b>has been revoked {{revocationTime|medianFromNow}}</b> ({{revocationTime|medianDate}}). It can no longer become a member.",
"IDENTITY_PENDING_REVOCATION": "The <b>revocation of this identity</b> has been requested and is awaiting processing. Certification is therefore disabled.",
"IDENTITY_INVALID_BLOCK_HASH": "This membership application is no longer valid (because it references a block that network peers are cancelled): the person must renew its application for membership <b>before</b> being certified.",
"IDENTITY_EXPIRED": "This identity has expired: this person must re-apply <b>before</b> being certified.",
diff --git a/www/i18n/locale-es-ES.json b/www/i18n/locale-es-ES.json
index 863ef935ab7acd89ad9ab4472d545f64e3cf6571..0198bb79009792a45f913c5f88855dfdb556d35c 100644
--- a/www/i18n/locale-es-ES.json
+++ b/www/i18n/locale-es-ES.json
@@ -668,7 +668,8 @@
"INVALID_COMMENT": "El campo 'referencia’ no debe contener carácteres acentuados.",
"INVALID_PUBKEY": "La clave pública no tiene el formato esperado.",
"INVALID_PUBKEY_CHECKSUM": "Suma de comprobación inválida.",
- "IDENTITY_REVOKED": "Esta identidad <b>fue revocada {{revocationTime|medianFromNow}}</b> ({{revocationTime|medianDate}}). No puede estar miembro.",
+ "IDENTITY_REVOKED": "Esta identidad <b>fue revocada</b>. No puede estar miembro.",
+ "IDENTITY_REVOKED_WITH_TIME": "Esta identidad <b>fue revocada {{revocationTime|medianFromNow}}</b> ({{revocationTime|medianDate}}). No puede estar miembro.",
"IDENTITY_PENDING_REVOCATION": "La <b>revocación de esta identidad</b> fue solicitado y esta en espera de tratamiento. Por lo que, la certificación es desactivada.",
"IDENTITY_INVALID_BLOCK_HASH": "Esta solicitud de adhesión no es valida (porque denomina un bloque los nodos de la red han anulado): esta persona debe renovelar su solicitud de adhesión <b>antes que</b> estar certificada.",
"IDENTITY_EXPIRED": "La publicación de esta identidad ha caducada: esta persona debe realizar una nueva solicitud de adhesión <b>antes que</b> estar certificada.",
diff --git a/www/i18n/locale-fr-FR.json b/www/i18n/locale-fr-FR.json
index a526546bf25f017b64b5bebde6ccf240638c6bf5..f62b79847dc14a39745291ea0481935866ad315f 100644
--- a/www/i18n/locale-fr-FR.json
+++ b/www/i18n/locale-fr-FR.json
@@ -719,7 +719,8 @@
"INVALID_COMMENT": "Le champ 'référence' ne doit pas contenir de caractères accentués.",
"INVALID_PUBKEY": "La clé publique n'a pas le format attendu.",
"INVALID_PUBKEY_CHECKSUM": "Somme de contrôle invalide.",
- "IDENTITY_REVOKED": "Cette identité <b>a été révoquée {{revocationTime|medianFromNow}}</b> ({{revocationTime|medianDate}}). Elle ne peut plus devenir membre.",
+ "IDENTITY_REVOKED": "Cette identité <b>a été révoquée</b>. Elle ne peut plus devenir membre.",
+ "IDENTITY_REVOKED_WITH_TIME": "Cette identité <b>a été révoquée {{revocationTime|medianFromNow}}</b> ({{revocationTime|medianDate}}). Elle ne peut plus devenir membre.",
"IDENTITY_PENDING_REVOCATION": "La <b>révocation de cette identité</b> a été demandée et est en attente de traitement. La certification est donc désactivée.",
"IDENTITY_INVALID_BLOCK_HASH": "Cette demande d'adhésion n'est plus valide (car elle référence un bloc que les nœuds du réseau ont annulé) : cette personne doit renouveler sa demande d'adhésion <b>avant</b> d'être certifiée.",
"IDENTITY_EXPIRED": "La publication de cette identité a expirée : cette personne doit effectuer une nouvelle demande d'adhésion <b>avant</b> d'être certifiée.",
diff --git a/www/i18n/locale-it-IT.json b/www/i18n/locale-it-IT.json
index c8e5f1466442de8806b8f69f59a14e17ef6e0116..dac136ffba3400506e1582480f02ae9529eb33c7 100644
--- a/www/i18n/locale-it-IT.json
+++ b/www/i18n/locale-it-IT.json
@@ -659,7 +659,8 @@
"INVALID_USER_ID": "Il campo del 'pseudonimo' non deve avere spazi vuoti o caratteri speciali.",
"INVALID_COMMENT": "Il formato del campo 'reference' è errato.",
"INVALID_PUBKEY": "If formato della chiave pubblica è errato.",
- "IDENTITY_REVOKED": "Questa identità <b>è stata revocata {{revocationTime|medianFromNow}}</b> ({{revocationTime|medianDate}}). Non puo più diventare membro.",
+ "IDENTITY_REVOKED": "Questa identità <b>è stata revocata</b>. Non puo più diventare membro.",
+ "IDENTITY_REVOKED_WITH_TIME": "Questa identità <b>è stata revocata {{revocationTime|medianFromNow}}</b> ({{revocationTime|medianDate}}). Non puo più diventare membro.",
"IDENTITY_PENDING_REVOCATION": "L'<b>annulamento di questa identità </b> è stata richiesta ed è in corso di evaluazione. Capacità ad inviare certificazioni disabilitata",
"IDENTITY_INVALID_BLOCK_HASH": "Questa richiesta di certificazione non è più valida (perche si riferisce ad un blocco che è stato eliminato dai peers): la persona deve rinnovare la sua domanda di certificazione <b>prima</b> di essere certificata.",
"IDENTITY_EXPIRED": "Questa identità è scaduta: la persona deve fare una nuova domanda di certificazione <b>prima di</b> essere certificata.",
diff --git a/www/js/services/wot-services.js b/www/js/services/wot-services.js
index 1a286334cbd577b42371d40f2878f7b59b4567f2..38a9ed3f2931cb92b9bf4956152cb1f7d2763eac 100644
--- a/www/js/services/wot-services.js
+++ b/www/js/services/wot-services.js
@@ -134,9 +134,6 @@ angular.module('cesium.wot.services', ['ngApi', 'cesium.bma.services', 'cesium.c
identity.meta.sig = identity.meta.sig || identity.sig;
delete identity.sig;
blocks.push(identity.meta.number);
- if (identity.revocationNumber) {
- blocks.push(identity.revocationNumber);
- }
});
// Get identities blocks, to fill self and revocation time
@@ -150,12 +147,6 @@ angular.module('cesium.wot.services', ['ngApi', 'cesium.bma.services', 'cesium.c
if (block && identity.meta.number !== 0 && identity.meta.hash !== block.hash) {
identity.meta.invalid = true;
}
-
- // Set revocation time
- if (identity.revocationNumber) {
- block = _.findWhere(blocks, {number: identity.revocationNumber});
- identity.revocationTime = block && block.medianTime;
- }
});
return identities;
@@ -171,12 +162,6 @@ angular.module('cesium.wot.services', ['ngApi', 'cesium.bma.services', 'cesium.c
return identities;
}
else {
- // FIXME workaround for issue #1304 ?
- /*
- if (identity.revocationNumber) {
- identity.revocationTime = identity.revocationNumber;
- return identity;
- }*/
throw err;
}
});
@@ -278,15 +263,10 @@ angular.module('cesium.wot.services', ['ngApi', 'cesium.bma.services', 'cesium.c
};
return BMA.wot.lookup({ search: pubkey||uid })
.then(function(res){
- var blocksToRetrieve = [];
var identities = res.results.reduce(function(idties, res) {
return idties.concat(res.uids.reduce(function(uids, idty) {
var blockUid = idty.meta.timestamp.split('-', 2);
var blockNumber = parseInt(blockUid[0]);
- blocksToRetrieve.push(blockNumber);
- if (idty.revoked_on) {
- blocksToRetrieve.push(idty.revoked_on);
- }
return uids.concat({
uid: idty.uid,
pubkey: res.pubkey,
@@ -297,7 +277,7 @@ angular.module('cesium.wot.services', ['ngApi', 'cesium.bma.services', 'cesium.c
sig: idty.self
},
revoked: idty.revoked,
- revocationNumber: idty.revoked_on
+ revoked_on: idty.revoked_on
});
}, []));
}, []);
@@ -613,8 +593,14 @@ angular.module('cesium.wot.services', ['ngApi', 'cesium.bma.services', 'cesium.c
if (data.requirements.revoked) {
delete data.requirements.meta.invalid;
- addEvent(data, {type: 'error', message: 'ERROR.IDENTITY_REVOKED', messageParams: {revocationTime: data.revocationTime}});
- console.debug("[wot] Identity [{0}] has been revoked".format(data.uid));
+ if (data.requirements.revoked_on) {
+ addEvent(data, {type: 'error', message: 'ERROR.IDENTITY_REVOKED_WITH_TIME', messageParams: {revocationTime: data.requirements.revoked_on}});
+ console.debug("[wot] Identity [{0}] has been revoked on {1}".format(data.uid, data.requirements.revoked_on));
+ }
+ else {
+ addEvent(data, {type: 'error', message: 'ERROR.IDENTITY_REVOKED'});
+ console.debug("[wot] Identity [{0}] has been revoked".format(data.uid));
+ }
}
else if (data.requirements.pendingRevocation) {
delete data.requirements.meta.invalid;