Fix localization concatenation + Cleanup unused strings #4239

Merged
infinite-persistence merged 9 commits from fix-localization-concat into master 2020-05-28 15:50:09 +02:00
2 changed files with 5 additions and 6 deletions
Showing only changes of commit 4464b3ff23 - Show all commits

View file

@ -569,7 +569,6 @@
"Spin Spin Sugar": "Spin Spin Sugar",
"You're not following any channels.": "You're not following any channels.",
"Look what's trending for everyone": "Look what's trending for everyone",
"or": "or",
"Discover some channels!": "Discover some channels!",
"Trending": "Trending",
"Top": "Top",
@ -1055,7 +1054,7 @@
"A moderator capable of approving you is typically available in the discord server. See the #rewards-approval instructions carefully and do not message any moderators directly. This process will likely involve providing proof of a stable and established online or real-life identity.": "A moderator capable of approving you is typically available in the discord server. See the #rewards-approval instructions carefully and do not message any moderators directly. This process will likely involve providing proof of a stable and established online or real-life identity.",
"Rewards validation is optional.": "Rewards validation is optional.",
"Continue Without Rewards": "Continue Without Rewards",
"If you'd like to participate our %rewards_program% to earn credits, please complete one of the steps below to be validated.": "If you'd like to participate our %rewards_program% to earn credits, please complete one of the steps below to be validated.",
"If you'd like to participate our %rewards_program% to earn credits, please complete one of the steps below to be validated. %Refresh% or %Skip%.": "If you'd like to participate our %rewards_program% to earn credits, please complete one of the steps below to be validated. %Refresh% or %Skip%.",
"verify your email": "verify your email",
"rename your existing wallet in the lbry/wallets directory": "rename your existing wallet in the lbry/wallets directory",
"Your wallet data will remain intact. If you sign in with a different account, the wallets will be merged. To prevent this, you need to %rename_wallet_instructions%": "Your wallet data will remain intact. If you sign in with a different account, the wallets will be merged. To prevent this, you need to %rename_wallet_instructions%",

View file

@ -44,13 +44,13 @@ class UserVerify extends React.PureComponent<Props> {
rewards_program: (
<Button button="link" label={__('Rewards Program')} href="https://lbry.com/faq/rewards" />
),
Refresh: <Button onClick={() => fetchUser()} button="link" label={__('Refresh')} />,
Skip: <Button {...skipButtonProps} button="link" label={__('Skip')} />,
}}
>
If you'd like to participate our %rewards_program% to earn credits, please complete one of the steps below
TigerxWood commented 2020-05-27 13:05:35 +02:00 (Migrated from github.com)
Review

I think you should remove the LF (end of line) after word *below *, to be translatable with the string from app-strings.json file

I think you should remove the LF (end of line) after word *below *, to be translatable with the string from app-strings.json file
infinite-persistence commented 2020-05-27 14:43:40 +02:00 (Migrated from github.com)
Review

Yeah, I noticed that with a few other sentences as well. I agree that it makes string-searching hard(er).

I left it as is since there were few other similar instances, so I don't know if it was intentional or not.

Yeah, I noticed that with a few other sentences as well. I agree that it makes string-searching hard(er). I left it as is since there were few other similar instances, so I don't know if it was intentional or not.
to be validated.
</I18nMessage>{' '}
<Button onClick={() => fetchUser()} button="link" label={__('Refresh')} /> {'or'}{' '}
<Button {...skipButtonProps} button="link" label={__('Skip')} />.
to be validated. %Refresh% or %Skip%.
</I18nMessage>
</p>
<p>{__('This step is not required to use LBRY, and not all users or regions may qualify.')}</p>
</section>