Skip to content

Commit

Permalink
displayString: Rename payment.account.owner to payment.account.owner.…
Browse files Browse the repository at this point in the history
…fullname
  • Loading branch information
alvasw committed Feb 2, 2025
1 parent 656b3c5 commit c42a8ef
Show file tree
Hide file tree
Showing 63 changed files with 306 additions and 306 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ public String getPaymentDetails() {
public String getPaymentDetailsForTradePopup() {
return
Res.get("payment.australia.payid") + ": " + payid + "\n" +
Res.get("payment.account.owner") + ": " + bankAccountName;
Res.get("payment.account.owner.fullname") + ": " + bankAccountName;
}


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ public String getPaymentDetailsForTradePopup() {
String holderTaxIdString = BankUtil.isHolderIdRequired(countryCode) ?
(BankUtil.getHolderIdLabel(countryCode) + ": " + holderTaxId + "\n") : "";

return Res.getWithCol("payment.account.owner") + " " + holderName + "\n" +
return Res.getWithCol("payment.account.owner.fullname") + " " + holderName + "\n" +
bankName +
bankId +
branchId +
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -95,14 +95,14 @@ public static CashByMailAccountPayload fromProto(protobuf.PaymentAccountPayload

@Override
public String getPaymentDetails() {
return Res.get(paymentMethodId) + " - " + Res.getWithCol("payment.account.owner") + " " + contact + ", " +
return Res.get(paymentMethodId) + " - " + Res.getWithCol("payment.account.owner.fullname") + " " + contact + ", " +
Res.getWithCol("payment.postal.address") + " " + postalAddress + ", " +
Res.getWithCol("payment.shared.extraInfo") + " " + extraInfo;
}

@Override
public String getPaymentDetailsForTradePopup() {
return Res.getWithCol("payment.account.owner") + " " + contact + "\n" +
return Res.getWithCol("payment.account.owner.fullname") + " " + contact + "\n" +
Res.getWithCol("payment.postal.address") + " " + postalAddress;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ public String getPaymentDetailsForTradePopup() {
String emailString = holderEmail != null ?
(Res.getWithCol("payment.email") + " " + holderEmail + "\n") : "";

return Res.getWithCol("payment.account.owner") + " " + holderName + "\n" +
return Res.getWithCol("payment.account.owner.fullname") + " " + holderName + "\n" +
emailString +
bankName +
bankId +
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -93,13 +93,13 @@ public static ChaseQuickPayAccountPayload fromProto(protobuf.PaymentAccountPaylo

@Override
public String getPaymentDetails() {
return Res.get(paymentMethodId) + " - " + Res.getWithCol("payment.account.owner") + " " + holderName + ", " +
return Res.get(paymentMethodId) + " - " + Res.getWithCol("payment.account.owner.fullname") + " " + holderName + ", " +
Res.get("payment.email") + " " + email;
}

@Override
public String getPaymentDetailsForTradePopup() {
return Res.getWithCol("payment.account.owner") + " " + holderName + "\n" +
return Res.getWithCol("payment.account.owner.fullname") + " " + holderName + "\n" +
Res.getWithCol("payment.email") + " " + email;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -90,13 +90,13 @@ public static ClearXchangeAccountPayload fromProto(protobuf.PaymentAccountPayloa

@Override
public String getPaymentDetails() {
return Res.get(paymentMethodId) + " - " + Res.getWithCol("payment.account.owner") + " " + holderName + ", " +
return Res.get(paymentMethodId) + " - " + Res.getWithCol("payment.account.owner.fullname") + " " + holderName + ", " +
Res.getWithCol("payment.emailOrMobile") + " " + emailOrMobileNr;
}

@Override
public String getPaymentDetailsForTradePopup() {
return Res.getWithCol("payment.account.owner") + " " + holderName + "\n" +
return Res.getWithCol("payment.account.owner.fullname") + " " + holderName + "\n" +
Res.getWithCol("payment.emailOrMobile") + " " + emailOrMobileNr;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ public static DomesticWireTransferAccountPayload fromProto(protobuf.PaymentAccou
@Override
public String getPaymentDetails() {
String paymentDetails = (Res.get(paymentMethodId) + " - " +
Res.getWithCol("payment.account.owner") + " " + holderName + ", " +
Res.getWithCol("payment.account.owner.fullname") + " " + holderName + ", " +
BankUtil.getBankNameLabel(countryCode) + ": " + this.bankName + ", " +
BankUtil.getBranchIdLabel(countryCode) + ": " + this.branchId + ", " +
BankUtil.getAccountNrLabel(countryCode) + ": " + this.accountNr);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ public String getPaymentDetails() {

@Override
public String getPaymentDetailsForTradePopup() {
return (getHolderName().isEmpty() ? "" : Res.getWithCol("payment.account.owner") + " " + getHolderName() + "\n") +
return (getHolderName().isEmpty() ? "" : Res.getWithCol("payment.account.owner.fullname") + " " + getHolderName() + "\n") +
"UK Sort code: " + sortCode + "\n" +
Res.getWithCol("payment.accountNr") + " " + accountNr;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ public String getPaymentDetails() {

@Override
public String getPaymentDetailsForTradePopup() {
return Res.getWithCol("payment.account.owner") + " " + holderName + "\n" +
return Res.getWithCol("payment.account.owner.fullname") + " " + holderName + "\n" +
BankUtil.getAccountNrLabel(countryCode) + ": " + accountNr + "\n" +
BankUtil.getBankIdLabel(countryCode) + ": " + ifsc + "\n" +
Res.getWithCol("payment.bank.country") + " " + CountryUtil.getNameByCode(countryCode);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ public static ImpsAccountPayload fromProto(protobuf.PaymentAccountPayload proto)

@Override
public String getPaymentDetails() {
return Res.get(paymentMethodId) + " - " + Res.getWithCol("payment.account.owner") + " " + holderName + ", " +
return Res.get(paymentMethodId) + " - " + Res.getWithCol("payment.account.owner.fullname") + " " + holderName + ", " +
Res.getWithCol("payment.account.no") + " " + accountNr +
Res.getWithCol("payment.ifsc") + " " + ifsc;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -101,14 +101,14 @@ public static InteracETransferAccountPayload fromProto(protobuf.PaymentAccountPa

@Override
public String getPaymentDetails() {
return Res.get(paymentMethodId) + " - " + Res.getWithCol("payment.account.owner") + " " + holderName + ", " +
return Res.get(paymentMethodId) + " - " + Res.getWithCol("payment.account.owner.fullname") + " " + holderName + ", " +
Res.get("payment.email") + " " + email + ", " + Res.getWithCol("payment.secret") + " " +
question + ", " + Res.getWithCol("payment.answer") + " " + answer;
}

@Override
public String getPaymentDetailsForTradePopup() {
return Res.getWithCol("payment.account.owner") + " " + holderName + "\n" +
return Res.getWithCol("payment.account.owner.fullname") + " " + holderName + "\n" +
Res.getWithCol("payment.email") + " " + email + "\n" +
Res.getWithCol("payment.secret") + " " + question + "\n" +
Res.getWithCol("payment.answer") + " " + answer;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ public String getPaymentDetails() {
@Override
public String getPaymentDetailsForTradePopup() {
return Res.get("payment.mercadoPago.holderId") + ": " + accountHolderId + "\n" +
Res.get("payment.account.owner") + ": " + accountHolderName;
Res.get("payment.account.owner.fullname") + ": " + accountHolderName;
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ public String getPaymentDetails() {
@Override
public String getPaymentDetailsForTradePopup() {
return Res.getWithCol("payment.account") + " " + accountId + "\n" +
Res.getWithCol("payment.account.owner") + " " + getHolderNameOrPromptIfEmpty();
Res.getWithCol("payment.account.owner.fullname") + " " + getHolderNameOrPromptIfEmpty();
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ public static NeftAccountPayload fromProto(protobuf.PaymentAccountPayload proto)

@Override
public String getPaymentDetails() {
return Res.get(paymentMethodId) + " - " + Res.getWithCol("payment.account.owner") + " " + holderName + ", " +
return Res.get(paymentMethodId) + " - " + Res.getWithCol("payment.account.owner.fullname") + " " + holderName + ", " +
Res.getWithCol("payment.account.no") + " " + accountNr +
Res.getWithCol("payment.ifsc") + " " + ifsc;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ public String getPaymentDetails() {
@Override
public String getPaymentDetailsForTradePopup() {
return Res.getWithCol("payment.pix.key") + " " + pixKey + "\n" +
Res.getWithCol("payment.account.owner") + " " + getHolderNameOrPromptIfEmpty();
Res.getWithCol("payment.account.owner.fullname") + " " + getHolderNameOrPromptIfEmpty();
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ public static PopmoneyAccountPayload fromProto(protobuf.PaymentAccountPayload pr

@Override
public String getPaymentDetails() {
return Res.get(paymentMethodId) + " - " + Res.getWithCol("payment.account.owner") + " " + holderName + ", " +
return Res.get(paymentMethodId) + " - " + Res.getWithCol("payment.account.owner.fullname") + " " + holderName + ", " +
Res.getWithCol("payment.popmoney.accountId") + " " + accountId;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ public static RtgsAccountPayload fromProto(protobuf.PaymentAccountPayload proto)

@Override
public String getPaymentDetails() {
return Res.get(paymentMethodId) + " - " + Res.getWithCol("payment.account.owner") + " " + holderName + ", " +
return Res.get(paymentMethodId) + " - " + Res.getWithCol("payment.account.owner.fullname") + " " + holderName + ", " +
Res.getWithCol("payment.account.no") + " " + accountNr +
Res.getWithCol("payment.ifsc") + " " + ifsc;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -152,13 +152,13 @@ public void revertChanges() {

@Override
public String getPaymentDetails() {
return Res.get(paymentMethodId) + " - " + Res.getWithCol("payment.account.owner") + " " + holderName + ", IBAN: " +
return Res.get(paymentMethodId) + " - " + Res.getWithCol("payment.account.owner.fullname") + " " + holderName + ", IBAN: " +
iban + ", BIC: " + bic + ", " + Res.getWithCol("payment.bank.country") + " " + getCountryCode();
}

@Override
public String getPaymentDetailsForTradePopup() {
return Res.getWithCol("payment.account.owner") + " " + holderName + "\n" +
return Res.getWithCol("payment.account.owner.fullname") + " " + holderName + "\n" +
"IBAN: " + iban + "\n" +
"BIC: " + bic + "\n" +
Res.getWithCol("payment.bank.country") + " " + CountryUtil.getNameByCode(countryCode);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -147,13 +147,13 @@ public void revertChanges() {

@Override
public String getPaymentDetails() {
return Res.get(paymentMethodId) + " - " + Res.getWithCol("payment.account.owner") + " " + holderName + ", IBAN: " +
return Res.get(paymentMethodId) + " - " + Res.getWithCol("payment.account.owner.fullname") + " " + holderName + ", IBAN: " +
iban + ", BIC: " + bic + ", " + Res.getWithCol("payment.bank.country") + " " + getCountryCode();
}

@Override
public String getPaymentDetailsForTradePopup() {
return Res.getWithCol("payment.account.owner") + " " + holderName + "\n" +
return Res.getWithCol("payment.account.owner.fullname") + " " + holderName + "\n" +
"IBAN: " + iban + "\n" +
"BIC: " + bic + "\n" +
Res.getWithCol("payment.bank.country") + " " + CountryUtil.getNameByCode(countryCode);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -88,13 +88,13 @@ public static SwishAccountPayload fromProto(protobuf.PaymentAccountPayload proto

@Override
public String getPaymentDetails() {
return Res.get(paymentMethodId) + " - " + Res.getWithCol("payment.account.owner") + " " + holderName +
return Res.get(paymentMethodId) + " - " + Res.getWithCol("payment.account.owner.fullname") + " " + holderName +
", " + Res.getWithCol("payment.mobile") + " " + mobileNr;
}

@Override
public String getPaymentDetailsForTradePopup() {
return Res.getWithCol("payment.account.owner") + " " + holderName + "\n" +
return Res.getWithCol("payment.account.owner.fullname") + " " + holderName + "\n" +
Res.getWithCol("payment.mobile") + " " + mobileNr;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ public String getPaymentDetails() {
@Override
public String getPaymentDetailsForTradePopup() {
return Res.getWithCol("payment.email") + " " + email + "\n" +
Res.getWithCol("payment.account.owner") + " " + getHolderNameOrPromptIfEmpty();
Res.getWithCol("payment.account.owner.fullname") + " " + getHolderNameOrPromptIfEmpty();
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -90,14 +90,14 @@ public static USPostalMoneyOrderAccountPayload fromProto(protobuf.PaymentAccount

@Override
public String getPaymentDetails() {
return Res.get(paymentMethodId) + " - " + Res.getWithCol("payment.account.owner") + " " + holderName + ", " +
return Res.get(paymentMethodId) + " - " + Res.getWithCol("payment.account.owner.fullname") + " " + holderName + ", " +
Res.getWithCol("payment.postal.address") + " " + postalAddress;
}


@Override
public String getPaymentDetailsForTradePopup() {
return Res.getWithCol("payment.account.owner") + " " + holderName + "\n" +
return Res.getWithCol("payment.account.owner.fullname") + " " + holderName + "\n" +
Res.getWithCol("payment.postal.address") + " " + postalAddress;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -103,11 +103,11 @@ public String getPaymentDetailsForTradePopup() {
if (accountOwner.isEmpty()) {
return
Res.get("payment.account") + ": " + accountId + "\n" +
Res.get("payment.account.owner") + ": N/A";
Res.get("payment.account.owner.fullname") + ": N/A";
} else {
return
Res.get("payment.account") + ": " + accountId + "\n" +
Res.get("payment.account.owner") + ": " + accountOwner;
Res.get("payment.account.owner.fullname") + ": " + accountOwner;
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ public static VenmoAccountPayload fromProto(protobuf.PaymentAccountPayload proto

@Override
public String getPaymentDetails() {
return Res.get(paymentMethodId) + " - " + Res.getWithCol("payment.account.owner") + " " + holderName + ", " +
return Res.get(paymentMethodId) + " - " + Res.getWithCol("payment.account.owner.fullname") + " " + holderName + ", " +
Res.getWithCol("payment.venmo.venmoUserName") + " " + venmoUserName;
}

Expand Down
2 changes: 1 addition & 1 deletion core/src/main/resources/i18n/displayStrings.properties
Original file line number Diff line number Diff line change
Expand Up @@ -3719,7 +3719,7 @@ payment.account.no=Account no.
payment.account.name=Account name
payment.account.userName=User name
payment.account.phoneNr=Phone number
payment.account.owner=Account owner full name
payment.account.owner.fullname=Account owner full name
payment.account.owner.ask=[Ask trader to provide account name if needed]
payment.account.owner.sbp=Account owner name (first, middle, and initial of last name)
payment.account.fullName=Full name (first, middle, last)
Expand Down
2 changes: 1 addition & 1 deletion core/src/main/resources/i18n/displayStrings_cs.properties
Original file line number Diff line number Diff line change
Expand Up @@ -2945,7 +2945,7 @@ payment.account.no=Číslo účtu
payment.account.name=Název účtu
payment.account.userName=Uživatelské jméno
payment.account.phoneNr=Telefonní číslo
payment.account.owner=Celé jméno vlastníka účtu
payment.account.owner.fullname=Celé jméno vlastníka účtu
payment.account.owner.ask=[Ask trader to provide account name if needed]
payment.account.owner.sbp=Account owner name (first, middle, and initial of last name)
payment.account.fullName=Celé jméno (křestní, střední, příjmení)
Expand Down
6 changes: 3 additions & 3 deletions core/src/main/resources/i18n/displayStrings_de.properties
Original file line number Diff line number Diff line change
Expand Up @@ -2945,7 +2945,7 @@ payment.account.no=Kontonummer
payment.account.name=Kontoname
payment.account.userName=Benutzername
payment.account.phoneNr=Telefonnummer
payment.account.owner=Vollständiger Name des Kontoinhabers
payment.account.owner.fullname=Vollständiger Name des Kontoinhabers
payment.account.owner.ask=[Ask trader to provide account name if needed]
payment.account.owner.sbp=Account owner name (first, middle, and initial of last name)
payment.account.fullName=Vollständiger Name (vor, zweit, nach)
Expand Down Expand Up @@ -3190,7 +3190,7 @@ payment.shared.optionalExtra=Freiwillige zusätzliche Informationen
payment.shared.extraInfo=Zusätzliche Informationen
payment.shared.extraInfo.prompt=Define any special terms, conditions, or details you would like to be displayed with your offers for this payment account (users will see this info before accepting offers). This field can NOT be used to provide a way for a peer to contact you outside of Bisq.
payment.cashByMail.extraInfo.prompt=Please state on your offers: \n\nCountry you are located (eg France); \nCountries / regions you would accept trades from (eg France, EU, or any European country); \nAny special terms/conditions; \nAny other details. \nThis field can NOT be used to provide a way for a peer to contact you outside of Bisq.
payment.cashByMail.tradingRestrictions=Überprüfen Sie die Bedingungen und Konditionen des Erstellers.\nWenn Sie die Anforderungen nicht erfüllen, nehmen Sie diesen Handel nicht an.
payment.cashByMail.tradingRestrictions=Überprüfen Sie die Bedingungen und Konditionen des Erstellers.\nWenn Sie die Anforderungen nicht erfüllen, nehmen Sie diesen Handel nicht an.
payment.f2f.info=Persönliche Händel "von Angesicht zu Angesicht" ('Face to Face') haben andere Regeln und andere Risiken als Online-Händel.\n\nDie Hauptunterschiede sind:\n● Die Handelspartner müssen Informationen über den Ort und die Uhrzeit des Treffens unter Verwendung ihrer angegebenen Kontaktdaten austauschen.\n● Die Handelspartner müssen ihre Laptops mitbringen und die Bestätigung "Zahlung gesendet" und "Zahlung erhalten" am Treffpunkt vornehmen.\n● Wenn der Ersteller eines Angebots spezielle "Geschäftsbedingungen" hat, muss er diese in seinem Konto unter dem Textfeld "Zusatzinformationen" angeben.\n● Mit der Annahme eines Angebots erklärt sich der Käufer mit den vom Ersteller angegebenen "Geschäftsbedingungen" einverstanden.\n● Im Konfliktfall kann der Vermittler oder die Schiedsperson nicht viel tun, da es in der Regel schwierig ist herauszubekommen, was bei dem Treffen wirklich passiert ist. In solchen Fällen bleiben die BTC auf unbestimmte Zeit gesperrt, oder bis die Handelspartner zu einer Einigung kommen.\n\nUm sicherzustellen, dass Sie die Besonderheiten der persönlichen "von Angesicht zu Angesicht" ('Face to Face') Händel vollständig verstehen, lesen Sie bitte die Anweisungen und Empfehlungen unter: [HYPERLINK:https://bisq.wiki/Face-to-face_(payment_method)]
payment.f2f.info.openURL=Webseite öffnen
payment.f2f.offerbook.tooltip.countryAndCity=Land und Stadt: {0} / {1}
Expand Down Expand Up @@ -3533,7 +3533,7 @@ validation.numberFormatException=Zahlenformat Ausnahme {0}
validation.mustNotBeNegative=Eingabe darf nicht negativ sein
validation.phone.missingCountryCode=Es wird eine zweistellige Ländervorwahl benötigt, um die Telefonnummer zu bestätigen
validation.phone.invalidCharacters=Telefonnummer {0} enthält ungültige Zeichen
validation.phone.insufficientDigits=Das ist keine gültige Telefonnummer. Sie habe nicht genügend Stellen angegeben.
validation.phone.insufficientDigits=Das ist keine gültige Telefonnummer. Sie habe nicht genügend Stellen angegeben.
validation.phone.tooManyDigits=Es sind zu viele Ziffern in {0} um eine gültige Telefonnummer zu sein.
validation.phone.incorrectLength=The field must contain {0} numbers
validation.phone.invalidDialingCode=Die Ländervorwahl in der Nummer {0} ist für das Land {1} ungültig. Die richtige Vorwahl ist {2}.
Expand Down
Loading

0 comments on commit c42a8ef

Please sign in to comment.