A free and open source instant messaging and VoIP chat app built for friends, groups, and communities.
fix(app): use product name as placeholders (#3770)
Tarek718f96e843f4
diff --git a/fluxer_app/src/features/app/config/I18nDisplayConstants.ts b/fluxer_app/src/features/app/config/I18nDisplayConstants.tsindex bf5a4917f..e8ca338fa 100644--- a/fluxer_app/src/features/app/config/I18nDisplayConstants.ts+++ b/fluxer_app/src/features/app/config/I18nDisplayConstants.ts@@ -28,8 +28,6 @@ export const EXAMPLE_CALLBACK_URL = `${EXAMPLE_URL}/callback`;export const EXAMPLE_EMAIL = '[email protected]';export const EXAMPLE_PERSONAL_EMAIL = '[email protected]';export const EXAMPLE_REPORT_EMAIL = '[email protected]';-export const EXAMPLE_REPORT_USER_TAG = 'username#1234';-export const EXAMPLE_REPORT_USERNAME = 'username';export const EXAMPLE_INVITE_CODE = 'abcDEF12';export const EXAMPLE_VERIFICATION_CODE = 'ABCD-1234';export const EXAMPLE_FLUXER_TAG = 'Marty_McFly';@@ -38,8 +36,6 @@ export const EXAMPLE_BOT_NAME = 'BotName';export const EXAMPLE_CHANNEL_NAME = 'new-channel';export const EXAMPLE_GENERAL_CHANNEL_NAME = 'general';export const EXAMPLE_USERNAME_MENTION = '@username';-export const EXAMPLE_FLUXER_TAG_FULL = 'Username#0000';-export const EXAMPLE_USERNAME = 'Username';export const VISIONARY_LIFETIME_BADGE_LABEL = 'Visionary #42';export const LINK_PREVIEW_EXAMPLE_URL = 'https://fluxer.com';export const EXAMPLE_GIF_URLS = `${EXAMPLE_URL}/gif1.gif\n${EXAMPLE_URL}/gif2.gif`;diff --git a/fluxer_app/src/features/channel/components/direct_message/AddFriendForm.tsx b/fluxer_app/src/features/channel/components/direct_message/AddFriendForm.tsxindex a13c63fcb..0e730788e 100644--- a/fluxer_app/src/features/channel/components/direct_message/AddFriendForm.tsx+++ b/fluxer_app/src/features/channel/components/direct_message/AddFriendForm.tsx@@ -1,6 +1,4 @@// SPDX-License-Identifier: AGPL-3.0-or-later--import {EXAMPLE_FLUXER_TAG_FULL, EXAMPLE_USERNAME} from '@app/features/app/config/I18nDisplayConstants';import RuntimeConfig from '@app/features/app/state/RuntimeConfig';import styles from '@app/features/channel/components/direct_message/AddFriendForm.module.css';import {failureCode, failureMessage} from '@app/features/platform/utils/ResponseInspection';@@ -56,6 +54,7 @@ export const AddFriendForm: React.FC<AddFriendFormProps> = observer(({onSuccess}const [errorCode, setErrorCode] = useState<string | null>(null);const [errorMessage, setErrorMessage] = useState<string | null>(null);const usernameOnly = RuntimeConfig.usesUniqueUsernames;+ const productName = RuntimeConfig.productName;const friendRequestGate = canPerform(Users.currentUser, TierGatedActions.FRIEND_REQUEST);if (!friendRequestGate.allowed) {return (@@ -87,7 +86,7 @@ export const AddFriendForm: React.FC<AddFriendFormProps> = observer(({onSuccess}}if (errorCode === APIErrorCodes.DISCRIMINATOR_REQUIRED) {if (usernameOnly) return i18n._(ENTER_A_VALID_USERNAME_DESCRIPTOR);- return i18n._(PLEASE_ENTER_A_VALID_USERNAME_DESCRIPTOR, {exampleFluxerTagFull: EXAMPLE_FLUXER_TAG_FULL});+ return i18n._(PLEASE_ENTER_A_VALID_USERNAME_DESCRIPTOR, {exampleFluxerTagFull: `${productName}#0000`});}if (errorCode === APIErrorCodes.NEW_CONVERSATIONS_LIMITED) {return getSendFriendRequestErrorMessage(i18n, errorCode, errorMessage);@@ -142,7 +141,7 @@ export const AddFriendForm: React.FC<AddFriendFormProps> = observer(({onSuccess}type="text"value={input}onChange={handleInputChange}- placeholder={usernameOnly ? EXAMPLE_USERNAME : EXAMPLE_FLUXER_TAG_FULL}+ placeholder={usernameOnly ? productName : `${productName}#0000`}className={clsx(styles.input,!isMobile && styles.inputDesktop,diff --git a/fluxer_app/src/features/moderation/components/report/ReportStepDetails.tsx b/fluxer_app/src/features/moderation/components/report/ReportStepDetails.tsxindex fe8fb362f..4d90627ec 100644--- a/fluxer_app/src/features/moderation/components/report/ReportStepDetails.tsx+++ b/fluxer_app/src/features/moderation/components/report/ReportStepDetails.tsx@@ -1,11 +1,7 @@// SPDX-License-Identifier: AGPL-3.0-or-laterimport Accessibility from '@app/features/accessibility/state/Accessibility';-import {- EXAMPLE_INVITE_CODE,- EXAMPLE_REPORT_USER_TAG,- EXAMPLE_REPORT_USERNAME,-} from '@app/features/app/config/I18nDisplayConstants';+import {EXAMPLE_INVITE_CODE} from '@app/features/app/config/I18nDisplayConstants';import RuntimeConfig from '@app/features/app/state/RuntimeConfig';import {getLocaleDirection} from '@app/features/i18n/utils/LocaleDirection';import styles from '@app/features/moderation/components/pages/ReportPage.module.css';@@ -147,7 +143,8 @@ export const ReportStepDetails: React.FC<Props> = ({}) => {const {i18n} = useLingui();const usernameOnly = RuntimeConfig.usesUniqueUsernames;- const userTagPlaceholder = usernameOnly ? EXAMPLE_REPORT_USERNAME : EXAMPLE_REPORT_USER_TAG;+ const productName = RuntimeConfig.productName;+ const userTagPlaceholder = usernameOnly ? productName : `${productName}#0000`;const hasFieldErrors = Object.values(fieldErrors).some((value) => Boolean(value));const showGeneralError = Boolean(errorMessage && (answersRejected || !hasFieldErrors));const errorBoxRef = useRef<HTMLDivElement>(null);