Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Correct the direction of the Persian language text #1670

Open
wants to merge 10 commits into
base: stable
Choose a base branch
from
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
## [1.128.0] - Not released
### Fixed
- Fix lightbox for some old attachments that have no sizes in API responses.
- Fix the text direction for Persian language content.
### Added
- Drafts. When a user creates/edits a post or comment, the entered text is
automatically saved to localStorage. This prevents accidental loss of content
Expand All @@ -24,6 +25,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
User can disable drafts saving on the Settings / Privacy page. In this case,
drafts will still work, but will not be saved to persistent storage and will
be lost on tab close/reload.
### Changed
- RTL texts are now right-aligned in the post bodies and in the user
descriptions.

## [1.127.3] - 2024-02-14
### Fixed
Expand Down
5 changes: 3 additions & 2 deletions src/components/post/post.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import {
} from '@fortawesome/free-solid-svg-icons';

import { pluralForm } from '../../utils';
import { getFirstLinkToEmbed } from '../../utils/parse-text';
import { getFirstLinkToEmbed, getTextAlign } from '../../utils/parse-text';
import { canonicalURI } from '../../utils/canonical-uri';
import { READMORE_STYLE_COMPACT } from '../../utils/frontend-preferences-options';
import { postReadmoreConfig } from '../../utils/readmore-config';
Expand Down Expand Up @@ -384,6 +384,7 @@ class Post extends Component {
const linkToEmbed = getFirstLinkToEmbed(props.body);

const { role, postLabel } = this.getAriaLabels();
const postText = getTextAlign(props.body) ? 'post-text rtl' : 'post-text';

return (
<PostProvider id={this.props.id}>
Expand Down Expand Up @@ -425,7 +426,7 @@ class Post extends Component {
comments={props.comments}
usersLikedPost={props.usersLikedPost}
/>
<div className="post-text">
<div className={postText}>
<PieceOfText
text={props.body}
readMoreStyle={props.readMoreStyle}
Expand Down
5 changes: 4 additions & 1 deletion src/components/user-profile-head.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ import {
enableBansInGroup,
} from '../redux/action-creators';
import { USERNAME } from '../utils/hide-criteria';
import { getTextAlign } from '../utils/parse-text';
import { withKey } from './with-key';
import { UserPicture } from './user-picture';
import { Throbber } from './throbber';
Expand Down Expand Up @@ -263,6 +264,8 @@ export const UserProfileHead = withRouter(

const isAuthenticated = !!currentUser;

const postText = `${styles.description}${getTextAlign(user.description) ? ` ${styles.rtl}` : ''}`;

return (
<div className={styles.profile} role="region">
<div className={styles.avatar}>
Expand All @@ -288,7 +291,7 @@ export const UserProfileHead = withRouter(
/>
</div>
</div>
<div className={styles.description}>
<div className={postText}>
<PieceOfText text={user.description} isExpanded={true} />
</div>
{isAuthenticated && !isCurrentUser && (
Expand Down
8 changes: 8 additions & 0 deletions src/components/user-profile-head.module.scss
Original file line number Diff line number Diff line change
Expand Up @@ -99,9 +99,17 @@ $actions-padding: 0.75em;
grid-area: description;
margin-top: 0.66em;

&.rtl {
text-align: right;
}

&:empty {
display: none;
}

& :global(.Linkify) {
display: block;
}
}

.stats {
Expand Down
15 changes: 10 additions & 5 deletions src/utils/parse-text.js
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
/* global CONFIG */
import {
withTexts,
arrows,
combine,
hashtags,
emails,
mentions,
foreignMentions,
links,
arrows,
hashtags,
LINK,
links,
mentions,
withTexts,
} from 'social-text-tokenizer';

import { linkHref } from 'social-text-tokenizer/prettifiers';
Expand Down Expand Up @@ -175,3 +175,8 @@ for (const srv of foreignMentionServices) {
shortCodeToService[code] = srv;
}
}

export function getTextAlign(char) {
const persianRegex = /[\u0600-\u065F\u066A-\u06EF\u06FA-\u06FF]/g;
return persianRegex.test(char);
}
12 changes: 12 additions & 0 deletions styles/shared/post.scss
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,10 @@ $post-line-height: rem(20px);
font-size: rem(16px);
line-height: $post-line-height;

&.rtl {
text-align: right;
}

&.modern {
max-height: 5 * $post-line-height;
overflow-y: hidden;
Expand All @@ -98,6 +102,10 @@ $post-line-height: rem(20px);
}
}

.Linkify {
display: block;
}

a {
color: #000088;
}
Expand Down Expand Up @@ -427,6 +435,10 @@ $post-line-height: rem(20px);

font-size: rem(21px);
line-height: rem(26px);

&.rtl {
text-align: right;
}
}
}
}
Expand Down
Loading