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

switch /faq to /guidelines in a bunch of places

This commit is contained in:
Jeff Atwood 2014-07-10 15:30:52 -07:00
parent 5fb38ba9c0
commit ed3bebfebe
3 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/stylesheets/common/base/faqs.scss
View File

@ -26,7 +26,7 @@
margin-left: 40px; margin-left: 40px;
} }
/* intended only for /faq, /tos, and /privacy */ /* intended only for /faq, /guidelines, /tos, and /privacy */
width: 700px; width: 700px;
padding-left:20px; padding-left:20px;

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

@ -105,7 +105,7 @@ en:
flags_title: "Flags" flags_title: "Flags"
show_more: "show more" show_more: "show more"
links: Links links: Links
faq: "FAQ" faq: "Guidelines"
privacy_policy: "Privacy Policy" privacy_policy: "Privacy Policy"
privacy: "Privacy" privacy: "Privacy"
terms_of_service: "Terms of Service" terms_of_service: "Terms of Service"

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

@ -141,7 +141,7 @@ en:
- Include good search words in your topic so others can *find* it. To group your topic with related topics, select a category. - Include good search words in your topic so others can *find* it. To group your topic with related topics, select a category.
For more guidance, [see our FAQ](/faq). This panel will only appear for your first %{education_posts_text}. For more, [see our community guidelines](/guidelines). This panel will only appear for your first %{education_posts_text}.
'new-reply': | 'new-reply': |
Welcome to %{site_name} — **thanks for contributing!** Welcome to %{site_name} — **thanks for contributing!**
@ -152,7 +152,7 @@ en:
- Constructive criticism is welcome, but criticize *ideas*, not people. - Constructive criticism is welcome, but criticize *ideas*, not people.
For more guidance, [see our FAQ](/faq). This panel will only appear for your first %{education_posts_text}. For more, [see our community guidelines](/guidelines). This panel will only appear for your first %{education_posts_text}.
avatar: | avatar: |
### How about a new picture for your account? ### How about a new picture for your account?
@ -399,7 +399,7 @@ en:
long_form: 'flagged this as spam' long_form: 'flagged this as spam'
inappropriate: inappropriate:
title: 'Inappropriate' title: 'Inappropriate'
description: 'This post contains content that a reasonable person would consider offensive, abusive, or a violation of <a href="/faq">our community guidelines</a>.' description: 'This post contains content that a reasonable person would consider offensive, abusive, or a violation of <a href="/guidelines">our community guidelines</a>.'
long_form: 'flagged this as inappropriate' long_form: 'flagged this as inappropriate'
notify_user: notify_user:
title: 'Notify {{username}}' title: 'Notify {{username}}'
@ -409,7 +409,7 @@ en:
email_body: "%{link}\n\n%{message}" email_body: "%{link}\n\n%{message}"
notify_moderators: notify_moderators:
title: 'Notify moderators' title: 'Notify moderators'
description: 'This post requires general moderator attention based on the <a href="/faq">FAQ</a>, <a href="%{tos_url}">TOS</a>, or for another reason not listed above.' description: 'This post requires general moderator attention based on the <a href="/guidelines">guidelines</a>, <a href="%{tos_url}">TOS</a>, or for another reason not listed above.'
long_form: 'notified moderators' long_form: 'notified moderators'
email_title: 'A post in "%{title}" requires moderator attention' email_title: 'A post in "%{title}" requires moderator attention'
email_body: "%{link}\n\n%{message}" email_body: "%{link}\n\n%{message}"
@ -433,11 +433,11 @@ en:
long_form: 'flagged this as spam' long_form: 'flagged this as spam'
inappropriate: inappropriate:
title: 'Inappropriate' title: 'Inappropriate'
description: 'This topic contains content that a reasonable person would consider offensive, abusive, or a violation of <a href="/faq">our community guidelines</a>.' description: 'This topic contains content that a reasonable person would consider offensive, abusive, or a violation of <a href="/guidelines">our community guidelines</a>.'
long_form: 'flagged this as inappropriate' long_form: 'flagged this as inappropriate'
notify_moderators: notify_moderators:
title: 'Notify moderators' title: 'Notify moderators'
description: 'This topic requires general moderator attention based on the <a href="/faq">FAQ</a>, <a href="%{tos_url}">TOS</a>, or for another reason not listed above.' description: 'This topic requires general moderator attention based on the <a href="/guidelines">guidelines</a>, <a href="%{tos_url}">TOS</a>, or for another reason not listed above.'
long_form: 'notified moderators' long_form: 'notified moderators'
email_title: 'The topic "%{title}" requires moderator attention' email_title: 'The topic "%{title}" requires moderator attention'
email_body: "%{link}\n\n%{message}" email_body: "%{link}\n\n%{message}"
@ -1199,7 +1199,7 @@ en:
flag_reasons: flag_reasons:
off_topic: "Your post was flagged as **off-topic**: the community thinks it does not fit into the topic, as currently defined by the title and the first post." off_topic: "Your post was flagged as **off-topic**: the community thinks it does not fit into the topic, as currently defined by the title and the first post."
inappropriate: "Your post was flagged as **inappropriate**: the community thinks it is offensive, abusive, or a violation of [the community guidelines](/faq)." inappropriate: "Your post was flagged as **inappropriate**: the community thinks it is offensive, abusive, or a violation of [the community guidelines](/guidelines)."
spam: "Your post was flagged as **spam**: the community thinks it is an advertisement, not useful or relevant to the topic, but promotional in nature." spam: "Your post was flagged as **spam**: the community thinks it is an advertisement, not useful or relevant to the topic, but promotional in nature."
notify_moderators: "Your post was flagged **for moderator attention**: the community thinks something about the post requires moderator intervention." notify_moderators: "Your post was flagged **for moderator attention**: the community thinks something about the post requires moderator intervention."
@ -1221,7 +1221,7 @@ en:
However, if the post is hidden by the community a second time, the moderators will be notified – and there may be further action, including the possible suspension of your account. However, if the post is hidden by the community a second time, the moderators will be notified – and there may be further action, including the possible suspension of your account.
For additional guidance, please refer to our [FAQ](%{base_url}/faq). For additional guidance, please refer to our [community guidelines](%{base_url}/guidelines).
usage_tips: usage_tips:
text_body_template: | text_body_template: |
@ -1272,7 +1272,7 @@ en:
%{new_user_tips} %{new_user_tips}
We believe in [civilized community behavior](%{base_url}/faq) at all times. We believe in [civilized community behavior](%{base_url}/guidelines) at all times.
Enjoy your stay! Enjoy your stay!
@ -1291,7 +1291,7 @@ en:
%{new_user_tips} %{new_user_tips}
We believe in [civilized community behavior](%{base_url}/faq) at all times. We believe in [civilized community behavior](%{base_url}/guidelines) at all times.
Enjoy your stay! Enjoy your stay!
@ -1400,7 +1400,7 @@ en:
As a precautionary measure, your new account has been blocked from creating new replies or topics until a staff member can review your account. As a precautionary measure, your new account has been blocked from creating new replies or topics until a staff member can review your account.
For additional guidance, please refer to our [FAQ](%{base_url}/faq). For additional guidance, please refer to our [community guidelines](%{base_url}/guidelines).
blocked_by_staff: blocked_by_staff:
subject_template: "Account blocked" subject_template: "Account blocked"
@ -1409,7 +1409,7 @@ en:
This is an automated message from %{site_name} to inform you that your account has been blocked by a staff member. This is an automated message from %{site_name} to inform you that your account has been blocked by a staff member.
For additional guidance, please refer to our [FAQ](%{base_url}/faq). For additional guidance, please refer to our [community guidelines](%{base_url}/guidelines).
user_automatically_blocked: user_automatically_blocked:
subject_template: "New user %{username} blocked due to community flags" subject_template: "New user %{username} blocked due to community flags"
@ -1583,7 +1583,7 @@ en:
%{new_user_tips} %{new_user_tips}
We believe in [civilized community behavior](%{base_url}/faq) at all times. We believe in [civilized community behavior](%{base_url}/guidelines) at all times.
Enjoy your stay! Enjoy your stay!