From 42146a32e49b97a1e35df016ea724d4dc48bad9c Mon Sep 17 00:00:00 2001 From: Marshall Rose Date: Tue, 1 Nov 2016 21:12:09 -0700 Subject: [PATCH] fix linkage for MINIMUM_VISIT_TIME and MINIMUM_VISITS and also make contribution date wording more consistent. auditor: @ayumi Fix #5200 Fix #5343 --- .../locales/bn-BD/preferences.properties | 2 +- .../locales/bn-IN/preferences.properties | 2 +- .../locales/en-US/preferences.properties | 2 +- .../brave/locales/es/preferences.properties | 2 +- .../brave/locales/eu/preferences.properties | 2 +- .../locales/fr-FR/preferences.properties | 2 +- .../locales/hi-IN/preferences.properties | 2 +- .../locales/it-IT/preferences.properties | 2 +- .../locales/ja-JP/preferences.properties | 2 +- .../locales/ko-KR/preferences.properties | 2 +- .../locales/nl-NL/preferences.properties | 2 +- .../locales/pl-PL/preferences.properties | 2 +- .../locales/pt-BR/preferences.properties | 2 +- .../brave/locales/ta/preferences.properties | 2 +- .../brave/locales/te/preferences.properties | 2 +- .../locales/tr-TR/preferences.properties | 2 +- .../brave/locales/uk/preferences.properties | 2 +- .../locales/zh-CN/preferences.properties | 2 +- app/ledger.js | 20 +++++++++++++++++-- js/about/preferences.js | 2 +- js/constants/settings.js | 2 +- package.json | 4 ++-- 22 files changed, 40 insertions(+), 24 deletions(-) diff --git a/app/extensions/brave/locales/bn-BD/preferences.properties b/app/extensions/brave/locales/bn-BD/preferences.properties index c6a9701f04c..8d8391c571c 100644 --- a/app/extensions/brave/locales/bn-BD/preferences.properties +++ b/app/extensions/brave/locales/bn-BD/preferences.properties @@ -30,7 +30,7 @@ accountBalanceConnectionError=তথ্য প্রাপ্তিতে ত্ accountBalanceLoading=লোড হচ্ছে monthlyBudget=মাসিক বাজেট status=অবস্থা -statusNextReconcileDate=Contribution due date: {{reconcileDate}}. +statusNextReconcileDate=Contribution due date is {{reconcileDate}}. createWallet=ওয়ালেট তৈরি করুন createWalletStatus=ওয়ালেট তৈরি করুন বাটনে ক্লিক করে শুরু করুন। creatingWallet=তৈরি করা হচ্ছে diff --git a/app/extensions/brave/locales/bn-IN/preferences.properties b/app/extensions/brave/locales/bn-IN/preferences.properties index 24e6fa6a059..89ba8a30825 100644 --- a/app/extensions/brave/locales/bn-IN/preferences.properties +++ b/app/extensions/brave/locales/bn-IN/preferences.properties @@ -30,7 +30,7 @@ accountBalanceConnectionError=error, can't retrieve data accountBalanceLoading=loading… monthlyBudget=monthly budget status=status -statusNextReconcileDate=Contribution due date: {{reconcileDate}}. +statusNextReconcileDate=Contribution due date is {{reconcileDate}}. createWallet=create wallet createWalletStatus=Click the Create Wallet button to get started. creatingWallet=creating… diff --git a/app/extensions/brave/locales/en-US/preferences.properties b/app/extensions/brave/locales/en-US/preferences.properties index 9cfa00f3f6f..e2875ffffd4 100644 --- a/app/extensions/brave/locales/en-US/preferences.properties +++ b/app/extensions/brave/locales/en-US/preferences.properties @@ -30,7 +30,7 @@ accountBalanceConnectionError=error, can't retrieve data accountBalanceLoading=loading… monthlyBudget=monthly budget status=status -statusNextReconcileDate=Contribution due date: {{reconcileDate}}. +statusNextReconcileDate=Contribution due date is {{reconcileDate}}. createWallet=create wallet createWalletStatus=Click the Create Wallet button to get started. creatingWallet=creating… diff --git a/app/extensions/brave/locales/es/preferences.properties b/app/extensions/brave/locales/es/preferences.properties index b1291606dce..7997e3dcc5f 100644 --- a/app/extensions/brave/locales/es/preferences.properties +++ b/app/extensions/brave/locales/es/preferences.properties @@ -30,7 +30,7 @@ accountBalanceConnectionError=error, no se pueden recuperar los datos accountBalanceLoading=cargando... monthlyBudget=presupuesto mensual status=estado -statusNextReconcileDate=Contribution due date: {{reconcileDate}}. +statusNextReconcileDate=Contribution due date is {{reconcileDate}}. createWallet=crear cartera createWalletStatus=Haga clic en el botón crear cartera para comenzar. creatingWallet=creando... diff --git a/app/extensions/brave/locales/eu/preferences.properties b/app/extensions/brave/locales/eu/preferences.properties index 0b950923b1a..511602f6726 100644 --- a/app/extensions/brave/locales/eu/preferences.properties +++ b/app/extensions/brave/locales/eu/preferences.properties @@ -30,7 +30,7 @@ accountBalanceConnectionError=Errorea, ezin dira datuak berreskuratu accountBalanceLoading=Kargatzen... monthlyBudget=Hileko aurrekontua status=Egoera -statusNextReconcileDate=Contribution due date: {{reconcileDate}}. +statusNextReconcileDate=Contribution due date is {{reconcileDate}}. createWallet=Diru-zorroa sortu createWalletStatus=Sakatu hemen diru-zorroa sortzeko creatingWallet=sortzen... diff --git a/app/extensions/brave/locales/fr-FR/preferences.properties b/app/extensions/brave/locales/fr-FR/preferences.properties index bb1ac056d78..a8a7ee50061 100644 --- a/app/extensions/brave/locales/fr-FR/preferences.properties +++ b/app/extensions/brave/locales/fr-FR/preferences.properties @@ -30,7 +30,7 @@ accountBalanceConnectionError=erreur, impossible de récupérer les données accountBalanceLoading=chargement... monthlyBudget=budget mensuel status=statut -statusNextReconcileDate=Contribution due date: {{reconcileDate}}. +statusNextReconcileDate=Contribution due date is {{reconcileDate}}. createWallet=créer un porte-monnaie createWalletStatus=Pour commencer, cliquez sur "créer un porte-monnaie" creatingWallet=création... diff --git a/app/extensions/brave/locales/hi-IN/preferences.properties b/app/extensions/brave/locales/hi-IN/preferences.properties index 054a6bc0ab6..6f7e6360de0 100644 --- a/app/extensions/brave/locales/hi-IN/preferences.properties +++ b/app/extensions/brave/locales/hi-IN/preferences.properties @@ -30,7 +30,7 @@ accountBalanceConnectionError=error, can't retrieve data accountBalanceLoading=loading… monthlyBudget=monthly budget status=status -statusNextReconcileDate=Contribution due date: {{reconcileDate}}. +statusNextReconcileDate=Contribution due date is {{reconcileDate}}. createWallet=create wallet createWalletStatus=Click the Create Wallet button to get started. creatingWallet=creating… diff --git a/app/extensions/brave/locales/it-IT/preferences.properties b/app/extensions/brave/locales/it-IT/preferences.properties index 7c2b1ccf034..5410869ba8c 100644 --- a/app/extensions/brave/locales/it-IT/preferences.properties +++ b/app/extensions/brave/locales/it-IT/preferences.properties @@ -30,7 +30,7 @@ accountBalanceConnectionError=errore, impossibile recuperare i dati accountBalanceLoading=caricamento in corso... monthlyBudget=budget mensile status=stato -statusNextReconcileDate=Contribution due date: {{reconcileDate}}. +statusNextReconcileDate=Contribution due date is {{reconcileDate}}. createWallet=crea portafoglio createWalletStatus=Fai click sul pulsante Crea Portafoglio per iniziare. creatingWallet=creazione in corso... diff --git a/app/extensions/brave/locales/ja-JP/preferences.properties b/app/extensions/brave/locales/ja-JP/preferences.properties index 96c3ebaaab7..f1f43b6fc01 100644 --- a/app/extensions/brave/locales/ja-JP/preferences.properties +++ b/app/extensions/brave/locales/ja-JP/preferences.properties @@ -30,7 +30,7 @@ accountBalanceConnectionError=エラーが発生しました。データが取 accountBalanceLoading=読み込み中です… monthlyBudget=毎月の予算 status=状態 -statusNextReconcileDate=Contribution due date: {{reconcileDate}}. +statusNextReconcileDate=Contribution due date is {{reconcileDate}}. createWallet=ウォレットを作る createWalletStatus=始めるには「ウォレットを作る」ボタンを押してください。 creatingWallet=作っています… diff --git a/app/extensions/brave/locales/ko-KR/preferences.properties b/app/extensions/brave/locales/ko-KR/preferences.properties index a52a5ab1629..8780399a45a 100644 --- a/app/extensions/brave/locales/ko-KR/preferences.properties +++ b/app/extensions/brave/locales/ko-KR/preferences.properties @@ -30,7 +30,7 @@ accountBalanceConnectionError=오류, 데이터를 검색 할 수 없습니다. accountBalanceLoading=로딩중... monthlyBudget=월 예산 status=상태 -statusNextReconcileDate=Contribution due date: {{reconcileDate}}. +statusNextReconcileDate=Contribution due date is {{reconcileDate}}. createWallet=지갑 만들기 createWalletStatus=지갑 만들기 버튼을 클릭하면 시작합니다. creatingWallet=만들기... diff --git a/app/extensions/brave/locales/nl-NL/preferences.properties b/app/extensions/brave/locales/nl-NL/preferences.properties index f773867f1d7..3982fd23916 100644 --- a/app/extensions/brave/locales/nl-NL/preferences.properties +++ b/app/extensions/brave/locales/nl-NL/preferences.properties @@ -30,7 +30,7 @@ accountBalanceConnectionError=error, can't retrieve data accountBalanceLoading=loading… monthlyBudget=monthly budget status=status -statusNextReconcileDate=Contribution due date: {{reconcileDate}}. +statusNextReconcileDate=Contribution due date is {{reconcileDate}}. createWallet=create wallet createWalletStatus=Click the Create Wallet button to get started. creatingWallet=creating… diff --git a/app/extensions/brave/locales/pl-PL/preferences.properties b/app/extensions/brave/locales/pl-PL/preferences.properties index 1412e71f2e1..e1d2b8bb33e 100644 --- a/app/extensions/brave/locales/pl-PL/preferences.properties +++ b/app/extensions/brave/locales/pl-PL/preferences.properties @@ -30,7 +30,7 @@ accountBalanceConnectionError=error, can't retrieve data accountBalanceLoading=loading… monthlyBudget=monthly budget status=status -statusNextReconcileDate=Contribution due date: {{reconcileDate}}. +statusNextReconcileDate=Contribution due date is {{reconcileDate}}. createWallet=create wallet createWalletStatus=Click the Create Wallet button to get started. creatingWallet=creating… diff --git a/app/extensions/brave/locales/pt-BR/preferences.properties b/app/extensions/brave/locales/pt-BR/preferences.properties index ac65f0ff80f..7d2b848160f 100644 --- a/app/extensions/brave/locales/pt-BR/preferences.properties +++ b/app/extensions/brave/locales/pt-BR/preferences.properties @@ -30,7 +30,7 @@ accountBalanceConnectionError=erro, impossível recuperar dados accountBalanceLoading=a carregar... monthlyBudget=orçamento mensal status=estado -statusNextReconcileDate=Contribution due date: {{reconcileDate}}. +statusNextReconcileDate=Contribution due date is {{reconcileDate}}. createWallet=criar carteira createWalletStatus=Clique no botão Criar Carteira para começar: creatingWallet=a criar... diff --git a/app/extensions/brave/locales/ta/preferences.properties b/app/extensions/brave/locales/ta/preferences.properties index ea36c8046d6..b721870d898 100644 --- a/app/extensions/brave/locales/ta/preferences.properties +++ b/app/extensions/brave/locales/ta/preferences.properties @@ -30,7 +30,7 @@ accountBalanceConnectionError=error, can't retrieve data accountBalanceLoading=loading… monthlyBudget=monthly budget status=status -statusNextReconcileDate=Contribution due date: {{reconcileDate}}. +statusNextReconcileDate=Contribution due date is {{reconcileDate}}. createWallet=create wallet createWalletStatus=Click the Create Wallet button to get started. creatingWallet=creating… diff --git a/app/extensions/brave/locales/te/preferences.properties b/app/extensions/brave/locales/te/preferences.properties index 0ea700b8733..4ef6d07101f 100644 --- a/app/extensions/brave/locales/te/preferences.properties +++ b/app/extensions/brave/locales/te/preferences.properties @@ -30,7 +30,7 @@ accountBalanceConnectionError=error, can't retrieve data accountBalanceLoading=loading… monthlyBudget=monthly budget status=status -statusNextReconcileDate=Contribution due date: {{reconcileDate}}. +statusNextReconcileDate=Contribution due date is {{reconcileDate}}. createWallet=create wallet createWalletStatus=Click the Create Wallet button to get started. creatingWallet=creating… diff --git a/app/extensions/brave/locales/tr-TR/preferences.properties b/app/extensions/brave/locales/tr-TR/preferences.properties index f63e69e8b3d..106329185f6 100644 --- a/app/extensions/brave/locales/tr-TR/preferences.properties +++ b/app/extensions/brave/locales/tr-TR/preferences.properties @@ -30,7 +30,7 @@ accountBalanceConnectionError=Hata, veri alınamıyor accountBalanceLoading=Yükleniyor... monthlyBudget=Aylık Bütçe status=Durum -statusNextReconcileDate=Contribution due date: {{reconcileDate}}. +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. creatingWallet=Oluşturuluyor... diff --git a/app/extensions/brave/locales/uk/preferences.properties b/app/extensions/brave/locales/uk/preferences.properties index 92340700cf4..284cb6e8731 100644 --- a/app/extensions/brave/locales/uk/preferences.properties +++ b/app/extensions/brave/locales/uk/preferences.properties @@ -30,7 +30,7 @@ accountBalanceConnectionError=помилка, неможливо отримат accountBalanceLoading=завантаження… monthlyBudget=місячний бюджет status=стан -statusNextReconcileDate=Contribution due date: {{reconcileDate}}. +statusNextReconcileDate=Contribution due date is {{reconcileDate}}. createWallet=створити гаманець createWalletStatus=Натисніть кнопку Створити гаманець для початку. creatingWallet=створення… diff --git a/app/extensions/brave/locales/zh-CN/preferences.properties b/app/extensions/brave/locales/zh-CN/preferences.properties index a33ac5a25c5..2c16ff5dfec 100644 --- a/app/extensions/brave/locales/zh-CN/preferences.properties +++ b/app/extensions/brave/locales/zh-CN/preferences.properties @@ -30,7 +30,7 @@ accountBalanceConnectionError=错误，无法检索数据 accountBalanceLoading=正在加载... monthlyBudget=每月预算 status=状态 -statusNextReconcileDate=Contribution due date: {{reconcileDate}}. +statusNextReconcileDate=Contribution due date is {{reconcileDate}}. createWallet=创建钱包 createWalletStatus=点击“创建钱包”按钮开始 creatingWallet=正在创建... diff --git a/app/ledger.js b/app/ledger.js index 97def35c81c..cbff4f2bb08 100644 --- a/app/ledger.js +++ b/app/ledger.js @@ -142,11 +142,11 @@ const doAction = (action) => { case settings.MINIMUM_VISIT_TIME: if (action.value <= 0) break - synopsis.options.minDuration = action.value + synopsis.options.minDuration = action.value * 1000 updatePublisherInfo() break - case settings.MINIMUM_VISTS: + case settings.MINIMUM_VISITS: if (action.value <= 0) break synopsis.options.minPublisherVisits = action.value @@ -562,7 +562,23 @@ var enable = (paymentsEnabled) => { synopsis = new (ledgerPublisher.Synopsis)() fs.readFile(pathName(synopsisPath), (err, data) => { var initSynopsis = () => { + var value + // cf., the `Synopsis` constructor, https://github.com/brave/ledger-publisher/blob/master/index.js#L167 + value = getSetting(settings.MINIMUM_VISIT_TIME) + if (!value) { + value = 8 + appActions.changeSetting(settings.MINIMUM_VISIT_TIME, value) + } + if (value > 0) synopsis.options.minDuration = value * 1000 + + value = getSetting(settings.MINIMUM_VISITS) + if (!value) { + value = 5 + appActions.changeSetting(settings.MINIMUM_VISITS, value) + } + if (value > 0) synopsis.options.minPublisherVisits = value + if (process.env.NODE_ENV === 'test') { synopsis.options.minDuration = 0 synopsis.options.minPublisherDuration = 0 diff --git a/js/about/preferences.js b/js/about/preferences.js index 3099a43d3e3..c14d5c0557d 100644 --- a/js/about/preferences.js +++ b/js/about/preferences.js @@ -1001,7 +1001,7 @@ class PaymentsTab extends ImmutableComponent {