i18n (#1252)

static/app-strings.json

@@ -24,7 +24,6 @@
   "Following --[button label indicating a channel has been followed]--": "Following",
   "The tags you follow will change what's trending for you.": "The tags you follow will change what's trending for you.",
   "Tags": "Tags",
-  "Send a tip": "Send a tip",
   "Share": "Share",
   "Play": "Play",
   "Shuffle Play": "Shuffle Play",
@@ -1024,6 +1023,7 @@
   "Sending": "Sending",
   "From": "From",
   "Only creators that verify cash accounts can receive tips": "Only creators that verify cash accounts can receive tips",
+  "Send a tip directly from your attached card": "Send a tip directly from your attached card",
   "Amount must be at least one dollar": "Amount must be at least one dollar",
   "Update Your Password": "Update Your Password",
   "Your Wallet is Empty": "Your Wallet is Empty",
@@ -1062,8 +1062,7 @@
   "Boost This %claimTypeText%": "Boost This %claimTypeText%",
   "Boost Your %claimTypeText%": "Boost Your %claimTypeText%",
   "Tip This %claimTypeText%": "Tip This %claimTypeText%",
-  "Send a $%displayAmount% Tip": "Send a $%displayAmount% Tip",
+  "Send a %amount% tip": "Send a %amount% tip",
-  "Send a %displayAmount% Credit Tip": "Send a %displayAmount% Credit Tip",
   "Boost": "Boost",
   "Boost transaction successful.": "Boost transaction successful.",
   "Boost transaction failed.": "Boost transaction failed.",
@@ -1983,6 +1982,7 @@
   "Manage Card": "Manage Card",
   "Card Details": "Card Details",
   "Remove Card": "Remove Card",
+  "Currency To Use": "Currency To Use",
   "Sorry, there was an error in processing your payment!": "Sorry, there was an error in processing your payment!",
   "Congratulations! Your account has been connected with Odysee.": "Congratulations! Your account has been connected with Odysee.",
   "Although your account is connected it still requires verification to begin receiving tips.": "Although your account is connected it still requires verification to begin receiving tips.",
@@ -2202,7 +2202,7 @@
   "You currently have no active memberships": "You currently have no active memberships",
   "Canceled Memberships": "Canceled Memberships",
   "You currently have no canceled memberships": "You currently have no canceled memberships",
-  "You are purchasing a %monthly_yearly% %plan% membership that is active immediately and will renew %monthly_yearly% at a price of %price%.": "You are purchasing a %monthly_yearly% %plan% membership that is active immediately and will renew %monthly_yearly% at a price of %price%.",
+  "You are purchasing a %monthly_yearly_bolded% %plan% membership that is active immediately and will renew %monthly_yearly% at a price of %price%.": "You are purchasing a %monthly_yearly_bolded% %plan% membership that is active immediately and will renew %monthly_yearly% at a price of %price%.",
   "monthly": "monthly",
   "yearly": "yearly",
   "You can cancel Premium at any time (no refunds) and you can also close this window and choose a different membership option.": "You can cancel Premium at any time (no refunds) and you can also close this window and choose a different membership option.",
@@ -2223,13 +2223,10 @@
   "You are cancelling your Odysee Premium. You will still have access to all the paid features until the point of the expiration of your current membership, at which point you will not be charged again and your membership will no longer be active. At this time, there is no way to subscribe to another membership if you cancel and there are no refunds.": "You are cancelling your Odysee Premium. You will still have access to all the paid features until the point of the expiration of your current membership, at which point you will not be charged again and your membership will no longer be active. At this time, there is no way to subscribe to another membership if you cancel and there are no refunds.",
   "Sorry, there was an error, please contact support or try again later": "Sorry, there was an error, please contact support or try again later",
   "Please save a card as a payment method so you can join Odysee Premium": "Please save a card as a payment method so you can join Odysee Premium",
-  "After the card is added, click Back": "After the card is added, click Back",
   "Registered On": "Registered On",
   "Auto-Renews On": "Auto-Renews On",
   "Canceled On": "Canceled On",
   "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--"
 }

ui/component/sideNavigation/view.jsx

@@ -22,15 +22,16 @@ const touch = isTouch();
 
 type SideNavLink = {
   title: string,
+  icon: string,
   link?: string,
   route?: string,
   onClick?: () => any,
-  icon: string,
   extra?: Node,
   hideForUnauth?: boolean,
+  noI18n?: boolean,
 };
 
-const GO_LIVE = {
+const GO_LIVE: SideNavLink = {
   title: 'Go Live',
   link: `/$/${PAGES.LIVESTREAM}`,
   icon: ICONS.VIDEO,
@@ -56,7 +57,7 @@ const RECENT_FROM_FOLLOWING = {
   icon: ICONS.SUBSCRIBE,
 };
 
-const NOTIFICATIONS = {
+const NOTIFICATIONS: SideNavLink = {
   title: 'Notifications',
   link: `/$/${PAGES.NOTIFICATIONS}`,
   icon: ICONS.NOTIFICATION,
@@ -64,32 +65,33 @@ const NOTIFICATIONS = {
   hideForUnauth: true,
 };
 
-const WATCH_LATER = {
+const WATCH_LATER: SideNavLink = {
   title: 'Watch Later',
   link: `/$/${PAGES.LIST}/watchlater`,
   icon: ICONS.TIME,
   hideForUnauth: true,
 };
 
-const FAVORITES = {
+const FAVORITES: SideNavLink = {
   title: 'Favorites',
   link: `/$/${PAGES.LIST}/favorites`,
   icon: ICONS.STAR,
   hideForUnauth: true,
 };
 
-const PLAYLISTS = {
+const PLAYLISTS: SideNavLink = {
   title: 'Lists',
   link: `/$/${PAGES.LISTS}`,
   icon: ICONS.STACK,
   hideForUnauth: true,
 };
 
-const PREMIUM = {
+const PREMIUM: SideNavLink = {
   title: 'Premium',
   link: `/$/${PAGES.ODYSEE_MEMBERSHIP}`,
   icon: ICONS.UPGRADE,
   hideForUnauth: true,
+  noI18n: true,
 };
 
 const UNAUTH_LINKS: Array<SideNavLink> = [
@@ -115,7 +117,7 @@ const UNAUTH_LINKS: Array<SideNavLink> = [
   },
 ];
 
-const WILD_WEST = {
+const WILD_WEST: SideNavLink = {
   title: 'Wild West',
   link: `/$/${PAGES.WILD_WEST}`,
   icon: ICONS.WILD_WEST,
@@ -298,7 +300,7 @@ function SideNavigation(props: Props) {
   }
 
   function getLink(props: SideNavLink) {
-    const { hideForUnauth, route, link, ...passedProps } = props;
+    const { hideForUnauth, route, link, noI18n, ...passedProps } = props;
     const { title, icon, extra } = passedProps;
 
     if (hideForUnauth && !email) {
@@ -311,8 +313,8 @@ function SideNavigation(props: Props) {
           {...passedProps}
           icon={icon}
           navigate={route || link}
-          label={__(title)}
+          label={noI18n ? title : __(title)}
-          title={__(title)}
+          title={noI18n ? title : __(title)}
           className={classnames('navigation-link', {
             'navigation-link--pulse': icon === ICONS.LIBRARY && pulseLibrary,
             'navigation-link--highlighted': icon === ICONS.NOTIFICATION && unseenCount > 0,

ui/component/walletSendTip/view.jsx

@@ -1,5 +1,6 @@
 // @flow
 import { Form } from 'component/common/form';
+import LbcMessage from 'component/common/lbc-message';
 import { Lbryio } from 'lbryinc';
 import { parseURI } from 'util/lbryURI';
 import * as ICONS from 'constants/icons';
@@ -235,9 +236,11 @@ export default function WalletSendTip(props: Props) {
       case TAB_BOOST:
         return titleText;
       case TAB_FIAT:
-        return __('Send a %fiatSymbolToUse%%displayAmount% Tip', { displayAmount, fiatSymbolToUse });
+        return __('Send a %amount% tip', { amount: `${fiatSymbolToUse}${displayAmount}` });
       case TAB_LBC:
-        return __('Send a %displayAmount% Credit Tip', { displayAmount });
+        return __('Send a %amount% tip', { amount: `${displayAmount} LBC` });
+      default:
+        return titleText;
     }
   }
 
@@ -351,7 +354,7 @@ export default function WalletSendTip(props: Props) {
                   button="primary"
                   type="submit"
                   disabled={fetchingChannels || isPending || tipError || !tipAmount || disableSubmitButton}
-                  label={customText || buildButtonText()}
+                  label={<LbcMessage>{customText || buildButtonText()}</LbcMessage>}
                 />
                 {fetchingChannels && <span className="help">{__('Loading your channels...')}</span>}
               </div>

ui/component/walletSpendableBalanceHelp/view.jsx

@@ -13,9 +13,9 @@ function WalletSpendableBalanceHelp(props: Props) {
   );
 
   return !balance ? null : inline ? (
-    <span className="help--spendable">{getMessage(__('%balance% available.'))}</span>
+    <span className="help--spendable">{getMessage('%balance% available.')}</span>
   ) : (
-    <div className="help">{getMessage(__('Your immediately spendable balance is %balance%.'))}</div>
+    <div className="help">{getMessage('Your immediately spendable balance is %balance%.')}</div>
   );
 }
 

ui/page/odyseeMembership/view.jsx

@@ -512,7 +512,7 @@ const OdyseeMembershipPage = (props: Props) => {
                             <div className="premium-option">
                               {/* plan title */}
                               <h4 className="membership_title">
-                                {__(membershipOption.Membership.name)}
+                                {membershipOption.Membership.name}
                                 <PremiumBadge membership={membershipOption.Membership.name} />
                               </h4>
 

ui/page/settingsStripeCard/view.jsx

@@ -497,7 +497,7 @@ class SettingsStripeCard extends React.Component<Props, State> {
                 >
                   {['USD', 'EUR'].map((currency) => (
                     <option key={currency} value={currency}>
-                      {currency === 'USD' ? __('USD') : __('EUR')}
+                      {currency}
                     </option>
                   ))}
                 </FormField>