Merge branch 'master' into simon/bisq-dashboard

# Conflicts:
#	frontend/src/locale/messages.xlf
This commit is contained in:
softsimon
2021-04-26 01:41:07 +04:00
35 changed files with 10601 additions and 9006 deletions

View File

@@ -71,7 +71,7 @@ export const languages: Language[] = [
{ code: 'ja', name: '日本語' }, // Japanese
{ code: 'nb', name: 'Norsk' }, // Norwegian Bokmål
// { code: 'nn', name: 'Norsk Nynorsk' }, // Norwegian Nynorsk
// { code: 'pl', name: 'Polski' }, // Polish
{ code: 'pl', name: 'Polski' }, // Polish
{ code: 'pt', name: 'Português' }, // Portuguese
// { code: 'pt-BR', name: 'Português (Brazil)' }, // Portuguese (Brazil)
// { code: 'ro', name: 'Română' }, // Romanian

View File

@@ -27,19 +27,19 @@ export class BisqTransactionsComponent implements OnInit {
types: string[] = [];
txTypeOptions: IMultiSelectOption[] = [
{ id: 1, name: 'Asset listing fee' },
{ id: 2, name: 'Blind vote' },
{ id: 3, name: 'Compensation request' },
{ id: 4, name: 'Genesis' },
{ id: 13, name: 'Irregular' },
{ id: 5, name: 'Lockup' },
{ id: 6, name: 'Pay trade fee' },
{ id: 7, name: 'Proof of burn' },
{ id: 8, name: 'Proposal' },
{ id: 9, name: 'Reimbursement request' },
{ id: 10, name: 'Transfer BSQ' },
{ id: 11, name: 'Unlock' },
{ id: 12, name: 'Vote reveal' },
{ id: 1, name: $localize`Asset listing fee` },
{ id: 2, name: $localize`Blind vote` },
{ id: 3, name: $localize`Compensation request` },
{ id: 4, name: $localize`Genesis` },
{ id: 13, name: $localize`Irregular` },
{ id: 5, name: $localize`Lockup` },
{ id: 6, name: $localize`Pay trade fee` },
{ id: 7, name: $localize`Proof of burn` },
{ id: 8, name: $localize`Proposal` },
{ id: 9, name: $localize`Reimbursement request` },
{ id: 10, name: $localize`Transfer BSQ` },
{ id: 11, name: $localize`Unlock` },
{ id: 12, name: $localize`Vote reveal` },
];
txTypesDefaultChecked = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13];

View File

@@ -44,7 +44,7 @@
<br><br>
<br><br>
<h3 i18n="about.sponsors.enterprise">Enterprise Sponsors 🚀</h3>
<h3 i18n="about.sponsors.enterprise.withRocket">Enterprise Sponsors 🚀</h3>
<a href="https://squarecrypto.org/" target="_blank">
<div class="profile_photo enterprise_sponsor d-inline-block" title="Square Crypto">

View File

@@ -1,5 +1,5 @@
<div class="container-xl">
<h1 style="float: left;">Asset</h1>
<h1 style="float: left;" i18n="asset|Liquid Asset page title">Asset</h1>
<a [routerLink]="['/asset/' | relativeUrl, assetString]" style="line-height: 56px; margin-left: 10px;">
<span class="d-inline d-lg-none">{{ assetString | shortenString : 24 }}</span>
<span class="d-none d-lg-inline">{{ assetString }}</span>
@@ -72,7 +72,7 @@
<br>
<h2><ng-template [ngIf]="transactions?.length">{{ (transactions?.length | number) || '?' }} of </ng-template>{{ txCount | number }} <ng-template [ngIf]="isNativeAsset" [ngIfElse]="defaultAsset" i18n="Liquid native asset transactions title">Peg In/Out and Burn Transactions</ng-template><ng-template #defaultAsset i18n="Default asset transactions title">Issuance and Burn Transactions</ng-template></h2>
<h2><ng-template [ngIf]="transactions?.length" i18n="asset.M_of_N">{{ (transactions?.length | number) || '?' }} of </ng-template>{{ txCount | number }} <ng-template [ngIf]="isNativeAsset" [ngIfElse]="defaultAsset" i18n="Liquid native asset transactions title">Peg In/Out and Burn Transactions</ng-template><ng-template #defaultAsset i18n="Default asset transactions title">Issuance and Burn Transactions</ng-template></h2>
<app-transactions-list [transactions]="transactions" [showConfirmations]="true" (loadMore)="loadMore()"></app-transactions-list>

View File

@@ -8,7 +8,7 @@ export class ScriptpubkeyTypePipe implements PipeTransform {
transform(value: string): string {
switch (value) {
case 'fee':
return 'Transaction fee';
return $localize`Transaction fee`;
case 'p2pk':
return 'P2PK';
case 'op_return':