mirror of
https://github.com/zulip/zulip.git
synced 2025-11-03 13:33:24 +00:00
spelling: Correctly write "cannot".
None of these errors were user-facing; mainly in comments, plus one bit of internal docs and a developer tool.
This commit is contained in:
@@ -72,7 +72,7 @@ group. However, "讨论组" has one more Chinese character than "频道
|
|||||||
* Invite-Only/Public Stream - **私有/公开频道**
|
* Invite-Only/Public Stream - **私有/公开频道**
|
||||||
|
|
||||||
"Invite-Only Stream" requires users must be invited explicitly to
|
"Invite-Only Stream" requires users must be invited explicitly to
|
||||||
subscribe, which assures a high privacy. Other users can not perceive
|
subscribe, which assures a high privacy. Other users cannot perceive
|
||||||
the presence of such streams. Since literal translation is hard to
|
the presence of such streams. Since literal translation is hard to
|
||||||
read, it is translated sense to sense as "私有频道(Private Stream)"。
|
read, it is translated sense to sense as "私有频道(Private Stream)"。
|
||||||
|
|
||||||
|
|||||||
@@ -57,7 +57,7 @@ yarn_get_tarball() {
|
|||||||
yarn_verify_integrity() {
|
yarn_verify_integrity() {
|
||||||
# Check if GPG is installed
|
# Check if GPG is installed
|
||||||
if [[ -z "$(command -v gpg)" ]]; then
|
if [[ -z "$(command -v gpg)" ]]; then
|
||||||
printf "$yellow> WARNING: GPG is not installed, integrity can not be verified!$reset\n"
|
printf "$yellow> WARNING: GPG is not installed, integrity cannot be verified!$reset\n"
|
||||||
return
|
return
|
||||||
fi
|
fi
|
||||||
|
|
||||||
@@ -71,7 +71,7 @@ yarn_verify_integrity() {
|
|||||||
gpg --list-keys $gpg_key >/dev/null 2>&1 || (curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | gpg --import)
|
gpg --list-keys $gpg_key >/dev/null 2>&1 || (curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | gpg --import)
|
||||||
|
|
||||||
if [ ! -f "$1.asc" ]; then
|
if [ ! -f "$1.asc" ]; then
|
||||||
printf "$red> Could not download GPG signature for this Yarn release. This means the release can not be verified!$reset\n"
|
printf "$red> Could not download GPG signature for this Yarn release. This means the release cannot be verified!$reset\n"
|
||||||
yarn_verify_or_quit "> Do you really want to continue?"
|
yarn_verify_or_quit "> Do you really want to continue?"
|
||||||
return
|
return
|
||||||
fi
|
fi
|
||||||
|
|||||||
@@ -364,7 +364,7 @@ exports.remove_subscriber = function (stream_name, user_id) {
|
|||||||
exports.user_is_subscribed = function (stream_name, user_email) {
|
exports.user_is_subscribed = function (stream_name, user_email) {
|
||||||
var sub = exports.get_sub(stream_name);
|
var sub = exports.get_sub(stream_name);
|
||||||
if (typeof sub === 'undefined' || !sub.can_access_subscribers) {
|
if (typeof sub === 'undefined' || !sub.can_access_subscribers) {
|
||||||
// If we don't know about the stream, or we ourselves can not access subscriber list,
|
// If we don't know about the stream, or we ourselves cannot access subscriber list,
|
||||||
// so we return undefined (treated as falsy if not explicitly handled).
|
// so we return undefined (treated as falsy if not explicitly handled).
|
||||||
blueslip.warn("We got a user_is_subscribed call for a non-existent or inaccessible stream.");
|
blueslip.warn("We got a user_is_subscribed call for a non-existent or inaccessible stream.");
|
||||||
return;
|
return;
|
||||||
|
|||||||
@@ -255,8 +255,8 @@ exports.update_settings_for_unsubscribed = function (sub) {
|
|||||||
if (active_stream !== undefined && active_stream.id === sub.stream_id) {
|
if (active_stream !== undefined && active_stream.id === sub.stream_id) {
|
||||||
stream_edit.rerender_subscribers_list(sub);
|
stream_edit.rerender_subscribers_list(sub);
|
||||||
|
|
||||||
// If user unsubscribed from private stream then user can not subscribe to
|
// If user unsubscribed from private stream then user cannot subscribe to
|
||||||
// stream without invitation and can not add subscribers to stream.
|
// stream without invitation and cannot add subscribers to stream.
|
||||||
if (!sub.should_display_subscription_button) {
|
if (!sub.should_display_subscription_button) {
|
||||||
settings_button.hide();
|
settings_button.hide();
|
||||||
$('.add_subscribers_container').hide();
|
$('.add_subscribers_container').hide();
|
||||||
|
|||||||
@@ -477,7 +477,7 @@ class BotTest(ZulipTestCase, UploadSerializeMixin):
|
|||||||
# Hamlet's bot.
|
# Hamlet's bot.
|
||||||
self.login(self.example_email('othello'))
|
self.login(self.example_email('othello'))
|
||||||
|
|
||||||
# Can not deactivate a user as a bot
|
# Cannot deactivate a user as a bot
|
||||||
result = self.client_delete("/json/bots/" + self.example_email("hamlet"))
|
result = self.client_delete("/json/bots/" + self.example_email("hamlet"))
|
||||||
self.assert_json_error(result, 'No such bot')
|
self.assert_json_error(result, 'No such bot')
|
||||||
|
|
||||||
@@ -488,7 +488,7 @@ class BotTest(ZulipTestCase, UploadSerializeMixin):
|
|||||||
self.login(self.example_email('hamlet'))
|
self.login(self.example_email('hamlet'))
|
||||||
self.assert_num_bots_equal(1)
|
self.assert_num_bots_equal(1)
|
||||||
|
|
||||||
# Can not deactivate a bot as a user
|
# Cannot deactivate a bot as a user
|
||||||
result = self.client_delete("/json/users/hambot-bot@zulip.testserver")
|
result = self.client_delete("/json/users/hambot-bot@zulip.testserver")
|
||||||
self.assert_json_error(result, 'No such user')
|
self.assert_json_error(result, 'No such user')
|
||||||
self.assert_num_bots_equal(1)
|
self.assert_num_bots_equal(1)
|
||||||
|
|||||||
@@ -311,7 +311,7 @@ class TestCrossRealmPMs(ZulipTestCase):
|
|||||||
with assert_invalid_email():
|
with assert_invalid_email():
|
||||||
self.send_huddle_message(feedback_email, [user1_email, user2_email])
|
self.send_huddle_message(feedback_email, [user1_email, user2_email])
|
||||||
|
|
||||||
# Users on the different realms can not PM each other
|
# Users on the different realms cannot PM each other
|
||||||
with assert_invalid_email():
|
with assert_invalid_email():
|
||||||
self.send_personal_message(user1_email, user2_email, sender_realm="1.example.com")
|
self.send_personal_message(user1_email, user2_email, sender_realm="1.example.com")
|
||||||
|
|
||||||
@@ -319,7 +319,7 @@ class TestCrossRealmPMs(ZulipTestCase):
|
|||||||
with assert_invalid_email():
|
with assert_invalid_email():
|
||||||
self.send_personal_message(user1_email, "hamlet@zulip.com", sender_realm="1.example.com")
|
self.send_personal_message(user1_email, "hamlet@zulip.com", sender_realm="1.example.com")
|
||||||
|
|
||||||
# Users on three different realms can not PM each other
|
# Users on three different realms cannot PM each other
|
||||||
with assert_invalid_email():
|
with assert_invalid_email():
|
||||||
self.send_huddle_message(user1_email, [user2_email, user3_email],
|
self.send_huddle_message(user1_email, [user2_email, user3_email],
|
||||||
sender_realm="1.example.com")
|
sender_realm="1.example.com")
|
||||||
|
|||||||
@@ -442,7 +442,7 @@ class StreamAdminTest(ZulipTestCase):
|
|||||||
{'new_description': ujson.dumps('new description')})
|
{'new_description': ujson.dumps('new description')})
|
||||||
self.assert_json_success(result)
|
self.assert_json_success(result)
|
||||||
|
|
||||||
# But can not change stream type.
|
# But cannot change stream type.
|
||||||
result = self.client_patch('/json/streams/%d' % (stream_id,),
|
result = self.client_patch('/json/streams/%d' % (stream_id,),
|
||||||
{'stream_name': ujson.dumps('private_stream'),
|
{'stream_name': ujson.dumps('private_stream'),
|
||||||
'is_private': ujson.dumps(True)})
|
'is_private': ujson.dumps(True)})
|
||||||
|
|||||||
@@ -354,11 +354,11 @@ class ActivateTest(ZulipTestCase):
|
|||||||
do_change_is_admin(admin, True)
|
do_change_is_admin(admin, True)
|
||||||
self.login(self.example_email("othello"))
|
self.login(self.example_email("othello"))
|
||||||
|
|
||||||
# Can not deactivate a user with the bot api
|
# Cannot deactivate a user with the bot api
|
||||||
result = self.client_delete('/json/bots/hamlet@zulip.com')
|
result = self.client_delete('/json/bots/hamlet@zulip.com')
|
||||||
self.assert_json_error(result, 'No such bot')
|
self.assert_json_error(result, 'No such bot')
|
||||||
|
|
||||||
# Can not deactivate a nonexistent user.
|
# Cannot deactivate a nonexistent user.
|
||||||
result = self.client_delete('/json/users/nonexistent@zulip.com')
|
result = self.client_delete('/json/users/nonexistent@zulip.com')
|
||||||
self.assert_json_error(result, 'No such user')
|
self.assert_json_error(result, 'No such user')
|
||||||
|
|
||||||
@@ -368,7 +368,7 @@ class ActivateTest(ZulipTestCase):
|
|||||||
result = self.client_delete('/json/users/othello@zulip.com')
|
result = self.client_delete('/json/users/othello@zulip.com')
|
||||||
self.assert_json_error(result, 'Cannot deactivate the only organization administrator')
|
self.assert_json_error(result, 'Cannot deactivate the only organization administrator')
|
||||||
|
|
||||||
# Can not reactivate a nonexistent user.
|
# Cannot reactivate a nonexistent user.
|
||||||
result = self.client_post('/json/users/nonexistent@zulip.com/reactivate')
|
result = self.client_post('/json/users/nonexistent@zulip.com/reactivate')
|
||||||
self.assert_json_error(result, 'No such user')
|
self.assert_json_error(result, 'No such user')
|
||||||
|
|
||||||
@@ -377,11 +377,11 @@ class ActivateTest(ZulipTestCase):
|
|||||||
do_change_is_admin(non_admin, False)
|
do_change_is_admin(non_admin, False)
|
||||||
self.login(self.example_email("othello"))
|
self.login(self.example_email("othello"))
|
||||||
|
|
||||||
# Can not deactivate a user with the users api
|
# Cannot deactivate a user with the users api
|
||||||
result = self.client_delete('/json/users/hamlet@zulip.com')
|
result = self.client_delete('/json/users/hamlet@zulip.com')
|
||||||
self.assert_json_error(result, 'Insufficient permission')
|
self.assert_json_error(result, 'Insufficient permission')
|
||||||
|
|
||||||
# Can not reactivate a user
|
# Cannot reactivate a user
|
||||||
result = self.client_post('/json/users/hamlet@zulip.com/reactivate')
|
result = self.client_post('/json/users/hamlet@zulip.com/reactivate')
|
||||||
self.assert_json_error(result, 'Insufficient permission')
|
self.assert_json_error(result, 'Insufficient permission')
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user