Skip to content

Commit f8351f0

Browse files
chrisbobbegnprice
authored andcommitted
i18n: Stop using ' character.
In `react-intl` v3, the escape character is changed to the apostrophe (') [1]. So, don't use it in our text. [1] https://formatjs.io/docs/react-intl/upgrade-guide-3x/#escape-character-has-been-changed-to-apostrophe-
1 parent 3d1e3dd commit f8351f0

File tree

5 files changed

+8
-8
lines changed

5 files changed

+8
-8
lines changed

src/compose/MentionWarnings.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ class MentionWarnings extends PureComponent<Props, State> {
7373
showSubscriptionStatusLoadError = (mentionedUser: UserOrBot) => {
7474
const _ = this.context;
7575

76-
const alertTitle = _("Couldn't load information about {fullName}", {
76+
const alertTitle = _('Couldn’t load information about {fullName}', {
7777
fullName: mentionedUser.full_name,
7878
});
7979
showToast(alertTitle);

src/message/messageActionSheet.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ muteTopic.title = 'Mute topic';
112112
muteTopic.errorMessage = 'Failed to mute topic';
113113

114114
const deleteTopic = async ({ auth, message, dispatch, ownEmail, _ }) => {
115-
const alertTitle = _("Are you sure you want to delete the topic '{topic}'?", {
115+
const alertTitle = _('Are you sure you want to delete the topic {topic}”?', {
116116
topic: message.subject,
117117
});
118118
const AsyncAlert = async (): Promise<boolean> =>

src/user-status/UserStatusScreen.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ class UserStatusScreen extends PureComponent<Props, State> {
8282
autoFocus
8383
maxLength={60}
8484
style={styles.statusTextInput}
85-
placeholder="What's your status?"
85+
placeholder="Whats your status?"
8686
value={statusText}
8787
onChangeText={this.setStatusTextState}
8888
/>

src/webview/webViewEventHandlers.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -273,7 +273,7 @@ export const handleMessageListEvent = (props: Props, _: GetText, event: MessageL
273273
}
274274

275275
case 'time': {
276-
const alertText = _("This time is in your timezone. Original text was '{originalText}'.", {
276+
const alertText = _('This time is in your timezone. Original text was {originalText}”.', {
277277
originalText: event.originalText,
278278
});
279279
Alert.alert('', alertText);

static/translations/messages_en.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,10 +48,10 @@
4848
"Add a reaction": "Add a reaction",
4949
"Copy to clipboard": "Copy to clipboard",
5050
"Link copied to clipboard": "Link copied to clipboard",
51-
"This time is in your timezone. Original text was '{originalText}'.": "This time is in your timezone. Original text was '{originalText}'.",
51+
"This time is in your timezone. Original text was {originalText}.": "This time is in your timezone. Original text was {originalText}.",
5252
"Mute topic": "Mute topic",
5353
"Delete topic": "Delete topic",
54-
"Are you sure you want to delete the topic '{topic}'?": "Are you sure you want to delete the topic '{topic}'?",
54+
"Are you sure you want to delete the topic {topic}?": "Are you sure you want to delete the topic {topic}?",
5555
"This will also delete all messages in the topic.": "This will also delete all messages in the topic.",
5656
"Unmute topic": "Unmute topic",
5757
"Mute stream": "Mute stream",
@@ -215,8 +215,8 @@
215215
"Sending Message...": "Sending Message...",
216216
"Failed to send message": "Failed to send message",
217217
"Message sent": "Message sent",
218-
"Couldn't load information about {fullName}": "Couldn't load information about {fullName}",
219-
"What's your status?": "What's your status?",
218+
"Couldnt load information about {fullName}": "Couldnt load information about {fullName}",
219+
"Whats your status?": "Whats your status?",
220220
"Click to join video call": "Click to join video call",
221221
"📅 In a meeting": "📅 In a meeting",
222222
"🚌 Commuting": "🚌 Commuting",

0 commit comments

Comments
 (0)