github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-11-23 21:48:04 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

normalize on "private message" vs "conversation"

Browse Source
This commit is contained in:
Jeff Atwood 2013-04-30 13:54:14 -07:00
parent 6d19db23bb
commit 180c021940
9 changed files with 34 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/discourse/views/modal/invite_private_modal_view.js
View File

@ -35,7 +35,7 @@ Discourse.InvitePrivateModalView = Discourse.ModalBodyView.extend({
var _this = this;
this.set('saving', true);
this.set('error', false);
// Invite the user to the private conversation
// Invite the user to the private message
this.get('topic').inviteUser(this.get('emailOrUsername')).then(function() {
// Success
_this.set('saving', false);

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

@ -245,7 +245,7 @@ en:
disable: 'Cancel "Best Of"'
private_message_info:
title: "Private Conversation"
title: "Private Message"
invite: "Invite Others..."
email: 'Email'
@ -372,9 +372,9 @@ en:
edited: "<i title='edited' class='icon icon-pencil'></i> {{username}} {{link}}"
liked: "<i title='liked' class='icon icon-heart'></i> {{username}} {{link}}"
private_message: "<i class='icon icon-envelope-alt' title='private message'></i> {{username}} {{link}}"
invited_to_private_message: "{{username}} invited you to a private conversation: {{link}}"
invited_to_private_message: "<i class='icon icon-envelope-alt' title='private message'></i> {{username}} {{link}}"
invitee_accepted: "<i title='accepted your invitation' class='icon icon-signin'></i> {{username}} accepted your invitation"
moved_post: "<i title='moved post' class='icon icon-arrow-right'></i> {{username}} moved post to {{link}}"
moved_post: "<i title='moved post' class='icon icon-arrow-right'></i> {{username}} moved to {{link}}"
total_flagged: "total flagged posts"
image_selector:
@ -434,7 +434,7 @@ en:
create_in: 'Create {{categoryName}} Topic'
create: 'Create Topic'
create_long: 'Create a new Topic'
private_message: 'Start a private conversation'
private_message: 'Start a private message'
list: 'Topics'
new: 'new topic'
title: 'Topic'
@ -532,11 +532,11 @@ en:
inviting: "Inviting..."
invite_private:
title: 'Invite to Private Conversation'
title: 'Invite to Private Message'
email_or_username: "Invitee's Email or Username"
email_or_username_placeholder: "email address or username"
action: "Invite"
success: "Thanks! We've invited that user to participate in this private conversation."
success: "Thanks! We've invited that user to participate in this private message."
error: "Sorry there was an error inviting that user."
invite_reply:
@ -653,8 +653,8 @@ en:
inappropriate: "{{icons}} marked this as inappropriate"
notify_moderators: "{{icons}} notified moderators"
notify_moderators_with_url: "{{icons}} <a href='{{postUrl}}'>notified moderators</a>"
notify_user: "{{icons}} started a private conversation"
notify_user_with_url: "{{icons}} started a <a href='{{postUrl}}'>private conversation</a>"
notify_user: "{{icons}} sent a private message"
notify_user_with_url: "{{icons}} sent a <a href='{{postUrl}}'>private message</a>"
bookmark: "{{icons}} bookmarked this"
like: "{{icons}} liked this"
vote: "{{icons}} voted for this"
@ -663,7 +663,7 @@ en:
spam: "You flagged this as spam"
inappropriate: "You flagged this as inappropriate"
notify_moderators: "You flagged this for moderation"
notify_user: "You started a private conversation with this user"
notify_user: "You sent a private message to this user"
bookmark: "You bookmarked this post"
like: "You liked this"
vote: "You voted for this post"
@ -681,8 +681,8 @@ en:
one: "You and 1 other flagged this for moderation"
other: "You and {{count}} other people flagged this for moderation"
notify_user:
one: "You and 1 other started a private conversation with this user"
other: "You and {{count}} other started a private conversation with this user"
one: "You and 1 other sent a private message to this user"
other: "You and {{count}} other people sent a private message to this user"
bookmark:
one: "You and 1 other bookmarked this post"
other: "You and {{count}} other people bookmarked this post"
@ -706,8 +706,8 @@ en:
one: "1 person flagged this for moderation"
other: "{{count}} people flagged this for moderation"
notify_user:
one: "1 person started a private conversation with this user"
other: "{{count}} started a private conversation with this user"
one: "1 person sent a private message to this user"
other: "{{count}} sent a private message to this user"
bookmark:
one: "1 person bookmarked this post"
other: "{{count}} people bookmarked this post"

4
config/locales/client.es.yml
View File

@ -478,11 +478,11 @@ es:
inviting: "Inviting..."
invite_private:
title: 'Invite to Private Conversation'
title: 'Invite to Private Message'
email_or_username: "Invitee's Email or Username"
email_or_username_placeholder: "email address or username"
action: "Invite"
success: "Thanks! We've invited that user to participate in this private conversation."
success: "Thanks! We've invited that user to participate in this private message."
error: "Sorry there was an error inviting that user."
invite_reply:

10
config/locales/client.id.yml
View File

@ -198,7 +198,7 @@ id:
button: 'Switch to "Best Of" view'
private_message_info:
title: "Private Conversation"
title: "Private Message"
invite: "Invite Others..."
email: 'Email'
@ -290,7 +290,7 @@ id:
edited: "<i title='edited' class='icon icon-pencil'></i> {{username}} {{link}}"
liked: "<i title='liked' class='icon icon-heart'></i> {{username}} {{link}}"
private_message: "<i class='icon icon-envelope-alt' title='private message'></i> {{username}} {{link}}"
invited_to_private_message: "{{username}} invited you to a private conversation: {{link}}"
invited_to_private_message: "<i class='icon icon-envelope-alt' title='private message'></i> {{username}} {{link}}"
invitee_accepted: "<i title='accepted your invitation' class='icon icon-signin'></i> {{username}} accepted your invitation"
moved_post: "<i title='moved post' class='icon icon-arrow-right'></i> {{username}} moved post to {{link}}"
@ -340,7 +340,7 @@ id:
create_in: 'Create {{categoryName}} Topic'
create: 'Create Topic'
create_long: 'Create a new Topic'
private_message: 'Start a private conversation'
private_message: 'Start a private message'
list: 'Topics'
new: 'new topic'
title: 'Topic'
@ -432,11 +432,11 @@ id:
inviting: "Inviting..."
invite_private:
title: 'Invite to Private Conversation'
title: 'Invite to Private Message'
email_or_username: "Invitee's Email or Username"
email_or_username_placeholder: "email address or username"
action: "Invite"
success: "Thanks! We've invited that user to participate in this private conversation."
success: "Thanks! We've invited that user to participate in this private message."
error: "Sorry there was an error inviting that user."
invite_reply:

2
config/locales/server.da.yml
View File

@ -326,7 +326,7 @@ da:
best_of_score_threshold: "The minimum score of a post to be included in the 'best of'"
best_of_posts_required: "Minimum posts in a topic before 'best of' mode is enabled"
best_of_likes_required: "Minimum likes in a topic before the 'best of' mode will be enabled"
enable_private_messages: "Allow basic (1) trust level users to create private messages and reply to private conversations"
enable_private_messages: "Allow basic (1) trust level users to create private messages and reply to private messages"
enable_long_polling: "Message bus used for notification can use long polling"
long_polling_interval: "Interval before a new long poll is issued in milliseconds "

6
config/locales/server.en.yml
View File

@ -420,7 +420,7 @@ en:
best_of_posts_required: "Minimum posts in a topic before 'best of' mode is enabled"
best_of_likes_required: "Minimum likes in a topic before the 'best of' mode will be enabled"
best_of_percent_filter: "When a user clicks best of, show the top % of posts"
enable_private_messages: "Allow basic (1) trust level users to create private messages and reply to private conversations"
enable_private_messages: "Allow basic (1) trust level users to create private messages and reply to private messages"
enable_long_polling: "Message bus used for notification can use long polling"
long_polling_interval: "Interval before a new long poll is issued in milliseconds "
@ -786,9 +786,9 @@ en:
description: "Not interested in getting these emails? No problem! Click below to unsubscribe instantly:"
user_invited_to_private_message:
subject_template: "[%{site_name}] %{username} invited you to a private conversation '%{topic_title}'"
subject_template: "[%{site_name}] %{username} invited you to a private message '%{topic_title}'"
text_body_template: |
%{username} invited you to a private conversation '%{topic_title}' on %{site_name}:
%{username} invited you to a private message '%{topic_title}' on %{site_name}:
Please visit this link to view the topic: %{base_url}%{url}

6
config/locales/server.es.yml
View File

@ -316,7 +316,7 @@ es:
best_of_score_threshold: "The minimum score of a post to be included in the 'best of'"
best_of_posts_required: "Minimum posts in a topic before 'best of' mode is enabled"
best_of_likes_required: "Minimum likes in a topic before the 'best of' mode will be enabled"
enable_private_messages: "Allow basic (1) trust level users to create private messages and reply to private conversations"
enable_private_messages: "Allow basic (1) trust level users to create private messages and reply to private messages"
enable_long_polling: "Message bus used for notification can use long polling"
long_polling_interval: "Interval before a new long poll is issued in milliseconds "
@ -678,9 +678,9 @@ es:
description: "Not interested in getting these emails? No problem! Click below to unsubscribe instantly:"
user_invited_to_private_message:
subject_template: "[%{site_name}] %{username} invited you to a private conversation '%{topic_title}'"
subject_template: "[%{site_name}] %{username} invited you to a private message '%{topic_title}'"
text_body_template: |
%{username} invited you to a private conversation '%{topic_title}' on %{site_name}:
%{username} invited you to a private message '%{topic_title}' on %{site_name}:
Please visit this link to view the topic: %{base_url}%{url}

6
config/locales/server.id.yml
View File

@ -331,7 +331,7 @@ id:
best_of_posts_required: "Minimum posts in a topic before 'best of' mode is enabled"
best_of_likes_required: "Minimum likes in a topic before the 'best of' mode will be enabled"
best_of_percent_filter: "When a user clicks best of, show the top % of posts"
enable_private_messages: "Allow basic (1) trust level users to create private messages and reply to private conversations"
enable_private_messages: "Allow basic (1) trust level users to create private messages and reply to private messages"
enable_long_polling: "Message bus used for notification can use long polling"
long_polling_interval: "Interval before a new long poll is issued in milliseconds "
@ -698,9 +698,9 @@ id:
description: "Not interested in getting these emails? No problem! Click below to unsubscribe instantly:"
user_invited_to_private_message:
subject_template: "[%{site_name}] %{username} invited you to a private conversation '%{topic_title}'"
subject_template: "[%{site_name}] %{username} invited you to a private message '%{topic_title}'"
text_body_template: |
%{username} invited you to a private conversation '%{topic_title}' on %{site_name}:
%{username} invited you to a private message '%{topic_title}' on %{site_name}:
Please visit this link to view the topic: %{base_url}%{url}

6
config/locales/server.sv.yml
View File

@ -370,7 +370,7 @@ sv:
best_of_posts_required: "Minimum posts in a topic before 'best of' mode is enabled"
best_of_likes_required: "Minimum likes in a topic before the 'best of' mode will be enabled"
best_of_percent_filter: "When a user clicks best of, show the top % of posts"
enable_private_messages: "Allow basic (1) trust level users to create private messages and reply to private conversations"
enable_private_messages: "Allow basic (1) trust level users to create private messages and reply to private messages"
enable_long_polling: "Message bus used for notification can use long polling"
long_polling_interval: "Interval before a new long poll is issued in milliseconds "
@ -752,9 +752,9 @@ sv:
description: "Not interested in getting these emails? No problem! Click below to unsubscribe instantly:"
user_invited_to_private_message:
subject_template: "[%{site_name}] %{username} invited you to a private conversation '%{topic_title}'"
subject_template: "[%{site_name}] %{username} invited you to a private message '%{topic_title}'"
text_body_template: |
%{username} invited you to a private conversation '%{topic_title}' on %{site_name}:
%{username} invited you to a private message '%{topic_title}' on %{site_name}:
Please visit this link to view the topic: %{base_url}%{url}