two bugfixes: i18n tags, all reposts loading loop

This commit is contained in:
jessop 2020-04-29 15:10:58 -04:00 committed by Sean Yesmunt
parent a5cc1a84aa
commit 867b5eb134
3 changed files with 9 additions and 3 deletions

View file

@ -1194,5 +1194,10 @@
"Earnings may also include any LBC you've sent yourself or added as support. We are working on making this more accurate. Check your wallet page for the correct total balance.": "Earnings may also include any LBC you've sent yourself or added as support. We are working on making this more accurate. Check your wallet page for the correct total balance.", "Earnings may also include any LBC you've sent yourself or added as support. We are working on making this more accurate. Check your wallet page for the correct total balance.": "Earnings may also include any LBC you've sent yourself or added as support. We are working on making this more accurate. Check your wallet page for the correct total balance.",
"Add A Password": "Add A Password", "Add A Password": "Add A Password",
"Hide reposts": "Hide reposts", "Hide reposts": "Hide reposts",
"You will not see reposts by people you follow or receive email notifying about them.": "You will not see reposts by people you follow or receive email notifying about them." "You will not see reposts by people you follow or receive email notifying about them.": "You will not see reposts by people you follow or receive email notifying about them.",
"Sorry, your request timed out. Modify your options or %again%": "Sorry, your request timed out. Modify your options or %again%",
"Pause at any time to select a thumbnail from your video": "Pause at any time to select a thumbnail from your video",
"For video content, use MP4s in H264/AAC format and a friendly bitrate (under 5 mbps) and resolution (720p) for more reliable streaming.": "For video content, use MP4s in H264/AAC format and a friendly bitrate (under 5 mbps) and resolution (720p) for more reliable streaming.",
"this channel": "this channel",
"Share this channel": "Share this channel"
} }

View file

@ -267,6 +267,7 @@ function ClaimListDiscover(props: Props) {
didNavigateForward || didNavigateForward ||
(!loading && (!loading &&
claimSearchResult && claimSearchResult &&
claimSearchResult.length &&
claimSearchResult.length < CS.PAGE_SIZE * page && claimSearchResult.length < CS.PAGE_SIZE * page &&
claimSearchResult.length % CS.PAGE_SIZE === 0); claimSearchResult.length % CS.PAGE_SIZE === 0);
@ -574,7 +575,7 @@ function ClaimListDiscover(props: Props) {
'claim-search__input-special': !followed.includes(tag), 'claim-search__input-special': !followed.includes(tag),
})} })}
> >
{followed.includes(tag) && typeof tag === 'string' && toCapitalCase(__(tag))} {followed.includes(tag) && typeof tag === 'string' && toCapitalCase(tag)}
{tag === CS.TAGS_ALL && __('Any')} {tag === CS.TAGS_ALL && __('Any')}
{tag === CS.TAGS_FOLLOWED && __('Following')} {tag === CS.TAGS_FOLLOWED && __('Following')}
{!followed.includes(tag) && tag !== CS.TAGS_ALL && tag !== CS.TAGS_FOLLOWED && __('Other')} {!followed.includes(tag) && tag !== CS.TAGS_ALL && tag !== CS.TAGS_FOLLOWED && __('Other')}

View file

@ -72,7 +72,7 @@ function DiscoverPage(props: Props) {
headerLabel = ( headerLabel = (
<span> <span>
<Icon icon={ICONS.TAG} size={10} /> <Icon icon={ICONS.TAG} size={10} />
{(tag === CS.TAGS_ALL && __('All Content')) || (tag === CS.TAGS_FOLLOWED && __('Followed Tags')) || __(tag)} {(tag === CS.TAGS_ALL && __('All Content')) || (tag === CS.TAGS_FOLLOWED && __('Followed Tags')) || tag}
</span> </span>
); );
} else { } else {