Merge pull request #5649 from brave/ledger-related-updates

small ledger fixes
brave · Nov 17, 2016 · de1d4e9 · de1d4e9
2 parents 76c3165 + 1fe7d71
commit de1d4e9
Show file tree

Hide file tree

Showing 26 changed files with 60 additions and 32 deletions.
diff --git a/app/extensions/brave/locales/bn-BD/preferences.properties b/app/extensions/brave/locales/bn-BD/preferences.properties
@@ -26,10 +26,11 @@ paymentsSidebarText2=সকল অর্থ আদান-প্রদানে
 paymentsSidebarText3=যাদের সহযোগীতায় Brave Bitcoin Wallets এর সুবিধা পাচ্ছেন:
 paymentsSidebarText4=আপনার ক্রেডিট কার্ড বা ব্যাংক কার্ডের মাধ্যমে দেয়া অনুদান সামাল দিয়েছেন:
 accountBalance=অ্যাকাউন্ট ব্যালেন্স
-accountBalanceConnectionError=An error occurred while loading your balance.
+accountBalanceConnectionError=Please check your Internet connection.
 accountBalanceLoading=লোড হচ্ছে 
 monthlyBudget=মাসিক বাজেট
 status=অবস্থা
+statusOnError=Brave Wallet can't be reached.
 statusNextReconcileDate=Contribution due date is {{reconcileDate}}.
 createWallet=ওয়ালেট তৈরি করুন
 createWalletStatus=ওয়ালেট তৈরি করুন বাটনে ক্লিক করে শুরু করুন।

diff --git a/app/extensions/brave/locales/bn-IN/preferences.properties b/app/extensions/brave/locales/bn-IN/preferences.properties
@@ -26,10 +26,11 @@ paymentsSidebarText2=All transaction IP addresses are anonymized with technology
 paymentsSidebarText3=Brave Bitcoin Wallets are provided through a partnership with:
 paymentsSidebarText4=Your contributions in the form of credit cards and bank cards are handled by:
 accountBalance=account balance
-accountBalanceConnectionError=An error occurred while loading your balance.
+accountBalanceConnectionError=Please check your Internet connection.
 accountBalanceLoading=loading…
 monthlyBudget=monthly budget
 status=status
+statusOnError=Brave Wallet can't be reached.
 statusNextReconcileDate=Contribution due date is {{reconcileDate}}.
 createWallet=create wallet
 createWalletStatus=Click the Create Wallet button to get started.

diff --git a/app/extensions/brave/locales/cs/preferences.properties b/app/extensions/brave/locales/cs/preferences.properties
@@ -26,10 +26,11 @@ paymentsSidebarText2=Všechny adresy IP transakcí anonymizovány pomocí techno
 paymentsSidebarText3=Peněženky Brave s bitcoiny jsou poskytovány pomocí partnerství:
 paymentsSidebarText4=Vaše příspěvky v podobě kreditních karet a bankovních karet jsou vyřizovány:
 accountBalance=Zůstatek účtu
-accountBalanceConnectionError=An error occurred while loading your balance.
+accountBalanceConnectionError=Please check your Internet connection.
 accountBalanceLoading=Nahrává se...
 monthlyBudget=Měsíční rozpočet
 status=Stav
+statusOnError=Brave Wallet can't be reached.
 statusNextReconcileDate=Datum splatnosti příspěvku platbou je {{reconcileDate}}.
 createWallet=Vytvořit peněženku
 createWalletStatus=Klepněte na tlačítko Vytvořit peněženku, čímž začnete.

diff --git a/app/extensions/brave/locales/de-DE/preferences.properties b/app/extensions/brave/locales/de-DE/preferences.properties
@@ -26,10 +26,11 @@ paymentsSidebarText2=Alle Transaktions-IP-Adressen werden anonymisiert mit Techn
 paymentsSidebarText3=Brave Bitcoin-Wallets werden bereitgestellt durch eine Partnerschaft mit:
 paymentsSidebarText4=Ihre Beiträge in Form von Kreditkarten und Bankkarten werden bearbeitet von:
 accountBalance=Kontostand
-accountBalanceConnectionError=Beim laden Ihres Kontostandes ist ein Fehler aufgetreten.
+accountBalanceConnectionError=Please check your Internet connection.
 accountBalanceLoading=wird geladen...
 monthlyBudget=Monatliches Budget
 status=Status
+statusOnError=Brave Wallet can't be reached.
 statusNextReconcileDate=Einzahlungsdatum {{reconcileDate}}.
 createWallet=Konto erstellen
 createWalletStatus=Klicken Sie auf 'Konto erstellen', um zu beginnen.

diff --git a/app/extensions/brave/locales/en-US/preferences.properties b/app/extensions/brave/locales/en-US/preferences.properties
@@ -26,10 +26,11 @@ paymentsSidebarText2=All transaction IP addresses are anonymized with technology
 paymentsSidebarText3=Brave Bitcoin Wallets are provided through a partnership with:
 paymentsSidebarText4=Your contributions in the form of credit cards and bank cards are handled by:
 accountBalance=account balance
-accountBalanceConnectionError=An error occurred while loading your balance.
+accountBalanceConnectionError=Please check your Internet connection.
 accountBalanceLoading=loading…
 monthlyBudget=monthly budget
 status=status
+statusOnError=Brave Wallet can't be reached.
 statusNextReconcileDate=Contribution due date is {{reconcileDate}}.
 createWallet=create wallet
 createWalletStatus=Click the Create Wallet button to get started.

diff --git a/app/extensions/brave/locales/es/preferences.properties b/app/extensions/brave/locales/es/preferences.properties
@@ -26,10 +26,11 @@ paymentsSidebarText2=Las direcciones IP de todas las transacciones son anónimas
 paymentsSidebarText3=Las carteras Brave Bitcoin se proporcionan a través de un colaborador con:
 paymentsSidebarText4=Sus contribuciones en forma de tarjetas de crédito y tarjetas bancarias son tramitadas por:
 accountBalance=balance de cuenta
-accountBalanceConnectionError=An error occurred while loading your balance.
+accountBalanceConnectionError=Please check your Internet connection.
 accountBalanceLoading=cargando...
 monthlyBudget=presupuesto mensual
 status=estado
+statusOnError=Brave Wallet can't be reached.
 statusNextReconcileDate=Fecha de vencimiento de la contribución: {{reconcileDate}}.
 createWallet=crear cartera
 createWalletStatus=Haga clic en el botón crear cartera para comenzar.

diff --git a/app/extensions/brave/locales/eu/preferences.properties b/app/extensions/brave/locales/eu/preferences.properties
@@ -26,10 +26,11 @@ paymentsSidebarText2=Transakzio guztien IP helbide anonimoak dira teknologia hau
 paymentsSidebarText3=Braven Bitcoin zorroak hauei bidez ematen da:
 paymentsSidebarText4=Zure kreditu-txartelak eta banku-txartelak formularioa ekarpenen bidez kudeatuko dira:
 accountBalance=Kontuan duzun diru guztia
-accountBalanceConnectionError=An error occurred while loading your balance.
+accountBalanceConnectionError=Please check your Internet connection.
 accountBalanceLoading=Kargatzen...
 monthlyBudget=Hileko aurrekontua
 status=Egoera
+statusOnError=Brave Wallet can't be reached.
 statusNextReconcileDate=Contribution due date is {{reconcileDate}}.
 createWallet=Diru-zorroa sortu
 createWalletStatus=Sakatu hemen diru-zorroa sortzeko

diff --git a/app/extensions/brave/locales/fr-FR/preferences.properties b/app/extensions/brave/locales/fr-FR/preferences.properties
@@ -26,10 +26,11 @@ paymentsSidebarText2=Toutes les adresses IP sont anonymisées avec la technologi
 paymentsSidebarText3=Les porte-monnaie Brave sont fournis grâce à un partenariat avec :
 paymentsSidebarText4=Vos contributions par cartes de crédit et bancaires sont gérées par :
 accountBalance=solde du compte
-accountBalanceConnectionError=Une erreur s'est produite lors du chargement de votre solde.
+accountBalanceConnectionError=Please check your Internet connection.
 accountBalanceLoading=chargement...
 monthlyBudget=budget mensuel
 status=statut
+statusOnError=Brave Wallet can't be reached.
 statusNextReconcileDate=La date d'échéance de la contribution est le {{reconcile Date}}.
 createWallet=créer un porte-monnaie
 createWalletStatus=Pour commencer, cliquez sur "créer un porte-monnaie"

diff --git a/app/extensions/brave/locales/hi-IN/preferences.properties b/app/extensions/brave/locales/hi-IN/preferences.properties
@@ -26,10 +26,11 @@ paymentsSidebarText2=All transaction IP addresses are anonymized with technology
 paymentsSidebarText3=Brave Bitcoin Wallets are provided through a partnership with:
 paymentsSidebarText4=Your contributions in the form of credit cards and bank cards are handled by:
 accountBalance=account balance
-accountBalanceConnectionError=An error occurred while loading your balance.
+accountBalanceConnectionError=Please check your Internet connection.
 accountBalanceLoading=loading…
 monthlyBudget=monthly budget
 status=status
+statusOnError=Brave Wallet can't be reached.
 statusNextReconcileDate=Contribution due date is {{reconcileDate}}.
 createWallet=create wallet
 createWalletStatus=Click the Create Wallet button to get started.

diff --git a/app/extensions/brave/locales/id-ID/preferences.properties b/app/extensions/brave/locales/id-ID/preferences.properties
@@ -26,10 +26,11 @@ paymentsSidebarText2=Semua alamat IP transaksi dianonimkan menggunakan teknologi
 paymentsSidebarText3=Dompet Bitcoin Brave tersedia melalui kerja sama dengan:
 paymentsSidebarText4=Kontribusi Anda dalam bentuk kartu kredit dan kartu bank ditangani oleh:
 accountBalance=saldo rekening
-accountBalanceConnectionError=Terjadi kesalahan ketika memuat saldo Anda.
+accountBalanceConnectionError=Please check your Internet connection.
 accountBalanceLoading=memuat...
 monthlyBudget=anggaran bulanan
 status=status
+statusOnError=Brave Wallet can't be reached.
 statusNextReconcileDate=Tanggal jatuh tempo kontribusi adalah {{reconcileDate}}.
 createWallet=buat dompet
 createWalletStatus=Klik tombol Buat Dompet untuk memulai.

diff --git a/app/extensions/brave/locales/it-IT/preferences.properties b/app/extensions/brave/locales/it-IT/preferences.properties
@@ -26,10 +26,11 @@ paymentsSidebarText2=Tutti gli indirizzi IP di transazione sono anonimi attraver
 paymentsSidebarText3=I portafoglio di Bitcoin di Brave sono forniti attraverso una partnership con:
 paymentsSidebarText4=I vostri contributi sotto forma di carte di credito e carte bancarie sono gestite da:
 accountBalance=saldo del conto
-accountBalanceConnectionError=An error occurred while loading your balance.
+accountBalanceConnectionError=Please check your Internet connection.
 accountBalanceLoading=caricamento in corso...
 monthlyBudget=budget mensile
 status=stato
+statusOnError=Brave Wallet can't be reached.
 statusNextReconcileDate=Contribution due date is {{reconcileDate}}.
 createWallet=crea portafoglio
 createWalletStatus=Fai click sul pulsante Crea Portafoglio per iniziare.

diff --git a/app/extensions/brave/locales/ja-JP/preferences.properties b/app/extensions/brave/locales/ja-JP/preferences.properties
@@ -26,10 +26,11 @@ paymentsSidebarText2=取引に用いられるIPアドレスは以下のサービ
 paymentsSidebarText3=Braveのビットコインウォレットは以下のパートナーシップにより提供されます
 paymentsSidebarText4=クレジットカードとデビットカードによる貢献は以下のサービスにより取り扱われます
 accountBalance=口座残高
-accountBalanceConnectionError=残高の読み込み中にエラーが発生しました。
+accountBalanceConnectionError=Please check your Internet connection.
 accountBalanceLoading=読み込み中です…
 monthlyBudget=毎月の予算
 status=状態
+statusOnError=Brave Wallet can't be reached.
 statusNextReconcileDate=寄付締切日は{{reconcileDate}}です。
 createWallet=ウォレットを作る
 createWalletStatus=始めるには「ウォレットを作る」ボタンを押してください。

diff --git a/app/extensions/brave/locales/ko-KR/preferences.properties b/app/extensions/brave/locales/ko-KR/preferences.properties
@@ -26,10 +26,11 @@ paymentsSidebarText2=모든 거래 IP 주소를 익명으로 처리해주는 기
 paymentsSidebarText3=Brave 비트 코인 지갑을 제휴해주는 파트너 :
 paymentsSidebarText4=신용 카드와 은행 카드의 양식의 기부를 처리해주는 곳:
 accountBalance=계정 잔액
-accountBalanceConnectionError=An error occurred while loading your balance.
+accountBalanceConnectionError=Please check your Internet connection.
 accountBalanceLoading=로딩중...
 monthlyBudget=월 예산
 status=상태
+statusOnError=Brave Wallet can't be reached.
 statusNextReconcileDate=Contribution due date is {{reconcileDate}}.
 createWallet=지갑 만들기
 createWalletStatus=지갑 만들기 버튼을 클릭하면 시작합니다.

diff --git a/app/extensions/brave/locales/ms-MY/preferences.properties b/app/extensions/brave/locales/ms-MY/preferences.properties
@@ -26,10 +26,11 @@ paymentsSidebarText2=Semua transaksi alamat IP dilakukan secara anonimi dengan t
 paymentsSidebarText3=E-dompet Bitcoin Brave disediakan melalui perkongsian dengan: 
 paymentsSidebarText4=Sumbangan anda dalam bentuk kad kredit atau kad bank dikendalikan oleh:
 accountBalance=baki akaun
-accountBalanceConnectionError=Ada ralat ketika memuat baki anda.
+accountBalanceConnectionError=Please check your Internet connection.
 accountBalanceLoading=sedang memuat...
 monthlyBudget=bajet bulanan
 status=status
+statusOnError=Brave Wallet can't be reached.
 statusNextReconcileDate=Tarikh akhir sumbangan: {{reconcileDate}}.
 createWallet=cipta e-dompet
 createWalletStatus=Klik butang Cipta Dompet untuk memulakannya.

diff --git a/app/extensions/brave/locales/nl-NL/preferences.properties b/app/extensions/brave/locales/nl-NL/preferences.properties
@@ -26,10 +26,11 @@ paymentsSidebarText2=All transaction IP addresses are anonymized with technology
 paymentsSidebarText3=Brave Bitcoin Wallets are provided through a partnership with:
 paymentsSidebarText4=Your contributions in the form of credit cards and bank cards are handled by:
 accountBalance=account balance
-accountBalanceConnectionError=An error occurred while loading your balance.
+accountBalanceConnectionError=Please check your Internet connection.
 accountBalanceLoading=loading…
 monthlyBudget=monthly budget
 status=status
+statusOnError=Brave Wallet can't be reached.
 statusNextReconcileDate=Contribution due date is {{reconcileDate}}.
 createWallet=create wallet
 createWalletStatus=Click the Create Wallet button to get started.

diff --git a/app/extensions/brave/locales/pl-PL/preferences.properties b/app/extensions/brave/locales/pl-PL/preferences.properties
@@ -26,10 +26,11 @@ paymentsSidebarText2=All transaction IP addresses are anonymized with technology
 paymentsSidebarText3=Brave Bitcoin Wallets are provided through a partnership with:
 paymentsSidebarText4=Your contributions in the form of credit cards and bank cards are handled by:
 accountBalance=account balance
-accountBalanceConnectionError=An error occurred while loading your balance.
+accountBalanceConnectionError=Please check your Internet connection.
 accountBalanceLoading=loading…
 monthlyBudget=monthly budget
 status=status
+statusOnError=Brave Wallet can't be reached.
 statusNextReconcileDate=Contribution due date is {{reconcileDate}}.
 createWallet=create wallet
 createWalletStatus=Click the Create Wallet button to get started.

diff --git a/app/extensions/brave/locales/pt-BR/preferences.properties b/app/extensions/brave/locales/pt-BR/preferences.properties
@@ -26,10 +26,11 @@ paymentsSidebarText2=Todos os endereços IP de transações são anonimizados co
 paymentsSidebarText3=As Carteiras Bitcoin Brave são fornecidas através de uma parceria com: 
 paymentsSidebarText4=As suas contribuições sob a forma de cartões de crédito e de cartões bancários são processadas por: 
 accountBalance=saldo da conta
-accountBalanceConnectionError=An error occurred while loading your balance.
+accountBalanceConnectionError=Please check your Internet connection.
 accountBalanceLoading=a carregar...
 monthlyBudget=orçamento mensal
 status=estado 
+statusOnError=Brave Wallet can't be reached.
 statusNextReconcileDate=Contribution due date is {{reconcileDate}}.
 createWallet=criar carteira
 createWalletStatus=Clique no botão Criar Carteira para começar:

diff --git a/app/extensions/brave/locales/ru/preferences.properties b/app/extensions/brave/locales/ru/preferences.properties
@@ -26,10 +26,11 @@ paymentsSidebarText2=Все IP-адреса транзакций анонимн
 paymentsSidebarText3=Brave Bitcoin кошельки предоставляются в рамках партнерства с:
 paymentsSidebarText4=Ваши пожертвования с кредитных и банковских карт обрабатываются:
 accountBalance=баланс аккаунта
-accountBalanceConnectionError=Произошла ошибка при загрузке вашего баланса.
+accountBalanceConnectionError=Please check your Internet connection.
 accountBalanceLoading=загрузка...
 monthlyBudget=ежемесячный бюджет
 status=статус
+statusOnError=Brave Wallet can't be reached.
 statusNextReconcileDate=Дата пожертвования {{reconcileDate}}.
 createWallet=создать кошелек
 createWalletStatus=Нажмите на кнопку Создать кошелек, чтобы начать работу.

diff --git a/app/extensions/brave/locales/sl/preferences.properties b/app/extensions/brave/locales/sl/preferences.properties
@@ -26,10 +26,11 @@ paymentsSidebarText2=Vsi naslovi IP transakcij se anonimizirajo s tehnologijo, k
 paymentsSidebarText3=Denarnice Bitcoin Brave zagotavlja partnerstvo z:
 paymentsSidebarText4=Vaše prispevke s kreditnih in bančnih kartic obdeluje:
 accountBalance=stanje na računu
-accountBalanceConnectionError=Pri nalaganju vašega stanja je prišlo od napake.
+accountBalanceConnectionError=Please check your Internet connection.
 accountBalanceLoading=Nalaganje ...
 monthlyBudget=mesečni proračun
 status=stanje
+statusOnError=Brave Wallet can't be reached.
 statusNextReconcileDate=Rok za prispevek je {{reconcileDate}}.
 createWallet=Ustvari denarnico
 createWalletStatus=Kliknite gumb Ustvari denarnico, da začnete.

diff --git a/app/extensions/brave/locales/ta/preferences.properties b/app/extensions/brave/locales/ta/preferences.properties
@@ -26,10 +26,11 @@ paymentsSidebarText2=All transaction IP addresses are anonymized with technology
 paymentsSidebarText3=Brave Bitcoin Wallets are provided through a partnership with:
 paymentsSidebarText4=Your contributions in the form of credit cards and bank cards are handled by:
 accountBalance=account balance
-accountBalanceConnectionError=An error occurred while loading your balance.
+accountBalanceConnectionError=Please check your Internet connection.
 accountBalanceLoading=loading…
 monthlyBudget=monthly budget
 status=status
+statusOnError=Brave Wallet can't be reached.
 statusNextReconcileDate=Contribution due date is {{reconcileDate}}.
 createWallet=create wallet
 createWalletStatus=Click the Create Wallet button to get started.

diff --git a/app/extensions/brave/locales/te/preferences.properties b/app/extensions/brave/locales/te/preferences.properties
@@ -26,10 +26,11 @@ paymentsSidebarText2=All transaction IP addresses are anonymized with technology
 paymentsSidebarText3=Brave Bitcoin Wallets are provided through a partnership with:
 paymentsSidebarText4=Your contributions in the form of credit cards and bank cards are handled by:
 accountBalance=account balance
-accountBalanceConnectionError=An error occurred while loading your balance.
+accountBalanceConnectionError=Please check your Internet connection.
 accountBalanceLoading=loading…
 monthlyBudget=monthly budget
 status=status
+statusOnError=Brave Wallet can't be reached.
 statusNextReconcileDate=Contribution due date is {{reconcileDate}}.
 createWallet=create wallet
 createWalletStatus=Click the Create Wallet button to get started.

diff --git a/app/extensions/brave/locales/tr-TR/preferences.properties b/app/extensions/brave/locales/tr-TR/preferences.properties
@@ -26,10 +26,11 @@ paymentsSidebarText2=All transaction IP addresses are anonymized with technology
 paymentsSidebarText3=Brave Bitcoin Wallets are provided through a partnership with:
 paymentsSidebarText4=Your contributions in the form of credit cards and bank cards are handled by:
 accountBalance=Hesap Bakiyesi
-accountBalanceConnectionError=An error occurred while loading your balance.
+accountBalanceConnectionError=Please check your Internet connection.
 accountBalanceLoading=Yükleniyor...
 monthlyBudget=Aylık Bütçe
 status=Durum
+statusOnError=Brave Wallet can't be reached.
 statusNextReconcileDate=Contribution due date is {{reconcileDate}}.
 createWallet=Cüzdan Oluştur
 createWalletStatus=Başlamak için Cüzdan Oluştur düğmesini tıklayın.

diff --git a/app/extensions/brave/locales/uk/preferences.properties b/app/extensions/brave/locales/uk/preferences.properties
@@ -26,10 +26,11 @@ paymentsSidebarText2=Всі IP-адреси транзакцій анонімі
 paymentsSidebarText3=Гаманці Brave Bitcoin надаються через партнерство з:
 paymentsSidebarText4=Ваші внески у вигляді платежів з банківських карток обробляються:
 accountBalance=баланс по рахунку
-accountBalanceConnectionError=Сталася помилка при завантаженні вашого балансу.
+accountBalanceConnectionError=Please check your Internet connection.
 accountBalanceLoading=завантаження…
 monthlyBudget=місячний бюджет
 status=стан
+statusOnError=Brave Wallet can't be reached.
 statusNextReconcileDate=Наступний платіжний внесок {{reconcileDate}}.
 createWallet=створити гаманець
 createWalletStatus=Натисніть кнопку Створити гаманець для початку.

diff --git a/app/extensions/brave/locales/zh-CN/preferences.properties b/app/extensions/brave/locales/zh-CN/preferences.properties
@@ -26,10 +26,11 @@ paymentsSidebarText2=所有的交易IP地址由...提供的匿名技术
 paymentsSidebarText3=Brave比特币钱包是由...合作伙伴提供
 paymentsSidebarText4=您以信用卡和银行卡形式的捐款是交由...处理的
 accountBalance=账户余额
-accountBalanceConnectionError=An error occurred while loading your balance.
+accountBalanceConnectionError=Please check your Internet connection.
 accountBalanceLoading=正在加载...
 monthlyBudget=每月预算
 status=状态
+statusOnError=Brave Wallet can't be reached.
 statusNextReconcileDate=打赏截止日期为{{协调日期}}
 createWallet=创建钱包
 createWalletStatus=点击“创建钱包”按钮开始

diff --git a/app/ledger.js b/app/ledger.js
@@ -1205,6 +1205,7 @@ var getStateInfo = (state) => {
   var then = underscore.now() - msecs.year
 
   ledgerInfo.paymentId = state.properties.wallet.paymentId
+  ledgerInfo.address = state.properties.wallet.address
   ledgerInfo.passphrase = state.properties.wallet.keychains.passphrase
 
   ledgerInfo.minDuration = synopsis.options.minDuration
@@ -1411,7 +1412,7 @@ var networkConnected = underscore.debounce(() => {
   if (client.sync(callback) === true) run(random.randomInt({ min: msecs.minute, max: 10 * msecs.minute }))
 
   if (balanceTimeoutId) clearTimeout(balanceTimeoutId)
-  balanceTimeoutId = setTimeout(getBalance, 5 * msecs.second)
+  balanceTimeoutId = setTimeout(getBalance, 1 * msecs.second)
 }, 1 * msecs.minute, true)
 
 /*