paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-11 01:16:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename user-visible uses of "subject" to "topic".

Browse Source 
(imported from commit 19e08a13624686da8703fcb8b5eefe2e29edf64b)
This commit is contained in:
Jessica McKellar
2013-07-16 15:00:52 -04:00
parent d61ebc2385
commit dac5a46fa4
14 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
templates/zephyr/compose.html
View File

@@ -43,7 +43,7 @@
<i class="icon-vector-narrow icon-vector-small"></i>
<input type="text" class="recipient_box" name="subject" id="subject"
maxlength="60"
value="" placeholder="Subject" autocomplete="off" tabindex="130"/>
value="" placeholder="Topic" autocomplete="off" tabindex="130"/>
</td>
</tr>
<tr id="private-message">

2
templates/zephyr/keyboard_shortcuts.html
View File

@@ -81,7 +81,7 @@
</tr>
<tr>
<td class="hotkey">S</td>
<td class="definition">Narrow by subject</td>
<td class="definition">Narrow by topic</td>
</tr>
<tr>
<td class="hotkey">v</td>

10
templates/zephyr/new-user.html
View File

@@ -16,9 +16,9 @@
Here's what you need to know:</p>
<ul>
<li>Every message has a <b>stream</b> and a <b>subject</b></li>
<li>Every message has a <b>stream</b> and a <b>topic</b></li>
<li>A stream is kind of like a mailing list -- it represents a group of people -- and anyone can <i>subscribe</i> to a stream and start getting traffic there</li>
<li>A subject, on the other hand, is what the message is <i>actually about</i></li>
<li>A topic, on the other hand, is what the message is <i>actually about</i></li>
<li>(You can, of course, send private messages.)</li>
<li>All of these are displayed simultaneously, in an interleaved way, chronologically</li>
<li>Time flows down</li>
@@ -35,14 +35,14 @@
<p>Here, we have three conversations occurring simultaneously:</p>
<ul>
<li>One on stream "zulip" with subject "Lunch", about where to go to lunch</li>
<li>One on stream "zulip" with subject "Zulip testers", about early beta testers</li>
<li>One on stream "zulip" with topic "Lunch", about where to go to lunch</li>
<li>One on stream "zulip" with topic "Zulip testers", about early beta testers</li>
<li>One automated notification on stream "commits", about a commit made to the repository</li>
</ul>
<h3>Some things to know</h3>
<ul>
<li>"Enter" will start a reply to the message with the blue line by it (in the example above, the one with subject "Zulip testers")</li>
<li>"Enter" will start a reply to the message with the blue line by it (in the example above, the one with topic "Zulip testers")</li>
<li>When you send the reply, it will appear at the very bottom of the stream (not directly below the message you reply to)</li>
<li>We have mobile apps, an API, and integrations with many popular services</li>
</ul>

2
templates/zephyr/tutorial_finale.html
View File

@@ -7,7 +7,7 @@
<b>We make it easy for you to see the things you care about.</b>
<p>
Streams, subjects, and narrowing let you zoom in on the things that
Streams, topics, and narrowing let you zoom in on the things that
interest you, and quickly ignore the ones that don't.
</p>
<p>

10
zephyr/lib/actions.py
View File

@@ -403,12 +403,12 @@ def check_message(sender, client, message_type_name, message_to,
return "Invalid stream name"
if subject_name is None:
return "Missing subject"
return "Missing topic"
subject = subject_name.strip()
if subject == "":
return "Subject can't be empty"
return "Topic can't be empty"
if len(subject) > MAX_SUBJECT_LENGTH:
return "Subject too long"
return "Topic too long"
## FIXME: Commented out temporarily while we figure out what we want
# if not valid_stream_name(subject):
# return json_error("Invalid subject name")
@@ -992,10 +992,10 @@ def do_update_message(user_profile, message_id, subject, content):
if subject is not None:
subject = subject.strip()
if subject == "":
raise JsonableError("Subject can't be empty")
raise JsonableError("Topic can't be empty")
if len(subject) > MAX_SUBJECT_LENGTH:
raise JsonableError("Subject too long")
raise JsonableError("Topic too long")
event["orig_subject"] = message.subject
message.subject = subject
event["subject"] = subject

2
zephyr/static/js/tutorial.js
View File

@@ -317,7 +317,7 @@ function subject() {
var spotlight_message = rows.first_visible();
var bar = spotlight_message.prev(".recipient_row");
var placement = maybe_tweak_placement("bottom");
create_and_show_popover(bar, placement, "Subjects", "tutorial_subject");
create_and_show_popover(bar, placement, "Topics", "tutorial_subject");
var my_popover = $("#tutorial-subject").closest(".popover");
if (placement === "bottom") { // Wider screen, popover is on bottom.

4
zephyr/static/templates/actions_popover_content.handlebars
View File

@@ -4,7 +4,7 @@
<a href="#" class="respond_button">
<i class="icon-share-alt"></i>
{{#if message.is_stream}}
Reply to this subject on stream <b>{{message.stream}}</b>
Reply to this topic on stream <b>{{message.stream}}</b>
{{else}}
Reply to this private message
{{/if}}
@@ -22,7 +22,7 @@
<li>
<a href="#" class="popover_narrow_by_subject_button" data-msgid="{{message.id}}">
<i class="icon-bullhorn"></i>
Narrow to this subject on stream <b>{{message.stream}}</b>
Narrow to this topic on stream <b>{{message.stream}}</b>
</a>
</li>
{{else}}

2
zephyr/static/templates/message.handlebars
View File

@@ -39,7 +39,7 @@
title="Narrow to stream &quot;{{display_recipient}}&quot;">{{display_recipient}}</span>
&nbsp;<i class="icon-vector-narrow icon-vector-small"></i>&nbsp;
<span class="message_label_clickable narrows_by_subject"
title="Narrow to stream &quot;{{display_recipient}}&quot;, subject &quot;{{subject}}&quot;">{{#if ../../../../use_match_properties}}{{{match_subject}}}{{else}}{{subject}}{{/if}}</span>
title="Narrow to stream &quot;{{display_recipient}}&quot;, topic &quot;{{subject}}&quot;">{{#if ../../../../use_match_properties}}{{{match_subject}}}{{else}}{{subject}}{{/if}}</span>
{{#if your_empty_subject}}<i class="icon-vector-pencil edit_subject"></i>{{/if}}
{{#each subject_links}}<a href="{{this}}" target="_blank"><i class="icon-vector-external-link-sign"></i>{{/each}}
</td>

2
zephyr/static/templates/message_edit_form.handlebars
View File

@@ -3,7 +3,7 @@
<form id="message_edit_form" class="form-horizontal">
{{#if is_stream}}
<div class="control-group">
<label class="control-label edit-control-label" for="message_edit_subject">Subject</label>
<label class="control-label edit-control-label" for="message_edit_subject">Topic</label>
<div class="controls edit-controls">
<input type="text" value="{{subject}}" class="message_edit_subject" id="message_edit_subject">
</div>

2
zephyr/static/templates/tutorial_home.handlebars
View File

@@ -4,7 +4,7 @@
<p>
We show stream and private messages together, and time flows down. You
can "narrow" to a particular stream or subject by clicking on it.
can "narrow" to a particular stream or topic by clicking on it.
</p>
<div class="tutorial-done-button">

2
zephyr/static/templates/tutorial_message.handlebars
View File

@@ -2,7 +2,7 @@
<div class="tutorial-popover" id="tutorial-message">
<p>
Messages in Zulip go to a <b>stream</b> and have a <b>subject</b>.
Messages in Zulip go to a <b>stream</b> and have a <b>topic</b>.
</p>
<div class="tutorial-done-button">

2
zephyr/static/templates/tutorial_reply.handlebars
View File

@@ -3,7 +3,7 @@
<div class="tutorial-popover" id="tutorial-reply">
<p>
You can reply to any message by clicking on it. The stream and subject
You can reply to any message by clicking on it. The stream and topic
will automatically be filled in.
</p>

2
zephyr/static/templates/tutorial_subject.handlebars
View File

@@ -3,7 +3,7 @@
<div class="tutorial-popover" id="tutorial-subject">
<p>
A subject is one word that describes what this message is about. Just
A topic is one word that describes what this message is about. Just
like an e-mail subject line, only much shorter. Don't overthink it.
</p>

2
zephyr/tests/frontend/tests/02-narrow.js
View File

@@ -146,7 +146,7 @@ casper.then(function () {
casper.then(function () {
expect_home();
casper.test.info('Narrowing by clicking subject');
casper.click('*[title="Narrow to stream \\\"Verona\\\", subject \\\"frontend test\\\""]');
casper.click('*[title="Narrow to stream \\\"Verona\\\", topic \\\"frontend test\\\""]');
});
casper.then(function () {