Merge branch 'dev' of https://gitlab.com/epic-tech/explorer2.epic.tech-angular8 into dev

server/i18n/de.json

@@ -84,5 +84,33 @@
         "ADDR" : "Adr",
         "DIRECTION" : "Richtung",
         "SPENT" : "Verbraucht"
+    },
+    "api-view": {
+        "query-api" : "Abfrage-API",
+        "query-api-line1" : "Die aufzurufende API-Funktion wird über den Parameter q angegeben.",
+        "query-api-line2" : "Zum Beispiel können Sie die Gesamtmünzen des epischen Bargeldes mit fragen ",
+        "circulating" : "Gibt die Anzahl der umlaufenden Münzen zurück",
+        "getblockcount":"Gibt die aktuelle Blockhöhe als reine Textzeichenfolge zurück",
+        "getdifficulty-randomx" : "Gibt die RandomX-Schwierigkeit als reine Textzeichenfolge zurück",
+        "getdifficulty-progpow" : "Gibt die Schwierigkeit ProgPow als reine Textzeichenfolge zurück",
+        "getdifficulty-cuckoo" : "returns the Cuckoo difficulty as a plain text string",
+        "totalcoins" : "Gibt die Cuckoo-Schwierigkeit als reine Textzeichenfolge zurück",
+        "Block-Queries": "Abfragen blockieren",
+        "real-time-simple-query" : "Einfache Echtzeitabfragen",
+        "block-query-text" : "Block-APIs berücksichtigen nur Blöcke in der 'Haupt'-Kette (wie in der Explorer-Brieftasche festgelegt).",
+        "getblockhash" : "Nimmt einen Höhenparameter und gibt den entsprechenden Block-Hash zurück",
+        "getblockheight" : "Nimmt einen Hash-Parameter und gibt die entsprechende Blockhöhe zurück.",
+        "getblocktime" : "Nimmt einen Höhenparameter und gibt die unixtime des Blocks zurück.",
+        "takes":"nimmt ein"
+    },
+    "commit-id-view": {
+        "output-commit":"Output Commit",
+        "created-at-block":"Erstellt am Block",
+        "created-at":"Hergestellt in",
+        "output-type" : "Ausgabetyp",
+        "proof" : "Beweis",
+        "proof-hash" : "Beweis-Hash",
+        "merkle-proof" : "Merkle Beweis",
+        "mmr-index" : "MMR Index"
     }
 }

server/i18n/en.json

@@ -84,5 +84,33 @@
         "ADDR" : "Addr",
         "DIRECTION" : "Direction",
         "SPENT" : "Spent"
+    },
+    "api-view": {
+        "query-api" : "Query API",
+        "query-api-line1" : "The API function to call is specified through the q parameter.",
+        "query-api-line2" : "For instance you can ask the totalcoins of epic cash with ",
+        "circulating" : "returns the number of circulating coins",
+        "getblockcount":"returns the current block height as a plain text string",
+        "getdifficulty-randomx" : "returns the RandomX difficulty as a plain text string",
+        "getdifficulty-progpow" : "returns the ProgPow difficulty as a plain text string",
+        "getdifficulty-cuckoo" : "returns the Cuckoo difficulty as a plain text string",
+        "totalcoins" : "returns the outstanding number of coins",
+        "Block-Queries": "Block Queries",
+        "real-time-simple-query" : "Real-Time Simple Queries",
+        "block-query-text" : "Block APIs only consider blocks in the 'main' chain (as determined by the explorer wallet).",
+        "getblockhash" : " parameter and returns corresponding block hash.",
+        "getblockheight" : " parameter and returns corresponding block height.",
+        "getblocktime" : " parameter and returns unixtime of the block.",
+        "takes" : "takes a"
+    },
+    "commit-id-view": {
+        "output-commit":"Output Commit",
+        "created-at-block":"Created at block",
+        "created-at":"Created At",
+        "output-type" : "Output Type",
+        "proof" : "Proof",
+        "proof-hash" : "Proof hash",
+        "merkle-proof" : "Merkle Proof",
+        "mmr-index" : "MMR Index"
     }
 }

src/app/view/api-view/api-view.component.html

@@ -1,29 +1,29 @@
 <div class="view_content py-4">
       <div  class="container">
-<h3>Query API</h3>
+<h3>{{'api-view.query-api' | translate}}</h3>
 
 <p>
-    The API function to call is specified through the <code>q</code> parameter.<br>
+   {{'api-view.query-api-line1' | translate}} <code>q</code> parameter.<br>
-    For instance you can ask the totalcoins of epic cash with "<i>https://explorer.epic.tech/api?q=totalcoins</i>".
+   {{'api-view.query-api-line2' | translate}} "<i>https://explorer.epic.tech/api?q=totalcoins</i>".
  </p>
- <h4>Real-Time Simple Queries</h4>
+ <h4>{{'api-view.real-time-simple-query' | translate}}</h4>
 <ul>
-    <li><b>circulating</b>: returns the number of circulating coins </li>
+    <li><b>circulating</b>: {{'api-view.circulating' | translate}} </li>
-    <li><b>getblockcount</b>: returns the current block height as a plain text string</li>
+    <li><b>getblockcount</b>: {{'api-view.getblockcount' | translate}}</li>
-    <li><b>getdifficulty-randomx</b>: returns the RandomX difficulty as a plain text string</li>
+    <li><b>getdifficulty-randomx</b>: {{'api-view.getdifficulty-randomx' | translate}}</li>
-    <li><b>getdifficulty-progpow</b>: returns the ProgPow difficulty as a plain text string</li>
+    <li><b>getdifficulty-progpow</b>: {{'api-view.getdifficulty-progpow' | translate}}</li>
-    <li><b>getdifficulty-cuckoo</b>: returns the Cuckoo difficulty as a plain text string</li>
+    <li><b>getdifficulty-cuckoo</b>: {{'api-view.getdifficulty-cuckoo' | translate}}</li>
-    <li><b>totalcoins</b>: returns the outstanding number of coins</li>
+    <li><b>totalcoins</b>: {{'api-view.totalcoins' | translate}}</li>
  </ul>
 
- <h4>Block Queries</h4>
+ <h4>{{'api-view.Block-Queries' | translate}}</h4>
  <p>
-    Block APIs only consider blocks in the "main" chain (as determined by the explorer wallet).
+   {{'api-view.block-query-text' | translate}}
  </p>
  <ul>
-    <li><b>getblockhash</b>: takes a <code>height</code> parameter and returns corresponding block hash.</li>
+    <li><b>getblockhash</b>: takes a <code>height</code> {{'api-view.getblockhash' | translate}}</li>
-    <li><b>getblockheight</b>: takes a <code>hash</code> parameter and returns corresponding block height.</li>
+    <li><b>getblockheight</b>: takes a <code>hash</code> {{'api-view.getblockheight' | translate}}</li>
-    <li><b>getblocktime</b>: takes a <code>height</code> parameter and returns unixtime of the block.</li>
+    <li><b>getblocktime</b>: takes a <code>height</code> {{'api-view.getblocktime' | translate}}</li>
  </ul>
  </div>
  </div>

src/app/view/block-view/block-detail/block-detail.component.html

@@ -291,50 +291,50 @@
   <div *ngIf="hashdata.viewType == 'Commit'" >
      
           <div class="container">
-                  <h3>&nbsp; Output Commit <span style="font-size:15px"></span></h3>
+                  <h3>&nbsp; {{'commit-id-view.output-commit' | translate}} <span style="font-size:15px"></span></h3>
       
                   <table class="table table-horizontal-bordered table-hover hashdata_table">
                           <tbody>
                             <tr>
-                              <td class="d-none d-md-table-cell">Created at block </td>
+                              <td class="d-none d-md-table-cell">{{'commit-id-view.created-at-block' | translate}} </td>
                               <td>
-                                  <p class="d-md-none">Created at block</p>
+                                  <p class="d-md-none">{{'commit-id-view.created-at-block' | translate}}</p>
                                 {{ hashdata.BlockchainBlockFetchQuery.Height }}</td>
                             </tr>
                            <tr>
-                            <td class="d-none d-md-table-cell">Created At </td>
+                            <td class="d-none d-md-table-cell">{{'commit-id-view.created-at' | translate}} </td>
                             <td>
-                                <p class="d-md-none">Created At</p>
+                                <p class="d-md-none">{{'commit-id-view.created-at' | translate}}</p>
                               {{ hashdata.BlockchainBlockFetchQuery.Timestamp }}</td>
                           </tr>
                           <tr>
-                            <td class="d-none d-md-table-cell">Output Type</td>
+                            <td class="d-none d-md-table-cell">{{'commit-id-view.output-type' | translate}}</td>
                             <td>
-                                <p class="d-md-none">Output Type</p>
+                                <p class="d-md-none">{{'commit-id-view.output-type' | translate}}</p>
                               {{ hashdata.BlockchainBlockOutputFetchQuery[0].OutputType }}</td>
                           </tr>
                           <tr>
-                            <td class="d-none d-md-table-cell">Proof</td>
+                            <td class="d-none d-md-table-cell">{{'commit-id-view.proof' | translate}}</td>
                             <td>
-                                <p class="d-md-none">Proof</p>
+                                <p class="d-md-none">{{'commit-id-view.proof' | translate}}</p>
                               {{ hashdata.BlockchainBlockOutputFetchQuery[0].Proof }}</td>
                           </tr>
                           <tr>
-                            <td class="d-none d-md-table-cell">Proof hash</td>
+                            <td class="d-none d-md-table-cell">{{'commit-id-view.proof-hash' | translate}}</td>
                             <td>
-                                <p class="d-md-none">Proof hash</p>
+                                <p class="d-md-none">{{'commit-id-view.proof-hash' | translate}}</p>
                               {{ hashdata.BlockchainBlockOutputFetchQuery[0].ProofHash }}</td>
                           </tr>
                           <tr>
-                            <td class="d-none d-md-table-cell">Merkle Proof</td>
+                            <td class="d-none d-md-table-cell">{{'commit-id-view.merkle-proof' | translate}}</td>
                             <td class="text_break">
-                                <p class="d-md-none">Merkle Proof</p>
+                                <p class="d-md-none">{{'commit-id-view.merkle-proof' | translate}}</p>
                               {{ hashdata.BlockchainBlockOutputFetchQuery[0].MerkleProof }}</td>
                           </tr>
                           <tr>
-                            <td class="d-none d-md-table-cell">MMR Index</td>
+                            <td class="d-none d-md-table-cell">{{'commit-id-view.mmr-index' | translate}}</td>
                             <td>
-                              <p class="d-md-none">MMR Index</p>
+                              <p class="d-md-none">{{'commit-id-view.mmr-index' | translate}}</p>
                               {{ hashdata.BlockchainBlockOutputFetchQuery[0].MmrIndex }}</td>
                           </tr>
                       </tbody>