Skip to content

Commit

Permalink
Merge pull request #4151 from thematters/fix/topup-copy
Browse files Browse the repository at this point in the history
[hotfix - master] fix(copy): fix donation copy
  • Loading branch information
robertu7 authored Jan 22, 2024
2 parents e64ef6c + d95c55c commit ff85d1e
Show file tree
Hide file tree
Showing 9 changed files with 26 additions and 11 deletions.
3 changes: 3 additions & 0 deletions lang/default.json
Original file line number Diff line number Diff line change
Expand Up @@ -646,6 +646,9 @@
"defaultMessage": "commented broadcast in {circleName}",
"description": "src/components/Notice/CircleNotice/CircleNewBroadcastComments.tsx"
},
"Eb1U+/": {
"defaultMessage": "Topped up successfully"
},
"EoeUjA": {
"defaultMessage": "You do not have permission to perform this operation",
"description": "FORBIDDEN_BY_STATE"
Expand Down
3 changes: 3 additions & 0 deletions lang/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -646,6 +646,9 @@
"defaultMessage": "commented broadcast in {circleName}",
"description": "src/components/Notice/CircleNotice/CircleNewBroadcastComments.tsx"
},
"Eb1U+/": {
"defaultMessage": "Topped up successfully"
},
"EoeUjA": {
"defaultMessage": "You do not have permission to perform this operation",
"description": "FORBIDDEN_BY_STATE"
Expand Down
3 changes: 3 additions & 0 deletions lang/zh-Hans.json
Original file line number Diff line number Diff line change
Expand Up @@ -646,6 +646,9 @@
"defaultMessage": "在 {circleName} 的广播中留言 ",
"description": "src/components/Notice/CircleNotice/CircleNewBroadcastComments.tsx"
},
"Eb1U+/": {
"defaultMessage": "储值成功"
},
"EoeUjA": {
"defaultMessage": "你无权限进行该操作",
"description": "FORBIDDEN_BY_STATE"
Expand Down
3 changes: 3 additions & 0 deletions lang/zh-Hant.json
Original file line number Diff line number Diff line change
Expand Up @@ -646,6 +646,9 @@
"defaultMessage": "在 {circleName} 的廣播中留言 ",
"description": "src/components/Notice/CircleNotice/CircleNewBroadcastComments.tsx"
},
"Eb1U+/": {
"defaultMessage": "儲值成功"
},
"EoeUjA": {
"defaultMessage": "你無權限進行該操作",
"description": "FORBIDDEN_BY_STATE"
Expand Down
6 changes: 0 additions & 6 deletions src/common/enums/text.ts
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,6 @@ export const TEXT = {
successRegister: '註冊成功',
successResetPassword: '密碼重置成功',
successSetSupportSetting: '支持反饋設置成功',
successTopUp: '儲值成功',
successUnblock: '已取消封鎖。該用戶現在可以評論你的作品和圍爐。',
successUploadImage: '圖片上傳成功',
supportRequestDescription:
Expand All @@ -198,7 +197,6 @@ export const TEXT = {
theFirstSupporter: '第一個支持了這篇作品',
thinkAboutIt: '考慮一下',
topic: '話題',
topUp: '儲值',
toYourIPNSPage: '指向到你的 IPNS 頁面',
understood: '我知道了',
unfollow: '取消追蹤',
Expand Down Expand Up @@ -397,7 +395,6 @@ export const TEXT = {
successRegister: '注册成功',
successResetPassword: '密码重置成功',
successSetSupportSetting: '支持反馈设置成功',
successTopUp: '储值成功',
successUnblock: '已取消屏蔽。该用户现在可以评论你的作品和围炉。',
successUploadImage: '图片上传成功',
supportRequestDescription:
Expand All @@ -421,7 +418,6 @@ export const TEXT = {
theFirstSupporter: '第一个支持了这篇作品',
thinkAboutIt: '考虑一下',
topic: '话题',
topUp: '储值',
toYourIPNSPage: '指向到你的 IPNS 页面',
understood: '我知道了',
unfollow: '取消追踪',
Expand Down Expand Up @@ -636,7 +632,6 @@ export const TEXT = {
successRegister: 'Thank you for registering',
successResetPassword: 'Password successfully changed.',
successSetSupportSetting: 'Support setting updated',
successTopUp: 'Topped up successfully',
successUnblock: 'User unblocked. User can now comment on your articles.',
successUploadImage: 'Image uploaded',
supportRequestDescription:
Expand All @@ -661,7 +656,6 @@ export const TEXT = {
theFirstSupporter: 'was the first to support this article',
thinkAboutIt: 'Maybe later',
topic: 'Topic',
topUp: 'Top Up',
toYourIPNSPage: 'to your IPNS page',
unblockSuccess: 'User unblocked and can reply your articles now.',
uncollapseComment: 'Unfold',
Expand Down
9 changes: 8 additions & 1 deletion src/components/Forms/PaymentForm/AddCredit/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,14 @@ const BaseAddCredit: React.FC<FormProps> = ({
if (completed) {
return (
<>
<Dialog.Header title={<Translate id="successTopUp" />} />
<Dialog.Header
title={
<FormattedMessage
defaultMessage="Topped up successfully"
id="Eb1U+/"
/>
}
/>

<Dialog.Content>
<Dialog.Content.Message align="center" smUpAlign="center">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ const HKDSubmitButton: React.FC<SubmitButtonProps> = ({
if (isBalanceInsufficient) {
const props = {
mode,
text: 'topUp',
text: <FormattedMessage defaultMessage="Top Up" id="dTOtPO" />,
form: formId,
}
return (
Expand Down
2 changes: 1 addition & 1 deletion src/views/Me/Wallet/Balance/FiatCurrency.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ const TopUpItem = ({

return (
<Menu.Item
text={<Translate id="topUp" />}
text={<FormattedMessage defaultMessage="Top Up" id="dTOtPO" />}
icon={<IconWallet24 size="mdS" />}
onClick={() => {
if (hasEmail) {
Expand Down
6 changes: 4 additions & 2 deletions src/views/Me/Wallet/Buttons/index.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
import { FormattedMessage } from 'react-intl'

import { analytics } from '~/common/utils'
import { AddCreditDialog, Dialog, Translate, useFeatures } from '~/components'
import { AddCreditDialog, Dialog, useFeatures } from '~/components'

import PayoutButton from './PayoutButton'
import styles from './styles.module.css'
Expand All @@ -17,7 +19,7 @@ const Buttons: React.FC<ButtonsProps> = ({ canPayout, hasStripeAccount }) => {
<AddCreditDialog>
{({ openDialog }) => (
<Dialog.RoundedButton
text={<Translate id="topUp" />}
text={<FormattedMessage defaultMessage="Top Up" id="dTOtPO" />}
onClick={() => {
openDialog()
analytics.trackEvent('click_button', { type: 'top_up' })
Expand Down

0 comments on commit ff85d1e

Please sign in to comment.