Page MenuHomePhabricator
Files F3385038

D4545.id14633.diff
No OneTemporary
Actions

D4545.id14633.diff
View Options

diff --git a/lib/shared/messages/create-sidebar-message-spec.js b/lib/shared/messages/create-sidebar-message-spec.js
--- a/lib/shared/messages/create-sidebar-message-spec.js
+++ b/lib/shared/messages/create-sidebar-message-spec.js
@@ -170,7 +170,7 @@
): string {
let text = `started ${params.encodedThreadEntity(
messageInfo.threadID,
- `this sidebar`,
+ `this thread`,
)}`;
const users = messageInfo.initialThreadState.otherMembers.filter(
member => member.id !== messageInfo.sourceMessageAuthor.id,
@@ -198,7 +198,7 @@
threadID: rawMessageInfo.threadID,
creatorID: rawMessageInfo.creatorID,
time: rawMessageInfo.time,
- robotext: 'created a sidebar',
+ robotext: 'created a thread',
unsupportedMessageInfo: rawMessageInfo,
};
},
@@ -225,7 +225,7 @@
? 'your'
: `${stringForUser(messageInfo.sourceMessageAuthor)}'s`;
const body =
- `started a sidebar in response to ${sourceMessageAuthorPossessive} ` +
+ `started a thread in response to ${sourceMessageAuthorPossessive} ` +
`message "${messageInfo.initialThreadState.name ?? ''}"`;
const merged = `${prefix} ${body}`;
return {
diff --git a/lib/shared/messages/create-sub-thread-message-spec.js b/lib/shared/messages/create-sub-thread-message-spec.js
--- a/lib/shared/messages/create-sub-thread-message-spec.js
+++ b/lib/shared/messages/create-sub-thread-message-spec.js
@@ -125,7 +125,7 @@
const childName = messageInfo.childThreadInfo.name;
const childNoun =
messageInfo.childThreadInfo.type === threadTypes.SIDEBAR
- ? 'sidebar'
+ ? 'thread'
: 'subchannel';
if (childName) {
return (
diff --git a/lib/shared/messages/sidebar-source-message-spec.js b/lib/shared/messages/sidebar-source-message-spec.js
--- a/lib/shared/messages/sidebar-source-message-spec.js
+++ b/lib/shared/messages/sidebar-source-message-spec.js
@@ -149,7 +149,7 @@
threadID: rawMessageInfo.threadID,
creatorID: rawMessageInfo.creatorID,
time: rawMessageInfo.time,
- robotext: 'first message in sidebar',
+ robotext: 'first message in thread',
dontPrefixCreator: true,
unsupportedMessageInfo: rawMessageInfo,
};
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
@@ -113,7 +113,7 @@
if (!isMemberOfParentThread && threadType === threadTypes.SIDEBAR) {
notice = 'not in parent chat';
alertTitle = 'Not in parent chat';
- alertText = 'You can only add members of the parent chat to a sidebar';
+ alertText = 'You can only add members of the parent chat to a thread';
} else if (
relationshipStatus === userRelationshipStatus.BLOCKED_BY_VIEWER
) {
diff --git a/lib/shared/thread-utils.js b/lib/shared/thread-utils.js
--- a/lib/shared/thread-utils.js
+++ b/lib/shared/thread-utils.js
@@ -932,7 +932,7 @@
};
function threadNoun(threadType: ThreadType): string {
- return threadType === threadTypes.SIDEBAR ? 'sidebar' : 'chat';
+ return threadType === threadTypes.SIDEBAR ? 'thread' : 'chat';
}
function threadLabel(threadType: ThreadType): string {
@@ -944,7 +944,7 @@
} else if (threadType === threadTypes.PERSONAL) {
return 'Personal';
} else if (threadType === threadTypes.SIDEBAR) {
- return 'Sidebar';
+ return 'Thread';
} else if (threadType === threadTypes.PRIVATE) {
return 'Private';
} else if (
diff --git a/native/chat/chat-thread-list-see-more-sidebars.react.js b/native/chat/chat-thread-list-see-more-sidebars.react.js
--- a/native/chat/chat-thread-list-see-more-sidebars.react.js
+++ b/native/chat/chat-thread-list-see-more-sidebars.react.js
@@ -26,7 +26,7 @@
const colors = useColors();
const styles = useStyles(unboundStyles);
const unreadStyle = unread ? styles.unread : null;
- const buttonText = showingSidebarsInline ? 'See more...' : 'See sidebars...';
+ const buttonText = showingSidebarsInline ? 'See more...' : 'See threads...';
return (
<Button
iosFormat="highlight"
diff --git a/native/chat/multimedia-message-tooltip-modal.react.js b/native/chat/multimedia-message-tooltip-modal.react.js
--- a/native/chat/multimedia-message-tooltip-modal.react.js
+++ b/native/chat/multimedia-message-tooltip-modal.react.js
@@ -24,12 +24,12 @@
entries: [
{
id: 'create_sidebar',
- text: 'Create sidebar',
+ text: 'Create thread',
onPress: navigateToSidebar,
},
{
id: 'open_sidebar',
- text: 'Go to sidebar',
+ text: 'Go to thread',
onPress: navigateToSidebar,
},
{
diff --git a/native/chat/robotext-message-tooltip-modal.react.js b/native/chat/robotext-message-tooltip-modal.react.js
--- a/native/chat/robotext-message-tooltip-modal.react.js
+++ b/native/chat/robotext-message-tooltip-modal.react.js
@@ -20,12 +20,12 @@
entries: [
{
id: 'create_sidebar',
- text: 'Create sidebar',
+ text: 'Create thread',
onPress: navigateToSidebar,
},
{
id: 'open_sidebar',
- text: 'Go to sidebar',
+ text: 'Go to thread',
onPress: navigateToSidebar,
},
],
diff --git a/native/chat/settings/thread-settings-promote-sidebar.react.js b/native/chat/settings/thread-settings-promote-sidebar.react.js
--- a/native/chat/settings/thread-settings-promote-sidebar.react.js
+++ b/native/chat/settings/thread-settings-promote-sidebar.react.js
@@ -26,7 +26,7 @@
onClick = () => {
Alert.alert(
'Are you sure?',
- 'Promoting a sidebar to a channel cannot be undone.',
+ 'Promoting a thread to a channel cannot be undone.',
[
{
text: 'Cancel',
diff --git a/native/chat/settings/thread-settings.react.js b/native/chat/settings/thread-settings.react.js
--- a/native/chat/settings/thread-settings.react.js
+++ b/native/chat/settings/thread-settings.react.js
@@ -558,7 +558,7 @@
listData.push({
itemType: 'header',
key: 'sidebarHeader',
- title: 'Sidebars',
+ title: 'Threads',
categoryType: 'unpadded',
});
diff --git a/native/chat/sidebar-list-modal.react.js b/native/chat/sidebar-list-modal.react.js
--- a/native/chat/sidebar-list-modal.react.js
+++ b/native/chat/sidebar-list-modal.react.js
@@ -88,7 +88,7 @@
searchText={searchState.text}
onChangeText={onChangeSearchInputText}
containerStyle={styles.search}
- placeholder="Search sidebars"
+ placeholder="Search threads"
ref={setSearchTextInputRef}
/>
<FlatList
diff --git a/native/chat/text-message-tooltip-modal.react.js b/native/chat/text-message-tooltip-modal.react.js
--- a/native/chat/text-message-tooltip-modal.react.js
+++ b/native/chat/text-message-tooltip-modal.react.js
@@ -56,12 +56,12 @@
},
{
id: 'create_sidebar',
- text: 'Create sidebar',
+ text: 'Create thread',
onPress: navigateToSidebar,
},
{
id: 'open_sidebar',
- text: 'Go to sidebar',
+ text: 'Go to thread',
onPress: navigateToSidebar,
},
],
diff --git a/web/chat/chat-thread-list-see-more-sidebars.react.js b/web/chat/chat-thread-list-see-more-sidebars.react.js
--- a/web/chat/chat-thread-list-see-more-sidebars.react.js
+++ b/web/chat/chat-thread-list-see-more-sidebars.react.js
@@ -22,7 +22,7 @@
() => pushModal(<SidebarListModal threadInfo={threadInfo} />),
[pushModal, threadInfo],
);
- const buttonText = showingSidebarsInline ? 'See more...' : 'See sidebars...';
+ const buttonText = showingSidebarsInline ? 'See more...' : 'See threads...';
return (
<div className={classNames(css.thread, css.sidebar)} onClick={onClick}>
<a className={css.threadButton}>
diff --git a/web/chat/message-tooltip.react.js b/web/chat/message-tooltip.react.js
--- a/web/chat/message-tooltip.react.js
+++ b/web/chat/message-tooltip.react.js
@@ -33,8 +33,8 @@
const messageActionIconExcessVerticalWhitespace = 10;
-const openSidebarText = 'Go to sidebar';
-const createSidebarText = 'Create sidebar';
+const openSidebarText = 'Go to thread';
+const createSidebarText = 'Create thread';
type TooltipType = 'sidebar' | 'reply';
diff --git a/web/chat/sidebar-item.react.js b/web/chat/sidebar-item.react.js
--- a/web/chat/sidebar-item.react.js
+++ b/web/chat/sidebar-item.react.js
@@ -30,12 +30,12 @@
<img
className={css.longArrow}
src="images/long_arrow.svg"
- alt="sidebar arrow"
+ alt="thread arrow"
/>
);
} else {
arrow = (
- <img src="images/arrow.svg" className={css.arrow} alt="sidebar arrow" />
+ <img src="images/arrow.svg" className={css.arrow} alt="thread arrow" />
);
}
diff --git a/web/chat/thread-menu.react.js b/web/chat/thread-menu.react.js
--- a/web/chat/thread-menu.react.js
+++ b/web/chat/thread-menu.react.js
@@ -105,7 +105,7 @@
return (
<MenuItem
key="sidebars"
- text="Sidebars"
+ text="Threads"
icon="arrow-right-small"
onClick={onClickSidebars}
/>
diff --git a/web/modals/chat/sidebar-list-modal.react.js b/web/modals/chat/sidebar-list-modal.react.js
--- a/web/modals/chat/sidebar-list-modal.react.js
+++ b/web/modals/chat/sidebar-list-modal.react.js
@@ -68,7 +68,7 @@
);
return (
- <Modal name="Sidebars" onClose={popModal}>
+ <Modal name="Threads" onClose={popModal}>
<div
className={classNames(
globalCSS['modal-body'],
@@ -80,7 +80,7 @@
<MagnifyingGlass className={chatThreadListCSS.searchVector} />
<Input
type="text"
- placeholder="Search sidebars"
+ placeholder="Search threads"
value={searchState.text}
onChange={handleOnChangeSearchText}
/>
diff --git a/web/modals/chat/sidebar-promote-modal.react.js b/web/modals/chat/sidebar-promote-modal.react.js
--- a/web/modals/chat/sidebar-promote-modal.react.js
+++ b/web/modals/chat/sidebar-promote-modal.react.js
@@ -32,7 +32,7 @@
>
<div className={css.modal_body}>
<p>{`Are you sure you want to promote "${uiName}"?`}</p>
- <p>Promoting a sidebar to a channel cannot be undone.</p>
+ <p>Promoting a thread to a channel cannot be undone.</p>
<div className={css.buttonContainer}>
<Button onClick={onClose} type="submit" variant="secondary">
Cancel

File Metadata

Mime Type
text/plain
Expires
Fri, Nov 29, 11:10 PM (20 h, 23 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
2598532
Default Alt Text
D4545.id14633.diff (10 KB)

Event Timeline