Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

UX: Update copy to remove a topic status update.

This commit is contained in:
Guo Xiang Tan 2017-03-31 11:54:20 +08:00
parent 7cf2528f18
commit beba481bc8
3 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/assets/javascripts/discourse/controllers/edit-topic-status-update.js.es6
View File

@ -41,15 +41,6 @@ export default Ember.Controller.extend(ModalFunctionality, {
return Ember.isEmpty(updateTime) || updateTimeInvalid || loading; return Ember.isEmpty(updateTime) || updateTimeInvalid || loading;
}, },
@computed('autoReopen', 'autoClose')
removeStatusUpdateLabel(autoReopen, autoClose) {
if (autoReopen) {
return 'topic.auto_reopen.remove';
} else if (autoClose) {
return 'topic.auto_close.remove';
}
},
@observes("topicStatusUpdate.execute_at", "topicStatusUpdate.duration") @observes("topicStatusUpdate.execute_at", "topicStatusUpdate.duration")
setAutoCloseTime() { setAutoCloseTime() {
let time = null; let time = null;

4
app/assets/javascripts/discourse/templates/modal/edit-topic-status-update.hbs
View File

@ -58,7 +58,9 @@
{{conditional-loading-spinner size="small" condition=loading}} {{conditional-loading-spinner size="small" condition=loading}}
{{#if topicStatusUpdate.execute_at}} {{#if topicStatusUpdate.execute_at}}
{{d-button class="pull-right" action="removeStatusUpdate" label=removeStatusUpdateLabel}} {{d-button class="pull-right btn-danger"
action="removeStatusUpdate"
label='topic.topic_status_update.remove'}}
{{/if}} {{/if}}
</div> </div>
</form> </form>

3
config/locales/client.en.yml
View File

@ -1473,6 +1473,7 @@ en:
title: "Set Topic Timer" title: "Set Topic Timer"
save: "Set Timer" save: "Set Timer"
time: "Time:" time: "Time:"
remove: "Remove Timer"
auto_update_input: auto_update_input:
limited: limited:
units: "(# of hours)" units: "(# of hours)"
@ -1482,13 +1483,11 @@ en:
examples: 'Enter number of hours (24), absolute time (17:30) or timestamp (2013-11-22 14:00).' examples: 'Enter number of hours (24), absolute time (17:30) or timestamp (2013-11-22 14:00).'
auto_reopen: auto_reopen:
title: "Auto-open Topic" title: "Auto-open Topic"
remove: "Don't Auto-Reopen This Topic"
auto_close: auto_close:
title: "Auto-Close Topic" title: "Auto-Close Topic"
label: "Auto-close topic time:" label: "Auto-close topic time:"
error: "Please enter a valid value." error: "Please enter a valid value."
based_on_last_post: "Don't close until the last post in the topic is at least this old." based_on_last_post: "Don't close until the last post in the topic is at least this old."
remove: "Don't Auto-Close This Topic"
status_update_notice: status_update_notice:
auto_open: "This topic will automatically open %{timeLeft}." auto_open: "This topic will automatically open %{timeLeft}."