diff --git a/desktop/src/main/java/bisq/desktop/main/dao/bonding/roles/RoleDetailsWindow.java b/desktop/src/main/java/bisq/desktop/main/dao/bonding/roles/RoleDetailsWindow.java index b4c7398979..4abcabc7c2 100644 --- a/desktop/src/main/java/bisq/desktop/main/dao/bonding/roles/RoleDetailsWindow.java +++ b/desktop/src/main/java/bisq/desktop/main/dao/bonding/roles/RoleDetailsWindow.java @@ -74,19 +74,19 @@ class RoleDetailsWindow extends Overlay { } private void addContent() { - FormBuilder.addTopLabelTextField(gridPane, ++rowIndex, Res.getWithCol("dao.bond.details.role"), + FormBuilder.addTopLabelTextField(gridPane, ++rowIndex, Res.get("dao.bond.details.role"), bondedRoleType.getDisplayString()); - FormBuilder.addTopLabelTextField(gridPane, ++rowIndex, Res.getWithCol("dao.bond.details.requiredBond"), + FormBuilder.addTopLabelTextField(gridPane, ++rowIndex, Res.get("dao.bond.details.requiredBond"), bsqFormatter.formatCoinWithCode(Coin.valueOf(bondedRoleType.getRequiredBond()))); - FormBuilder.addTopLabelTextField(gridPane, ++rowIndex, Res.getWithCol("dao.bond.details.unlockTime"), + FormBuilder.addTopLabelTextField(gridPane, ++rowIndex, Res.get("dao.bond.details.unlockTime"), Res.get("dao.bond.details.blocks", bondedRoleType.getUnlockTimeInBlocks())); - FormBuilder.addLabelHyperlinkWithIcon(gridPane, ++rowIndex, Res.getWithCol("dao.bond.details.link"), + FormBuilder.addLabelHyperlinkWithIcon(gridPane, ++rowIndex, Res.get("dao.bond.details.link"), bondedRoleType.getLink(), bondedRoleType.getLink()); - FormBuilder.addTopLabelTextField(gridPane, ++rowIndex, Res.getWithCol("dao.bond.details.isSingleton"), + FormBuilder.addTopLabelTextField(gridPane, ++rowIndex, Res.get("dao.bond.details.isSingleton"), bsqFormatter.booleanToYesNo(bondedRoleType.isAllowMultipleHolders())); } } diff --git a/desktop/src/main/java/bisq/desktop/main/dao/governance/make/MakeProposalView.java b/desktop/src/main/java/bisq/desktop/main/dao/governance/make/MakeProposalView.java index 80c68c17aa..400805d00e 100644 --- a/desktop/src/main/java/bisq/desktop/main/dao/governance/make/MakeProposalView.java +++ b/desktop/src/main/java/bisq/desktop/main/dao/governance/make/MakeProposalView.java @@ -130,7 +130,7 @@ public class MakeProposalView extends ActivatableView implements addTitledGroupBg(root, ++gridRow, 1, Res.get("dao.proposal.create.selectProposalType"), Layout.GROUP_DISTANCE); proposalTypeComboBox = FormBuilder.addComboBox(root, gridRow, - Res.getWithCol("dao.proposal.create.proposalType"), Layout.FIRST_ROW_AND_GROUP_DISTANCE); + Res.get("dao.proposal.create.proposalType"), Layout.FIRST_ROW_AND_GROUP_DISTANCE); proposalTypeComboBox.setMaxWidth(300); proposalTypeComboBox.setConverter(new StringConverter<>() { @Override diff --git a/desktop/src/main/java/bisq/desktop/main/dao/governance/proposals/ProposalsView.java b/desktop/src/main/java/bisq/desktop/main/dao/governance/proposals/ProposalsView.java index f407f23ecc..37159875dc 100644 --- a/desktop/src/main/java/bisq/desktop/main/dao/governance/proposals/ProposalsView.java +++ b/desktop/src/main/java/bisq/desktop/main/dao/governance/proposals/ProposalsView.java @@ -667,7 +667,7 @@ public class ProposalsView extends ActivatableView implements Bs voteFields.add(voteTitledGroupBg); Tuple3 meritTuple = addTopLabelTextField(root, gridRow, - Res.getWithCol("dao.proposal.myVote.merit"), 40); + Res.get("dao.proposal.myVote.merit"), 40); Label meritLabel = meritTuple.first; meritTextField = meritTuple.second; meritTextField.setText(bsqFormatter.formatCoinWithCode(Coin.ZERO)); @@ -675,19 +675,19 @@ public class ProposalsView extends ActivatableView implements Bs voteFields.add(meritTextField); stakeInputTextField = addInputTextField(root, ++gridRow, - Res.getWithCol("dao.proposal.myVote.stake")); + Res.get("dao.proposal.myVote.stake")); stakeInputTextField.setValidator(new BsqValidator(bsqFormatter)); voteFields.add(stakeInputTextField); Tuple3 tuple = addTopLabelTxIdTextField(root, ++gridRow, - Res.getWithCol("dao.proposal.myVote.blindVoteTxId"), 0); + Res.get("dao.proposal.myVote.blindVoteTxId"), 0); blindVoteTxIdTextField = tuple.second; blindVoteTxIdContainer = tuple.third; blindVoteTxIdTextField.setBsq(true); voteFields.add(blindVoteTxIdContainer); tuple = addTopLabelTxIdTextField(root, ++gridRow, - Res.getWithCol("dao.proposal.myVote.revealTxId"), 0); + Res.get("dao.proposal.myVote.revealTxId"), 0); revealTxIdTextField = tuple.second; revealTxIdTextField.setBsq(true); revealTxIdContainer = tuple.third;