From 83770dbfd4deaef921941f5afc5f45abba5979e4 Mon Sep 17 00:00:00 2001 From: Christoph Atteneder Date: Mon, 8 Apr 2019 17:42:37 +0200 Subject: [PATCH] Add votes as shared translation --- .../resources/i18n/displayStrings.properties | 2 +- .../dao/governance/result/VoteResultView.java | 2 +- .../windows/ProposalResultsWindow.java | 21 +++++++++++++++++-- 3 files changed, 21 insertions(+), 4 deletions(-) diff --git a/core/src/main/resources/i18n/displayStrings.properties b/core/src/main/resources/i18n/displayStrings.properties index 2ce30feb8d..dfd169fabe 100644 --- a/core/src/main/resources/i18n/displayStrings.properties +++ b/core/src/main/resources/i18n/displayStrings.properties @@ -200,6 +200,7 @@ shared.sellerUpperCase=Seller shared.new=NEW shared.blindVoteTxId=Blind vote transaction ID shared.proposal=Proposal +shared.votes=Votes #################################################################### # UI views @@ -1317,7 +1318,6 @@ dao.voteReveal.txPublished=Your vote reveal transaction with transaction ID {0} dao.results.cycles.header=Cycles dao.results.cycles.table.header.cycle=Cycle dao.results.cycles.table.header.numProposals=Proposals -dao.results.cycles.table.header.numVotes=Votes dao.results.cycles.table.header.voteWeight=Vote weight dao.results.cycles.table.header.issuance=Issuance diff --git a/desktop/src/main/java/bisq/desktop/main/dao/governance/result/VoteResultView.java b/desktop/src/main/java/bisq/desktop/main/dao/governance/result/VoteResultView.java index eace19ae8e..418474f535 100644 --- a/desktop/src/main/java/bisq/desktop/main/dao/governance/result/VoteResultView.java +++ b/desktop/src/main/java/bisq/desktop/main/dao/governance/result/VoteResultView.java @@ -541,7 +541,7 @@ public class VoteResultView extends ActivatableView implements D column.setComparator(Comparator.comparing(CycleListItem::getNumProposals)); votesTableView.getColumns().add(column); - column = new AutoTooltipTableColumn<>(Res.get("dao.results.cycles.table.header.numVotes")); + column = new AutoTooltipTableColumn<>(Res.get("shared.votes")); column.setMinWidth(70); column.setMaxWidth(70); column.setCellValueFactory((item) -> new ReadOnlyObjectWrapper<>(item.getValue())); diff --git a/desktop/src/main/java/bisq/desktop/main/overlays/windows/ProposalResultsWindow.java b/desktop/src/main/java/bisq/desktop/main/overlays/windows/ProposalResultsWindow.java index e557ce8bdf..b208faac7b 100644 --- a/desktop/src/main/java/bisq/desktop/main/overlays/windows/ProposalResultsWindow.java +++ b/desktop/src/main/java/bisq/desktop/main/overlays/windows/ProposalResultsWindow.java @@ -1,3 +1,20 @@ +/* + * This file is part of Bisq. + * + * Bisq is free software: you can redistribute it and/or modify it + * under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or (at + * your option) any later version. + * + * Bisq is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public + * License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with Bisq. If not, see . + */ + package bisq.desktop.main.overlays.windows; import bisq.desktop.Navigation; @@ -96,8 +113,8 @@ public class ProposalResultsWindow extends TabbedOverlay } private void createTabs() { - proposalTab = new Tab("PROPOSAL"); - votesTab = new Tab("VOTES"); + proposalTab = new Tab(Res.get("shared.proposal").toUpperCase()); + votesTab = new Tab(Res.get("shared.votes".toUpperCase())); tabPane.getTabs().addAll(proposalTab, votesTab);