diff --git a/www/i18n/locale-en-GB.json b/www/i18n/locale-en-GB.json index d63ff55904228ef387a18eb26e09950ebb2a865c..2b8e0cd3cbf6b143d33baf17ee92699df2ac55de 100644 --- a/www/i18n/locale-en-GB.json +++ b/www/i18n/locale-en-GB.json @@ -235,6 +235,7 @@ "SIG_WINDOW": "Maximum delay before a certification will be treated", "SIG_VALIDITY": "Lifetime of a certification that has been treated", "MS_WINDOW": "Maximum delay before a pending membership will be treated", + "MS_VALIDITY": "Lifetime of a membership that has been treated", "STEP_MAX": "Maximum distance between a newcomer and each referring members.", "WOT_RULES_DIVIDER": "Rules for web of trust", "SENTRIES": "Required number of certifications (given <b>and</b> received) to become a referring member", diff --git a/www/i18n/locale-en.json b/www/i18n/locale-en.json index 3068738159514369f8ee8d33cb33b6489eee5515..45a3e7022ec3626d4173b34bffd781c763a8481b 100644 --- a/www/i18n/locale-en.json +++ b/www/i18n/locale-en.json @@ -235,6 +235,7 @@ "SIG_WINDOW": "Maximum delay before a certification will be treated", "SIG_VALIDITY": "Lifetime of a certification that has been treated", "MS_WINDOW": "Maximum delay before a pending membership will be treated", + "MS_VALIDITY": "Lifetime of a membership that has been treated", "STEP_MAX": "Maximum distance between a newcomer and each referring members.", "WOT_RULES_DIVIDER": "Rules for web of trust", "SENTRIES": "Required number of certifications (given <b>and</b> received) to become a referring member", diff --git a/www/i18n/locale-es-ES.json b/www/i18n/locale-es-ES.json index 22d059c95b7d03048a875102d496515d042e28db..8676632e9286d28c8712df812da454d3e04801fb 100644 --- a/www/i18n/locale-es-ES.json +++ b/www/i18n/locale-es-ES.json @@ -234,7 +234,8 @@ "SIG_PERIOD": "Plazo mÃnimo de espera entre 2 certificaciónes sucesivas emitidas por la misma persona", "SIG_WINDOW": "Plazo lÃmite para toma en cuenta de una certificación", "SIG_VALIDITY": "Duración de una certificación que se ha tenido en cuenta.", - "MS_WINDOW": "Plazo lÃmite para toma en cuenta de una adhesión", + "MS_WINDOW": "Duración lÃmite para toma en cuenta de una adhesión", + "MS_VALIDITY": "Duración de una adhesión que se ha tenido en cuenta", "STEP_MAX": "Distancia máxima entre un nuevo entrante y los miembros referentes", "WOT_RULES_DIVIDER": "Regla de la red de confianza", "SENTRIES": "Número de certificaciónes necesarias para hacerse miembro referente", diff --git a/www/i18n/locale-fr-FR.json b/www/i18n/locale-fr-FR.json index ea269298348d6f2786d712a7c4c08c987eeeecc6..831079a8a0dc6357129ae785b2e235908c8d25bd 100644 --- a/www/i18n/locale-fr-FR.json +++ b/www/i18n/locale-fr-FR.json @@ -235,6 +235,7 @@ "SIG_WINDOW": "Délai limite de prise en compte d'une certification", "SIG_VALIDITY": "Durée de vie d'une certification qui a été prise en compte", "MS_WINDOW": "Délai limite de prise en compte d'une demande d'adhésion comme membre", + "MS_VALIDITY": "Durée de vie d'une adhésion qui a été prise en compte", "STEP_MAX": "Distance maximale, par les certifications, entre un nouvel entrant et les membres référents", "WOT_RULES_DIVIDER": "Règles de la toile de confiance", "SENTRIES": "Nombre de certifications (émises <b>et</b> reçues) pour devenir membre référent", diff --git a/www/js/config.js b/www/js/config.js index 7c767dd9f9834673962f38b51af09358a97b798a..e43850e4ed371aced5ee4479fe74f6f4acfb8020 100644 --- a/www/js/config.js +++ b/www/js/config.js @@ -80,8 +80,8 @@ angular.module("cesium.config", []) } }, "version": "1.0.2", - "build": "2017-12-01T16:50:26.623Z", - "newIssueUrl": "https://github.com/duniter/cesium/issues/new?labels=bug" + "build": "2018-01-08T14:51:00.382Z", + "newIssueUrl": "https://git.duniter.org/clients/cesium/cesium/issues/new" }) ; \ No newline at end of file diff --git a/www/js/controllers/currency-controllers.js b/www/js/controllers/currency-controllers.js index 8f5cb6482ff9b7a1aadec50f46e6d9776f4d9d74..af06607b2b4852e2ecfd215e188fe6cd6bcc9ba2 100644 --- a/www/js/controllers/currency-controllers.js +++ b/www/js/controllers/currency-controllers.js @@ -90,6 +90,7 @@ function CurrencyViewController($scope, $q, $timeout, $ionicPopover, Modals, BMA sigQty: 0, sigStock: 0, msWindow: 0, + msValidity: 0, sigWindow: 0, sigValidity: 0, sigPeriod: 0, @@ -154,6 +155,7 @@ function CurrencyViewController($scope, $q, $timeout, $ionicPopover, Modals, BMA data.sigQty = json.sigQty; data.sigStock = json.sigStock; data.msWindow = json.msWindow; + data.msValidity = json.msValidity; data.sigWindow = json.sigWindow; data.sigValidity = json.sigValidity; data.sigPeriod = json.sigPeriod; diff --git a/www/templates/currency/items_wot.html b/www/templates/currency/items_wot.html index ee2ad20bfbcd546aacddbe4094700425c2ee241e..e45ed104bc84fbd88d990dd4c3f83c043cc72a70 100644 --- a/www/templates/currency/items_wot.html +++ b/www/templates/currency/items_wot.html @@ -43,6 +43,13 @@ <span class="badge badge-assertive" ng-if="!loading">{{formData.msWindow | formatDuration}}</span> </ion-item> + <ion-item class="item-icon-left item-text-wrap"> + <i class="icon ion-person"></i> + <b class="ion-calendar icon-secondary" style="font-size: 18px; left: 33px; top: -12px;"></b> + <span class="col col-60" translate>CURRENCY.VIEW.MS_VALIDITY</span> + <span class="badge badge-balanced" ng-if="!loading">{{formData.msValidity | formatDuration}}</span> + </ion-item> + <ion-item class="item-icon-left item-text-wrap" ng-if="formData.allWotRules"> <i class="icon ion-ribbon-b"></i> <b class="ion-clock icon-secondary" style="font-size: 18px; left: 33px; top: -12px;"></b>