From f1ea0b20dd69f3e4b2208437ab2a768f67245630 Mon Sep 17 00:00:00 2001
From: infinite-persistence <inf.persistence@gmail.com>
Date: Thu, 24 Mar 2022 15:13:14 +0800
Subject: [PATCH] Fix i18n issues reported

- Changed to "Add a Card" to reuse existing string.
---
 static/app-strings.json           | 12 ++++++++----
 ui/page/odyseeMembership/view.jsx |  4 ++--
 ui/redux/actions/rewards.js       |  3 ++-
 ui/util/api-message.js            | 12 ++++++++++++
 4 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/static/app-strings.json b/static/app-strings.json
index 1a711f9e2..364e3bab3 100644
--- a/static/app-strings.json
+++ b/static/app-strings.json
@@ -601,6 +601,7 @@
   "RSS URL copied.": "RSS URL copied.",
   "Failed to copy RSS URL.": "Failed to copy RSS URL.",
   "Text copied": "Text copied",
+  "Embed link copied": "Embed link copied",
   "Wallet server": "Wallet server",
   "Wallet servers are used to relay data to and from the LBRY blockchain. They also determine what content shows in trending or is blocked. %learn_more%": "Wallet servers are used to relay data to and from the LBRY blockchain. They also determine what content shows in trending or is blocked. %learn_more%",
   "Your Tags": "Your Tags",
@@ -927,6 +928,9 @@
   "in %duration% seconds": "in %duration% seconds",
   "in %duration% second": "in %duration% second",
   "in a few seconds": "in %duration% second",
+  "in a week": "in a week",
+  "in a month": "in a month",
+  "in a year": "in a year",
   "Just now": "Just now",
   "Message received! Thanks for helping.": "Message received! Thanks for helping.",
   "Report an issue or request a feature": "Report an issue or request a feature",
@@ -1409,10 +1413,9 @@
   "Some extra Credits for you and the person that brought you to us.": "Some extra Credits for you and the person that brought you to us.",
   "Weekly Watch Reward": "Weekly Watch Reward",
   "%SITE_NAME% view reward": "%SITE_NAME% view reward",
-  "You earned %lbc% for looking at neat stuff. ": "You earned %lbc% for looking at neat stuff. ",
-  "Earn a random reward of at least %lbc% for watching anything at all.": "Earn a random reward of at least %lbc% for watching anything at all.",
-  "You have already claimed this reward within the last 24 hours.": "You have already claimed this reward within the last 24 hours.",
-  "Please watch some content to earn this reward.": "Please watch some content to earn this reward.",
+  "You earned %lbc% for looking at neat stuff this week.": "You earned %lbc% for looking at neat stuff this week.",
+  "You have already claimed this reward within the last week.": "You have already claimed this reward within the last week.",
+  "You only watched content for %1% days in the last week. It needs to be at least %2% to get the reward.": "You only watched content for %1% days in the last week. It needs to be at least %2% to get the reward.",
   "You will receive an SMS text message confirming your phone number is valid. May not be available in all regions.": "You will receive an SMS text message confirming your phone number is valid. May not be available in all regions.",
   "Verified accounts are eligible to earn LBRY Credits for views, watching and reposting videos, sharing invite links etc. Verifying also helps us keep the %SITE_NAME% community safe too! %Refresh% or %Skip%.": "Verified accounts are eligible to earn LBRY Credits for views, watching and reposting videos, sharing invite links etc. Verifying also helps us keep the %SITE_NAME% community safe too! %Refresh% or %Skip%.",
   "Your First Nickel": "Your First Nickel",
@@ -2257,5 +2260,6 @@
   "Still Valid Until": "Still Valid Until",
   "Membership Period Options": "Membership Period Options",
   "%yearly_cost% USD For A One Year Membership (%monthly_cost% Per Month)": "%yearly_cost% USD For A One Year Membership (%monthly_cost% Per Month)",
+  "Active channel": "Active channel",
   "--end--": "--end--"
 }
diff --git a/ui/page/odyseeMembership/view.jsx b/ui/page/odyseeMembership/view.jsx
index 2ad4d9eee..06180ef6b 100644
--- a/ui/page/odyseeMembership/view.jsx
+++ b/ui/page/odyseeMembership/view.jsx
@@ -22,7 +22,7 @@ let stripeEnvironment = getStripeEnvironment();
 
 const isDev = process.env.NODE_ENV !== 'production';
 
-let log = function(input) {};
+let log = (input) => {};
 if (isDev) log = console.log;
 
 // odysee channel information since the memberships are only for Odysee
@@ -667,7 +667,7 @@ const OdyseeMembershipPage = (props: Props) => {
 
                 <Button
                   button="primary"
-                  label={__('Add A Card')}
+                  label={__('Add a Card')}
                   icon={ICONS.SETTINGS}
                   navigate={`/$/${PAGES.SETTINGS_STRIPE_CARD}`}
                   className="membership_button"
diff --git a/ui/redux/actions/rewards.js b/ui/redux/actions/rewards.js
index 3e87a6688..88f2b987a 100644
--- a/ui/redux/actions/rewards.js
+++ b/ui/redux/actions/rewards.js
@@ -6,6 +6,7 @@ import { selectUnclaimedRewards, selectWeeklyWatchClaimedThisWeek } from 'redux/
 import { selectUserIsRewardApproved } from 'redux/selectors/user';
 import { doFetchInviteStatus } from 'redux/actions/user';
 import rewards from 'rewards';
+import { resolveApiMessage } from 'util/api-message';
 
 export function doRewardList() {
   return (dispatch) => {
@@ -111,7 +112,7 @@ export function doClaimRewardType(rewardType, options = {}) {
       });
 
       if (options.notifyError) {
-        dispatch(doToast({ message: error.message, isError: true }));
+        dispatch(doToast({ message: resolveApiMessage(error.message), isError: true }));
       }
 
       if (options.callback) {
diff --git a/ui/util/api-message.js b/ui/util/api-message.js
index e2fae3fdb..525d013df 100644
--- a/ui/util/api-message.js
+++ b/ui/util/api-message.js
@@ -39,6 +39,18 @@ const MESSAGE_MAP: Array<ApiMsgConfig> = Object.freeze([
     originalMsg: 'this creator has set minimum account age requirements that are not currently met',
     replacement: "Your channel does not meet the creator's minimum channel-age limit.",
   },
+  {
+    originalMsg: /^You only watched content (.*) days in the last week and it needs to be at least (.*) to get the reward.$/,
+    replacement: 'You only watched content for %1% days in the last week. It needs to be at least %2% to get the reward.',
+  },
+  // {
+  //   originalMsg: /^Earn a random reward of at least 0.1 LBC for watching cool stuff at least 3 days during the week. You can claim it again in (.*)$/,
+  //   replacement: 'Earn a random reward of at least 0.1 LBC for watching cool stuff at least 3 days during the week. You can claim it again in %1%',
+  // },
+  // {
+  //   originalMsg: /^Earn a random reward of at least 0.1 LBC for watching cool stuff at least 3 days during the week. You last claimed it (.*) ago!$/,
+  //   replacement: 'Earn a random reward of at least 0.1 LBC for watching cool stuff at least 3 days during the week. You last claimed it %1% ago!',
+  // },
 ]);
 
 /**