From f660a9e53173d4c29de80f86db1d9ac6a43b4eb6 Mon Sep 17 00:00:00 2001 From: "Marshall T. Rose" Date: Thu, 19 Jan 2017 20:08:04 -0800 Subject: [PATCH] 0.13.1: Payment history footer message needs correct past/future context Fixes #6059 --- .../locales/bn-BD/preferences.properties | 1 - .../locales/bn-IN/preferences.properties | 1 - .../brave/locales/cs/preferences.properties | 2 +- .../locales/de-DE/preferences.properties | 2 +- .../locales/en-US/preferences.properties | 7 +++++-- .../brave/locales/es/preferences.properties | 2 +- .../brave/locales/eu/preferences.properties | 1 - .../locales/fr-FR/preferences.properties | 2 +- .../locales/hi-IN/preferences.properties | 1 - .../locales/id-ID/preferences.properties | 2 +- .../locales/it-IT/preferences.properties | 2 +- .../locales/ja-JP/preferences.properties | 2 +- .../locales/ko-KR/preferences.properties | 1 - .../locales/ms-MY/preferences.properties | 2 +- .../locales/nl-NL/preferences.properties | 1 - .../locales/pl-PL/preferences.properties | 1 - .../locales/pt-BR/preferences.properties | 2 +- .../brave/locales/ru/preferences.properties | 2 +- .../brave/locales/sl/preferences.properties | 2 +- .../brave/locales/ta/preferences.properties | 1 - .../brave/locales/te/preferences.properties | 1 - .../locales/tr-TR/preferences.properties | 1 - .../brave/locales/uk/preferences.properties | 2 +- .../locales/zh-CN/preferences.properties | 2 +- js/about/preferences.js | 20 +++++++++++++++++-- 25 files changed, 36 insertions(+), 27 deletions(-) diff --git a/app/extensions/brave/locales/bn-BD/preferences.properties b/app/extensions/brave/locales/bn-BD/preferences.properties index 6f548c662aa..5a0174d4b02 100644 --- a/app/extensions/brave/locales/bn-BD/preferences.properties +++ b/app/extensions/brave/locales/bn-BD/preferences.properties @@ -49,7 +49,6 @@ bitcoinAddDescription=Use any BTC wallet that can transfer Bitcoin to your Brave bitcoinBuy=Bitcoin কিনুন viewPaymentHistory=View Payment History… paymentHistoryTitle=আপনার Payment ইতিহাস -paymentHistoryFooterText=Your next payment contribution is {{reconcileDate}}. paymentHistoryOKText=ঠিক আছে bravePayments=Brave Payments beta=beta diff --git a/app/extensions/brave/locales/bn-IN/preferences.properties b/app/extensions/brave/locales/bn-IN/preferences.properties index f0cacbb78dd..9b09de2ff18 100644 --- a/app/extensions/brave/locales/bn-IN/preferences.properties +++ b/app/extensions/brave/locales/bn-IN/preferences.properties @@ -49,7 +49,6 @@ bitcoinAddDescription=Use any BTC wallet that can transfer Bitcoin to your Brave bitcoinBuy=Buy Bitcoin viewPaymentHistory=View Payment History… paymentHistoryTitle=Your Payment History -paymentHistoryFooterText=Your next payment contribution is {{reconcileDate}}. paymentHistoryOKText=OK bravePayments=Brave Payments beta=beta diff --git a/app/extensions/brave/locales/cs/preferences.properties b/app/extensions/brave/locales/cs/preferences.properties index 341a76718cb..fed3bbd47e7 100644 --- a/app/extensions/brave/locales/cs/preferences.properties +++ b/app/extensions/brave/locales/cs/preferences.properties @@ -49,7 +49,7 @@ bitcoinAddDescription=Použít jakoukoli peněženku BTC, která dokáže přesu bitcoinBuy=Koupit bitcoin viewPaymentHistory=Podívat se na historii plateb... paymentHistoryTitle=Historie vašich plateb -paymentHistoryFooterText=Další příspěvek platbou je {{reconcileDate}}. +paymentHistoryNextFooterText=Další příspěvek platbou je {{reconcileDate}}. paymentHistoryOKText=OK bravePayments=Platby Brave beta=beta diff --git a/app/extensions/brave/locales/de-DE/preferences.properties b/app/extensions/brave/locales/de-DE/preferences.properties index 10a08c838f1..056df93d5b6 100644 --- a/app/extensions/brave/locales/de-DE/preferences.properties +++ b/app/extensions/brave/locales/de-DE/preferences.properties @@ -49,7 +49,7 @@ bitcoinAddDescription=Ein BTC Konto mit dem Bitcoins auf Ihr Brave Konto übertr bitcoinBuy=Bitcoin kaufen viewPaymentHistory=Transaktionsverlauf ansehen... paymentHistoryTitle=Ihr Zahlungsverlauf -paymentHistoryFooterText=Ihre nächste Einzahlung ist am {{reconcileDate}}. +paymentHistoryNextFooterText=Ihre nächste Einzahlung ist am {{reconcileDate}}. paymentHistoryOKText=OK bravePayments=Brave Payments beta=beta diff --git a/app/extensions/brave/locales/en-US/preferences.properties b/app/extensions/brave/locales/en-US/preferences.properties index 3e9b48b23b9..f536f894275 100644 --- a/app/extensions/brave/locales/en-US/preferences.properties +++ b/app/extensions/brave/locales/en-US/preferences.properties @@ -33,6 +33,7 @@ monthlyBudget=monthly budget status=status statusOnError=Brave Wallet can't be reached. statusNextReconcileDate=Contribution due date is {{reconcileDate}}. +statusNextReconcileToday=Contribution due date is today. createWallet=create wallet createWalletStatus=Click the Create Wallet button to get started. creatingWallet=creating… @@ -48,10 +49,12 @@ bitcoin=Bitcoin bitcoinAdd=Use your existing Bitcoin wallet/account bitcoinAddDescription=Use any BTC wallet that can transfer Bitcoin to your Brave wallet. bitcoinBuy=Buy Bitcoin -noPaymentHistory=Your first payment contribution will be {{reconcileDate}} +noPaymentHistory=Your first contribution will be {{reconcileDate}} viewPaymentHistory=View Payment History… paymentHistoryTitle=Your Payment History -paymentHistoryFooterText=Your next payment contribution is {{reconcileDate}}. +paymentHistoryNextFooterText=Your next contribution is {{reconcileDate}}. +paymentHistoryDueFooterText=Your next contribution is due. +paymentHistoryOverdueFooterText=Your next contribution is overdue. paymentHistoryOKText=OK hideExcluded=Only show included sites bravePayments=Brave Payments diff --git a/app/extensions/brave/locales/es/preferences.properties b/app/extensions/brave/locales/es/preferences.properties index f3509dc6aa9..947ef2b8c0c 100644 --- a/app/extensions/brave/locales/es/preferences.properties +++ b/app/extensions/brave/locales/es/preferences.properties @@ -49,7 +49,7 @@ bitcoinAddDescription=Utilice cualquier cartera BTC que pueda transferir Bitcoin bitcoinBuy=Comprar Bitcoin viewPaymentHistory=Ver historial de pagos… paymentHistoryTitle=Su historial de pagos -paymentHistoryFooterText=Tu próxima contribución de pago es {{reconcileDate}}. +paymentHistoryNextFooterText=Tu próxima contribución de pago es {{reconcileDate}}. paymentHistoryOKText=OK bravePayments=Brave Payments beta=beta diff --git a/app/extensions/brave/locales/eu/preferences.properties b/app/extensions/brave/locales/eu/preferences.properties index ab2d6048b5c..ddf006d3c52 100644 --- a/app/extensions/brave/locales/eu/preferences.properties +++ b/app/extensions/brave/locales/eu/preferences.properties @@ -49,7 +49,6 @@ bitcoinAddDescription=Edozein BTC diru-zor erabili zure Brave Bitcoinera transfe bitcoinBuy=Bitcoina erosi viewPaymentHistory=View Payment History… paymentHistoryTitle=Zure ordainketen historia -paymentHistoryFooterText=Your next payment contribution is {{reconcileDate}}. paymentHistoryOKText=Ados bravePayments=Brave Payments beta=beta diff --git a/app/extensions/brave/locales/fr-FR/preferences.properties b/app/extensions/brave/locales/fr-FR/preferences.properties index 07567e0dd83..4270b45dacc 100644 --- a/app/extensions/brave/locales/fr-FR/preferences.properties +++ b/app/extensions/brave/locales/fr-FR/preferences.properties @@ -49,7 +49,7 @@ bitcoinAddDescription=Utilisez n'importe quel porte-monnaie Bitcoin qui peut tra bitcoinBuy=Acheter des Bitcoin viewPaymentHistory=Voir l'historique des paiements... paymentHistoryTitle=Votre historique de paiement -paymentHistoryFooterText=Votre prochaine contribution de paiement est le {{reconcileDate}}. +paymentHistoryNextFooterText=Votre prochaine contribution de paiement est le {{reconcileDate}}. paymentHistoryOKText=OK bravePayments=Brave Payments beta=beta diff --git a/app/extensions/brave/locales/hi-IN/preferences.properties b/app/extensions/brave/locales/hi-IN/preferences.properties index fcee22c6f4a..182f683582e 100644 --- a/app/extensions/brave/locales/hi-IN/preferences.properties +++ b/app/extensions/brave/locales/hi-IN/preferences.properties @@ -49,7 +49,6 @@ bitcoinAddDescription=Use any BTC wallet that can transfer Bitcoin to your Brave bitcoinBuy=Buy Bitcoin viewPaymentHistory=View Payment History… paymentHistoryTitle=Your Payment History -paymentHistoryFooterText=Your next payment contribution is {{reconcileDate}}. paymentHistoryOKText=OK bravePayments=Brave Payments beta=beta diff --git a/app/extensions/brave/locales/id-ID/preferences.properties b/app/extensions/brave/locales/id-ID/preferences.properties index ca15b4bda5b..c3f3fa5468e 100644 --- a/app/extensions/brave/locales/id-ID/preferences.properties +++ b/app/extensions/brave/locales/id-ID/preferences.properties @@ -49,7 +49,7 @@ bitcoinAddDescription=Gunakan dompet BTC apa saja yang dapat mentransfer Bitcoin bitcoinBuy=Beli Bitcoin viewPaymentHistory=Lihat Riwayat Pembayaran... paymentHistoryTitle=Riwayat Pemayaran Anda -paymentHistoryFooterText=Kontribusi pembayaran Anda selanjutnya adalah {{reconcileDate}}. +paymentHistoryNextFooterText=Kontribusi pembayaran Anda selanjutnya adalah {{reconcileDate}}. paymentHistoryOKText=OK bravePayments=Pembayaran Brave beta=beta diff --git a/app/extensions/brave/locales/it-IT/preferences.properties b/app/extensions/brave/locales/it-IT/preferences.properties index 97f184271b0..996b7c187b0 100644 --- a/app/extensions/brave/locales/it-IT/preferences.properties +++ b/app/extensions/brave/locales/it-IT/preferences.properties @@ -49,7 +49,7 @@ bitcoinAddDescription=Usa un qualsiasi portafoglio BTC in grado di trasferire Bi bitcoinBuy=Acquista Bitcoin viewPaymentHistory=Visualizza cronologia pagamenti... paymentHistoryTitle=Cronologia dei tuoi pagamenti -paymentHistoryFooterText=Il tuo prossimo invio di pagamento è {{reconcileDate}}. +paymentHistoryNextFooterText=Il tuo prossimo invio di pagamento è {{reconcileDate}}. paymentHistoryOKText=OK bravePayments=Brave Payments beta=beta diff --git a/app/extensions/brave/locales/ja-JP/preferences.properties b/app/extensions/brave/locales/ja-JP/preferences.properties index f4a258a868a..7df26a89974 100644 --- a/app/extensions/brave/locales/ja-JP/preferences.properties +++ b/app/extensions/brave/locales/ja-JP/preferences.properties @@ -49,7 +49,7 @@ bitcoinAddDescription=ビットコインをBraveウォレットに転送でき bitcoinBuy=ビットコインを買う viewPaymentHistory=支払履歴を表示 paymentHistoryTitle=支払履歴 -paymentHistoryFooterText=次の寄付支払日は{{reconcileDate}}です。 +paymentHistoryNextFooterText=次の寄付支払日は{{reconcileDate}}です。 paymentHistoryOKText=はい bravePayments=Brave Payments beta=ベータ diff --git a/app/extensions/brave/locales/ko-KR/preferences.properties b/app/extensions/brave/locales/ko-KR/preferences.properties index 7d29ceab96e..7599fb261b5 100644 --- a/app/extensions/brave/locales/ko-KR/preferences.properties +++ b/app/extensions/brave/locales/ko-KR/preferences.properties @@ -49,7 +49,6 @@ bitcoinAddDescription=당신의 Brave 지갑에 비트 코인을 전송할 수 bitcoinBuy=비트코인 구매하기 viewPaymentHistory=View Payment History… paymentHistoryTitle=Payment 기록 -paymentHistoryFooterText=Your next payment contribution is {{reconcileDate}}. paymentHistoryOKText=확인 bravePayments=Brave Payments beta=beta diff --git a/app/extensions/brave/locales/ms-MY/preferences.properties b/app/extensions/brave/locales/ms-MY/preferences.properties index 9f30cbcd119..ba9022f22f8 100644 --- a/app/extensions/brave/locales/ms-MY/preferences.properties +++ b/app/extensions/brave/locales/ms-MY/preferences.properties @@ -49,7 +49,7 @@ bitcoinAddDescription=Guna sebarang dompet BTC yang membolehkan anda menghantar bitcoinBuy=Beli Bitcoin viewPaymentHistory=Papar Sejarah Pembayaran paymentHistoryTitle=Sejarah Pembayaran Anda -paymentHistoryFooterText=Serahan pembayaran sumbangan anda seterusnya ialah {{reconcileDate}}. +paymentHistoryNextFooterText=Serahan pembayaran sumbangan anda seterusnya ialah {{reconcileDate}}. paymentHistoryOKText=OK bravePayments=Brave Payments beta=beta diff --git a/app/extensions/brave/locales/nl-NL/preferences.properties b/app/extensions/brave/locales/nl-NL/preferences.properties index 18f25f16095..957e39be5a4 100644 --- a/app/extensions/brave/locales/nl-NL/preferences.properties +++ b/app/extensions/brave/locales/nl-NL/preferences.properties @@ -49,7 +49,6 @@ bitcoinAddDescription=Use any BTC wallet that can transfer Bitcoin to your Brave bitcoinBuy=Buy Bitcoin viewPaymentHistory=View Payment History… paymentHistoryTitle=Your Payment History -paymentHistoryFooterText=Your next payment contribution is {{reconcileDate}}. paymentHistoryOKText=OK bravePayments=Brave Payments beta=beta diff --git a/app/extensions/brave/locales/pl-PL/preferences.properties b/app/extensions/brave/locales/pl-PL/preferences.properties index d0e64f738de..f693c50829c 100644 --- a/app/extensions/brave/locales/pl-PL/preferences.properties +++ b/app/extensions/brave/locales/pl-PL/preferences.properties @@ -49,7 +49,6 @@ bitcoinAddDescription=Use any BTC wallet that can transfer Bitcoin to your Brave bitcoinBuy=Kup Bitcoin viewPaymentHistory=View Payment History… paymentHistoryTitle=Your Payment History -paymentHistoryFooterText=Your next payment contribution is {{reconcileDate}}. paymentHistoryOKText=OK bravePayments=Brave Payments beta=beta diff --git a/app/extensions/brave/locales/pt-BR/preferences.properties b/app/extensions/brave/locales/pt-BR/preferences.properties index afc0251e473..6270de55b35 100644 --- a/app/extensions/brave/locales/pt-BR/preferences.properties +++ b/app/extensions/brave/locales/pt-BR/preferences.properties @@ -49,7 +49,7 @@ bitcoinAddDescription=Use qualquer carteira BTC para transferir Bitcoin para a s bitcoinBuy=Compra Bitcoin viewPaymentHistory=Ver Histórico de Pagamentos... paymentHistoryTitle=Seu Histórico de Pagamentos -paymentHistoryFooterText=Sua próxima contribuição de pagamento é em {{reconcileDate}}. +paymentHistoryNextFooterText=Sua próxima contribuição de pagamento é em {{reconcileDate}}. paymentHistoryOKText=OK bravePayments=Pagamentos Brave beta=beta diff --git a/app/extensions/brave/locales/ru/preferences.properties b/app/extensions/brave/locales/ru/preferences.properties index c0dc676ebd3..d8e0216b8f3 100644 --- a/app/extensions/brave/locales/ru/preferences.properties +++ b/app/extensions/brave/locales/ru/preferences.properties @@ -49,7 +49,7 @@ bitcoinAddDescription=Используйте любой BTC кошелек, ко bitcoinBuy=Купить Bitcoin viewPaymentHistory=Просмотр истории платежей... paymentHistoryTitle=Ваша история платежей -paymentHistoryFooterText=Ваш следующий взнос {{reconcileDate}} +paymentHistoryNextFooterText=Ваш следующий взнос {{reconcileDate}} paymentHistoryOKText=ОК bravePayments=Brave Payments beta=бета diff --git a/app/extensions/brave/locales/sl/preferences.properties b/app/extensions/brave/locales/sl/preferences.properties index 201be79a803..27d62c22534 100644 --- a/app/extensions/brave/locales/sl/preferences.properties +++ b/app/extensions/brave/locales/sl/preferences.properties @@ -49,7 +49,7 @@ bitcoinAddDescription=Uporabi poljubno denarnico BTC, ki lahko prenaša Bitcoine bitcoinBuy=Kupi Bitcoin viewPaymentHistory=Pokaži zgodovino plačil ... paymentHistoryTitle=Zgodovina vaših plačil -paymentHistoryFooterText=Vaš naslednji plačilni prislevek je {{reconcileDate}}. +paymentHistoryNextFooterText=Vaš naslednji plačilni prislevek je {{reconcileDate}}. paymentHistoryOKText=V redu bravePayments=Plačila Brave beta=beta diff --git a/app/extensions/brave/locales/ta/preferences.properties b/app/extensions/brave/locales/ta/preferences.properties index 2a25404dc3c..e42519b4135 100644 --- a/app/extensions/brave/locales/ta/preferences.properties +++ b/app/extensions/brave/locales/ta/preferences.properties @@ -49,7 +49,6 @@ bitcoinAddDescription=Use any BTC wallet that can transfer Bitcoin to your Brave bitcoinBuy=Buy Bitcoin viewPaymentHistory=View Payment History… paymentHistoryTitle=Your Payment History -paymentHistoryFooterText=Your next payment contribution is {{reconcileDate}}. paymentHistoryOKText=OK bravePayments=Brave Payments beta=beta diff --git a/app/extensions/brave/locales/te/preferences.properties b/app/extensions/brave/locales/te/preferences.properties index 248748caa41..1e25fd03ea8 100644 --- a/app/extensions/brave/locales/te/preferences.properties +++ b/app/extensions/brave/locales/te/preferences.properties @@ -49,7 +49,6 @@ bitcoinAddDescription=Use any BTC wallet that can transfer Bitcoin to your Brave bitcoinBuy=Buy Bitcoin viewPaymentHistory=View Payment History… paymentHistoryTitle=Your Payment History -paymentHistoryFooterText=Your next payment contribution is {{reconcileDate}}. paymentHistoryOKText=OK bravePayments=Brave Payments beta=beta diff --git a/app/extensions/brave/locales/tr-TR/preferences.properties b/app/extensions/brave/locales/tr-TR/preferences.properties index 1ab4910476b..a2303efa7ea 100644 --- a/app/extensions/brave/locales/tr-TR/preferences.properties +++ b/app/extensions/brave/locales/tr-TR/preferences.properties @@ -49,7 +49,6 @@ bitcoinAddDescription=Use any BTC wallet that can transfer Bitcoin to your Brave bitcoinBuy=Bitcoin al viewPaymentHistory=View Payment History… paymentHistoryTitle=Ödeme Geçmişi -paymentHistoryFooterText=Your next payment contribution is {{reconcileDate}}. paymentHistoryOKText=Tamam bravePayments=Brave Payments beta=beta diff --git a/app/extensions/brave/locales/uk/preferences.properties b/app/extensions/brave/locales/uk/preferences.properties index 3f14f66957b..39f3994ced8 100644 --- a/app/extensions/brave/locales/uk/preferences.properties +++ b/app/extensions/brave/locales/uk/preferences.properties @@ -49,7 +49,7 @@ bitcoinAddDescription=Використайте будь-який BTC гаман bitcoinBuy=Купити Bitcoin viewPaymentHistory=Перегляд історії платежів… paymentHistoryTitle=Ваша історія платежів -paymentHistoryFooterText=Ваш наступний платіжний внесок {{reconcileDate}}. +paymentHistoryNextFooterText=Ваш наступний платіжний внесок {{reconcileDate}}. paymentHistoryOKText=ОК bravePayments=Brave платежі beta=beta diff --git a/app/extensions/brave/locales/zh-CN/preferences.properties b/app/extensions/brave/locales/zh-CN/preferences.properties index 5ed529edb6c..62134459149 100644 --- a/app/extensions/brave/locales/zh-CN/preferences.properties +++ b/app/extensions/brave/locales/zh-CN/preferences.properties @@ -49,7 +49,7 @@ bitcoinAddDescription=所有BTC钱包都可以转移比特币到您的Brave钱 bitcoinBuy=购买比特币 viewPaymentHistory=查看付款历史… paymentHistoryTitle=您的付款历史 -paymentHistoryFooterText=您的下一次支付缴款日期为 {{reconcileDate}}。 +paymentHistoryNextFooterText=您的下一次支付缴款日期为 {{reconcileDate}}。 paymentHistoryOKText=好 bravePayments=Brave 支付 beta=测试版 diff --git a/js/about/preferences.js b/js/about/preferences.js index c541e57464c..34626ccb8ad 100644 --- a/js/about/preferences.js +++ b/js/about/preferences.js @@ -1050,13 +1050,20 @@ class PaymentsTab extends ImmutableComponent { return null } const timestamp = ledgerData.get('reconcileStamp') + const now = new Date().getTime() + let l10nDataId = 'paymentHistoryNextFooterText' + if (timestamp <= now) { + l10nDataId = (timestamp <= (now - (24 * 60 * 60 * 1000))) + ? 'paymentHistoryOverdueFooterText' : 'paymentHistoryDueFooterText' + } + const nextReconcileDateRelative = formattedTimeFromNow(timestamp) const l10nDataArgs = { reconcileDate: nextReconcileDateRelative } return
- +
@@ -1222,15 +1229,24 @@ class PaymentsTab extends ImmutableComponent { } get nextReconcileMessage () { + const ledgerData = this.props.ledgerData const nextReconcileDateRelative = this.nextReconcileDate if (!nextReconcileDateRelative) { return null } + const timestamp = ledgerData.get('reconcileStamp') + const now = new Date().getTime() + let l10nDataId = 'statusNextReconcileDate' + if (timestamp <= now) { + l10nDataId = (timestamp <= (now - (24 * 60 * 60 * 1000))) + ? 'paymentHistoryOverdueFooterText' : 'statusNextReconcileToday' + } + const l10nDataArgs = { reconcileDate: nextReconcileDateRelative } - return
+ return
} get ledgerDataErrorText () {