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

rename private to personal

This commit is contained in:
Arpit Jalan 2018-01-31 11:57:50 +05:30
parent 6be536ca50
commit 49424fd798
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/discourse/templates/modal/keyboard-shortcuts-help.hbs
View File

@ -11,7 +11,7 @@
<li>{{{i18n 'keyboard_shortcuts_help.jump_to.top'}}}</li> <li>{{{i18n 'keyboard_shortcuts_help.jump_to.top'}}}</li>
<li>{{{i18n 'keyboard_shortcuts_help.jump_to.bookmarks'}}}</li> <li>{{{i18n 'keyboard_shortcuts_help.jump_to.bookmarks'}}}</li>
<li>{{{i18n 'keyboard_shortcuts_help.jump_to.profile'}}}</li> <li>{{{i18n 'keyboard_shortcuts_help.jump_to.profile'}}}</li>
{{#if siteSettings.enable_private_messages}} {{#if siteSettings.enable_personal_messages}}
<li>{{{i18n 'keyboard_shortcuts_help.jump_to.messages'}}}</li> <li>{{{i18n 'keyboard_shortcuts_help.jump_to.messages'}}}</li>
{{/if}} {{/if}}
</ul> </ul>

2
app/assets/javascripts/discourse/templates/topic.hbs
View File

@ -42,7 +42,7 @@
{{else}} {{else}}
<h1> <h1>
{{#unless model.is_warning}} {{#unless model.is_warning}}
{{#if siteSettings.enable_private_messages}} {{#if siteSettings.enable_personal_messages}}
<a href={{pmPath}}> <a href={{pmPath}}>
<span class="private-message-glyph">{{d-icon "envelope"}}</span> <span class="private-message-glyph">{{d-icon "envelope"}}</span>
</a> </a>

4
test/javascripts/helpers/site-settings.js
View File

@ -39,11 +39,11 @@ Discourse.SiteSettingsOriginal = {
"delete_user_max_post_age":60, "delete_user_max_post_age":60,
"delete_all_posts_max":15, "delete_all_posts_max":15,
"min_post_length":20, "min_post_length":20,
"min_private_message_post_length":10, "min_personal_message_post_length":10,
"max_post_length":32000, "max_post_length":32000,
"min_topic_title_length":15, "min_topic_title_length":15,
"max_topic_title_length":255, "max_topic_title_length":255,
"min_private_message_title_length":2, "min_personal_message_title_length":2,
"allow_uncategorized_topics":true, "allow_uncategorized_topics":true,
"min_title_similar_length":10, "min_title_similar_length":10,
"edit_history_visible_to_public":true, "edit_history_visible_to_public":true,