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

DEV: unpin Prettier version, apply to YAML files 

We had Prettier pinned because of https://github.com/prettier/prettier/issues/5529. Since that bug is fixed, unpinning.

Prettier now supports YAML, so this applies Prettier to all .yml except for translations, which should not be edited directly anyway.
This commit is contained in:
Penar Musaraj 2019-01-17 13:05:39 -05:00
parent 77fda4dc00
commit 3501533a2b
18 changed files with 941 additions and 937 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.prettierignore
View File

@ -1,3 +1,5 @@
app/assets/stylesheets/vendor/
plugins/**/assets/stylesheets/vendor/
package.json
config/locales/**/*.yml
!config/locales/**/*.en.yml

8
app/assets/javascripts/admin/controllers/admin-user-index.js.es6
View File

@ -301,9 +301,11 @@ export default Ember.Controller.extend(CanCheckEmails, {
const bufferedIds = this.get("customGroupIdsBuffer");
const availableGroups = this.get("availableGroups");
bufferedIds.filter(id => !currentIds.includes(id)).forEach(id => {
this.groupAdded(availableGroups.findBy("id", id));
});
bufferedIds
.filter(id => !currentIds.includes(id))
.forEach(id => {
this.groupAdded(availableGroups.findBy("id", id));
});
currentIds
.filter(id => !bufferedIds.includes(id))

9
app/assets/javascripts/discourse/components/composer-messages.js.es6
View File

@ -205,11 +205,10 @@ export default Ember.Component.extend({
this.set("checkedMessages", true);
const queuedForTyping = this.get("queuedForTyping");
messages.forEach(
msg =>
msg.wait_for_typing
? queuedForTyping.addObject(msg)
: this.send("popup", msg)
messages.forEach(msg =>
msg.wait_for_typing
? queuedForTyping.addObject(msg)
: this.send("popup", msg)
);
};

8
app/assets/javascripts/discourse/components/composer-toggles.js.es6
View File

@ -15,8 +15,8 @@ export default Ember.Component.extend({
return composeState === "draft"
? "composer.open"
: composeState === "fullscreen"
? "composer.exit_fullscreen"
: "composer.enter_fullscreen";
? "composer.exit_fullscreen"
: "composer.enter_fullscreen";
},
@computed("composeState")
@ -31,7 +31,7 @@ export default Ember.Component.extend({
return composeState === "draft"
? "chevron-up"
: composeState === "fullscreen"
? "discourse-compress"
: "discourse-expand";
? "discourse-compress"
: "discourse-expand";
}
});

4
app/assets/javascripts/discourse/components/group-selector.js.es6
View File

@ -27,8 +27,8 @@ export default Ember.Component.extend({
items: _.isArray(groupNames)
? groupNames
: Ember.isEmpty(groupNames)
? []
: [groupNames],
? []
: [groupNames],
single: this.get("single"),
updateData: opts && opts.updateData ? opts.updateData : false,
onChangeItems: items => {

9
app/assets/javascripts/discourse/controllers/preferences/account.js.es6
View File

@ -106,13 +106,8 @@ export default Ember.Controller.extend(
@computed("showAllAuthTokens", "model.user_auth_tokens")
authTokens(showAllAuthTokens, tokens) {
tokens.sort(
(a, b) =>
a.is_active
? -1
: b.is_active
? 1
: b.seen_at.localeCompare(a.seen_at)
tokens.sort((a, b) =>
a.is_active ? -1 : b.is_active ? 1 : b.seen_at.localeCompare(a.seen_at)
);
return showAllAuthTokens

18
app/assets/javascripts/discourse/lib/formatter.js.es6
View File

@ -1,15 +1,15 @@
/* global BreakString:true */
/*
* memoize.js
* by @philogb and @addyosmani
* with further optimizations by @mathias
* and @DmitryBaranovsk
* perf tests: http://bit.ly/q3zpG3
* Released under an MIT license.
*
* modified with cap by Sam
*/
* memoize.js
* by @philogb and @addyosmani
* with further optimizations by @mathias
* and @DmitryBaranovsk
* perf tests: http://bit.ly/q3zpG3
* Released under an MIT license.
*
* modified with cap by Sam
*/
function cappedMemoize(fn, max) {
fn.maxMemoize = max;
fn.memoizeLength = 0;

4
app/assets/javascripts/discourse/lib/page-visible.js.es6
View File

@ -3,8 +3,8 @@ var hiddenProperty =
document.hidden !== undefined
? "hidden"
: document.webkitHidden !== undefined
? "webkitHidden"
: undefined;
? "webkitHidden"
: undefined;
export default function() {
if (hiddenProperty !== undefined) {

8
app/assets/javascripts/ember-addons/fmt.js.es6
View File

@ -21,9 +21,9 @@ export default function(str, formats) {
return typeof s === "string"
? s
: s === null
? "(null)"
: s === undefined
? ""
: "" + s;
? "(null)"
: s === undefined
? ""
: "" + s;
});
}

378
config/cloud/cloud66/deploy_hooks.yml
View File

@ -1,224 +1,224 @@
production:
first_thing:
first_thing:
# 1. Permissions on postgres box
- source: /config/cloud/cloud66/scripts/permissions.sh
destination: /tmp/scripts/permissions.sh
target: postgresql
apply_during: build_only
execute: true
sudo: true
after_postgresql:
- source: /config/cloud/cloud66/scripts/permissions.sh
destination: /tmp/scripts/permissions.sh
target: postgresql
apply_during: build_only
execute: true
sudo: true
after_postgresql:
# 2. Copy SQL image to PSQL server
- source: /pg_dumps/production-image.sql
destination: /tmp/images/production-image.sql
target: postgresql
apply_during: build_only
owner: postgres
after_checkout:
- source: /pg_dumps/production-image.sql
destination: /tmp/images/production-image.sql
target: postgresql
apply_during: build_only
owner: postgres
after_checkout:
# 3. Copy Procfile
- source: /config/cloud/cloud66/files/Procfile
destination: <%= ENV['RAILS_STACK_PATH'] %>/Procfile
target: rails
run_on: all_servers
- source: /config/cloud/cloud66/files/Procfile
destination: <%= ENV['RAILS_STACK_PATH'] %>/Procfile
target: rails
run_on: all_servers
# 5. Copy production.rb file
- source: /config/cloud/cloud66/files/production.rb
destination: <%= ENV['RAILS_STACK_PATH'] %>/config/environments/production.rb
target: rails
run_on: all_servers
- source: /config/cloud/cloud66/files/production.rb
destination: <%= ENV['RAILS_STACK_PATH'] %>/config/environments/production.rb
target: rails
run_on: all_servers
# 6. Move thin config to server
- source: /config/cloud/cloud66/files/thin.yml
destination: <%= ENV['RAILS_STACK_PATH'] %>/config/thin.yml
target: rails
run_on: all_servers
after_rails:
- source: /config/cloud/cloud66/files/thin.yml
destination: <%= ENV['RAILS_STACK_PATH'] %>/config/thin.yml
target: rails
run_on: all_servers
after_rails:
# 7. Set environment variables and allow PSQL user to access them
- source: /config/cloud/cloud66/scripts/env_vars.sh
destination: /tmp/scripts/env_vars.sh
target: rails
apply_during: build_only
execute: true
sudo: true
last_thing:
- source: /config/cloud/cloud66/scripts/env_vars.sh
destination: /tmp/scripts/env_vars.sh
target: rails
apply_during: build_only
execute: true
sudo: true
last_thing:
# 8. KILL DB
- source: /config/cloud/cloud66/scripts/kill_db.sh
destination: /tmp/scripts/kill_db.sh
target: postgresql
apply_during: build_only
execute: true
sudo: true
- source: /config/cloud/cloud66/scripts/kill_db.sh
destination: /tmp/scripts/kill_db.sh
target: postgresql
apply_during: build_only
execute: true
sudo: true
# 9. DB:DROP & DB:CREATE
- source: /config/cloud/cloud66/scripts/drop_create.sh
destination: /tmp/scripts/drop_create.sh
target: rails
apply_during: build_only
execute: true
sudo: true
- source: /config/cloud/cloud66/scripts/drop_create.sh
destination: /tmp/scripts/drop_create.sh
target: rails
apply_during: build_only
execute: true
sudo: true
# 10. Import database image
- source: /config/cloud/cloud66/scripts/import_prod.sh
destination: /tmp/scripts/import_prod.sh
target: postgresql
apply_during: build_only
execute: true
owner: postgres
run_as: postgres
- source: /config/cloud/cloud66/scripts/import_prod.sh
destination: /tmp/scripts/import_prod.sh
target: postgresql
apply_during: build_only
execute: true
owner: postgres
run_as: postgres
# 11. Migrate database
- source: /config/cloud/cloud66/scripts/migrate.sh
destination: /tmp/migrate.sh
target: rails
apply_during: build_only
execute: true
sudo: true
- source: /config/cloud/cloud66/scripts/migrate.sh
destination: /tmp/migrate.sh
target: rails
apply_during: build_only
execute: true
sudo: true
# 12. Curl script
- source: /config/cloud/cloud66/scripts/curl.sh
destination: /tmp/curl.sh
target: rails
apply_during: build_only
execute: true
sudo: true
- source: /config/cloud/cloud66/scripts/curl.sh
destination: /tmp/curl.sh
target: rails
apply_during: build_only
execute: true
sudo: true
staging:
first_thing:
first_thing:
# 1. Permissions on postgres box
- source: /config/cloud/cloud66/scripts/permissions.sh
destination: /tmp/scripts/permissions.sh
target: postgresql
apply_during: build_only
execute: true
sudo: true
after_postgresql:
- source: /config/cloud/cloud66/scripts/permissions.sh
destination: /tmp/scripts/permissions.sh
target: postgresql
apply_during: build_only
execute: true
sudo: true
after_postgresql:
# 2. Copy SQL image to PSQL server
- source: /pg_dumps/production-image.sql
destination: /tmp/images/production-image.sql
target: postgresql
apply_during: build_only
owner: postgres
after_checkout:
- source: /pg_dumps/production-image.sql
destination: /tmp/images/production-image.sql
target: postgresql
apply_during: build_only
owner: postgres
after_checkout:
# 3. Copy Procfile
- source: /config/cloud/cloud66/files/Procfile
destination: <%= ENV['RAILS_STACK_PATH'] %>/Procfile
target: rails
run_on: all_servers
- source: /config/cloud/cloud66/files/Procfile
destination: <%= ENV['RAILS_STACK_PATH'] %>/Procfile
target: rails
run_on: all_servers
# 5. Rename production.rb.sample file
- source: /config/cloud/cloud66/files/production.rb
destination: <%= ENV['RAILS_STACK_PATH'] %>/config/environments/production.rb
target: rails
run_on: all_servers
- source: /config/cloud/cloud66/files/production.rb
destination: <%= ENV['RAILS_STACK_PATH'] %>/config/environments/production.rb
target: rails
run_on: all_servers
# 6. Move thin config to server
- source: /config/cloud/cloud66/files/thin.yml
destination: <%= ENV['RAILS_STACK_PATH'] %>/config/thin.yml
target: rails
run_on: all_servers
after_rails:
- source: /config/cloud/cloud66/files/thin.yml
destination: <%= ENV['RAILS_STACK_PATH'] %>/config/thin.yml
target: rails
run_on: all_servers
after_rails:
# 7. Set environment variables and allow PSQL user to access them
- source: /config/cloud/cloud66/scripts/env_vars.sh
destination: /tmp/scripts/env_vars.sh
target: rails
apply_during: build_only
execute: true
sudo: true
last_thing:
- source: /config/cloud/cloud66/scripts/env_vars.sh
destination: /tmp/scripts/env_vars.sh
target: rails
apply_during: build_only
execute: true
sudo: true
last_thing:
# 8. KILL DB
- source: /config/cloud/cloud66/scripts/kill_db.sh
destination: /tmp/scripts/kill_db.sh
target: postgresql
apply_during: build_only
execute: true
sudo: true
- source: /config/cloud/cloud66/scripts/kill_db.sh
destination: /tmp/scripts/kill_db.sh
target: postgresql
apply_during: build_only
execute: true
sudo: true
# 9. DB:DROP & DB:CREATE
- source: /config/cloud/cloud66/scripts/drop_create.sh
destination: /tmp/scripts/drop_create.sh
target: rails
apply_during: build_only
execute: true
sudo: true
- source: /config/cloud/cloud66/scripts/drop_create.sh
destination: /tmp/scripts/drop_create.sh
target: rails
apply_during: build_only
execute: true
sudo: true
# 10. Import database image
- source: /config/cloud/cloud66/scripts/import_prod.sh
destination: /tmp/scripts/import_prod.sh
target: postgresql
apply_during: build_only
execute: true
owner: postgres
run_as: postgres
- source: /config/cloud/cloud66/scripts/import_prod.sh
destination: /tmp/scripts/import_prod.sh
target: postgresql
apply_during: build_only
execute: true
owner: postgres
run_as: postgres
# 11. Migrate database
- source: /config/cloud/cloud66/scripts/migrate.sh
destination: /tmp/migrate.sh
target: rails
apply_during: build_only
execute: true
sudo: true
- source: /config/cloud/cloud66/scripts/migrate.sh
destination: /tmp/migrate.sh
target: rails
apply_during: build_only
execute: true
sudo: true
# 12. Curl script
- source: /config/cloud/cloud66/scripts/curl.sh
destination: /tmp/curl.sh
target: rails
apply_during: build_only
execute: true
sudo: true
- source: /config/cloud/cloud66/scripts/curl.sh
destination: /tmp/curl.sh
target: rails
apply_during: build_only
execute: true
sudo: true
development:
first_thing:
first_thing:
# 1. Permissions on postgres box
- source: /config/cloud/cloud66/scripts/permissions.sh
apply_during: build_only
execute: true
sudo: true
after_postgresql:
- source: /config/cloud/cloud66/scripts/permissions.sh
apply_during: build_only
execute: true
sudo: true
after_postgresql:
# 2. Copy SQL image to PSQL server
- source: /pg_dumps/development-image.sql
destination: /tmp/images/development-image.sql
target: postgresql
apply_during: build_only
owner: postgres
after_checkout:
- source: /pg_dumps/development-image.sql
destination: /tmp/images/development-image.sql
target: postgresql
apply_during: build_only
owner: postgres
after_checkout:
# 3. Copy Procfile
- source: /config/cloud/cloud66/files/Procfile
destination: <%= ENV['RAILS_STACK_PATH'] %>/Procfile
target: rails
run_on: all_servers
- source: /config/cloud/cloud66/files/Procfile
destination: <%= ENV['RAILS_STACK_PATH'] %>/Procfile
target: rails
run_on: all_servers
# 5. Move thin config to server
- source: /config/cloud/cloud66/files/thin.yml
destination: <%= ENV['RAILS_STACK_PATH'] %>/config/thin.yml
target: rails
run_on: all_servers
after_rails:
- source: /config/cloud/cloud66/files/thin.yml
destination: <%= ENV['RAILS_STACK_PATH'] %>/config/thin.yml
target: rails
run_on: all_servers
after_rails:
# 6. Set environment variables and allow PSQL user to access them
- source: /config/cloud/cloud66/scripts/env_vars.sh
destination: /tmp/scripts/env_vars.sh
target: rails
apply_during: build_only
execute: true
sudo: true
last_thing:
- source: /config/cloud/cloud66/scripts/env_vars.sh
destination: /tmp/scripts/env_vars.sh
target: rails
apply_during: build_only
execute: true
sudo: true
last_thing:
# 7. KILL DB
- source: /config/cloud/cloud66/scripts/kill_db.sh
destination: /tmp/scripts/kill_db.sh
target: postgresql
apply_during: build_only
execute: true
sudo: true
- source: /config/cloud/cloud66/scripts/kill_db.sh
destination: /tmp/scripts/kill_db.sh
target: postgresql
apply_during: build_only
execute: true
sudo: true
# 8. DB:DROP & DB:CREATE
- source: /config/cloud/cloud66/scripts/drop_create.sh
destination: /tmp/scripts/drop_create.sh
target: rails
apply_during: build_only
execute: true
sudo: true
- source: /config/cloud/cloud66/scripts/drop_create.sh
destination: /tmp/scripts/drop_create.sh
target: rails
apply_during: build_only
execute: true
sudo: true
# 9. Import database image
- source: /config/cloud/cloud66/scripts/import_dev.sh
destination: /tmp/scripts/import_dev.sh
target: postgresql
apply_during: build_only
execute: true
owner: postgres
run_as: postgres
- source: /config/cloud/cloud66/scripts/import_dev.sh
destination: /tmp/scripts/import_dev.sh
target: postgresql
apply_during: build_only
execute: true
owner: postgres
run_as: postgres
# 10. Migrate database
- source: /config/cloud/cloud66/scripts/migrate.sh
destination: /tmp/migrate.sh
target: rails
apply_during: build_only
execute: true
sudo: true
- source: /config/cloud/cloud66/scripts/migrate.sh
destination: /tmp/migrate.sh
target: rails
apply_during: build_only
execute: true
sudo: true
# 11. Curl script
- source: /config/cloud/cloud66/scripts/curl.sh
destination: /tmp/curl.sh
target: rails
apply_during: build_only
execute: true
sudo: true
- source: /config/cloud/cloud66/scripts/curl.sh
destination: /tmp/curl.sh
target: rails
apply_during: build_only
execute: true
sudo: true

2
config/cloud/cloud66/files/thin.yml
View File

@ -10,4 +10,4 @@ wait: 30
daemonize: true
chdir: $STACK_PATH
environment: $RAILS_ENV
log: $STACK_PATH/log/thin.log
log: $STACK_PATH/log/thin.log

32
config/cloud/cloud66/manifest.yml
View File

@ -1,19 +1,19 @@
production:
rails:
server:
unique_name: frontend
configuration:
ignore_missing_schema: true
rails:
server:
unique_name: frontend
configuration:
ignore_missing_schema: true
staging:
rails:
server:
unique_name: frontend
configuration:
ignore_missing_schema: true
rails:
server:
unique_name: frontend
configuration:
ignore_missing_schema: true
development:
rails:
server:
unique_name: frontend
configuration:
use_asset_pipeline: false
ignore_missing_schema: true
rails:
server:
unique_name: frontend
configuration:
use_asset_pipeline: false
ignore_missing_schema: true

3
config/database.yml
View File

@ -19,7 +19,7 @@ development:
test:
prepared_statements: false
adapter: postgresql
database: discourse_test<%= ENV['MULTISITE'] ? "_#{ENV['MULTISITE']}" : '' %>
database: "discourse_test<%= ENV['MULTISITE'] ? '_' + ENV['MULTISITE'] : '' %>"
min_messages: warning
pool: 5
timeout: 5000
@ -36,7 +36,6 @@ profile:
timeout: 5000
host_names:
- "localhost"
# You may be surprised production is not here, it is sourced from application.rb using a monkey patch
# This is done for 2 reasons
#

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

File diff suppressed because it is too large Load Diff

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

@ -36,7 +36,21 @@ en:
date:
# Do not remove the brackets and commas and do not translate the first month name. It should be "null".
month_names:
[~, January, February, March, April, May, June, July, August, September, October, November, December]
[
~,
January,
February,
March,
April,
May,
June,
July,
August,
September,
October,
November,
December,
]
<<: *datetime_formats
time:
<<: *datetime_formats
@ -92,7 +106,7 @@ en:
maximum_staged_user_per_email_reached: "Reached maximum number of staged users created per email."
no_subject: "(no subject)"
no_body: "(no body)"
missing_attachment: '(Attachment %{filename} is missing)'
missing_attachment: "(Attachment %{filename} is missing)"
errors:
empty_email_error: "Happens when the raw mail we received was blank."
no_message_id_error: "Happens when the mail has no 'Message-Id' header."
@ -115,8 +129,8 @@ en:
unrecognized_error: "Unrecognized Error"
errors: &errors
format: ! '%{attribute} %{message}'
format_with_full_message: '<b>%{attribute}</b>: %{message}'
format: ! "%{attribute} %{message}"
format_with_full_message: "<b>%{attribute}</b>: %{message}"
messages:
too_long_validation: "is limited to %{max} characters; you entered %{length}."
invalid_boolean: "Invalid boolean."
@ -141,7 +155,7 @@ en:
not_a_number: is not a number
not_an_integer: must be an integer
odd: must be odd
record_invalid: ! 'Validation failed: %{errors}'
record_invalid: ! "Validation failed: %{errors}"
max_emojis: "can't have more than %{max_emojis_count} emoji"
emojis_disabled: "can't have emoji"
ip_address_already_screened: "is already included in an existing rule"
@ -159,16 +173,16 @@ en:
other: is the wrong length (should be %{count} characters)
other_than: "must be other than %{count}"
template:
body: ! 'There were problems with the following fields:'
body: ! "There were problems with the following fields:"
header:
one: 1 error prohibited this %{model} from being saved
other: ! '%{count} errors prohibited this %{model} from being saved'
other: ! "%{count} errors prohibited this %{model} from being saved"
embed:
load_from_remote: "There was an error loading that post."
site_settings:
invalid_choice:
one: 'You specified the invalid choice %{name}'
other: 'You specified the invalid choices %{name}'
one: "You specified the invalid choice %{name}"
other: "You specified the invalid choices %{name}"
default_categories_already_selected: "You cannot select a category used in another list."
s3_upload_bucket_is_required: "You cannot enable uploads to S3 unless you've provided the 's3_upload_bucket'."
s3_backup_requires_s3_settings: "You cannot use S3 as backup location unless you've provided the '%{setting_name}'."
@ -361,7 +375,7 @@ en:
one: "1 post"
other: "%{count} posts"
'new-topic': |
"new-topic": |
Welcome to %{site_name} &mdash; **thanks for starting a new conversation!**
- Does the title sound interesting if you read it out loud? Is it a good summary?
@ -372,7 +386,7 @@ en:
For more, [see our community guidelines](%{base_path}/guidelines). This panel will only appear for your first %{education_posts_text}.
'new-reply': |
"new-reply": |
Welcome to %{site_name} &mdash; **thanks for contributing!**
- Does your reply improve the conversation in some way?
@ -436,8 +450,8 @@ en:
category:
name: "Category Name"
topic:
title: 'Title'
featured_link: 'Featured Link'
title: "Title"
featured_link: "Featured Link"
post:
raw: "Body"
user_profile:
@ -527,7 +541,6 @@ en:
You may want to close this topic via the admin :wrench: (at the upper right and bottom), so that replies don't pile up on an announcement.
lounge_welcome:
title: "Welcome to the Lounge"
body: |
@ -552,7 +565,6 @@ en:
[trust]: https://blog.discourse.org/2018/06/understanding-discourse-trust-levels/
category:
topic_prefix: "About the %{category} category"
replace_paragraph: "(Replace this first paragraph with a brief description of your new category. This guidance will appear in the category selection area, so try to keep it below 200 characters. **Until you edit this description or create topics, this category won't appear on the categories page.**)"
@ -625,82 +637,82 @@ en:
distance_in_words:
half_a_minute: "< 1m"
less_than_x_seconds:
one: "< 1s"
one: "< 1s"
other: "< %{count}s"
x_seconds:
one: "1s"
one: "1s"
other: "%{count}s"
less_than_x_minutes:
one: "< 1m"
one: "< 1m"
other: "< %{count}m"
x_minutes:
one: "1m"
one: "1m"
other: "%{count}m"
about_x_hours:
one: "1h"
one: "1h"
other: "%{count}h"
x_days:
one: "1d"
one: "1d"
other: "%{count}d"
about_x_months:
one: "1mon"
one: "1mon"
other: "%{count}mon"
x_months:
one: "1mon"
one: "1mon"
other: "%{count}mon"
about_x_years:
one: "1y"
one: "1y"
other: "%{count}y"
over_x_years:
one: "> 1y"
one: "> 1y"
other: "> %{count}y"
almost_x_years:
one: "1y"
one: "1y"
other: "%{count}y"
distance_in_words_verbose:
half_a_minute: "just now"
less_than_x_seconds:
one: "just now"
one: "just now"
other: "just now"
x_seconds:
one: "1 second ago"
one: "1 second ago"
other: "%{count} seconds ago"
less_than_x_minutes:
one: "less than 1 minute ago"
one: "less than 1 minute ago"
other: "less than %{count} minutes ago"
x_minutes:
one: "1 minute ago"
one: "1 minute ago"
other: "%{count} minutes ago"
about_x_hours:
one: "1 hour ago"
one: "1 hour ago"
other: "%{count} hours ago"
x_days:
one: "1 day ago"
one: "1 day ago"
other: "%{count} days ago"
about_x_months:
one: "about 1 month ago"
one: "about 1 month ago"
other: "about %{count} months ago"
x_months:
one: "1 month ago"
one: "1 month ago"
other: "%{count} months ago"
about_x_years:
one: "about 1 year ago"
one: "about 1 year ago"
other: "about %{count} years ago"
over_x_years:
one: "over 1 year ago"
one: "over 1 year ago"
other: "over %{count} years ago"
almost_x_years:
one: "almost 1 year ago"
one: "almost 1 year ago"
other: "almost %{count} years ago"
password_reset:
no_token: "Sorry, that password change link is too old. Select the Log In button and use 'I forgot my password' to get a new link."
choose_new: "Choose a new password"
choose: "Choose a password"
update: 'Update Password'
save: 'Set Password'
title: 'Reset Password'
update: "Update Password"
save: "Set Password"
title: "Reset Password"
success: "You successfully changed your password and are now logged in."
success_unapproved: "You successfully changed your password."
@ -765,46 +777,46 @@ en:
back_to: "Return to %{title}"
post_action_types:
off_topic:
title: 'Off-Topic'
description: 'This post is not relevant to the current discussion as defined by the title and first post, and should probably be moved elsewhere.'
short_description: 'Not relevant to the discussion'
long_form: 'flagged this as off-topic'
title: "Off-Topic"
description: "This post is not relevant to the current discussion as defined by the title and first post, and should probably be moved elsewhere."
short_description: "Not relevant to the discussion"
long_form: "flagged this as off-topic"
spam:
title: 'Spam'
description: 'This post is an advertisement, or vandalism. It is not useful or relevant to the current topic.'
short_description: 'This is an advertisement or vandalism'
long_form: 'flagged this as spam'
title: "Spam"
description: "This post is an advertisement, or vandalism. It is not useful or relevant to the current topic."
short_description: "This is an advertisement or vandalism"
long_form: "flagged this as spam"
email_title: '"%{title}" was flagged as spam'
email_body: "%{link}\n\n%{message}"
inappropriate:
title: 'Inappropriate'
title: "Inappropriate"
description: 'This post contains content that a reasonable person would consider offensive, abusive, or a violation of <a href="%{base_path}/guidelines">our community guidelines</a>.'
short_description: 'A violation of <a href="%{base_path}/guidelines">our community guidelines</a>'
long_form: 'flagged this as inappropriate'
long_form: "flagged this as inappropriate"
notify_user:
title: 'Send @{{username}} a message'
description: 'I want to talk to this person directly and personally about their post.'
short_description: 'I want to talk to this person directly and personally about their post.'
long_form: 'messaged user'
title: "Send @{{username}} a message"
description: "I want to talk to this person directly and personally about their post."
short_description: "I want to talk to this person directly and personally about their post."
long_form: "messaged user"
email_title: 'Your post in "%{title}"'
email_body: "%{link}\n\n%{message}"
notify_moderators:
title: "Something Else"
description: 'This post requires staff attention for another reason not listed above.'
short_description: 'Requires staff attention for another reason'
long_form: 'flagged this for staff attention'
description: "This post requires staff attention for another reason not listed above."
short_description: "Requires staff attention for another reason"
long_form: "flagged this for staff attention"
email_title: 'A post in "%{title}" requires staff attention'
email_body: "%{link}\n\n%{message}"
bookmark:
title: 'Bookmark'
description: 'Bookmark this post'
short_description: 'Bookmark this post'
long_form: 'bookmarked this post'
title: "Bookmark"
description: "Bookmark this post"
short_description: "Bookmark this post"
long_form: "bookmarked this post"
like:
title: 'Like'
description: 'Like this post'
short_description: 'Like this post'
long_form: 'liked this'
title: "Like"
description: "Like this post"
short_description: "Like this post"
long_form: "liked this"
user_activity:
no_default:
@ -824,26 +836,26 @@ en:
topic_flag_types:
spam:
title: 'Spam'
description: 'This topic is an advertisement. It is not useful or relevant to this site, but promotional in nature.'
long_form: 'flagged this as spam'
short_description: 'This is an advertisement'
title: "Spam"
description: "This topic is an advertisement. It is not useful or relevant to this site, but promotional in nature."
long_form: "flagged this as spam"
short_description: "This is an advertisement"
inappropriate:
title: 'Inappropriate'
title: "Inappropriate"
description: 'This topic contains content that a reasonable person would consider offensive, abusive, or a violation of <a href="%{base_path}/guidelines">our community guidelines</a>.'
long_form: 'flagged this as inappropriate'
long_form: "flagged this as inappropriate"
short_description: 'A violation of <a href="%{base_path}/guidelines">our community guidelines</a>'
notify_moderators:
title: "Something Else"
description: 'This topic requires general staff attention based on the <a href="%{base_path}/guidelines">guidelines</a>, <a href="%{tos_url}">TOS</a>, or for another reason not listed above.'
long_form: 'flagged this for moderator attention'
short_description: 'Requires staff attention for another reason'
long_form: "flagged this for moderator attention"
short_description: "Requires staff attention for another reason"
email_title: 'The topic "%{title}" requires moderator attention'
email_body: "%{link}\n\n%{message}"
flagging:
you_must_edit: '<p>Your post was flagged by the community. Please <a href="%{path}">see your messages</a>.</p>'
user_must_edit: '<p>This post was flagged by the community and is temporarily hidden.</p>'
user_must_edit: "<p>This post was flagged by the community and is temporarily hidden.</p>"
archetypes:
regular:
@ -877,8 +889,8 @@ en:
authorize: "Authorize"
read: "read"
read_write: "read/write"
description: "\"%{application_name}\" is requesting the following access to your account:"
instructions: "We just generated a new user API key for you to use with \"%{application_name}\", please paste the following key into your application:"
description: '"%{application_name}" is requesting the following access to your account:'
instructions: 'We just generated a new user API key for you to use with "%{application_name}", please paste the following key into your application:'
no_trust_level: "Sorry, you do not have the required trust level to access the user API"
generic_error: "Sorry, we are unable to issue user API keys, this feature may be disabled by the site admin"
scopes:
@ -1190,8 +1202,8 @@ en:
host_names_warning: "Your config/database.yml file is using the default localhost hostname. Update it to use your site's hostname."
gc_warning: 'Your server is using default ruby garbage collection parameters, which will not give you the best performance. Read this topic on performance tuning: <a href="https://meta.discourse.org/t/tuning-ruby-and-rails-for-discourse/4126" target="_blank">Tuning Ruby and Rails for Discourse</a>.'
sidekiq_warning: 'Sidekiq is not running. Many tasks, like sending emails, are executed asynchronously by sidekiq. Please ensure at least one sidekiq process is running. <a href="https://github.com/mperham/sidekiq" target="_blank">Learn about Sidekiq here</a>.'
queue_size_warning: 'The number of queued jobs is %{queue_size}, which is high. This could indicate a problem with the Sidekiq process(es), or you may need to add more Sidekiq workers.'
memory_warning: 'Your server is running with less than 1 GB of total memory. At least 1 GB of memory is recommended.'
queue_size_warning: "The number of queued jobs is %{queue_size}, which is high. This could indicate a problem with the Sidekiq process(es), or you may need to add more Sidekiq workers."
memory_warning: "Your server is running with less than 1 GB of total memory. At least 1 GB of memory is recommended."
google_oauth2_config_warning: 'The server is configured to allow signup and log in with Google OAuth2 (enable_google_oauth2_logins), but the client id and client secret values are not set. Go to <a href="%{base_path}/admin/site_settings">the Site Settings</a> and update the settings. <a href="https://meta.discourse.org/t/configuring-google-login-for-discourse/15858" target="_blank">See this guide to learn more</a>.'
facebook_config_warning: 'The server is configured to allow signup and log in with Facebook (enable_facebook_logins), but the app id and app secret values are not set. Go to <a href="%{base_path}/admin/site_settings">the Site Settings</a> and update the settings. <a href="https://meta.discourse.org/t/configuring-facebook-login-for-discourse/13394" target="_blank">See this guide to learn more</a>.'
twitter_config_warning: 'The server is configured to allow signup and log in with Twitter (enable_twitter_logins), but the key and secret values are not set. Go to <a href="%{base_path}/admin/site_settings">the Site Settings</a> and update the settings. <a href="https://meta.discourse.org/t/configuring-twitter-login-for-discourse/13395" target="_blank">See this guide to learn more</a>.'
@ -1265,7 +1277,7 @@ en:
responsive_post_image_sizes: "Resize lightbox preview images to allow for high DPI screens of the following pixel ratios. Remove all values to disable responsive images."
fixed_category_positions: "If checked, you will be able to arrange categories into a fixed order. If unchecked, categories are listed in order of activity."
fixed_category_positions_on_create: "If checked, category ordering will be maintained on topic creation dialog (requires fixed_category_positions)."
add_rel_nofollow_to_user_content: "Add rel nofollow to all submitted user content, except for internal links (including parent domains). If you change this, you must rebake all posts with: \"rake posts:rebake\""
add_rel_nofollow_to_user_content: 'Add rel nofollow to all submitted user content, except for internal links (including parent domains). If you change this, you must rebake all posts with: "rake posts:rebake"'
exclude_rel_nofollow_domains: "A list of domains where nofollow should not be added to links. example.com will automatically allow sub.example.com as well. As a minimum, you should add the domain of this site to help web crawlers find all content. If other parts of your website are at other domains, add those too."
post_excerpt_maxlength: "Maximum length of a post excerpt / summary."
@ -1343,10 +1355,10 @@ en:
blacklist_ip_blocks: "A list of private IP blocks that should never be crawled by Discourse"
whitelist_internal_hosts: "A list of internal hosts that discourse can safely crawl for oneboxing and other purposes"
allowed_iframes: "A list of iframe src domain prefixes that discourse can safely allow in posts"
whitelisted_crawler_user_agents: 'User agents of web crawlers that should be allowed to access the site.'
blacklisted_crawler_user_agents: 'Unique case insensitive word in the user agent string identifying web crawlers that should not be allowed to access the site. Does not apply if whitelist is defined.'
slow_down_crawler_user_agents: 'User agents of web crawlers that should be rate limited in robots.txt using the Crawl-delay directive'
slow_down_crawler_rate: 'If slow_down_crawler_user_agents is specified this rate will apply to all the crawlers (number of seconds delay between requests)'
whitelisted_crawler_user_agents: "User agents of web crawlers that should be allowed to access the site."
blacklisted_crawler_user_agents: "Unique case insensitive word in the user agent string identifying web crawlers that should not be allowed to access the site. Does not apply if whitelist is defined."
slow_down_crawler_user_agents: "User agents of web crawlers that should be rate limited in robots.txt using the Crawl-delay directive"
slow_down_crawler_rate: "If slow_down_crawler_user_agents is specified this rate will apply to all the crawlers (number of seconds delay between requests)"
content_security_policy: "Enable Content-Security-Policy"
content_security_policy_report_only: "Enable Content-Security-Policy-Report-Only"
content_security_policy_collect_reports: "Enable CSP violation report collection at /csp_reports"
@ -1716,7 +1728,7 @@ en:
pop3_polling_password: "The password for the POP3 account to poll for email."
pop3_polling_delete_from_server: "Delete emails from server. NOTE: If you disable this you should manually clean your mail inbox"
log_mail_processing_failures: "Log all email processing failures to <a href='%{base_path}/logs' target='_blank'>/logs</a>"
email_in: "Allow users to post new topics via email (requires manual or pop3 polling). Configure the addresses in the \"Settings\" tab of each category."
email_in: 'Allow users to post new topics via email (requires manual or pop3 polling). Configure the addresses in the "Settings" tab of each category.'
email_in_min_trust: "The minimum trust level a user needs to have to be allowed to post new topics via email."
email_in_spam_header: "The email header to detect spam."
email_prefix: "The [label] used in the subject of emails. It will default to 'title' if not set."
@ -1968,9 +1980,9 @@ en:
search:
within_post: "#%{post_number} by %{username}"
types:
category: 'Categories'
topic: 'Results'
user: 'Users'
category: "Categories"
topic: "Results"
user: "Users"
results_page: "Search results for '%{term}'"
sso:
@ -2675,7 +2687,6 @@ en:
The Post Action was not recognized. Please try again, or post via the website if this continues.
email_reject_reply_key:
title: "Email Reject Reply Key"
subject_template: "[%{email_prefix}] Email issue -- Unknown Reply Key"
@ -2735,7 +2746,7 @@ en:
email_reject_attachment:
title: "Email Attachment Rejected"
subject_template: "[%{email_prefix}] Email issue -- Attachment Rejected"
text_body_template: |
text_body_template: |
Unfortunately some attachments in your email message to %{destination} (titled %{former_title}) were rejected.
Details:
@ -2881,8 +2892,6 @@ en:
Posts from new users were held for moderation and are currently waiting to be reviewed. [Approve or reject them here](%{base_url}/queued-posts).
unsubscribe_link: |
To unsubscribe from these emails, [click here](%{unsubscribe_url}).
@ -2908,7 +2917,7 @@ en:
title: "Unsubscribe"
description: "Not interested in getting these emails? No problem! Click below to unsubscribe instantly:"
header_instructions: ''
header_instructions: ""
reply_by_email: "[Visit Topic](%{base_url}%{url}) or reply to this email to respond."
reply_by_email_pm: "[Visit Message](%{base_url}%{url}) or reply to this email to respond to %{participants}."
only_reply_by_email: "Reply to this email to respond."
@ -3140,7 +3149,6 @@ en:
%{message}
account_exists:
title: "Account already exists"
subject_template: "[%{email_prefix}] Account already exists"
@ -3153,8 +3161,6 @@ en:
If you have any questions, [contact our friendly staff](%{base_url}/about).
account_second_factor_disabled:
title: "Two Factor Authentication disabled"
subject_template: "[%{email_prefix}] Two Factor Authentication disabled"
@ -3165,7 +3171,6 @@ en:
If you have any questions, [contact our friendly staff](%{base_url}/about).
digest:
why: "A brief summary of %{site_link} since your last visit on %{last_seen_at}"
since_last_visit: "Since your last visit"
@ -3188,26 +3193,26 @@ en:
preheader: "A brief summary since your last visit on %{last_seen_at}"
custom:
html:
header: ''
below_post_1: ''
below_post_2: ''
below_post_3: ''
below_post_4: ''
below_post_5: ''
above_popular_topics: ''
below_popular_topics: ''
above_footer: ''
below_footer: ''
header: ""
below_post_1: ""
below_post_2: ""
below_post_3: ""
below_post_4: ""
below_post_5: ""
above_popular_topics: ""
below_popular_topics: ""
above_footer: ""
below_footer: ""
text:
below_post_1: ''
below_post_2: ''
below_post_3: ''
below_post_4: ''
below_post_5: ''
above_popular_topics: ''
below_popular_topics: ''
above_footer: ''
below_footer: ''
below_post_1: ""
below_post_2: ""
below_post_3: ""
below_post_4: ""
below_post_5: ""
above_popular_topics: ""
below_popular_topics: ""
above_footer: ""
below_footer: ""
forgot_password:
title: "Forgot Password"
@ -3364,7 +3369,7 @@ en:
title: "Terms of Service"
signup_form_message: 'I have read and accept the <a href="%{base_path}/tos" target="_blank">Terms of Service</a>.'
deleted: 'deleted'
deleted: "deleted"
image: "image"
@ -3547,7 +3552,6 @@ en:
Yes, legalese is boring, but we must protect ourselves &ndash; and by extension, you and your data &ndash; against unfriendly folks. We have a [Terms of Service](%{base_path}/tos) describing your (and our) behavior and rights related to content, privacy, and laws. To use this service, you must agree to abide by our [TOS](%{base_path}/tos).
tos_topic:
title: "Terms of Service"
body: |
@ -4036,7 +4040,7 @@ en:
This badge is granted to congratulate two new users each month for their excellent overall contributions, as measured by how often their posts were liked, and by whom.
enthusiast:
name: Enthusiast
description: Visited 10 days
description: Visited 10 days
long_description: |
This badge is granted for visiting 10 consecutive days. Thanks for sticking with us for over a week!
aficionado:
@ -4065,15 +4069,15 @@ en:
tags:
title: "Tags"
staff_tag_disallowed: "The tag \"%{tag}\" may only be applied by staff."
staff_tag_remove_disallowed: "The tag \"%{tag}\" may only be removed by staff."
staff_tag_disallowed: 'The tag "%{tag}" may only be applied by staff.'
staff_tag_remove_disallowed: 'The tag "%{tag}" may only be removed by staff.'
minimum_required_tags: "You must select at least %{count} tags."
upload_row_too_long: "The CSV file should have one tag per line. Optionally the tag can be followed by a comma, then the tag group name."
forbidden:
in_this_category: "\"%{tag_name}\" cannot be used in this category"
in_this_category: '"%{tag_name}" cannot be used in this category'
restricted_to:
one: "\"%{tag_name}\" is restricted to the \"%{category_names}\" category"
other: "\"%{tag_name}\" is restricted to the following categories: %{category_names}"
one: '"%{tag_name}" is restricted to the "%{category_names}" category'
other: '"%{tag_name}" is restricted to the following categories: %{category_names}'
rss_by_tag: "Topics tagged %{tag}"
finish_installation:
@ -4124,7 +4128,8 @@ en:
introduction:
title: "Introduction"
disabled: "<p>We couldn’t find any topic with the title “%{topic_title}”.</p>
disabled:
"<p>We couldn’t find any topic with the title “%{topic_title}”.</p>
<ul>
<li>If you have changed the title, edit that topic to modify your site’s introductory text.</li>
<li>If you have deleted this topic, create another topic with “%{topic_title}” as the title. The content of the first post is your site’s introductory text.</li>
@ -4133,19 +4138,21 @@ en:
fields:
welcome:
label: "Welcome Topic"
description: "<p>How would you describe your community to a stranger on an elevator in about 1 minute?</p>
description:
"<p>How would you describe your community to a stranger on an elevator in about 1 minute?</p>
<ul>
<li>Who are these discussions for?</li>
<li>What can I find here?</li>
<li>Why should I visit?</li>
</ul>
<p>Your welcome topic is the first thing new arrivals will read. Think of it as your <b>one paragraph</b> 'elevator pitch' or 'mission statement'. </p>"
<p>Your welcome topic is the first thing new arrivals will read. Think of it as your <b>one paragraph</b> 'elevator pitch' or 'mission statement'. </p>"
one_paragraph: "Please restrict your welcome message to one paragraph."
privacy:
title: "Access"
description: "<p>Is your community open to everyone, or is it restricted by membership, invitation, or approval? If you prefer, you can set things up privately, then switch over to public later.</p>
<p>You can always send invites from topics, or from your user profile page, too.</p>"
description:
"<p>Is your community open to everyone, or is it restricted by membership, invitation, or approval? If you prefer, you can set things up privately, then switch over to public later.</p>
<p>You can always send invites from topics, or from your user profile page, too.</p>"
fields:
privacy:
@ -4269,8 +4276,8 @@ en:
posted: '%{username} posted in "%{topic}" - %{site_title}'
private_message: '%{username} sent you a private message in "%{topic}" - %{site_title}'
linked: '%{username} linked to your post from "%{topic}" - %{site_title}'
confirm_title: 'Notifications enabled - %{site_title}'
confirm_body: 'Success! Notifications have been enabled.'
confirm_title: "Notifications enabled - %{site_title}"
confirm_body: "Success! Notifications have been enabled."
staff_action_logs:
not_found: "not found"

468
config/site_settings.yml
View File

File diff suppressed because it is too large Load Diff

2
package.json
View File

@ -34,7 +34,7 @@
"chrome-remote-interface": "^0.25",
"eslint": "^4.19",
"pretender": "^1.6",
"prettier": "1.14.3",
"prettier": "^1.15.3",
"puppeteer": "1.4",
"qunit": "2.8.0",
"route-recognizer": "^0.3.3",

8
yarn.lock
View File

@ -1836,10 +1836,10 @@ pretender@^1.6:
fake-xml-http-request "^1.6.0"
route-recognizer "^0.3.3"
prettier@1.14.3:
version "1.14.3"
resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.14.3.tgz#90238dd4c0684b7edce5f83b0fb7328e48bd0895"
integrity sha512-qZDVnCrnpsRJJq5nSsiHCE3BYMED2OtsI+cmzIzF1QIfqm5ALf8tEJcO27zV1gKNKRPdhjO0dNWnrzssDQ1tFg==
prettier@^1.15.3:
version "1.15.3"
resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.15.3.tgz#1feaac5bdd181237b54dbe65d874e02a1472786a"
integrity sha512-gAU9AGAPMaKb3NNSUUuhhFAS7SCO4ALTN4nRIn6PJ075Qd28Yn2Ig2ahEJWdJwJmlEBTUfC7mMUSFy8MwsOCfg==
process-nextick-args@~2.0.0:
version "2.0.0"