Skip to content
Snippets Groups Projects
Commit 90763e7a authored by Benoit Lavenier's avatar Benoit Lavenier
Browse files

Merge branch 'master' of https://github.com/duniter/cesium

parents 8a0ad649 df6a85f8
No related branches found
No related tags found
No related merge requests found
......@@ -19,6 +19,7 @@
"BLOCKS_ISSUERS_LABEL": "Number of blocks",
"TX_DIVIDER": "Analysis of transactions",
"TX_AMOUNT_TITLE": "Transaction volume",
"TX_AMOUNT_PUBKEY_TITLE": "Volume of transactions calculated by {{issuer | formatPubkey}}",
"TX_AMOUNT_LABEL": "Exchange volume",
"TX_COUNT_TITLE": "Number of written transactions",
"TX_COUNT_LABEL": "Number of transactions",
......
......@@ -19,6 +19,7 @@
"BLOCKS_ISSUERS_LABEL": "Number of blocks",
"TX_DIVIDER": "Analysis of transactions",
"TX_AMOUNT_TITLE": "Transaction volume",
"TX_AMOUNT_PUBKEY_TITLE": "Volume of transactions calculated by {{issuer | formatPubkey}}",
"TX_AMOUNT_LABEL": "Exchange volume",
"TX_COUNT_TITLE": "Number of written transactions",
"TX_COUNT_LABEL": "Number of transactions",
......
......@@ -19,6 +19,7 @@
"BLOCKS_ISSUERS_LABEL": "Número de bloques",
"TX_DIVIDER": "Análisis de transacciones",
"TX_AMOUNT_TITLE": "El volumen de operaciones",
"TX_AMOUNT_PUBKEY_TITLE": "El volumen de operaciones calculado por {{issuer | formatPubkey}}",
"TX_AMOUNT_LABEL": "Volumen negociado",
"TX_COUNT_TITLE": "Número de transacciones escritas",
"TX_COUNT_LABEL": "Número de transacciones",
......
......@@ -19,6 +19,7 @@
"BLOCKS_ISSUERS_LABEL": "Nombre de blocs",
"TX_DIVIDER": "Analyse des transactions",
"TX_AMOUNT_TITLE": "Volume des transactions",
"TX_AMOUNT_PUBKEY_TITLE": "Volume des transactions calculées par {{issuer | formatPubkey}}",
"TX_AMOUNT_LABEL": "Volume échangé",
"TX_COUNT_TITLE": "Nombre de transactions écrites",
"TX_COUNT_LABEL": "Nombre de transactions",
......
......@@ -19,6 +19,7 @@
"BLOCKS_ISSUERS_LABEL": "Aantal blokken",
"TX_DIVIDER": "Analyse van transacties",
"TX_AMOUNT_TITLE": "Trading volume",
"TX_AMOUNT_PUBKEY_TITLE": "Trading volume dat wordt berekend door {{issuer | formatPubkey}}",
"TX_AMOUNT_LABEL": "Verhandeld volume",
"TX_COUNT_TITLE": "Aantal schriftelijke transacties",
"TX_COUNT_LABEL": "Aantal transacties",
......
......@@ -83,9 +83,12 @@ function GpBlockchainTxCountController($scope, $q, $state, $filter, $translate,
return $q.all([
$translate($scope.txOptions.issuer?
'GRAPH.BLOCKCHAIN.TX_AMOUNT_PUBKEY_TITLE':
'GRAPH.BLOCKCHAIN.TX_AMOUNT_TITLE', txOptions),
// translate i18n keys
$translate(['GRAPH.BLOCKCHAIN.TX_AMOUNT_TITLE',
'GRAPH.BLOCKCHAIN.TX_AMOUNT_LABEL',
$translate(['GRAPH.BLOCKCHAIN.TX_AMOUNT_LABEL',
'GRAPH.BLOCKCHAIN.TX_COUNT_LABEL',
'GRAPH.BLOCKCHAIN.TX_AVG_BY_BLOCK',
'COMMON.DATE_PATTERN',
......@@ -106,11 +109,14 @@ function GpBlockchainTxCountController($scope, $q, $state, $filter, $translate,
gpData.blockchain.txCount($scope.currency, txOptions)
])
.then(function(result) {
var translations = result[0];
$scope.firstBlockTime = $scope.firstBlockTime || result[1].medianTime;
var title = result[0];
var translations = result[1];
$scope.firstBlockTime = $scope.firstBlockTime || result[2].medianTime;
$scope.formData.firstBlockTime = $scope.formData.firstBlockTime || truncDate($scope.firstBlockTime);
$scope.formData.currencyAge = truncDate(esHttp.date.now()) - $scope.formData.firstBlockTime;
result = result[2];
result = result[3];
if (!result || !result.times) return; // no data
$scope.times = result.times;
......@@ -170,7 +176,7 @@ function GpBlockchainTxCountController($scope, $q, $state, $filter, $translate,
maintainAspectRatio: true,
title: {
display: true,
text: translations['GRAPH.BLOCKCHAIN.TX_AMOUNT_TITLE']
text: title
},
scales: {
yAxes: [
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment