Page MenuHomePhorge
Files F32174889

D4541.1765066382.diff
No OneTemporary
Actions

Size
9 KB
Referenced Files
None
Subscribers
None

D4541.1765066382.diff
View Options

diff --git a/lib/facts/genesis.json b/lib/facts/genesis.json
--- a/lib/facts/genesis.json
+++ b/lib/facts/genesis.json
@@ -1,11 +1,11 @@
{
"id": "1",
"name": "GENESIS",
- "description": "This is the first community on Comm. In the future it will be possible to create threads outside of a community, but for now all of these threads get set with GENESIS as their parent. GENESIS is hosted on Ashoat's keyserver.",
+ "description": "This is the first community on Comm. In the future it will be possible to create threads outside of a community, but for now all of these threads get set with GENESIS as their parent. GENESIS is hosted on Ashoat’s keyserver.",
"introMessages": [
"welcome to Genesis!",
"for now, Genesis is the only community on Comm, and is the parent of all new threads",
- "this is meant to be temporary. we're working on support for threads that can exist outside of any community, as well as support for user-hosted communities",
+ "this is meant to be temporary. we’re working on support for threads that can exist outside of any community, as well as support for user-hosted communities",
"to learn more about our roadmap and how Genesis fits in, check out [this document](https://www.notion.so/Comm-Genesis-1059f131fb354250abd1966894b15951)"
]
}
diff --git a/lib/facts/testers.json b/lib/facts/testers.json
--- a/lib/facts/testers.json
+++ b/lib/facts/testers.json
@@ -4,9 +4,9 @@
"introMessages": [
"hello my dear SquadCal testers 💗",
"first of all, thank you SO MUCH for helping to test this app over the last couple years. it means the world to me",
- "we have some big changes coming up:\n1. the app is getting renamed to Comm! we hope to submit Comm to the App Store in the next couple weeks\n2. we're working on updating the app to use E2E encryption so that we don't have access to your messages\n3. after that, we're aiming to launch a self-hosted communities feature, where you can use your laptop as a server to host a chat community. sort of like Discord, except totally private",
+ "we have some big changes coming up:\n1. the app is getting renamed to Comm! we hope to submit Comm to the App Store in the next couple weeks\n2. we’re working on updating the app to use E2E encryption so that we don’t have access to your messages\n3. after that, we’re aiming to launch a self-hosted communities feature, where you can use your laptop as a server to host a chat community. sort of like Discord, except totally private",
"as part of moving to E2E encryption, we had to figure out what to do with your existing messages, which are currently stored on my private server",
- "we don't want to delete your messages, but we also want to be transparent about the fact that I have access to them",
+ "we don’t want to delete your messages, but we also want to be transparent about the fact that I have access to them",
"the solution we came up with was to move them all into the very first self-hosted community on Comm: Genesis",
"check out [this link](https://www.notion.so/Comm-Genesis-1059f131fb354250abd1966894b15951) if you want to read more :)"
]
diff --git a/lib/shared/search-utils.js b/lib/shared/search-utils.js
--- a/lib/shared/search-utils.js
+++ b/lib/shared/search-utils.js
@@ -118,11 +118,11 @@
} else if (
relationshipStatus === userRelationshipStatus.BLOCKED_BY_VIEWER
) {
- notice = "you've blocked this user";
+ notice = 'you’ve blocked this user';
alertTitle = 'Not a friend';
alertText =
`Before you add ${userText} to this thread, ` +
- "you'll need to unblock them and send a friend request. " +
+ 'you’ll need to unblock them and send a friend request. ' +
'You can do this from the Block List and Friend List ' +
'in the Profile tab.';
} else if (relationshipStatus !== userRelationshipStatus.FRIEND) {
@@ -130,7 +130,7 @@
alertTitle = 'Not a friend';
alertText =
`Before you add ${userText} to this thread, ` +
- "you'll need to send them a friend request. " +
+ 'you’ll need to send them a friend request. ' +
'You can do this from the Friend List in the Profile tab.';
} else if (parentThreadInfo) {
notice = 'not in parent thread';
diff --git a/native/account/log-in-panel.react.js b/native/account/log-in-panel.react.js
--- a/native/account/log-in-panel.react.js
+++ b/native/account/log-in-panel.react.js
@@ -202,7 +202,7 @@
this.props.setActiveAlert(true);
if (this.usernameInputText.search(validEmailRegex) > -1) {
Alert.alert(
- "Can't log in with email",
+ 'Can’t log in with email',
'You need to log in with your username now',
[{ text: 'OK', onPress: this.onUsernameAlertAcknowledged }],
{ cancelable: false },
@@ -263,7 +263,7 @@
if (e.message === 'invalid_parameters') {
Alert.alert(
'Invalid username',
- "User doesn't exist",
+ 'User doesn’t exist',
[{ text: 'OK', onPress: this.onUsernameAlertAcknowledged }],
{ cancelable: false },
);
@@ -281,7 +281,7 @@
});
Alert.alert(
'App out of date',
- "Your app version is pretty old, and the server doesn't know how " +
+ 'Your app version is pretty old, and the server doesn’t know how ' +
`to speak to it anymore. Please use the ${app} app to update!`,
[{ text: 'OK', onPress: this.onAppOutOfDateAlertAcknowledged }],
{ cancelable: false },
diff --git a/native/account/register-panel.react.js b/native/account/register-panel.react.js
--- a/native/account/register-panel.react.js
+++ b/native/account/register-panel.react.js
@@ -271,7 +271,7 @@
this.props.registerState.state.confirmPasswordInputText
) {
Alert.alert(
- "Passwords don't match",
+ 'Passwords don’t match',
'Password fields must contain the same password',
[{ text: 'OK', onPress: this.onPasswordAlertAcknowledged }],
{ cancelable: false },
@@ -364,7 +364,7 @@
});
Alert.alert(
'App out of date',
- "Your app version is pretty old, and the server doesn't know how " +
+ 'Your app version is pretty old, and the server doesn’t know how ' +
`to speak to it anymore. Please use the ${app} app to update!`,
[{ text: 'OK', onPress: this.onAppOutOfDateAlertAcknowledged }],
{ cancelable: false },
diff --git a/native/media/camera-modal.react.js b/native/media/camera-modal.react.js
--- a/native/media/camera-modal.react.js
+++ b/native/media/camera-modal.react.js
@@ -676,7 +676,7 @@
return (
<View style={styles.authorizationDeniedContainer}>
<Text style={styles.authorizationDeniedText}>
- {"don't have permission :("}
+ {'don’t have permission :('}
</Text>
</View>
);
diff --git a/native/media/save-media.js b/native/media/save-media.js
--- a/native/media/save-media.js
+++ b/native/media/save-media.js
@@ -66,7 +66,7 @@
});
message = `saving media is unsupported on ${os}`;
} else if (result.reason === 'missing_permission') {
- message = "don't have permission :(";
+ message = 'don’t have permission :(';
} else if (
result.reason === 'resolve_failed' ||
result.reason === 'data_uri_failed'
diff --git a/native/profile/edit-password.react.js b/native/profile/edit-password.react.js
--- a/native/profile/edit-password.react.js
+++ b/native/profile/edit-password.react.js
@@ -212,7 +212,7 @@
);
} else if (this.state.newPassword !== this.state.confirmPassword) {
Alert.alert(
- "Passwords don't match",
+ 'Passwords don’t match',
'New password fields must contain the same password',
[{ text: 'OK', onPress: this.onNewPasswordAlertAcknowledged }],
{ cancelable: false },
diff --git a/native/redux/redux-setup.js b/native/redux/redux-setup.js
--- a/native/redux/redux-setup.js
+++ b/native/redux/redux-setup.js
@@ -373,7 +373,7 @@
});
Alert.alert(
'App out of date',
- "Your app version is pretty old, and the server doesn't know how to " +
+ 'Your app version is pretty old, and the server doesn’t know how to ' +
`speak to it anymore. Please use the ${app} app to update!`,
[{ text: 'OK' }],
{ cancelable: true },
@@ -381,7 +381,7 @@
} else {
Alert.alert(
'Session invalidated',
- "We're sorry, but your session was invalidated by the server. " +
+ 'We’re sorry, but your session was invalidated by the server. ' +
'Please log in again.',
[{ text: 'OK' }],
{ cancelable: true },
diff --git a/web/settings/password-change-modal.js b/web/settings/password-change-modal.js
--- a/web/settings/password-change-modal.js
+++ b/web/settings/password-change-modal.js
@@ -173,7 +173,7 @@
{
newPassword: '',
confirmNewPassword: '',
- errorMessage: "passwords don't match",
+ errorMessage: 'passwords don’t match',
},
() => {
invariant(this.newPasswordInput, 'newPasswordInput ref unset');

File Metadata

Mime Type
text/plain
Expires
Sun, Dec 7, 12:13 AM (11 h, 28 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
5841532
Default Alt Text
D4541.1765066382.diff (9 KB)

Event Timeline