From 64d0eb567df3eadad1c70a5eadec58e9560ef0de Mon Sep 17 00:00:00 2001 From: Arpit Jalan Date: Tue, 14 Apr 2015 08:02:01 +0530 Subject: [PATCH 001/113] FIX: scale large vertial images for onebox --- app/assets/stylesheets/common/base/onebox.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/assets/stylesheets/common/base/onebox.scss b/app/assets/stylesheets/common/base/onebox.scss index cc2ce2c2d1..b8f2e93b36 100644 --- a/app/assets/stylesheets/common/base/onebox.scss +++ b/app/assets/stylesheets/common/base/onebox.scss @@ -131,7 +131,7 @@ aside.onebox { img { max-height: 80%; - max-width: 25%; + max-width: 20%; height: auto; float: left; margin-right: 10px; From dba8cbc6ced42c78dd824c3dbcf76ae556c5b830 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcus=20R=C3=BCckert?= Date: Tue, 14 Apr 2015 13:54:33 +0200 Subject: [PATCH 002/113] Update poll readme to include warning about the topic prefix. --- plugins/poll/README.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/plugins/poll/README.md b/plugins/poll/README.md index 805c0818c7..0af9a14877 100644 --- a/plugins/poll/README.md +++ b/plugins/poll/README.md @@ -7,6 +7,11 @@ Allows you to add a poll to the first post of a topic. 1. Make your topic title start with "Poll: " 2. Include a list in your post (the **first list** will be used) +Important note: + +Make sure you have the "Poll: " prefix in the title right from the start. +Editing the title to include it later is not possible atm. + ## Closing the poll Change the start of the topic title from "Poll: " to "Closed Poll: ". This feature uses the locale of the user who started the topic. From c3b461f58d20c413469c2248b08f20356449e5a7 Mon Sep 17 00:00:00 2001 From: Ben Hadley-Evans Date: Tue, 14 Apr 2015 12:28:39 +0100 Subject: [PATCH 003/113] Add blank alt attribute to avatars. This was giving an ugly border to avatars in the user card as the full size version loaded in Firefox. --- app/assets/javascripts/discourse/lib/utilities.js | 2 +- spec/components/pretty_text_spec.rb | 6 +++--- test/javascripts/lib/utilities-test.js.es6 | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/app/assets/javascripts/discourse/lib/utilities.js b/app/assets/javascripts/discourse/lib/utilities.js index 11f5af2923..f51fd4d46f 100644 --- a/app/assets/javascripts/discourse/lib/utilities.js +++ b/app/assets/javascripts/discourse/lib/utilities.js @@ -51,7 +51,7 @@ Discourse.Utilities = { var classes = "avatar" + (options.extraClasses ? " " + options.extraClasses : ""); var title = (options.title) ? " title='" + Handlebars.Utils.escapeExpression(options.title || "") + "'" : ""; - return ""; + return ""; }, tinyAvatar: function(avatarTemplate, options) { diff --git a/spec/components/pretty_text_spec.rb b/spec/components/pretty_text_spec.rb index 57576faca2..5b1dfd26cf 100644 --- a/spec/components/pretty_text_spec.rb +++ b/spec/components/pretty_text_spec.rb @@ -17,15 +17,15 @@ describe PrettyText do end it "produces a quote even with new lines in it" do - expect(PrettyText.cook("[quote=\"EvilTrout, post:123, topic:456, full:true\"]ddd\n[/quote]")).to match_html "" + expect(PrettyText.cook("[quote=\"EvilTrout, post:123, topic:456, full:true\"]ddd\n[/quote]")).to match_html "" end it "should produce a quote" do - expect(PrettyText.cook("[quote=\"EvilTrout, post:123, topic:456, full:true\"]ddd[/quote]")).to match_html "" + expect(PrettyText.cook("[quote=\"EvilTrout, post:123, topic:456, full:true\"]ddd[/quote]")).to match_html "" end it "trims spaces on quote params" do - expect(PrettyText.cook("[quote=\"EvilTrout, post:555, topic: 666\"]ddd[/quote]")).to match_html "" + expect(PrettyText.cook("[quote=\"EvilTrout, post:555, topic: 666\"]ddd[/quote]")).to match_html "" end end diff --git a/test/javascripts/lib/utilities-test.js.es6 b/test/javascripts/lib/utilities-test.js.es6 index c73153f7da..75d4f14b86 100644 --- a/test/javascripts/lib/utilities-test.js.es6 +++ b/test/javascripts/lib/utilities-test.js.es6 @@ -137,15 +137,15 @@ test("avatarImg", function() { var avatarTemplate = "/path/to/avatar/{size}.png"; equal(utils.avatarImg({avatarTemplate: avatarTemplate, size: 'tiny'}), - "", + "", "it returns the avatar html"); equal(utils.avatarImg({avatarTemplate: avatarTemplate, size: 'tiny', title: 'evilest trout'}), - "", + "", "it adds a title if supplied"); equal(utils.avatarImg({avatarTemplate: avatarTemplate, size: 'tiny', extraClasses: 'evil fish'}), - "", + "", "it adds extra classes if supplied"); blank(utils.avatarImg({avatarTemplate: "", size: 'tiny'}), From eaf5d21c41477cee4241aa310fbe6bfe9284f9b2 Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Tue, 14 Apr 2015 11:49:44 -0400 Subject: [PATCH 004/113] Don't store post timings that are greater than the account lifetime --- app/models/post_timing.rb | 4 +++- spec/models/post_timing_spec.rb | 16 ++++++++++++++++ 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/app/models/post_timing.rb b/app/models/post_timing.rb index 245f512c6a..a1cf4dd60b 100644 --- a/app/models/post_timing.rb +++ b/app/models/post_timing.rb @@ -65,9 +65,11 @@ class PostTiming < ActiveRecord::Base def self.process_timings(current_user, topic_id, topic_time, timings) current_user.user_stat.update_time_read! + account_age_msecs = ((Time.now - current_user.created_at) * 1000.0) + highest_seen = 1 timings.each do |post_number, time| - if post_number >= 0 + if post_number >= 0 && time < account_age_msecs PostTiming.record_timing(topic_id: topic_id, post_number: post_number, user_id: current_user.id, diff --git a/spec/models/post_timing_spec.rb b/spec/models/post_timing_spec.rb index 452d6ad3e8..b2c18dd804 100644 --- a/spec/models/post_timing_spec.rb +++ b/spec/models/post_timing_spec.rb @@ -60,6 +60,22 @@ describe PostTiming do end end + describe 'safeguard' do + it "doesn't store timings that are larger than the account lifetime" do + user = Fabricate(:user, created_at: 3.minutes.ago) + post = Fabricate(:post) + + PostTiming.process_timings(user, post.topic_id, 1, [[post.post_number, 123]]) + msecs = PostTiming.where(post_number: post.post_number, user_id: user.id).pluck(:msecs)[0] + expect(msecs).to eq(123) + + PostTiming.process_timings(user, post.topic_id, 1, [[post.post_number, 10.minutes.to_i * 1000]]) + msecs = PostTiming.where(post_number: post.post_number, user_id: user.id).pluck(:msecs)[0] + expect(msecs).to eq(123) + end + + end + describe 'process_timings' do # integration test From 869d8e25ad053b2b9673f25a84e1928b6aef54e8 Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Tue, 14 Apr 2015 12:05:09 -0400 Subject: [PATCH 005/113] Promotion fails if the user account isn't old enough yet. --- lib/promotion.rb | 3 ++ spec/components/promotion_spec.rb | 36 +++++++++++++++++-- spec/components/topic_view_spec.rb | 2 ++ .../admin/users_controller_spec.rb | 2 +- 4 files changed, 40 insertions(+), 3 deletions(-) diff --git a/lib/promotion.rb b/lib/promotion.rb index 14e89c8688..82dd5a998c 100644 --- a/lib/promotion.rb +++ b/lib/promotion.rb @@ -83,6 +83,7 @@ class Promotion return false if stat.topics_entered < SiteSetting.tl2_requires_topics_entered return false if stat.posts_read_count < SiteSetting.tl2_requires_read_posts return false if (stat.time_read / 60) < SiteSetting.tl2_requires_time_spent_mins + return false if ((Time.now - user.created_at) / 60) < SiteSetting.tl2_requires_time_spent_mins return false if stat.days_visited < SiteSetting.tl2_requires_days_visited return false if stat.likes_received < SiteSetting.tl2_requires_likes_received return false if stat.likes_given < SiteSetting.tl2_requires_likes_given @@ -96,6 +97,8 @@ class Promotion return false if stat.topics_entered < SiteSetting.tl1_requires_topics_entered return false if stat.posts_read_count < SiteSetting.tl1_requires_read_posts return false if (stat.time_read / 60) < SiteSetting.tl1_requires_time_spent_mins + return false if ((Time.now - user.created_at) / 60) < SiteSetting.tl1_requires_time_spent_mins + return true end diff --git a/spec/components/promotion_spec.rb b/spec/components/promotion_spec.rb index 0729e63672..71d80a2738 100644 --- a/spec/components/promotion_spec.rb +++ b/spec/components/promotion_spec.rb @@ -15,7 +15,7 @@ describe Promotion do context "newuser" do - let(:user) { Fabricate(:user, trust_level: TrustLevel[0])} + let(:user) { Fabricate(:user, trust_level: TrustLevel[0], created_at: 2.days.ago)} let(:promotion) { Promotion.new(user) } it "doesn't raise an error with a nil user" do @@ -53,11 +53,24 @@ describe Promotion do end end + context "that has done the requisite things" do + it "does not promote the user" do + user.created_at = 1.minute.ago + stat = user.user_stat + stat.topics_entered = SiteSetting.tl1_requires_topics_entered + stat.posts_read_count = SiteSetting.tl1_requires_read_posts + stat.time_read = SiteSetting.tl1_requires_time_spent_mins * 60 + @result = promotion.review + expect(@result).to eq(false) + expect(user.trust_level).to eq(TrustLevel[0]) + end + end + end context "basic" do - let(:user) { Fabricate(:user, trust_level: TrustLevel[1])} + let(:user) { Fabricate(:user, trust_level: TrustLevel[1], created_at: 2.days.ago)} let(:promotion) { Promotion.new(user) } context 'that has done nothing' do @@ -96,6 +109,25 @@ describe Promotion do end end + context "when the account hasn't existed long enough" do + it "does not promote the user" do + user.created_at = 1.minute.ago + + stat = user.user_stat + stat.topics_entered = SiteSetting.tl2_requires_topics_entered + stat.posts_read_count = SiteSetting.tl2_requires_read_posts + stat.time_read = SiteSetting.tl2_requires_time_spent_mins * 60 + stat.days_visited = SiteSetting.tl2_requires_days_visited * 60 + stat.likes_received = SiteSetting.tl2_requires_likes_received + stat.likes_given = SiteSetting.tl2_requires_likes_given + stat.topic_reply_count = SiteSetting.tl2_requires_topic_reply_count + + result = promotion.review + expect(result).to eq(false) + expect(user.trust_level).to eq(TrustLevel[1]) + end + end + end context "regular" do diff --git a/spec/components/topic_view_spec.rb b/spec/components/topic_view_spec.rb index c10fc0128a..dedc080b9f 100644 --- a/spec/components/topic_view_spec.rb +++ b/spec/components/topic_view_spec.rb @@ -214,6 +214,8 @@ describe TopicView do # random user has nothing expect(topic_view.read?(1)).to eq(false) + coding_horror.created_at = 2.days.ago + # a real user that just read it should have it marked PostTiming.process_timings(coding_horror, topic.id, 1, [[1,1000]]) expect(TopicView.new(topic.id, coding_horror).read?(1)).to eq(true) diff --git a/spec/controllers/admin/users_controller_spec.rb b/spec/controllers/admin/users_controller_spec.rb index 114b62b67c..d76ea7c696 100644 --- a/spec/controllers/admin/users_controller_spec.rb +++ b/spec/controllers/admin/users_controller_spec.rb @@ -187,7 +187,7 @@ describe Admin::UsersController do context '.trust_level' do before do - @another_user = Fabricate(:coding_horror) + @another_user = Fabricate(:coding_horror, created_at: 1.month.ago) end it "raises an error when the user doesn't have permission" do From 32e02411bd93bfa6167d8591f1cd735c8665ff48 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9gis=20Hanol?= Date: Tue, 14 Apr 2015 18:16:42 +0200 Subject: [PATCH 006/113] add custom importer for sfn.org --- script/import_scripts/sfn.rb | 269 +++++++++++++++++++++++++++++++++++ 1 file changed, 269 insertions(+) create mode 100644 script/import_scripts/sfn.rb diff --git a/script/import_scripts/sfn.rb b/script/import_scripts/sfn.rb new file mode 100644 index 0000000000..3be18a741f --- /dev/null +++ b/script/import_scripts/sfn.rb @@ -0,0 +1,269 @@ +# custom importer for www.sfn.org, feel free to borrow ideas + +require 'mysql2' +require File.expand_path(File.dirname(__FILE__) + "/base.rb") + +class ImportScripts::Sfn < ImportScripts::Base + + BATCH_SIZE = 1000 + + def initialize + super + end + + def execute + import_users + import_categories + import_topics + import_posts + end + + def import_users + puts "", "importing users..." + + user_count = mysql_query <<-SQL + SELECT COUNT(DISTINCT cm.ContactKey) AS "count" + FROM CommunityMember cm + LEFT JOIN EgroupSubscription es ON es.ContactKey = cm.ContactKey + WHERE LENGTH(COALESCE(es.EmailAddr_, "")) > 5 + SQL + + user_count = user_count.first["count"] + + batches(BATCH_SIZE) do |offset| + users = mysql_query <<-SQL + SELECT cm.ContactKey AS "id", + cm.InvitedOn AS "created_at", + es.EmailAddr_ AS "email", + es.FullName_ AS "name", + c.Bio AS "bio", + c.ProfileImage AS "avatar" + FROM CommunityMember cm + LEFT JOIN EgroupSubscription es ON es.ContactKey = cm.ContactKey + LEFT JOIN Contact c ON c.ContactKey = cm.ContactKey + WHERE LENGTH(COALESCE(es.EmailAddr_, "")) > 5 + GROUP BY cm.ContactKey + ORDER BY "created_at" + LIMIT #{BATCH_SIZE} + OFFSET #{offset} + SQL + + break if users.size < 1 + + create_users(users, total: user_count, offset: offset) do |user| + { + id: user["id"], + name: user["name"], + email: user["email"], + bio_raw: user["bio"], + created_at: user["created_at"], + post_create_action: proc do |newuser| + next if user["avatar"].blank? + + avatar = Tempfile.new("sfn-avatar") + avatar.write(user["avatar"].encode("ASCII-8BIT").force_encoding("UTF-8")) + avatar.rewind + + upload = Upload.create_for(newuser.id, avatar, "avatar.jpg", avatar.size) + if upload.persisted? + newuser.create_user_avatar + newuser.user_avatar.update(custom_upload_id: upload.id) + newuser.update(uploaded_avatar_id: upload.id) + end + + avatar.try(:close!) rescue nil + end + } + end + end + end + + NEW_CATEGORIES = [ + "Abstract Topic Matching Forum", + "Animals in Research", + "Brain Awareness and Teaching", + "Career Advice", + "Career Paths", + "Diversity", + "Early Career Policy Advocates", + "LATP Associates", + "LATP Fellows", + "Mid and Advanced Career", + "Neurobiology of Disease Workshop", + "Neuroscience 2015", + "Neuroscience Scholars Program", + "NSP Associates", + "NSP Fellows", + "Outreach", + "Postdocs and Early Career", + "Program Committee", + "Program Development", + "Roommate Matching Forum", + "Scientific Research", + "Students", + ] + + # EgroupKey => New Category Name + CATEGORY_MAPPING = { + "{DE10E4F4-621A-48BF-9B45-05D9F774A590}" => "Abstract Topic Matching Forum", + "{3FFC1217-1576-4D38-BB81-D6CADC7FB793}" => "Animals in Research", + "{9362BB21-BF6C-4E55-A3E0-18CD5D9F3323}" => "Brain Awareness and Teaching", + "{3AC01B09-A21F-4166-95DA-0E585E271075}" => "Brain Awareness and Teaching", + "{C249728D-8C9E-4138-AA49-D02467C28EAD}" => "Career Advice", + "{01570B85-0124-478F-A8B9-B028BD1B1F2F}" => "Career Paths", + "{2A430528-278A-46CD-BE1A-07CFA1122919}" => "Diversity", + "{2F211345-3C19-43C9-90B5-27BA9FCD4DB0}" => "Diversity", + "{8092297D-8DF4-404A-8BEB-4D5D0DC6A191}" => "Early Career Policy Advocates", + "{8CB58762-D562-448C-9AF1-8DAE6C482C9B}" => "LATP Associates", + "{CDF80A92-925A-46DD-A867-8558FA72D016}" => "LATP Fellows", + "{E71E237B-7C23-4596-AECA-655BD8ED50DB}" => "Mid and Advanced Career", + "{1D674C38-17CB-4C48-826A-D465AC3F8948}" => "Neurobiology of Disease Workshop", + "{3D4F885B-0037-403B-83DD-62FAA8E81DF1}" => "Neuroscience 2015", + "{9ACC3B40-E4A3-4FFD-AADC-C8403EB6231D}" => "Neuroscience 2015", + "{9FC30FFB-E450-4361-8844-0266C3D96868}" => "Neuroscience Scholars Program", + "{3E78123E-87CE-435E-B4B7-7DAB1A21C541}" => "NSP Associates", + "{12D889D3-5CFD-49D5-93E4-32AAB2CFFCDA}" => "NSP Fellows", + "{FA86D79E-170E-4F53-8F1C-942CB3FFB19E}" => "Outreach", + "{D7041C64-3D32-4010-B3D8-71858323CB4A}" => "Outreach", + "{69B76913-4E23-4C80-A11E-9CDB4130722E}" => "Outreach", + "{774878EA-96AD-49F5-9D29-105AEA488007}" => "Outreach", + "{E6349704-FD01-41B1-9C59-68E928DD4318}" => "Postdocs and Early Career", + "{31CF5944-2567-4E79-9730-18EEC23E5B52}" => "Postdocs and Early Career", + "{5625C403-AFAE-4323-A470-33FC32B12B53}" => "Program Committee", + "{8415D871-54F5-4128-B099-E5A376A6B41B}" => "Program Development", + "{B4DF2044-47AB-4329-8BF7-0D832CAB402C}" => "Roommate Matching Forum", + "{6A3A12B9-5C72-472F-97AC-F34983674960}" => "Scientific Research", + "{2CF635E9-4866-451C-A4F2-E2A8A80FED54}" => "Scientific Research", + "{CF2DDCCE-737F-499D-AFE4-E5C36F195C8B}" => "Scientific Research", + "{282B48D7-AC1D-453E-9806-3C6CE6830EF9}" => "Scientific Research", + "{6D750CAF-E96F-4AD1-A45B-7B74FDFF0B40}" => "Scientific Research", + "{10AF5D45-BEB3-4F07-BE77-0BAB6910DE10}" => "Scientific Research", + "{18D7F624-26D1-44B9-BF33-AB5C5A2AB2BF}" => "Scientific Research", + "{6016FF4F-D834-4888-BA03-F9FE8CB1D4CC}" => "Scientific Research", + "{B0290A37-EA39-4CB8-B6CB-3E0B7EF6D036}" => "Scientific Research", + "{97CC60D0-B93A-43FF-BB48-366FAAEE2BAC}" => "Scientific Research", + "{8FC9B57B-2755-4FC5-90E8-CCDB56CF2F66}" => "Scientific Research", + "{57C8BF37-357E-4FE6-952D-906248642792}" => "Scientific Research", + "{7B2A3B63-BC2C-4219-830C-BA1DECB33337}" => "Scientific Research", + "{0ED1D205-0E48-48D2-B82B-3CE80C6C553F}" => "Scientific Research", + "{10355962-D172-4294-AA8E-1BC381B67971}" => "Scientific Research", + "{C84B0222-5232-4B94-9FB8-DDF802241171}" => "Scientific Research", + "{9143F984-0D67-46CB-AAAF-7FE3B6335E07}" => "Scientific Research", + "{1392DC10-37A0-46A6-9979-4568D0224C5F}" => "Scientific Research", + "{E4891409-0F4F-4151-B550-ECE53655E231}" => "Scientific Research", + "{9613BAC2-229B-4563-9E1C-35C31CDDCE2F}" => "Students", + } + + def import_categories + puts "", "importing categories..." + + create_categories(NEW_CATEGORIES) do |category| + { id: category, name: category } + end + end + + def import_topics + puts "", "importing topics..." + + topic_count = mysql_query <<-SQL + SELECT COUNT(MessageID_) AS "count" + FROM EgroupMessages + WHERE ParentId_ = 0 + AND ApprovedRejectedPendingInd = "Approved" + SQL + + topic_count = topic_count.first["count"] + + batches(BATCH_SIZE) do |offset| + topics = mysql_query <<-SQL + SELECT MessageID_ AS "id", + EgroupKey AS "category_id", + ContactKey AS "user_id", + HdrSubject_ AS "title", + Body_ AS "raw", + CreatStamp_ AS "created_at" + FROM EgroupMessages + WHERE ParentId_ = 0 + AND ApprovedRejectedPendingInd = "Approved" + ORDER BY "created_at" + LIMIT #{BATCH_SIZE} + OFFSET #{offset} + SQL + + break if topics.size < 1 + + create_posts(topics, total: topic_count, offset: offset) do |topic| + next unless category_id = CATEGORY_MAPPING[topic["category_id"]] + { + id: topic["id"], + category: category_id_from_imported_category_id(category_id), + user_id: user_id_from_imported_user_id(topic["user_id"]) || Discourse::SYSTEM_USER_ID, + title: topic["title"][0..250], + raw: cleanup_raw(topic["raw"]), + created_at: topic["created_at"], + } + end + end + end + + def import_posts + puts "", "importing posts..." + + posts_count = mysql_query <<-SQL + SELECT COUNT(MessageID_) AS "count" + FROM EgroupMessages + WHERE ParentId_ > 0 + AND ApprovedRejectedPendingInd = "Approved" + SQL + + posts_count = posts_count.first["count"] + + batches(BATCH_SIZE) do |offset| + posts = mysql_query <<-SQL + SELECT MessageID_ AS "id", + ContactKey AS "user_id", + ParentID_ AS "topic_id", + Body_ AS "raw", + CreatStamp_ AS "created_at" + FROM EgroupMessages + WHERE ParentId_ > 0 + AND ApprovedRejectedPendingInd = "Approved" + ORDER BY "created_at" + LIMIT #{BATCH_SIZE} + OFFSET #{offset} + SQL + + break if posts.size < 1 + + create_posts(posts, total: posts_count, offset: offset) do |post| + next unless parent = topic_lookup_from_imported_post_id(post["topic_id"]) + { + id: post["id"], + topic_id: parent[:topic_id], + user_id: user_id_from_imported_user_id(post["user_id"]) || Discourse::SYSTEM_USER_ID, + raw: cleanup_raw(post["raw"]), + created_at: post["created_at"], + } + end + end + end + + def cleanup_raw(raw) + # fix some html + raw.gsub!(//i, "\n") + # remove "This message has been cross posted to the following eGroups: ..." + raw.gsub!(/^This message has been cross posted to the following eGroups: .+\n-{3,}/i, "") + # remove signatures + raw.gsub!(/-{3,}.+/m, "") + # strip leading/trailing whitespaces + raw.strip + end + + def mysql_query(sql) + @client ||= Mysql2::Client.new(username: "root", database: "sfn") + @client.query(sql) + end + +end + +ImportScripts::Sfn.new.perform From a87bf1d9aac4557317d258cb5115dc1da17e6dab Mon Sep 17 00:00:00 2001 From: Kris Aubuchon Date: Tue, 14 Apr 2015 15:54:17 -0400 Subject: [PATCH 007/113] some fixes for tag alignment --- app/assets/stylesheets/common/base/topic.scss | 17 +++++++++++++++++ .../common/components/badges.css.scss | 5 ++++- app/assets/stylesheets/mobile/topic.scss | 2 +- 3 files changed, 22 insertions(+), 2 deletions(-) diff --git a/app/assets/stylesheets/common/base/topic.scss b/app/assets/stylesheets/common/base/topic.scss index 13201331cc..4eb62c3089 100644 --- a/app/assets/stylesheets/common/base/topic.scss +++ b/app/assets/stylesheets/common/base/topic.scss @@ -6,6 +6,13 @@ .btn-small { margin: 0 6px 0 0; } + + .badge-wrapper { + float: left; + &.bullet { + margin-top: 5px; + } + } } a.badge-category { @@ -24,3 +31,13 @@ top: 0; } } + +.extra-info-wrapper { + .badge-wrapper { + float: left; + &.bullet { + margin-top: 5px; + } + } + +} diff --git a/app/assets/stylesheets/common/components/badges.css.scss b/app/assets/stylesheets/common/components/badges.css.scss index 9e8ace19fb..d4ff996ce4 100644 --- a/app/assets/stylesheets/common/components/badges.css.scss +++ b/app/assets/stylesheets/common/components/badges.css.scss @@ -24,6 +24,8 @@ &.bar { //bar category style line-height: 1.25; + margin-right: 5px; + span.badge-category { color: $primary !important; padding: 3px; @@ -51,7 +53,7 @@ &.bullet { //bullet category style line-height: 1; - margin-right: 5px; + margin-right: 10px; h3 & { line-height: .9; @@ -98,6 +100,7 @@ &.box { //box category style (apply custom widths to the wrapper, not the children) line-height: 1.5; margin-top: 5px; + margin-right: 5px; span { display: block; diff --git a/app/assets/stylesheets/mobile/topic.scss b/app/assets/stylesheets/mobile/topic.scss index 70812a772f..313bcfcd7c 100644 --- a/app/assets/stylesheets/mobile/topic.scss +++ b/app/assets/stylesheets/mobile/topic.scss @@ -19,7 +19,7 @@ h1 { font-size: 1.5em; line-height: 1.25em; - margin:0; + margin: 0; a { color: $primary; vertical-align: middle; From 6a0cce8571e024a63acd501a700fb620714dbaa3 Mon Sep 17 00:00:00 2001 From: Sam Date: Wed, 15 Apr 2015 08:38:42 +1000 Subject: [PATCH 008/113] UX: tweak copy and position of tracking and new prefs --- .../javascripts/discourse/controllers/preferences.js.es6 | 2 +- .../javascripts/discourse/templates/user/preferences.hbs | 9 +++++---- config/locales/client.en.yml | 2 +- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/app/assets/javascripts/discourse/controllers/preferences.js.es6 b/app/assets/javascripts/discourse/controllers/preferences.js.es6 index 07120a7c84..7b5810ff30 100644 --- a/app/assets/javascripts/discourse/controllers/preferences.js.es6 +++ b/app/assets/javascripts/discourse/controllers/preferences.js.es6 @@ -67,7 +67,7 @@ export default ObjectController.extend(CanCheckEmails, { { name: I18n.t('user.email_digests.every_two_weeks'), value: 14 }], autoTrackDurations: [{ name: I18n.t('user.auto_track_options.never'), value: -1 }, - { name: I18n.t('user.auto_track_options.always'), value: 0 }, + { name: I18n.t('user.auto_track_options.immediately'), value: 0 }, { name: I18n.t('user.auto_track_options.after_n_seconds', { count: 30 }), value: 30000 }, { name: I18n.t('user.auto_track_options.after_n_minutes', { count: 1 }), value: 60000 }, { name: I18n.t('user.auto_track_options.after_n_minutes', { count: 2 }), value: 120000 }, diff --git a/app/assets/javascripts/discourse/templates/user/preferences.hbs b/app/assets/javascripts/discourse/templates/user/preferences.hbs index d8e5ff1e2b..0133f6537b 100644 --- a/app/assets/javascripts/discourse/templates/user/preferences.hbs +++ b/app/assets/javascripts/discourse/templates/user/preferences.hbs @@ -197,16 +197,17 @@
-
- - {{combo-box valueAttribute="value" content=autoTrackDurations value=auto_track_topics_after_msecs}} -
{{combo-box valueAttribute="value" content=considerNewTopicOptions value=new_topic_duration_minutes}}
+
+ + {{combo-box valueAttribute="value" content=autoTrackDurations value=auto_track_topics_after_msecs}} +
+ {{preference-checkbox labelKey="user.external_links_in_new_tab" checked=external_links_in_new_tab}} {{preference-checkbox labelKey="user.enable_quoting" checked=enable_quoting}} {{preference-checkbox labelKey="user.dynamic_favicon" checked=dynamic_favicon}} diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml index c2d95b258e..7ca4043164 100644 --- a/config/locales/client.en.yml +++ b/config/locales/client.en.yml @@ -509,7 +509,7 @@ en: auto_track_topics: "Automatically track topics I enter" auto_track_options: never: "never" - always: "always" + immediately: "immediately" after_n_seconds: one: "after 1 second" other: "after {{count}} seconds" From 2a3f71a9a1717c420c047dc379d3367858c82391 Mon Sep 17 00:00:00 2001 From: Sam Date: Wed, 15 Apr 2015 08:57:43 +1000 Subject: [PATCH 009/113] SECURITY: log off all existing sessions when resetting password --- app/controllers/users_controller.rb | 1 + spec/controllers/users_controller_spec.rb | 8 +++++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 23dfb48705..137cf9d6bd 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -321,6 +321,7 @@ class UsersController < ApplicationController else @user.password = params[:password] @user.password_required! + @user.auth_token = nil if @user.save Invite.invalidate_for_email(@user.email) # invite link can't be used to log in anymore logon_after_password_reset diff --git a/spec/controllers/users_controller_spec.rb b/spec/controllers/users_controller_spec.rb index 159e007c71..39e4aae8e1 100644 --- a/spec/controllers/users_controller_spec.rb +++ b/spec/controllers/users_controller_spec.rb @@ -266,13 +266,19 @@ describe UsersController do context 'valid token' do it 'returns success' do - user = Fabricate(:user) + user = Fabricate(:user, auth_token: SecureRandom.hex(16)) token = user.email_tokens.create(email: user.email).token + old_token = user.auth_token + get :password_reset, token: token put :password_reset, token: token, password: 'newpassword' expect(response).to be_success expect(assigns[:error]).to be_blank + + user.reload + expect(user.auth_token).to_not eq old_token + expect(user.auth_token.length).to eq 32 end end From 9191fbe9fb66ae4fd2fc6f28030e25096220229a Mon Sep 17 00:00:00 2001 From: Sam Date: Wed, 15 Apr 2015 09:21:52 +1000 Subject: [PATCH 010/113] Upgrade ruby racer so we can remove our freedom patch --- Gemfile.lock | 2 +- .../fix_rubyracer_memory_leak.rb | 33 ------------------- 2 files changed, 1 insertion(+), 34 deletions(-) delete mode 100644 lib/freedom_patches/fix_rubyracer_memory_leak.rb diff --git a/Gemfile.lock b/Gemfile.lock index 79946b29bf..fca49b6c97 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -422,7 +422,7 @@ GEM sprockets (~> 2.8) stackprof (0.2.7) stringex (2.5.2) - therubyracer (0.12.1) + therubyracer (0.12.2) libv8 (~> 3.16.14.0) ref thin (1.6.3) diff --git a/lib/freedom_patches/fix_rubyracer_memory_leak.rb b/lib/freedom_patches/fix_rubyracer_memory_leak.rb deleted file mode 100644 index 2971797b84..0000000000 --- a/lib/freedom_patches/fix_rubyracer_memory_leak.rb +++ /dev/null @@ -1,33 +0,0 @@ -## TODO: DELETE ME WHEN https://github.com/cowboyd/therubyracer/pull/336 -# is upstreamed and released -# -module V8 - module Weak - class WeakValueMap - def initialize - @values = {} - end - - def [](key) - if ref = @values[key] - ref.object - end - end - - def []=(key, value) - ref = V8::Weak::Ref.new(value) - ObjectSpace.define_finalizer(value, self.class.ensure_cleanup(@values, key, ref)) - - @values[key] = ref - end - - private - - def self.ensure_cleanup(values,key,ref) - proc { - values.delete(key) if values[key] == ref - } - end - end - end -end From 499bed69e2365a7e9dad329cf69bb8169886d2b6 Mon Sep 17 00:00:00 2001 From: Arpit Jalan Date: Wed, 15 Apr 2015 13:36:54 +0530 Subject: [PATCH 011/113] FIX: show error message if user already exist in group --- app/assets/javascripts/discourse/models/group.js.es6 | 6 ++++++ app/controllers/admin/groups_controller.rb | 6 +++++- config/locales/server.en.yml | 1 + spec/controllers/admin/groups_controller_spec.rb | 10 ++++++++++ 4 files changed, 22 insertions(+), 1 deletion(-) diff --git a/app/assets/javascripts/discourse/models/group.js.es6 b/app/assets/javascripts/discourse/models/group.js.es6 index 6f426073aa..984941e89f 100644 --- a/app/assets/javascripts/discourse/models/group.js.es6 +++ b/app/assets/javascripts/discourse/models/group.js.es6 @@ -52,6 +52,12 @@ const Group = Discourse.Model.extend({ }).then(function() { // reload member list self.findMembers(); + }).catch(function(error) { + if (error && error.responseText) { + bootbox.alert($.parseJSON(error.responseText).errors[0]); + } else { + bootbox.alert(I18n.t('generic_error')); + } }); }, diff --git a/app/controllers/admin/groups_controller.rb b/app/controllers/admin/groups_controller.rb index 69288921f4..42ed206bfd 100644 --- a/app/controllers/admin/groups_controller.rb +++ b/app/controllers/admin/groups_controller.rb @@ -83,7 +83,11 @@ class Admin::GroupsController < Admin::AdminController end users.each do |user| - group.add(user) + if !group.users.include?(user) + group.add(user) + else + return render_json_error I18n.t('groups.errors.member_already_exist', username: user.username) + end end if group.save diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml index ee0ec4e0e5..f7d1fd83ac 100644 --- a/config/locales/server.en.yml +++ b/config/locales/server.en.yml @@ -180,6 +180,7 @@ en: groups: errors: can_not_modify_automatic: "You can not modify an automatic group" + member_already_exist: "'%{username}' is already a member of this group." default_names: everyone: "everyone" admins: "admins" diff --git a/spec/controllers/admin/groups_controller_spec.rb b/spec/controllers/admin/groups_controller_spec.rb index b8c543f4cc..b7710e7007 100644 --- a/spec/controllers/admin/groups_controller_spec.rb +++ b/spec/controllers/admin/groups_controller_spec.rb @@ -136,6 +136,16 @@ describe Admin::GroupsController do end end + it "returns 422 if member already exists" do + group = Fabricate(:group) + existing_member = Fabricate(:user) + group.add(existing_member) + group.save + + xhr :put, :add_members, id: group.id, usernames: existing_member.username + expect(response.status).to eq(422) + end + end context ".remove_member" do From 539861cc3fa3591ce8529880adedea143b513227 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9gis=20Hanol?= Date: Wed, 15 Apr 2015 11:31:27 +0200 Subject: [PATCH 012/113] FIX: generate pngout-compatible letter avatars --- lib/letter_avatar.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/letter_avatar.rb b/lib/letter_avatar.rb index a9288be339..75708e2546 100644 --- a/lib/letter_avatar.rb +++ b/lib/letter_avatar.rb @@ -77,6 +77,7 @@ class LetterAvatar -stroke #{to_rgb(stroke)} -strokewidth 2 -annotate -0+20 '#{letter}' + -depth 8 '#{filename}' } From b28a004413cfe1637de635b5ef827a280746824b Mon Sep 17 00:00:00 2001 From: betson Date: Wed, 15 Apr 2015 11:42:39 -0400 Subject: [PATCH 013/113] indicate that lists can be pasted if pipe-delimited In the configuration for a list-setting component, the Select2 component is initialized with a pipe ("|") as the separator. (app/assets/javascripts/admin/components/list-setting.js.es6) This should be communicated to the user in the event they want to paste a list of domains for the blacklist/whitelist. --- config/locales/server.en.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml index f7d1fd83ac..edae071b27 100644 --- a/config/locales/server.en.yml +++ b/config/locales/server.en.yml @@ -850,8 +850,8 @@ en: enable_badges: "Enable the badge system" allow_index_in_robots_txt: "Specify in robots.txt that this site is allowed to be indexed by web search engines." - email_domains_blacklist: "A list of email domains that users are not allowed to register accounts with. Example: mailinator.com trashmail.net" - email_domains_whitelist: "A list of email domains that users MUST register accounts with. WARNING: Users with email domains other than those listed will not be allowed!" + email_domains_blacklist: "A pipe-delimited list of email domains that users are not allowed to register accounts with. Example: mailinator.com|trashmail.net" + email_domains_whitelist: "A pipe-delimited list of email domains that users MUST register accounts with. WARNING: Users with email domains other than those listed will not be allowed!" forgot_password_strict: "Don't inform users of an account's existance when they use the forgot password dialog." log_out_strict: "When logging out, log out ALL sessions for the user on all devices" version_checks: "Ping the Discourse Hub for version updates and show new version messages on the /admin dashboard" From 535f7aab8887aaaa1350049c844976e4fc7fc874 Mon Sep 17 00:00:00 2001 From: Jens Maier Date: Wed, 15 Apr 2015 18:35:08 +0200 Subject: [PATCH 014/113] Fix admin badge UI style when no badge selected --- app/assets/javascripts/admin/templates/badges-index.hbs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/assets/javascripts/admin/templates/badges-index.hbs b/app/assets/javascripts/admin/templates/badges-index.hbs index fcb54478d8..6ee80748f8 100644 --- a/app/assets/javascripts/admin/templates/badges-index.hbs +++ b/app/assets/javascripts/admin/templates/badges-index.hbs @@ -1,4 +1,4 @@ -
+

{{i18n 'admin.badges.none_selected'}}

From 8ba6a45cd70c6413746592229998020ae75238d6 Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Wed, 25 Mar 2015 14:24:34 -0400 Subject: [PATCH 015/113] Post Queue model to enqueue creation of posts --- app/models/queued_post.rb | 77 +++++++++++ .../20150325160959_create_queued_posts.rb | 20 +++ spec/models/queued_post_spec.rb | 124 ++++++++++++++++++ 3 files changed, 221 insertions(+) create mode 100644 app/models/queued_post.rb create mode 100644 db/migrate/20150325160959_create_queued_posts.rb create mode 100644 spec/models/queued_post_spec.rb diff --git a/app/models/queued_post.rb b/app/models/queued_post.rb new file mode 100644 index 0000000000..a7b4dcec44 --- /dev/null +++ b/app/models/queued_post.rb @@ -0,0 +1,77 @@ +class QueuedPost < ActiveRecord::Base + + class InvalidStateTransition < StandardError; end; + + serialize :post_options, JSON + + belongs_to :user + belongs_to :topic + belongs_to :approved_by, class_name: "User" + belongs_to :rejected_by, class_name: "User" + + def self.attributes_by_queue + @attributes_by_queue ||= { + base: [:archetype, + :via_email, + :raw_email, + :auto_track, + :custom_fields, + :cooking_options, + :cook_method, + :image_sizes], + new_post: [:reply_to_post_number], + new_topic: [:title, :category, :meta_data, :archetype], + } + end + + def self.states + @states ||= Enum.new(:new, :approved, :rejected) + end + + def reject!(rejected_by) + change_to!(:rejected, rejected_by) + end + + def create_options + opts = {raw: raw} + post_attributes.each {|a| opts[a] = post_options[a.to_s] } + + opts[:topic_id] = topic_id if topic_id + opts + end + + def approve!(approved_by) + created_post = nil + QueuedPost.transaction do + change_to!(:approved, approved_by) + + creator = PostCreator.new(user, create_options) + created_post = creator.create + end + created_post + end + + private + def post_attributes + [QueuedPost.attributes_by_queue[:base], QueuedPost.attributes_by_queue[queue.to_sym]].flatten.compact + end + + def change_to!(state, changed_by) + state_val = QueuedPost.states[state] + + updates = { state: state_val, + "#{state}_by_id" => changed_by.id, + "#{state}_at" => Time.now } + + # We use an update with `row_count` trick here to avoid stampeding requests to + # update the same row simultaneously. Only one state change should go through and + # we can use the DB to enforce this + row_count = QueuedPost.where('id = ? AND state <> ?', id, state_val).update_all(updates) + raise InvalidStateTransition.new if row_count == 0 + + # Update the record in memory too, and clear the dirty flag + updates.each {|k, v| send("#{k}=", v) } + changes_applied + end + +end diff --git a/db/migrate/20150325160959_create_queued_posts.rb b/db/migrate/20150325160959_create_queued_posts.rb new file mode 100644 index 0000000000..4941753ee2 --- /dev/null +++ b/db/migrate/20150325160959_create_queued_posts.rb @@ -0,0 +1,20 @@ +class CreateQueuedPosts < ActiveRecord::Migration + def change + create_table :queued_posts do |t| + t.string :queue, null: false + t.integer :state, null: false + t.integer :user_id, null: false + t.text :raw, null: false + t.text :post_options, null: false + t.integer :topic_id + t.integer :approved_by_id + t.timestamp :approved_at + t.integer :rejected_by_id + t.timestamp :rejected_at + t.timestamps + end + + add_index :queued_posts, [:queue, :state, :created_at], name: 'by_queue_status' + add_index :queued_posts, [:topic, :queue, :state, :created_at], name: 'by_queue_status_topic' + end +end diff --git a/spec/models/queued_post_spec.rb b/spec/models/queued_post_spec.rb new file mode 100644 index 0000000000..7fa07b1991 --- /dev/null +++ b/spec/models/queued_post_spec.rb @@ -0,0 +1,124 @@ +require 'spec_helper' +require_dependency 'queued_post' + +describe QueuedPost do + + context "creating a post" do + let(:topic) { Fabricate(:topic) } + let(:user) { Fabricate(:user) } + let(:admin) { Fabricate(:admin) } + let(:qp) { QueuedPost.create(queue: 'new_post', + state: QueuedPost.states[:new], + user_id: user.id, + topic_id: topic.id, + raw: 'This post should be queued up', + post_options: { + reply_to_post_number: 1, + via_email: true, + raw_email: 'store_me', + auto_track: true, + custom_fields: { hello: 'world' }, + cooking_options: { cat: 'hat' }, + cook_method: 'regular', + not_create_option: true, + image_sizes: {"http://foo.bar/image.png" => {"width" => 0, "height" => 222}} + }) } + + it "returns the appropriate options for posting" do + create_options = qp.create_options + + expect(create_options[:topic_id]).to eq(topic.id) + expect(create_options[:raw]).to eq('This post should be queued up') + expect(create_options[:reply_to_post_number]).to eq(1) + expect(create_options[:via_email]).to eq(true) + expect(create_options[:raw_email]).to eq('store_me') + expect(create_options[:auto_track]).to eq(true) + expect(create_options[:custom_fields]).to eq('hello' => 'world') + expect(create_options[:cooking_options]).to eq('cat' => 'hat') + expect(create_options[:cook_method]).to eq('regular') + expect(create_options[:not_create_option]).to eq(nil) + expect(create_options[:image_sizes]).to eq("http://foo.bar/image.png" => {"width" => 0, "height" => 222}) + end + + it "follows the correct workflow for approval" do + post = qp.approve!(admin) + + # Creates the post with the attributes + expect(post).to be_present + expect(post).to be_valid + expect(post.topic).to eq(topic) + + # Updates the QP record + expect(qp.approved_by).to eq(admin) + expect(qp.state).to eq(QueuedPost.states[:approved]) + expect(qp.approved_at).to be_present + + # We can't approve twice + expect(-> { qp.approve!(admin) }).to raise_error(QueuedPost::InvalidStateTransition) + + end + + it "follows the correct workflow for rejection" do + qp.reject!(admin) + + # Updates the QP record + expect(qp.rejected_by).to eq(admin) + expect(qp.state).to eq(QueuedPost.states[:rejected]) + expect(qp.rejected_at).to be_present + + # We can't reject twice + expect(-> { qp.reject!(admin) }).to raise_error(QueuedPost::InvalidStateTransition) + end + end + + context "creating a topic" do + let(:user) { Fabricate(:user) } + let(:admin) { Fabricate(:admin) } + let!(:category) { Fabricate(:category) } + + let(:qp) { QueuedPost.create(queue: 'new_topic', + state: QueuedPost.states[:new], + user_id: user.id, + raw: 'This post should be queued up', + post_options: { + title: 'This is the topic title to queue up', + archetype: 'regular', + category: category.id, + meta_data: {evil: 'trout'} + }) } + + + it "returns the appropriate options for creating a topic" do + create_options = qp.create_options + + expect(create_options[:category]).to eq(category.id) + expect(create_options[:archetype]).to eq('regular') + expect(create_options[:meta_data]).to eq('evil' => 'trout') + end + + it "creates the post and topic" do + topic_count, post_count = Topic.count, Post.count + post = qp.approve!(admin) + + expect(Topic.count).to eq(topic_count + 1) + expect(Post.count).to eq(post_count + 1) + + expect(post).to be_present + expect(post).to be_valid + + topic = post.topic + expect(topic).to be_present + expect(topic.category).to eq(category) + end + + it "doesn't create the post and topic" do + topic_count, post_count = Topic.count, Post.count + + qp.reject!(admin) + + expect(Topic.count).to eq(topic_count) + expect(Post.count).to eq(post_count) + end + end + +end From a5ee45ccbec1a8933f721c10fb14956d292c1ae7 Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Thu, 26 Mar 2015 16:57:50 -0400 Subject: [PATCH 016/113] `PostEnqueuer` object to handle validation of enqueued posts --- app/models/post.rb | 4 +- app/models/queued_post.rb | 5 +- .../20150318143915_create_directory_items.rb | 2 +- db/migrate/20150323234856_add_muted_users.rb | 2 +- ... => 20150325190959_create_queued_posts.rb} | 6 +- lib/has_errors.rb | 31 ++++ lib/post_creator.rb | 136 +++++++++--------- lib/post_enqueuer.rb | 41 ++++++ lib/topic_creator.rb | 93 ++++++------ lib/validators/post_validator.rb | 8 +- spec/components/has_errors_spec.rb | 55 +++++++ spec/components/post_creator_spec.rb | 8 +- spec/components/post_enqueuer_spec.rb | 47 ++++++ spec/models/queued_post_spec.rb | 75 +++++----- 14 files changed, 348 insertions(+), 165 deletions(-) rename db/migrate/{20150325160959_create_queued_posts.rb => 20150325190959_create_queued_posts.rb} (71%) create mode 100644 lib/has_errors.rb create mode 100644 lib/post_enqueuer.rb create mode 100644 spec/components/has_errors_spec.rb create mode 100644 spec/components/post_enqueuer_spec.rb diff --git a/app/models/post.rb b/app/models/post.rb index 9e07e94f93..7e0e5e4559 100644 --- a/app/models/post.rb +++ b/app/models/post.rb @@ -369,7 +369,9 @@ class Post < ActiveRecord::Base problems end - def rebake!(opts={}) + def rebake!(opts=nil) + opts ||= {} + new_cooked = cook( raw, topic_id: topic_id, diff --git a/app/models/queued_post.rb b/app/models/queued_post.rb index a7b4dcec44..2b1cdacaf2 100644 --- a/app/models/queued_post.rb +++ b/app/models/queued_post.rb @@ -2,8 +2,6 @@ class QueuedPost < ActiveRecord::Base class InvalidStateTransition < StandardError; end; - serialize :post_options, JSON - belongs_to :user belongs_to :topic belongs_to :approved_by, class_name: "User" @@ -36,6 +34,8 @@ class QueuedPost < ActiveRecord::Base opts = {raw: raw} post_attributes.each {|a| opts[a] = post_options[a.to_s] } + opts[:cooking_options].symbolize_keys! if opts[:cooking_options] + opts[:topic_id] = topic_id if topic_id opts end @@ -52,6 +52,7 @@ class QueuedPost < ActiveRecord::Base end private + def post_attributes [QueuedPost.attributes_by_queue[:base], QueuedPost.attributes_by_queue[queue.to_sym]].flatten.compact end diff --git a/db/migrate/20150318143915_create_directory_items.rb b/db/migrate/20150318143915_create_directory_items.rb index 37f08336a1..088bfba0d0 100644 --- a/db/migrate/20150318143915_create_directory_items.rb +++ b/db/migrate/20150318143915_create_directory_items.rb @@ -1,6 +1,6 @@ class CreateDirectoryItems < ActiveRecord::Migration def change - create_table :directory_items do |t| + create_table :directory_items, force: true do |t| t.integer :period_type, null: false t.references :user, null: false t.integer :likes_received, null: false diff --git a/db/migrate/20150323234856_add_muted_users.rb b/db/migrate/20150323234856_add_muted_users.rb index 2e7c5048f6..8192d38284 100644 --- a/db/migrate/20150323234856_add_muted_users.rb +++ b/db/migrate/20150323234856_add_muted_users.rb @@ -1,6 +1,6 @@ class AddMutedUsers < ActiveRecord::Migration def change - create_table :muted_users do |t| + create_table :muted_users, force: true do |t| t.integer :user_id, null: false t.integer :muted_user_id, null: false t.timestamps diff --git a/db/migrate/20150325160959_create_queued_posts.rb b/db/migrate/20150325190959_create_queued_posts.rb similarity index 71% rename from db/migrate/20150325160959_create_queued_posts.rb rename to db/migrate/20150325190959_create_queued_posts.rb index 4941753ee2..9946a642b7 100644 --- a/db/migrate/20150325160959_create_queued_posts.rb +++ b/db/migrate/20150325190959_create_queued_posts.rb @@ -1,11 +1,11 @@ class CreateQueuedPosts < ActiveRecord::Migration def change - create_table :queued_posts do |t| + create_table :queued_posts, force: true do |t| t.string :queue, null: false t.integer :state, null: false t.integer :user_id, null: false t.text :raw, null: false - t.text :post_options, null: false + t.json :post_options, null: false t.integer :topic_id t.integer :approved_by_id t.timestamp :approved_at @@ -15,6 +15,6 @@ class CreateQueuedPosts < ActiveRecord::Migration end add_index :queued_posts, [:queue, :state, :created_at], name: 'by_queue_status' - add_index :queued_posts, [:topic, :queue, :state, :created_at], name: 'by_queue_status_topic' + add_index :queued_posts, [:topic_id, :queue, :state, :created_at], name: 'by_queue_status_topic' end end diff --git a/lib/has_errors.rb b/lib/has_errors.rb new file mode 100644 index 0000000000..9aae07e05c --- /dev/null +++ b/lib/has_errors.rb @@ -0,0 +1,31 @@ +# Helper functions for dealing with errors and objects that have +# child objects with errors +module HasErrors + + def errors + @errors ||= ActiveModel::Errors.new(self) + end + + def validate_child(obj) + return true if obj.valid? + add_errors_from(obj) + false + end + + def rollback_with!(obj, error) + obj.errors[:base] << error + rollback_from_errors!(obj) + end + + def rollback_from_errors!(obj) + add_errors_from(obj) + raise ActiveRecord::Rollback.new + end + + def add_errors_from(obj) + obj.errors.full_messages.each do |msg| + errors[:base] << msg unless errors[:base].include?(msg) + end + end + +end diff --git a/lib/post_creator.rb b/lib/post_creator.rb index d4627ca2ee..9660a96b9d 100644 --- a/lib/post_creator.rb +++ b/lib/post_creator.rb @@ -4,10 +4,12 @@ require_dependency 'rate_limiter' require_dependency 'topic_creator' require_dependency 'post_jobs_enqueuer' require_dependency 'distributed_mutex' +require_dependency 'has_errors' class PostCreator + include HasErrors - attr_reader :errors, :opts + attr_reader :opts # Acceptable options: # @@ -66,36 +68,66 @@ class PostCreator @guardian ||= Guardian.new(@user) end - def create + def valid? @topic = nil @post = nil if @user.suspended? && !skip_validations? - @errors = Post.new.errors - @errors.add(:base, I18n.t(:user_is_suspended)) - return + errors[:base] << I18n.t(:user_is_suspended) + return false end - transaction do - setup_topic - setup_post - rollback_if_host_spam_detected - plugin_callbacks - save_post - extract_links - store_unique_post_key - track_topic - update_topic_stats - update_topic_auto_close - update_user_counts - create_embedded_topic - - ensure_in_allowed_users if guardian.is_staff? - @post.advance_draft_sequence - @post.save_reply_relationships + if new_topic? + topic_creator = TopicCreator.new(@user, guardian, @opts) + return false unless skip_validations? || validate_child(topic_creator) + else + @topic = Topic.find_by(id: @opts[:topic_id]) + if (@topic.blank? || !guardian.can_create?(Post, @topic)) + errors[:base] << I18n.t(:topic_not_found) + return false + end end - if @post && @post.errors.empty? + setup_post + + return true if skip_validations? + if @post.has_host_spam? + @spam = true + errors[:base] << I18n.t(:spamming_host) + return false + end + + DiscourseEvent.trigger :before_create_post, @post + DiscourseEvent.trigger :validate_post, @post + + post_validator = Validators::PostValidator.new(skip_topic: true) + post_validator.validate(@post) + + valid = @post.errors.blank? + add_errors_from(@post) unless valid + valid + end + + def create + if valid? + transaction do + create_topic + save_post + extract_links + store_unique_post_key + track_topic + update_topic_stats + update_topic_auto_close + update_user_counts + create_embedded_topic + + ensure_in_allowed_users if guardian.is_staff? + @post.advance_draft_sequence + @post.save_reply_relationships + end + end + + if @post && errors.blank? publish PostAlerter.post_created(@post) unless @opts[:import_mode] @@ -164,16 +196,11 @@ class PostCreator { user: @user, limit_once_per: 24.hours, message_params: {domains: @post.linked_hosts.keys.join(', ')} } ) - elsif @post && !@post.errors.present? && !skip_validations? + elsif @post && errors.blank? && !skip_validations? SpamRulesEnforcer.enforce!(@post) end end - def plugin_callbacks - DiscourseEvent.trigger :before_create_post, @post - DiscourseEvent.trigger :validate_post, @post - end - def track_latest_on_category return unless @post && @post.errors.count == 0 && @topic && @topic.category_id @@ -191,27 +218,17 @@ class PostCreator private - def setup_topic - if new_topic? + def create_topic + return if @topic + begin topic_creator = TopicCreator.new(@user, guardian, @opts) - - begin - topic = topic_creator.create - @errors = topic_creator.errors - rescue ActiveRecord::Rollback => ex - # In the event of a rollback, grab the errors from the topic - @errors = topic_creator.errors - raise ex - end - else - topic = Topic.find_by(id: @opts[:topic_id]) - if (topic.blank? || !guardian.can_create?(Post, topic)) - @errors = Post.new.errors - @errors.add(:base, I18n.t(:topic_not_found)) - raise ActiveRecord::Rollback.new - end + @topic = topic_creator.create + rescue ActiveRecord::Rollback + add_errors_from(topic_creator) + return end - @topic = topic + @post.topic_id = @topic.id + @post.topic = @topic end def update_topic_stats @@ -232,9 +249,10 @@ class PostCreator def setup_post @opts[:raw] = TextCleaner.normalize_whitespaces(@opts[:raw]).gsub(/\s+\z/, "") - post = @topic.posts.new(raw: @opts[:raw], - user: @user, - reply_to_post_number: @opts[:reply_to_post_number]) + post = Post.new(raw: @opts[:raw], + topic_id: @topic.try(:id), + user: @user, + reply_to_post_number: @opts[:reply_to_post_number]) # Attributes we pass through to the post instance if present [:post_type, :no_bump, :cooking_options, :image_sizes, :acting_user, :invalidate_oneboxes, :cook_method, :via_email, :raw_email].each do |a| @@ -251,21 +269,9 @@ class PostCreator @post = post end - def rollback_if_host_spam_detected - return if skip_validations? - if @post.has_host_spam? - @post.errors.add(:base, I18n.t(:spamming_host)) - @errors = @post.errors - @spam = true - raise ActiveRecord::Rollback.new - end - end - def save_post - unless @post.save(validate: !skip_validations?) - @errors = @post.errors - raise ActiveRecord::Rollback.new - end + saved = @post.save(validate: !skip_validations?) + rollback_from_errors!(@post) unless saved end def store_unique_post_key diff --git a/lib/post_enqueuer.rb b/lib/post_enqueuer.rb new file mode 100644 index 0000000000..e6ba63f554 --- /dev/null +++ b/lib/post_enqueuer.rb @@ -0,0 +1,41 @@ +require_dependency 'topic_creator' +require_dependency 'queued_post' +require_dependency 'has_errors' + +class PostEnqueuer + include HasErrors + + def initialize(user, queue) + @user = user + @queue = queue + end + + def enqueue(args) + + queued_post = QueuedPost.new(queue: @queue, + state: QueuedPost.states[:new], + user_id: @user.id, + topic_id: args[:topic_id], + raw: args[:raw], + post_options: args[:post_options] || {}) + + validate_method = :"validate_#{@queue}" + if respond_to?(validate_method) + return unless send(validate_method, queued_post.create_options) + end + + add_errors_from(queued_post) unless queued_post.save + queued_post + end + + def validate_new_topic(create_options) + topic_creator = TopicCreator.new(@user, Guardian.new(@user), create_options) + validate_child(topic_creator) + end + + def validate_new_post(create_options) + post_creator = PostCreator.new(@user, create_options) + validate_child(post_creator) + end + +end diff --git a/lib/topic_creator.rb b/lib/topic_creator.rb index 40b6aee9dc..790da802ed 100644 --- a/lib/topic_creator.rb +++ b/lib/topic_creator.rb @@ -1,6 +1,7 @@ -class TopicCreator +require_dependency 'has_errors' - attr_accessor :errors +class TopicCreator + include HasErrors def self.create(user, guardian, opts) self.new(user, guardian, opts).create @@ -13,55 +14,52 @@ class TopicCreator @added_users = [] end + def valid? + topic = Topic.new(setup_topic_params) + validate_child(topic) + end + def create - @topic = Topic.new(setup_topic_params) + topic = Topic.new(setup_topic_params) - setup_auto_close_time - process_private_message - save_topic - create_warning - watch_topic + setup_auto_close_time(topic) + process_private_message(topic) + save_topic(topic) + create_warning(topic) + watch_topic(topic) - @topic + topic end private - def create_warning + def create_warning(topic) return unless @opts[:is_warning] # We can only attach warnings to PMs - unless @topic.private_message? - @topic.errors.add(:base, :warning_requires_pm) - @errors = @topic.errors - raise ActiveRecord::Rollback.new - end + rollback_with!(topic, :warning_requires_pm) unless topic.private_message? # Don't create it if there is more than one user - if @added_users.size != 1 - @topic.errors.add(:base, :too_many_users) - @errors = @topic.errors - raise ActiveRecord::Rollback.new - end + rollback_with!(topic, :too_many_users) if @added_users.size != 1 # Create a warning record - Warning.create(topic: @topic, user: @added_users.first, created_by: @user) + Warning.create(topic: topic, user: @added_users.first, created_by: @user) end - def watch_topic + def watch_topic(topic) unless @opts[:auto_track] == false - @topic.notifier.watch_topic!(@topic.user_id) + topic.notifier.watch_topic!(topic.user_id) end - user_ids = @topic.topic_allowed_users(true).pluck(:user_id) - user_ids += @topic.topic_allowed_groups(true).map { |t| t.group.users.pluck(:id) }.flatten + user_ids = topic.topic_allowed_users(true).pluck(:user_id) + user_ids += topic.topic_allowed_groups(true).map { |t| t.group.users.pluck(:id) }.flatten - user_ids.uniq.reject{ |id| id == @topic.user_id }.each do |user_id| - @topic.notifier.watch_topic!(user_id, nil) unless user_id == -1 + user_ids.uniq.reject{ |id| id == topic.user_id }.each do |user_id| + topic.notifier.watch_topic!(user_id, nil) unless user_id == -1 end - CategoryUser.auto_watch_new_topic(@topic) - CategoryUser.auto_track_new_topic(@topic) + CategoryUser.auto_watch_new_topic(topic) + CategoryUser.auto_track_new_topic(topic) end def setup_topic_params @@ -106,31 +104,28 @@ class TopicCreator end end - def setup_auto_close_time + def setup_auto_close_time(topic) return unless @opts[:auto_close_time].present? - return unless @guardian.can_moderate?(@topic) - @topic.set_auto_close(@opts[:auto_close_time], @user) + return unless @guardian.can_moderate?(topic) + topic.set_auto_close(@opts[:auto_close_time], @user) end - def process_private_message + def process_private_message(topic) return unless @opts[:archetype] == Archetype.private_message - @topic.subtype = TopicSubtype.user_to_user unless @topic.subtype + topic.subtype = TopicSubtype.user_to_user unless topic.subtype unless @opts[:target_usernames].present? || @opts[:target_group_names].present? - @topic.errors.add(:base, :no_user_selected) - @errors = @topic.errors - raise ActiveRecord::Rollback.new + rollback_with!(topic, :no_user_selected) end - add_users(@topic,@opts[:target_usernames]) - add_groups(@topic,@opts[:target_group_names]) - @topic.topic_allowed_users.build(user_id: @user.id) + add_users(topic,@opts[:target_usernames]) + add_groups(topic,@opts[:target_group_names]) + topic.topic_allowed_users.build(user_id: @user.id) end - def save_topic - unless @topic.save(validate: !@opts[:skip_validations]) - @errors = @topic.errors - raise ActiveRecord::Rollback.new + def save_topic(topic) + unless topic.save(validate: !@opts[:skip_validations]) + rollback_from_errors!(topic) end end @@ -146,16 +141,12 @@ class TopicCreator def add_groups(topic, groups) return unless groups Group.where(name: groups.split(',')).each do |group| - check_can_send_permission!(topic,group) + check_can_send_permission!(topic, group) topic.topic_allowed_groups.build(group_id: group.id) end end - def check_can_send_permission!(topic,item) - unless @guardian.can_send_private_message?(item) - topic.errors.add(:base, :cant_send_pm) - @errors = topic.errors - raise ActiveRecord::Rollback.new - end + def check_can_send_permission!(topic, obj) + rollback_with!(topic, :cant_send_pm) unless @guardian.can_send_private_message?(obj) end end diff --git a/lib/validators/post_validator.rb b/lib/validators/post_validator.rb index a5751ccade..fc16571476 100644 --- a/lib/validators/post_validator.rb +++ b/lib/validators/post_validator.rb @@ -1,6 +1,7 @@ require_dependency 'validators/stripped_length_validator' module Validators; end class Validators::PostValidator < ActiveModel::Validator + def validate(record) presence(record) unless Discourse.static_doc_topic_ids.include?(record.topic_id) && record.acting_user.try(:admin?) @@ -16,9 +17,12 @@ class Validators::PostValidator < ActiveModel::Validator end def presence(post) - [:raw,:topic_id].each do |attr_name| - post.errors.add(attr_name, :blank, options) if post.send(attr_name).blank? + + post.errors.add(:raw, :blank, options) if post.raw.blank? + unless options[:skip_topic] + post.errors.add(:topic_id, :blank, options) if post.topic_id.blank? end + if post.new_record? and post.user_id.nil? post.errors.add(:user_id, :blank, options) end diff --git a/spec/components/has_errors_spec.rb b/spec/components/has_errors_spec.rb new file mode 100644 index 0000000000..9ea4d1a068 --- /dev/null +++ b/spec/components/has_errors_spec.rb @@ -0,0 +1,55 @@ +require 'spec_helper' +require 'has_errors' + +describe HasErrors do + + class ErrorTestClass + include HasErrors + end + + let(:error_test) { ErrorTestClass.new } + let(:title_error) { "Title can't be blank" } + + # No title is invalid + let(:invalid_topic) { Fabricate.build(:topic, title: '') } + + it "has no errors by default" do + expect(error_test.errors).to be_blank + end + + context "validate_child" do + it "adds the errors from invalid AR objects" do + expect(error_test.validate_child(invalid_topic)).to eq(false) + expect(error_test.errors).to be_present + expect(error_test.errors[:base]).to include(title_error) + end + + it "doesn't add the errors from valid AR objects" do + topic = Fabricate.build(:topic) + expect(error_test.validate_child(topic)).to eq(true) + expect(error_test.errors).to be_blank + end + end + + context "rollback_from_errors!" do + it "triggers a rollback" do + invalid_topic.valid? + + expect(-> { error_test.rollback_from_errors!(invalid_topic) }).to raise_error(ActiveRecord::Rollback) + expect(error_test.errors).to be_present + expect(error_test.errors[:base]).to include(title_error) + end + end + + context "rollback_with_error!" do + it "triggers a rollback" do + + expect(-> { + error_test.rollback_with!(invalid_topic, :custom_error) + }).to raise_error(ActiveRecord::Rollback) + expect(error_test.errors).to be_present + expect(error_test.errors[:base]).to include(:custom_error) + end + end + +end diff --git a/spec/components/post_creator_spec.rb b/spec/components/post_creator_spec.rb index 77d658f08c..7db6eb829e 100644 --- a/spec/components/post_creator_spec.rb +++ b/spec/components/post_creator_spec.rb @@ -311,7 +311,8 @@ describe PostCreator do it "does not create the post" do GroupMessage.stubs(:create) - creator.create + post = creator.create + expect(creator.errors).to be_present expect(creator.spam?).to eq(true) end @@ -521,7 +522,7 @@ describe PostCreator do it 'can save a post' do creator = PostCreator.new(user, raw: 'q', title: 'q', skip_validations: true) creator.create - expect(creator.errors).to eq(nil) + expect(creator.errors).to be_blank end end @@ -573,7 +574,8 @@ describe PostCreator do end it "doesn't strip starting whitespaces" do - post = PostCreator.new(user, { title: "testing whitespace stripping", raw: " <-- whitespaces --> " }).create + pc = PostCreator.new(user, { title: "testing whitespace stripping", raw: " <-- whitespaces --> " }) + post = pc.create expect(post.raw).to eq(" <-- whitespaces -->") end diff --git a/spec/components/post_enqueuer_spec.rb b/spec/components/post_enqueuer_spec.rb new file mode 100644 index 0000000000..0c9d5a1dee --- /dev/null +++ b/spec/components/post_enqueuer_spec.rb @@ -0,0 +1,47 @@ +require 'spec_helper' +require_dependency 'post_enqueuer' + +describe PostEnqueuer do + + let(:user) { Fabricate(:user) } + + context 'with valid arguments' do + let(:topic) { Fabricate(:topic) } + let(:enqueuer) { PostEnqueuer.new(user, 'new_post') } + + it 'enqueues the post' do + qp = enqueuer.enqueue(raw: 'This should be enqueued', + topic_id: topic.id, + post_options: { reply_to_post_number: 1 }) + + expect(enqueuer.errors).to be_blank + expect(qp).to be_present + expect(qp.topic).to eq(topic) + expect(qp.user).to eq(user) + end + end + + context "topic validations" do + let(:enqueuer) { PostEnqueuer.new(user, 'new_topic') } + + it "doesn't enqueue the post" do + qp = enqueuer.enqueue(raw: 'This should not be enqueued', + post_options: { title: 'too short' }) + + expect(enqueuer.errors).to be_present + expect(qp).to be_blank + end + end + + context "post validations" do + let(:enqueuer) { PostEnqueuer.new(user, 'new_post') } + + it "doesn't enqueue the post" do + qp = enqueuer.enqueue(raw: 'too short') + + expect(enqueuer.errors).to be_present + expect(qp).to be_blank + end + end + +end diff --git a/spec/models/queued_post_spec.rb b/spec/models/queued_post_spec.rb index 7fa07b1991..521819fef5 100644 --- a/spec/models/queued_post_spec.rb +++ b/spec/models/queued_post_spec.rb @@ -19,7 +19,7 @@ describe QueuedPost do auto_track: true, custom_fields: { hello: 'world' }, cooking_options: { cat: 'hat' }, - cook_method: 'regular', + cook_method: Post.cook_methods[:raw_html], not_create_option: true, image_sizes: {"http://foo.bar/image.png" => {"width" => 0, "height" => 222}} }) } @@ -34,8 +34,8 @@ describe QueuedPost do expect(create_options[:raw_email]).to eq('store_me') expect(create_options[:auto_track]).to eq(true) expect(create_options[:custom_fields]).to eq('hello' => 'world') - expect(create_options[:cooking_options]).to eq('cat' => 'hat') - expect(create_options[:cook_method]).to eq('regular') + expect(create_options[:cooking_options]).to eq(cat: 'hat') + expect(create_options[:cook_method]).to eq(Post.cook_methods[:raw_html]) expect(create_options[:not_create_option]).to eq(nil) expect(create_options[:image_sizes]).to eq("http://foo.bar/image.png" => {"width" => 0, "height" => 222}) end @@ -47,6 +47,7 @@ describe QueuedPost do expect(post).to be_present expect(post).to be_valid expect(post.topic).to eq(topic) + expect(post.custom_fields['hello']).to eq('world') # Updates the QP record expect(qp.approved_by).to eq(admin) @@ -74,50 +75,52 @@ describe QueuedPost do context "creating a topic" do let(:user) { Fabricate(:user) } let(:admin) { Fabricate(:admin) } - let!(:category) { Fabricate(:category) } - let(:qp) { QueuedPost.create(queue: 'new_topic', - state: QueuedPost.states[:new], - user_id: user.id, - raw: 'This post should be queued up', - post_options: { - title: 'This is the topic title to queue up', - archetype: 'regular', - category: category.id, - meta_data: {evil: 'trout'} - }) } + context "with a valid topic" do + let!(:category) { Fabricate(:category) } + let(:qp) { QueuedPost.create(queue: 'new_topic', + state: QueuedPost.states[:new], + user_id: user.id, + raw: 'This post should be queued up', + post_options: { + title: 'This is the topic title to queue up', + archetype: 'regular', + category: category.id, + meta_data: {evil: 'trout'} + }) } - it "returns the appropriate options for creating a topic" do - create_options = qp.create_options + it "returns the appropriate options for creating a topic" do + create_options = qp.create_options - expect(create_options[:category]).to eq(category.id) - expect(create_options[:archetype]).to eq('regular') - expect(create_options[:meta_data]).to eq('evil' => 'trout') - end + expect(create_options[:category]).to eq(category.id) + expect(create_options[:archetype]).to eq('regular') + expect(create_options[:meta_data]).to eq('evil' => 'trout') + end - it "creates the post and topic" do - topic_count, post_count = Topic.count, Post.count - post = qp.approve!(admin) + it "creates the post and topic" do + topic_count, post_count = Topic.count, Post.count + post = qp.approve!(admin) - expect(Topic.count).to eq(topic_count + 1) - expect(Post.count).to eq(post_count + 1) + expect(Topic.count).to eq(topic_count + 1) + expect(Post.count).to eq(post_count + 1) - expect(post).to be_present - expect(post).to be_valid + expect(post).to be_present + expect(post).to be_valid - topic = post.topic - expect(topic).to be_present - expect(topic.category).to eq(category) - end + topic = post.topic + expect(topic).to be_present + expect(topic.category).to eq(category) + end - it "doesn't create the post and topic" do - topic_count, post_count = Topic.count, Post.count + it "doesn't create the post and topic" do + topic_count, post_count = Topic.count, Post.count - qp.reject!(admin) + qp.reject!(admin) - expect(Topic.count).to eq(topic_count) - expect(Post.count).to eq(post_count) + expect(Topic.count).to eq(topic_count) + expect(Post.count).to eq(post_count) + end end end From 19a9a8b4088b56ff6996c0508ee7571d25c06c4e Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Tue, 31 Mar 2015 12:58:56 -0400 Subject: [PATCH 017/113] `NewPostManager` determines whether to queue a post or not --- .travis.yml | 3 + app/controllers/application_controller.rb | 13 +-- app/controllers/posts_controller.rb | 83 ++++++++----------- app/serializers/new_post_result_serializer.rb | 39 +++++++++ lib/discourse.rb | 2 - lib/discourse_event.rb | 4 + lib/guardian/post_guardian.rb | 1 + lib/new_post_manager.rb | 66 +++++++++++++++ lib/new_post_result.rb | 30 +++++++ lib/post_creator.rb | 7 ++ lib/post_enqueuer.rb | 1 - spec/components/new_post_manager_spec.rb | 83 +++++++++++++++++++ spec/components/new_post_result_spec.rb | 12 +++ spec/components/post_creator_spec.rb | 33 ++++++++ spec/controllers/posts_controller_spec.rb | 60 ++++++++------ 15 files changed, 354 insertions(+), 83 deletions(-) create mode 100644 app/serializers/new_post_result_serializer.rb create mode 100644 lib/new_post_manager.rb create mode 100644 lib/new_post_result.rb create mode 100644 spec/components/new_post_manager_spec.rb create mode 100644 spec/components/new_post_result_spec.rb diff --git a/.travis.yml b/.travis.yml index cf7aa1b1be..64d25f1d16 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,6 +8,9 @@ env: - "RAILS_MASTER=1" - "RAILS_MASTER=0" +addons: + postgresql: 9.3 + matrix: allow_failures: - rvm: 2.0.0 diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index afaf3ef11e..3b76392c28 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -198,9 +198,9 @@ class ApplicationController < ActionController::Base @guardian ||= Guardian.new(current_user) end - def serialize_data(obj, serializer, opts={}) + def serialize_data(obj, serializer, opts=nil) # If it's an array, apply the serializer as an each_serializer to the elements - serializer_opts = {scope: guardian}.merge!(opts) + serializer_opts = {scope: guardian}.merge!(opts || {}) if obj.respond_to?(:to_ary) serializer_opts[:each_serializer] = serializer ActiveModel::ArraySerializer.new(obj.to_ary, serializer_opts).as_json @@ -213,12 +213,13 @@ class ApplicationController < ActionController::Base # 20% slower than calling MultiJSON.dump ourselves. I'm not sure why # Rails doesn't call MultiJson.dump when you pass it json: obj but # it seems we don't need whatever Rails is doing. - def render_serialized(obj, serializer, opts={}) - render_json_dump(serialize_data(obj, serializer, opts)) + def render_serialized(obj, serializer, opts=nil) + render_json_dump(serialize_data(obj, serializer, opts), opts) end - def render_json_dump(obj) - render json: MultiJson.dump(obj) + def render_json_dump(obj, opts=nil) + opts ||= {} + render json: MultiJson.dump(obj), status: opts[:status] || 200 end def can_cache_content? diff --git a/app/controllers/posts_controller.rb b/app/controllers/posts_controller.rb index 0ebb3a766c..e632b8f277 100644 --- a/app/controllers/posts_controller.rb +++ b/app/controllers/posts_controller.rb @@ -1,6 +1,8 @@ +require_dependency 'new_post_manager' require_dependency 'post_creator' require_dependency 'post_destroyer' require_dependency 'distributed_memoizer' +require_dependency 'new_post_result_serializer' class PostsController < ApplicationController @@ -76,49 +78,21 @@ class PostsController < ApplicationController end def create - params = create_params + @manager_params = create_params + manager = NewPostManager.new(current_user, @manager_params) - key = params_key(params) - error_json = nil - - if (is_api?) - payload = DistributedMemoizer.memoize(key, 120) do - success, json = create_post(params) - unless success - error_json = json - raise Discourse::InvalidPost - end - json + if is_api? + memoized_payload = DistributedMemoizer.memoize(signature_for(@manager_params), 120) do + result = manager.perform + MultiJson.dump(serialize_data(result, NewPostResultSerializer, root: false)) end + + parsed_payload = JSON.parse(memoized_payload) + backwards_compatible_json(parsed_payload, parsed_payload['success']) else - success, payload = create_post(params) - unless success - error_json = payload - raise Discourse::InvalidPost - end - end - - render json: payload - - rescue Discourse::InvalidPost - render json: error_json, status: 422 - end - - def create_post(params) - post_creator = PostCreator.new(current_user, params) - post = post_creator.create - - if post_creator.errors.present? - # If the post was spam, flag all the user's posts as spam - current_user.flag_linked_posts_as_spam if post_creator.spam? - [false, MultiJson.dump(errors: post_creator.errors.full_messages)] - - else - DiscourseEvent.trigger(:topic_created, post.topic, params, current_user) unless params[:topic_id] - DiscourseEvent.trigger(:post_created, post, params, current_user) - post_serializer = PostSerializer.new(post, scope: guardian, root: false) - post_serializer.draft_sequence = DraftSequence.current(current_user, post.topic.draft_key) - [true, MultiJson.dump(post_serializer)] + result = manager.perform + json = serialize_data(result, NewPostResultSerializer, root: false) + backwards_compatible_json(json, result.success?) end end @@ -358,6 +332,15 @@ class PostsController < ApplicationController protected + # We can't break the API for making posts. The new, queue supporting API + # doesn't return the post as the root JSON object, but as a nested object. + # If a param is present it uses that result structure. + def backwards_compatible_json(json_obj, success) + json_obj = json_obj[:post] || json_obj['post'] unless params[:nested_post] + render json: json_obj, status: (!!success) ? 200 : 422 + end + + def find_post_revision_from_params post_id = params[:id] || params[:post_id] revision = params[:revision].to_i @@ -411,15 +394,6 @@ class PostsController < ApplicationController .limit(opts[:limit]) end - def params_key(params) - "post##" << Digest::SHA1.hexdigest(params - .to_a - .concat([["user", current_user.id]]) - .sort{|x,y| x[0] <=> y[0]}.join do |x,y| - "#{x}:#{y}" - end) - end - def create_params permitted = [ :raw, @@ -454,6 +428,8 @@ class PostsController < ApplicationController if current_user.staff? params.permit(:is_warning) result[:is_warning] = (params[:is_warning] == "true") + else + result[:is_warning] = false end PostRevisor.tracked_topic_fields.keys.each do |f| @@ -469,6 +445,15 @@ class PostsController < ApplicationController result end + def signature_for(args) + "post##" << Digest::SHA1.hexdigest(args + .to_a + .concat([["user", current_user.id]]) + .sort{|x,y| x[0] <=> y[0]}.join do |x,y| + "#{x}:#{y}" + end) + end + def too_late_to(action, post) !guardian.send("can_#{action}?", post) && post.user_id == current_user.id && post.edit_time_limit_expired? end diff --git a/app/serializers/new_post_result_serializer.rb b/app/serializers/new_post_result_serializer.rb new file mode 100644 index 0000000000..ff7330cdd4 --- /dev/null +++ b/app/serializers/new_post_result_serializer.rb @@ -0,0 +1,39 @@ +require_dependency 'application_serializer' + +class NewPostResultSerializer < ApplicationSerializer + attributes :action, + :post, + :errors, + :success + + def post + post_serializer = PostSerializer.new(object.post, scope: scope, root: false) + post_serializer.draft_sequence = DraftSequence.current(scope.user, object.post.topic.draft_key) + post_serializer.as_json + end + + def include_post? + object.post.present? + end + + def success + true + end + + def include_success? + @object.success? + end + + def errors + object.errors.full_messages + end + + def include_errors? + !object.errors.empty? + end + + def action + object.action + end + +end diff --git a/lib/discourse.rb b/lib/discourse.rb index 9c37ed3505..1bafaea847 100644 --- a/lib/discourse.rb +++ b/lib/discourse.rb @@ -47,8 +47,6 @@ module Discourse # When ImageMagick is missing class ImageMagickMissing < StandardError; end - class InvalidPost < StandardError; end - # When read-only mode is enabled class ReadOnly < StandardError; end diff --git a/lib/discourse_event.rb b/lib/discourse_event.rb index c0ec064d3d..2c1110a632 100644 --- a/lib/discourse_event.rb +++ b/lib/discourse_event.rb @@ -17,6 +17,10 @@ module DiscourseEvent events[event_name] << block end + def self.off(event_name, &block) + events[event_name].delete(block) + end + def self.clear @events = nil end diff --git a/lib/guardian/post_guardian.rb b/lib/guardian/post_guardian.rb index 2e8031be78..4c0292048b 100644 --- a/lib/guardian/post_guardian.rb +++ b/lib/guardian/post_guardian.rb @@ -1,5 +1,6 @@ #mixin for all guardian methods dealing with post permissions module PostGuardian + # Can the user act on the post in a particular way. # taken_actions = the list of actions the user has already taken def post_can_act?(post, action_key, opts={}) diff --git a/lib/new_post_manager.rb b/lib/new_post_manager.rb new file mode 100644 index 0000000000..323acaa7ed --- /dev/null +++ b/lib/new_post_manager.rb @@ -0,0 +1,66 @@ +require_dependency 'post_creator' +require_dependency 'new_post_result' +require_dependency 'post_enqueuer' + +# Determines what actions should be taken with new posts. +# +# The default action is to create the post, but this can be extended +# with `NewPostManager.add_handler` to take other approaches depending +# on the user or input. +class NewPostManager + + attr_reader :user, :args + + def self.handlers + @handlers ||= Set.new + end + + def self.add_handler(&block) + handlers << block + end + + def initialize(user, args) + @user = user + @args = args + end + + def perform + + # Perform handlers until one returns a result + handled = NewPostManager.handlers.any? do |handler| + result = handler.call(self) + return result if result + + false + end + + perform_create_post unless handled + end + + # Enqueue this post in a queue + def enqueue(queue) + result = NewPostResult.new(:enqueued) + enqueuer = PostEnqueuer.new(@user, queue) + post = enqueuer.enqueue(@args) + + result.check_errors_from(enqueuer) + result + end + + def perform_create_post + result = NewPostResult.new(:create_post) + + creator = PostCreator.new(@user, @args) + post = creator.create + result.check_errors_from(creator) + + if result.success? + result.post = post + else + @user.flag_linked_posts_as_spam if creator.spam? + end + + result + end + +end diff --git a/lib/new_post_result.rb b/lib/new_post_result.rb new file mode 100644 index 0000000000..1e8bdffb04 --- /dev/null +++ b/lib/new_post_result.rb @@ -0,0 +1,30 @@ +require_dependency 'has_errors' + +class NewPostResult + include HasErrors + + attr_reader :action + attr_accessor :post + + def initialize(action, success=false) + @action = action + @success = success + end + + def check_errors_from(obj) + if obj.errors.empty? + @success = true + else + add_errors_from(obj) + end + end + + def success? + @success + end + + def failed? + !@success + end + +end diff --git a/lib/post_creator.rb b/lib/post_creator.rb index 9660a96b9d..7183793794 100644 --- a/lib/post_creator.rb +++ b/lib/post_creator.rb @@ -134,6 +134,8 @@ class PostCreator track_latest_on_category enqueue_jobs BadgeGranter.queue_badge_grant(Badge::Trigger::PostRevision, post: @post) + + trigger_after_events(@post) end if @post || @spam @@ -169,6 +171,11 @@ class PostCreator protected + def trigger_after_events(post) + DiscourseEvent.trigger(:topic_created, post.topic, @opts, @user) unless @opts[:topic_id] + DiscourseEvent.trigger(:post_created, post, @opts, @user) + end + def transaction(&blk) Post.transaction do if new_topic? diff --git a/lib/post_enqueuer.rb b/lib/post_enqueuer.rb index e6ba63f554..78242d405d 100644 --- a/lib/post_enqueuer.rb +++ b/lib/post_enqueuer.rb @@ -11,7 +11,6 @@ class PostEnqueuer end def enqueue(args) - queued_post = QueuedPost.new(queue: @queue, state: QueuedPost.states[:new], user_id: @user.id, diff --git a/spec/components/new_post_manager_spec.rb b/spec/components/new_post_manager_spec.rb new file mode 100644 index 0000000000..523d8652a0 --- /dev/null +++ b/spec/components/new_post_manager_spec.rb @@ -0,0 +1,83 @@ +require 'spec_helper' +require 'new_post_manager' + +describe NewPostManager do + + let(:topic) { Fabricate(:topic) } + + context "default action" do + it "creates the post by default" do + manager = NewPostManager.new(topic.user, raw: 'this is a new post', topic_id: topic.id) + result = manager.perform + + expect(result.action).to eq(:create_post) + expect(result).to be_success + expect(result.post).to be_present + expect(result.post).to be_a(Post) + end + end + + context "extensibility" do + + before do + @counter = 0 + + @counter_handler = lambda do |manager| + result = nil + if manager.args[:raw] == 'this post increases counter' + @counter += 1 + result = NewPostResult.new(:counter, true) + end + + result + end + + @queue_handler = -> (manager) { manager.args[:raw] =~ /queue me/ ? manager.enqueue('test') : nil } + + NewPostManager.add_handler(&@counter_handler) + NewPostManager.add_handler(&@queue_handler) + end + + after do + NewPostManager.handlers.delete(@counter_handler) + NewPostManager.handlers.delete(@queue_handler) + end + + it "calls custom handlers" do + manager = NewPostManager.new(topic.user, raw: 'this post increases counter', topic_id: topic.id) + + result = manager.perform + + expect(result.action).to eq(:counter) + expect(result).to be_success + expect(result.post).to be_blank + expect(@counter).to be(1) + expect(QueuedPost.count).to be(0) + end + + it "calls custom enqueuing handlers" do + manager = NewPostManager.new(topic.user, raw: 'to the handler I say enqueue me!', topic_id: topic.id) + + result = manager.perform + + expect(result.action).to eq(:enqueued) + expect(result).to be_success + expect(result.post).to be_blank + expect(QueuedPost.count).to be(1) + expect(@counter).to be(0) + end + + it "if nothing returns a result it creates a post" do + manager = NewPostManager.new(topic.user, raw: 'this is a new post', topic_id: topic.id) + + result = manager.perform + + expect(result.action).to eq(:create_post) + expect(result).to be_success + expect(result.post).to be_present + expect(@counter).to be(0) + end + + end + +end diff --git a/spec/components/new_post_result_spec.rb b/spec/components/new_post_result_spec.rb new file mode 100644 index 0000000000..3c555e7931 --- /dev/null +++ b/spec/components/new_post_result_spec.rb @@ -0,0 +1,12 @@ +require 'spec_helper' +require 'new_post_result' + +describe NewPostResult do + + it "fails by default" do + result = NewPostResult.new(:eviltrout) + expect(result.failed?).to eq(true) + expect(result.success?).to eq(false) + end + +end diff --git a/spec/components/post_creator_spec.rb b/spec/components/post_creator_spec.rb index 7db6eb829e..950af81885 100644 --- a/spec/components/post_creator_spec.rb +++ b/spec/components/post_creator_spec.rb @@ -579,4 +579,37 @@ describe PostCreator do expect(post.raw).to eq(" <-- whitespaces -->") end + context "events" do + let(:topic) { Fabricate(:topic, user: user) } + + before do + @posts_created = 0 + @topics_created = 0 + + @increase_posts = -> (post, opts, user) { @posts_created += 1 } + @increase_topics = -> (topic, opts, user) { @topics_created += 1 } + DiscourseEvent.on(:post_created, &@increase_posts) + DiscourseEvent.on(:topic_created, &@increase_topics) + end + + after do + DiscourseEvent.off(:post_created, &@increase_posts) + DiscourseEvent.off(:topic_created, &@increase_topics) + end + + it "fires boths event when creating a topic" do + pc = PostCreator.new(user, raw: 'this is the new content for my topic', title: 'this is my new topic title') + post = pc.create + expect(@posts_created).to eq(1) + expect(@topics_created).to eq(1) + end + + it "fires only the post event when creating a post" do + pc = PostCreator.new(user, topic_id: topic.id, raw: 'this is the new content for my post') + post = pc.create + expect(@posts_created).to eq(1) + expect(@topics_created).to eq(0) + end + end + end diff --git a/spec/controllers/posts_controller_spec.rb b/spec/controllers/posts_controller_spec.rb index 3faf22d2ae..41c114ab55 100644 --- a/spec/controllers/posts_controller_spec.rb +++ b/spec/controllers/posts_controller_spec.rb @@ -449,7 +449,7 @@ describe PostsController do include_examples 'action requires login', :post, :create context 'api' do - it 'allows dupes through' do + it 'memoizes duplicate requests' do raw = "this is a test post 123 #{SecureRandom.hash}" title = "this is a title #{SecureRandom.hash}" @@ -478,16 +478,25 @@ describe PostsController do end it 'creates the post' do - PostCreator.any_instance.expects(:create).returns(new_post) - - # Make sure our extensibility points are triggered - DiscourseEvent.expects(:trigger).with(:topic_created, new_post.topic, anything, user).once - DiscourseEvent.expects(:trigger).with(:post_created, new_post, anything, user).once - - xhr :post, :create, {raw: 'test'} + xhr :post, :create, {raw: 'this is the test content', title: 'this is the test title for the topic'} expect(response).to be_success - expect(::JSON.parse(response.body)).to be_present + parsed = ::JSON.parse(response.body) + + # Deprecated structure + expect(parsed['post']).to be_blank + expect(parsed['cooked']).to be_present + end + + it "returns the nested post with a param" do + xhr :post, :create, {raw: 'this is the test content', + title: 'this is the test title for the topic', + nested_post: true} + + expect(response).to be_success + parsed = ::JSON.parse(response.body) + expect(parsed['post']).to be_present + expect(parsed['post']['cooked']).to be_present end it 'protects against dupes' do @@ -528,72 +537,73 @@ describe PostsController do context "parameters" do - let(:post_creator) { mock } - before do - post_creator.expects(:create).returns(new_post) - post_creator.stubs(:errors).returns(nil) + # Just for performance, no reason to actually perform for these + # tests. + NewPostManager.stubs(:perform).returns(NewPostResult) end it "passes raw through" do - PostCreator.expects(:new).with(user, has_entries('raw' => 'hello')).returns(post_creator) xhr :post, :create, {raw: 'hello'} + expect(assigns(:manager_params)['raw']).to eq('hello') end it "passes title through" do - PostCreator.expects(:new).with(user, has_entries('title' => 'new topic title')).returns(post_creator) xhr :post, :create, {raw: 'hello', title: 'new topic title'} + expect(assigns(:manager_params)['title']).to eq('new topic title') end it "passes topic_id through" do - PostCreator.expects(:new).with(user, has_entries('topic_id' => '1234')).returns(post_creator) xhr :post, :create, {raw: 'hello', topic_id: 1234} + expect(assigns(:manager_params)['topic_id']).to eq('1234') end it "passes archetype through" do - PostCreator.expects(:new).with(user, has_entries('archetype' => 'private_message')).returns(post_creator) xhr :post, :create, {raw: 'hello', archetype: 'private_message'} + expect(assigns(:manager_params)['archetype']).to eq('private_message') end it "passes category through" do - PostCreator.expects(:new).with(user, has_entries('category' => 'cool')).returns(post_creator) xhr :post, :create, {raw: 'hello', category: 'cool'} + expect(assigns(:manager_params)['category']).to eq('cool') end it "passes target_usernames through" do - PostCreator.expects(:new).with(user, has_entries('target_usernames' => 'evil,trout')).returns(post_creator) xhr :post, :create, {raw: 'hello', target_usernames: 'evil,trout'} + expect(assigns(:manager_params)['target_usernames']).to eq('evil,trout') end it "passes reply_to_post_number through" do - PostCreator.expects(:new).with(user, has_entries('reply_to_post_number' => '6789')).returns(post_creator) xhr :post, :create, {raw: 'hello', reply_to_post_number: 6789} + expect(assigns(:manager_params)['reply_to_post_number']).to eq('6789') end it "passes image_sizes through" do - PostCreator.expects(:new).with(user, has_entries('image_sizes' => {'width' => '100', 'height' => '200'})).returns(post_creator) xhr :post, :create, {raw: 'hello', image_sizes: {width: '100', height: '200'}} + expect(assigns(:manager_params)['image_sizes']['width']).to eq('100') + expect(assigns(:manager_params)['image_sizes']['height']).to eq('200') end it "passes meta_data through" do - PostCreator.expects(:new).with(user, has_entries('meta_data' => {'xyz' => 'abc'})).returns(post_creator) xhr :post, :create, {raw: 'hello', meta_data: {xyz: 'abc'}} + expect(assigns(:manager_params)['meta_data']['xyz']).to eq('abc') end context "is_warning" do it "doesn't pass `is_warning` through if you're not staff" do - PostCreator.expects(:new).with(user, Not(has_entries('is_warning' => true))).returns(post_creator) xhr :post, :create, {raw: 'hello', archetype: 'private_message', is_warning: 'true'} + expect(assigns(:manager_params)['is_warning']).to eq(false) end it "passes `is_warning` through if you're staff" do - PostCreator.expects(:new).with(moderator, has_entries('is_warning' => true)).returns(post_creator) + log_in(:moderator) xhr :post, :create, {raw: 'hello', archetype: 'private_message', is_warning: 'true'} + expect(assigns(:manager_params)['is_warning']).to eq(true) end it "passes `is_warning` as false through if you're staff" do - PostCreator.expects(:new).with(moderator, has_entries('is_warning' => false)).returns(post_creator) xhr :post, :create, {raw: 'hello', archetype: 'private_message', is_warning: 'false'} + expect(assigns(:manager_params)['is_warning']).to eq(false) end end From 22ffcba8e6ac9f675c3ff619b2c6aef300fb78e0 Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Wed, 1 Apr 2015 14:18:46 -0400 Subject: [PATCH 018/113] Convert `Discourse.Post` to ES6 and use Store model - Includes acceptance tests for composer (post, edit) - Supports acceptance testing of bootbox --- .../discourse/adapters/post.js.es6 | 11 + .../discourse/controllers/composer.js.es6 | 5 +- .../discourse/lib/Markdown.Editor.js | 14 +- .../discourse/models/composer.js.es6 | 190 ++++---- .../models/{_post.js => post.js.es6} | 173 +++---- app/assets/javascripts/main_include.js | 1 + app/controllers/posts_controller.rb | 6 +- .../acceptance/composer-test.js.es6 | 117 +++++ .../acceptance/header-test-staff.js.es6 | 6 +- test/javascripts/fixtures/post.js.es6 | 4 + .../fixtures/session-fixtures.js.es6 | 4 + test/javascripts/fixtures/topic.js.es6 | 2 +- .../helpers/create-pretender.js.es6 | 56 ++- test/javascripts/helpers/qunit-helpers.js.es6 | 46 +- test/javascripts/models/composer-test.js.es6 | 87 ++-- test/javascripts/test_helper.js | 6 +- vendor/assets/javascripts/bootbox.js | 8 +- vendor/assets/javascripts/bootstrap-modal.js | 438 +++++++++++------- vendor/assets/javascripts/ember-cloaking.js | 13 +- 19 files changed, 747 insertions(+), 440 deletions(-) create mode 100644 app/assets/javascripts/discourse/adapters/post.js.es6 rename app/assets/javascripts/discourse/models/{_post.js => post.js.es6} (78%) create mode 100644 test/javascripts/acceptance/composer-test.js.es6 create mode 100644 test/javascripts/fixtures/post.js.es6 create mode 100644 test/javascripts/fixtures/session-fixtures.js.es6 diff --git a/app/assets/javascripts/discourse/adapters/post.js.es6 b/app/assets/javascripts/discourse/adapters/post.js.es6 new file mode 100644 index 0000000000..1705a07e60 --- /dev/null +++ b/app/assets/javascripts/discourse/adapters/post.js.es6 @@ -0,0 +1,11 @@ +import RestAdapter from 'discourse/adapters/rest'; + +export default RestAdapter.extend({ + + // GET /posts doesn't include a type + find(store, type, findArgs) { + return this._super(store, type, findArgs).then(function(result) { + return {post: result}; + }); + } +}); diff --git a/app/assets/javascripts/discourse/controllers/composer.js.es6 b/app/assets/javascripts/discourse/controllers/composer.js.es6 index cc61d4a3b2..2a2f13cf4a 100644 --- a/app/assets/javascripts/discourse/controllers/composer.js.es6 +++ b/app/assets/javascripts/discourse/controllers/composer.js.es6 @@ -61,7 +61,8 @@ export default DiscourseController.extend({ if (postId) { this.set('model.loading', true); const composer = this; - return Discourse.Post.load(postId).then(function(post) { + + return this.store.find('post', postId).then(function(post) { const quote = Discourse.Quote.build(post, post.get("raw")); composer.appendBlockAtCursor(quote); composer.set('model.loading', false); @@ -412,7 +413,7 @@ export default DiscourseController.extend({ composerModel.set('topic', opts.topic); } } else { - composerModel = composerModel || Discourse.Composer.create(); + composerModel = composerModel || Discourse.Composer.create({ store: this.store }); composerModel.open(opts); } diff --git a/app/assets/javascripts/discourse/lib/Markdown.Editor.js b/app/assets/javascripts/discourse/lib/Markdown.Editor.js index 7c6ef13587..568b486dba 100644 --- a/app/assets/javascripts/discourse/lib/Markdown.Editor.js +++ b/app/assets/javascripts/discourse/lib/Markdown.Editor.js @@ -323,7 +323,13 @@ // Adds a listener callback to a DOM element which is fired on a specified // event. util.addEvent = function (elem, event, listener) { - elem.addEventListener(event, listener, false); + var wrapped = function() { + var wrappedArgs = Array.prototype.slice(arguments); + Ember.run(function() { + listener.call(this, wrappedArgs); + }); + }; + elem.addEventListener(event, wrapped, false); }; @@ -904,7 +910,7 @@ // TODO allow us to inject this in (its our debouncer) var debounce = function(func,wait,trickle) { var timeout = null; - return function(){ + return function() { var context = this; var args = arguments; @@ -924,8 +930,8 @@ currentWait = wait; } - if (timeout) { clearTimeout(timeout); } - timeout = setTimeout(later, currentWait); + if (timeout) { Ember.run.cancel(timeout); } + timeout = Ember.run.later(later, currentWait); } } diff --git a/app/assets/javascripts/discourse/models/composer.js.es6 b/app/assets/javascripts/discourse/models/composer.js.es6 index fa101a177c..8171432a0e 100644 --- a/app/assets/javascripts/discourse/models/composer.js.es6 +++ b/app/assets/javascripts/discourse/models/composer.js.es6 @@ -29,7 +29,7 @@ const CLOSED = 'closed', const Composer = Discourse.Model.extend({ archetypes: function() { - return Discourse.Site.currentProp('archetypes'); + return this.site.get('archetypes'); }.property(), creatingTopic: Em.computed.equal('action', CREATE_TOPIC), @@ -127,21 +127,16 @@ const Composer = Discourse.Model.extend({ } else { // has a category? (when needed) return this.get('canCategorize') && - !Discourse.SiteSettings.allow_uncategorized_topics && + !this.siteSettings.allow_uncategorized_topics && !this.get('categoryId') && - !Discourse.User.currentProp('staff'); + !this.user.get('staff'); } }.property('loading', 'canEditTitle', 'titleLength', 'targetUsernames', 'replyLength', 'categoryId', 'missingReplyCharacters'), - /** - Is the title's length valid? - - @property titleLengthValid - **/ titleLengthValid: function() { - if (Discourse.User.currentProp('admin') && this.get('post.static_doc') && this.get('titleLength') > 0) return true; + if (this.user.get('admin') && this.get('post.static_doc') && this.get('titleLength') > 0) return true; if (this.get('titleLength') < this.get('minimumTitleLength')) return false; - return (this.get('titleLength') <= Discourse.SiteSettings.max_topic_title_length); + return (this.get('titleLength') <= this.siteSettings.max_topic_title_length); }.property('minimumTitleLength', 'titleLength', 'post.static_doc'), // The icon for the save button @@ -194,9 +189,9 @@ const Composer = Discourse.Model.extend({ **/ minimumTitleLength: function() { if (this.get('privateMessage')) { - return Discourse.SiteSettings.min_private_message_title_length; + return this.siteSettings.min_private_message_title_length; } else { - return Discourse.SiteSettings.min_topic_title_length; + return this.siteSettings.min_topic_title_length; } }.property('privateMessage'), @@ -216,12 +211,12 @@ const Composer = Discourse.Model.extend({ **/ minimumPostLength: function() { if( this.get('privateMessage') ) { - return Discourse.SiteSettings.min_private_message_post_length; + return this.siteSettings.min_private_message_post_length; } else if (this.get('topicFirstPost')) { // first post (topic body) - return Discourse.SiteSettings.min_first_post_length; + return this.siteSettings.min_first_post_length; } else { - return Discourse.SiteSettings.min_post_length; + return this.siteSettings.min_post_length; } }.property('privateMessage', 'topicFirstPost'), @@ -249,7 +244,7 @@ const Composer = Discourse.Model.extend({ _setupComposer: function() { const val = (Discourse.Mobile.mobileView ? false : (Discourse.KeyValueStore.get('composer.showPreview') || 'true')); this.set('showPreview', val === 'true'); - this.set('archetypeId', Discourse.Site.currentProp('default_archetype')); + this.set('archetypeId', this.site.get('default_archetype')); }.on('init'), /** @@ -349,15 +344,15 @@ const Composer = Discourse.Model.extend({ this.setProperties({ categoryId: opts.categoryId || this.get('topic.category.id'), - archetypeId: opts.archetypeId || Discourse.Site.currentProp('default_archetype'), + archetypeId: opts.archetypeId || this.site.get('default_archetype'), metaData: opts.metaData ? Em.Object.create(opts.metaData) : null, reply: opts.reply || this.get("reply") || "" }); if (opts.postId) { this.set('loading', true); - Discourse.Post.load(opts.postId).then(function(result) { - composer.set('post', result); + this.store.find('post', opts.postId).then(function(post) { + composer.set('post', post); composer.set('loading', false); }); } @@ -370,10 +365,10 @@ const Composer = Discourse.Model.extend({ this.setProperties(topicProps); - Discourse.Post.load(opts.post.get('id')).then(function(result) { + this.store.find('post', opts.post.get('id')).then(function(post) { composer.setProperties({ - reply: result.get('raw'), - originalText: result.get('raw'), + reply: post.get('raw'), + originalText: post.get('raw'), loading: false }); }); @@ -467,7 +462,7 @@ const Composer = Discourse.Model.extend({ createPost(opts) { const post = this.get('post'), topic = this.get('topic'), - currentUser = Discourse.User.current(), + user = this.user, postStream = this.get('topic.postStream'); let addedToStream = false; @@ -477,17 +472,17 @@ const Composer = Discourse.Model.extend({ imageSizes: opts.imageSizes, cooked: this.getCookedHtml(), reply_count: 0, - name: currentUser.get('name'), - display_username: currentUser.get('name'), - username: currentUser.get('username'), - user_id: currentUser.get('id'), - user_title: currentUser.get('title'), - uploaded_avatar_id: currentUser.get('uploaded_avatar_id'), - user_custom_fields: currentUser.get('custom_fields'), - post_type: Discourse.Site.currentProp('post_types.regular'), + name: user.get('name'), + display_username: user.get('name'), + username: user.get('username'), + user_id: user.get('id'), + user_title: user.get('title'), + uploaded_avatar_id: user.get('uploaded_avatar_id'), + user_custom_fields: user.get('custom_fields'), + post_type: this.site.get('post_types.regular'), actions_summary: [], - moderator: currentUser.get('moderator'), - admin: currentUser.get('admin'), + moderator: user.get('moderator'), + admin: user.get('admin'), yours: true, newPost: true, read: true @@ -520,7 +515,7 @@ const Composer = Discourse.Model.extend({ // we would need to handle oneboxes and other bits that are not even in the // engine, staging will just cause a blank post to render if (!_.isEmpty(createdPost.get('cooked'))) { - state = postStream.stagePost(createdPost, currentUser); + state = postStream.stagePost(createdPost, user); if(state === "alreadyStaging"){ return; @@ -529,69 +524,64 @@ const Composer = Discourse.Model.extend({ } } - const composer = this, - promise = new Ember.RSVP.Promise(function(resolve, reject) { - composer.set('composeState', SAVING); - - createdPost.save(function(result) { - let saving = true; - - createdPost.updateFromJson(result); - - if (topic) { - // It's no longer a new post - createdPost.set('newPost', false); - topic.set('draft_sequence', result.draft_sequence); - postStream.commitPost(createdPost); - addedToStream = true; - } else { - // We created a new topic, let's show it. - composer.set('composeState', CLOSED); - saving = false; - - // Update topic_count for the category - const category = Discourse.Site.currentProp('categories').find(function(x) { return x.get('id') === (parseInt(createdPost.get('category'),10) || 1); }); - if (category) category.incrementProperty('topic_count'); - Discourse.notifyPropertyChange('globalNotice'); - } - - composer.clearState(); - composer.set('createdPost', createdPost); - - if (addedToStream) { - composer.set('composeState', CLOSED); - } else if (saving) { - composer.set('composeState', SAVING); - } - - return resolve({ post: result }); - }, function(error) { - // If an error occurs - if (postStream) { - postStream.undoPost(createdPost); - } - composer.set('composeState', OPEN); - - // TODO extract error handling code - let parsedError; - try { - const parsedJSON = $.parseJSON(error.responseText); - if (parsedJSON.errors) { - parsedError = parsedJSON.errors[0]; - } else if (parsedJSON.failed) { - parsedError = parsedJSON.message; - } - } - catch(ex) { - parsedError = "Unknown error saving post, try again. Error: " + error.status + " " + error.statusText; - } - reject(parsedError); - }); - }); - + const composer = this; + composer.set('composeState', SAVING); composer.set("stagedPost", state === "staged" && createdPost); - return promise; + return createdPost.save().then(function(result) { + let saving = true; + createdPost.updateFromJson(result); + + if (topic) { + // It's no longer a new post + createdPost.set('newPost', false); + topic.set('draft_sequence', result.draft_sequence); + postStream.commitPost(createdPost); + addedToStream = true; + } else { + // We created a new topic, let's show it. + composer.set('composeState', CLOSED); + saving = false; + + // Update topic_count for the category + const category = composer.site.get('categories').find(function(x) { return x.get('id') === (parseInt(createdPost.get('category'),10) || 1); }); + if (category) category.incrementProperty('topic_count'); + Discourse.notifyPropertyChange('globalNotice'); + } + + composer.clearState(); + composer.set('createdPost', createdPost); + + if (addedToStream) { + composer.set('composeState', CLOSED); + } else if (saving) { + composer.set('composeState', SAVING); + } + + return { post: result }; + }).catch(function(error) { + + // If an error occurs + if (postStream) { + postStream.undoPost(createdPost); + } + composer.set('composeState', OPEN); + + // TODO extract error handling code + let parsedError; + try { + const parsedJSON = $.parseJSON(error.responseText); + if (parsedJSON.errors) { + parsedError = parsedJSON.errors[0]; + } else if (parsedJSON.failed) { + parsedError = parsedJSON.message; + } + } + catch(ex) { + parsedError = "Unknown error saving post, try again. Error: " + error.status + " " + error.statusText; + } + throw parsedError; + }); }, getCookedHtml() { @@ -604,7 +594,7 @@ const Composer = Discourse.Model.extend({ // Do not save when there is no reply if (!this.get('reply')) return; // Do not save when the reply's length is too small - if (this.get('replyLength') < Discourse.SiteSettings.min_post_length) return; + if (this.get('replyLength') < this.siteSettings.min_post_length) return; const data = { reply: this.get('reply'), @@ -673,6 +663,14 @@ Composer.reopenClass({ } }, + create(args) { + args = args || {}; + args.user = args.user || Discourse.User.current(); + args.site = args.site || Discourse.Site.current(); + args.siteSettings = args.siteSettings || Discourse.SiteSettings; + return this._super(args); + }, + serializeToTopic(fieldName, property) { if (!property) { property = fieldName; } _edit_topic_serializer[fieldName] = property; diff --git a/app/assets/javascripts/discourse/models/_post.js b/app/assets/javascripts/discourse/models/post.js.es6 similarity index 78% rename from app/assets/javascripts/discourse/models/_post.js rename to app/assets/javascripts/discourse/models/post.js.es6 index 7ae7058cbc..1d54744332 100644 --- a/app/assets/javascripts/discourse/models/_post.js +++ b/app/assets/javascripts/discourse/models/post.js.es6 @@ -1,20 +1,12 @@ -/** - A data model representing a post in a topic +const Post = Discourse.Model.extend({ - @class Post - @extends Discourse.Model - @namespace Discourse - @module Discourse -**/ -Discourse.Post = Discourse.Model.extend({ - - init: function() { + init() { this.set('replyHistory', []); }, shareUrl: function() { - var user = Discourse.User.current(); - var userSuffix = user ? '?u=' + user.get('username_lower') : ''; + const user = Discourse.User.current(); + const userSuffix = user ? '?u=' + user.get('username_lower') : ''; if (this.get('firstPost')) { return this.get('topic.url') + userSuffix; @@ -33,7 +25,7 @@ Discourse.Post = Discourse.Model.extend({ userDeleted: Em.computed.empty('user_id'), showName: function() { - var name = this.get('name'); + const name = this.get('name'); return name && (name !== this.get('username')) && Discourse.SiteSettings.display_name_on_posts; }.property('name', 'username'), @@ -69,17 +61,17 @@ Discourse.Post = Discourse.Model.extend({ }.property("user_id"), wikiChanged: function() { - var data = { wiki: this.get("wiki") }; + const data = { wiki: this.get("wiki") }; this._updatePost("wiki", data); }.observes('wiki'), postTypeChanged: function () { - var data = { post_type: this.get("post_type") }; + const data = { post_type: this.get("post_type") }; this._updatePost("post_type", data); }.observes("post_type"), - _updatePost: function (field, data) { - var self = this; + _updatePost(field, data) { + const self = this; Discourse.ajax("/posts/" + this.get("id") + "/" + field, { type: "PUT", data: data @@ -103,7 +95,7 @@ Discourse.Post = Discourse.Model.extend({ editCount: function() { return this.get('version') - 1; }.property('version'), flagsAvailable: function() { - var post = this; + const post = this; return Discourse.Site.currentProp('flagTypes').filter(function(item) { return post.get("actionByName." + item.get('name_key') + ".can_act"); }); @@ -119,9 +111,8 @@ Discourse.Post = Discourse.Model.extend({ }); }.property('actions_summary.@each.users', 'actions_summary.@each.count'), - // Save a post and call the callback when done. - save: function(complete, error) { - var self = this; + save() { + const self = this; if (!this.get('newPost')) { // We're updating a post return Discourse.ajax("/posts/" + (this.get('id')), { @@ -135,19 +126,17 @@ Discourse.Post = Discourse.Model.extend({ // If we received a category update, update it self.set('version', result.post.version); if (result.category) Discourse.Site.current().updateCategory(result.category); - if (complete) complete(Discourse.Post.create(result.post)); - }).catch(function(result) { - // Post failed to update - if (error) error(result); + return Discourse.Post.create(result.post); }); } else { // We're saving a post - var data = this.getProperties(Discourse.Composer.serializedFieldsForCreate()); + const data = this.getProperties(Discourse.Composer.serializedFieldsForCreate()); data.reply_to_post_number = this.get('reply_to_post_number'); data.image_sizes = this.get('imageSizes'); + data.nested_post = true; - var metaData = this.get('metaData'); + const metaData = this.get('metaData'); // Put the metaData into the request if (metaData) { data.meta_data = {}; @@ -158,34 +147,22 @@ Discourse.Post = Discourse.Model.extend({ type: 'POST', data: data }).then(function(result) { - // Post created - if (complete) complete(Discourse.Post.create(result)); - }).catch(function(result) { - // Failed to create a post - if (error) error(result); + return Discourse.Post.create(result.post); }); } }, - /** - Expands the first post's content, if embedded and shortened. - - @method expandFirstPost - **/ - expand: function() { - var self = this; + // Expands the first post's content, if embedded and shortened. + expand() { + const self = this; return Discourse.ajax("/posts/" + this.get('id') + "/expand-embed").then(function(post) { self.set('cooked', "
" + post.cooked + "
" ); }); }, - /** - Recover a deleted post - - @method recover - **/ - recover: function() { - var post = this; + // Recover a deleted post + recover() { + const post = this; post.setProperties({ deleted_at: null, deleted_by: null, @@ -207,11 +184,8 @@ Discourse.Post = Discourse.Model.extend({ /** Changes the state of the post to be deleted. Does not call the server, that should be done elsewhere. - - @method setDeletedState - @param {Discourse.User} deletedBy The user deleting the post **/ - setDeletedState: function(deletedBy) { + setDeletedState(deletedBy) { this.set('oldCooked', this.get('cooked')); // Moderators can delete posts. Users can only trigger a deleted at message, unless delete_removed_posts_after is 0. @@ -237,10 +211,8 @@ Discourse.Post = Discourse.Model.extend({ Changes the state of the post to NOT be deleted. Does not call the server. This can only be called after setDeletedState was called, but the delete failed on the server. - - @method undoDeletedState **/ - undoDeleteState: function() { + undoDeleteState() { if (this.get('oldCooked')) { this.setProperties({ deleted_at: null, @@ -253,13 +225,7 @@ Discourse.Post = Discourse.Model.extend({ } }, - /** - Deletes a post - - @method destroy - @param {Discourse.User} deletedBy The user deleting the post - **/ - destroy: function(deletedBy) { + destroy(deletedBy) { this.setDeletedState(deletedBy); return Discourse.ajax("/posts/" + this.get('id'), { data: { context: window.location.pathname }, @@ -270,14 +236,11 @@ Discourse.Post = Discourse.Model.extend({ /** Updates a post from another's attributes. This will normally happen when a post is loading but is already found in an identity map. - - @method updateFromPost - @param {Discourse.Post} otherPost The post we're updating from **/ - updateFromPost: function(otherPost) { - var self = this; + updateFromPost(otherPost) { + const self = this; Object.keys(otherPost).forEach(function (key) { - var value = otherPost[key], + let value = otherPost[key], oldValue = self[key]; if (key === "replyHistory") { @@ -287,7 +250,7 @@ Discourse.Post = Discourse.Model.extend({ if (!value) { value = null; } if (!oldValue) { oldValue = null; } - var skip = false; + let skip = false; if (typeof value !== "function" && oldValue !== value) { // wishing for an identity map if (key === "reply_to_user" && value && oldValue) { @@ -304,17 +267,14 @@ Discourse.Post = Discourse.Model.extend({ /** Updates a post from a JSON packet. This is normally done after the post is saved to refresh any attributes. - - @method updateFromJson - @param {Object} obj The Json data to update with **/ - updateFromJson: function(obj) { + updateFromJson(obj) { if (!obj) return; - var skip, oldVal; + let skip, oldVal; // Update all the properties - var post = this; + const post = this; _.each(obj, function(val,key) { if (key !== 'actions_summary'){ oldVal = post[key]; @@ -336,12 +296,11 @@ Discourse.Post = Discourse.Model.extend({ // Rebuild actions summary this.set('actions_summary', Em.A()); if (obj.actions_summary) { - var lookup = Em.Object.create(); + const lookup = Em.Object.create(); _.each(obj.actions_summary,function(a) { - var actionSummary; a.post = post; a.actionType = Discourse.Site.current().postActionTypeById(a.id); - actionSummary = Discourse.ActionSummary.create(a); + const actionSummary = Discourse.ActionSummary.create(a); post.get('actions_summary').pushObject(actionSummary); lookup.set(a.actionType.get('name_key'), actionSummary); }); @@ -350,7 +309,7 @@ Discourse.Post = Discourse.Model.extend({ }, // Load replies to this post - loadReplies: function() { + loadReplies() { if(this.get('loadingReplies')){ return; } @@ -358,12 +317,12 @@ Discourse.Post = Discourse.Model.extend({ this.set('loadingReplies', true); this.set('replies', []); - var self = this; + const self = this; return Discourse.ajax("/posts/" + (this.get('id')) + "/replies") .then(function(loaded) { - var replies = self.get('replies'); + const replies = self.get('replies'); _.each(loaded,function(reply) { - var post = Discourse.Post.create(reply); + const post = Discourse.Post.create(reply); post.set('topic', self.get('topic')); replies.pushObject(post); }); @@ -375,7 +334,7 @@ Discourse.Post = Discourse.Model.extend({ // Whether to show replies directly below showRepliesBelow: function() { - var replyCount = this.get('reply_count'); + const replyCount = this.get('reply_count'); // We don't show replies if there aren't any if (replyCount === 0) return false; @@ -387,13 +346,13 @@ Discourse.Post = Discourse.Model.extend({ if (replyCount > 1) return true; // If we have *exactly* one reply, we have to consider if it's directly below us - var topic = this.get('topic'); + const topic = this.get('topic'); return !topic.isReplyDirectlyBelow(this); }.property('reply_count'), - expandHidden: function() { - var self = this; + expandHidden() { + const self = this; return Discourse.ajax("/posts/" + this.get('id') + "/cooked.json").then(function (result) { self.setProperties({ cooked: result.cooked, @@ -402,17 +361,17 @@ Discourse.Post = Discourse.Model.extend({ }); }, - rebake: function () { + rebake() { return Discourse.ajax("/posts/" + this.get("id") + "/rebake", { type: "PUT" }); }, - unhide: function () { + unhide() { return Discourse.ajax("/posts/" + this.get("id") + "/unhide", { type: "PUT" }); }, - toggleBookmark: function() { - var self = this, - bookmarkedTopic; + toggleBookmark() { + const self = this; + let bookmarkedTopic; this.toggleProperty("bookmarked"); @@ -435,16 +394,16 @@ Discourse.Post = Discourse.Model.extend({ } }); -Discourse.Post.reopenClass({ +Post.reopenClass({ - createActionSummary: function(result) { + createActionSummary(result) { if (result.actions_summary) { - var lookup = Em.Object.create(); + const lookup = Em.Object.create(); // this area should be optimized, it is creating way too many objects per post result.actions_summary = result.actions_summary.map(function(a) { a.post = result; a.actionType = Discourse.Site.current().postActionTypeById(a.id); - var actionSummary = Discourse.ActionSummary.create(a); + const actionSummary = Discourse.ActionSummary.create(a); lookup[a.actionType.name_key] = actionSummary; return actionSummary; }); @@ -452,8 +411,8 @@ Discourse.Post.reopenClass({ } }, - create: function(obj) { - var result = this._super.apply(this, arguments); + create(obj) { + const result = this._super.apply(this, arguments); this.createActionSummary(result); if (obj && obj.reply_to_user) { result.set('reply_to_user', Discourse.User.create(obj.reply_to_user)); @@ -461,14 +420,14 @@ Discourse.Post.reopenClass({ return result; }, - updateBookmark: function(postId, bookmarked) { + updateBookmark(postId, bookmarked) { return Discourse.ajax("/posts/" + postId + "/bookmark", { type: 'PUT', data: { bookmarked: bookmarked } }); }, - deleteMany: function(selectedPosts, selectedReplies) { + deleteMany(selectedPosts, selectedReplies) { return Discourse.ajax("/posts/destroy_many", { type: 'DELETE', data: { @@ -478,37 +437,33 @@ Discourse.Post.reopenClass({ }); }, - loadRevision: function(postId, version) { + loadRevision(postId, version) { return Discourse.ajax("/posts/" + postId + "/revisions/" + version + ".json").then(function (result) { return Ember.Object.create(result); }); }, - hideRevision: function(postId, version) { + hideRevision(postId, version) { return Discourse.ajax("/posts/" + postId + "/revisions/" + version + "/hide", { type: 'PUT' }); }, - showRevision: function(postId, version) { + showRevision(postId, version) { return Discourse.ajax("/posts/" + postId + "/revisions/" + version + "/show", { type: 'PUT' }); }, - loadQuote: function(postId) { + loadQuote(postId) { return Discourse.ajax("/posts/" + postId + ".json").then(function (result) { - var post = Discourse.Post.create(result); + const post = Discourse.Post.create(result); return Discourse.Quote.build(post, post.get('raw')); }); }, - loadRawEmail: function(postId) { + loadRawEmail(postId) { return Discourse.ajax("/posts/" + postId + "/raw-email").then(function (result) { return result.raw_email; }); - }, - - load: function(postId) { - return Discourse.ajax("/posts/" + postId + ".json").then(function (result) { - return Discourse.Post.create(result); - }); } }); + +export default Post; diff --git a/app/assets/javascripts/main_include.js b/app/assets/javascripts/main_include.js index 9816d42f55..9a6e975743 100644 --- a/app/assets/javascripts/main_include.js +++ b/app/assets/javascripts/main_include.js @@ -25,6 +25,7 @@ //= require ./discourse/lib/safari-hacks //= require_tree ./discourse/adapters //= require ./discourse/models/model +//= require ./discourse/models/post //= require ./discourse/models/user_action //= require ./discourse/models/composer //= require ./discourse/models/post-stream diff --git a/app/controllers/posts_controller.rb b/app/controllers/posts_controller.rb index e632b8f277..57b829e531 100644 --- a/app/controllers/posts_controller.rb +++ b/app/controllers/posts_controller.rb @@ -336,7 +336,11 @@ class PostsController < ApplicationController # doesn't return the post as the root JSON object, but as a nested object. # If a param is present it uses that result structure. def backwards_compatible_json(json_obj, success) - json_obj = json_obj[:post] || json_obj['post'] unless params[:nested_post] + json_obj.symbolize_keys! + if params[:nested_post].blank? && json_obj[:errors].blank? + json_obj = json_obj[:post] + end + render json: json_obj, status: (!!success) ? 200 : 422 end diff --git a/test/javascripts/acceptance/composer-test.js.es6 b/test/javascripts/acceptance/composer-test.js.es6 new file mode 100644 index 0000000000..14788f02ba --- /dev/null +++ b/test/javascripts/acceptance/composer-test.js.es6 @@ -0,0 +1,117 @@ +import { acceptance } from "helpers/qunit-helpers"; + +acceptance("Composer", { loggedIn: true }); + +test("Tests the Composer controls", () => { + visit("/"); + andThen(() => { + ok(exists('#create-topic'), 'the create button is visible'); + }); + + click('#create-topic'); + andThen(() => { + ok(exists('#wmd-input'), 'the composer input is visible'); + ok(exists('.title-input .popup-tip.bad.hide'), 'title errors are hidden by default'); + ok(exists('.textarea-wrapper .popup-tip.bad.hide'), 'body errors are hidden by default'); + }); + + click('a.toggle-preview'); + andThen(() => { + ok(!exists('#wmd-preview:visible'), "clicking the toggle hides the preview"); + }); + + click('a.toggle-preview'); + andThen(() => { + ok(exists('#wmd-preview:visible'), "clicking the toggle shows the preview again"); + }); + + click('#reply-control button.create'); + andThen(() => { + ok(!exists('.title-input .popup-tip.bad.hide'), 'it shows the empty title error'); + ok(!exists('.textarea-wrapper .popup-tip.bad.hide'), 'it shows the empty body error'); + }); + + fillIn('#reply-title', "this is my new topic title"); + andThen(() => { + ok(exists('.title-input .popup-tip.good'), 'the title is now good'); + }); + + fillIn('#wmd-input', "this is the *content* of a post"); + andThen(() => { + equal(find('#wmd-preview').html(), "

this is the content of a post

", "it previews content"); + ok(exists('.textarea-wrapper .popup-tip.good'), 'the body is now good'); + }); + + click('#reply-control a.cancel'); + andThen(() => { + ok(exists('.bootbox.modal'), 'it pops up a confirmation dialog'); + }); + + click('.modal-footer a:eq(1)'); + andThen(() => { + ok(!exists('.bootbox.modal'), 'the confirmation can be cancelled'); + }); + +}); + +test("Create a topic with server side errors", () => { + visit("/"); + click('#create-topic'); + fillIn('#reply-title', "this title triggers an error"); + fillIn('#wmd-input', "this is the *content* of a post"); + click('#reply-control button.create'); + andThen(() => { + ok(exists('.bootbox.modal'), 'it pops up an error message'); + }); + click('.bootbox.modal a.btn-primary'); + andThen(() => { + ok(!exists('.bootbox.modal'), 'it dismisses the error'); + ok(exists('#wmd-input'), 'the composer input is visible'); + }); +}); + +test("Create a Topic", () => { + visit("/"); + click('#create-topic'); + fillIn('#reply-title', "Internationalization Localization"); + fillIn('#wmd-input', "this is the *content* of a new topic post"); + click('#reply-control button.create'); + andThen(() => { + equal(currentURL(), "/t/internationalization-localization/280", "it transitions to the newly created topic URL"); + }); +}); + +test("Create a Reply", () => { + visit("/t/internationalization-localization/280"); + + click('#topic-footer-buttons .btn.create'); + andThen(() => { + ok(exists('#wmd-input'), 'the composer input is visible'); + ok(!exists('#reply-title'), 'there is no title since this is a reply'); + }); + + fillIn('#wmd-input', 'this is the content of my reply'); + click('#reply-control button.create'); + andThen(() => { + exists('#post_12345', 'it inserts the post into the document'); + }); +}); + +test("Edit the first post", () => { + visit("/t/internationalization-localization/280"); + + click('.topic-post:eq(0) button[data-action=showMoreActions]'); + click('.topic-post:eq(0) button[data-action=edit]'); + andThen(() => { + equal(find('#wmd-input').val().indexOf('Any plans to support'), 0, 'it populates the input with the post text'); + }); + + fillIn('#wmd-input', "This is the new text for the post"); + fillIn('#reply-title', "This is the new text for the title"); + click('#reply-control button.create'); + andThen(() => { + ok(!exists('#wmd-input'), 'it closes the composer'); + ok(find('#topic-title h1').text().indexOf('This is the new text for the title') !== -1, 'it shows the new title'); + ok(find('.topic-post:eq(0) .cooked').text().indexOf('This is the new text for the post') !== -1, 'it updates the post'); + }); +}); diff --git a/test/javascripts/acceptance/header-test-staff.js.es6 b/test/javascripts/acceptance/header-test-staff.js.es6 index 2f4db1aa2f..fb3278ee8b 100644 --- a/test/javascripts/acceptance/header-test-staff.js.es6 +++ b/test/javascripts/acceptance/header-test-staff.js.es6 @@ -1,10 +1,6 @@ import { acceptance } from "helpers/qunit-helpers"; -acceptance("Header (Staff)", { - user: { username: 'test', - staff: true, - site_flagged_posts_count: 1 } -}); +acceptance("Header (Staff)", { loggedIn: true }); test("header", () => { visit("/"); diff --git a/test/javascripts/fixtures/post.js.es6 b/test/javascripts/fixtures/post.js.es6 new file mode 100644 index 0000000000..c2d22a62cb --- /dev/null +++ b/test/javascripts/fixtures/post.js.es6 @@ -0,0 +1,4 @@ +export default { + "/posts/398": {"id":398,"name":"Uwe Keim","username":"uwe_keim","avatar_template":"/user_avatar/meta.discourse.org/uwe_keim/{size}/5697.png","uploaded_avatar_id":5697,"created_at":"2013-02-05T21:29:00.280Z","cooked":"

Any plans to support localization of UI elements, so that I (for example) could set up a completely German speaking forum?

","post_number":1,"post_type":1,"updated_at":"2013-02-05T21:29:00.280Z","like_count":0,"reply_count":1,"reply_to_post_number":null,"quote_count":0,"avg_time":25,"incoming_link_count":314,"reads":475,"score":1702.25,"yours":false,"topic_id":280,"topic_slug":"internationalization-localization","display_username":"Uwe Keim","primary_group_name":null,"version":2,"can_edit":true,"can_delete":false,"can_recover":true,"user_title":null,"raw":"Any plans to support localization of UI elements, so that I (for example) could set up a completely German speaking forum?","actions_summary":[{"id":2,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":3,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":4,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":5,"count":0,"hidden":true,"can_act":true,"can_defer_flags":false},{"id":6,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":7,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":8,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false}],"moderator":false,"admin":false,"staff":false,"user_id":255,"hidden":false,"hidden_reason_id":null,"trust_level":2,"deleted_at":null,"user_deleted":false,"edit_reason":null,"can_view_edit_history":true,"wiki":false} +}; + diff --git a/test/javascripts/fixtures/session-fixtures.js.es6 b/test/javascripts/fixtures/session-fixtures.js.es6 new file mode 100644 index 0000000000..fa940ccec9 --- /dev/null +++ b/test/javascripts/fixtures/session-fixtures.js.es6 @@ -0,0 +1,4 @@ +export default { + "/session/current.json": {"current_user":{"id":19,"username":"eviltrout","uploaded_avatar_id":5275,"avatar_template":"/user_avatar/localhost/eviltrout/{size}/5275.png","name":"Robin Ward","total_unread_notifications":205,"unread_notifications":0,"unread_private_messages":0,"admin":true,"notification_channel_position":null,"site_flagged_posts_count":1,"moderator":true,"staff":true,"title":"co-founder","reply_count":859,"topic_count":36,"enable_quoting":true,"external_links_in_new_tab":false,"dynamic_favicon":true,"trust_level":4,"can_edit":true,"can_invite_to_forum":true,"should_be_redirected_to_top":false,"disable_jump_reply":false,"custom_fields":{},"muted_category_ids":[],"dismissed_banner_key":null,"akismet_review_count":0}} +}; + diff --git a/test/javascripts/fixtures/topic.js.es6 b/test/javascripts/fixtures/topic.js.es6 index b072266f46..7d5be12cbc 100644 --- a/test/javascripts/fixtures/topic.js.es6 +++ b/test/javascripts/fixtures/topic.js.es6 @@ -1,2 +1,2 @@ /*jshint maxlen:10000000 */ -export default {"/t/280.json": {"post_stream":{"posts":[{"id":398,"name":"Uwe Keim","username":"uwe_keim","avatar_template":"//www.gravatar.com/avatar/53a82f701ae492808834e621de2586eb.png?s={size}&r=pg&d=identicon","created_at":"2013-02-05T16:29:00.000-05:00","cooked":"

Any plans to support localization of UI elements, so that I (for example) could set up a completely German speaking forum?

","post_number":1,"post_type":1,"updated_at":"2013-02-05T16:29:00.000-05:00","reply_count":0,"reply_to_post_number":null,"quote_count":0,"avg_time":23,"incoming_link_count":9,"reads":390,"score":158.15,"yours":false,"topic_slug":"internationalization-localization","topic_id":280,"display_username":"Uwe Keim","version":1,"can_edit":false,"can_delete":false,"can_recover":false,"link_counts":[{"url":"http://meta.discourse.org/t/comrades-lets-join-our-efforts-on-ukrainian-and-russian-translations/4403/5","internal":true,"reflection":true,"title":"Comrades let's join our efforts on ukrainian and russian translations","clicks":1},{"url":"http://meta.discourse.org/t/bookmark-last-read-sometimes-doesn-t-go-to-the-end-of-a-topic/4825/9","internal":true,"reflection":true,"title":"Bookmark/last read sometimes doesn't go to the end of a topic","clicks":0},{"url":"http://meta.discourse.org/t/suggestion-translation-on-admin-panel/6923/5","internal":true,"reflection":true,"title":"Suggestion: Translation on admin panel","clicks":0},{"url":"http://meta.discourse.org/t/translation-workflow/6102","internal":true,"reflection":true,"title":"Translation workflow","clicks":0},{"url":"http://meta.discourse.org/t/missing-user-value-in-chinese-localized-page/7406/6","internal":true,"reflection":true,"title":"[missing {{user}} value] in Chinese localized page","clicks":0},{"url":"http://meta.discourse.org/t/changing-language-phrase-does-not-affect-on-the-site/8429/3","internal":true,"reflection":true,"title":"Changing language phrase does not affect on the site?","clicks":0},{"url":"http://meta.discourse.org/t/internationalization-i18n-provided-for-discourse/2073/2","internal":true,"reflection":true,"title":"Internationalization I18n provided for discourse ?","clicks":0},{"url":"http://meta.discourse.org/t/language-mirrors/2378/2","internal":true,"reflection":true,"title":"Language mirrors","clicks":0},{"url":"http://meta.discourse.org/t/roadplan-for-discourse/2939/5","internal":true,"reflection":true,"title":"Roadplan for Discourse","clicks":0},{"url":"http://meta.discourse.org/t/solving-xda-developer-style-forums/4368/4","internal":true,"reflection":true,"title":"Solving XDA-Developer style forums","clicks":0}],"read":false,"user_title":null,"actions_summary":[{"id":2,"count":0,"hidden":false,"can_act":null},{"id":3,"count":0,"hidden":false,"can_act":null},{"id":4,"count":0,"hidden":false,"can_act":null},{"id":5,"count":0,"hidden":true,"can_act":null},{"id":6,"count":0,"hidden":false,"can_act":null},{"id":7,"count":0,"hidden":false,"can_act":null},{"id":8,"count":0,"hidden":false,"can_act":null}],"moderator":false,"staff":false,"user_id":255,"hidden":false,"hidden_reason_id":null,"trust_level":1,"deleted_at":null,"user_deleted":false,"edit_reason":null},{"id":419,"name":"Tim Stone","username":"tms","avatar_template":"//www.gravatar.com/avatar/3981cd271c302f5cba628c6b6d2b32ee.png?s={size}&r=pg&d=identicon","created_at":"2013-02-05T16:32:47.000-05:00","cooked":"

The application strings are externalized, so localization should be entirely possible with enough translation effort.

","post_number":2,"post_type":1,"updated_at":"2013-02-06T05:15:27.000-05:00","reply_count":0,"reply_to_post_number":null,"quote_count":0,"avg_time":26,"incoming_link_count":12,"reads":376,"score":256.5,"yours":false,"topic_slug":"internationalization-localization","topic_id":280,"display_username":"Tim Stone","version":2,"can_edit":false,"can_delete":false,"can_recover":false,"link_counts":[{"url":"https://github.com/discourse/discourse/blob/master/config/locales/en.yml","internal":false,"reflection":false,"clicks":91}],"read":false,"user_title":null,"actions_summary":[{"id":2,"count":3,"hidden":false,"can_act":null},{"id":3,"count":0,"hidden":false,"can_act":null},{"id":4,"count":0,"hidden":false,"can_act":null},{"id":5,"count":0,"hidden":true,"can_act":null},{"id":6,"count":0,"hidden":false,"can_act":null},{"id":7,"count":0,"hidden":false,"can_act":null},{"id":8,"count":0,"hidden":false,"can_act":null}],"moderator":false,"staff":false,"user_id":9,"hidden":false,"hidden_reason_id":null,"trust_level":2,"deleted_at":null,"user_deleted":false,"edit_reason":null},{"id":1060,"name":"Jeff Atwood","username":"codinghorror","avatar_template":"//www.gravatar.com/avatar/51d623f33f8b83095db84ff35e15dbe8.png?s={size}&r=pg&d=identicon","created_at":"2013-02-05T21:26:24.000-05:00","cooked":"

Yep, all strings are going through a lookup table.*

\n\n
\n
\n
\n \n github.com\n \n
\n
\n
\n

https://github.com/discourse/discourse/blob/master/config/locales

\n 
\n\n\n\n\n<!DOCTYPE html>\n<html>\n<head>\n  <meta charset=\"utf-8\">\n  <meta name=\"viewport\" id=\"vp\" content=\"initial-scale=1.0,user-scalable=no,maximum-scale=1,width=device-width\">\n  <meta name=\"viewport\" id=\"vp\" content=\"initial-scale=1.0,user-scalable=no,maximum-scale=1\" media=\"(device-height: 568px)\">\n  <link rel=\"apple-touch-icon-precomposed\" href=\"apple-touch-icon-precomposed.png\">\n  <link rel=\"apple-touch-icon-precomposed\" sizes=\"114x114\" href=\"apple-touch-icon-114-precomposed.png\">\n  <meta name=\"google-analytics\" content=\"UA-3769691-2\">\n\n  <meta content=\"authenticity_token\" name=\"csrf-param\" />\n<meta content=\"nFiTSR4YODX1WTtDmWoO2Xbd9vatOibhb97Rm3nw+8I=\" name=\"csrf-token\" />\n\n  <meta content=\"collector.githubapp.com\" name=\"octolytics-host\" /><meta content=\"collector-cdn.github.com\" name=\"octolytics-script-host\" /><meta content=\"github\" name=\"octolytics-app-id\" /><meta content=\"40479403:2C5C:A159F60:52CDD76D\" name=\"octolytics-dimension-request_id\" />\n  <meta content=\"mobile\" name=\"octolytics-dimension-device\" />\n  <meta content=\"3220138\" name=\"octolytics-dimension-user_id\" /><meta content=\"discourse\" name=\"octolytics-dimension-user_login\" /><meta content=\"7569578\" name=\"octolytics-dimension-repository_id\" /><meta content=\"discourse/discourse\" name=\"octolytics-dimension-repository_nwo\" /><meta content=\"true\" name=\"octolytics-dimension-repository_public\" /><meta content=\"false\" name=\"octolytics-dimension-repository_is_fork\" /><meta content=\"7569578\" name=\"octolytics-dimension-repository_network_root_id\" /><meta content=\"discourse/discourse\" name=\"octolytics-dimension-repository_network_root_nwo\" />\n  \n\n  <title>discourse/discourse · GitHub</title>\n\n  <link href=\"https://github.global.ssl.fastly.net/assets/mobile-9164f493ea1c72c93c839eba1f16fb0a36e0f638.css\" media=\"all\" rel=\"stylesheet\" type=\"text/css\" />\n  <script async=\"async\" defer=\"defer\" src=\"https://github.global.ssl.fastly.net/assets/mobile-756d65616fde6492018be51d0739ed8ccfcc25b6.js\" type=\"text/javascript\"></script>\n</head>\n<body class=\"\">\n  <header class=\"nav-bar clearfix\">\n    <div class=\"nav-bar-inner\">\n      \n\n      <button class=\"header-button header-nav-button touchable js-show-global-nav \">\n        <span class=\"octicon octicon-three-bars\"></span>\n        <span class=\"octicon octicon-primitive-dot\"></span>\n      </button>\n\n      <div class=\"nav-bar-title-text\">\n              <span class=\"octicon octicon-repo\"></span>\n\n    <strong><a href=\"/discourse\">discourse</a></strong>\n    /\n    <strong><a href=\"/discourse/discourse\">discourse</a></strong>\n\n      </div>\n    </div>\n\n    <nav class=\"nav-bar-tabs repo-nav-bar-tabs \">\n      <ul>\n\n\n        <li>\n          <a href=\"/explore\"><span class=\"octicon octicon-telescope\"></span> Explore</a>\n        </li>\n\n        <li>\n            <a href=\"/login\"><span class=\"octicon octicon-log-in\"></span> Sign in</a>\n        </li>\n\n            <li class=\"section-title\">This repository</li>\n    <li><a href=\"/discourse/discourse?files=1\"><span class=\"octicon octicon-code\"></span> Code</a></li>\n      <li><a href=\"/discourse/discourse/issues\"><span class=\"octicon octicon-issue-opened\"></span> Issues</a></li>\n    <li><a href=\"/discourse/discourse/pulls\"><span class=\"octicon octicon-git-pull-request\"></span> Pull Requests</a></li>\n    <li><a href=\"/discourse/discourse/pulse\"><span class=\"octicon octicon-pulse\"></span> Pulse</a></li>\n\n      </ul>\n    </nav>\n  </header>\n\n  \n\n        \n\n\n<div class=\"file-browser\">\n\n  <p class=\"history-link\">\n    <a href=\"/discourse/discourse/commits/master/config/locales\">\n      <span class=\"octicon octicon-history\"></span>\n      View 5857 commits\n    </a>\n  </p>\n\n  <div class=\"bubble\">\n    <ul class=\"bubble-list files-list\">\n      <li class=\"path\">\n        <span class=\"branch\">master</span>\n        <span class='bold'>\n          <span itemtype=\"http://data-vocabulary.org/Breadcrumb\">\n            <a href=\"/discourse/discourse?files=1\" data-branch=\"master\" data-direction=\"back\" itemscope=\"url\">\n              <span itemprop=\"title\">discourse</span>\n            </a>\n          </span>\n        </span>\n        <span class=\"separator\"> / </span>\n\n        <span itemscope=\"\" itemtype=\"http://data-vocabulary.org/Breadcrumb\"><a href=\"/discourse/discourse/tree/master/config\" data-branch=\"master\" data-direction=\"back\" data-pjax=\"true\" itemscope=\"url\"><span itemprop=\"title\">config</span></a></span><span class=\"separator\"> / </span><strong class=\"final-path\">locales</strong>\n      </li>\n\n        <li>\n          <a href=\"/discourse/discourse/blob/master/config/locales/client.cs.yml\" class=\"file-list-item\">\n            <span class=\"octicon octicon-file-text\"></span>\n            client.cs.yml\n              <span class=\"timestamp\">28 days ago</span>\n          </a>\n        </li>\n        <li>\n          <a href=\"/discourse/discourse/blob/master/config/locales/client.da.yml\" class=\"file-list-item\">\n            <span class=\"octicon octicon-file-text\"></span>\n            client.da.yml\n          </a>\n        </li>\n        <li>
\n\n This file has been truncated. show original\n
\n
\n\n

So you could replace that lookup table with the \"de\" one to get German.

\n\n

* we didn't get all the strings into the lookup table for launch, but the vast, vast majority of them are and the ones that are not, we will fix as we go!

","post_number":3,"post_type":1,"updated_at":"2013-06-18T22:58:28.000-04:00","reply_count":3,"reply_to_post_number":null,"quote_count":0,"avg_time":33,"incoming_link_count":4,"reads":367,"score":155.05,"yours":false,"topic_slug":"internationalization-localization","topic_id":280,"display_username":"Jeff Atwood","version":3,"can_edit":false,"can_delete":false,"can_recover":false,"link_counts":[{"url":"https://github.com/discourse/discourse/blob/master/config/locales","internal":false,"reflection":false,"clicks":27},{"url":"http://meta.discourse.org/t/github-onebox-rendering-issue/7616","internal":true,"reflection":true,"title":"GitHub OneBox Rendering Issue","clicks":0}],"read":false,"user_title":"co-founder","actions_summary":[{"id":2,"count":3,"hidden":false,"can_act":null},{"id":3,"count":0,"hidden":false,"can_act":null},{"id":4,"count":0,"hidden":false,"can_act":null},{"id":5,"count":0,"hidden":true,"can_act":null},{"id":6,"count":0,"hidden":false,"can_act":null},{"id":7,"count":0,"hidden":false,"can_act":null},{"id":8,"count":0,"hidden":false,"can_act":null}],"moderator":true,"staff":true,"user_id":32,"hidden":false,"hidden_reason_id":null,"trust_level":2,"deleted_at":null,"user_deleted":false,"edit_reason":null},{"id":3623,"name":"Shade","username":"shade","avatar_template":"//www.gravatar.com/avatar/02c3f1806f6962f56168c7bd9f8924b8.png?s={size}&r=pg&d=identicon","created_at":"2013-02-07T07:55:33.000-05:00","cooked":"

Is it a coincidence that the strings file is 1337 lines long? \"smiley\"

","post_number":4,"post_type":1,"updated_at":"2013-02-07T07:55:33.000-05:00","reply_count":0,"reply_to_post_number":null,"quote_count":0,"avg_time":21,"incoming_link_count":11,"reads":324,"score":255.85,"yours":false,"topic_slug":"internationalization-localization","topic_id":280,"display_username":"Shade","version":1,"can_edit":false,"can_delete":false,"can_recover":false,"link_counts":[{"url":"http://meta.discourse.org/t/hi-support-chinese/4393/6","internal":true,"reflection":true,"title":"Hi, support Chinese?","clicks":0}],"read":false,"user_title":null,"actions_summary":[{"id":2,"count":7,"hidden":false,"can_act":null},{"id":3,"count":0,"hidden":false,"can_act":null},{"id":4,"count":0,"hidden":false,"can_act":null},{"id":5,"count":0,"hidden":true,"can_act":null},{"id":6,"count":0,"hidden":false,"can_act":null},{"id":7,"count":0,"hidden":false,"can_act":null},{"id":8,"count":0,"hidden":false,"can_act":null}],"moderator":false,"staff":false,"user_id":1808,"hidden":false,"hidden_reason_id":null,"trust_level":1,"deleted_at":null,"user_deleted":false,"edit_reason":null},{"id":3651,"name":"Pekka Gaiser","username":"pekka","avatar_template":"//www.gravatar.com/avatar/100a6c42a31a56e882475725d65537f8.png?s={size}&r=pg&d=identicon","created_at":"2013-02-07T09:02:07.000-05:00","cooked":"

\n\n

The problem I see here is that this file is likely two grow and change massively over the next couple months, and tracking these changes in order to keep a localized file up to date is going to be a bitch.

\n\n

I wonder where there is a tool that can compare two yml structures and point out which nodes are missing? That would help keep track of new strings.

\n\n

Re keeping track of changed strings, @codinghorror I found this very interesting: http://stackoverflow.com/questions/4232922/why-do-people-use-plain-english-as-translation-placeholders if plain English placeholders were used, any change in strings would lead to a new node in the yml file, making keeping the translation up to date easier. Maybe worth thinking about in the future.

","post_number":5,"post_type":1,"updated_at":"2013-02-07T09:05:42.000-05:00","reply_count":2,"reply_to_post_number":3,"quote_count":1,"avg_time":23,"incoming_link_count":6,"reads":317,"score":179.55,"yours":false,"topic_slug":"internationalization-localization","topic_id":280,"display_username":"Pekka Gaiser","version":1,"can_edit":false,"can_delete":false,"can_recover":false,"link_counts":[{"url":"http://stackoverflow.com/questions/4232922/why-do-people-use-plain-english-as-translation-placeholders","internal":false,"reflection":false,"clicks":56}],"read":false,"user_title":null,"actions_summary":[{"id":2,"count":2,"hidden":false,"can_act":null},{"id":3,"count":0,"hidden":false,"can_act":null},{"id":4,"count":0,"hidden":false,"can_act":null},{"id":5,"count":0,"hidden":true,"can_act":null},{"id":6,"count":0,"hidden":false,"can_act":null},{"id":7,"count":0,"hidden":false,"can_act":null},{"id":8,"count":0,"hidden":false,"can_act":null}],"moderator":false,"staff":false,"user_id":7,"hidden":false,"hidden_reason_id":null,"trust_level":2,"deleted_at":null,"user_deleted":false,"edit_reason":null},{"id":3654,"name":"Sam Saffron","username":"sam","avatar_template":"//www.gravatar.com/avatar/3dcae8378d46c244172a115c28ca49ce.png?s={size}&r=pg&d=identicon","created_at":"2013-02-07T09:05:39.000-05:00","cooked":"

Yes, I really like the concept of fuzzy matching for localization, perhaps you can chase up alex sexton he was meaning to upload a localization tool for this kind of stuff.

\n\n

Also, I am a big fan of ICU message format, but it is not the \"Rails way (tm)\".

","post_number":6,"post_type":1,"updated_at":"2013-02-07T09:05:39.000-05:00","reply_count":1,"reply_to_post_number":5,"quote_count":0,"avg_time":19,"incoming_link_count":2,"reads":276,"score":86.15,"yours":false,"topic_slug":"internationalization-localization","topic_id":280,"display_username":"Sam Saffron","version":1,"can_edit":false,"can_delete":false,"can_recover":false,"link_counts":[{"url":"https://github.com/SlexAxton/messageformat.js","internal":false,"reflection":false,"clicks":38},{"url":"https://github.com/SlexAxton","internal":false,"reflection":false,"clicks":9}],"read":false,"user_title":"co-founder","reply_to_user":{"username":"pekka","avatar_template":"//www.gravatar.com/avatar/100a6c42a31a56e882475725d65537f8.png?s={size}&r=pg&d=identicon"},"actions_summary":[{"id":2,"count":1,"hidden":false,"can_act":null},{"id":3,"count":0,"hidden":false,"can_act":null},{"id":4,"count":0,"hidden":false,"can_act":null},{"id":5,"count":0,"hidden":true,"can_act":null},{"id":6,"count":0,"hidden":false,"can_act":null},{"id":7,"count":0,"hidden":false,"can_act":null},{"id":8,"count":0,"hidden":false,"can_act":null}],"moderator":true,"staff":true,"user_id":1,"hidden":false,"hidden_reason_id":null,"trust_level":2,"deleted_at":null,"user_deleted":false,"edit_reason":null},{"id":3655,"name":"Pekka Gaiser","username":"pekka","avatar_template":"//www.gravatar.com/avatar/100a6c42a31a56e882475725d65537f8.png?s={size}&r=pg&d=identicon","created_at":"2013-02-07T09:08:17.000-05:00","cooked":"

Looks interesting, I'll take a peek.

\n\n

As said on dev, the best tool I can see in terms of giving translators a proper interface and quality control would be something like GlotPress. It's based on the PO messages format (is that somehow related to ICU?) but looks pretty great.

\n\n

\n\n

I'm not familiar with the term in this context, you mean keeping the English version in the code base (instead of a generic code like message_error_nametooshort ?)

","post_number":7,"post_type":1,"updated_at":"2013-02-07T09:12:02.000-05:00","reply_count":1,"reply_to_post_number":6,"quote_count":1,"avg_time":17,"incoming_link_count":0,"reads":276,"score":76.05,"yours":false,"topic_slug":"internationalization-localization","topic_id":280,"display_username":"Pekka Gaiser","version":1,"can_edit":false,"can_delete":false,"can_recover":false,"link_counts":[{"url":"http://translate.wordpress.org/projects/bbpress/dev","internal":false,"reflection":false,"clicks":14}],"read":false,"user_title":null,"actions_summary":[{"id":2,"count":1,"hidden":false,"can_act":null},{"id":3,"count":0,"hidden":false,"can_act":null},{"id":4,"count":0,"hidden":false,"can_act":null},{"id":5,"count":0,"hidden":true,"can_act":null},{"id":6,"count":0,"hidden":false,"can_act":null},{"id":7,"count":0,"hidden":false,"can_act":null},{"id":8,"count":0,"hidden":false,"can_act":null}],"moderator":false,"staff":false,"user_id":7,"hidden":false,"hidden_reason_id":null,"trust_level":2,"deleted_at":null,"user_deleted":false,"edit_reason":null},{"id":3658,"name":"Sam Saffron","username":"sam","avatar_template":"//www.gravatar.com/avatar/3dcae8378d46c244172a115c28ca49ce.png?s={size}&r=pg&d=identicon","created_at":"2013-02-07T09:12:22.000-05:00","cooked":"

ICU Message format is basically Gettext on steroids, Gettext has been around for so many years and actually works pretty well, being super prevalent in Linux.

\n\n

Trouble is you need a fuzzy matcher for translators if you are going to store stuff like mf.compile( 'This is a message.' ) in source, one letter change and all your translators need to validate it.

","post_number":8,"post_type":1,"updated_at":"2013-02-07T09:12:22.000-05:00","reply_count":1,"reply_to_post_number":7,"quote_count":0,"avg_time":11,"incoming_link_count":0,"reads":251,"score":70.75,"yours":false,"topic_slug":"internationalization-localization","topic_id":280,"display_username":"Sam Saffron","version":1,"can_edit":false,"can_delete":false,"can_recover":false,"link_counts":[{"url":"http://meta.discourse.org/t/what-i-love-about-wordpress-plugins/5697","internal":true,"reflection":true,"title":"What I love about WordPress plugins","clicks":0}],"read":false,"user_title":"co-founder","reply_to_user":{"username":"pekka","avatar_template":"//www.gravatar.com/avatar/100a6c42a31a56e882475725d65537f8.png?s={size}&r=pg&d=identicon"},"actions_summary":[{"id":2,"count":1,"hidden":false,"can_act":null},{"id":3,"count":0,"hidden":false,"can_act":null},{"id":4,"count":0,"hidden":false,"can_act":null},{"id":5,"count":0,"hidden":true,"can_act":null},{"id":6,"count":0,"hidden":false,"can_act":null},{"id":7,"count":0,"hidden":false,"can_act":null},{"id":8,"count":0,"hidden":false,"can_act":null}],"moderator":true,"staff":true,"user_id":1,"hidden":false,"hidden_reason_id":null,"trust_level":2,"deleted_at":null,"user_deleted":false,"edit_reason":null},{"id":3660,"name":"Pekka Gaiser","username":"pekka","avatar_template":"//www.gravatar.com/avatar/100a6c42a31a56e882475725d65537f8.png?s={size}&r=pg&d=identicon","created_at":"2013-02-07T09:14:12.000-05:00","cooked":"

\n\n

Yeah, that's why I've always been a friend of message_error_nametooshort placeholders, until I asked the SO question linked above. The accepted answer makes a good argument against those placeholders: you want translations to break even on small changes in the English original because the translations will probably need to reflect the change, too. Maybe that's not the case right now as new stuff is being checked in pretty much every couple of hours, but in the long run, it'll be overwhelmingly true.

","post_number":9,"post_type":1,"updated_at":"2013-02-07T09:18:09.000-05:00","reply_count":1,"reply_to_post_number":8,"quote_count":1,"avg_time":10,"incoming_link_count":0,"reads":249,"score":70.3,"yours":false,"topic_slug":"internationalization-localization","topic_id":280,"display_username":"Pekka Gaiser","version":1,"can_edit":false,"can_delete":false,"can_recover":false,"read":false,"user_title":null,"actions_summary":[{"id":2,"count":1,"hidden":false,"can_act":null},{"id":3,"count":0,"hidden":false,"can_act":null},{"id":4,"count":0,"hidden":false,"can_act":null},{"id":5,"count":0,"hidden":true,"can_act":null},{"id":6,"count":0,"hidden":false,"can_act":null},{"id":7,"count":0,"hidden":false,"can_act":null},{"id":8,"count":0,"hidden":false,"can_act":null}],"moderator":false,"staff":false,"user_id":7,"hidden":false,"hidden_reason_id":null,"trust_level":2,"deleted_at":null,"user_deleted":false,"edit_reason":null},{"id":3667,"name":"Tim Stone","username":"tms","avatar_template":"//www.gravatar.com/avatar/3981cd271c302f5cba628c6b6d2b32ee.png?s={size}&r=pg&d=identicon","created_at":"2013-02-07T09:25:16.000-05:00","cooked":"

Hmm...You could theoretically also build something into the development process that would monitor changes to the English locale file and make a translator-friendly list of changes between versions.

","post_number":10,"post_type":1,"updated_at":"2013-02-07T09:25:16.000-05:00","reply_count":1,"reply_to_post_number":9,"quote_count":0,"avg_time":8,"incoming_link_count":0,"reads":236,"score":67.6,"yours":false,"topic_slug":"internationalization-localization","topic_id":280,"display_username":"Tim Stone","version":1,"can_edit":false,"can_delete":false,"can_recover":false,"read":false,"user_title":null,"reply_to_user":{"username":"pekka","avatar_template":"//www.gravatar.com/avatar/100a6c42a31a56e882475725d65537f8.png?s={size}&r=pg&d=identicon"},"actions_summary":[{"id":2,"count":1,"hidden":false,"can_act":null},{"id":3,"count":0,"hidden":false,"can_act":null},{"id":4,"count":0,"hidden":false,"can_act":null},{"id":5,"count":0,"hidden":true,"can_act":null},{"id":6,"count":0,"hidden":false,"can_act":null},{"id":7,"count":0,"hidden":false,"can_act":null},{"id":8,"count":0,"hidden":false,"can_act":null}],"moderator":false,"staff":false,"user_id":9,"hidden":false,"hidden_reason_id":null,"trust_level":2,"deleted_at":null,"user_deleted":false,"edit_reason":null},{"id":3673,"name":"Sam Saffron","username":"sam","avatar_template":"//www.gravatar.com/avatar/3dcae8378d46c244172a115c28ca49ce.png?s={size}&r=pg&d=identicon","created_at":"2013-02-07T09:30:21.000-05:00","cooked":"

Yeah, totally, also we could build tools for dev that make introducing string less annoying and make it possible to garbage collect old unused strings, I hate trudging through that file.

","post_number":11,"post_type":1,"updated_at":"2013-02-07T09:30:21.000-05:00","reply_count":1,"reply_to_post_number":10,"quote_count":0,"avg_time":7,"incoming_link_count":0,"reads":233,"score":66.95,"yours":false,"topic_slug":"internationalization-localization","topic_id":280,"display_username":"Sam Saffron","version":1,"can_edit":false,"can_delete":false,"can_recover":false,"read":false,"user_title":"co-founder","reply_to_user":{"username":"tms","avatar_template":"//www.gravatar.com/avatar/3981cd271c302f5cba628c6b6d2b32ee.png?s={size}&r=pg&d=identicon"},"actions_summary":[{"id":2,"count":1,"hidden":false,"can_act":null},{"id":3,"count":0,"hidden":false,"can_act":null},{"id":4,"count":0,"hidden":false,"can_act":null},{"id":5,"count":0,"hidden":true,"can_act":null},{"id":6,"count":0,"hidden":false,"can_act":null},{"id":7,"count":0,"hidden":false,"can_act":null},{"id":8,"count":0,"hidden":false,"can_act":null}],"moderator":true,"staff":true,"user_id":1,"hidden":false,"hidden_reason_id":null,"trust_level":2,"deleted_at":null,"user_deleted":false,"edit_reason":null},{"id":3675,"name":"Pekka Gaiser","username":"pekka","avatar_template":"//www.gravatar.com/avatar/100a6c42a31a56e882475725d65537f8.png?s={size}&r=pg&d=identicon","created_at":"2013-02-07T09:33:38.000-05:00","cooked":"

\n\n

As said, I'd look into whether WP's tools can't be reused for this with some tweaking. They seem to be able to scan a code base for new strings, and make them available automatically to translators.

\n\n

They're PHP based which isn't ideal, but it looks like they've done a crapload of work to take the hassle out of translations.

","post_number":12,"post_type":1,"updated_at":"2013-02-07T09:34:39.000-05:00","reply_count":1,"reply_to_post_number":11,"quote_count":1,"avg_time":8,"incoming_link_count":1,"reads":231,"score":71.6,"yours":false,"topic_slug":"internationalization-localization","topic_id":280,"display_username":"Pekka Gaiser","version":1,"can_edit":false,"can_delete":false,"can_recover":false,"read":false,"user_title":null,"actions_summary":[{"id":2,"count":1,"hidden":false,"can_act":null},{"id":3,"count":0,"hidden":false,"can_act":null},{"id":4,"count":0,"hidden":false,"can_act":null},{"id":5,"count":0,"hidden":true,"can_act":null},{"id":6,"count":0,"hidden":false,"can_act":null},{"id":7,"count":0,"hidden":false,"can_act":null},{"id":8,"count":0,"hidden":false,"can_act":null}],"moderator":false,"staff":false,"user_id":7,"hidden":false,"hidden_reason_id":null,"trust_level":2,"deleted_at":null,"user_deleted":false,"edit_reason":null},{"id":3690,"name":"Valts","username":"Vilx","avatar_template":"//www.gravatar.com/avatar/7bd2e50770e937761cfc3811a332bccc.png?s={size}&r=pg&d=identicon","created_at":"2013-02-07T10:05:35.000-05:00","cooked":"

This site looks so nice with all the little tweaks like \"10 minutes ago\" instead of simply time, etc - I wonder if there will also be support for proper pluralization in other languages? That's a pretty hard task though, I don't think I've ever seen a website that has done that. But it would be awesome.

","post_number":13,"post_type":1,"updated_at":"2013-02-07T10:05:35.000-05:00","reply_count":0,"reply_to_post_number":null,"quote_count":0,"avg_time":8,"incoming_link_count":11,"reads":246,"score":149.6,"yours":false,"topic_slug":"internationalization-localization","topic_id":280,"display_username":"Valts","version":1,"can_edit":false,"can_delete":false,"can_recover":false,"read":false,"user_title":null,"actions_summary":[{"id":2,"count":3,"hidden":false,"can_act":null},{"id":3,"count":0,"hidden":false,"can_act":null},{"id":4,"count":0,"hidden":false,"can_act":null},{"id":5,"count":0,"hidden":true,"can_act":null},{"id":6,"count":0,"hidden":false,"can_act":null},{"id":7,"count":0,"hidden":false,"can_act":null},{"id":8,"count":0,"hidden":false,"can_act":null}],"moderator":false,"staff":false,"user_id":1216,"hidden":false,"hidden_reason_id":null,"trust_level":2,"deleted_at":null,"user_deleted":false,"edit_reason":null},{"id":3925,"name":"Eric Kidd","username":"emk","avatar_template":"//www.gravatar.com/avatar/528ca205857ff8f648359dcd3e74c84a.png?s={size}&r=pg&d=identicon","created_at":"2013-02-07T14:37:06.000-05:00","cooked":"

\n\n

I've had pretty decent luck using Localeapp to localize Rails applications:

\n\n

http://www.localeapp.com/

\n\n

The developer workflow took me about an hour to really get used to, and there were a few minor glitches. But the non-technical translators had very few problems. One limitation: It insists on rewriting all those yaml files full of strings.

\n\n

Anyway, it's worth a look, and it's free for open source, if I recall correctly. Certainly easier than doing a whole bunch of toolsmithing from scratch.

","post_number":14,"post_type":1,"updated_at":"2013-02-07T14:37:06.000-05:00","reply_count":1,"reply_to_post_number":12,"quote_count":1,"avg_time":9,"incoming_link_count":0,"reads":237,"score":127.85,"yours":false,"topic_slug":"internationalization-localization","topic_id":280,"display_username":"Eric Kidd","version":1,"can_edit":false,"can_delete":false,"can_recover":false,"link_counts":[{"url":"http://www.localeapp.com/","internal":false,"reflection":false,"clicks":59}],"read":false,"user_title":null,"actions_summary":[{"id":2,"count":3,"hidden":false,"can_act":null},{"id":3,"count":0,"hidden":false,"can_act":null},{"id":4,"count":0,"hidden":false,"can_act":null},{"id":5,"count":0,"hidden":true,"can_act":null},{"id":6,"count":0,"hidden":false,"can_act":null},{"id":7,"count":0,"hidden":false,"can_act":null},{"id":8,"count":0,"hidden":false,"can_act":null}],"moderator":false,"staff":false,"user_id":1860,"hidden":false,"hidden_reason_id":null,"trust_level":1,"deleted_at":null,"user_deleted":false,"edit_reason":null},{"id":3938,"name":"Pekka Gaiser","username":"pekka","avatar_template":"//www.gravatar.com/avatar/100a6c42a31a56e882475725d65537f8.png?s={size}&r=pg&d=identicon","created_at":"2013-02-07T14:52:13.000-05:00","cooked":"

\n\n

Ohhh. Looking sexy. droool

","post_number":15,"post_type":1,"updated_at":"2013-02-07T14:52:13.000-05:00","reply_count":1,"reply_to_post_number":14,"quote_count":1,"avg_time":8,"incoming_link_count":0,"reads":217,"score":63.8,"yours":false,"topic_slug":"internationalization-localization","topic_id":280,"display_username":"Pekka Gaiser","version":1,"can_edit":false,"can_delete":false,"can_recover":false,"read":false,"user_title":null,"actions_summary":[{"id":2,"count":1,"hidden":false,"can_act":null},{"id":3,"count":0,"hidden":false,"can_act":null},{"id":4,"count":0,"hidden":false,"can_act":null},{"id":5,"count":0,"hidden":true,"can_act":null},{"id":6,"count":0,"hidden":false,"can_act":null},{"id":7,"count":0,"hidden":false,"can_act":null},{"id":8,"count":0,"hidden":false,"can_act":null}],"moderator":false,"staff":false,"user_id":7,"hidden":false,"hidden_reason_id":null,"trust_level":2,"deleted_at":null,"user_deleted":false,"edit_reason":null},{"id":3982,"name":"Eric Kidd","username":"emk","avatar_template":"//www.gravatar.com/avatar/528ca205857ff8f648359dcd3e74c84a.png?s={size}&r=pg&d=identicon","created_at":"2013-02-07T15:52:22.000-05:00","cooked":"

\n\n

Yeah, it's pretty. \"smile\" But there were still some rough edges as of a few months ago.

\n\n

Whether or not those rough edges are a deal-breaker will probably depends on whether or not localization is already a source of acute pain. If you're already hurting, Localeapp is a pretty useful tool, especially when it comes to enlisting non-technical translators.

\n\n

But it does require changing how you work with text, and adding one new tool to the mix. So for projects that just don't want to know about non-English languages, it's not yet seamless the way Unicode is these days.

\n\n

(Sweet forum software, by the way. I was just testing out Egyptian hieroglyphics on the test server, because they're well off the Basic Multilingual Plane, and tend to flush Unicode bugs. Everything worked flawlessly.)

","post_number":16,"post_type":1,"updated_at":"2013-02-07T15:52:22.000-05:00","reply_count":1,"reply_to_post_number":15,"quote_count":1,"avg_time":8,"incoming_link_count":0,"reads":209,"score":62.2,"yours":false,"topic_slug":"internationalization-localization","topic_id":280,"display_username":"Eric Kidd","version":1,"can_edit":false,"can_delete":false,"can_recover":false,"read":false,"user_title":null,"actions_summary":[{"id":2,"count":1,"hidden":false,"can_act":null},{"id":3,"count":0,"hidden":false,"can_act":null},{"id":4,"count":0,"hidden":false,"can_act":null},{"id":5,"count":0,"hidden":true,"can_act":null},{"id":6,"count":0,"hidden":false,"can_act":null},{"id":7,"count":0,"hidden":false,"can_act":null},{"id":8,"count":0,"hidden":false,"can_act":null}],"moderator":false,"staff":false,"user_id":1860,"hidden":false,"hidden_reason_id":null,"trust_level":1,"deleted_at":null,"user_deleted":false,"edit_reason":null},{"id":3989,"name":"Pekka Gaiser","username":"pekka","avatar_template":"//www.gravatar.com/avatar/100a6c42a31a56e882475725d65537f8.png?s={size}&r=pg&d=identicon","created_at":"2013-02-07T16:04:15.000-05:00","cooked":"

\n\n

Interesting, thanks for the insight. I don't think localization is seriously on their table right now, there's likely to be many other things on the table before it... but it will become an issue sooner or later.

","post_number":17,"post_type":1,"updated_at":"2013-02-07T16:04:15.000-05:00","reply_count":2,"reply_to_post_number":16,"quote_count":1,"avg_time":8,"incoming_link_count":0,"reads":212,"score":67.8,"yours":false,"topic_slug":"internationalization-localization","topic_id":280,"display_username":"Pekka Gaiser","version":1,"can_edit":false,"can_delete":false,"can_recover":false,"read":false,"user_title":null,"actions_summary":[{"id":2,"count":1,"hidden":false,"can_act":null},{"id":3,"count":0,"hidden":false,"can_act":null},{"id":4,"count":0,"hidden":false,"can_act":null},{"id":5,"count":0,"hidden":true,"can_act":null},{"id":6,"count":0,"hidden":false,"can_act":null},{"id":7,"count":0,"hidden":false,"can_act":null},{"id":8,"count":0,"hidden":false,"can_act":null}],"moderator":false,"staff":false,"user_id":7,"hidden":false,"hidden_reason_id":null,"trust_level":2,"deleted_at":null,"user_deleted":false,"edit_reason":null},{"id":3996,"name":"Sam Saffron","username":"sam","avatar_template":"//www.gravatar.com/avatar/3dcae8378d46c244172a115c28ca49ce.png?s={size}&r=pg&d=identicon","created_at":"2013-02-07T16:12:06.000-05:00","cooked":"

I had an idea ... what if in dev mode, you could right-click on a page and get access to all the translations on the page, make your edits and have it refreshed live.

\n\n

I think it would be awesome, very doable technically.

","post_number":18,"post_type":1,"updated_at":"2013-02-07T16:12:06.000-05:00","reply_count":2,"reply_to_post_number":17,"quote_count":0,"avg_time":9,"incoming_link_count":0,"reads":220,"score":144.45,"yours":false,"topic_slug":"internationalization-localization","topic_id":280,"display_username":"Sam Saffron","version":1,"can_edit":false,"can_delete":false,"can_recover":false,"read":false,"user_title":"co-founder","reply_to_user":{"username":"pekka","avatar_template":"//www.gravatar.com/avatar/100a6c42a31a56e882475725d65537f8.png?s={size}&r=pg&d=identicon"},"actions_summary":[{"id":2,"count":6,"hidden":false,"can_act":null},{"id":3,"count":0,"hidden":false,"can_act":null},{"id":4,"count":0,"hidden":false,"can_act":null},{"id":5,"count":0,"hidden":true,"can_act":null},{"id":6,"count":0,"hidden":false,"can_act":null},{"id":7,"count":0,"hidden":false,"can_act":null},{"id":8,"count":0,"hidden":false,"can_act":null}],"moderator":true,"staff":true,"user_id":1,"hidden":false,"hidden_reason_id":null,"trust_level":2,"deleted_at":null,"user_deleted":false,"edit_reason":null},{"id":4009,"name":"Pekka Gaiser","username":"pekka","avatar_template":"//www.gravatar.com/avatar/100a6c42a31a56e882475725d65537f8.png?s={size}&r=pg&d=identicon","created_at":"2013-02-07T16:18:47.000-05:00","cooked":"

That would be fricking cool. There'd still be some leftovers (like error messages that normally never show up, etc.) but you could corral those up on a specific page.

\n\n

It could have a dropdown giving you all the languages that you have a .yml for in the locale directory, and write the changes into the one selected. I'm sure people would love it.

","post_number":19,"post_type":1,"updated_at":"2013-02-07T16:22:10.000-05:00","reply_count":0,"reply_to_post_number":18,"quote_count":0,"avg_time":9,"incoming_link_count":0,"reads":203,"score":56.05,"yours":false,"topic_slug":"internationalization-localization","topic_id":280,"display_username":"Pekka Gaiser","version":1,"can_edit":false,"can_delete":false,"can_recover":false,"read":false,"user_title":null,"reply_to_user":{"username":"sam","avatar_template":"//www.gravatar.com/avatar/3dcae8378d46c244172a115c28ca49ce.png?s={size}&r=pg&d=identicon"},"actions_summary":[{"id":2,"count":1,"hidden":false,"can_act":null},{"id":3,"count":0,"hidden":false,"can_act":null},{"id":4,"count":0,"hidden":false,"can_act":null},{"id":5,"count":0,"hidden":true,"can_act":null},{"id":6,"count":0,"hidden":false,"can_act":null},{"id":7,"count":0,"hidden":false,"can_act":null},{"id":8,"count":0,"hidden":false,"can_act":null}],"moderator":false,"staff":false,"user_id":7,"hidden":false,"hidden_reason_id":null,"trust_level":2,"deleted_at":null,"user_deleted":false,"edit_reason":null},{"id":4012,"name":"Marco Ceppi","username":"marcoceppi","avatar_template":"//www.gravatar.com/avatar/4ddc8924e79bcec03256821af65fca91.png?s={size}&r=pg&d=identicon","created_at":"2013-02-07T16:22:46.000-05:00","cooked":"

If you use gettext format you could leverage Launchpad translations and the community behind it.

","post_number":20,"post_type":1,"updated_at":"2013-02-07T16:22:46.000-05:00","reply_count":0,"reply_to_post_number":null,"quote_count":0,"avg_time":10,"incoming_link_count":1,"reads":204,"score":61.3,"yours":false,"topic_slug":"internationalization-localization","topic_id":280,"display_username":"Marco Ceppi","version":1,"can_edit":false,"can_delete":false,"can_recover":false,"link_counts":[{"url":"https://translations.launchpad.net/","internal":false,"reflection":false,"clicks":8}],"read":false,"user_title":null,"actions_summary":[{"id":2,"count":1,"hidden":false,"can_act":null},{"id":3,"count":0,"hidden":false,"can_act":null},{"id":4,"count":0,"hidden":false,"can_act":null},{"id":5,"count":0,"hidden":true,"can_act":null},{"id":6,"count":0,"hidden":false,"can_act":null},{"id":7,"count":0,"hidden":false,"can_act":null},{"id":8,"count":0,"hidden":false,"can_act":null}],"moderator":false,"staff":false,"user_id":761,"hidden":false,"hidden_reason_id":null,"trust_level":2,"deleted_at":null,"user_deleted":false,"edit_reason":null}],"stream":[398,419,1060,3623,3651,3654,3655,3658,3660,3667,3673,3675,3690,3925,3938,3982,3989,3996,4009,4012,4025,4056,4058,4093,4129,6288,6302,6683,6687,7059,7078,7197,7445,7448,7524,7528,7784,8379,8426,8427,8569,8570,8577,8861,8992,8999,9000,9002,9015,9048,9052,9104,9408,9435,9625,9631,9655,9896,10386,10400,10547,10671,10700,10710,10714,10753,10786,10846,10893,10994,11001,11107,11221,11225,11229,11251,11660,12453,12454,12462,12624,12625,12627,12628,12629,12630,12918,13501,13507,17251,17252,17977,20706,21397,25473,30505,30512]},"draft":null,"draft_key":"topic_280","draft_sequence":null,"pinned":false,"details":{"auto_close_at":null,"created_by":{"id":255,"username":"uwe_keim","avatar_template":"//www.gravatar.com/avatar/53a82f701ae492808834e621de2586eb.png?s={size}&r=pg&d=identicon"},"last_poster":{"id":19,"username":"eviltrout","avatar_template":"//www.gravatar.com/avatar/c6e17f2ae2a215e87ff9e878a4e63cd9.png?s={size}&r=pg&d=identicon"},"participants":[{"id":212,"username":"alxndr","avatar_template":"//www.gravatar.com/avatar/51c9cfe3d5ebd64a79983aa3117f4aed.png?s={size}&r=pg&d=identicon","post_count":11},{"id":1,"username":"sam","avatar_template":"//www.gravatar.com/avatar/3dcae8378d46c244172a115c28ca49ce.png?s={size}&r=pg&d=identicon","post_count":11},{"id":7,"username":"pekka","avatar_template":"//www.gravatar.com/avatar/100a6c42a31a56e882475725d65537f8.png?s={size}&r=pg&d=identicon","post_count":8},{"id":461,"username":"kuba","avatar_template":"//www.gravatar.com/avatar/1835cb6a5f35bd4089e416a99af90f5f.png?s={size}&r=pg&d=identicon","post_count":7},{"id":2995,"username":"tattoo","avatar_template":"//www.gravatar.com/avatar/645454e097898e3f0d9a54c699995678.png?s={size}&r=pg&d=identicon","post_count":6},{"id":2540,"username":"jgourdon","avatar_template":"//www.gravatar.com/avatar/3f0ee7e17ec820c458958ed7b0e8538b.png?s={size}&r=pg&d=identicon","post_count":5},{"id":1860,"username":"emk","avatar_template":"//www.gravatar.com/avatar/528ca205857ff8f648359dcd3e74c84a.png?s={size}&r=pg&d=identicon","post_count":4},{"id":19,"username":"eviltrout","avatar_template":"//www.gravatar.com/avatar/c6e17f2ae2a215e87ff9e878a4e63cd9.png?s={size}&r=pg&d=identicon","post_count":4},{"id":1275,"username":"dacap","avatar_template":"//www.gravatar.com/avatar/ec0ebc7c17f649d03ee78d4eba56ef73.png?s={size}&r=pg&d=identicon","post_count":4},{"id":3190,"username":"gururea","avatar_template":"//www.gravatar.com/avatar/5ffb222c9c1bd2d99d9267c1557ca984.png?s={size}&r=pg&d=identicon","post_count":3},{"id":1895,"username":"maciek","avatar_template":"//www.gravatar.com/avatar/e3fe0c49f509994d67045602f49808ee.png?s={size}&r=pg&d=identicon","post_count":3},{"id":3704,"username":"mojzis","avatar_template":"//localhost:3000/uploads/default/avatars/2d3/5f5/e677798a1a/{size}.jpg","post_count":3},{"id":22,"username":"splattne","avatar_template":"//www.gravatar.com/avatar/7847006dbf49f1722b07c8da396f1275.png?s={size}&r=pg&d=identicon","post_count":2},{"id":32,"username":"codinghorror","avatar_template":"//www.gravatar.com/avatar/51d623f33f8b83095db84ff35e15dbe8.png?s={size}&r=pg&d=identicon","post_count":2},{"id":1979,"username":"Superuser","avatar_template":"//www.gravatar.com/avatar/a7f1529299c8fb9a263b8e8afcab23da.png?s={size}&r=pg&d=identicon","post_count":2},{"id":3620,"username":"potthast","avatar_template":"//www.gravatar.com/avatar/1753724263a5dee3e38790e6ac3d685c.png?s={size}&r=pg&d=identicon","post_count":2},{"id":3818,"username":"Tudor","avatar_template":"//www.gravatar.com/avatar/8f367608e1d013beed72a8941bb768ca.png?s={size}&r=pg&d=identicon","post_count":2},{"id":9,"username":"tms","avatar_template":"//www.gravatar.com/avatar/3981cd271c302f5cba628c6b6d2b32ee.png?s={size}&r=pg&d=identicon","post_count":2},{"id":255,"username":"uwe_keim","avatar_template":"//www.gravatar.com/avatar/53a82f701ae492808834e621de2586eb.png?s={size}&r=pg&d=identicon","post_count":1},{"id":2753,"username":"mikl","avatar_template":"//www.gravatar.com/avatar/2c3b9882e6898958b892a218b5493af9.png?s={size}&r=pg&d=identicon","post_count":1},{"id":5052,"username":"vulkanino","avatar_template":"//www.gravatar.com/avatar/811bf232b634245aebba5323462d885c.png?s={size}&r=pg&d=identicon","post_count":1},{"id":761,"username":"marcoceppi","avatar_template":"//www.gravatar.com/avatar/4ddc8924e79bcec03256821af65fca91.png?s={size}&r=pg&d=identicon","post_count":1},{"id":2316,"username":"pakl","avatar_template":"//www.gravatar.com/avatar/42910619ef3d550e37f7150caa0d94ff.png?s={size}&r=pg&d=identicon","post_count":1},{"id":5564,"username":"Sjors","avatar_template":"//www.gravatar.com/avatar/2fb09bd6501779802459a171d3f8fbd9.png?s={size}&r=pg&d=identicon","post_count":1}],"suggested_topics":[{"id":5894,"title":"Spam-blocking URL Blacklist","fancy_title":"Spam-blocking URL Blacklist","slug":"spam-blocking-url-blacklist","posts_count":5,"reply_count":3,"highest_post_number":5,"image_url":null,"created_at":"2013-04-15T11:09:39.000-04:00","last_posted_at":"2013-04-15T13:33:11.000-04:00","bumped":true,"bumped_at":"2013-04-15T13:33:11.000-04:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":false,"archetype":"regular","like_count":3,"views":244,"category_id":2},{"id":7116,"title":"Custom fields and Custom post types - (ex. article, recipe)","fancy_title":"Custom fields and Custom post types - (ex. article, recipe)","slug":"custom-fields-and-custom-post-types-ex-article-recipe","posts_count":2,"reply_count":1,"highest_post_number":2,"image_url":null,"created_at":"2013-06-02T17:34:37.000-04:00","last_posted_at":"2013-06-03T01:27:34.000-04:00","bumped":true,"bumped_at":"2013-06-03T01:27:34.000-04:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":false,"archetype":"regular","like_count":0,"views":206,"category_id":2},{"id":7111,"title":"Make the 1 level of sub-categorization freeform","fancy_title":"Make the 1 level of sub-categorization freeform","slug":"make-the-1-level-of-sub-categorization-freeform","posts_count":8,"reply_count":4,"highest_post_number":8,"image_url":"https://www.gravatar.com/avatar/51d623f33f8b83095db84ff35e15dbe8.png?s=40&r=pg&d=identicon","created_at":"2013-06-02T14:47:06.000-04:00","last_posted_at":"2013-06-04T18:07:33.000-04:00","bumped":true,"bumped_at":"2013-06-04T18:07:33.000-04:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":false,"archetype":"regular","like_count":0,"views":197,"category_id":2},{"id":1127,"title":"Automated Signatures?","fancy_title":"Automated Signatures?","slug":"automated-signatures","posts_count":75,"reply_count":57,"highest_post_number":76,"image_url":null,"created_at":"2013-02-06T05:40:37.000-05:00","last_posted_at":"2013-11-19T18:31:32.000-05:00","bumped":true,"bumped_at":"2013-11-19T18:31:32.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":false,"archetype":"regular","like_count":156,"views":2371,"category_id":2},{"id":8667,"title":"Add \"Share\" modal to original thread post?","fancy_title":"Add “Share” modal to original thread post?","slug":"add-share-modal-to-original-thread-post","posts_count":1,"reply_count":0,"highest_post_number":1,"image_url":"/uploads/meta_discourse/1497/ff2adcd46c71a223.png","created_at":"2013-07-26T10:22:48.000-04:00","last_posted_at":"2013-07-26T10:22:49.000-04:00","bumped":true,"bumped_at":"2013-07-26T10:22:49.000-04:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":false,"archetype":"regular","like_count":0,"views":122,"category_id":2},{"id":708,"title":"Special topic types","fancy_title":"Special topic types","slug":"special-topic-types","posts_count":1,"reply_count":0,"highest_post_number":1,"image_url":null,"created_at":"2013-02-05T21:03:26.000-05:00","last_posted_at":"2013-02-05T21:03:26.000-05:00","bumped":false,"bumped_at":"2013-02-05T21:03:26.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":false,"archetype":"regular","like_count":1,"views":108,"category_id":2},{"id":6569,"title":"Linebreaks require two trailing spaces in blockquotes, etc","fancy_title":"Linebreaks require two trailing spaces in blockquotes, etc","slug":"linebreaks-require-two-trailing-spaces-in-blockquotes-etc","posts_count":3,"reply_count":2,"highest_post_number":3,"image_url":null,"created_at":"2013-05-12T02:40:48.000-04:00","last_posted_at":"2013-05-15T11:01:50.000-04:00","bumped":true,"bumped_at":"2013-05-15T11:01:50.000-04:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":false,"archetype":"regular","like_count":0,"views":168,"category_id":2}],"links":[{"url":"https://github.com/discourse/discourse/blob/master/config/locales/en.yml","title":null,"fancy_title":null,"internal":false,"reflection":false,"clicks":"91","user_id":9},{"url":"http://www.localeapp.com/","title":null,"fancy_title":null,"internal":false,"reflection":false,"clicks":"59","user_id":1860},{"url":"http://stackoverflow.com/questions/4232922/why-do-people-use-plain-english-as-translation-placeholders","title":null,"fancy_title":null,"internal":false,"reflection":false,"clicks":"56","user_id":7},{"url":"https://github.com/SlexAxton/messageformat.js","title":null,"fancy_title":null,"internal":false,"reflection":false,"clicks":"38","user_id":1},{"url":"https://github.com/discourse/discourse/blob/master/config/locales","title":null,"fancy_title":null,"internal":false,"reflection":false,"clicks":"27","user_id":32},{"url":"http://www.localeapp.com/projects/1537/translations?utf8=%E2%9C%93&search=source_code","title":null,"fancy_title":null,"internal":false,"reflection":false,"clicks":"21","user_id":1860},{"url":"https://github.com/berk/tr8n","title":null,"fancy_title":null,"internal":false,"reflection":false,"clicks":"20","user_id":1},{"url":"https://translations.launchpad.net/","title":null,"fancy_title":null,"internal":false,"reflection":false,"clicks":"18","user_id":761},{"url":"https://www.transifex.com/","title":null,"fancy_title":null,"internal":false,"reflection":false,"clicks":"16","user_id":1979},{"url":"http://translate.wordpress.org/projects/bbpress/dev","title":null,"fancy_title":null,"internal":false,"reflection":false,"clicks":"14","user_id":7},{"url":"http://weblate.org","title":null,"fancy_title":null,"internal":false,"reflection":false,"clicks":"13","user_id":2316},{"url":"https://github.com/discourse/discourse/pull/493","title":null,"fancy_title":null,"internal":false,"reflection":false,"clicks":"12","user_id":2753},{"url":"https://github.com/SlexAxton","title":null,"fancy_title":null,"internal":false,"reflection":false,"clicks":"9","user_id":1},{"url":"https://github.com/discourse/discourse/tree/master/config/locales","title":null,"fancy_title":null,"internal":false,"reflection":false,"clicks":"8","user_id":19},{"url":"https://github.com/gururea/discourse/tree/master/config/locales","title":null,"fancy_title":null,"internal":false,"reflection":false,"clicks":"8","user_id":3190},{"url":"https://github.com/dacap/discourse/tree/spanish","title":null,"fancy_title":null,"internal":false,"reflection":false,"clicks":"7","user_id":1275},{"url":"https://github.com/discourse/discourse/blob/master/config/locales/client.en.yml#L691","title":null,"fancy_title":null,"internal":false,"reflection":false,"clicks":"7","user_id":461},{"url":"https://github.com/discourse/discourse/blob/master/config/locales/client.nl.yml","title":null,"fancy_title":null,"internal":false,"reflection":false,"clicks":"5","user_id":461},{"url":"http://tr8n.github.com/","title":null,"fancy_title":null,"internal":false,"reflection":false,"clicks":"5","user_id":212},{"url":"https://github.com/discourse/discourse/commit/c5761eae8afe37e20cec0d0f9d14b85b6e585bda","title":null,"fancy_title":null,"internal":false,"reflection":false,"clicks":"5","user_id":212},{"url":"http://www.getlocalization.com/","title":null,"fancy_title":null,"internal":false,"reflection":false,"clicks":"5","user_id":22},{"url":"http://blog.discourse.org/2013/04/discourse-as-your-first-rails-app/","title":null,"fancy_title":null,"internal":false,"reflection":false,"clicks":"4","user_id":1995},{"url":"http://translate.sourceforge.net/wiki/virtaal/index","title":null,"fancy_title":null,"internal":false,"reflection":false,"clicks":"4","user_id":1979},{"url":"https://poeditor.com/","title":null,"fancy_title":null,"internal":false,"reflection":false,"clicks":"4","user_id":1979},{"url":"http://www.madanalogy.com/2012/06/rails-i18n-translations-in-yaml.html","title":null,"fancy_title":null,"internal":false,"reflection":false,"clicks":"3","user_id":3190},{"url":"http://meta.discourse.org/t/translation-workflow/6102/6","title":"Translation workflow","fancy_title":null,"internal":true,"reflection":false,"clicks":"3","user_id":1995},{"url":"https://github.com/alxndr/discourse/blob/i18n-chinese/config/locales/server.zh.yml","title":null,"fancy_title":null,"internal":false,"reflection":false,"clicks":"3","user_id":212},{"url":"http://www.slideshare.net/HeatherRivers/linguistic-potluck-crowdsourcing-localization-with-rails","title":null,"fancy_title":null,"internal":false,"reflection":false,"clicks":"2","user_id":212},{"url":"http://www.youtube.com/watch?v=MqqdzJ98q7s","title":null,"fancy_title":null,"internal":false,"reflection":false,"clicks":"2","user_id":212},{"url":"http://en.wikipedia.org/wiki/T%E2%80%93V_distinction","title":null,"fancy_title":null,"internal":false,"reflection":false,"clicks":"2","user_id":3620},{"url":"http://pootle.locamotion.org/","title":null,"fancy_title":null,"internal":false,"reflection":false,"clicks":"2","user_id":3190},{"url":"http://en.lichess.org/@/Hellball","title":null,"fancy_title":null,"internal":false,"reflection":false,"clicks":"2","user_id":1979},{"url":"http://sugarjs.com/dates#date_locales","title":null,"fancy_title":null,"internal":false,"reflection":false,"clicks":"1","user_id":461},{"url":"http://meta.discourse.org/t/comrades-lets-join-our-efforts-on-ukrainian-and-russian-translations/4403/5","title":"Comrades let's join our efforts on ukrainian and russian translations","fancy_title":null,"internal":true,"reflection":true,"clicks":"1","user_id":3417},{"url":"https://github.com/discourse/discourse/blob/master/app/assets/javascripts/locales/date_locales.js","title":null,"fancy_title":null,"internal":false,"reflection":false,"clicks":"1","user_id":461},{"url":"http://meta.discourse.org/t/changing-language-phrase-does-not-affect-on-the-site/8429/3","title":"Changing language phrase does not affect on the site?","fancy_title":null,"internal":true,"reflection":true,"clicks":"0","user_id":6122},{"url":"http://meta.discourse.org/t/solving-xda-developer-style-forums/4368/4","title":"Solving XDA-Developer style forums","fancy_title":null,"internal":true,"reflection":true,"clicks":"0","user_id":639},{"url":"http://meta.discourse.org/t/translation-workflow/6102","title":"Translation workflow","fancy_title":null,"internal":true,"reflection":true,"clicks":"0","user_id":4702},{"url":"http://meta.discourse.org/t/bookmark-last-read-sometimes-doesn-t-go-to-the-end-of-a-topic/4825/9","title":"Bookmark/last read sometimes doesn't go to the end of a topic","fancy_title":null,"internal":true,"reflection":true,"clicks":"0","user_id":3681},{"url":"http://meta.discourse.org/t/suggestion-translation-on-admin-panel/6923/5","title":"Suggestion: Translation on admin panel","fancy_title":null,"internal":true,"reflection":true,"clicks":"0","user_id":1},{"url":"http://meta.discourse.org/t/roadplan-for-discourse/2939/5","title":"Roadplan for Discourse","fancy_title":null,"internal":true,"reflection":true,"clicks":"0","user_id":32},{"url":"http://meta.discourse.org/t/internationalization-i18n-provided-for-discourse/2073/2","title":"Internationalization I18n provided for discourse ?","fancy_title":null,"internal":true,"reflection":true,"clicks":"0","user_id":114},{"url":"http://meta.discourse.org/t/language-mirrors/2378/2","title":"Language mirrors","fancy_title":null,"internal":true,"reflection":true,"clicks":"0","user_id":32},{"url":"http://meta.discourse.org/t/hi-support-chinese/4393/6","title":"Hi, support Chinese?","fancy_title":null,"internal":true,"reflection":true,"clicks":"0","user_id":2014},{"url":"http://meta.discourse.org/t/roadplan-for-discourse/2939/3","title":"Roadplan for Discourse","fancy_title":null,"internal":true,"reflection":true,"clicks":"0","user_id":2540},{"url":"http://meta.discourse.org/t/missing-user-value-in-chinese-localized-page/7406/6","title":"[missing {{user}} value] in Chinese localized page","fancy_title":null,"internal":true,"reflection":true,"clicks":"0","user_id":1},{"url":"http://meta.discourse.org/t/github-onebox-rendering-issue/7616","title":"GitHub OneBox Rendering Issue","fancy_title":null,"internal":true,"reflection":true,"clicks":"0","user_id":5372},{"url":"http://guides.rubyonrails.org/i18n.html#the-public-i18n-api","title":null,"fancy_title":null,"internal":false,"reflection":false,"clicks":"0","user_id":1895},{"url":"http://meta.discourse.org/t/translation-tools-transifex-localeapp/7763","title":"Translation Tools: Transifex? Localeapp?","fancy_title":null,"internal":true,"reflection":true,"clicks":"0","user_id":2},{"url":"http://meta.discourse.org/t/what-i-love-about-wordpress-plugins/5697","title":"What I love about WordPress plugins","fancy_title":null,"internal":true,"reflection":true,"clicks":"0","user_id":1}]},"highest_post_number":98,"deleted_by":null,"id":280,"title":"Internationalization / localization","fancy_title":"Internationalization / localization","posts_count":97,"created_at":"2013-02-05T16:29:00.000-05:00","views":3500,"reply_count":66,"participant_count":34,"like_count":128,"last_posted_at":"2013-10-13T13:30:47.000-04:00","visible":true,"closed":false,"archived":false,"has_summary":true,"archetype":"regular","slug":"internationalization-localization","category_id":2,"word_count":5576,"deleted_at":null}}; +export default {"/t/280.json": {"post_stream":{"posts":[{"id":398,"name":"Uwe Keim","username":"uwe_keim","avatar_template":"/user_avatar/meta.discourse.org/uwe_keim/{size}/5697.png","uploaded_avatar_id":5697,"created_at":"2013-02-05T21:29:00.280Z","cooked":"

Any plans to support localization of UI elements, so that I (for example) could set up a completely German speaking forum?

","post_number":1,"post_type":1,"updated_at":"2013-02-05T21:29:00.280Z","like_count":0,"reply_count":1,"reply_to_post_number":null,"quote_count":0,"avg_time":25,"incoming_link_count":314,"reads":475,"score":1702.25,"yours":false,"topic_id":280,"topic_slug":"internationalization-localization","display_username":"Uwe Keim","primary_group_name":null,"version":2,"can_edit":true,"can_delete":false,"can_recover":true,"link_counts":[{"url":"https://meta.discourse.org/t/language-mirrors/2378/2","internal":true,"reflection":true,"title":"Language mirrors","clicks":3},{"url":"https://meta.discourse.org/t/translation-workflow/6102","internal":true,"reflection":true,"title":"Translation workflow","clicks":2},{"url":"https://meta.discourse.org/t/solving-xda-developer-style-forums/4368/4","internal":true,"reflection":true,"title":"Solving XDA-Developer style forums","clicks":2},{"url":"https://meta.discourse.org/t/comrades-lets-join-our-efforts-on-ukrainian-and-russian-translations/4403/5","internal":true,"reflection":true,"title":"Comrades let's join our efforts on ukrainian and russian translations","clicks":1},{"url":"https://meta.discourse.org/t/bookmark-last-read-sometimes-doesn-t-go-to-the-end-of-a-topic/4825/9","internal":true,"reflection":true,"title":"Bookmark/last read sometimes doesn't go to the end of a topic","clicks":0},{"url":"https://meta.discourse.org/t/roadplan-for-discourse/2939/5","internal":true,"reflection":true,"title":"Roadplan for Discourse 2013","clicks":0}],"read":true,"user_title":null,"actions_summary":[{"id":2,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":3,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":4,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":5,"count":0,"hidden":true,"can_act":true,"can_defer_flags":false},{"id":6,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":7,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":8,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false}],"moderator":false,"admin":false,"staff":false,"user_id":255,"hidden":false,"hidden_reason_id":null,"trust_level":2,"deleted_at":null,"user_deleted":false,"edit_reason":null,"can_view_edit_history":true,"wiki":false},{"id":419,"name":"Tim Stone","username":"tms","avatar_template":"/user_avatar/meta.discourse.org/tms/{size}/40181.png","uploaded_avatar_id":40181,"created_at":"2013-02-05T21:32:47.649Z","cooked":"

The application strings are externalized, so localization should be entirely possible with enough translation effort.

","post_number":2,"post_type":1,"updated_at":"2013-02-06T10:15:27.965Z","like_count":4,"reply_count":0,"reply_to_post_number":null,"quote_count":0,"avg_time":27,"incoming_link_count":16,"reads":460,"score":308.35,"yours":false,"topic_id":280,"topic_slug":"internationalization-localization","display_username":"Tim Stone","primary_group_name":null,"version":2,"can_edit":true,"can_delete":true,"can_recover":true,"link_counts":[{"url":"https://github.com/discourse/discourse/blob/master/config/locales/en.yml","internal":false,"reflection":false,"clicks":118}],"read":true,"user_title":"Great contributor","actions_summary":[{"id":2,"count":4,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":3,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":4,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":5,"count":0,"hidden":true,"can_act":true,"can_defer_flags":false},{"id":6,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":7,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":8,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false}],"moderator":false,"admin":false,"staff":false,"user_id":9,"hidden":false,"hidden_reason_id":null,"trust_level":2,"deleted_at":null,"user_deleted":false,"edit_reason":null,"can_view_edit_history":true,"wiki":false},{"id":1060,"name":"Jeff Atwood","username":"codinghorror","avatar_template":"/user_avatar/meta.discourse.org/codinghorror/{size}/5297.png","uploaded_avatar_id":5297,"created_at":"2013-02-06T02:26:24.922Z","cooked":"

Yep, all strings are going through a lookup table.*

\n\n

master/config/locales

\n\n

So you could replace that lookup table with the \"de\" one to get German.

\n\n

* we didn't get all the strings into the lookup table for launch, but the vast, vast majority of them are and the ones that are not, we will fix as we go!

","post_number":3,"post_type":1,"updated_at":"2014-02-24T05:23:39.211Z","like_count":4,"reply_count":3,"reply_to_post_number":null,"quote_count":0,"avg_time":33,"incoming_link_count":5,"reads":449,"score":191.45,"yours":false,"topic_id":280,"topic_slug":"internationalization-localization","display_username":"Jeff Atwood","primary_group_name":"discourse","version":4,"can_edit":true,"can_delete":true,"can_recover":true,"link_counts":[{"url":"https://github.com/discourse/discourse/blob/master/config/locales","internal":false,"reflection":false,"title":"discourse/config/locales at master · discourse/discourse · GitHub","clicks":62},{"url":"https://meta.discourse.org/t/github-onebox-rendering-issue/7616","internal":true,"reflection":true,"title":"GitHub OneBox Rendering Issue","clicks":0}],"read":true,"user_title":"co-founder","actions_summary":[{"id":2,"count":4,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":3,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":4,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":5,"count":0,"hidden":true,"can_act":true,"can_defer_flags":false},{"id":6,"count":1,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":7,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":8,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false}],"moderator":true,"admin":true,"staff":true,"user_id":32,"hidden":false,"hidden_reason_id":null,"trust_level":3,"deleted_at":null,"user_deleted":false,"edit_reason":"","can_view_edit_history":true,"wiki":false},{"id":3623,"name":"Shade","username":"shade","avatar_template":"/user_avatar/meta.discourse.org/shade/{size}/8306.png","uploaded_avatar_id":8306,"created_at":"2013-02-07T12:55:33.129Z","cooked":"

Is it a coincidence that the strings file is 1337 lines long? \"smiley\"

","post_number":4,"post_type":1,"updated_at":"2013-02-07T12:55:33.129Z","like_count":7,"reply_count":0,"reply_to_post_number":null,"quote_count":0,"avg_time":20,"incoming_link_count":15,"reads":401,"score":291.2,"yours":false,"topic_id":280,"topic_slug":"internationalization-localization","display_username":"Shade","primary_group_name":null,"version":1,"can_edit":true,"can_delete":true,"can_recover":true,"link_counts":[{"url":"https://meta.discourse.org/t/hi-support-chinese/4393/6","internal":true,"reflection":true,"title":"Hi, support Chinese?","clicks":0}],"read":true,"user_title":null,"actions_summary":[{"id":2,"count":7,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":3,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":4,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":5,"count":0,"hidden":true,"can_act":true,"can_defer_flags":false},{"id":6,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":7,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":8,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false}],"moderator":false,"admin":false,"staff":false,"user_id":1808,"hidden":false,"hidden_reason_id":null,"trust_level":1,"deleted_at":null,"user_deleted":false,"edit_reason":null,"can_view_edit_history":true,"wiki":false},{"id":3651,"name":"Pekka Gaiser","username":"pekka","avatar_template":"/user_avatar/meta.discourse.org/pekka/{size}/5253.png","uploaded_avatar_id":5253,"created_at":"2013-02-07T14:02:07.869Z","cooked":"

\n\n

The problem I see here is that this file is likely two grow and change massively over the next couple months, and tracking these changes in order to keep a localized file up to date is going to be a bitch.

\n\n

I wonder where there is a tool that can compare two yml structures and point out which nodes are missing? That would help keep track of new strings.

\n\n

Re keeping track of changed strings, @codinghorror I found this very interesting: http://stackoverflow.com/questions/4232922/why-do-people-use-plain-english-as-translation-placeholders if plain English placeholders were used, any change in strings would lead to a new node in the yml file, making keeping the translation up to date easier. Maybe worth thinking about in the future.

","post_number":5,"post_type":1,"updated_at":"2013-02-07T14:05:42.328Z","like_count":2,"reply_count":2,"reply_to_post_number":3,"quote_count":1,"avg_time":22,"incoming_link_count":10,"reads":386,"score":213.3,"yours":false,"topic_id":280,"topic_slug":"internationalization-localization","display_username":"Pekka Gaiser","primary_group_name":null,"version":1,"can_edit":true,"can_delete":true,"can_recover":true,"link_counts":[{"url":"http://stackoverflow.com/questions/4232922/why-do-people-use-plain-english-as-translation-placeholders","internal":false,"reflection":false,"title":"internationalization - Why do people use plain english as translation placeholders? - Stack Overflow","clicks":63}],"read":true,"user_title":null,"actions_summary":[{"id":2,"count":2,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":3,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":4,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":5,"count":0,"hidden":true,"can_act":true,"can_defer_flags":false},{"id":6,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":7,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":8,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false}],"moderator":false,"admin":false,"staff":false,"user_id":7,"hidden":false,"hidden_reason_id":null,"trust_level":2,"deleted_at":null,"user_deleted":false,"edit_reason":null,"can_view_edit_history":true,"wiki":false},{"id":3654,"name":"Sam Saffron","username":"sam","avatar_template":"/user_avatar/meta.discourse.org/sam/{size}/5243.png","uploaded_avatar_id":5243,"created_at":"2013-02-07T14:05:39.910Z","cooked":"

Yes, I really like the concept of fuzzy matching for localization, perhaps you can chase up alex sexton he was meaning to upload a localization tool for this kind of stuff.

\n\n

Also, I am a big fan of ICU message format, but it is not the \"Rails way (tm)\".

","post_number":6,"post_type":1,"updated_at":"2013-02-07T14:05:39.910Z","like_count":1,"reply_count":1,"reply_to_post_number":5,"quote_count":0,"avg_time":17,"incoming_link_count":4,"reads":329,"score":106.65,"yours":false,"topic_id":280,"topic_slug":"internationalization-localization","display_username":"Sam Saffron","primary_group_name":"discourse","version":1,"can_edit":true,"can_delete":true,"can_recover":true,"link_counts":[{"url":"https://github.com/SlexAxton/messageformat.js","internal":false,"reflection":false,"title":"SlexAxton/messageformat.js · GitHub","clicks":46},{"url":"https://github.com/SlexAxton","internal":false,"reflection":false,"title":"SlexAxton (Alex Sexton) · GitHub","clicks":10}],"read":true,"user_title":"co-founder","reply_to_user":{"username":"pekka","avatar_template":"/user_avatar/meta.discourse.org/pekka/{size}/5253.png","uploaded_avatar_id":5253},"actions_summary":[{"id":2,"count":1,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":3,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":4,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":5,"count":0,"hidden":true,"can_act":true,"can_defer_flags":false},{"id":6,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":7,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":8,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false}],"moderator":true,"admin":true,"staff":true,"user_id":1,"hidden":false,"hidden_reason_id":null,"trust_level":4,"deleted_at":null,"user_deleted":false,"edit_reason":null,"can_view_edit_history":true,"wiki":false},{"id":3655,"name":"Pekka Gaiser","username":"pekka","avatar_template":"/user_avatar/meta.discourse.org/pekka/{size}/5253.png","uploaded_avatar_id":5253,"created_at":"2013-02-07T14:08:17.493Z","cooked":"

Looks interesting, I'll take a peek.

\n\n

As said on dev, the best tool I can see in terms of giving translators a proper interface and quality control would be something like GlotPress. It's based on the PO messages format (is that somehow related to ICU?) but looks pretty great.

\n\n

\n\n

I'm not familiar with the term in this context, you mean keeping the English version in the code base (instead of a generic code like message_error_nametooshort ?)

","post_number":7,"post_type":1,"updated_at":"2013-02-07T14:12:02.965Z","like_count":1,"reply_count":1,"reply_to_post_number":6,"quote_count":1,"avg_time":16,"incoming_link_count":0,"reads":326,"score":86.0,"yours":false,"topic_id":280,"topic_slug":"internationalization-localization","display_username":"Pekka Gaiser","primary_group_name":null,"version":1,"can_edit":true,"can_delete":true,"can_recover":true,"link_counts":[{"url":"http://translate.wordpress.org/projects/bbpress/dev","internal":false,"reflection":false,"title":"WordPress › Development < GlotPress","clicks":16}],"read":true,"user_title":null,"actions_summary":[{"id":2,"count":1,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":3,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":4,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":5,"count":0,"hidden":true,"can_act":true,"can_defer_flags":false},{"id":6,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":7,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":8,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false}],"moderator":false,"admin":false,"staff":false,"user_id":7,"hidden":false,"hidden_reason_id":null,"trust_level":2,"deleted_at":null,"user_deleted":false,"edit_reason":null,"can_view_edit_history":true,"wiki":false},{"id":3658,"name":"Sam Saffron","username":"sam","avatar_template":"/user_avatar/meta.discourse.org/sam/{size}/5243.png","uploaded_avatar_id":5243,"created_at":"2013-02-07T14:12:22.582Z","cooked":"

ICU Message format is basically Gettext on steroids, Gettext has been around for so many years and actually works pretty well, being super prevalent in Linux.

\n\n

Trouble is you need a fuzzy matcher for translators if you are going to store stuff like mf.compile( 'This is a message.' ) in source, one letter change and all your translators need to validate it.

","post_number":8,"post_type":1,"updated_at":"2013-02-07T14:12:22.582Z","like_count":1,"reply_count":1,"reply_to_post_number":7,"quote_count":0,"avg_time":11,"incoming_link_count":2,"reads":296,"score":89.75,"yours":false,"topic_id":280,"topic_slug":"internationalization-localization","display_username":"Sam Saffron","primary_group_name":"discourse","version":1,"can_edit":true,"can_delete":true,"can_recover":true,"link_counts":[{"url":"https://meta.discourse.org/t/what-i-love-about-wordpress-plugins/5697","internal":true,"reflection":true,"title":"What I love about WordPress plugins","clicks":0}],"read":true,"user_title":"co-founder","reply_to_user":{"username":"pekka","avatar_template":"/user_avatar/meta.discourse.org/pekka/{size}/5253.png","uploaded_avatar_id":5253},"actions_summary":[{"id":2,"count":1,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":3,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":4,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":5,"count":0,"hidden":true,"can_act":true,"can_defer_flags":false},{"id":6,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":7,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":8,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false}],"moderator":true,"admin":true,"staff":true,"user_id":1,"hidden":false,"hidden_reason_id":null,"trust_level":4,"deleted_at":null,"user_deleted":false,"edit_reason":null,"can_view_edit_history":true,"wiki":false},{"id":3660,"name":"Pekka Gaiser","username":"pekka","avatar_template":"/user_avatar/meta.discourse.org/pekka/{size}/5253.png","uploaded_avatar_id":5253,"created_at":"2013-02-07T14:14:12.666Z","cooked":"

\n\n

Yeah, that's why I've always been a friend of message_error_nametooshort placeholders, until I asked the SO question linked above. The accepted answer makes a good argument against those placeholders: you want translations to break even on small changes in the English original because the translations will probably need to reflect the change, too. Maybe that's not the case right now as new stuff is being checked in pretty much every couple of hours, but in the long run, it'll be overwhelmingly true.

","post_number":9,"post_type":1,"updated_at":"2013-02-07T14:18:09.569Z","like_count":1,"reply_count":1,"reply_to_post_number":8,"quote_count":1,"avg_time":10,"incoming_link_count":0,"reads":293,"score":79.1,"yours":false,"topic_id":280,"topic_slug":"internationalization-localization","display_username":"Pekka Gaiser","primary_group_name":null,"version":1,"can_edit":true,"can_delete":true,"can_recover":true,"read":true,"user_title":null,"actions_summary":[{"id":2,"count":1,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":3,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":4,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":5,"count":0,"hidden":true,"can_act":true,"can_defer_flags":false},{"id":6,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":7,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":8,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false}],"moderator":false,"admin":false,"staff":false,"user_id":7,"hidden":false,"hidden_reason_id":null,"trust_level":2,"deleted_at":null,"user_deleted":false,"edit_reason":null,"can_view_edit_history":true,"wiki":false},{"id":3667,"name":"Tim Stone","username":"tms","avatar_template":"/user_avatar/meta.discourse.org/tms/{size}/40181.png","uploaded_avatar_id":40181,"created_at":"2013-02-07T14:25:16.859Z","cooked":"

Hmm...You could theoretically also build something into the development process that would monitor changes to the English locale file and make a translator-friendly list of changes between versions.

","post_number":10,"post_type":1,"updated_at":"2013-02-07T14:25:16.859Z","like_count":1,"reply_count":1,"reply_to_post_number":9,"quote_count":0,"avg_time":7,"incoming_link_count":0,"reads":275,"score":75.35,"yours":false,"topic_id":280,"topic_slug":"internationalization-localization","display_username":"Tim Stone","primary_group_name":null,"version":1,"can_edit":true,"can_delete":true,"can_recover":true,"read":true,"user_title":"Great contributor","reply_to_user":{"username":"pekka","avatar_template":"/user_avatar/meta.discourse.org/pekka/{size}/5253.png","uploaded_avatar_id":5253},"actions_summary":[{"id":2,"count":1,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":3,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":4,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":5,"count":0,"hidden":true,"can_act":true,"can_defer_flags":false},{"id":6,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":7,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":8,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false}],"moderator":false,"admin":false,"staff":false,"user_id":9,"hidden":false,"hidden_reason_id":null,"trust_level":2,"deleted_at":null,"user_deleted":false,"edit_reason":null,"can_view_edit_history":true,"wiki":false},{"id":3673,"name":"Sam Saffron","username":"sam","avatar_template":"/user_avatar/meta.discourse.org/sam/{size}/5243.png","uploaded_avatar_id":5243,"created_at":"2013-02-07T14:30:21.401Z","cooked":"

Yeah, totally, also we could build tools for dev that make introducing string less annoying and make it possible to garbage collect old unused strings, I hate trudging through that file.

","post_number":11,"post_type":1,"updated_at":"2013-02-07T14:30:21.401Z","like_count":1,"reply_count":1,"reply_to_post_number":10,"quote_count":0,"avg_time":7,"incoming_link_count":1,"reads":273,"score":79.95,"yours":false,"topic_id":280,"topic_slug":"internationalization-localization","display_username":"Sam Saffron","primary_group_name":"discourse","version":1,"can_edit":true,"can_delete":true,"can_recover":true,"read":true,"user_title":"co-founder","reply_to_user":{"username":"tms","avatar_template":"/user_avatar/meta.discourse.org/tms/{size}/40181.png","uploaded_avatar_id":40181},"actions_summary":[{"id":2,"count":1,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":3,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":4,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":5,"count":0,"hidden":true,"can_act":true,"can_defer_flags":false},{"id":6,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":7,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":8,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false}],"moderator":true,"admin":true,"staff":true,"user_id":1,"hidden":false,"hidden_reason_id":null,"trust_level":4,"deleted_at":null,"user_deleted":false,"edit_reason":null,"can_view_edit_history":true,"wiki":false},{"id":3675,"name":"Pekka Gaiser","username":"pekka","avatar_template":"/user_avatar/meta.discourse.org/pekka/{size}/5253.png","uploaded_avatar_id":5253,"created_at":"2013-02-07T14:33:38.280Z","cooked":"

\n\n

As said, I'd look into whether WP's tools can't be reused for this with some tweaking. They seem to be able to scan a code base for new strings, and make them available automatically to translators.

\n\n

They're PHP based which isn't ideal, but it looks like they've done a crapload of work to take the hassle out of translations.

","post_number":12,"post_type":1,"updated_at":"2013-02-07T14:34:39.910Z","like_count":1,"reply_count":1,"reply_to_post_number":11,"quote_count":1,"avg_time":7,"incoming_link_count":2,"reads":273,"score":84.95,"yours":false,"topic_id":280,"topic_slug":"internationalization-localization","display_username":"Pekka Gaiser","primary_group_name":null,"version":1,"can_edit":true,"can_delete":true,"can_recover":true,"read":true,"user_title":null,"actions_summary":[{"id":2,"count":1,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":3,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":4,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":5,"count":0,"hidden":true,"can_act":true,"can_defer_flags":false},{"id":6,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":7,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":8,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false}],"moderator":false,"admin":false,"staff":false,"user_id":7,"hidden":false,"hidden_reason_id":null,"trust_level":2,"deleted_at":null,"user_deleted":false,"edit_reason":null,"can_view_edit_history":true,"wiki":false},{"id":3690,"name":"Valts","username":"Vilx","avatar_template":"/user_avatar/meta.discourse.org/vilx/{size}/7299.png","uploaded_avatar_id":7299,"created_at":"2013-02-07T15:05:35.867Z","cooked":"

This site looks so nice with all the little tweaks like \"10 minutes ago\" instead of simply time, etc - I wonder if there will also be support for proper pluralization in other languages? That's a pretty hard task though, I don't think I've ever seen a website that has done that. But it would be awesome.

","post_number":13,"post_type":1,"updated_at":"2013-02-07T15:05:35.867Z","like_count":3,"reply_count":0,"reply_to_post_number":null,"quote_count":0,"avg_time":7,"incoming_link_count":11,"reads":290,"score":158.35,"yours":false,"topic_id":280,"topic_slug":"internationalization-localization","display_username":"Valts","primary_group_name":null,"version":1,"can_edit":true,"can_delete":true,"can_recover":true,"read":true,"user_title":null,"actions_summary":[{"id":2,"count":3,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":3,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":4,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":5,"count":0,"hidden":true,"can_act":true,"can_defer_flags":false},{"id":6,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":7,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":8,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false}],"moderator":false,"admin":false,"staff":false,"user_id":1216,"hidden":false,"hidden_reason_id":null,"trust_level":2,"deleted_at":null,"user_deleted":false,"edit_reason":null,"can_view_edit_history":true,"wiki":false},{"id":3925,"name":"Eric Kidd","username":"emk","avatar_template":"/user_avatar/meta.discourse.org/emk/{size}/8400.png","uploaded_avatar_id":8400,"created_at":"2013-02-07T19:37:06.194Z","cooked":"

\n\n

I've had pretty decent luck using Localeapp to localize Rails applications:

\n\n

http://www.localeapp.com/

\n\n

The developer workflow took me about an hour to really get used to, and there were a few minor glitches. But the non-technical translators had very few problems. One limitation: It insists on rewriting all those yaml files full of strings.

\n\n

Anyway, it's worth a look, and it's free for open source, if I recall correctly. Certainly easier than doing a whole bunch of toolsmithing from scratch.

","post_number":14,"post_type":1,"updated_at":"2013-02-07T19:37:06.194Z","like_count":3,"reply_count":1,"reply_to_post_number":12,"quote_count":1,"avg_time":9,"incoming_link_count":0,"reads":283,"score":137.05,"yours":false,"topic_id":280,"topic_slug":"internationalization-localization","display_username":"Eric Kidd","primary_group_name":null,"version":1,"can_edit":true,"can_delete":true,"can_recover":true,"link_counts":[{"url":"http://www.localeapp.com/","internal":false,"reflection":false,"title":"Easy localization for Rails apps | Locale","clicks":69}],"read":true,"user_title":null,"actions_summary":[{"id":2,"count":3,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":3,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":4,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":5,"count":0,"hidden":true,"can_act":true,"can_defer_flags":false},{"id":6,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":7,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":8,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false}],"moderator":false,"admin":false,"staff":false,"user_id":1860,"hidden":false,"hidden_reason_id":null,"trust_level":1,"deleted_at":null,"user_deleted":false,"edit_reason":null,"can_view_edit_history":true,"wiki":false},{"id":3938,"name":"Pekka Gaiser","username":"pekka","avatar_template":"/user_avatar/meta.discourse.org/pekka/{size}/5253.png","uploaded_avatar_id":5253,"created_at":"2013-02-07T19:52:13.748Z","cooked":"

\n\n

Ohhh. Looking sexy. droool

","post_number":15,"post_type":1,"updated_at":"2013-02-07T19:52:13.748Z","like_count":1,"reply_count":1,"reply_to_post_number":14,"quote_count":1,"avg_time":7,"incoming_link_count":0,"reads":260,"score":72.35,"yours":false,"topic_id":280,"topic_slug":"internationalization-localization","display_username":"Pekka Gaiser","primary_group_name":null,"version":1,"can_edit":true,"can_delete":true,"can_recover":true,"read":true,"user_title":null,"actions_summary":[{"id":2,"count":1,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":3,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":4,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":5,"count":0,"hidden":true,"can_act":true,"can_defer_flags":false},{"id":6,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":7,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":8,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false}],"moderator":false,"admin":false,"staff":false,"user_id":7,"hidden":false,"hidden_reason_id":null,"trust_level":2,"deleted_at":null,"user_deleted":false,"edit_reason":null,"can_view_edit_history":true,"wiki":false},{"id":3982,"name":"Eric Kidd","username":"emk","avatar_template":"/user_avatar/meta.discourse.org/emk/{size}/8400.png","uploaded_avatar_id":8400,"created_at":"2013-02-07T20:52:22.454Z","cooked":"

\n\n

Yeah, it's pretty. \"smile\" But there were still some rough edges as of a few months ago.

\n\n

Whether or not those rough edges are a deal-breaker will probably depends on whether or not localization is already a source of acute pain. If you're already hurting, Localeapp is a pretty useful tool, especially when it comes to enlisting non-technical translators.

\n\n

But it does require changing how you work with text, and adding one new tool to the mix. So for projects that just don't want to know about non-English languages, it's not yet seamless the way Unicode is these days.

\n\n

(Sweet forum software, by the way. I was just testing out Egyptian hieroglyphics on the test server, because they're well off the Basic Multilingual Plane, and tend to flush Unicode bugs. Everything worked flawlessly.)

","post_number":16,"post_type":1,"updated_at":"2013-02-07T20:52:22.454Z","like_count":1,"reply_count":1,"reply_to_post_number":15,"quote_count":1,"avg_time":7,"incoming_link_count":0,"reads":254,"score":71.15,"yours":false,"topic_id":280,"topic_slug":"internationalization-localization","display_username":"Eric Kidd","primary_group_name":null,"version":1,"can_edit":true,"can_delete":true,"can_recover":true,"read":true,"user_title":null,"actions_summary":[{"id":2,"count":1,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":3,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":4,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":5,"count":0,"hidden":true,"can_act":true,"can_defer_flags":false},{"id":6,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":7,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":8,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false}],"moderator":false,"admin":false,"staff":false,"user_id":1860,"hidden":false,"hidden_reason_id":null,"trust_level":1,"deleted_at":null,"user_deleted":false,"edit_reason":null,"can_view_edit_history":true,"wiki":false},{"id":3989,"name":"Pekka Gaiser","username":"pekka","avatar_template":"/user_avatar/meta.discourse.org/pekka/{size}/5253.png","uploaded_avatar_id":5253,"created_at":"2013-02-07T21:04:15.405Z","cooked":"

\n\n

Interesting, thanks for the insight. I don't think localization is seriously on their table right now, there's likely to be many other things on the table before it... but it will become an issue sooner or later.

","post_number":17,"post_type":1,"updated_at":"2013-02-07T21:04:15.405Z","like_count":1,"reply_count":2,"reply_to_post_number":16,"quote_count":1,"avg_time":7,"incoming_link_count":0,"reads":255,"score":76.35,"yours":false,"topic_id":280,"topic_slug":"internationalization-localization","display_username":"Pekka Gaiser","primary_group_name":null,"version":1,"can_edit":true,"can_delete":true,"can_recover":true,"read":true,"user_title":null,"actions_summary":[{"id":2,"count":1,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":3,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":4,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":5,"count":0,"hidden":true,"can_act":true,"can_defer_flags":false},{"id":6,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":7,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":8,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false}],"moderator":false,"admin":false,"staff":false,"user_id":7,"hidden":false,"hidden_reason_id":null,"trust_level":2,"deleted_at":null,"user_deleted":false,"edit_reason":null,"can_view_edit_history":true,"wiki":false},{"id":3996,"name":"Sam Saffron","username":"sam","avatar_template":"/user_avatar/meta.discourse.org/sam/{size}/5243.png","uploaded_avatar_id":5243,"created_at":"2013-02-07T21:12:06.575Z","cooked":"

I had an idea ... what if in dev mode, you could right-click on a page and get access to all the translations on the page, make your edits and have it refreshed live.

\n\n

I think it would be awesome, very doable technically.

","post_number":18,"post_type":1,"updated_at":"2013-02-07T21:12:06.575Z","like_count":7,"reply_count":2,"reply_to_post_number":17,"quote_count":0,"avg_time":8,"incoming_link_count":0,"reads":264,"score":168.2,"yours":false,"topic_id":280,"topic_slug":"internationalization-localization","display_username":"Sam Saffron","primary_group_name":"discourse","version":1,"can_edit":true,"can_delete":true,"can_recover":true,"read":true,"user_title":"co-founder","reply_to_user":{"username":"pekka","avatar_template":"/user_avatar/meta.discourse.org/pekka/{size}/5253.png","uploaded_avatar_id":5253},"actions_summary":[{"id":2,"count":7,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":3,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":4,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":5,"count":0,"hidden":true,"can_act":true,"can_defer_flags":false},{"id":6,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":7,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":8,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false}],"moderator":true,"admin":true,"staff":true,"user_id":1,"hidden":false,"hidden_reason_id":null,"trust_level":4,"deleted_at":null,"user_deleted":false,"edit_reason":null,"can_view_edit_history":true,"wiki":false},{"id":4009,"name":"Pekka Gaiser","username":"pekka","avatar_template":"/user_avatar/meta.discourse.org/pekka/{size}/5253.png","uploaded_avatar_id":5253,"created_at":"2013-02-07T21:18:47.422Z","cooked":"

That would be fricking cool. There'd still be some leftovers (like error messages that normally never show up, etc.) but you could corral those up on a specific page.

\n\n

It could have a dropdown giving you all the languages that you have a .yml for in the locale directory, and write the changes into the one selected. I'm sure people would love it.

","post_number":19,"post_type":1,"updated_at":"2013-02-07T21:22:10.692Z","like_count":1,"reply_count":0,"reply_to_post_number":18,"quote_count":0,"avg_time":8,"incoming_link_count":1,"reads":241,"score":68.6,"yours":false,"topic_id":280,"topic_slug":"internationalization-localization","display_username":"Pekka Gaiser","primary_group_name":null,"version":1,"can_edit":true,"can_delete":true,"can_recover":true,"read":true,"user_title":null,"reply_to_user":{"username":"sam","avatar_template":"/user_avatar/meta.discourse.org/sam/{size}/5243.png","uploaded_avatar_id":5243},"actions_summary":[{"id":2,"count":1,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":3,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":4,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":5,"count":0,"hidden":true,"can_act":true,"can_defer_flags":false},{"id":6,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":7,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":8,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false}],"moderator":false,"admin":false,"staff":false,"user_id":7,"hidden":false,"hidden_reason_id":null,"trust_level":2,"deleted_at":null,"user_deleted":false,"edit_reason":null,"can_view_edit_history":true,"wiki":false},{"id":4012,"name":"Marco Ceppi","username":"marcoceppi","avatar_template":"/user_avatar/meta.discourse.org/marcoceppi/{size}/6552.png","uploaded_avatar_id":6552,"created_at":"2013-02-07T21:22:46.376Z","cooked":"

If you use gettext format you could leverage Launchpad translations and the community behind it.

","post_number":20,"post_type":1,"updated_at":"2013-02-07T21:22:46.376Z","like_count":1,"reply_count":0,"reply_to_post_number":null,"quote_count":0,"avg_time":9,"incoming_link_count":2,"reads":244,"score":74.25,"yours":false,"topic_id":280,"topic_slug":"internationalization-localization","display_username":"Marco Ceppi","primary_group_name":null,"version":1,"can_edit":true,"can_delete":true,"can_recover":true,"link_counts":[{"url":"https://translations.launchpad.net/","internal":false,"reflection":false,"title":"Launchpad Translations","clicks":13}],"read":true,"user_title":null,"actions_summary":[{"id":2,"count":1,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":3,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":4,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":5,"count":0,"hidden":true,"can_act":true,"can_defer_flags":false},{"id":6,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":7,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":8,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false}],"moderator":false,"admin":false,"staff":false,"user_id":761,"hidden":false,"hidden_reason_id":null,"trust_level":2,"deleted_at":null,"user_deleted":false,"edit_reason":null,"can_view_edit_history":true,"wiki":false}],"stream":[398,419,1060,3623,3651,3654,3655,3658,3660,3667,3673,3675,3690,3925,3938,3982,3989,3996,4009,4012],"gaps":{"before":{"20706":[20125]},"after":{}}},"id":280,"title":"Internationalization / localization","fancy_title":"Internationalization / localization","posts_count":103,"created_at":"2013-02-05T21:29:00.174Z","views":5211,"reply_count":67,"participant_count":40,"like_count":135,"last_posted_at":"2015-03-04T15:07:10.487Z","visible":true,"closed":false,"archived":false,"has_summary":true,"archetype":"regular","slug":"internationalization-localization","category_id":2,"word_count":6198,"deleted_at":null,"draft":null,"draft_key":"topic_280","draft_sequence":4,"posted":true,"unpinned":null,"pinned_globally":false,"pinned":false,"pinned_at":null,"details":{"auto_close_at":null,"auto_close_hours":null,"auto_close_based_on_last_post":false,"created_by":{"id":255,"username":"uwe_keim","uploaded_avatar_id":5697,"avatar_template":"/user_avatar/meta.discourse.org/uwe_keim/{size}/5697.png"},"last_poster":{"id":14091,"username":"Luciano_Fantuzzi","uploaded_avatar_id":39484,"avatar_template":"/user_avatar/meta.discourse.org/luciano_fantuzzi/{size}/39484.png"},"participants":[{"id":212,"username":"alxndr","uploaded_avatar_id":5619,"avatar_template":"/user_avatar/meta.discourse.org/alxndr/{size}/5619.png","post_count":11},{"id":1,"username":"sam","uploaded_avatar_id":5243,"avatar_template":"/user_avatar/meta.discourse.org/sam/{size}/5243.png","post_count":11},{"id":7,"username":"pekka","uploaded_avatar_id":5253,"avatar_template":"/user_avatar/meta.discourse.org/pekka/{size}/5253.png","post_count":8},{"id":461,"username":"kuba","uploaded_avatar_id":6049,"avatar_template":"/user_avatar/meta.discourse.org/kuba/{size}/6049.png","post_count":7},{"id":2995,"username":"tattoo","uploaded_avatar_id":null,"avatar_template":"/letter_avatar/tattoo/{size}/3.png","post_count":6},{"id":2540,"username":"jgourdon","uploaded_avatar_id":9537,"avatar_template":"/user_avatar/meta.discourse.org/jgourdon/{size}/9537.png","post_count":5},{"id":1860,"username":"emk","uploaded_avatar_id":8400,"avatar_template":"/user_avatar/meta.discourse.org/emk/{size}/8400.png","post_count":4},{"id":1275,"username":"dacap","uploaded_avatar_id":7401,"avatar_template":"/user_avatar/meta.discourse.org/dacap/{size}/7401.png","post_count":4},{"id":19,"username":"eviltrout","uploaded_avatar_id":5275,"avatar_template":"/user_avatar/meta.discourse.org/eviltrout/{size}/5275.png","post_count":4},{"id":3704,"username":"mojzis","uploaded_avatar_id":31201,"avatar_template":"/user_avatar/meta.discourse.org/mojzis/{size}/31201.png","post_count":3},{"id":3190,"username":"gururea","uploaded_avatar_id":10663,"avatar_template":"/user_avatar/meta.discourse.org/gururea/{size}/10663.png","post_count":3},{"id":1895,"username":"maciek","uploaded_avatar_id":8463,"avatar_template":"/user_avatar/meta.discourse.org/maciek/{size}/8463.png","post_count":3},{"id":22,"username":"splattne","uploaded_avatar_id":5280,"avatar_template":"/user_avatar/meta.discourse.org/splattne/{size}/5280.png","post_count":2},{"id":1979,"username":"Superuser","uploaded_avatar_id":8604,"avatar_template":"/user_avatar/meta.discourse.org/superuser/{size}/8604.png","post_count":2},{"id":3818,"username":"Tudor","uploaded_avatar_id":11675,"avatar_template":"/user_avatar/meta.discourse.org/tudor/{size}/11675.png","post_count":2},{"id":32,"username":"codinghorror","uploaded_avatar_id":5297,"avatar_template":"/user_avatar/meta.discourse.org/codinghorror/{size}/5297.png","post_count":2},{"id":3620,"username":"potthast","uploaded_avatar_id":11363,"avatar_template":"/user_avatar/meta.discourse.org/potthast/{size}/11363.png","post_count":2},{"id":9,"username":"tms","uploaded_avatar_id":40181,"avatar_template":"/user_avatar/meta.discourse.org/tms/{size}/40181.png","post_count":2},{"id":14091,"username":"Luciano_Fantuzzi","uploaded_avatar_id":39484,"avatar_template":"/user_avatar/meta.discourse.org/luciano_fantuzzi/{size}/39484.png","post_count":1},{"id":255,"username":"uwe_keim","uploaded_avatar_id":5697,"avatar_template":"/user_avatar/meta.discourse.org/uwe_keim/{size}/5697.png","post_count":1},{"id":9006,"username":"berk","uploaded_avatar_id":19348,"avatar_template":"/user_avatar/meta.discourse.org/berk/{size}/19348.png","post_count":1},{"id":754,"username":"danneu","uploaded_avatar_id":6540,"avatar_template":"/user_avatar/meta.discourse.org/danneu/{size}/6540.png","post_count":1},{"id":761,"username":"marcoceppi","uploaded_avatar_id":6552,"avatar_template":"/user_avatar/meta.discourse.org/marcoceppi/{size}/6552.png","post_count":1},{"id":2753,"username":"mikl","uploaded_avatar_id":9918,"avatar_template":"/user_avatar/meta.discourse.org/mikl/{size}/9918.png","post_count":1}],"suggested_topics":[{"id":27331,"title":"Polls are still very buggy","fancy_title":"Polls are still very buggy","slug":"polls-are-still-very-buggy","posts_count":4,"reply_count":1,"highest_post_number":4,"image_url":"/uploads/default/_optimized/cd1/b8c/c162528887_690x401.png","created_at":"2015-04-08T09:51:00.357Z","last_posted_at":"2015-04-08T15:59:16.258Z","bumped":true,"bumped_at":"2015-04-08T16:05:09.842Z","unseen":false,"last_read_post_number":3,"unread":0,"new_posts":1,"pinned":false,"unpinned":null,"visible":true,"closed":false,"archived":false,"notification_level":2,"bookmarked":false,"liked":false,"archetype":"regular","like_count":11,"views":55,"category_id":1},{"id":27343,"title":"Mobile theme doesn't show last activity time for topics on category page","fancy_title":"Mobile theme doesn’t show last activity time for topics on category page","slug":"mobile-theme-doesnt-show-last-activity-time-for-topics-on-category-page","posts_count":4,"reply_count":2,"highest_post_number":4,"image_url":"/uploads/default/_optimized/13e/25c/bd30b466be_281x500.png","created_at":"2015-04-08T14:20:51.177Z","last_posted_at":"2015-04-08T15:40:30.037Z","bumped":true,"bumped_at":"2015-04-08T15:40:30.037Z","unseen":false,"last_read_post_number":2,"unread":0,"new_posts":2,"pinned":false,"unpinned":null,"visible":true,"closed":false,"archived":false,"notification_level":2,"bookmarked":false,"liked":false,"archetype":"regular","like_count":3,"views":23,"category_id":9},{"id":27346,"title":"Reply+{messagekey}@... optionaly in header \"from\" in addition to \"reply-to\"","fancy_title":"Reply+{messagekey}@… optionaly in header “from” in addition to “reply-to”","slug":"reply-messagekey-optionaly-in-header-from-in-addition-to-reply-to","posts_count":1,"reply_count":0,"highest_post_number":1,"image_url":null,"created_at":"2015-04-08T16:05:13.103Z","last_posted_at":"2015-04-08T16:05:13.415Z","bumped":true,"bumped_at":"2015-04-08T16:05:13.415Z","unseen":true,"pinned":false,"unpinned":null,"visible":true,"closed":false,"archived":false,"bookmarked":null,"liked":null,"archetype":"regular","like_count":0,"views":8,"category_id":2},{"id":19670,"title":"Parsing (Oneboxing) IMDB links","fancy_title":"Parsing (Oneboxing) IMDB links","slug":"parsing-oneboxing-imdb-links","posts_count":8,"reply_count":1,"highest_post_number":8,"image_url":null,"created_at":"2014-09-05T07:19:26.161Z","last_posted_at":"2015-04-07T09:21:21.570Z","bumped":true,"bumped_at":"2015-04-07T09:21:21.570Z","unseen":false,"last_read_post_number":8,"unread":0,"new_posts":0,"pinned":false,"unpinned":null,"visible":true,"closed":false,"archived":false,"notification_level":2,"bookmarked":false,"liked":false,"archetype":"regular","like_count":4,"views":253,"category_id":2},{"id":7512,"title":"Support for Piwik Analytics as an alternative to Google Analytics","fancy_title":"Support for Piwik Analytics as an alternative to Google Analytics","slug":"support-for-piwik-analytics-as-an-alternative-to-google-analytics","posts_count":53,"reply_count":41,"highest_post_number":65,"image_url":"/plugins/emoji/images/smile.png","created_at":"2013-06-16T01:32:30.596Z","last_posted_at":"2015-02-22T13:46:26.845Z","bumped":true,"bumped_at":"2015-02-22T13:46:26.845Z","unseen":false,"last_read_post_number":65,"unread":0,"new_posts":0,"pinned":false,"unpinned":null,"visible":true,"closed":false,"archived":false,"notification_level":2,"bookmarked":false,"liked":false,"archetype":"regular","like_count":62,"views":1877,"category_id":2},{"id":25480,"title":"CSS admin-contents reloaded","fancy_title":"CSS admin-contents reloaded","slug":"css-admin-contents-reloaded","posts_count":22,"reply_count":15,"highest_post_number":22,"image_url":null,"created_at":"2015-02-21T12:15:57.707Z","last_posted_at":"2015-03-02T23:24:18.899Z","bumped":true,"bumped_at":"2015-03-02T23:24:18.899Z","unseen":false,"pinned":false,"unpinned":null,"visible":true,"closed":false,"archived":false,"bookmarked":null,"liked":null,"archetype":"regular","like_count":21,"views":185,"category_id":2},{"id":26576,"title":"Badge timestamp should be the time the badge was granted?","fancy_title":"Badge timestamp should be the time the badge was granted?","slug":"badge-timestamp-should-be-the-time-the-badge-was-granted","posts_count":2,"reply_count":0,"highest_post_number":2,"image_url":null,"created_at":"2015-03-20T13:22:08.266Z","last_posted_at":"2015-03-21T00:33:52.243Z","bumped":true,"bumped_at":"2015-03-21T00:33:52.243Z","unseen":false,"last_read_post_number":1,"unread":0,"new_posts":0,"pinned":false,"unpinned":null,"visible":true,"closed":false,"archived":false,"notification_level":1,"bookmarked":false,"liked":false,"archetype":"regular","like_count":9,"views":87,"category_id":2}],"links":[{"url":"https://github.com/discourse/discourse/blob/master/config/locales/en.yml","title":null,"fancy_title":null,"internal":false,"reflection":false,"clicks":118,"user_id":9,"domain":"github.com"},{"url":"http://www.localeapp.com/","title":"Easy localization for Rails apps | Locale","fancy_title":null,"internal":false,"reflection":false,"clicks":69,"user_id":1860,"domain":"www.localeapp.com"},{"url":"http://stackoverflow.com/questions/4232922/why-do-people-use-plain-english-as-translation-placeholders","title":"internationalization - Why do people use plain english as translation placeholders? - Stack Overflow","fancy_title":null,"internal":false,"reflection":false,"clicks":63,"user_id":7,"domain":"stackoverflow.com"},{"url":"https://github.com/discourse/discourse/blob/master/config/locales","title":"discourse/config/locales at master · discourse/discourse · GitHub","fancy_title":null,"internal":false,"reflection":false,"clicks":62,"user_id":32,"domain":"github.com"},{"url":"https://github.com/SlexAxton/messageformat.js","title":"SlexAxton/messageformat.js · GitHub","fancy_title":null,"internal":false,"reflection":false,"clicks":46,"user_id":1,"domain":"github.com"},{"url":"http://www.localeapp.com/projects/1537/translations?utf8=%E2%9C%93&search=source_code","title":"langforums | Locale","fancy_title":null,"internal":false,"reflection":false,"clicks":25,"user_id":1860,"domain":"www.localeapp.com"},{"url":"https://translations.launchpad.net/","title":"Launchpad Translations","fancy_title":null,"internal":false,"reflection":false,"clicks":23,"user_id":761,"domain":"translations.launchpad.net"},{"url":"https://www.transifex.com/","title":"Transifex - Continuous Localization Platform","fancy_title":null,"internal":false,"reflection":false,"clicks":22,"user_id":1979,"domain":"www.transifex.com"},{"url":"https://github.com/berk/tr8n","title":"berk/tr8n · GitHub","fancy_title":null,"internal":false,"reflection":false,"clicks":22,"user_id":1,"domain":"github.com"},{"url":"http://translate.wordpress.org/projects/bbpress/dev","title":"WordPress › Development < GlotPress","fancy_title":null,"internal":false,"reflection":false,"clicks":16,"user_id":7,"domain":"translate.wordpress.org"},{"url":"http://weblate.org","title":"Weblate - web-based translation","fancy_title":null,"internal":false,"reflection":false,"clicks":15,"user_id":2316,"domain":"weblate.org"},{"url":"https://github.com/discourse/discourse/tree/master/config/locales","title":"discourse/config/locales at master · discourse/discourse · GitHub","fancy_title":null,"internal":false,"reflection":false,"clicks":14,"user_id":19,"domain":"github.com"},{"url":"https://github.com/discourse/discourse/pull/493","title":"Danish translation. by mikl · Pull Request #493 · discourse/discourse · GitHub","fancy_title":null,"internal":false,"reflection":false,"clicks":12,"user_id":2753,"domain":"github.com"},{"url":"https://github.com/SlexAxton","title":"SlexAxton (Alex Sexton) · GitHub","fancy_title":null,"internal":false,"reflection":false,"clicks":10,"user_id":1,"domain":"github.com"},{"url":"https://github.com/gururea/discourse/tree/master/config/locales","title":"discourse/config/locales at master · gururea/discourse · GitHub","fancy_title":null,"internal":false,"reflection":false,"clicks":9,"user_id":3190,"domain":"github.com"},{"url":"https://github.com/discourse/discourse/blob/master/config/locales/client.en.yml#L691","title":"discourse/config/locales/client.en.yml at master · discourse/discourse · GitHub","fancy_title":null,"internal":false,"reflection":false,"clicks":7,"user_id":461,"domain":"github.com"},{"url":"https://github.com/dacap/discourse/tree/spanish","title":"dacap/discourse · GitHub","fancy_title":null,"internal":false,"reflection":false,"clicks":7,"user_id":1275,"domain":"github.com"},{"url":"https://github.com/discourse/discourse/blob/master/config/locales/client.nl.yml","title":"discourse/config/locales/client.nl.yml at master · discourse/discourse · GitHub","fancy_title":null,"internal":false,"reflection":false,"clicks":7,"user_id":461,"domain":"github.com"},{"url":"https://github.com/discourse/discourse/commit/c5761eae8afe37e20cec0d0f9d14b85b6e585bda","title":"Support for Simplified Chinese thanks to tangramor · c5761ea · discourse/discourse · GitHub","fancy_title":null,"internal":false,"reflection":false,"clicks":6,"user_id":212,"domain":"github.com"},{"url":"http://tr8n.github.com/","title":"tr8n","fancy_title":null,"internal":false,"reflection":false,"clicks":6,"user_id":212,"domain":"tr8n.github.com"},{"url":"http://www.getlocalization.com/","title":"Crowdsourced, Social and Collaborative App & Website Translation - Get Localization","fancy_title":null,"internal":false,"reflection":false,"clicks":6,"user_id":22,"domain":"www.getlocalization.com"},{"url":"http://blog.discourse.org/2013/04/discourse-as-your-first-rails-app/","title":"Discourse as Your First Rails App","fancy_title":null,"internal":false,"reflection":false,"clicks":5,"user_id":1995,"domain":"blog.discourse.org"},{"url":"https://github.com/alxndr/discourse/blob/i18n-chinese/config/locales/server.zh.yml","title":null,"fancy_title":null,"internal":false,"reflection":false,"clicks":5,"user_id":212,"domain":"github.com"},{"url":"http://translate.sourceforge.net/wiki/virtaal/index","title":"Easy-to-use and powerful offline translation tool | Virtaal","fancy_title":null,"internal":false,"reflection":false,"clicks":4,"user_id":1979,"domain":"translate.sourceforge.net"},{"url":"https://poeditor.com/","title":"POEditor - online software localization tool","fancy_title":null,"internal":false,"reflection":false,"clicks":4,"user_id":1979,"domain":"poeditor.com"},{"url":"http://en.lichess.org/@/Hellball","title":null,"fancy_title":null,"internal":false,"reflection":false,"clicks":3,"user_id":1979,"domain":"en.lichess.org"},{"url":"http://en.wikipedia.org/wiki/T%E2%80%93V_distinction","title":"T–V distinction - Wikipedia, the free encyclopedia","fancy_title":null,"internal":false,"reflection":false,"clicks":3,"user_id":3620,"domain":"en.wikipedia.org"},{"url":"http://www.slideshare.net/HeatherRivers/linguistic-potluck-crowdsourcing-localization-with-rails","title":"Linguistic Potluck: Crowdsourcing localization with Rails","fancy_title":null,"internal":false,"reflection":false,"clicks":3,"user_id":212,"domain":"www.slideshare.net"},{"url":"https://meta.discourse.org/t/language-mirrors/2378/2","title":"Language mirrors","fancy_title":null,"internal":true,"reflection":true,"clicks":3,"user_id":32,"domain":"meta.discourse.org"},{"url":"http://www.madanalogy.com/2012/06/rails-i18n-translations-in-yaml.html","title":"Mad Analogy: Rails i18n translations in Yaml: translation tool support","fancy_title":null,"internal":false,"reflection":false,"clicks":3,"user_id":3190,"domain":"www.madanalogy.com"},{"url":"https://github.com/tr8n","title":"Translation Exchange · GitHub","fancy_title":null,"internal":false,"reflection":false,"clicks":3,"user_id":9006,"domain":"github.com"},{"url":"http://pootle.locamotion.org/","title":"Main | Pootle Demo","fancy_title":null,"internal":false,"reflection":false,"clicks":2,"user_id":3190,"domain":"pootle.locamotion.org"},{"url":"http://www.youtube.com/watch?v=MqqdzJ98q7s","title":"GoGaRuCo 2012 - Linguistic Potluck: Crowdsourcing Localization in Rails by Heather Rivers - YouTube","fancy_title":null,"internal":false,"reflection":false,"clicks":2,"user_id":212,"domain":"www.youtube.com"},{"url":"https://meta.discourse.org/t/translation-workflow/6102","title":"Translation workflow","fancy_title":null,"internal":true,"reflection":true,"clicks":2,"user_id":4702,"domain":"meta.discourse.org"},{"url":"https://meta.discourse.org/t/solving-xda-developer-style-forums/4368/4","title":"Solving XDA-Developer style forums","fancy_title":null,"internal":true,"reflection":true,"clicks":2,"user_id":639,"domain":"meta.discourse.org"},{"url":"https://tr8nhub.com","title":"TranslationExchange","fancy_title":null,"internal":false,"reflection":false,"clicks":2,"user_id":9006,"domain":"tr8nhub.com"},{"url":"https://meta.discourse.org/t/roadplan-for-discourse/2939/3","title":"Roadplan for Discourse 2013","fancy_title":null,"internal":true,"reflection":true,"clicks":1,"user_id":2540,"domain":"meta.discourse.org"},{"url":"http://sugarjs.com/dates#date_locales","title":"Dates - Sugar","fancy_title":null,"internal":false,"reflection":false,"clicks":1,"user_id":461,"domain":"sugarjs.com"},{"url":"http://blog.discourse.org/2013/03/localizing-discourse/","title":"Localizing Discourse","fancy_title":null,"internal":false,"reflection":false,"clicks":1,"user_id":893,"domain":"blog.discourse.org"},{"url":"https://github.com/discourse/discourse/blob/master/app/assets/javascripts/locales/date_locales.js","title":null,"fancy_title":null,"internal":false,"reflection":false,"clicks":1,"user_id":461,"domain":"github.com"},{"url":"http://transifex.com/projects/p/discourse-pt-br/","title":"Discourse-Translations-Project localization","fancy_title":null,"internal":false,"reflection":false,"clicks":1,"user_id":893,"domain":"transifex.com"},{"url":"https://github.com/discourse/discourse/issues/279","title":null,"fancy_title":null,"internal":false,"reflection":false,"clicks":1,"user_id":893,"domain":"github.com"},{"url":"https://meta.discourse.org/t/comrades-lets-join-our-efforts-on-ukrainian-and-russian-translations/4403/5","title":"Comrades let's join our efforts on ukrainian and russian translations","fancy_title":null,"internal":true,"reflection":true,"clicks":1,"user_id":3417,"domain":"meta.discourse.org"},{"url":"https://meta.discourse.org/t/translation-workflow/6102/6","title":"Translation workflow","fancy_title":null,"internal":true,"reflection":false,"clicks":0,"user_id":1995,"domain":"meta.discourse.org"},{"url":"https://meta.discourse.org/t/bookmark-last-read-sometimes-doesn-t-go-to-the-end-of-a-topic/4825/9","title":"Bookmark/last read sometimes doesn't go to the end of a topic","fancy_title":null,"internal":true,"reflection":true,"clicks":0,"user_id":3681,"domain":"meta.discourse.org"},{"url":"https://github.com/discourse/discourse/blob/master/config/locales/client.de.yml","title":"discourse/config/locales/client.de.yml at master · discourse/discourse · GitHub","fancy_title":null,"internal":false,"reflection":false,"clicks":0,"user_id":2,"domain":"github.com"},{"url":"https://meta.discourse.org/t/what-i-love-about-wordpress-plugins/5697","title":"What I love about WordPress plugins","fancy_title":null,"internal":true,"reflection":true,"clicks":0,"user_id":1,"domain":"meta.discourse.org"},{"url":"https://meta.discourse.org/t/github-onebox-rendering-issue/7616","title":"GitHub OneBox Rendering Issue","fancy_title":null,"internal":true,"reflection":true,"clicks":0,"user_id":5372,"domain":"meta.discourse.org"},{"url":"https://github.com/discourse/discourse/blob/master/config/locales/server.de.yml","title":"discourse/config/locales/server.de.yml at master · discourse/discourse · GitHub","fancy_title":null,"internal":false,"reflection":false,"clicks":0,"user_id":2,"domain":"github.com"},{"url":"https://meta.discourse.org/t/roadplan-for-discourse/2939/5","title":"Roadplan for Discourse 2013","fancy_title":null,"internal":true,"reflection":true,"clicks":0,"user_id":32,"domain":"meta.discourse.org"},{"url":"https://meta.discourse.org/t/translation-tools-transifex-localeapp/7763","title":"Translation Tools: Transifex? Localeapp?","fancy_title":null,"internal":true,"reflection":true,"clicks":0,"user_id":2,"domain":"meta.discourse.org"},{"url":"http://guides.rubyonrails.org/i18n.html#the-public-i18n-api","title":"Rails Internationalization (I18n) API — Ruby on Rails Guides","fancy_title":null,"internal":false,"reflection":false,"clicks":0,"user_id":1895,"domain":"guides.rubyonrails.org"},{"url":"https://meta.discourse.org/t/hi-support-chinese/4393/6","title":"Hi, support Chinese?","fancy_title":null,"internal":true,"reflection":true,"clicks":0,"user_id":2014,"domain":"meta.discourse.org"},{"url":"https://meta.discourse.org/t/translation-tools-transifex-localeapp/7763/41","title":"Translation Tools: Transifex? Localeapp?","fancy_title":null,"internal":true,"reflection":false,"clicks":0,"user_id":6626,"domain":"meta.discourse.org"}],"notification_level":2,"notifications_reason_id":4,"can_move_posts":true,"can_edit":true,"can_delete":true,"can_recover":true,"can_remove_allowed_users":true,"can_invite_to":true,"can_create_post":true,"can_reply_as_new_topic":true,"can_flag_topic":true},"highest_post_number":104,"last_read_post_number":104,"deleted_by":null,"has_deleted":true,"actions_summary":[{"id":4,"count":0,"hidden":false,"can_act":true},{"id":7,"count":0,"hidden":false,"can_act":true},{"id":8,"count":0,"hidden":false,"can_act":true}],"chunk_size":20,"bookmarked":false,"tags":null}}; diff --git a/test/javascripts/helpers/create-pretender.js.es6 b/test/javascripts/helpers/create-pretender.js.es6 index cc51c3db0b..e6184eee2f 100644 --- a/test/javascripts/helpers/create-pretender.js.es6 +++ b/test/javascripts/helpers/create-pretender.js.es6 @@ -2,7 +2,7 @@ function parsePostData(query) { const result = {}; query.split("&").forEach(function(part) { const item = part.split("="); - result[item[0]] = decodeURIComponent(item[1]); + result[item[0]] = decodeURIComponent(item[1]).replace(/\+/g, ' '); }); return result; } @@ -33,9 +33,16 @@ const _moreWidgets = [ {id: 224, name: 'Good Repellant'} ]; +function loggedIn() { + return !!Discourse.User.current(); +} + export default function() { + const server = new Pretender(function() { + const fixturesByUrl = {}; + // Load any fixtures automatically const self = this; Ember.keys(require._eak_seen).forEach(function(entry) { @@ -44,6 +51,7 @@ export default function() { if (fixture && fixture.default) { const obj = fixture.default; Ember.keys(obj).forEach(function(url) { + fixturesByUrl[url] = obj[url]; self.get(url, function() { return response(obj[url]); }); @@ -52,6 +60,20 @@ export default function() { } }); + this.get('/composer-messages', () => { return response([]); }); + + this.get("/latest.json", () => { + const json = fixturesByUrl['/latest.json']; + + if (loggedIn()) { + // Stuff to let us post + json.topic_list.can_create_topic = true; + json.topic_list.draft_key = "new_topic"; + json.topic_list.draft_sequence = 1; + } + return response(json); + }); + this.get("/t/id_for/:slug", function() { return response({id: 280, slug: "internationalization-localization", url: "/t/internationalization-localization/280"}); }); @@ -99,6 +121,33 @@ export default function() { this.delete('/posts/:post_id', success); this.put('/posts/:post_id/recover', success); + this.put('/posts/:post_id', (request) => { + return response({ post: {id: request.params.post_id, version: 2 } }); + }); + + this.put('/t/:slug/:id', (request) => { + const data = parsePostData(request.requestBody); + + return response(200, { basic_topic: {id: request.params.id, + title: data.title, + fancy_title: data.title, + slug: request.params.slug } }) + }); + + this.post('/posts', function(request) { + const data = parsePostData(request.requestBody); + + if (data.title === "this title triggers an error") { + return response(422, {errors: ['That title has already been taken']}); + } else { + return response(200, { + success: true, + action: 'create_post', + post: {id: 12345, topic_id: 280, topic_slug: 'internationalization-localization'} + }); + } + }); + this.get('/widgets/:widget_id', function(request) { const w = _widgets.findBy('id', parseInt(request.params.widget_id)); if (w) { @@ -130,8 +179,11 @@ export default function() { }); this.delete('/widgets/:widget_id', success); - }); + this.post('/topics/timings', function() { + return response(200, {}); + }); + }); server.prepareBody = function(body){ if (body && typeof body === "object") { diff --git a/test/javascripts/helpers/qunit-helpers.js.es6 b/test/javascripts/helpers/qunit-helpers.js.es6 index 17b82bd171..054a4686a4 100644 --- a/test/javascripts/helpers/qunit-helpers.js.es6 +++ b/test/javascripts/helpers/qunit-helpers.js.es6 @@ -1,20 +1,59 @@ /* global asyncTest */ +import sessionFixtures from 'fixtures/session-fixtures'; import siteFixtures from 'fixtures/site_fixtures'; +import HeaderView from 'discourse/views/header'; + +function currentUser() { + return Discourse.User.create(sessionFixtures['/session/current.json'].current_user); +} + +function logIn() { + Discourse.User.resetCurrent(currentUser()); +} + +const Plugin = $.fn.modal; +const Modal = Plugin.Constructor; + +function AcceptanceModal(option, _relatedTarget) { + return this.each(function () { + var $this = $(this); + var data = $this.data('bs.modal'); + var options = $.extend({}, Modal.DEFAULTS, $this.data(), typeof option === 'object' && option); + + if (!data) $this.data('bs.modal', (data = new Modal(this, options))); + data.$body = $('#ember-testing'); + + if (typeof option === 'string') data[option](_relatedTarget); + else if (options.show) data.show(_relatedTarget); + }); +} + +window.bootbox.$body = $('#ember-testing'); +$.fn.modal = AcceptanceModal; + +var oldAvatar = Discourse.Utilities.avatarImg; function acceptance(name, options) { module("Acceptance: " + name, { setup: function() { Ember.run(Discourse, Discourse.advanceReadiness); + // Don't render avatars in acceptance tests, it's faster and no 404s + Discourse.Utilities.avatarImg = () => ""; + + // For now don't do scrolling stuff in Test Mode + Ember.CloakedCollectionView.scrolled = Ember.K; + HeaderView.reopen({examineDockHeader: Ember.K}); + var siteJson = siteFixtures['site.json'].site; if (options) { if (options.setup) { options.setup.call(this); } - if (options.user) { - Discourse.User.resetCurrent(Discourse.User.create(options.user)); + if (options.loggedIn) { + logIn(); } if (options.settings) { @@ -34,6 +73,7 @@ function acceptance(name, options) { options.teardown.call(this); } + Discourse.Utilities.avatarImg = oldAvatar; Discourse.reset(); } }); @@ -61,4 +101,4 @@ function fixture(selector) { return $("#qunit-fixture"); } -export { acceptance, controllerFor, asyncTestDiscourse, fixture }; +export { acceptance, controllerFor, asyncTestDiscourse, fixture, logIn, currentUser }; diff --git a/test/javascripts/models/composer-test.js.es6 b/test/javascripts/models/composer-test.js.es6 index 413156077e..1727d2893a 100644 --- a/test/javascripts/models/composer-test.js.es6 +++ b/test/javascripts/models/composer-test.js.es6 @@ -1,16 +1,18 @@ -module("Discourse.Composer", { - setup: function() { - sandbox.stub(Discourse.User, 'currentProp').withArgs('admin').returns(false); - }, +import { currentUser } from 'helpers/qunit-helpers'; - teardown: function() { - Discourse.User.currentProp.restore(); - } -}); +module("model:composer"); + +function createComposer(opts) { + opts = opts || {}; + opts.user = opts.user || currentUser(); + opts.site = Discourse.Site.current(); + opts.siteSettings = Discourse.SiteSettings; + return Discourse.Composer.create(opts); +} test('replyLength', function() { - var replyLength = function(val, expectedLength) { - var composer = Discourse.Composer.create({ reply: val }); + const replyLength = function(val, expectedLength) { + const composer = createComposer({ reply: val }); equal(composer.get('replyLength'), expectedLength); }; @@ -23,8 +25,8 @@ test('replyLength', function() { test('missingReplyCharacters', function() { Discourse.SiteSettings.min_first_post_length = 40; - var missingReplyCharacters = function(val, isPM, isFirstPost, expected, message) { - var composer = Discourse.Composer.create({ reply: val, creatingPrivateMessage: isPM, creatingTopic: isFirstPost }); + const missingReplyCharacters = function(val, isPM, isFirstPost, expected, message) { + const composer = createComposer({ reply: val, creatingPrivateMessage: isPM, creatingTopic: isFirstPost }); equal(composer.get('missingReplyCharacters'), expected, message); }; @@ -34,8 +36,8 @@ test('missingReplyCharacters', function() { }); test('missingTitleCharacters', function() { - var missingTitleCharacters = function(val, isPM, expected, message) { - var composer = Discourse.Composer.create({ title: val, creatingPrivateMessage: isPM }); + const missingTitleCharacters = function(val, isPM, expected, message) { + const composer = createComposer({ title: val, creatingPrivateMessage: isPM }); equal(composer.get('missingTitleCharacters'), expected, message); }; @@ -44,7 +46,7 @@ test('missingTitleCharacters', function() { }); test('replyDirty', function() { - var composer = Discourse.Composer.create(); + const composer = createComposer(); ok(!composer.get('replyDirty'), "by default it's false"); composer.setProperties({ @@ -58,7 +60,7 @@ test('replyDirty', function() { }); test("appendText", function() { - var composer = Discourse.Composer.create(); + const composer = createComposer(); blank(composer.get('reply'), "the reply is blank by default"); @@ -89,7 +91,7 @@ test("appendText", function() { test("Title length for regular topics", function() { Discourse.SiteSettings.min_topic_title_length = 5; Discourse.SiteSettings.max_topic_title_length = 10; - var composer = Discourse.Composer.create(); + const composer = createComposer(); composer.set('title', 'asdf'); ok(!composer.get('titleLengthValid'), "short titles are not valid"); @@ -104,7 +106,7 @@ test("Title length for regular topics", function() { test("Title length for private messages", function() { Discourse.SiteSettings.min_private_message_title_length = 5; Discourse.SiteSettings.max_topic_title_length = 10; - var composer = Discourse.Composer.create({action: Discourse.Composer.PRIVATE_MESSAGE}); + const composer = createComposer({action: Discourse.Composer.PRIVATE_MESSAGE}); composer.set('title', 'asdf'); ok(!composer.get('titleLengthValid'), "short titles are not valid"); @@ -119,7 +121,7 @@ test("Title length for private messages", function() { test("Title length for private messages", function() { Discourse.SiteSettings.min_private_message_title_length = 5; Discourse.SiteSettings.max_topic_title_length = 10; - var composer = Discourse.Composer.create({action: Discourse.Composer.PRIVATE_MESSAGE}); + const composer = createComposer({action: Discourse.Composer.PRIVATE_MESSAGE}); composer.set('title', 'asdf'); ok(!composer.get('titleLengthValid'), "short titles are not valid"); @@ -132,10 +134,10 @@ test("Title length for private messages", function() { }); test('editingFirstPost', function() { - var composer = Discourse.Composer.create(); + const composer = createComposer(); ok(!composer.get('editingFirstPost'), "it's false by default"); - var post = Discourse.Post.create({id: 123, post_number: 2}); + const post = Discourse.Post.create({id: 123, post_number: 2}); composer.setProperties({post: post, action: Discourse.Composer.EDIT }); ok(!composer.get('editingFirstPost'), "it's false when not editing the first post"); @@ -145,7 +147,7 @@ test('editingFirstPost', function() { }); test('clearState', function() { - var composer = Discourse.Composer.create({ + const composer = createComposer({ originalText: 'asdf', reply: 'asdf2', post: Discourse.Post.create({id: 1}), @@ -163,61 +165,48 @@ test('clearState', function() { test('initial category when uncategorized is allowed', function() { Discourse.SiteSettings.allow_uncategorized_topics = true; - var composer = Discourse.Composer.open({action: 'createTopic', draftKey: 'asfd', draftSequence: 1}); + const composer = Discourse.Composer.open({action: 'createTopic', draftKey: 'asfd', draftSequence: 1}); equal(composer.get('categoryId'),undefined,"Uncategorized by default"); }); test('initial category when uncategorized is not allowed', function() { Discourse.SiteSettings.allow_uncategorized_topics = false; - var composer = Discourse.Composer.open({action: 'createTopic', draftKey: 'asfd', draftSequence: 1}); + const composer = Discourse.Composer.open({action: 'createTopic', draftKey: 'asfd', draftSequence: 1}); ok(composer.get('categoryId') === undefined, "Uncategorized by default. Must choose a category."); }); test('showPreview', function() { - var new_composer = function() { + const newComposer = function() { return Discourse.Composer.open({action: 'createTopic', draftKey: 'asfd', draftSequence: 1}); }; Discourse.Mobile.mobileView = true; - equal(new_composer().get('showPreview'), false, "Don't show preview in mobile view"); + equal(newComposer().get('showPreview'), false, "Don't show preview in mobile view"); Discourse.KeyValueStore.set({ key: 'composer.showPreview', value: 'true' }); - equal(new_composer().get('showPreview'), false, "Don't show preview in mobile view even if KeyValueStore wants to"); + equal(newComposer().get('showPreview'), false, "Don't show preview in mobile view even if KeyValueStore wants to"); Discourse.KeyValueStore.remove('composer.showPreview'); Discourse.Mobile.mobileView = false; - equal(new_composer().get('showPreview'), true, "Show preview by default in desktop view"); + equal(newComposer().get('showPreview'), true, "Show preview by default in desktop view"); }); test('open with a quote', function() { - var quote = '[quote="neil, post:5, topic:413"]\nSimmer down you two.\n[/quote]'; - var new_composer = function() { + const quote = '[quote="neil, post:5, topic:413"]\nSimmer down you two.\n[/quote]'; + const newComposer = function() { return Discourse.Composer.open({action: Discourse.Composer.REPLY, draftKey: 'asfd', draftSequence: 1, quote: quote}); }; - equal(new_composer().get('originalText'), quote, "originalText is the quote" ); - equal(new_composer().get('replyDirty'), false, "replyDirty is initally false with a quote" ); -}); - - -module("Discourse.Composer as admin", { - setup: function() { - Discourse.SiteSettings.min_topic_title_length = 5; - Discourse.SiteSettings.max_topic_title_length = 10; - sandbox.stub(Discourse.User, 'currentProp').withArgs('admin').returns(true); - }, - - teardown: function() { - Discourse.SiteSettings.min_topic_title_length = 15; - Discourse.SiteSettings.max_topic_title_length = 255; - Discourse.User.currentProp.restore(); - } + equal(newComposer().get('originalText'), quote, "originalText is the quote" ); + equal(newComposer().get('replyDirty'), false, "replyDirty is initally false with a quote" ); }); test("Title length for static page topics as admin", function() { - var composer = Discourse.Composer.create(); + Discourse.SiteSettings.min_topic_title_length = 5; + Discourse.SiteSettings.max_topic_title_length = 10; + const composer = createComposer(); - var post = Discourse.Post.create({id: 123, post_number: 2, static_doc: true}); + const post = Discourse.Post.create({id: 123, post_number: 2, static_doc: true}); composer.setProperties({post: post, action: Discourse.Composer.EDIT }); composer.set('title', 'asdf'); diff --git a/test/javascripts/test_helper.js b/test/javascripts/test_helper.js index 87c2812f06..bc38f15d11 100644 --- a/test/javascripts/test_helper.js +++ b/test/javascripts/test_helper.js @@ -59,7 +59,11 @@ sinon.config = { useFakeServer: false }; -window.assetPath = function() { return null; }; +window.assetPath = function(url) { + if (url.indexOf('defer') === 0) { + return "/assets/" + url; + } +}; // Stop the message bus so we don't get ajax calls window.MessageBus.stop(); diff --git a/vendor/assets/javascripts/bootbox.js b/vendor/assets/javascripts/bootbox.js index d19f1557c1..69ec027eff 100644 --- a/vendor/assets/javascripts/bootbox.js +++ b/vendor/assets/javascripts/bootbox.js @@ -427,16 +427,17 @@ var bootbox = window.bootbox || (function(document, $) { }); // well, *if* we have a primary - give the first dom element focus - div.on('shown', function() { + div.on('shown.bs.modal', function() { div.find("a.btn-primary:first").focus(); }); - div.on('hidden', function() { + div.on('hidden.bs.modal', function() { div.remove(); }); // wire up button handlers div.on('click', '.modal-footer a', function(e) { + Ember.run(function() { var handler = $(this).data("handler"), cb = callbacks[handler], @@ -462,10 +463,11 @@ var bootbox = window.bootbox || (function(document, $) { if (hideModal !== false) { div.modal("hide"); } + }); }); // stick the modal right at the bottom of the main body out of the way - $("body").append(div); + (that.$body || $("body")).append(div); div.modal({ // unless explicitly overridden take whatever our default backdrop value is diff --git a/vendor/assets/javascripts/bootstrap-modal.js b/vendor/assets/javascripts/bootstrap-modal.js index 0465cb5256..1dd9c0df9d 100644 --- a/vendor/assets/javascripts/bootstrap-modal.js +++ b/vendor/assets/javascripts/bootstrap-modal.js @@ -1,218 +1,338 @@ -/* ========================================================= - * bootstrap-modal.js v2.0.3 - * http://twitter.github.com/bootstrap/javascript.html#modals - * ========================================================= - * Copyright 2012 Twitter, Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ========================================================= */ +/* ======================================================================== + * Bootstrap: modal.js v3.3.4 + * http://getbootstrap.com/javascript/#modals + * ======================================================================== + * Copyright 2011-2015 Twitter, Inc. + * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) + * ======================================================================== */ -!function ($) { ++function ($) { + 'use strict'; - "use strict"; // jshint ;_; + // MODAL CLASS DEFINITION + // ====================== + var Modal = function (element, options) { + this.options = options + this.$body = $(document.body) + this.$element = $(element) + this.$dialog = this.$element.find('.modal-dialog') + this.$backdrop = null + this.isShown = null + this.originalBodyPad = null + this.scrollbarWidth = 0 + this.ignoreBackdropClick = false - /* MODAL CLASS DEFINITION - * ====================== */ - - var Modal = function (content, options) { - this.options = options - this.$element = $(content) - .delegate('[data-dismiss="modal"]', 'click.dismiss.modal', $.proxy(this.hide, this)) + if (this.options.remote) { + this.$element + .find('.modal-content') + .load(this.options.remote, $.proxy(function () { + this.$element.trigger('loaded.bs.modal') + }, this)) + } } - Modal.prototype = { + Modal.VERSION = '3.3.4' - constructor: Modal - - , toggle: function () { - return this[!this.isShown ? 'show' : 'hide']() - } - - , show: function () { - var that = this - , e = $.Event('show') - - this.$element.trigger(e) - - if (this.isShown || e.isDefaultPrevented()) return - - $('body').addClass('modal-open') - - this.isShown = true - - escape.call(this) - backdrop.call(this, function () { - var transition = $.support.transition && that.$element.hasClass('fade') - - if (!that.$element.parent().length) { - that.$element.appendTo(document.body) //don't move modals dom position - } - - that.$element - .show() - - if (transition) { - that.$element[0].offsetWidth // force reflow - } - - that.$element.addClass('in') - - transition ? - that.$element.one($.support.transition.end, function () { that.$element.trigger('shown') }) : - that.$element.trigger('shown') - - }) - } - - , hide: function (e) { - e && e.preventDefault() - - var that = this - - e = $.Event('hide') - - this.$element.trigger(e) - - if (!this.isShown || e.isDefaultPrevented()) return - - this.isShown = false - - $('body').removeClass('modal-open') - - escape.call(this) - - this.$element.removeClass('in') - - $.support.transition && this.$element.hasClass('fade') ? - hideWithTransition.call(this) : - hideModal.call(this) - } + Modal.TRANSITION_DURATION = 300 + Modal.BACKDROP_TRANSITION_DURATION = 150 + Modal.DEFAULTS = { + backdrop: true, + keyboard: true, + show: true } + Modal.prototype.toggle = function (_relatedTarget) { + return this.isShown ? this.hide() : this.show(_relatedTarget) + } - /* MODAL PRIVATE METHODS - * ===================== */ - - function hideWithTransition() { + Modal.prototype.show = function (_relatedTarget) { var that = this - , timeout = setTimeout(function () { - that.$element.off($.support.transition.end) - hideModal.call(that) - }, 500) + var e = $.Event('show.bs.modal', { relatedTarget: _relatedTarget }) - this.$element.one($.support.transition.end, function () { - clearTimeout(timeout) - hideModal.call(that) + this.$element.trigger(e) + + if (this.isShown || e.isDefaultPrevented()) return + + this.isShown = true + + this.checkScrollbar() + this.setScrollbar() + this.$body.addClass('modal-open') + + this.escape() + this.resize() + + this.$element.on('click.dismiss.bs.modal', '[data-dismiss="modal"]', $.proxy(this.hide, this)) + + this.$dialog.on('mousedown.dismiss.bs.modal', function () { + that.$element.one('mouseup.dismiss.bs.modal', function (e) { + if ($(e.target).is(that.$element)) that.ignoreBackdropClick = true + }) + }) + + this.backdrop(function () { + var transition = $.support.transition && that.$element.hasClass('fade') + + if (!that.$element.parent().length) { + that.$element.appendTo(that.$body) // don't move modals dom position + } + + that.$element + .show() + .scrollTop(0) + + that.adjustDialog() + + if (transition) { + that.$element[0].offsetWidth // force reflow + } + + that.$element.addClass('in') + + that.enforceFocus() + + var e = $.Event('shown.bs.modal', { relatedTarget: _relatedTarget }) + + transition ? + that.$dialog // wait for modal to slide in + .one('bsTransitionEnd', function () { + that.$element.trigger('focus').trigger(e) + }) + .emulateTransitionEnd(Modal.TRANSITION_DURATION) : + that.$element.trigger('focus').trigger(e) }) } - function hideModal(that) { - this.$element - .hide() - .trigger('hidden') + Modal.prototype.hide = function (e) { + if (e) e.preventDefault() - backdrop.call(this) + e = $.Event('hide.bs.modal') + + this.$element.trigger(e) + + if (!this.isShown || e.isDefaultPrevented()) return + + this.isShown = false + + this.escape() + this.resize() + + $(document).off('focusin.bs.modal') + + this.$element + .removeClass('in') + .off('click.dismiss.bs.modal') + .off('mouseup.dismiss.bs.modal') + + this.$dialog.off('mousedown.dismiss.bs.modal') + + $.support.transition && this.$element.hasClass('fade') ? + this.$element + .one('bsTransitionEnd', $.proxy(this.hideModal, this)) + .emulateTransitionEnd(Modal.TRANSITION_DURATION) : + this.hideModal() } - function backdrop(callback) { + Modal.prototype.enforceFocus = function () { + $(document) + .off('focusin.bs.modal') // guard against infinite focus loop + .on('focusin.bs.modal', $.proxy(function (e) { + if (this.$element[0] !== e.target && !this.$element.has(e.target).length) { + this.$element.trigger('focus') + } + }, this)) + } + + Modal.prototype.escape = function () { + if (this.isShown && this.options.keyboard) { + this.$element.on('keydown.dismiss.bs.modal', $.proxy(function (e) { + e.which == 27 && this.hide() + }, this)) + } else if (!this.isShown) { + this.$element.off('keydown.dismiss.bs.modal') + } + } + + Modal.prototype.resize = function () { + if (this.isShown) { + $(window).on('resize.bs.modal', $.proxy(this.handleUpdate, this)) + } else { + $(window).off('resize.bs.modal') + } + } + + Modal.prototype.hideModal = function () { var that = this - , animate = this.$element.hasClass('fade') ? 'fade' : '' + this.$element.hide() + this.backdrop(function () { + that.$body.removeClass('modal-open') + that.resetAdjustments() + that.resetScrollbar() + that.$element.trigger('hidden.bs.modal') + }) + } + + Modal.prototype.removeBackdrop = function () { + this.$backdrop && this.$backdrop.remove() + this.$backdrop = null + } + + Modal.prototype.backdrop = function (callback) { + var that = this + var animate = this.$element.hasClass('fade') ? 'fade' : '' if (this.isShown && this.options.backdrop) { var doAnimate = $.support.transition && animate - this.$backdrop = $('
') - .appendTo(document.body) + this.$backdrop = $(document.createElement('div')) + .addClass('modal-backdrop ' + animate) + .appendTo(this.$body) - if (this.options.backdrop != 'static') { - this.$backdrop.click($.proxy(this.hide, this)) - } + this.$element.on('click.dismiss.bs.modal', $.proxy(function (e) { + if (this.ignoreBackdropClick) { + this.ignoreBackdropClick = false + return + } + if (e.target !== e.currentTarget) return + this.options.backdrop == 'static' + ? this.$element[0].focus() + : this.hide() + }, this)) if (doAnimate) this.$backdrop[0].offsetWidth // force reflow this.$backdrop.addClass('in') + if (!callback) return + doAnimate ? - this.$backdrop.one($.support.transition.end, callback) : + this.$backdrop + .one('bsTransitionEnd', callback) + .emulateTransitionEnd(Modal.BACKDROP_TRANSITION_DURATION) : callback() } else if (!this.isShown && this.$backdrop) { this.$backdrop.removeClass('in') - $.support.transition && this.$element.hasClass('fade')? - this.$backdrop.one($.support.transition.end, $.proxy(removeBackdrop, this)) : - removeBackdrop.call(this) + var callbackRemove = function () { + that.removeBackdrop() + callback && callback() + } + $.support.transition && this.$element.hasClass('fade') ? + this.$backdrop + .one('bsTransitionEnd', callbackRemove) + .emulateTransitionEnd(Modal.BACKDROP_TRANSITION_DURATION) : + callbackRemove() } else if (callback) { callback() } } - function removeBackdrop() { - this.$backdrop.remove() - this.$backdrop = null + // these following methods are used to handle overflowing modals + + Modal.prototype.handleUpdate = function () { + this.adjustDialog() } - function escape() { - var that = this - if (this.isShown && this.options.keyboard) { - $(document).on('keyup.dismiss.modal', function ( e ) { - e.which == 27 && that.hide() - }) - } else if (!this.isShown) { - $(document).off('keyup.dismiss.modal') - } - } + Modal.prototype.adjustDialog = function () { + var modalIsOverflowing = this.$element[0].scrollHeight > document.documentElement.clientHeight - - /* MODAL PLUGIN DEFINITION - * ======================= */ - - $.fn.modal = function (option) { - return this.each(function () { - var $this = $(this) - , data = $this.data('modal') - , options = $.extend({}, $.fn.modal.defaults, $this.data(), typeof option == 'object' && option) - if (!data) $this.data('modal', (data = new Modal(this, options))) - if (typeof option == 'string') data[option]() - else if (options.show) data.show() + this.$element.css({ + paddingLeft: !this.bodyIsOverflowing && modalIsOverflowing ? this.scrollbarWidth : '', + paddingRight: this.bodyIsOverflowing && !modalIsOverflowing ? this.scrollbarWidth : '' }) } - $.fn.modal.defaults = { - backdrop: true - , keyboard: true - , show: true + Modal.prototype.resetAdjustments = function () { + this.$element.css({ + paddingLeft: '', + paddingRight: '' + }) } + Modal.prototype.checkScrollbar = function () { + var fullWindowWidth = window.innerWidth + if (!fullWindowWidth) { // workaround for missing window.innerWidth in IE8 + var documentElementRect = document.documentElement.getBoundingClientRect() + fullWindowWidth = documentElementRect.right - Math.abs(documentElementRect.left) + } + this.bodyIsOverflowing = document.body.clientWidth < fullWindowWidth + this.scrollbarWidth = this.measureScrollbar() + } + + Modal.prototype.setScrollbar = function () { + var bodyPad = parseInt((this.$body.css('padding-right') || 0), 10) + this.originalBodyPad = document.body.style.paddingRight || '' + if (this.bodyIsOverflowing) this.$body.css('padding-right', bodyPad + this.scrollbarWidth) + } + + Modal.prototype.resetScrollbar = function () { + this.$body.css('padding-right', this.originalBodyPad) + } + + Modal.prototype.measureScrollbar = function () { // thx walsh + var scrollDiv = document.createElement('div') + scrollDiv.className = 'modal-scrollbar-measure' + this.$body.append(scrollDiv) + var scrollbarWidth = scrollDiv.offsetWidth - scrollDiv.clientWidth + this.$body[0].removeChild(scrollDiv) + return scrollbarWidth + } + + + // MODAL PLUGIN DEFINITION + // ======================= + + function Plugin(option, _relatedTarget) { + return this.each(function () { + var $this = $(this) + var data = $this.data('bs.modal') + var options = $.extend({}, Modal.DEFAULTS, $this.data(), typeof option == 'object' && option) + + if (!data) $this.data('bs.modal', (data = new Modal(this, options))) + + if (typeof option == 'string') data[option](_relatedTarget) + else if (options.show) data.show(_relatedTarget) + }) + } + + var old = $.fn.modal + + $.fn.modal = Plugin $.fn.modal.Constructor = Modal - /* MODAL DATA-API - * ============== */ + // MODAL NO CONFLICT + // ================= - $(function () { - $('body').on('click.modal.data-api', '[data-toggle="modal"]', function ( e ) { - var $this = $(this), href - , $target = $($this.attr('data-target') || (href = $this.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '')) //strip for ie7 - , option = $target.data('modal') ? 'toggle' : $.extend({}, $target.data(), $this.data()) + $.fn.modal.noConflict = function () { + $.fn.modal = old + return this + } - e.preventDefault() - $target.modal(option) + + // MODAL DATA-API + // ============== + + $(document).on('click.bs.modal.data-api', '[data-toggle="modal"]', function (e) { + var $this = $(this) + var href = $this.attr('href') + var $target = $($this.attr('data-target') || (href && href.replace(/.*(?=#[^\s]+$)/, ''))) // strip for ie7 + var option = $target.data('bs.modal') ? 'toggle' : $.extend({ remote: !/#/.test(href) && href }, $target.data(), $this.data()) + + if ($this.is('a')) e.preventDefault() + + $target.one('show.bs.modal', function (showEvent) { + if (showEvent.isDefaultPrevented()) return // only register focus restorer if modal will actually get shown + $target.one('hidden.bs.modal', function () { + $this.is(':visible') && $this.trigger('focus') + }) }) + Plugin.call($target, option, this) }) -}(window.jQuery); +}(jQuery); diff --git a/vendor/assets/javascripts/ember-cloaking.js b/vendor/assets/javascripts/ember-cloaking.js index cc698f39d1..e47030abc2 100644 --- a/vendor/assets/javascripts/ember-cloaking.js +++ b/vendor/assets/javascripts/ember-cloaking.js @@ -148,11 +148,14 @@ // Find the bottom view and what's onscreen while (bottomView < childViews.length) { var view = childViews[bottomView], - $view = view.$(), - // in case of not full-window scrolling - scrollOffset = this.get('wrapperTop') || 0, - viewTop = $view.offset().top + scrollOffset, - viewBottom = viewTop + $view.height(); + $view = view.$(); + + if (!$view) { break; } + + // in case of not full-window scrolling + var scrollOffset = this.get('wrapperTop') || 0, + viewTop = $view.offset().top + scrollOffset, + viewBottom = viewTop + $view.height(); if (viewTop > viewportBottom) { break; } toUncloak.push(view); From a83a19f6cea7fa0371787d8b01d92d27022ac20b Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Wed, 8 Apr 2015 14:17:21 -0400 Subject: [PATCH 019/113] ES6 module migrations --- .../admin-logs-screened-emails.js.es6 | 3 +- .../admin-logs-screened-ip-addresses.js.es6 | 3 +- .../admin-logs-screened-urls.js.es6 | 3 +- .../admin-logs-staff-action-logs.js.es6 | 3 +- .../controllers/admin-site-settings.js.es6 | 4 +- .../discourse/controllers/controller.js.es6 | 4 +- .../discourse/controllers/object.js.es6 | 4 +- .../discourse/controllers/search.js.es6 | 3 +- .../javascripts/discourse/mixins/presence.js | 36 ------------- .../discourse/mixins/presence.js.es6 | 20 +++++++ .../models/{model.js => model.js.es6} | 8 ++- .../javascripts/discourse/models/post.js.es6 | 4 +- .../javascripts/discourse/models/rest.js.es6 | 4 +- .../discourse/views/container.js.es6 | 4 +- .../discourse/views/grouped.js.es6 | 12 +++++ .../javascripts/discourse/views/view.js | 52 ------------------- .../javascripts/discourse/views/view.js.es6 | 17 ++++++ app/assets/javascripts/main_include.js | 2 + .../tilt/es6_module_transpiler_template.rb | 1 + .../controllers/admin-email-index-test.js.es6 | 5 -- .../admin-email-preview-digest-test.js.es6 | 5 -- .../controllers/discourse-test.js.es6 | 3 +- .../helpers/create-pretender.js.es6 | 2 +- test/javascripts/mixins/presence-test.js.es6 | 6 ++- test/javascripts/models/model-test.js.es6 | 13 +++-- .../views/container-view-test.js.es6 | 6 ++- test/javascripts/views/view-test.js.es6 | 6 ++- 27 files changed, 109 insertions(+), 124 deletions(-) delete mode 100644 app/assets/javascripts/discourse/mixins/presence.js create mode 100644 app/assets/javascripts/discourse/mixins/presence.js.es6 rename app/assets/javascripts/discourse/models/{model.js => model.js.es6} (63%) create mode 100644 app/assets/javascripts/discourse/views/grouped.js.es6 delete mode 100644 app/assets/javascripts/discourse/views/view.js create mode 100644 app/assets/javascripts/discourse/views/view.js.es6 delete mode 100644 test/javascripts/admin/controllers/admin-email-index-test.js.es6 delete mode 100644 test/javascripts/admin/controllers/admin-email-preview-digest-test.js.es6 diff --git a/app/assets/javascripts/admin/controllers/admin-logs-screened-emails.js.es6 b/app/assets/javascripts/admin/controllers/admin-logs-screened-emails.js.es6 index e467be5b17..c744f96c48 100644 --- a/app/assets/javascripts/admin/controllers/admin-logs-screened-emails.js.es6 +++ b/app/assets/javascripts/admin/controllers/admin-logs-screened-emails.js.es6 @@ -1,6 +1,7 @@ +import Presence from 'discourse/mixins/presence'; import { outputExportResult } from 'discourse/lib/export-result'; -export default Ember.ArrayController.extend(Discourse.Presence, { +export default Ember.ArrayController.extend(Presence, { loading: false, actions: { diff --git a/app/assets/javascripts/admin/controllers/admin-logs-screened-ip-addresses.js.es6 b/app/assets/javascripts/admin/controllers/admin-logs-screened-ip-addresses.js.es6 index dcbd6505e1..1bc3596973 100644 --- a/app/assets/javascripts/admin/controllers/admin-logs-screened-ip-addresses.js.es6 +++ b/app/assets/javascripts/admin/controllers/admin-logs-screened-ip-addresses.js.es6 @@ -1,6 +1,7 @@ +import Presence from 'discourse/mixins/presence'; import { outputExportResult } from 'discourse/lib/export-result'; -export default Ember.ArrayController.extend(Discourse.Presence, { +export default Ember.ArrayController.extend(Presence, { loading: false, itemController: 'admin-log-screened-ip-address', filter: null, diff --git a/app/assets/javascripts/admin/controllers/admin-logs-screened-urls.js.es6 b/app/assets/javascripts/admin/controllers/admin-logs-screened-urls.js.es6 index 003dedca08..06839b7456 100644 --- a/app/assets/javascripts/admin/controllers/admin-logs-screened-urls.js.es6 +++ b/app/assets/javascripts/admin/controllers/admin-logs-screened-urls.js.es6 @@ -1,6 +1,7 @@ +import Presence from 'discourse/mixins/presence'; import { outputExportResult } from 'discourse/lib/export-result'; -export default Ember.ArrayController.extend(Discourse.Presence, { +export default Ember.ArrayController.extend(Presence, { loading: false, show() { diff --git a/app/assets/javascripts/admin/controllers/admin-logs-staff-action-logs.js.es6 b/app/assets/javascripts/admin/controllers/admin-logs-staff-action-logs.js.es6 index 6784fa1d8f..e3f56d5786 100644 --- a/app/assets/javascripts/admin/controllers/admin-logs-staff-action-logs.js.es6 +++ b/app/assets/javascripts/admin/controllers/admin-logs-staff-action-logs.js.es6 @@ -1,6 +1,7 @@ +import Presence from 'discourse/mixins/presence'; import { outputExportResult } from 'discourse/lib/export-result'; -export default Ember.ArrayController.extend(Discourse.Presence, { +export default Ember.ArrayController.extend(Presence, { loading: false, filters: null, diff --git a/app/assets/javascripts/admin/controllers/admin-site-settings.js.es6 b/app/assets/javascripts/admin/controllers/admin-site-settings.js.es6 index 95fdff940e..9e67e638b5 100644 --- a/app/assets/javascripts/admin/controllers/admin-site-settings.js.es6 +++ b/app/assets/javascripts/admin/controllers/admin-site-settings.js.es6 @@ -1,4 +1,6 @@ -export default Ember.ArrayController.extend(Discourse.Presence, { +import Presence from 'discourse/mixins/presence'; + +export default Ember.ArrayController.extend(Presence, { filter: null, onlyOverridden: false, filtered: Ember.computed.notEmpty('filter'), diff --git a/app/assets/javascripts/discourse/controllers/controller.js.es6 b/app/assets/javascripts/discourse/controllers/controller.js.es6 index 94c3ba1d43..0be72a02a4 100644 --- a/app/assets/javascripts/discourse/controllers/controller.js.es6 +++ b/app/assets/javascripts/discourse/controllers/controller.js.es6 @@ -1 +1,3 @@ -export default Ember.Controller.extend(Discourse.Presence); +import Presence from 'discourse/mixins/presence'; + +export default Ember.Controller.extend(Presence); diff --git a/app/assets/javascripts/discourse/controllers/object.js.es6 b/app/assets/javascripts/discourse/controllers/object.js.es6 index 75a4714285..7351a0a174 100644 --- a/app/assets/javascripts/discourse/controllers/object.js.es6 +++ b/app/assets/javascripts/discourse/controllers/object.js.es6 @@ -1 +1,3 @@ -export default Ember.ObjectController.extend(Discourse.Presence); +import Presence from 'discourse/mixins/presence'; + +export default Ember.ObjectController.extend(Presence); diff --git a/app/assets/javascripts/discourse/controllers/search.js.es6 b/app/assets/javascripts/discourse/controllers/search.js.es6 index 4efcd31dca..bc812e3efe 100644 --- a/app/assets/javascripts/discourse/controllers/search.js.es6 +++ b/app/assets/javascripts/discourse/controllers/search.js.es6 @@ -1,8 +1,9 @@ +import Presence from 'discourse/mixins/presence'; import searchForTerm from 'discourse/lib/search-for-term'; var _dontSearch = false; -export default Em.Controller.extend(Discourse.Presence, { +export default Em.Controller.extend(Presence, { contextType: function(key, value){ if(arguments.length > 1) { diff --git a/app/assets/javascripts/discourse/mixins/presence.js b/app/assets/javascripts/discourse/mixins/presence.js deleted file mode 100644 index a09bea3d60..0000000000 --- a/app/assets/javascripts/discourse/mixins/presence.js +++ /dev/null @@ -1,36 +0,0 @@ -/** - This mixin provides `blank` and `present` to determine whether properties are - there, accounting for more cases than just null and undefined. - - @class Discourse.Presence - @extends Ember.Mixin - @namespace Discourse - @module Discourse -**/ -Discourse.Presence = Em.Mixin.create({ - - /** - Returns whether a property is blank. It considers empty arrays, string, objects, undefined and null - to be blank, otherwise true. - - @method blank - @param {String} name the name of the property we want to check - @return {Boolean} - */ - blank: function(name) { - return Ember.isEmpty(this[name] || this.get(name)); - }, - - /** - Returns whether a property is present. A present property is the opposite of a `blank` one. - - @method present - @param {String} name the name of the property we want to check - @return {Boolean} - */ - present: function(name) { - return !this.blank(name); - } -}); - - diff --git a/app/assets/javascripts/discourse/mixins/presence.js.es6 b/app/assets/javascripts/discourse/mixins/presence.js.es6 new file mode 100644 index 0000000000..742f50f402 --- /dev/null +++ b/app/assets/javascripts/discourse/mixins/presence.js.es6 @@ -0,0 +1,20 @@ +/** + This mixin provides `blank` and `present` to determine whether properties are + there, accounting for more cases than just null and undefined. +**/ +export default Ember.Mixin.create({ + + /** + Returns whether a property is blank. It considers empty arrays, string, objects, undefined and null + to be blank, otherwise true. + */ + blank(name) { + return Ember.isEmpty(this[name] || this.get(name)); + }, + + // Returns whether a property is present. A present property is the opposite of a `blank` one. + present(name) { + return !this.blank(name); + } + +}); diff --git a/app/assets/javascripts/discourse/models/model.js b/app/assets/javascripts/discourse/models/model.js.es6 similarity index 63% rename from app/assets/javascripts/discourse/models/model.js rename to app/assets/javascripts/discourse/models/model.js.es6 index 0c2619c7cb..4a5209bee5 100644 --- a/app/assets/javascripts/discourse/models/model.js +++ b/app/assets/javascripts/discourse/models/model.js.es6 @@ -1,6 +1,8 @@ -Discourse.Model = Ember.Object.extend(Discourse.Presence); +import Presence from 'discourse/mixins/presence'; -Discourse.Model.reopenClass({ +const Model = Ember.Object.extend(Presence); + +Model.reopenClass({ extractByKey: function(collection, klass) { var retval = {}; if (Ember.isEmpty(collection)) { return retval; } @@ -11,3 +13,5 @@ Discourse.Model.reopenClass({ return retval; } }); + +export default Model; diff --git a/app/assets/javascripts/discourse/models/post.js.es6 b/app/assets/javascripts/discourse/models/post.js.es6 index 1d54744332..627cc1aaf8 100644 --- a/app/assets/javascripts/discourse/models/post.js.es6 +++ b/app/assets/javascripts/discourse/models/post.js.es6 @@ -1,4 +1,6 @@ -const Post = Discourse.Model.extend({ +import RestModel from 'discourse/models/rest'; + +const Post = RestModel.extend({ init() { this.set('replyHistory', []); diff --git a/app/assets/javascripts/discourse/models/rest.js.es6 b/app/assets/javascripts/discourse/models/rest.js.es6 index d85475644c..fc5eff01ef 100644 --- a/app/assets/javascripts/discourse/models/rest.js.es6 +++ b/app/assets/javascripts/discourse/models/rest.js.es6 @@ -1,4 +1,6 @@ -export default Ember.Object.extend({ +import Presence from 'discourse/mixins/presence'; + +export default Ember.Object.extend(Presence, { update(attrs) { const self = this, type = this.get('__type'); diff --git a/app/assets/javascripts/discourse/views/container.js.es6 b/app/assets/javascripts/discourse/views/container.js.es6 index f8cbc3bd60..68c6533532 100644 --- a/app/assets/javascripts/discourse/views/container.js.es6 +++ b/app/assets/javascripts/discourse/views/container.js.es6 @@ -1,4 +1,6 @@ -export default Ember.ContainerView.extend(Discourse.Presence, { +import Presence from 'discourse/mixins/presence'; + +export default Ember.ContainerView.extend(Presence, { attachViewWithArgs(viewArgs, viewClass) { if (!viewClass) { viewClass = Ember.View.extend(); } diff --git a/app/assets/javascripts/discourse/views/grouped.js.es6 b/app/assets/javascripts/discourse/views/grouped.js.es6 new file mode 100644 index 0000000000..ed06f49b50 --- /dev/null +++ b/app/assets/javascripts/discourse/views/grouped.js.es6 @@ -0,0 +1,12 @@ +import Presence from 'discourse/mixins/presence'; + +export default Ember.View.extend(Presence, { + _groupInit: function() { + this.set('context', this.get('content')); + + const templateData = this.get('templateData'); + if (templateData) { + this.set('templateData.insideGroup', true); + } + }.on('init') +}); diff --git a/app/assets/javascripts/discourse/views/view.js b/app/assets/javascripts/discourse/views/view.js deleted file mode 100644 index c62af2582e..0000000000 --- a/app/assets/javascripts/discourse/views/view.js +++ /dev/null @@ -1,52 +0,0 @@ -/** - A base view that gives us common functionality, for example `present` and `blank` - - @class View - @extends Ember.View - @uses Discourse.Presence - @namespace Discourse - @module Discourse -**/ -Discourse.View = Ember.View.extend(Discourse.Presence, {}); - -Discourse.GroupedView = Ember.View.extend(Discourse.Presence, { - init: function() { - this._super(); - this.set('context', this.get('content')); - - var templateData = this.get('templateData'); - if (templateData) { - this.set('templateData.insideGroup', true); - } - } -}); - -Discourse.View.reopenClass({ - - /** - Register a view helper for ease of use - - @method registerHelper - @param {String} helperName the name of the helper - @param {Ember.View} helperClass the view that will be inserted by the helper - **/ - registerHelper: function(helperName, helperClass) { - Ember.Handlebars.registerHelper(helperName, function(options) { - var hash = options.hash, - types = options.hashTypes; - - Discourse.Utilities.normalizeHash(hash, types); - return Ember.Handlebars.helpers.view.call(this, helperClass, options); - }); - }, - - renderIfChanged: function() { - Em.warn("`rerenderIfChanged` is deprecated. Use the `StringBuffer` mixin with `rerenderTriggers` instead."); - var args = Array.prototype.slice.call(arguments, 0); - args.unshift(function () { - Ember.run.once(this, 'rerender'); - }); - return Ember.observer.apply(this, args); - } - -}); diff --git a/app/assets/javascripts/discourse/views/view.js.es6 b/app/assets/javascripts/discourse/views/view.js.es6 new file mode 100644 index 0000000000..f939764ebb --- /dev/null +++ b/app/assets/javascripts/discourse/views/view.js.es6 @@ -0,0 +1,17 @@ +import Presence from 'discourse/mixins/presence'; + +const View = Ember.View.extend(Presence, {}); + +View.reopenClass({ + registerHelper(helperName, helperClass) { + Ember.Handlebars.registerHelper(helperName, function(options) { + var hash = options.hash, + types = options.hashTypes; + + Discourse.Utilities.normalizeHash(hash, types); + return Ember.Handlebars.helpers.view.call(this, helperClass, options); + }); + } +}); + +export default View; diff --git a/app/assets/javascripts/main_include.js b/app/assets/javascripts/main_include.js index 9a6e975743..597dbbdd93 100644 --- a/app/assets/javascripts/main_include.js +++ b/app/assets/javascripts/main_include.js @@ -24,6 +24,7 @@ //= require ./discourse/lib/avatar-template //= require ./discourse/lib/safari-hacks //= require_tree ./discourse/adapters +//= require ./discourse/models/rest //= require ./discourse/models/model //= require ./discourse/models/post //= require ./discourse/models/user_action @@ -36,6 +37,7 @@ //= require ./discourse/controllers/object //= require ./discourse/controllers/navigation/default //= require ./discourse/views/view +//= require ./discourse/views/grouped //= require ./discourse/views/container //= require ./discourse/views/modal-body //= require ./discourse/views/flag diff --git a/lib/es6_module_transpiler/tilt/es6_module_transpiler_template.rb b/lib/es6_module_transpiler/tilt/es6_module_transpiler_template.rb index b5cc2a0a7f..2777603580 100644 --- a/lib/es6_module_transpiler/tilt/es6_module_transpiler_template.rb +++ b/lib/es6_module_transpiler/tilt/es6_module_transpiler_template.rb @@ -107,6 +107,7 @@ module Tilt # HAX result = "Controller" if result == "ControllerController" result = "Route" if result == "DiscourseRoute" + result = "View" if result == "ViewView" result.gsub!(/Mixin$/, '') result.gsub!(/Model$/, '') diff --git a/test/javascripts/admin/controllers/admin-email-index-test.js.es6 b/test/javascripts/admin/controllers/admin-email-index-test.js.es6 deleted file mode 100644 index 0456c5e50e..0000000000 --- a/test/javascripts/admin/controllers/admin-email-index-test.js.es6 +++ /dev/null @@ -1,5 +0,0 @@ -moduleFor("controller:admin-email-index"); - -test("mixes in Discourse.Presence", function() { - ok(Discourse.Presence.detect(this.subject())); -}); diff --git a/test/javascripts/admin/controllers/admin-email-preview-digest-test.js.es6 b/test/javascripts/admin/controllers/admin-email-preview-digest-test.js.es6 deleted file mode 100644 index e6aa17bfdb..0000000000 --- a/test/javascripts/admin/controllers/admin-email-preview-digest-test.js.es6 +++ /dev/null @@ -1,5 +0,0 @@ -moduleFor("controller:admin-email-preview-digest"); - -test("mixes in Discourse.Presence", function() { - ok(Discourse.Presence.detect(this.subject())); -}); diff --git a/test/javascripts/controllers/discourse-test.js.es6 b/test/javascripts/controllers/discourse-test.js.es6 index cf5959f8ad..ab8239f851 100644 --- a/test/javascripts/controllers/discourse-test.js.es6 +++ b/test/javascripts/controllers/discourse-test.js.es6 @@ -1,7 +1,8 @@ import DiscourseController from 'discourse/controllers/controller'; +import Presence from 'discourse/mixins/presence'; module("DiscourseController"); test("includes mixins", function() { - ok(Discourse.Presence.detect(DiscourseController.create()), "Discourse.Presence"); + ok(Presence.detect(DiscourseController.create()), "has Presence"); }); diff --git a/test/javascripts/helpers/create-pretender.js.es6 b/test/javascripts/helpers/create-pretender.js.es6 index e6184eee2f..71d2ab593f 100644 --- a/test/javascripts/helpers/create-pretender.js.es6 +++ b/test/javascripts/helpers/create-pretender.js.es6 @@ -131,7 +131,7 @@ export default function() { return response(200, { basic_topic: {id: request.params.id, title: data.title, fancy_title: data.title, - slug: request.params.slug } }) + slug: request.params.slug } }); }); this.post('/posts', function(request) { diff --git a/test/javascripts/mixins/presence-test.js.es6 b/test/javascripts/mixins/presence-test.js.es6 index 268f427908..f11a94588a 100644 --- a/test/javascripts/mixins/presence-test.js.es6 +++ b/test/javascripts/mixins/presence-test.js.es6 @@ -1,6 +1,8 @@ -module("Discourse.Presence"); +import Presence from 'discourse/mixins/presence'; -var testObj = Em.Object.createWithMixins(Discourse.Presence, { +module("mixin:presence"); + +var testObj = Em.Object.createWithMixins(Presence, { emptyString: "", nonEmptyString: "Evil Trout", emptyArray: [], diff --git a/test/javascripts/models/model-test.js.es6 b/test/javascripts/models/model-test.js.es6 index 6404fe88a7..b8d92921ec 100644 --- a/test/javascripts/models/model-test.js.es6 +++ b/test/javascripts/models/model-test.js.es6 @@ -1,14 +1,17 @@ +import Presence from 'discourse/mixins/presence'; +import Model from 'discourse/models/model'; + module("Discourse.Model"); -test("mixes in Discourse.Presence", function() { - ok(Discourse.Presence.detect(Discourse.Model.create())); +test("mixes in Presence", function() { + ok(Presence.detect(Model.create())); }); test("extractByKey: converts a list of hashes into a hash of instances of specified class, indexed by their ids", function() { var firstObject = {id: "id_1", foo: "foo_1"}; var secondObject = {id: "id_2", foo: "foo_2"}; - var actual = Discourse.Model.extractByKey([firstObject, secondObject], Ember.Object); + var actual = Model.extractByKey([firstObject, secondObject], Ember.Object); var expected = { id_1: Ember.Object.create(firstObject), id_2: Ember.Object.create(secondObject) @@ -18,6 +21,6 @@ test("extractByKey: converts a list of hashes into a hash of instances of specif }); test("extractByKey: returns an empty hash if there isn't anything to convert", function() { - deepEqual(Discourse.Model.extractByKey(), {}, "when called without parameters"); - deepEqual(Discourse.Model.extractByKey([]), {}, "when called with an empty array"); + deepEqual(Model.extractByKey(), {}, "when called without parameters"); + deepEqual(Model.extractByKey([]), {}, "when called with an empty array"); }); diff --git a/test/javascripts/views/container-view-test.js.es6 b/test/javascripts/views/container-view-test.js.es6 index c462559436..e8f3b2a8a4 100644 --- a/test/javascripts/views/container-view-test.js.es6 +++ b/test/javascripts/views/container-view-test.js.es6 @@ -1,3 +1,5 @@ +import Presence from 'discourse/mixins/presence'; + var SomeViewClass = Ember.View.extend(); function containerHasOnlyOneChild(containerView, klass) { @@ -17,9 +19,9 @@ function childHasProperty(containerView, name) { moduleFor("view:container"); -test("mixes in Discourse.Presence", function() { +test("mixes in Presence", function() { var containerView = this.subject(); - ok(Discourse.Presence.detect(containerView)); + ok(Presence.detect(containerView)); }); test("attachViewWithArgs: creates a view of a given class with given properties and appends it to the container", function() { diff --git a/test/javascripts/views/view-test.js.es6 b/test/javascripts/views/view-test.js.es6 index f9ea42dfe4..ee62c02de7 100644 --- a/test/javascripts/views/view-test.js.es6 +++ b/test/javascripts/views/view-test.js.es6 @@ -1,3 +1,5 @@ +import Presence from 'discourse/mixins/presence'; + var oldHelpers; module("Discourse.View", { @@ -10,8 +12,8 @@ module("Discourse.View", { } }); -test("mixes in Discourse.Presence", function() { - ok(Discourse.Presence.detect(Discourse.View.create())); +test("mixes in Presence", function() { + ok(Presence.detect(Discourse.View.create())); }); test("registerHelper: enables embedding a child view in a parent view via dedicated, named helper instead of generic 'view' helper", function() { From d4a05825da211e330d0d3a4a6d10894b1087997a Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Wed, 8 Apr 2015 14:44:44 -0400 Subject: [PATCH 020/113] Convert `Composer` to use Store - Uses store for `PostStream`, `TopicList` too --- .../discourse/adapters/topic-list.js.es6 | 39 +++ .../discourse/controllers/composer.js.es6 | 2 +- .../controllers/discovery/topics.js.es6 | 3 +- .../discourse/models/composer.js.es6 | 11 +- .../discourse/models/post-stream.js.es6 | 24 +- .../javascripts/discourse/models/post.js.es6 | 21 +- .../javascripts/discourse/models/rest.js.es6 | 28 +- .../javascripts/discourse/models/store.js.es6 | 49 +++- .../discourse/models/topic-details.js.es6 | 7 +- .../discourse/models/topic-list.js.es6 | 163 +++++++++++ .../javascripts/discourse/models/topic.js.es6 | 9 +- .../discourse/models/topic_list.js | 272 ------------------ .../routes/build-category-route.js.es6 | 4 +- .../discourse/routes/build-topic-route.js.es6 | 63 +++- .../routes/build-user-topic-list-route.js.es6 | 2 +- .../javascripts/discourse/routes/topic.js.es6 | 6 +- .../routes/user-activity-topics.js.es6 | 2 +- app/assets/javascripts/main_include.js | 4 +- test/javascripts/helpers/create-store.js.es6 | 7 +- .../models/post-stream-test.js.es6 | 145 +++++----- .../javascripts/models/rest-model-test.js.es6 | 15 + test/javascripts/models/store-test.js.es6 | 22 ++ test/javascripts/test_helper.js | 2 + 23 files changed, 507 insertions(+), 393 deletions(-) create mode 100644 app/assets/javascripts/discourse/adapters/topic-list.js.es6 create mode 100644 app/assets/javascripts/discourse/models/topic-list.js.es6 delete mode 100644 app/assets/javascripts/discourse/models/topic_list.js diff --git a/app/assets/javascripts/discourse/adapters/topic-list.js.es6 b/app/assets/javascripts/discourse/adapters/topic-list.js.es6 new file mode 100644 index 0000000000..46a3a56683 --- /dev/null +++ b/app/assets/javascripts/discourse/adapters/topic-list.js.es6 @@ -0,0 +1,39 @@ +import RestAdapter from 'discourse/adapters/rest'; + +function finderFor(filter, params) { + return function() { + let url = Discourse.getURL("/") + filter + ".json"; + + if (params) { + const keys = Object.keys(params), + encoded = []; + + keys.forEach(function(p) { + const value = params[p]; + if (typeof value !== 'undefined') { + encoded.push(p + "=" + value); + } + }); + + if (encoded.length > 0) { + url += "?" + encoded.join('&'); + } + } + return Discourse.ajax(url); + }; +} + +export default RestAdapter.extend({ + + find(store, type, findArgs) { + const filter = findArgs.filter; + const params = findArgs.params; + + return PreloadStore.getAndRemove("topic_list_" + filter, finderFor(filter, params)).then(function(result) { + result.filter = filter; + result.params = params; + return result; + }); + } +}); + diff --git a/app/assets/javascripts/discourse/controllers/composer.js.es6 b/app/assets/javascripts/discourse/controllers/composer.js.es6 index 2a2f13cf4a..d8c8980700 100644 --- a/app/assets/javascripts/discourse/controllers/composer.js.es6 +++ b/app/assets/javascripts/discourse/controllers/composer.js.es6 @@ -413,7 +413,7 @@ export default DiscourseController.extend({ composerModel.set('topic', opts.topic); } } else { - composerModel = composerModel || Discourse.Composer.create({ store: this.store }); + composerModel = composerModel || this.store.createRecord('composer'); composerModel.open(opts); } diff --git a/app/assets/javascripts/discourse/controllers/discovery/topics.js.es6 b/app/assets/javascripts/discourse/controllers/discovery/topics.js.es6 index 27ae37afd9..293d9c826c 100644 --- a/app/assets/javascripts/discourse/controllers/discovery/topics.js.es6 +++ b/app/assets/javascripts/discourse/controllers/discovery/topics.js.es6 @@ -48,7 +48,8 @@ var controllerOpts = { // router and ember throws an error due to missing `handlerInfos`. // Lesson learned: Don't call `loading` yourself. this.set('controllers.discovery.loading', true); - Discourse.TopicList.find(filter).then(function(list) { + + this.store.findFiltered('topicList', {filter}).then(function(list) { Discourse.TopicList.hideUniformCategory(list, self.get('category')); self.setProperties({ model: list }); diff --git a/app/assets/javascripts/discourse/models/composer.js.es6 b/app/assets/javascripts/discourse/models/composer.js.es6 index 8171432a0e..8b0df34811 100644 --- a/app/assets/javascripts/discourse/models/composer.js.es6 +++ b/app/assets/javascripts/discourse/models/composer.js.es6 @@ -1,3 +1,7 @@ +import RestModel from 'discourse/models/rest'; +import Post from 'discourse/models/post'; +import Topic from 'discourse/models/topic'; + const CLOSED = 'closed', SAVING = 'saving', OPEN = 'open', @@ -26,7 +30,7 @@ const CLOSED = 'closed', categoryId: 'topic.category.id' }; -const Composer = Discourse.Model.extend({ +const Composer = RestModel.extend({ archetypes: function() { return this.site.get('archetypes'); @@ -420,7 +424,8 @@ const Composer = Discourse.Model.extend({ post.get('post_number') === 1 && this.get('topic.details.can_edit')) { const topicProps = this.getProperties(Object.keys(_edit_topic_serializer)); - promise = Discourse.Topic.update(this.get('topic'), topicProps); + + promise = Topic.update(this.get('topic'), topicProps); } else { promise = Ember.RSVP.resolve(); } @@ -468,7 +473,7 @@ const Composer = Discourse.Model.extend({ let addedToStream = false; // Build the post object - const createdPost = Discourse.Post.create({ + const createdPost = Post.create({ imageSizes: opts.imageSizes, cooked: this.getCookedHtml(), reply_count: 0, diff --git a/app/assets/javascripts/discourse/models/post-stream.js.es6 b/app/assets/javascripts/discourse/models/post-stream.js.es6 index 7c3ae0cf26..6ff9f73bdb 100644 --- a/app/assets/javascripts/discourse/models/post-stream.js.es6 +++ b/app/assets/javascripts/discourse/models/post-stream.js.es6 @@ -1,4 +1,6 @@ -const PostStream = Ember.Object.extend({ +import RestModel from 'discourse/models/rest'; + +const PostStream = RestModel.extend({ loading: Em.computed.or('loadingAbove', 'loadingBelow', 'loadingFilter', 'stagingPost'), notLoading: Em.computed.not('loading'), filteredPostsCount: Em.computed.alias("stream.length"), @@ -420,8 +422,9 @@ const PostStream = Ember.Object.extend({ } else { // need to insert into stream const url = "/posts/" + postId; + const store = this.store; Discourse.ajax(url).then(function(p){ - const post = Discourse.Post.create(p); + const post = store.createRecord('post', p); const stream = self.get("stream"); const posts = self.get("posts"); self.storePost(post); @@ -461,9 +464,10 @@ const PostStream = Ember.Object.extend({ if(existing){ const url = "/posts/" + postId; + const store = this.store; Discourse.ajax(url).then( function(p){ - self.storePost(Discourse.Post.create(p)); + self.storePost(store.createRecord('post', p)); }, function(){ self.removePosts([existing]); @@ -480,8 +484,9 @@ const PostStream = Ember.Object.extend({ if (existing && existing.updated_at !== updatedAt) { const url = "/posts/" + postId; + const store = this.store; Discourse.ajax(url).then(function(p){ - self.storePost(Discourse.Post.create(p)); + self.storePost(store.createRecord('post', p)); }); } }, @@ -491,9 +496,10 @@ const PostStream = Ember.Object.extend({ const postStream = this, url = "/posts/" + post.get('id') + "/reply-history.json?max_replies=" + Discourse.SiteSettings.max_reply_history; + const store = this.store; return Discourse.ajax(url).then(function(result) { return result.map(function (p) { - return postStream.storePost(Discourse.Post.create(p)); + return postStream.storePost(store.createRecord('post', p)); }); }).then(function (replyHistory) { post.set('replyHistory', replyHistory); @@ -594,8 +600,9 @@ const PostStream = Ember.Object.extend({ this.set('gaps', null); if (postStreamData) { // Load posts if present + const store = this.store; postStreamData.posts.forEach(function(p) { - postStream.appendPost(Discourse.Post.create(p)); + postStream.appendPost(store.createRecord('post', p)); }); delete postStreamData.posts; @@ -671,11 +678,12 @@ const PostStream = Ember.Object.extend({ data = { post_ids: postIds }, postStream = this; + const store = this.store; return Discourse.ajax(url, {data: data}).then(function(result) { const posts = Em.get(result, "post_stream.posts"); if (posts) { posts.forEach(function (p) { - postStream.storePost(Discourse.Post.create(p)); + postStream.storePost(store.createRecord('post', p)); }); } }); @@ -751,6 +759,8 @@ PostStream.reopenClass({ url += "/" + opts.nearPost; } delete opts.nearPost; + delete opts.__type; + delete opts.store; return PreloadStore.getAndRemove("topic_" + topicId, function() { return Discourse.ajax(url + ".json", {data: opts}); diff --git a/app/assets/javascripts/discourse/models/post.js.es6 b/app/assets/javascripts/discourse/models/post.js.es6 index 627cc1aaf8..6a45675a05 100644 --- a/app/assets/javascripts/discourse/models/post.js.es6 +++ b/app/assets/javascripts/discourse/models/post.js.es6 @@ -394,32 +394,29 @@ const Post = RestModel.extend({ throw e; }); } + }); Post.reopenClass({ - createActionSummary(result) { - if (result.actions_summary) { + munge(json) { + if (json.actions_summary) { const lookup = Em.Object.create(); // this area should be optimized, it is creating way too many objects per post - result.actions_summary = result.actions_summary.map(function(a) { - a.post = result; + json.actions_summary = json.actions_summary.map(function(a) { + a.post = json; a.actionType = Discourse.Site.current().postActionTypeById(a.id); const actionSummary = Discourse.ActionSummary.create(a); lookup[a.actionType.name_key] = actionSummary; return actionSummary; }); - result.set('actionByName', lookup); + json.actionByName = lookup; } - }, - create(obj) { - const result = this._super.apply(this, arguments); - this.createActionSummary(result); - if (obj && obj.reply_to_user) { - result.set('reply_to_user', Discourse.User.create(obj.reply_to_user)); + if (json && json.reply_to_user) { + json.reply_to_user = Discourse.User.create(json.reply_to_user); } - return result; + return json; }, updateBookmark(postId, bookmarked) { diff --git a/app/assets/javascripts/discourse/models/rest.js.es6 b/app/assets/javascripts/discourse/models/rest.js.es6 index fc5eff01ef..d4ec50be0b 100644 --- a/app/assets/javascripts/discourse/models/rest.js.es6 +++ b/app/assets/javascripts/discourse/models/rest.js.es6 @@ -1,16 +1,18 @@ import Presence from 'discourse/mixins/presence'; -export default Ember.Object.extend(Presence, { +const RestModel = Ember.Object.extend(Presence, { update(attrs) { const self = this, type = this.get('__type'); + + const munge = this.__munge; return this.store.update(type, this.get('id'), attrs).then(function(result) { if (result && result[type]) { Object.keys(result).forEach(function(k) { attrs[k] = result[k]; }); } - self.setProperties(attrs); + self.setProperties(munge(attrs)); return result; }); }, @@ -20,3 +22,25 @@ export default Ember.Object.extend(Presence, { return this.store.destroyRecord(type, this); } }); + +RestModel.reopenClass({ + + // Overwrite and JSON will be passed through here before `create` and `update` + munge(json) { + return json; + }, + + create(args) { + args = args || {}; + if (!args.store) { + const container = Discourse.__container__; + Ember.warn('Use `store.createRecord` to create records instead of `.create()`'); + args.store = container.lookup('store:main'); + } + + args.__munge = this.munge; + return this._super(this.munge(args, args.store)); + } +}); + +export default RestModel; diff --git a/app/assets/javascripts/discourse/models/store.js.es6 b/app/assets/javascripts/discourse/models/store.js.es6 index 72f36db374..0430bc4878 100644 --- a/app/assets/javascripts/discourse/models/store.js.es6 +++ b/app/assets/javascripts/discourse/models/store.js.es6 @@ -1,7 +1,14 @@ import RestModel from 'discourse/models/rest'; import ResultSet from 'discourse/models/result-set'; -const _identityMap = {}; +let _identityMap; + +// You should only call this if you're a test scaffold +function flushMap() { + _identityMap = {}; +} + +flushMap(); export default Ember.Object.extend({ pluralize(thing) { @@ -16,6 +23,15 @@ export default Ember.Object.extend({ }); }, + // Mostly for legacy, things like TopicList without ResultSets + findFiltered(type, findArgs) { + const adapter = this.container.lookup('adapter:' + type) || this.container.lookup('adapter:rest'); + const self = this; + return adapter.find(this, type, findArgs).then(function(result) { + return self._build(type, result); + }); + }, + find(type, findArgs) { const adapter = this.container.lookup('adapter:' + type) || this.container.lookup('adapter:rest'); const self = this; @@ -60,7 +76,8 @@ export default Ember.Object.extend({ }, createRecord(type, attrs) { - return this._hydrate(type, attrs); + attrs = attrs || {}; + return !!attrs.id ? this._hydrate(type, attrs) : this._build(type, attrs); }, destroyRecord(type, record) { @@ -81,6 +98,19 @@ export default Ember.Object.extend({ return ResultSet.create({ content, totalRows, loadMoreUrl, store: this, __type: type }); }, + _build(type, obj) { + obj.store = this; + obj.__type = type; + + const klass = this.container.lookupFactory('model:' + type) || RestModel; + const model = klass.create(obj); + + if (obj.id) { + _identityMap[type][obj.id] = model; + } + return model; + }, + _hydrate(type, obj) { if (!obj) { throw "Can't hydrate " + type + " of `null`"; } if (!obj.id) { throw "Can't hydrate " + type + " without an `id`"; } @@ -88,18 +118,17 @@ export default Ember.Object.extend({ _identityMap[type] = _identityMap[type] || {}; const existing = _identityMap[type][obj.id]; + if (existing === obj) { return existing; } + if (existing) { delete obj.id; - existing.setProperties(obj); + const klass = this.container.lookupFactory('model:' + type) || RestModel; + existing.setProperties(klass.munge(obj)); return existing; } - obj.store = this; - obj.__type = type; - - const klass = this.container.lookupFactory('model:' + type) || RestModel; - const model = klass.create(obj); - _identityMap[type][obj.id] = model; - return model; + return this._build(type, obj); } }); + +export { flushMap }; diff --git a/app/assets/javascripts/discourse/models/topic-details.js.es6 b/app/assets/javascripts/discourse/models/topic-details.js.es6 index 6e6c1b05b2..9c8ca30e27 100644 --- a/app/assets/javascripts/discourse/models/topic-details.js.es6 +++ b/app/assets/javascripts/discourse/models/topic-details.js.es6 @@ -2,7 +2,9 @@ A model representing a Topic's details that aren't always present, such as a list of participants. When showing topics in lists and such this information should not be required. **/ -const TopicDetails = Discourse.Model.extend({ +import RestModel from 'discourse/models/rest'; + +const TopicDetails = RestModel.extend({ loaded: false, updateFromJson(details) { @@ -15,8 +17,9 @@ const TopicDetails = Discourse.Model.extend({ } if (details.suggested_topics) { + const store = this.store; details.suggested_topics = details.suggested_topics.map(function (st) { - return Discourse.Topic.create(st); + return store.createRecord('topic', st); }); } diff --git a/app/assets/javascripts/discourse/models/topic-list.js.es6 b/app/assets/javascripts/discourse/models/topic-list.js.es6 new file mode 100644 index 0000000000..36b0ba6795 --- /dev/null +++ b/app/assets/javascripts/discourse/models/topic-list.js.es6 @@ -0,0 +1,163 @@ +import RestModel from 'discourse/models/rest'; +import Model from 'discourse/models/model'; + + +function topicsFrom(result, store) { + if (!result) { return; } + + // Stitch together our side loaded data + const categories = Discourse.Category.list(), + users = Model.extractByKey(result.users, Discourse.User); + + return result.topic_list.topics.map(function (t) { + t.category = categories.findBy('id', t.category_id); + t.posters.forEach(function(p) { + p.user = users[p.user_id]; + }); + if (t.participants) { + t.participants.forEach(function(p) { + p.user = users[p.user_id]; + }); + } + return store.createRecord('topic', t); + }); +} + +const TopicList = RestModel.extend({ + canLoadMore: Em.computed.notEmpty("more_topics_url"), + + forEachNew: function(topics, callback) { + const topicIds = []; + _.each(this.get('topics'),function(topic) { + topicIds[topic.get('id')] = true; + }); + + _.each(topics,function(topic) { + if(!topicIds[topic.id]) { + callback(topic); + } + }); + }, + + refreshSort: function(order, ascending) { + const self = this, + params = this.get('params'); + + params.order = order || params.order; + + if (ascending === undefined) { + params.ascending = ascending; + } else { + params.ascending = ascending; + } + + this.set('loaded', false); + const store = this.store; + store.findFiltered('topicList', {filter: this.get('filter'), params}).then(function(tl) { + const newTopics = tl.get('topics'), + topics = self.get('topics'); + + topics.clear(); + topics.pushObjects(newTopics); + self.setProperties({ loaded: true, more_topics_url: newTopics.get('more_topics_url') }); + }); + }, + + loadMore: function() { + if (this.get('loadingMore')) { return Ember.RSVP.resolve(); } + + const moreUrl = this.get('more_topics_url'); + if (moreUrl) { + const self = this; + this.set('loadingMore', true); + + const store = this.store; + return Discourse.ajax({url: moreUrl}).then(function (result) { + let topicsAdded = 0; + + if (result) { + // the new topics loaded from the server + const newTopics = topicsFrom(result, store), + topics = self.get("topics"); + + self.forEachNew(newTopics, function(t) { + t.set('highlight', topicsAdded++ === 0); + topics.pushObject(t); + }); + + self.setProperties({ + loadingMore: false, + more_topics_url: result.topic_list.more_topics_url + }); + + Discourse.Session.currentProp('topicList', self); + return self.get('more_topics_url'); + } + }); + } else { + // Return a promise indicating no more results + return Ember.RSVP.resolve(); + } + }, + + + // loads topics with these ids "before" the current topics + loadBefore: function(topic_ids){ + const topicList = this, + topics = this.get('topics'); + + // refresh dupes + topics.removeObjects(topics.filter(function(topic){ + return topic_ids.indexOf(topic.get('id')) >= 0; + })); + + const url = Discourse.getURL("/") + this.get('filter') + "?topic_ids=" + topic_ids.join(","); + + const store = this.store; + return Discourse.ajax({ url }).then(function(result) { + let i = 0; + topicList.forEachNew(topicsFrom(result, store), function(t) { + // highlight the first of the new topics so we can get a visual feedback + t.set('highlight', true); + topics.insertAt(i,t); + i++; + }); + Discourse.Session.currentProp('topicList', topicList); + }); + } +}); + +TopicList.reopenClass({ + + munge(json, store) { + json.inserted = json.inserted || []; + json.can_create_topic = json.topic_list.can_create_topic; + json.more_topics_url = json.topic_list.more_topics_url; + json.draft_key = json.topic_list.draft_key; + json.draft_sequence = json.topic_list.draft_sequence; + json.draft = json.topic_list.draft; + json.for_period = json.topic_list.for_period; + json.loaded = true; + json.per_page = json.topic_list.per_page; + json.topics = topicsFrom(json, store); + + if (json.topic_list.filtered_category) { + json.category = Discourse.Category.create(json.topic_list.filtered_category); + } + return json; + }, + + find(filter, params) { + const store = Discourse.__container__.lookup('store:main'); + return store.findFiltered('topicList', {filter, params}); + }, + + // Sets `hideCategory` if all topics in the last have a particular category + hideUniformCategory(list, category) { + const hideCategory = !list.get('topics').any(function (t) { return t.get('category') !== category; }); + list.set('hideCategory', hideCategory); + } + +}); + +export default TopicList; diff --git a/app/assets/javascripts/discourse/models/topic.js.es6 b/app/assets/javascripts/discourse/models/topic.js.es6 index a2e984ea30..2b51a06d66 100644 --- a/app/assets/javascripts/discourse/models/topic.js.es6 +++ b/app/assets/javascripts/discourse/models/topic.js.es6 @@ -1,7 +1,6 @@ -import TopicDetails from 'discourse/models/topic-details'; -import PostStream from 'discourse/models/post-stream'; +import RestModel from 'discourse/models/rest'; -const Topic = Discourse.Model.extend({ +const Topic = RestModel.extend({ // returns createdAt if there's no bumped date bumpedAt: function() { @@ -23,7 +22,7 @@ const Topic = Discourse.Model.extend({ }.property('created_at'), postStream: function() { - return PostStream.create({topic: this}); + return this.store.createRecord('postStream', {id: this.get('id'), topic: this}); }.property(), replyCount: function() { @@ -31,7 +30,7 @@ const Topic = Discourse.Model.extend({ }.property('posts_count'), details: function() { - return TopicDetails.create({topic: this}); + return this.store.createRecord('topicDetails', {id: this.get('id'), topic: this}); }.property(), invisible: Em.computed.not('visible'), diff --git a/app/assets/javascripts/discourse/models/topic_list.js b/app/assets/javascripts/discourse/models/topic_list.js deleted file mode 100644 index dce4524d0f..0000000000 --- a/app/assets/javascripts/discourse/models/topic_list.js +++ /dev/null @@ -1,272 +0,0 @@ -function finderFor(filter, params) { - return function() { - var url = Discourse.getURL("/") + filter + ".json"; - - if (params) { - var keys = Object.keys(params), - encoded = []; - - keys.forEach(function(p) { - var value = params[p]; - if (typeof value !== 'undefined') { - encoded.push(p + "=" + value); - } - }); - - if (encoded.length > 0) { - url += "?" + encoded.join('&'); - } - } - return Discourse.ajax(url); - }; -} - -Discourse.TopicList = Discourse.Model.extend({ - canLoadMore: Em.computed.notEmpty("more_topics_url"), - - forEachNew: function(topics, callback) { - var topicIds = []; - _.each(this.get('topics'),function(topic) { - topicIds[topic.get('id')] = true; - }); - - _.each(topics,function(topic) { - if(!topicIds[topic.id]) { - callback(topic); - } - }); - }, - - refreshSort: function(order, ascending) { - var self = this, - params = this.get('params'); - - params.order = order || params.order; - - if (ascending === undefined) { - params.ascending = ascending; - } else { - params.ascending = ascending; - } - - this.set('loaded', false); - var finder = finderFor(this.get('filter'), params); - finder().then(function (result) { - var newTopics = Discourse.TopicList.topicsFrom(result), - topics = self.get('topics'); - - topics.clear(); - topics.pushObjects(newTopics); - self.setProperties({ loaded: true, more_topics_url: result.topic_list.more_topics_url }); - }); - }, - - loadMore: function() { - if (this.get('loadingMore')) { return Ember.RSVP.resolve(); } - - var moreUrl = this.get('more_topics_url'); - if (moreUrl) { - var self = this; - this.set('loadingMore', true); - - return Discourse.ajax({url: moreUrl}).then(function (result) { - var topicsAdded = 0; - if (result) { - // the new topics loaded from the server - var newTopics = Discourse.TopicList.topicsFrom(result), - topics = self.get("topics"); - - self.forEachNew(newTopics, function(t) { - t.set('highlight', topicsAdded++ === 0); - topics.pushObject(t); - }); - - self.setProperties({ - loadingMore: false, - more_topics_url: result.topic_list.more_topics_url - }); - - Discourse.Session.currentProp('topicList', self); - return self.get('more_topics_url'); - } - }); - } else { - // Return a promise indicating no more results - return Ember.RSVP.resolve(); - } - }, - - - // loads topics with these ids "before" the current topics - loadBefore: function(topic_ids){ - var topicList = this, - topics = this.get('topics'); - - // refresh dupes - topics.removeObjects(topics.filter(function(topic){ - return topic_ids.indexOf(topic.get('id')) >= 0; - })); - - Discourse.TopicList.loadTopics(topic_ids, this.get('filter')) - .then(function(newTopics){ - var i = 0; - topicList.forEachNew(newTopics, function(t) { - // highlight the first of the new topics so we can get a visual feedback - t.set('highlight', true); - topics.insertAt(i,t); - i++; - }); - Discourse.Session.currentProp('topicList', topicList); - }); - } -}); - -Discourse.TopicList.reopenClass({ - - loadTopics: function(topic_ids, filter) { - return new Ember.RSVP.Promise(function(resolve, reject) { - var url = Discourse.getURL("/") + filter + "?topic_ids=" + topic_ids.join(","); - - Discourse.ajax({url: url}).then(function (result) { - if (result) { - // the new topics loaded from the server - var newTopics = Discourse.TopicList.topicsFrom(result); - resolve(newTopics); - } else { - reject(); - } - }).catch(reject); - }); - }, - - /** - Stitch together side loaded topic data - - @method topicsFrom - @param {Object} result JSON object with topic data - @returns {Array} the list of topics - **/ - topicsFrom: function(result) { - // Stitch together our side loaded data - var categories = Discourse.Category.list(), - users = this.extractByKey(result.users, Discourse.User); - - return result.topic_list.topics.map(function (t) { - t.category = categories.findBy('id', t.category_id); - t.posters.forEach(function(p) { - p.user = users[p.user_id]; - }); - if (t.participants) { - t.participants.forEach(function(p) { - p.user = users[p.user_id]; - }); - } - return Discourse.Topic.create(t); - }); - }, - - from: function(result, filter, params) { - var topicList = Discourse.TopicList.create({ - inserted: [], - filter: filter, - params: params || {}, - topics: Discourse.TopicList.topicsFrom(result), - can_create_topic: result.topic_list.can_create_topic, - more_topics_url: result.topic_list.more_topics_url, - draft_key: result.topic_list.draft_key, - draft_sequence: result.topic_list.draft_sequence, - draft: result.topic_list.draft, - for_period: result.topic_list.for_period, - loaded: true, - per_page: result.topic_list.per_page - }); - - if (result.topic_list.filtered_category) { - topicList.set('category', Discourse.Category.create(result.topic_list.filtered_category)); - } - - return topicList; - }, - - /** - Lists topics on a given menu item - - @method list - @param {Object} filter The menu item to filter to - @param {Object} params Any additional params to pass to TopicList.find() - @param {Object} extras Additional finding options, such as caching - @returns {Promise} a promise that resolves to the list of topics - **/ - list: function(filter, filterParams, extras) { - var tracking = Discourse.TopicTrackingState.current(); - - extras = extras || {}; - return new Ember.RSVP.Promise(function(resolve) { - var session = Discourse.Session.current(); - - if (extras.cached) { - var cachedList = session.get('topicList'); - - // Try to use the cached version if it exists and is greater than the topics per page - if (cachedList && (cachedList.get('filter') === filter) && - (cachedList.get('topics.length') || 0) > cachedList.get('per_page') && - _.isEqual(cachedList.get('listParams'), filterParams)) { - cachedList.set('loaded', true); - - if (tracking) { - tracking.updateTopics(cachedList.get('topics')); - } - return resolve(cachedList); - } - session.set('topicList', null); - } else { - // Clear the cache - session.setProperties({topicList: null, topicListScrollPosition: null}); - } - - - // Clean up any string parameters that might slip through - filterParams = filterParams || {}; - Ember.keys(filterParams).forEach(function(k) { - var val = filterParams[k]; - if (val === "undefined" || val === "null" || val === 'false') { - filterParams[k] = undefined; - } - }); - - var findParams = {}; - Discourse.SiteSettings.top_menu.split('|').forEach(function (i) { - if (i.indexOf(filter) === 0) { - var exclude = i.split("-"); - if (exclude && exclude.length === 2) { - findParams.exclude_category = exclude[1]; - } - } - }); - return resolve(Discourse.TopicList.find(filter, _.extend(findParams, filterParams || {}))); - - }).then(function(list) { - list.set('listParams', filterParams); - if (tracking) { - tracking.sync(list, list.filter); - tracking.trackIncoming(list.filter); - } - Discourse.Session.currentProp('topicList', list); - return list; - }); - }, - - find: function(filter, params) { - return PreloadStore.getAndRemove("topic_list_" + filter, finderFor(filter, params)).then(function(result) { - return Discourse.TopicList.from(result, filter, params); - }); - }, - - // Sets `hideCategory` if all topics in the last have a particular category - hideUniformCategory: function(list, category) { - var hideCategory = !list.get('topics').any(function (t) { return t.get('category') !== category; }); - list.set('hideCategory', hideCategory); - } - -}); - diff --git a/app/assets/javascripts/discourse/routes/build-category-route.js.es6 b/app/assets/javascripts/discourse/routes/build-category-route.js.es6 index 8113104ea9..fe794b4482 100644 --- a/app/assets/javascripts/discourse/routes/build-category-route.js.es6 +++ b/app/assets/javascripts/discourse/routes/build-category-route.js.es6 @@ -1,4 +1,4 @@ -import { queryParams, filterQueryParams } from 'discourse/routes/build-topic-route'; +import { queryParams, filterQueryParams, findTopicList } from 'discourse/routes/build-topic-route'; // A helper function to create a category route with parameters export default function(filter, params) { @@ -52,7 +52,7 @@ export default function(filter, params) { var findOpts = filterQueryParams(transition.queryParams, params), extras = { cached: this.isPoppedState(transition) }; - return Discourse.TopicList.list(listFilter, findOpts, extras).then(function(list) { + return findTopicList(this.store, listFilter, findOpts, extras).then(function(list) { Discourse.TopicList.hideUniformCategory(list, model); self.set('topics', list); }); diff --git a/app/assets/javascripts/discourse/routes/build-topic-route.js.es6 b/app/assets/javascripts/discourse/routes/build-topic-route.js.es6 index 4b21e9b0bb..81b94b5a2d 100644 --- a/app/assets/javascripts/discourse/routes/build-topic-route.js.es6 +++ b/app/assets/javascripts/discourse/routes/build-topic-route.js.es6 @@ -11,6 +11,65 @@ function filterQueryParams(params, defaultParams) { return findOpts; } +function findTopicList(store, filter, filterParams, extras) { + const tracking = Discourse.TopicTrackingState.current(); + + extras = extras || {}; + return new Ember.RSVP.Promise(function(resolve) { + const session = Discourse.Session.current(); + + if (extras.cached) { + const cachedList = session.get('topicList'); + + // Try to use the cached version if it exists and is greater than the topics per page + if (cachedList && (cachedList.get('filter') === filter) && + (cachedList.get('topics.length') || 0) > cachedList.get('per_page') && + _.isEqual(cachedList.get('listParams'), filterParams)) { + cachedList.set('loaded', true); + + if (tracking) { + tracking.updateTopics(cachedList.get('topics')); + } + return resolve(cachedList); + } + session.set('topicList', null); + } else { + // Clear the cache + session.setProperties({topicList: null, topicListScrollPosition: null}); + } + + + // Clean up any string parameters that might slip through + filterParams = filterParams || {}; + Ember.keys(filterParams).forEach(function(k) { + const val = filterParams[k]; + if (val === "undefined" || val === "null" || val === 'false') { + filterParams[k] = undefined; + } + }); + + const findParams = {}; + Discourse.SiteSettings.top_menu.split('|').forEach(function (i) { + if (i.indexOf(filter) === 0) { + const exclude = i.split("-"); + if (exclude && exclude.length === 2) { + findParams.exclude_category = exclude[1]; + } + } + }); + return resolve(store.findFiltered('topicList', { filter, params:_.extend(findParams, filterParams || {})})); + + }).then(function(list) { + list.set('listParams', filterParams); + if (tracking) { + tracking.sync(list, list.filter); + tracking.trackIncoming(list.filter); + } + Discourse.Session.currentProp('topicList', list); + return list; + }); +} + export default function(filter, extras) { extras = extras || {}; return Discourse.Route.extend({ @@ -28,7 +87,7 @@ export default function(filter, extras) { const findOpts = filterQueryParams(transition.queryParams), extras = { cached: this.isPoppedState(transition) }; - return Discourse.TopicList.list(filter, findOpts, extras); + return findTopicList(this.store, filter, findOpts, extras); }, titleToken() { @@ -72,4 +131,4 @@ export default function(filter, extras) { }, extras); } -export { filterQueryParams }; +export { filterQueryParams, findTopicList }; diff --git a/app/assets/javascripts/discourse/routes/build-user-topic-list-route.js.es6 b/app/assets/javascripts/discourse/routes/build-user-topic-list-route.js.es6 index ae1ff7ba3b..c8c345e88b 100644 --- a/app/assets/javascripts/discourse/routes/build-user-topic-list-route.js.es6 +++ b/app/assets/javascripts/discourse/routes/build-user-topic-list-route.js.es6 @@ -14,7 +14,7 @@ export default function (viewName, path) { }, model: function() { - return Discourse.TopicList.find('topics/' + path + '/' + this.modelFor('user').get('username_lower')); + return this.store.findFiltered('topicList', {filter: 'topics/' + path + '/' + this.modelFor('user').get('username_lower')}); }, setupController: function() { diff --git a/app/assets/javascripts/discourse/routes/topic.js.es6 b/app/assets/javascripts/discourse/routes/topic.js.es6 index 725c895ead..0f23333859 100644 --- a/app/assets/javascripts/discourse/routes/topic.js.es6 +++ b/app/assets/javascripts/discourse/routes/topic.js.es6 @@ -5,7 +5,6 @@ let isTransitioning = false, const SCROLL_DELAY = 500; import ShowFooter from "discourse/mixins/show-footer"; -import Topic from 'discourse/models/topic'; import showModal from 'discourse/lib/show-modal'; const TopicRoute = Discourse.Route.extend(ShowFooter, { @@ -153,7 +152,7 @@ const TopicRoute = Discourse.Route.extend(ShowFooter, { model(params, transition) { const queryParams = transition.queryParams; - const topic = this.modelFor('topic'); + let topic = this.modelFor('topic'); if (topic && (topic.get('id') === parseInt(params.id, 10))) { this.setupParams(topic, queryParams); // If we have the existing model, refresh it @@ -161,7 +160,8 @@ const TopicRoute = Discourse.Route.extend(ShowFooter, { return topic; }); } else { - return this.setupParams(Topic.create(_.omit(params, 'username_filters', 'filter')), queryParams); + topic = this.store.createRecord('topic', _.omit(params, 'username_filters', 'filter')); + return this.setupParams(topic, queryParams); } }, diff --git a/app/assets/javascripts/discourse/routes/user-activity-topics.js.es6 b/app/assets/javascripts/discourse/routes/user-activity-topics.js.es6 index ba5e6aa748..65210df7a7 100644 --- a/app/assets/javascripts/discourse/routes/user-activity-topics.js.es6 +++ b/app/assets/javascripts/discourse/routes/user-activity-topics.js.es6 @@ -4,6 +4,6 @@ export default UserTopicListRoute.extend({ userActionType: Discourse.UserAction.TYPES.topics, model: function() { - return Discourse.TopicList.find('topics/created-by/' + this.modelFor('user').get('username_lower')); + return this.store.findFiltered('topicList', {filter: 'topics/created-by/' + this.modelFor('user').get('username_lower') }); } }); diff --git a/app/assets/javascripts/main_include.js b/app/assets/javascripts/main_include.js index 597dbbdd93..e0c1a4ca77 100644 --- a/app/assets/javascripts/main_include.js +++ b/app/assets/javascripts/main_include.js @@ -27,11 +27,11 @@ //= require ./discourse/models/rest //= require ./discourse/models/model //= require ./discourse/models/post -//= require ./discourse/models/user_action -//= require ./discourse/models/composer //= require ./discourse/models/post-stream //= require ./discourse/models/topic-details //= require ./discourse/models/topic +//= require ./discourse/models/user_action +//= require ./discourse/models/composer //= require ./discourse/controllers/controller //= require ./discourse/controllers/discovery-sortable //= require ./discourse/controllers/object diff --git a/test/javascripts/helpers/create-store.js.es6 b/test/javascripts/helpers/create-store.js.es6 index 244fab70c7..4be1b8feb0 100644 --- a/test/javascripts/helpers/create-store.js.es6 +++ b/test/javascripts/helpers/create-store.js.es6 @@ -1,8 +1,10 @@ import Store from "discourse/models/store"; import RestAdapter from 'discourse/adapters/rest'; +import Resolver from 'discourse/ember/resolver'; let _restAdapter; export default function() { + const resolver = Resolver.create(); return Store.create({ container: { lookup(type) { @@ -12,7 +14,10 @@ export default function() { } }, - lookupFactory: function() { } + lookupFactory(type) { + const split = type.split(':'); + return resolver.customResolve({type: split[0], fullNameWithoutType: split[1]}); + }, } }); } diff --git a/test/javascripts/models/post-stream-test.js.es6 b/test/javascripts/models/post-stream-test.js.es6 index a3f7e1319e..a510c48398 100644 --- a/test/javascripts/models/post-stream-test.js.es6 +++ b/test/javascripts/models/post-stream-test.js.es6 @@ -1,32 +1,34 @@ module("model:post-stream"); -import PostStream from 'discourse/models/post-stream'; -import Topic from 'discourse/models/topic'; +import createStore from 'helpers/create-store'; -var buildStream = function(id, stream) { - var topic = Topic.create({id: id, chunk_size: 5}); - var ps = topic.get('postStream'); +const buildStream = function(id, stream) { + const store = createStore(); + const topic = store.createRecord('topic', {id, chunk_size: 5}); + const ps = topic.get('postStream'); if (stream) { ps.set('stream', stream); } return ps; }; -var participant = {username: 'eviltrout'}; +const participant = {username: 'eviltrout'}; test('create', function() { - ok(PostStream.create(), 'it can be created with no parameters'); + const store = createStore(); + ok(store.createRecord('postStream'), 'it can be created with no parameters'); }); test('defaults', function() { - var postStream = buildStream(1234); + const postStream = buildStream(1234); blank(postStream.get('posts'), "there are no posts in a stream by default"); ok(!postStream.get('loaded'), "it has never loaded"); present(postStream.get('topic')); }); test('appending posts', function() { - var postStream = buildStream(4567, [1, 3, 4]); + const postStream = buildStream(4567, [1, 3, 4]); + const store = postStream.store; equal(postStream.get('lastPostId'), 4, "the last post id is 4"); @@ -35,25 +37,24 @@ test('appending posts', function() { ok(!postStream.get('loadedAllPosts'), "the last post is not loaded"); equal(postStream.get('posts.length'), 0, "it has no posts initially"); - postStream.appendPost(Discourse.Post.create({id: 2, post_number: 2})); + postStream.appendPost(store.createRecord('post', {id: 2, post_number: 2})); ok(!postStream.get('firstPostPresent'), "the first post is still not loaded"); equal(postStream.get('posts.length'), 1, "it has one post in the stream"); - postStream.appendPost(Discourse.Post.create({id: 4, post_number: 4})); + postStream.appendPost(store.createRecord('post', {id: 4, post_number: 4})); ok(!postStream.get('firstPostPresent'), "the first post is still loaded"); ok(postStream.get('loadedAllPosts'), "the last post is now loaded"); equal(postStream.get('posts.length'), 2, "it has two posts in the stream"); - postStream.appendPost(Discourse.Post.create({id: 4, post_number: 4})); + postStream.appendPost(store.createRecord('post', {id: 4, post_number: 4})); equal(postStream.get('posts.length'), 2, "it will not add the same post with id twice"); - var stagedPost = Discourse.Post.create({raw: 'incomplete post'}); + const stagedPost = store.createRecord('post', {raw: 'incomplete post'}); postStream.appendPost(stagedPost); equal(postStream.get('posts.length'), 3, "it can handle posts without ids"); postStream.appendPost(stagedPost); equal(postStream.get('posts.length'), 3, "it won't add the same post without an id twice"); - // change the stream postStream.set('stream', [1, 2, 4]); ok(!postStream.get('firstPostPresent'), "the first post no longer loaded since the stream changed."); @@ -61,12 +62,13 @@ test('appending posts', function() { }); test('closestPostNumberFor', function() { - var postStream = buildStream(1231); + const postStream = buildStream(1231); + const store = postStream.store; blank(postStream.closestPostNumberFor(1), "there is no closest post when nothing is loaded"); - postStream.appendPost(Discourse.Post.create({id: 1, post_number: 2})); - postStream.appendPost(Discourse.Post.create({id: 2, post_number: 3})); + postStream.appendPost(store.createRecord('post', {id: 1, post_number: 2})); + postStream.appendPost(store.createRecord('post', {id: 2, post_number: 3})); equal(postStream.closestPostNumberFor(2), 2, "If a post is in the stream it returns its post number"); equal(postStream.closestPostNumberFor(3), 3, "If a post is in the stream it returns its post number"); @@ -75,7 +77,7 @@ test('closestPostNumberFor', function() { }); test('updateFromJson', function() { - var postStream = buildStream(1231); + const postStream = buildStream(1231); postStream.updateFromJson({ posts: [{id: 1}], @@ -90,11 +92,12 @@ test('updateFromJson', function() { }); test("removePosts", function() { - var postStream = buildStream(10000001, [1,2,3]); + const postStream = buildStream(10000001, [1,2,3]); + const store = postStream.store; - var p1 = Discourse.Post.create({id: 1, post_number: 2}), - p2 = Discourse.Post.create({id: 2, post_number: 3}), - p3 = Discourse.Post.create({id: 3, post_number: 4}); + const p1 = store.createRecord('post', {id: 1, post_number: 2}), + p2 = store.createRecord('post', {id: 2, post_number: 3}), + p3 = store.createRecord('post', {id: 3, post_number: 4}); postStream.appendPost(p1); postStream.appendPost(p2); @@ -111,7 +114,7 @@ test("removePosts", function() { }); test("cancelFilter", function() { - var postStream = buildStream(1235); + const postStream = buildStream(1235); sandbox.stub(postStream, "refresh"); @@ -125,7 +128,7 @@ test("cancelFilter", function() { }); test("findPostIdForPostNumber", function() { - var postStream = buildStream(1234, [10, 20, 30, 40, 50, 60, 70]); + const postStream = buildStream(1234, [10, 20, 30, 40, 50, 60, 70]); postStream.set('gaps', { before: { 60: [55, 58] } }); equal(postStream.findPostIdForPostNumber(500), null, 'it returns null when the post cannot be found'); @@ -136,7 +139,7 @@ test("findPostIdForPostNumber", function() { }); test("toggleParticipant", function() { - var postStream = buildStream(1236); + const postStream = buildStream(1236); sandbox.stub(postStream, "refresh"); equal(postStream.get('userFilters.length'), 0, "by default no participants are toggled"); @@ -149,7 +152,7 @@ test("toggleParticipant", function() { }); test("streamFilters", function() { - var postStream = buildStream(1237); + const postStream = buildStream(1237); sandbox.stub(postStream, "refresh"); deepEqual(postStream.get('streamFilters'), {}, "there are no postFilters by default"); @@ -179,7 +182,7 @@ test("streamFilters", function() { }); test("loading", function() { - var postStream = buildStream(1234); + let postStream = buildStream(1234); ok(!postStream.get('loading'), "we're not loading by default"); postStream.set('loadingAbove', true); @@ -195,7 +198,7 @@ test("loading", function() { }); test("nextWindow", function() { - var postStream = buildStream(1234, [1,2,3,5,8,9,10,11,13,14,15,16]); + const postStream = buildStream(1234, [1,2,3,5,8,9,10,11,13,14,15,16]); blank(postStream.get('nextWindow'), 'With no posts loaded, the window is blank'); @@ -211,7 +214,7 @@ test("nextWindow", function() { }); test("previousWindow", function() { - var postStream = buildStream(1234, [1,2,3,5,8,9,10,11,13,14,15,16]); + const postStream = buildStream(1234, [1,2,3,5,8,9,10,11,13,14,15,16]); blank(postStream.get('previousWindow'), 'With no posts loaded, the window is blank'); @@ -227,21 +230,22 @@ test("previousWindow", function() { }); test("storePost", function() { - var postStream = buildStream(1234), - post = Discourse.Post.create({id: 1, post_number: 100, raw: 'initial value'}); + const postStream = buildStream(1234), + store = postStream.store, + post = store.createRecord('post', {id: 1, post_number: 100, raw: 'initial value'}); blank(postStream.get('topic.highest_post_number'), "it has no highest post number yet"); - var stored = postStream.storePost(post); + let stored = postStream.storePost(post); equal(post, stored, "it returns the post it stored"); equal(post.get('topic'), postStream.get('topic'), "it creates the topic reference properly"); equal(postStream.get('topic.highest_post_number'), 100, "it set the highest post number"); - var dupePost = Discourse.Post.create({id: 1, post_number: 100, raw: 'updated value'}); - var storedDupe = postStream.storePost(dupePost); + const dupePost = store.createRecord('post', {id: 1, post_number: 100, raw: 'updated value'}); + const storedDupe = postStream.storePost(dupePost); equal(storedDupe, post, "it returns the previously stored post instead to avoid dupes"); equal(storedDupe.get('raw'), 'updated value', 'it updates the previously stored post'); - var postWithoutId = Discourse.Post.create({raw: 'hello world'}); + const postWithoutId = store.createRecord('post', {raw: 'hello world'}); stored = postStream.storePost(postWithoutId); equal(stored, postWithoutId, "it returns the same post back"); equal(postStream.get('postIdentityMap.size'), 1, "it does not add a new entry into the identity map"); @@ -249,9 +253,11 @@ test("storePost", function() { }); test("identity map", function() { - var postStream = buildStream(1234); - var p1 = postStream.appendPost(Discourse.Post.create({id: 1, post_number: 1})); - postStream.appendPost(Discourse.Post.create({id: 3, post_number: 4})); + const postStream = buildStream(1234), + store = postStream.store; + + const p1 = postStream.appendPost(store.createRecord('post', {id: 1, post_number: 1})); + postStream.appendPost(store.createRecord('post', {id: 3, post_number: 4})); equal(postStream.findLoadedPost(1), p1, "it can return cached posts by id"); blank(postStream.findLoadedPost(4), "it can't find uncached posts"); @@ -262,7 +268,7 @@ test("identity map", function() { }); asyncTestDiscourse("loadIntoIdentityMap with no data", function() { - var postStream = buildStream(1234); + const postStream = buildStream(1234); expect(1); sandbox.stub(Discourse, "ajax"); @@ -273,7 +279,7 @@ asyncTestDiscourse("loadIntoIdentityMap with no data", function() { }); asyncTestDiscourse("loadIntoIdentityMap with post ids", function() { - var postStream = buildStream(1234); + const postStream = buildStream(1234); expect(1); sandbox.stub(Discourse, "ajax").returns(Ember.RSVP.resolve({ @@ -289,12 +295,12 @@ asyncTestDiscourse("loadIntoIdentityMap with post ids", function() { }); asyncTestDiscourse("loading a post's history", function() { - var postStream = buildStream(1234); + const postStream = buildStream(1234); + const store = postStream.store; expect(3); - var post = Discourse.Post.create({id: 4321}); - - var secondPost = Discourse.Post.create({id: 2222}); + const post = store.createRecord('post', {id: 4321}); + const secondPost = store.createRecord('post', {id: 2222}); sandbox.stub(Discourse, "ajax").returns(Ember.RSVP.resolve([secondPost])); postStream.findReplyHistory(post).then(function() { @@ -306,20 +312,22 @@ asyncTestDiscourse("loading a post's history", function() { }); test("staging and undoing a new post", function() { - var postStream = buildStream(10101, [1]); - postStream.appendPost(Discourse.Post.create({id: 1, post_number: 1, topic_id: 10101})); + const postStream = buildStream(10101, [1]); + const store = postStream.store; - var user = Discourse.User.create({username: 'eviltrout', name: 'eviltrout', id: 321}); - var stagedPost = Discourse.Post.create({ raw: 'hello world this is my new post', topic_id: 10101 }); + postStream.appendPost(store.createRecord('post', {id: 1, post_number: 1, topic_id: 10101})); - var topic = postStream.get('topic'); + const user = Discourse.User.create({username: 'eviltrout', name: 'eviltrout', id: 321}); + const stagedPost = store.createRecord('post', { raw: 'hello world this is my new post', topic_id: 10101 }); + + const topic = postStream.get('topic'); topic.setProperties({ posts_count: 1, highest_post_number: 1 }); // Stage the new post in the stream - var result = postStream.stagePost(stagedPost, user); + const result = postStream.stagePost(stagedPost, user); equal(result, "staged", "it returns staged"); equal(topic.get('highest_post_number'), 2, "it updates the highest_post_number"); ok(postStream.get('loading'), "it is loading while the post is being staged"); @@ -345,16 +353,18 @@ test("staging and undoing a new post", function() { }); test("staging and committing a post", function() { - var postStream = buildStream(10101, [1]); - postStream.appendPost(Discourse.Post.create({id: 1, post_number: 1, topic_id: 10101})); - var user = Discourse.User.create({username: 'eviltrout', name: 'eviltrout', id: 321}); - var stagedPost = Discourse.Post.create({ raw: 'hello world this is my new post', topic_id: 10101 }); + const postStream = buildStream(10101, [1]); + const store = postStream.store; - var topic = postStream.get('topic'); + postStream.appendPost(store.createRecord('post', {id: 1, post_number: 1, topic_id: 10101})); + const user = Discourse.User.create({username: 'eviltrout', name: 'eviltrout', id: 321}); + const stagedPost = store.createRecord('post', { raw: 'hello world this is my new post', topic_id: 10101 }); + + const topic = postStream.get('topic'); topic.set('posts_count', 1); // Stage the new post in the stream - var result = postStream.stagePost(stagedPost, user); + let result = postStream.stagePost(stagedPost, user); equal(result, "staged", "it returns staged"); ok(postStream.get('loading'), "it is loading while the post is being staged"); @@ -369,7 +379,7 @@ test("staging and committing a post", function() { equal(postStream.get('filteredPostsCount'), 2, "it increases the filteredPostsCount"); - var found = postStream.findLoadedPost(stagedPost.get('id')); + const found = postStream.findLoadedPost(stagedPost.get('id')); present(found, "the post is in the identity map"); ok(postStream.indexOf(stagedPost) > -1, "the post is in the stream"); equal(found.get('raw'), 'different raw value', 'it also updated the value in the stream'); @@ -377,7 +387,8 @@ test("staging and committing a post", function() { }); test('triggerNewPostInStream', function() { - var postStream = buildStream(225566); + const postStream = buildStream(225566); + const store = postStream.store; sandbox.stub(postStream, 'appendMore'); sandbox.stub(postStream, 'refresh'); @@ -399,7 +410,7 @@ test('triggerNewPostInStream', function() { ok(!postStream.appendMore.calledOnce, "it wont't delegate to appendMore because the last post is not loaded"); postStream.cancelFilter(); - postStream.appendPost(Discourse.Post.create({id: 1, post_number: 2})); + postStream.appendPost(store.createRecord('post', {id: 1, post_number: 2})); postStream.triggerNewPostInStream(2); ok(postStream.appendMore.calledOnce, "delegates to appendMore because the last post is loaded"); }); @@ -408,10 +419,11 @@ test('triggerNewPostInStream', function() { test("loadedAllPosts when the id changes", function() { // This can happen in a race condition between staging a post and it coming through on the // message bus. If the id of a post changes we should reconsider the loadedAllPosts property. - var postStream = buildStream(10101, [1, 2]); - var postWithoutId = Discourse.Post.create({ raw: 'hello world this is my new post' }); + const postStream = buildStream(10101, [1, 2]); + const store = postStream.store; + const postWithoutId = store.createRecord('post', { raw: 'hello world this is my new post' }); - postStream.appendPost(Discourse.Post.create({id: 1, post_number: 1})); + postStream.appendPost(store.createRecord('post', {id: 1, post_number: 1})); postStream.appendPost(postWithoutId); ok(!postStream.get('loadedAllPosts'), 'the last post is not loaded'); @@ -420,11 +432,12 @@ test("loadedAllPosts when the id changes", function() { }); test("comitting and triggerNewPostInStream race condition", function() { - var postStream = buildStream(4964); + const postStream = buildStream(4964); + const store = postStream.store; - postStream.appendPost(Discourse.Post.create({id: 1, post_number: 1})); - var user = Discourse.User.create({username: 'eviltrout', name: 'eviltrout', id: 321}); - var stagedPost = Discourse.Post.create({ raw: 'hello world this is my new post' }); + postStream.appendPost(store.createRecord('post', {id: 1, post_number: 1})); + const user = Discourse.User.create({username: 'eviltrout', name: 'eviltrout', id: 321}); + const stagedPost = store.createRecord('post', { raw: 'hello world this is my new post' }); postStream.stagePost(stagedPost, user); equal(postStream.get('filteredPostsCount'), 0, "it has no filteredPostsCount yet"); diff --git a/test/javascripts/models/rest-model-test.js.es6 b/test/javascripts/models/rest-model-test.js.es6 index 0f0ea28296..0362706c97 100644 --- a/test/javascripts/models/rest-model-test.js.es6 +++ b/test/javascripts/models/rest-model-test.js.es6 @@ -1,6 +1,21 @@ module('rest-model'); import createStore from 'helpers/create-store'; +import RestModel from 'discourse/models/rest'; + +test('munging', function() { + const store = createStore(); + const Grape = RestModel.extend(); + Grape.reopenClass({ + munge: function(json) { + json.inverse = 1 - json.percent; + return json; + } + }); + + var g = Grape.create({ store, percent: 0.4 }); + equal(g.get('inverse'), 0.6, 'it runs `munge` on `create`'); +}); test('update', function() { const store = createStore(); diff --git a/test/javascripts/models/store-test.js.es6 b/test/javascripts/models/store-test.js.es6 index d9e68fc785..f47c99f1b2 100644 --- a/test/javascripts/models/store-test.js.es6 +++ b/test/javascripts/models/store-test.js.es6 @@ -9,6 +9,28 @@ test('createRecord', function() { equal(widget.get('id'), 111); }); +test('createRecord without an `id`', function() { + const store = createStore(); + const widget = store.createRecord('widget', {name: 'hello'}); + + ok(!widget.get('id'), 'there is no id'); +}); + +test('createRecord without attributes', function() { + const store = createStore(); + const widget = store.createRecord('widget'); + + ok(!widget.get('id'), 'there is no id'); +}); + +test('createRecord with a record as attributes returns that record from the map', function() { + const store = createStore(); + const widget = store.createRecord('widget', {id: 33}); + const secondWidget = store.createRecord('widget', {id: 33}); + + equal(widget, secondWidget, 'they should be the same'); +}); + test('find', function() { const store = createStore(); store.find('widget', 123).then(function(w) { diff --git a/test/javascripts/test_helper.js b/test/javascripts/test_helper.js index bc38f15d11..b59d22af6a 100644 --- a/test/javascripts/test_helper.js +++ b/test/javascripts/test_helper.js @@ -90,6 +90,7 @@ if (window.Logster) { var origDebounce = Ember.run.debounce, createPretendServer = require('helpers/create-pretender', null, null, false).default, fixtures = require('fixtures/site_fixtures', null, null, false).default, + flushMap = require('discourse/models/store', null, null, false).flushMap, server; QUnit.testStart(function(ctx) { @@ -120,6 +121,7 @@ QUnit.testDone(function() { // Destroy any modals $('.modal-backdrop').remove(); + flushMap(); server.shutdown(); }); From 76f7786d0daa2234c491e0894ef325be3fbc21df Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Thu, 9 Apr 2015 14:54:17 -0400 Subject: [PATCH 021/113] Support saving posts via Store --- .../discourse/adapters/post.js.es6 | 11 +- .../discourse/adapters/rest.js.es6 | 19 ++- .../discourse/controllers/composer.js.es6 | 2 +- .../discourse/lib/ajax-error.js.es6 | 30 +++++ .../discourse/models/composer.js.es6 | 56 +++------ .../javascripts/discourse/models/post.js.es6 | 108 +++++------------- .../javascripts/discourse/models/rest.js.es6 | 56 ++++++--- .../javascripts/discourse/models/store.js.es6 | 20 ++-- app/assets/javascripts/main_include.js | 1 + .../acceptance/composer-test.js.es6 | 3 + test/javascripts/fixtures/post.js.es6 | 2 +- test/javascripts/fixtures/topic.js.es6 | 2 +- .../helpers/create-pretender.js.es6 | 31 +++-- .../javascripts/models/rest-model-test.js.es6 | 15 +++ test/javascripts/models/store-test.js.es6 | 6 + vendor/assets/javascripts/bootbox.js | 3 +- 16 files changed, 205 insertions(+), 160 deletions(-) create mode 100644 app/assets/javascripts/discourse/lib/ajax-error.js.es6 diff --git a/app/assets/javascripts/discourse/adapters/post.js.es6 b/app/assets/javascripts/discourse/adapters/post.js.es6 index 1705a07e60..1d0a375b58 100644 --- a/app/assets/javascripts/discourse/adapters/post.js.es6 +++ b/app/assets/javascripts/discourse/adapters/post.js.es6 @@ -1,11 +1,20 @@ import RestAdapter from 'discourse/adapters/rest'; +import { Result } from 'discourse/adapters/rest'; export default RestAdapter.extend({ - // GET /posts doesn't include a type find(store, type, findArgs) { return this._super(store, type, findArgs).then(function(result) { return {post: result}; }); + }, + + createRecord(store, type, args) { + const typeField = Ember.String.underscore(type); + args.nested_post = true; + return Discourse.ajax(this.pathFor(store, type), { method: 'POST', data: args }).then(function (json) { + return new Result(json[typeField], json); + }); } + }); diff --git a/app/assets/javascripts/discourse/adapters/rest.js.es6 b/app/assets/javascripts/discourse/adapters/rest.js.es6 index fc9d7c4065..bd56612354 100644 --- a/app/assets/javascripts/discourse/adapters/rest.js.es6 +++ b/app/assets/javascripts/discourse/adapters/rest.js.es6 @@ -1,5 +1,11 @@ const ADMIN_MODELS = ['plugin']; +export function Result(payload, responseJson) { + this.payload = payload; + this.responseJson = responseJson; + this.target = null; +} + export default Ember.Object.extend({ pathFor(store, type, findArgs) { let path = "/" + Ember.String.underscore(store.pluralize(type)); @@ -35,7 +41,18 @@ export default Ember.Object.extend({ update(store, type, id, attrs) { const data = {}; data[Ember.String.underscore(type)] = attrs; - return Discourse.ajax(this.pathFor(store, type, id), { method: 'PUT', data }); + return Discourse.ajax(this.pathFor(store, type, id), { method: 'PUT', data }).then(function(json) { + return new Result(json[type], json); + }); + }, + + createRecord(store, type, attrs) { + const data = {}; + const typeField = Ember.String.underscore(type); + data[typeField] = attrs; + return Discourse.ajax(this.pathFor(store, type), { method: 'POST', data }).then(function (json) { + return new Result(json[typeField], json); + }); }, destroyRecord(store, type, record) { diff --git a/app/assets/javascripts/discourse/controllers/composer.js.es6 b/app/assets/javascripts/discourse/controllers/composer.js.es6 index d8c8980700..c7df684157 100644 --- a/app/assets/javascripts/discourse/controllers/composer.js.es6 +++ b/app/assets/javascripts/discourse/controllers/composer.js.es6 @@ -219,6 +219,7 @@ export default DiscourseController.extend({ imageSizes: this.get('view').imageSizes(), editReason: this.get("editReason") }).then(function(opts) { + // If we replied as a new topic successfully, remove the draft. if (self.get('replyAsNewTopicDraft')) { self.destroyDraft(); @@ -246,7 +247,6 @@ export default DiscourseController.extend({ bootbox.alert(error); }); - if (this.get('controllers.application.currentRouteName').split('.')[0] === 'topic' && composer.get('topic.id') === this.get('controllers.topic.model.id')) { staged = composer.get('stagedPost'); diff --git a/app/assets/javascripts/discourse/lib/ajax-error.js.es6 b/app/assets/javascripts/discourse/lib/ajax-error.js.es6 new file mode 100644 index 0000000000..0117c94a5b --- /dev/null +++ b/app/assets/javascripts/discourse/lib/ajax-error.js.es6 @@ -0,0 +1,30 @@ +export function throwAjaxError(undoCallback) { + return function(error) { + if (error instanceof Error) { + Ember.Logger.error(error.stack); + } + + if (typeof error === "string") { + Ember.Logger.error(error); + } + + // If we provided an `undo` callback + if (undoCallback) { undoCallback(error); } + + let parsedError; + if (error.responseText) { + try { + const parsedJSON = $.parseJSON(error.responseText); + if (parsedJSON.errors) { + parsedError = parsedJSON.errors[0]; + } else if (parsedJSON.failed) { + parsedError = parsedJSON.message; + } + } catch(ex) { + // in case the JSON doesn't parse + Ember.Logger.error(ex.stack); + } + } + throw parsedError || I18n.t('generic_error'); + }; +} diff --git a/app/assets/javascripts/discourse/models/composer.js.es6 b/app/assets/javascripts/discourse/models/composer.js.es6 index 8b0df34811..a8ffe86735 100644 --- a/app/assets/javascripts/discourse/models/composer.js.es6 +++ b/app/assets/javascripts/discourse/models/composer.js.es6 @@ -1,6 +1,6 @@ import RestModel from 'discourse/models/rest'; -import Post from 'discourse/models/post'; import Topic from 'discourse/models/topic'; +import { throwAjaxError } from 'discourse/lib/ajax-error'; const CLOSED = 'closed', SAVING = 'saving', @@ -430,25 +430,22 @@ const Composer = RestModel.extend({ promise = Ember.RSVP.resolve(); } - post.setProperties({ + const props = { raw: this.get('reply'), - editReason: opts.editReason, - imageSizes: opts.imageSizes, + edit_reason: opts.editReason, + image_sizes: opts.imageSizes, cooked: this.getCookedHtml() - }); + }; this.set('composeState', CLOSED); return promise.then(function() { - return post.save(function(result) { - post.updateFromPost(result); + return post.save(props).then(function() { self.clearState(); - }, function (error) { + }).catch(throwAjaxError(function() { post.set('cooked', oldCooked); self.set('composeState', OPEN); - const response = $.parseJSON(error.responseText); - throw response && response.errors ? response.errors[0] : I18n.t('generic_error'); - }); + })); }); }, @@ -473,7 +470,7 @@ const Composer = RestModel.extend({ let addedToStream = false; // Build the post object - const createdPost = Post.create({ + const createdPost = this.store.createRecord('post', { imageSizes: opts.imageSizes, cooked: this.getCookedHtml(), reply_count: 0, @@ -489,7 +486,6 @@ const Composer = RestModel.extend({ moderator: user.get('moderator'), admin: user.get('admin'), yours: true, - newPost: true, read: true }); @@ -521,11 +517,7 @@ const Composer = RestModel.extend({ // engine, staging will just cause a blank post to render if (!_.isEmpty(createdPost.get('cooked'))) { state = postStream.stagePost(createdPost, user); - - if(state === "alreadyStaging"){ - return; - } - + if (state === "alreadyStaging") { return; } } } @@ -534,13 +526,12 @@ const Composer = RestModel.extend({ composer.set("stagedPost", state === "staged" && createdPost); return createdPost.save().then(function(result) { + let saving = true; - createdPost.updateFromJson(result); if (topic) { // It's no longer a new post - createdPost.set('newPost', false); - topic.set('draft_sequence', result.draft_sequence); + topic.set('draft_sequence', result.target.draft_sequence); postStream.commitPost(createdPost); addedToStream = true; } else { @@ -563,30 +554,13 @@ const Composer = RestModel.extend({ composer.set('composeState', SAVING); } - return { post: result }; - }).catch(function(error) { - - // If an error occurs + return { post: createdPost }; + }).catch(throwAjaxError(function() { if (postStream) { postStream.undoPost(createdPost); } composer.set('composeState', OPEN); - - // TODO extract error handling code - let parsedError; - try { - const parsedJSON = $.parseJSON(error.responseText); - if (parsedJSON.errors) { - parsedError = parsedJSON.errors[0]; - } else if (parsedJSON.failed) { - parsedError = parsedJSON.message; - } - } - catch(ex) { - parsedError = "Unknown error saving post, try again. Error: " + error.status + " " + error.statusText; - } - throw parsedError; - }); + })); }, getCookedHtml() { diff --git a/app/assets/javascripts/discourse/models/post.js.es6 b/app/assets/javascripts/discourse/models/post.js.es6 index 6a45675a05..4ada9a1eb5 100644 --- a/app/assets/javascripts/discourse/models/post.js.es6 +++ b/app/assets/javascripts/discourse/models/post.js.es6 @@ -113,47 +113,35 @@ const Post = RestModel.extend({ }); }.property('actions_summary.@each.users', 'actions_summary.@each.count'), - save() { - const self = this; - if (!this.get('newPost')) { - // We're updating a post - return Discourse.ajax("/posts/" + (this.get('id')), { - type: 'PUT', - dataType: 'json', - data: { - post: { raw: this.get('raw'), edit_reason: this.get('editReason') }, - image_sizes: this.get('imageSizes') - } - }).then(function(result) { - // If we received a category update, update it - self.set('version', result.post.version); - if (result.category) Discourse.Site.current().updateCategory(result.category); - return Discourse.Post.create(result.post); - }); - - } else { - // We're saving a post - const data = this.getProperties(Discourse.Composer.serializedFieldsForCreate()); - data.reply_to_post_number = this.get('reply_to_post_number'); - data.image_sizes = this.get('imageSizes'); - data.nested_post = true; - - const metaData = this.get('metaData'); - // Put the metaData into the request - if (metaData) { - data.meta_data = {}; - Ember.keys(metaData).forEach(function(key) { data.meta_data[key] = metaData.get(key); }); - } - - return Discourse.ajax("/posts", { - type: 'POST', - data: data - }).then(function(result) { - return Discourse.Post.create(result.post); - }); + afterUpdate(res) { + if (res.category) { + Discourse.Site.current().updateCategory(res.category); } }, + updateProperties() { + return { + post: { raw: this.get('raw'), edit_reason: this.get('editReason') }, + image_sizes: this.get('imageSizes') + }; + }, + + createProperties() { + const data = this.getProperties(Discourse.Composer.serializedFieldsForCreate()); + data.reply_to_post_number = this.get('reply_to_post_number'); + data.image_sizes = this.get('imageSizes'); + + const metaData = this.get('metaData'); + + // Put the metaData into the request + if (metaData) { + data.meta_data = {}; + Ember.keys(metaData).forEach(function(key) { data.meta_data[key] = metaData.get(key); }); + } + + return data; + }, + // Expands the first post's content, if embedded and shortened. expand() { const self = this; @@ -266,50 +254,6 @@ const Post = RestModel.extend({ }); }, - /** - Updates a post from a JSON packet. This is normally done after the post is saved to refresh any - attributes. - **/ - updateFromJson(obj) { - if (!obj) return; - - let skip, oldVal; - - // Update all the properties - const post = this; - _.each(obj, function(val,key) { - if (key !== 'actions_summary'){ - oldVal = post[key]; - skip = false; - - if (val && val !== oldVal) { - - if (key === "reply_to_user" && val && oldVal) { - skip = val.username === oldVal.username || Em.get(val, "username") === Em.get(oldVal, "username"); - } - - if(!skip) { - post.set(key, val); - } - } - } - }); - - // Rebuild actions summary - this.set('actions_summary', Em.A()); - if (obj.actions_summary) { - const lookup = Em.Object.create(); - _.each(obj.actions_summary,function(a) { - a.post = post; - a.actionType = Discourse.Site.current().postActionTypeById(a.id); - const actionSummary = Discourse.ActionSummary.create(a); - post.get('actions_summary').pushObject(actionSummary); - lookup.set(a.actionType.get('name_key'), actionSummary); - }); - this.set('actionByName', lookup); - } - }, - // Load replies to this post loadReplies() { if(this.get('loadingReplies')){ diff --git a/app/assets/javascripts/discourse/models/rest.js.es6 b/app/assets/javascripts/discourse/models/rest.js.es6 index d4ec50be0b..37afe11eb9 100644 --- a/app/assets/javascripts/discourse/models/rest.js.es6 +++ b/app/assets/javascripts/discourse/models/rest.js.es6 @@ -1,22 +1,52 @@ import Presence from 'discourse/mixins/presence'; const RestModel = Ember.Object.extend(Presence, { - update(attrs) { - const self = this, - type = this.get('__type'); + isNew: Ember.computed.equal('__state', 'new'), + isCreated: Ember.computed.equal('__state', 'created'), - const munge = this.__munge; - return this.store.update(type, this.get('id'), attrs).then(function(result) { - if (result && result[type]) { - Object.keys(result).forEach(function(k) { - attrs[k] = result[k]; - }); - } - self.setProperties(munge(attrs)); - return result; + afterUpdate: Ember.K, + + update(props) { + props = props || this.updateProperties(); + + const type = this.get('__type'), + store = this.get('store'); + + const self = this; + return store.update(type, this.get('id'), props).then(function(res) { + self.setProperties(self.__munge(res.payload || res.responseJson)); + self.afterUpdate(res); + return res; }); }, + _saveNew(props) { + props = props || this.createProperties(); + + const type = this.get('__type'), + store = this.get('store'), + adapter = store.adapterFor(type); + + const self = this; + return adapter.createRecord(store, type, props).then(function(res) { + if (!res) { throw "Received no data back from createRecord"; } + self.setProperties(self.__munge(res.payload)); + + self.set('__state', 'created'); + + res.target = self; + return res; + }); + }, + + createProperties() { + throw "You must overwrite `createProperties()` before saving a record"; + }, + + save(props) { + return this.get('isNew') ? this._saveNew(props) : this.update(props); + }, + destroyRecord() { const type = this.get('__type'); return this.store.destroyRecord(type, this); @@ -34,7 +64,7 @@ RestModel.reopenClass({ args = args || {}; if (!args.store) { const container = Discourse.__container__; - Ember.warn('Use `store.createRecord` to create records instead of `.create()`'); + // Ember.warn('Use `store.createRecord` to create records instead of `.create()`'); args.store = container.lookup('store:main'); } diff --git a/app/assets/javascripts/discourse/models/store.js.es6 b/app/assets/javascripts/discourse/models/store.js.es6 index 0430bc4878..e54eaee4a2 100644 --- a/app/assets/javascripts/discourse/models/store.js.es6 +++ b/app/assets/javascripts/discourse/models/store.js.es6 @@ -16,26 +16,23 @@ export default Ember.Object.extend({ }, findAll(type) { - const adapter = this.container.lookup('adapter:' + type) || this.container.lookup('adapter:rest'); const self = this; - return adapter.findAll(this, type).then(function(result) { + return this.adapterFor(type).findAll(this, type).then(function(result) { return self._resultSet(type, result); }); }, // Mostly for legacy, things like TopicList without ResultSets findFiltered(type, findArgs) { - const adapter = this.container.lookup('adapter:' + type) || this.container.lookup('adapter:rest'); const self = this; - return adapter.find(this, type, findArgs).then(function(result) { + return this.adapterFor(type).find(this, type, findArgs).then(function(result) { return self._build(type, result); }); }, find(type, findArgs) { - const adapter = this.container.lookup('adapter:' + type) || this.container.lookup('adapter:rest'); const self = this; - return adapter.find(this, type, findArgs).then(function(result) { + return this.adapterFor(type).find(this, type, findArgs).then(function(result) { if (typeof findArgs === "object") { return self._resultSet(type, result); } else { @@ -64,8 +61,7 @@ export default Ember.Object.extend({ }, update(type, id, attrs) { - const adapter = this.container.lookup('adapter:' + type) || this.container.lookup('adapter:rest'); - return adapter.update(this, type, id, attrs, function(result) { + return this.adapterFor(type).update(this, type, id, attrs, function(result) { if (result && result[type] && result[type].id) { const oldRecord = _identityMap[type][id]; delete _identityMap[type][id]; @@ -81,8 +77,7 @@ export default Ember.Object.extend({ }, destroyRecord(type, record) { - const adapter = this.container.lookup('adapter:' + type) || this.container.lookup('adapter:rest'); - return adapter.destroyRecord(this, type, record).then(function(result) { + return this.adapterFor(type).destroyRecord(this, type, record).then(function(result) { const forType = _identityMap[type]; if (forType) { delete forType[record.get('id')]; } return result; @@ -101,6 +96,7 @@ export default Ember.Object.extend({ _build(type, obj) { obj.store = this; obj.__type = type; + obj.__state = obj.id ? "created" : "new"; const klass = this.container.lookupFactory('model:' + type) || RestModel; const model = klass.create(obj); @@ -111,6 +107,10 @@ export default Ember.Object.extend({ return model; }, + adapterFor(type) { + return this.container.lookup('adapter:' + type) || this.container.lookup('adapter:rest'); + }, + _hydrate(type, obj) { if (!obj) { throw "Can't hydrate " + type + " of `null`"; } if (!obj.id) { throw "Can't hydrate " + type + " without an `id`"; } diff --git a/app/assets/javascripts/main_include.js b/app/assets/javascripts/main_include.js index e0c1a4ca77..9efe2cfe6c 100644 --- a/app/assets/javascripts/main_include.js +++ b/app/assets/javascripts/main_include.js @@ -15,6 +15,7 @@ //= require ./discourse/helpers/register-unbound //= require ./discourse/mixins/scrolling //= require_tree ./discourse/mixins +//= require ./discourse/lib/ajax-error //= require ./discourse/lib/markdown //= require ./discourse/lib/search-for-term //= require ./discourse/lib/user-search diff --git a/test/javascripts/acceptance/composer-test.js.es6 b/test/javascripts/acceptance/composer-test.js.es6 index 14788f02ba..2456370e69 100644 --- a/test/javascripts/acceptance/composer-test.js.es6 +++ b/test/javascripts/acceptance/composer-test.js.es6 @@ -100,6 +100,8 @@ test("Create a Reply", () => { test("Edit the first post", () => { visit("/t/internationalization-localization/280"); + ok(!exists('.topic-post:eq(0) .post-info.edits'), 'it has no edits icon at first'); + click('.topic-post:eq(0) button[data-action=showMoreActions]'); click('.topic-post:eq(0) button[data-action=edit]'); andThen(() => { @@ -111,6 +113,7 @@ test("Edit the first post", () => { click('#reply-control button.create'); andThen(() => { ok(!exists('#wmd-input'), 'it closes the composer'); + ok(exists('.topic-post:eq(0) .post-info.edits'), 'it has the edits icon'); ok(find('#topic-title h1').text().indexOf('This is the new text for the title') !== -1, 'it shows the new title'); ok(find('.topic-post:eq(0) .cooked').text().indexOf('This is the new text for the post') !== -1, 'it updates the post'); }); diff --git a/test/javascripts/fixtures/post.js.es6 b/test/javascripts/fixtures/post.js.es6 index c2d22a62cb..19a7abc691 100644 --- a/test/javascripts/fixtures/post.js.es6 +++ b/test/javascripts/fixtures/post.js.es6 @@ -1,4 +1,4 @@ export default { - "/posts/398": {"id":398,"name":"Uwe Keim","username":"uwe_keim","avatar_template":"/user_avatar/meta.discourse.org/uwe_keim/{size}/5697.png","uploaded_avatar_id":5697,"created_at":"2013-02-05T21:29:00.280Z","cooked":"

Any plans to support localization of UI elements, so that I (for example) could set up a completely German speaking forum?

","post_number":1,"post_type":1,"updated_at":"2013-02-05T21:29:00.280Z","like_count":0,"reply_count":1,"reply_to_post_number":null,"quote_count":0,"avg_time":25,"incoming_link_count":314,"reads":475,"score":1702.25,"yours":false,"topic_id":280,"topic_slug":"internationalization-localization","display_username":"Uwe Keim","primary_group_name":null,"version":2,"can_edit":true,"can_delete":false,"can_recover":true,"user_title":null,"raw":"Any plans to support localization of UI elements, so that I (for example) could set up a completely German speaking forum?","actions_summary":[{"id":2,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":3,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":4,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":5,"count":0,"hidden":true,"can_act":true,"can_defer_flags":false},{"id":6,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":7,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":8,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false}],"moderator":false,"admin":false,"staff":false,"user_id":255,"hidden":false,"hidden_reason_id":null,"trust_level":2,"deleted_at":null,"user_deleted":false,"edit_reason":null,"can_view_edit_history":true,"wiki":false} + "/posts/398": {"id":398,"name":"Uwe Keim","username":"uwe_keim","avatar_template":"/user_avatar/meta.discourse.org/uwe_keim/{size}/5697.png","uploaded_avatar_id":5697,"created_at":"2013-02-05T21:29:00.280Z","cooked":"

Any plans to support localization of UI elements, so that I (for example) could set up a completely German speaking forum?

","post_number":1,"post_type":1,"updated_at":"2013-02-05T21:29:00.280Z","like_count":0,"reply_count":1,"reply_to_post_number":null,"quote_count":0,"avg_time":25,"incoming_link_count":314,"reads":475,"score":1702.25,"yours":false,"topic_id":280,"topic_slug":"internationalization-localization","display_username":"Uwe Keim","primary_group_name":null,"version":1,"can_edit":true,"can_delete":false,"can_recover":true,"user_title":null,"raw":"Any plans to support localization of UI elements, so that I (for example) could set up a completely German speaking forum?","actions_summary":[{"id":2,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":3,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":4,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":5,"count":0,"hidden":true,"can_act":true,"can_defer_flags":false},{"id":6,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":7,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":8,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false}],"moderator":false,"admin":false,"staff":false,"user_id":255,"hidden":false,"hidden_reason_id":null,"trust_level":2,"deleted_at":null,"user_deleted":false,"edit_reason":null,"can_view_edit_history":true,"wiki":false} }; diff --git a/test/javascripts/fixtures/topic.js.es6 b/test/javascripts/fixtures/topic.js.es6 index 7d5be12cbc..55e124a0c7 100644 --- a/test/javascripts/fixtures/topic.js.es6 +++ b/test/javascripts/fixtures/topic.js.es6 @@ -1,2 +1,2 @@ /*jshint maxlen:10000000 */ -export default {"/t/280.json": {"post_stream":{"posts":[{"id":398,"name":"Uwe Keim","username":"uwe_keim","avatar_template":"/user_avatar/meta.discourse.org/uwe_keim/{size}/5697.png","uploaded_avatar_id":5697,"created_at":"2013-02-05T21:29:00.280Z","cooked":"

Any plans to support localization of UI elements, so that I (for example) could set up a completely German speaking forum?

","post_number":1,"post_type":1,"updated_at":"2013-02-05T21:29:00.280Z","like_count":0,"reply_count":1,"reply_to_post_number":null,"quote_count":0,"avg_time":25,"incoming_link_count":314,"reads":475,"score":1702.25,"yours":false,"topic_id":280,"topic_slug":"internationalization-localization","display_username":"Uwe Keim","primary_group_name":null,"version":2,"can_edit":true,"can_delete":false,"can_recover":true,"link_counts":[{"url":"https://meta.discourse.org/t/language-mirrors/2378/2","internal":true,"reflection":true,"title":"Language mirrors","clicks":3},{"url":"https://meta.discourse.org/t/translation-workflow/6102","internal":true,"reflection":true,"title":"Translation workflow","clicks":2},{"url":"https://meta.discourse.org/t/solving-xda-developer-style-forums/4368/4","internal":true,"reflection":true,"title":"Solving XDA-Developer style forums","clicks":2},{"url":"https://meta.discourse.org/t/comrades-lets-join-our-efforts-on-ukrainian-and-russian-translations/4403/5","internal":true,"reflection":true,"title":"Comrades let's join our efforts on ukrainian and russian translations","clicks":1},{"url":"https://meta.discourse.org/t/bookmark-last-read-sometimes-doesn-t-go-to-the-end-of-a-topic/4825/9","internal":true,"reflection":true,"title":"Bookmark/last read sometimes doesn't go to the end of a topic","clicks":0},{"url":"https://meta.discourse.org/t/roadplan-for-discourse/2939/5","internal":true,"reflection":true,"title":"Roadplan for Discourse 2013","clicks":0}],"read":true,"user_title":null,"actions_summary":[{"id":2,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":3,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":4,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":5,"count":0,"hidden":true,"can_act":true,"can_defer_flags":false},{"id":6,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":7,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":8,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false}],"moderator":false,"admin":false,"staff":false,"user_id":255,"hidden":false,"hidden_reason_id":null,"trust_level":2,"deleted_at":null,"user_deleted":false,"edit_reason":null,"can_view_edit_history":true,"wiki":false},{"id":419,"name":"Tim Stone","username":"tms","avatar_template":"/user_avatar/meta.discourse.org/tms/{size}/40181.png","uploaded_avatar_id":40181,"created_at":"2013-02-05T21:32:47.649Z","cooked":"

The application strings are externalized, so localization should be entirely possible with enough translation effort.

","post_number":2,"post_type":1,"updated_at":"2013-02-06T10:15:27.965Z","like_count":4,"reply_count":0,"reply_to_post_number":null,"quote_count":0,"avg_time":27,"incoming_link_count":16,"reads":460,"score":308.35,"yours":false,"topic_id":280,"topic_slug":"internationalization-localization","display_username":"Tim Stone","primary_group_name":null,"version":2,"can_edit":true,"can_delete":true,"can_recover":true,"link_counts":[{"url":"https://github.com/discourse/discourse/blob/master/config/locales/en.yml","internal":false,"reflection":false,"clicks":118}],"read":true,"user_title":"Great contributor","actions_summary":[{"id":2,"count":4,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":3,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":4,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":5,"count":0,"hidden":true,"can_act":true,"can_defer_flags":false},{"id":6,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":7,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":8,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false}],"moderator":false,"admin":false,"staff":false,"user_id":9,"hidden":false,"hidden_reason_id":null,"trust_level":2,"deleted_at":null,"user_deleted":false,"edit_reason":null,"can_view_edit_history":true,"wiki":false},{"id":1060,"name":"Jeff Atwood","username":"codinghorror","avatar_template":"/user_avatar/meta.discourse.org/codinghorror/{size}/5297.png","uploaded_avatar_id":5297,"created_at":"2013-02-06T02:26:24.922Z","cooked":"

Yep, all strings are going through a lookup table.*

\n\n

master/config/locales

\n\n

So you could replace that lookup table with the \"de\" one to get German.

\n\n

* we didn't get all the strings into the lookup table for launch, but the vast, vast majority of them are and the ones that are not, we will fix as we go!

","post_number":3,"post_type":1,"updated_at":"2014-02-24T05:23:39.211Z","like_count":4,"reply_count":3,"reply_to_post_number":null,"quote_count":0,"avg_time":33,"incoming_link_count":5,"reads":449,"score":191.45,"yours":false,"topic_id":280,"topic_slug":"internationalization-localization","display_username":"Jeff Atwood","primary_group_name":"discourse","version":4,"can_edit":true,"can_delete":true,"can_recover":true,"link_counts":[{"url":"https://github.com/discourse/discourse/blob/master/config/locales","internal":false,"reflection":false,"title":"discourse/config/locales at master · discourse/discourse · GitHub","clicks":62},{"url":"https://meta.discourse.org/t/github-onebox-rendering-issue/7616","internal":true,"reflection":true,"title":"GitHub OneBox Rendering Issue","clicks":0}],"read":true,"user_title":"co-founder","actions_summary":[{"id":2,"count":4,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":3,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":4,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":5,"count":0,"hidden":true,"can_act":true,"can_defer_flags":false},{"id":6,"count":1,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":7,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":8,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false}],"moderator":true,"admin":true,"staff":true,"user_id":32,"hidden":false,"hidden_reason_id":null,"trust_level":3,"deleted_at":null,"user_deleted":false,"edit_reason":"","can_view_edit_history":true,"wiki":false},{"id":3623,"name":"Shade","username":"shade","avatar_template":"/user_avatar/meta.discourse.org/shade/{size}/8306.png","uploaded_avatar_id":8306,"created_at":"2013-02-07T12:55:33.129Z","cooked":"

Is it a coincidence that the strings file is 1337 lines long? \"smiley\"

","post_number":4,"post_type":1,"updated_at":"2013-02-07T12:55:33.129Z","like_count":7,"reply_count":0,"reply_to_post_number":null,"quote_count":0,"avg_time":20,"incoming_link_count":15,"reads":401,"score":291.2,"yours":false,"topic_id":280,"topic_slug":"internationalization-localization","display_username":"Shade","primary_group_name":null,"version":1,"can_edit":true,"can_delete":true,"can_recover":true,"link_counts":[{"url":"https://meta.discourse.org/t/hi-support-chinese/4393/6","internal":true,"reflection":true,"title":"Hi, support Chinese?","clicks":0}],"read":true,"user_title":null,"actions_summary":[{"id":2,"count":7,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":3,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":4,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":5,"count":0,"hidden":true,"can_act":true,"can_defer_flags":false},{"id":6,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":7,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":8,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false}],"moderator":false,"admin":false,"staff":false,"user_id":1808,"hidden":false,"hidden_reason_id":null,"trust_level":1,"deleted_at":null,"user_deleted":false,"edit_reason":null,"can_view_edit_history":true,"wiki":false},{"id":3651,"name":"Pekka Gaiser","username":"pekka","avatar_template":"/user_avatar/meta.discourse.org/pekka/{size}/5253.png","uploaded_avatar_id":5253,"created_at":"2013-02-07T14:02:07.869Z","cooked":"

\n\n

The problem I see here is that this file is likely two grow and change massively over the next couple months, and tracking these changes in order to keep a localized file up to date is going to be a bitch.

\n\n

I wonder where there is a tool that can compare two yml structures and point out which nodes are missing? That would help keep track of new strings.

\n\n

Re keeping track of changed strings, @codinghorror I found this very interesting: http://stackoverflow.com/questions/4232922/why-do-people-use-plain-english-as-translation-placeholders if plain English placeholders were used, any change in strings would lead to a new node in the yml file, making keeping the translation up to date easier. Maybe worth thinking about in the future.

","post_number":5,"post_type":1,"updated_at":"2013-02-07T14:05:42.328Z","like_count":2,"reply_count":2,"reply_to_post_number":3,"quote_count":1,"avg_time":22,"incoming_link_count":10,"reads":386,"score":213.3,"yours":false,"topic_id":280,"topic_slug":"internationalization-localization","display_username":"Pekka Gaiser","primary_group_name":null,"version":1,"can_edit":true,"can_delete":true,"can_recover":true,"link_counts":[{"url":"http://stackoverflow.com/questions/4232922/why-do-people-use-plain-english-as-translation-placeholders","internal":false,"reflection":false,"title":"internationalization - Why do people use plain english as translation placeholders? - Stack Overflow","clicks":63}],"read":true,"user_title":null,"actions_summary":[{"id":2,"count":2,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":3,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":4,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":5,"count":0,"hidden":true,"can_act":true,"can_defer_flags":false},{"id":6,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":7,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":8,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false}],"moderator":false,"admin":false,"staff":false,"user_id":7,"hidden":false,"hidden_reason_id":null,"trust_level":2,"deleted_at":null,"user_deleted":false,"edit_reason":null,"can_view_edit_history":true,"wiki":false},{"id":3654,"name":"Sam Saffron","username":"sam","avatar_template":"/user_avatar/meta.discourse.org/sam/{size}/5243.png","uploaded_avatar_id":5243,"created_at":"2013-02-07T14:05:39.910Z","cooked":"

Yes, I really like the concept of fuzzy matching for localization, perhaps you can chase up alex sexton he was meaning to upload a localization tool for this kind of stuff.

\n\n

Also, I am a big fan of ICU message format, but it is not the \"Rails way (tm)\".

","post_number":6,"post_type":1,"updated_at":"2013-02-07T14:05:39.910Z","like_count":1,"reply_count":1,"reply_to_post_number":5,"quote_count":0,"avg_time":17,"incoming_link_count":4,"reads":329,"score":106.65,"yours":false,"topic_id":280,"topic_slug":"internationalization-localization","display_username":"Sam Saffron","primary_group_name":"discourse","version":1,"can_edit":true,"can_delete":true,"can_recover":true,"link_counts":[{"url":"https://github.com/SlexAxton/messageformat.js","internal":false,"reflection":false,"title":"SlexAxton/messageformat.js · GitHub","clicks":46},{"url":"https://github.com/SlexAxton","internal":false,"reflection":false,"title":"SlexAxton (Alex Sexton) · GitHub","clicks":10}],"read":true,"user_title":"co-founder","reply_to_user":{"username":"pekka","avatar_template":"/user_avatar/meta.discourse.org/pekka/{size}/5253.png","uploaded_avatar_id":5253},"actions_summary":[{"id":2,"count":1,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":3,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":4,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":5,"count":0,"hidden":true,"can_act":true,"can_defer_flags":false},{"id":6,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":7,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":8,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false}],"moderator":true,"admin":true,"staff":true,"user_id":1,"hidden":false,"hidden_reason_id":null,"trust_level":4,"deleted_at":null,"user_deleted":false,"edit_reason":null,"can_view_edit_history":true,"wiki":false},{"id":3655,"name":"Pekka Gaiser","username":"pekka","avatar_template":"/user_avatar/meta.discourse.org/pekka/{size}/5253.png","uploaded_avatar_id":5253,"created_at":"2013-02-07T14:08:17.493Z","cooked":"

Looks interesting, I'll take a peek.

\n\n

As said on dev, the best tool I can see in terms of giving translators a proper interface and quality control would be something like GlotPress. It's based on the PO messages format (is that somehow related to ICU?) but looks pretty great.

\n\n

\n\n

I'm not familiar with the term in this context, you mean keeping the English version in the code base (instead of a generic code like message_error_nametooshort ?)

","post_number":7,"post_type":1,"updated_at":"2013-02-07T14:12:02.965Z","like_count":1,"reply_count":1,"reply_to_post_number":6,"quote_count":1,"avg_time":16,"incoming_link_count":0,"reads":326,"score":86.0,"yours":false,"topic_id":280,"topic_slug":"internationalization-localization","display_username":"Pekka Gaiser","primary_group_name":null,"version":1,"can_edit":true,"can_delete":true,"can_recover":true,"link_counts":[{"url":"http://translate.wordpress.org/projects/bbpress/dev","internal":false,"reflection":false,"title":"WordPress › Development < GlotPress","clicks":16}],"read":true,"user_title":null,"actions_summary":[{"id":2,"count":1,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":3,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":4,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":5,"count":0,"hidden":true,"can_act":true,"can_defer_flags":false},{"id":6,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":7,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":8,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false}],"moderator":false,"admin":false,"staff":false,"user_id":7,"hidden":false,"hidden_reason_id":null,"trust_level":2,"deleted_at":null,"user_deleted":false,"edit_reason":null,"can_view_edit_history":true,"wiki":false},{"id":3658,"name":"Sam Saffron","username":"sam","avatar_template":"/user_avatar/meta.discourse.org/sam/{size}/5243.png","uploaded_avatar_id":5243,"created_at":"2013-02-07T14:12:22.582Z","cooked":"

ICU Message format is basically Gettext on steroids, Gettext has been around for so many years and actually works pretty well, being super prevalent in Linux.

\n\n

Trouble is you need a fuzzy matcher for translators if you are going to store stuff like mf.compile( 'This is a message.' ) in source, one letter change and all your translators need to validate it.

","post_number":8,"post_type":1,"updated_at":"2013-02-07T14:12:22.582Z","like_count":1,"reply_count":1,"reply_to_post_number":7,"quote_count":0,"avg_time":11,"incoming_link_count":2,"reads":296,"score":89.75,"yours":false,"topic_id":280,"topic_slug":"internationalization-localization","display_username":"Sam Saffron","primary_group_name":"discourse","version":1,"can_edit":true,"can_delete":true,"can_recover":true,"link_counts":[{"url":"https://meta.discourse.org/t/what-i-love-about-wordpress-plugins/5697","internal":true,"reflection":true,"title":"What I love about WordPress plugins","clicks":0}],"read":true,"user_title":"co-founder","reply_to_user":{"username":"pekka","avatar_template":"/user_avatar/meta.discourse.org/pekka/{size}/5253.png","uploaded_avatar_id":5253},"actions_summary":[{"id":2,"count":1,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":3,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":4,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":5,"count":0,"hidden":true,"can_act":true,"can_defer_flags":false},{"id":6,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":7,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":8,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false}],"moderator":true,"admin":true,"staff":true,"user_id":1,"hidden":false,"hidden_reason_id":null,"trust_level":4,"deleted_at":null,"user_deleted":false,"edit_reason":null,"can_view_edit_history":true,"wiki":false},{"id":3660,"name":"Pekka Gaiser","username":"pekka","avatar_template":"/user_avatar/meta.discourse.org/pekka/{size}/5253.png","uploaded_avatar_id":5253,"created_at":"2013-02-07T14:14:12.666Z","cooked":"

\n\n

Yeah, that's why I've always been a friend of message_error_nametooshort placeholders, until I asked the SO question linked above. The accepted answer makes a good argument against those placeholders: you want translations to break even on small changes in the English original because the translations will probably need to reflect the change, too. Maybe that's not the case right now as new stuff is being checked in pretty much every couple of hours, but in the long run, it'll be overwhelmingly true.

","post_number":9,"post_type":1,"updated_at":"2013-02-07T14:18:09.569Z","like_count":1,"reply_count":1,"reply_to_post_number":8,"quote_count":1,"avg_time":10,"incoming_link_count":0,"reads":293,"score":79.1,"yours":false,"topic_id":280,"topic_slug":"internationalization-localization","display_username":"Pekka Gaiser","primary_group_name":null,"version":1,"can_edit":true,"can_delete":true,"can_recover":true,"read":true,"user_title":null,"actions_summary":[{"id":2,"count":1,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":3,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":4,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":5,"count":0,"hidden":true,"can_act":true,"can_defer_flags":false},{"id":6,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":7,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":8,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false}],"moderator":false,"admin":false,"staff":false,"user_id":7,"hidden":false,"hidden_reason_id":null,"trust_level":2,"deleted_at":null,"user_deleted":false,"edit_reason":null,"can_view_edit_history":true,"wiki":false},{"id":3667,"name":"Tim Stone","username":"tms","avatar_template":"/user_avatar/meta.discourse.org/tms/{size}/40181.png","uploaded_avatar_id":40181,"created_at":"2013-02-07T14:25:16.859Z","cooked":"

Hmm...You could theoretically also build something into the development process that would monitor changes to the English locale file and make a translator-friendly list of changes between versions.

","post_number":10,"post_type":1,"updated_at":"2013-02-07T14:25:16.859Z","like_count":1,"reply_count":1,"reply_to_post_number":9,"quote_count":0,"avg_time":7,"incoming_link_count":0,"reads":275,"score":75.35,"yours":false,"topic_id":280,"topic_slug":"internationalization-localization","display_username":"Tim Stone","primary_group_name":null,"version":1,"can_edit":true,"can_delete":true,"can_recover":true,"read":true,"user_title":"Great contributor","reply_to_user":{"username":"pekka","avatar_template":"/user_avatar/meta.discourse.org/pekka/{size}/5253.png","uploaded_avatar_id":5253},"actions_summary":[{"id":2,"count":1,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":3,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":4,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":5,"count":0,"hidden":true,"can_act":true,"can_defer_flags":false},{"id":6,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":7,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":8,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false}],"moderator":false,"admin":false,"staff":false,"user_id":9,"hidden":false,"hidden_reason_id":null,"trust_level":2,"deleted_at":null,"user_deleted":false,"edit_reason":null,"can_view_edit_history":true,"wiki":false},{"id":3673,"name":"Sam Saffron","username":"sam","avatar_template":"/user_avatar/meta.discourse.org/sam/{size}/5243.png","uploaded_avatar_id":5243,"created_at":"2013-02-07T14:30:21.401Z","cooked":"

Yeah, totally, also we could build tools for dev that make introducing string less annoying and make it possible to garbage collect old unused strings, I hate trudging through that file.

","post_number":11,"post_type":1,"updated_at":"2013-02-07T14:30:21.401Z","like_count":1,"reply_count":1,"reply_to_post_number":10,"quote_count":0,"avg_time":7,"incoming_link_count":1,"reads":273,"score":79.95,"yours":false,"topic_id":280,"topic_slug":"internationalization-localization","display_username":"Sam Saffron","primary_group_name":"discourse","version":1,"can_edit":true,"can_delete":true,"can_recover":true,"read":true,"user_title":"co-founder","reply_to_user":{"username":"tms","avatar_template":"/user_avatar/meta.discourse.org/tms/{size}/40181.png","uploaded_avatar_id":40181},"actions_summary":[{"id":2,"count":1,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":3,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":4,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":5,"count":0,"hidden":true,"can_act":true,"can_defer_flags":false},{"id":6,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":7,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":8,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false}],"moderator":true,"admin":true,"staff":true,"user_id":1,"hidden":false,"hidden_reason_id":null,"trust_level":4,"deleted_at":null,"user_deleted":false,"edit_reason":null,"can_view_edit_history":true,"wiki":false},{"id":3675,"name":"Pekka Gaiser","username":"pekka","avatar_template":"/user_avatar/meta.discourse.org/pekka/{size}/5253.png","uploaded_avatar_id":5253,"created_at":"2013-02-07T14:33:38.280Z","cooked":"

\n\n

As said, I'd look into whether WP's tools can't be reused for this with some tweaking. They seem to be able to scan a code base for new strings, and make them available automatically to translators.

\n\n

They're PHP based which isn't ideal, but it looks like they've done a crapload of work to take the hassle out of translations.

","post_number":12,"post_type":1,"updated_at":"2013-02-07T14:34:39.910Z","like_count":1,"reply_count":1,"reply_to_post_number":11,"quote_count":1,"avg_time":7,"incoming_link_count":2,"reads":273,"score":84.95,"yours":false,"topic_id":280,"topic_slug":"internationalization-localization","display_username":"Pekka Gaiser","primary_group_name":null,"version":1,"can_edit":true,"can_delete":true,"can_recover":true,"read":true,"user_title":null,"actions_summary":[{"id":2,"count":1,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":3,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":4,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":5,"count":0,"hidden":true,"can_act":true,"can_defer_flags":false},{"id":6,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":7,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":8,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false}],"moderator":false,"admin":false,"staff":false,"user_id":7,"hidden":false,"hidden_reason_id":null,"trust_level":2,"deleted_at":null,"user_deleted":false,"edit_reason":null,"can_view_edit_history":true,"wiki":false},{"id":3690,"name":"Valts","username":"Vilx","avatar_template":"/user_avatar/meta.discourse.org/vilx/{size}/7299.png","uploaded_avatar_id":7299,"created_at":"2013-02-07T15:05:35.867Z","cooked":"

This site looks so nice with all the little tweaks like \"10 minutes ago\" instead of simply time, etc - I wonder if there will also be support for proper pluralization in other languages? That's a pretty hard task though, I don't think I've ever seen a website that has done that. But it would be awesome.

","post_number":13,"post_type":1,"updated_at":"2013-02-07T15:05:35.867Z","like_count":3,"reply_count":0,"reply_to_post_number":null,"quote_count":0,"avg_time":7,"incoming_link_count":11,"reads":290,"score":158.35,"yours":false,"topic_id":280,"topic_slug":"internationalization-localization","display_username":"Valts","primary_group_name":null,"version":1,"can_edit":true,"can_delete":true,"can_recover":true,"read":true,"user_title":null,"actions_summary":[{"id":2,"count":3,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":3,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":4,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":5,"count":0,"hidden":true,"can_act":true,"can_defer_flags":false},{"id":6,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":7,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":8,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false}],"moderator":false,"admin":false,"staff":false,"user_id":1216,"hidden":false,"hidden_reason_id":null,"trust_level":2,"deleted_at":null,"user_deleted":false,"edit_reason":null,"can_view_edit_history":true,"wiki":false},{"id":3925,"name":"Eric Kidd","username":"emk","avatar_template":"/user_avatar/meta.discourse.org/emk/{size}/8400.png","uploaded_avatar_id":8400,"created_at":"2013-02-07T19:37:06.194Z","cooked":"

\n\n

I've had pretty decent luck using Localeapp to localize Rails applications:

\n\n

http://www.localeapp.com/

\n\n

The developer workflow took me about an hour to really get used to, and there were a few minor glitches. But the non-technical translators had very few problems. One limitation: It insists on rewriting all those yaml files full of strings.

\n\n

Anyway, it's worth a look, and it's free for open source, if I recall correctly. Certainly easier than doing a whole bunch of toolsmithing from scratch.

","post_number":14,"post_type":1,"updated_at":"2013-02-07T19:37:06.194Z","like_count":3,"reply_count":1,"reply_to_post_number":12,"quote_count":1,"avg_time":9,"incoming_link_count":0,"reads":283,"score":137.05,"yours":false,"topic_id":280,"topic_slug":"internationalization-localization","display_username":"Eric Kidd","primary_group_name":null,"version":1,"can_edit":true,"can_delete":true,"can_recover":true,"link_counts":[{"url":"http://www.localeapp.com/","internal":false,"reflection":false,"title":"Easy localization for Rails apps | Locale","clicks":69}],"read":true,"user_title":null,"actions_summary":[{"id":2,"count":3,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":3,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":4,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":5,"count":0,"hidden":true,"can_act":true,"can_defer_flags":false},{"id":6,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":7,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":8,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false}],"moderator":false,"admin":false,"staff":false,"user_id":1860,"hidden":false,"hidden_reason_id":null,"trust_level":1,"deleted_at":null,"user_deleted":false,"edit_reason":null,"can_view_edit_history":true,"wiki":false},{"id":3938,"name":"Pekka Gaiser","username":"pekka","avatar_template":"/user_avatar/meta.discourse.org/pekka/{size}/5253.png","uploaded_avatar_id":5253,"created_at":"2013-02-07T19:52:13.748Z","cooked":"

\n\n

Ohhh. Looking sexy. droool

","post_number":15,"post_type":1,"updated_at":"2013-02-07T19:52:13.748Z","like_count":1,"reply_count":1,"reply_to_post_number":14,"quote_count":1,"avg_time":7,"incoming_link_count":0,"reads":260,"score":72.35,"yours":false,"topic_id":280,"topic_slug":"internationalization-localization","display_username":"Pekka Gaiser","primary_group_name":null,"version":1,"can_edit":true,"can_delete":true,"can_recover":true,"read":true,"user_title":null,"actions_summary":[{"id":2,"count":1,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":3,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":4,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":5,"count":0,"hidden":true,"can_act":true,"can_defer_flags":false},{"id":6,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":7,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":8,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false}],"moderator":false,"admin":false,"staff":false,"user_id":7,"hidden":false,"hidden_reason_id":null,"trust_level":2,"deleted_at":null,"user_deleted":false,"edit_reason":null,"can_view_edit_history":true,"wiki":false},{"id":3982,"name":"Eric Kidd","username":"emk","avatar_template":"/user_avatar/meta.discourse.org/emk/{size}/8400.png","uploaded_avatar_id":8400,"created_at":"2013-02-07T20:52:22.454Z","cooked":"

\n\n

Yeah, it's pretty. \"smile\" But there were still some rough edges as of a few months ago.

\n\n

Whether or not those rough edges are a deal-breaker will probably depends on whether or not localization is already a source of acute pain. If you're already hurting, Localeapp is a pretty useful tool, especially when it comes to enlisting non-technical translators.

\n\n

But it does require changing how you work with text, and adding one new tool to the mix. So for projects that just don't want to know about non-English languages, it's not yet seamless the way Unicode is these days.

\n\n

(Sweet forum software, by the way. I was just testing out Egyptian hieroglyphics on the test server, because they're well off the Basic Multilingual Plane, and tend to flush Unicode bugs. Everything worked flawlessly.)

","post_number":16,"post_type":1,"updated_at":"2013-02-07T20:52:22.454Z","like_count":1,"reply_count":1,"reply_to_post_number":15,"quote_count":1,"avg_time":7,"incoming_link_count":0,"reads":254,"score":71.15,"yours":false,"topic_id":280,"topic_slug":"internationalization-localization","display_username":"Eric Kidd","primary_group_name":null,"version":1,"can_edit":true,"can_delete":true,"can_recover":true,"read":true,"user_title":null,"actions_summary":[{"id":2,"count":1,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":3,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":4,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":5,"count":0,"hidden":true,"can_act":true,"can_defer_flags":false},{"id":6,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":7,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":8,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false}],"moderator":false,"admin":false,"staff":false,"user_id":1860,"hidden":false,"hidden_reason_id":null,"trust_level":1,"deleted_at":null,"user_deleted":false,"edit_reason":null,"can_view_edit_history":true,"wiki":false},{"id":3989,"name":"Pekka Gaiser","username":"pekka","avatar_template":"/user_avatar/meta.discourse.org/pekka/{size}/5253.png","uploaded_avatar_id":5253,"created_at":"2013-02-07T21:04:15.405Z","cooked":"

\n\n

Interesting, thanks for the insight. I don't think localization is seriously on their table right now, there's likely to be many other things on the table before it... but it will become an issue sooner or later.

","post_number":17,"post_type":1,"updated_at":"2013-02-07T21:04:15.405Z","like_count":1,"reply_count":2,"reply_to_post_number":16,"quote_count":1,"avg_time":7,"incoming_link_count":0,"reads":255,"score":76.35,"yours":false,"topic_id":280,"topic_slug":"internationalization-localization","display_username":"Pekka Gaiser","primary_group_name":null,"version":1,"can_edit":true,"can_delete":true,"can_recover":true,"read":true,"user_title":null,"actions_summary":[{"id":2,"count":1,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":3,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":4,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":5,"count":0,"hidden":true,"can_act":true,"can_defer_flags":false},{"id":6,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":7,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":8,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false}],"moderator":false,"admin":false,"staff":false,"user_id":7,"hidden":false,"hidden_reason_id":null,"trust_level":2,"deleted_at":null,"user_deleted":false,"edit_reason":null,"can_view_edit_history":true,"wiki":false},{"id":3996,"name":"Sam Saffron","username":"sam","avatar_template":"/user_avatar/meta.discourse.org/sam/{size}/5243.png","uploaded_avatar_id":5243,"created_at":"2013-02-07T21:12:06.575Z","cooked":"

I had an idea ... what if in dev mode, you could right-click on a page and get access to all the translations on the page, make your edits and have it refreshed live.

\n\n

I think it would be awesome, very doable technically.

","post_number":18,"post_type":1,"updated_at":"2013-02-07T21:12:06.575Z","like_count":7,"reply_count":2,"reply_to_post_number":17,"quote_count":0,"avg_time":8,"incoming_link_count":0,"reads":264,"score":168.2,"yours":false,"topic_id":280,"topic_slug":"internationalization-localization","display_username":"Sam Saffron","primary_group_name":"discourse","version":1,"can_edit":true,"can_delete":true,"can_recover":true,"read":true,"user_title":"co-founder","reply_to_user":{"username":"pekka","avatar_template":"/user_avatar/meta.discourse.org/pekka/{size}/5253.png","uploaded_avatar_id":5253},"actions_summary":[{"id":2,"count":7,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":3,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":4,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":5,"count":0,"hidden":true,"can_act":true,"can_defer_flags":false},{"id":6,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":7,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":8,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false}],"moderator":true,"admin":true,"staff":true,"user_id":1,"hidden":false,"hidden_reason_id":null,"trust_level":4,"deleted_at":null,"user_deleted":false,"edit_reason":null,"can_view_edit_history":true,"wiki":false},{"id":4009,"name":"Pekka Gaiser","username":"pekka","avatar_template":"/user_avatar/meta.discourse.org/pekka/{size}/5253.png","uploaded_avatar_id":5253,"created_at":"2013-02-07T21:18:47.422Z","cooked":"

That would be fricking cool. There'd still be some leftovers (like error messages that normally never show up, etc.) but you could corral those up on a specific page.

\n\n

It could have a dropdown giving you all the languages that you have a .yml for in the locale directory, and write the changes into the one selected. I'm sure people would love it.

","post_number":19,"post_type":1,"updated_at":"2013-02-07T21:22:10.692Z","like_count":1,"reply_count":0,"reply_to_post_number":18,"quote_count":0,"avg_time":8,"incoming_link_count":1,"reads":241,"score":68.6,"yours":false,"topic_id":280,"topic_slug":"internationalization-localization","display_username":"Pekka Gaiser","primary_group_name":null,"version":1,"can_edit":true,"can_delete":true,"can_recover":true,"read":true,"user_title":null,"reply_to_user":{"username":"sam","avatar_template":"/user_avatar/meta.discourse.org/sam/{size}/5243.png","uploaded_avatar_id":5243},"actions_summary":[{"id":2,"count":1,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":3,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":4,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":5,"count":0,"hidden":true,"can_act":true,"can_defer_flags":false},{"id":6,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":7,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":8,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false}],"moderator":false,"admin":false,"staff":false,"user_id":7,"hidden":false,"hidden_reason_id":null,"trust_level":2,"deleted_at":null,"user_deleted":false,"edit_reason":null,"can_view_edit_history":true,"wiki":false},{"id":4012,"name":"Marco Ceppi","username":"marcoceppi","avatar_template":"/user_avatar/meta.discourse.org/marcoceppi/{size}/6552.png","uploaded_avatar_id":6552,"created_at":"2013-02-07T21:22:46.376Z","cooked":"

If you use gettext format you could leverage Launchpad translations and the community behind it.

","post_number":20,"post_type":1,"updated_at":"2013-02-07T21:22:46.376Z","like_count":1,"reply_count":0,"reply_to_post_number":null,"quote_count":0,"avg_time":9,"incoming_link_count":2,"reads":244,"score":74.25,"yours":false,"topic_id":280,"topic_slug":"internationalization-localization","display_username":"Marco Ceppi","primary_group_name":null,"version":1,"can_edit":true,"can_delete":true,"can_recover":true,"link_counts":[{"url":"https://translations.launchpad.net/","internal":false,"reflection":false,"title":"Launchpad Translations","clicks":13}],"read":true,"user_title":null,"actions_summary":[{"id":2,"count":1,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":3,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":4,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":5,"count":0,"hidden":true,"can_act":true,"can_defer_flags":false},{"id":6,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":7,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":8,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false}],"moderator":false,"admin":false,"staff":false,"user_id":761,"hidden":false,"hidden_reason_id":null,"trust_level":2,"deleted_at":null,"user_deleted":false,"edit_reason":null,"can_view_edit_history":true,"wiki":false}],"stream":[398,419,1060,3623,3651,3654,3655,3658,3660,3667,3673,3675,3690,3925,3938,3982,3989,3996,4009,4012],"gaps":{"before":{"20706":[20125]},"after":{}}},"id":280,"title":"Internationalization / localization","fancy_title":"Internationalization / localization","posts_count":103,"created_at":"2013-02-05T21:29:00.174Z","views":5211,"reply_count":67,"participant_count":40,"like_count":135,"last_posted_at":"2015-03-04T15:07:10.487Z","visible":true,"closed":false,"archived":false,"has_summary":true,"archetype":"regular","slug":"internationalization-localization","category_id":2,"word_count":6198,"deleted_at":null,"draft":null,"draft_key":"topic_280","draft_sequence":4,"posted":true,"unpinned":null,"pinned_globally":false,"pinned":false,"pinned_at":null,"details":{"auto_close_at":null,"auto_close_hours":null,"auto_close_based_on_last_post":false,"created_by":{"id":255,"username":"uwe_keim","uploaded_avatar_id":5697,"avatar_template":"/user_avatar/meta.discourse.org/uwe_keim/{size}/5697.png"},"last_poster":{"id":14091,"username":"Luciano_Fantuzzi","uploaded_avatar_id":39484,"avatar_template":"/user_avatar/meta.discourse.org/luciano_fantuzzi/{size}/39484.png"},"participants":[{"id":212,"username":"alxndr","uploaded_avatar_id":5619,"avatar_template":"/user_avatar/meta.discourse.org/alxndr/{size}/5619.png","post_count":11},{"id":1,"username":"sam","uploaded_avatar_id":5243,"avatar_template":"/user_avatar/meta.discourse.org/sam/{size}/5243.png","post_count":11},{"id":7,"username":"pekka","uploaded_avatar_id":5253,"avatar_template":"/user_avatar/meta.discourse.org/pekka/{size}/5253.png","post_count":8},{"id":461,"username":"kuba","uploaded_avatar_id":6049,"avatar_template":"/user_avatar/meta.discourse.org/kuba/{size}/6049.png","post_count":7},{"id":2995,"username":"tattoo","uploaded_avatar_id":null,"avatar_template":"/letter_avatar/tattoo/{size}/3.png","post_count":6},{"id":2540,"username":"jgourdon","uploaded_avatar_id":9537,"avatar_template":"/user_avatar/meta.discourse.org/jgourdon/{size}/9537.png","post_count":5},{"id":1860,"username":"emk","uploaded_avatar_id":8400,"avatar_template":"/user_avatar/meta.discourse.org/emk/{size}/8400.png","post_count":4},{"id":1275,"username":"dacap","uploaded_avatar_id":7401,"avatar_template":"/user_avatar/meta.discourse.org/dacap/{size}/7401.png","post_count":4},{"id":19,"username":"eviltrout","uploaded_avatar_id":5275,"avatar_template":"/user_avatar/meta.discourse.org/eviltrout/{size}/5275.png","post_count":4},{"id":3704,"username":"mojzis","uploaded_avatar_id":31201,"avatar_template":"/user_avatar/meta.discourse.org/mojzis/{size}/31201.png","post_count":3},{"id":3190,"username":"gururea","uploaded_avatar_id":10663,"avatar_template":"/user_avatar/meta.discourse.org/gururea/{size}/10663.png","post_count":3},{"id":1895,"username":"maciek","uploaded_avatar_id":8463,"avatar_template":"/user_avatar/meta.discourse.org/maciek/{size}/8463.png","post_count":3},{"id":22,"username":"splattne","uploaded_avatar_id":5280,"avatar_template":"/user_avatar/meta.discourse.org/splattne/{size}/5280.png","post_count":2},{"id":1979,"username":"Superuser","uploaded_avatar_id":8604,"avatar_template":"/user_avatar/meta.discourse.org/superuser/{size}/8604.png","post_count":2},{"id":3818,"username":"Tudor","uploaded_avatar_id":11675,"avatar_template":"/user_avatar/meta.discourse.org/tudor/{size}/11675.png","post_count":2},{"id":32,"username":"codinghorror","uploaded_avatar_id":5297,"avatar_template":"/user_avatar/meta.discourse.org/codinghorror/{size}/5297.png","post_count":2},{"id":3620,"username":"potthast","uploaded_avatar_id":11363,"avatar_template":"/user_avatar/meta.discourse.org/potthast/{size}/11363.png","post_count":2},{"id":9,"username":"tms","uploaded_avatar_id":40181,"avatar_template":"/user_avatar/meta.discourse.org/tms/{size}/40181.png","post_count":2},{"id":14091,"username":"Luciano_Fantuzzi","uploaded_avatar_id":39484,"avatar_template":"/user_avatar/meta.discourse.org/luciano_fantuzzi/{size}/39484.png","post_count":1},{"id":255,"username":"uwe_keim","uploaded_avatar_id":5697,"avatar_template":"/user_avatar/meta.discourse.org/uwe_keim/{size}/5697.png","post_count":1},{"id":9006,"username":"berk","uploaded_avatar_id":19348,"avatar_template":"/user_avatar/meta.discourse.org/berk/{size}/19348.png","post_count":1},{"id":754,"username":"danneu","uploaded_avatar_id":6540,"avatar_template":"/user_avatar/meta.discourse.org/danneu/{size}/6540.png","post_count":1},{"id":761,"username":"marcoceppi","uploaded_avatar_id":6552,"avatar_template":"/user_avatar/meta.discourse.org/marcoceppi/{size}/6552.png","post_count":1},{"id":2753,"username":"mikl","uploaded_avatar_id":9918,"avatar_template":"/user_avatar/meta.discourse.org/mikl/{size}/9918.png","post_count":1}],"suggested_topics":[{"id":27331,"title":"Polls are still very buggy","fancy_title":"Polls are still very buggy","slug":"polls-are-still-very-buggy","posts_count":4,"reply_count":1,"highest_post_number":4,"image_url":"/uploads/default/_optimized/cd1/b8c/c162528887_690x401.png","created_at":"2015-04-08T09:51:00.357Z","last_posted_at":"2015-04-08T15:59:16.258Z","bumped":true,"bumped_at":"2015-04-08T16:05:09.842Z","unseen":false,"last_read_post_number":3,"unread":0,"new_posts":1,"pinned":false,"unpinned":null,"visible":true,"closed":false,"archived":false,"notification_level":2,"bookmarked":false,"liked":false,"archetype":"regular","like_count":11,"views":55,"category_id":1},{"id":27343,"title":"Mobile theme doesn't show last activity time for topics on category page","fancy_title":"Mobile theme doesn’t show last activity time for topics on category page","slug":"mobile-theme-doesnt-show-last-activity-time-for-topics-on-category-page","posts_count":4,"reply_count":2,"highest_post_number":4,"image_url":"/uploads/default/_optimized/13e/25c/bd30b466be_281x500.png","created_at":"2015-04-08T14:20:51.177Z","last_posted_at":"2015-04-08T15:40:30.037Z","bumped":true,"bumped_at":"2015-04-08T15:40:30.037Z","unseen":false,"last_read_post_number":2,"unread":0,"new_posts":2,"pinned":false,"unpinned":null,"visible":true,"closed":false,"archived":false,"notification_level":2,"bookmarked":false,"liked":false,"archetype":"regular","like_count":3,"views":23,"category_id":9},{"id":27346,"title":"Reply+{messagekey}@... optionaly in header \"from\" in addition to \"reply-to\"","fancy_title":"Reply+{messagekey}@… optionaly in header “from” in addition to “reply-to”","slug":"reply-messagekey-optionaly-in-header-from-in-addition-to-reply-to","posts_count":1,"reply_count":0,"highest_post_number":1,"image_url":null,"created_at":"2015-04-08T16:05:13.103Z","last_posted_at":"2015-04-08T16:05:13.415Z","bumped":true,"bumped_at":"2015-04-08T16:05:13.415Z","unseen":true,"pinned":false,"unpinned":null,"visible":true,"closed":false,"archived":false,"bookmarked":null,"liked":null,"archetype":"regular","like_count":0,"views":8,"category_id":2},{"id":19670,"title":"Parsing (Oneboxing) IMDB links","fancy_title":"Parsing (Oneboxing) IMDB links","slug":"parsing-oneboxing-imdb-links","posts_count":8,"reply_count":1,"highest_post_number":8,"image_url":null,"created_at":"2014-09-05T07:19:26.161Z","last_posted_at":"2015-04-07T09:21:21.570Z","bumped":true,"bumped_at":"2015-04-07T09:21:21.570Z","unseen":false,"last_read_post_number":8,"unread":0,"new_posts":0,"pinned":false,"unpinned":null,"visible":true,"closed":false,"archived":false,"notification_level":2,"bookmarked":false,"liked":false,"archetype":"regular","like_count":4,"views":253,"category_id":2},{"id":7512,"title":"Support for Piwik Analytics as an alternative to Google Analytics","fancy_title":"Support for Piwik Analytics as an alternative to Google Analytics","slug":"support-for-piwik-analytics-as-an-alternative-to-google-analytics","posts_count":53,"reply_count":41,"highest_post_number":65,"image_url":"/plugins/emoji/images/smile.png","created_at":"2013-06-16T01:32:30.596Z","last_posted_at":"2015-02-22T13:46:26.845Z","bumped":true,"bumped_at":"2015-02-22T13:46:26.845Z","unseen":false,"last_read_post_number":65,"unread":0,"new_posts":0,"pinned":false,"unpinned":null,"visible":true,"closed":false,"archived":false,"notification_level":2,"bookmarked":false,"liked":false,"archetype":"regular","like_count":62,"views":1877,"category_id":2},{"id":25480,"title":"CSS admin-contents reloaded","fancy_title":"CSS admin-contents reloaded","slug":"css-admin-contents-reloaded","posts_count":22,"reply_count":15,"highest_post_number":22,"image_url":null,"created_at":"2015-02-21T12:15:57.707Z","last_posted_at":"2015-03-02T23:24:18.899Z","bumped":true,"bumped_at":"2015-03-02T23:24:18.899Z","unseen":false,"pinned":false,"unpinned":null,"visible":true,"closed":false,"archived":false,"bookmarked":null,"liked":null,"archetype":"regular","like_count":21,"views":185,"category_id":2},{"id":26576,"title":"Badge timestamp should be the time the badge was granted?","fancy_title":"Badge timestamp should be the time the badge was granted?","slug":"badge-timestamp-should-be-the-time-the-badge-was-granted","posts_count":2,"reply_count":0,"highest_post_number":2,"image_url":null,"created_at":"2015-03-20T13:22:08.266Z","last_posted_at":"2015-03-21T00:33:52.243Z","bumped":true,"bumped_at":"2015-03-21T00:33:52.243Z","unseen":false,"last_read_post_number":1,"unread":0,"new_posts":0,"pinned":false,"unpinned":null,"visible":true,"closed":false,"archived":false,"notification_level":1,"bookmarked":false,"liked":false,"archetype":"regular","like_count":9,"views":87,"category_id":2}],"links":[{"url":"https://github.com/discourse/discourse/blob/master/config/locales/en.yml","title":null,"fancy_title":null,"internal":false,"reflection":false,"clicks":118,"user_id":9,"domain":"github.com"},{"url":"http://www.localeapp.com/","title":"Easy localization for Rails apps | Locale","fancy_title":null,"internal":false,"reflection":false,"clicks":69,"user_id":1860,"domain":"www.localeapp.com"},{"url":"http://stackoverflow.com/questions/4232922/why-do-people-use-plain-english-as-translation-placeholders","title":"internationalization - Why do people use plain english as translation placeholders? - Stack Overflow","fancy_title":null,"internal":false,"reflection":false,"clicks":63,"user_id":7,"domain":"stackoverflow.com"},{"url":"https://github.com/discourse/discourse/blob/master/config/locales","title":"discourse/config/locales at master · discourse/discourse · GitHub","fancy_title":null,"internal":false,"reflection":false,"clicks":62,"user_id":32,"domain":"github.com"},{"url":"https://github.com/SlexAxton/messageformat.js","title":"SlexAxton/messageformat.js · GitHub","fancy_title":null,"internal":false,"reflection":false,"clicks":46,"user_id":1,"domain":"github.com"},{"url":"http://www.localeapp.com/projects/1537/translations?utf8=%E2%9C%93&search=source_code","title":"langforums | Locale","fancy_title":null,"internal":false,"reflection":false,"clicks":25,"user_id":1860,"domain":"www.localeapp.com"},{"url":"https://translations.launchpad.net/","title":"Launchpad Translations","fancy_title":null,"internal":false,"reflection":false,"clicks":23,"user_id":761,"domain":"translations.launchpad.net"},{"url":"https://www.transifex.com/","title":"Transifex - Continuous Localization Platform","fancy_title":null,"internal":false,"reflection":false,"clicks":22,"user_id":1979,"domain":"www.transifex.com"},{"url":"https://github.com/berk/tr8n","title":"berk/tr8n · GitHub","fancy_title":null,"internal":false,"reflection":false,"clicks":22,"user_id":1,"domain":"github.com"},{"url":"http://translate.wordpress.org/projects/bbpress/dev","title":"WordPress › Development < GlotPress","fancy_title":null,"internal":false,"reflection":false,"clicks":16,"user_id":7,"domain":"translate.wordpress.org"},{"url":"http://weblate.org","title":"Weblate - web-based translation","fancy_title":null,"internal":false,"reflection":false,"clicks":15,"user_id":2316,"domain":"weblate.org"},{"url":"https://github.com/discourse/discourse/tree/master/config/locales","title":"discourse/config/locales at master · discourse/discourse · GitHub","fancy_title":null,"internal":false,"reflection":false,"clicks":14,"user_id":19,"domain":"github.com"},{"url":"https://github.com/discourse/discourse/pull/493","title":"Danish translation. by mikl · Pull Request #493 · discourse/discourse · GitHub","fancy_title":null,"internal":false,"reflection":false,"clicks":12,"user_id":2753,"domain":"github.com"},{"url":"https://github.com/SlexAxton","title":"SlexAxton (Alex Sexton) · GitHub","fancy_title":null,"internal":false,"reflection":false,"clicks":10,"user_id":1,"domain":"github.com"},{"url":"https://github.com/gururea/discourse/tree/master/config/locales","title":"discourse/config/locales at master · gururea/discourse · GitHub","fancy_title":null,"internal":false,"reflection":false,"clicks":9,"user_id":3190,"domain":"github.com"},{"url":"https://github.com/discourse/discourse/blob/master/config/locales/client.en.yml#L691","title":"discourse/config/locales/client.en.yml at master · discourse/discourse · GitHub","fancy_title":null,"internal":false,"reflection":false,"clicks":7,"user_id":461,"domain":"github.com"},{"url":"https://github.com/dacap/discourse/tree/spanish","title":"dacap/discourse · GitHub","fancy_title":null,"internal":false,"reflection":false,"clicks":7,"user_id":1275,"domain":"github.com"},{"url":"https://github.com/discourse/discourse/blob/master/config/locales/client.nl.yml","title":"discourse/config/locales/client.nl.yml at master · discourse/discourse · GitHub","fancy_title":null,"internal":false,"reflection":false,"clicks":7,"user_id":461,"domain":"github.com"},{"url":"https://github.com/discourse/discourse/commit/c5761eae8afe37e20cec0d0f9d14b85b6e585bda","title":"Support for Simplified Chinese thanks to tangramor · c5761ea · discourse/discourse · GitHub","fancy_title":null,"internal":false,"reflection":false,"clicks":6,"user_id":212,"domain":"github.com"},{"url":"http://tr8n.github.com/","title":"tr8n","fancy_title":null,"internal":false,"reflection":false,"clicks":6,"user_id":212,"domain":"tr8n.github.com"},{"url":"http://www.getlocalization.com/","title":"Crowdsourced, Social and Collaborative App & Website Translation - Get Localization","fancy_title":null,"internal":false,"reflection":false,"clicks":6,"user_id":22,"domain":"www.getlocalization.com"},{"url":"http://blog.discourse.org/2013/04/discourse-as-your-first-rails-app/","title":"Discourse as Your First Rails App","fancy_title":null,"internal":false,"reflection":false,"clicks":5,"user_id":1995,"domain":"blog.discourse.org"},{"url":"https://github.com/alxndr/discourse/blob/i18n-chinese/config/locales/server.zh.yml","title":null,"fancy_title":null,"internal":false,"reflection":false,"clicks":5,"user_id":212,"domain":"github.com"},{"url":"http://translate.sourceforge.net/wiki/virtaal/index","title":"Easy-to-use and powerful offline translation tool | Virtaal","fancy_title":null,"internal":false,"reflection":false,"clicks":4,"user_id":1979,"domain":"translate.sourceforge.net"},{"url":"https://poeditor.com/","title":"POEditor - online software localization tool","fancy_title":null,"internal":false,"reflection":false,"clicks":4,"user_id":1979,"domain":"poeditor.com"},{"url":"http://en.lichess.org/@/Hellball","title":null,"fancy_title":null,"internal":false,"reflection":false,"clicks":3,"user_id":1979,"domain":"en.lichess.org"},{"url":"http://en.wikipedia.org/wiki/T%E2%80%93V_distinction","title":"T–V distinction - Wikipedia, the free encyclopedia","fancy_title":null,"internal":false,"reflection":false,"clicks":3,"user_id":3620,"domain":"en.wikipedia.org"},{"url":"http://www.slideshare.net/HeatherRivers/linguistic-potluck-crowdsourcing-localization-with-rails","title":"Linguistic Potluck: Crowdsourcing localization with Rails","fancy_title":null,"internal":false,"reflection":false,"clicks":3,"user_id":212,"domain":"www.slideshare.net"},{"url":"https://meta.discourse.org/t/language-mirrors/2378/2","title":"Language mirrors","fancy_title":null,"internal":true,"reflection":true,"clicks":3,"user_id":32,"domain":"meta.discourse.org"},{"url":"http://www.madanalogy.com/2012/06/rails-i18n-translations-in-yaml.html","title":"Mad Analogy: Rails i18n translations in Yaml: translation tool support","fancy_title":null,"internal":false,"reflection":false,"clicks":3,"user_id":3190,"domain":"www.madanalogy.com"},{"url":"https://github.com/tr8n","title":"Translation Exchange · GitHub","fancy_title":null,"internal":false,"reflection":false,"clicks":3,"user_id":9006,"domain":"github.com"},{"url":"http://pootle.locamotion.org/","title":"Main | Pootle Demo","fancy_title":null,"internal":false,"reflection":false,"clicks":2,"user_id":3190,"domain":"pootle.locamotion.org"},{"url":"http://www.youtube.com/watch?v=MqqdzJ98q7s","title":"GoGaRuCo 2012 - Linguistic Potluck: Crowdsourcing Localization in Rails by Heather Rivers - YouTube","fancy_title":null,"internal":false,"reflection":false,"clicks":2,"user_id":212,"domain":"www.youtube.com"},{"url":"https://meta.discourse.org/t/translation-workflow/6102","title":"Translation workflow","fancy_title":null,"internal":true,"reflection":true,"clicks":2,"user_id":4702,"domain":"meta.discourse.org"},{"url":"https://meta.discourse.org/t/solving-xda-developer-style-forums/4368/4","title":"Solving XDA-Developer style forums","fancy_title":null,"internal":true,"reflection":true,"clicks":2,"user_id":639,"domain":"meta.discourse.org"},{"url":"https://tr8nhub.com","title":"TranslationExchange","fancy_title":null,"internal":false,"reflection":false,"clicks":2,"user_id":9006,"domain":"tr8nhub.com"},{"url":"https://meta.discourse.org/t/roadplan-for-discourse/2939/3","title":"Roadplan for Discourse 2013","fancy_title":null,"internal":true,"reflection":true,"clicks":1,"user_id":2540,"domain":"meta.discourse.org"},{"url":"http://sugarjs.com/dates#date_locales","title":"Dates - Sugar","fancy_title":null,"internal":false,"reflection":false,"clicks":1,"user_id":461,"domain":"sugarjs.com"},{"url":"http://blog.discourse.org/2013/03/localizing-discourse/","title":"Localizing Discourse","fancy_title":null,"internal":false,"reflection":false,"clicks":1,"user_id":893,"domain":"blog.discourse.org"},{"url":"https://github.com/discourse/discourse/blob/master/app/assets/javascripts/locales/date_locales.js","title":null,"fancy_title":null,"internal":false,"reflection":false,"clicks":1,"user_id":461,"domain":"github.com"},{"url":"http://transifex.com/projects/p/discourse-pt-br/","title":"Discourse-Translations-Project localization","fancy_title":null,"internal":false,"reflection":false,"clicks":1,"user_id":893,"domain":"transifex.com"},{"url":"https://github.com/discourse/discourse/issues/279","title":null,"fancy_title":null,"internal":false,"reflection":false,"clicks":1,"user_id":893,"domain":"github.com"},{"url":"https://meta.discourse.org/t/comrades-lets-join-our-efforts-on-ukrainian-and-russian-translations/4403/5","title":"Comrades let's join our efforts on ukrainian and russian translations","fancy_title":null,"internal":true,"reflection":true,"clicks":1,"user_id":3417,"domain":"meta.discourse.org"},{"url":"https://meta.discourse.org/t/translation-workflow/6102/6","title":"Translation workflow","fancy_title":null,"internal":true,"reflection":false,"clicks":0,"user_id":1995,"domain":"meta.discourse.org"},{"url":"https://meta.discourse.org/t/bookmark-last-read-sometimes-doesn-t-go-to-the-end-of-a-topic/4825/9","title":"Bookmark/last read sometimes doesn't go to the end of a topic","fancy_title":null,"internal":true,"reflection":true,"clicks":0,"user_id":3681,"domain":"meta.discourse.org"},{"url":"https://github.com/discourse/discourse/blob/master/config/locales/client.de.yml","title":"discourse/config/locales/client.de.yml at master · discourse/discourse · GitHub","fancy_title":null,"internal":false,"reflection":false,"clicks":0,"user_id":2,"domain":"github.com"},{"url":"https://meta.discourse.org/t/what-i-love-about-wordpress-plugins/5697","title":"What I love about WordPress plugins","fancy_title":null,"internal":true,"reflection":true,"clicks":0,"user_id":1,"domain":"meta.discourse.org"},{"url":"https://meta.discourse.org/t/github-onebox-rendering-issue/7616","title":"GitHub OneBox Rendering Issue","fancy_title":null,"internal":true,"reflection":true,"clicks":0,"user_id":5372,"domain":"meta.discourse.org"},{"url":"https://github.com/discourse/discourse/blob/master/config/locales/server.de.yml","title":"discourse/config/locales/server.de.yml at master · discourse/discourse · GitHub","fancy_title":null,"internal":false,"reflection":false,"clicks":0,"user_id":2,"domain":"github.com"},{"url":"https://meta.discourse.org/t/roadplan-for-discourse/2939/5","title":"Roadplan for Discourse 2013","fancy_title":null,"internal":true,"reflection":true,"clicks":0,"user_id":32,"domain":"meta.discourse.org"},{"url":"https://meta.discourse.org/t/translation-tools-transifex-localeapp/7763","title":"Translation Tools: Transifex? Localeapp?","fancy_title":null,"internal":true,"reflection":true,"clicks":0,"user_id":2,"domain":"meta.discourse.org"},{"url":"http://guides.rubyonrails.org/i18n.html#the-public-i18n-api","title":"Rails Internationalization (I18n) API — Ruby on Rails Guides","fancy_title":null,"internal":false,"reflection":false,"clicks":0,"user_id":1895,"domain":"guides.rubyonrails.org"},{"url":"https://meta.discourse.org/t/hi-support-chinese/4393/6","title":"Hi, support Chinese?","fancy_title":null,"internal":true,"reflection":true,"clicks":0,"user_id":2014,"domain":"meta.discourse.org"},{"url":"https://meta.discourse.org/t/translation-tools-transifex-localeapp/7763/41","title":"Translation Tools: Transifex? Localeapp?","fancy_title":null,"internal":true,"reflection":false,"clicks":0,"user_id":6626,"domain":"meta.discourse.org"}],"notification_level":2,"notifications_reason_id":4,"can_move_posts":true,"can_edit":true,"can_delete":true,"can_recover":true,"can_remove_allowed_users":true,"can_invite_to":true,"can_create_post":true,"can_reply_as_new_topic":true,"can_flag_topic":true},"highest_post_number":104,"last_read_post_number":104,"deleted_by":null,"has_deleted":true,"actions_summary":[{"id":4,"count":0,"hidden":false,"can_act":true},{"id":7,"count":0,"hidden":false,"can_act":true},{"id":8,"count":0,"hidden":false,"can_act":true}],"chunk_size":20,"bookmarked":false,"tags":null}}; +export default {"/t/280.json": {"post_stream":{"posts":[{"id":398,"name":"Uwe Keim","username":"uwe_keim","avatar_template":"/user_avatar/meta.discourse.org/uwe_keim/{size}/5697.png","uploaded_avatar_id":5697,"created_at":"2013-02-05T21:29:00.280Z","cooked":"

Any plans to support localization of UI elements, so that I (for example) could set up a completely German speaking forum?

","post_number":1,"post_type":1,"updated_at":"2013-02-05T21:29:00.280Z","like_count":0,"reply_count":1,"reply_to_post_number":null,"quote_count":0,"avg_time":25,"incoming_link_count":314,"reads":475,"score":1702.25,"yours":false,"topic_id":280,"topic_slug":"internationalization-localization","display_username":"Uwe Keim","primary_group_name":null,"version":1,"can_edit":true,"can_delete":false,"can_recover":true,"link_counts":[{"url":"https://meta.discourse.org/t/language-mirrors/2378/2","internal":true,"reflection":true,"title":"Language mirrors","clicks":3},{"url":"https://meta.discourse.org/t/translation-workflow/6102","internal":true,"reflection":true,"title":"Translation workflow","clicks":2},{"url":"https://meta.discourse.org/t/solving-xda-developer-style-forums/4368/4","internal":true,"reflection":true,"title":"Solving XDA-Developer style forums","clicks":2},{"url":"https://meta.discourse.org/t/comrades-lets-join-our-efforts-on-ukrainian-and-russian-translations/4403/5","internal":true,"reflection":true,"title":"Comrades let's join our efforts on ukrainian and russian translations","clicks":1},{"url":"https://meta.discourse.org/t/bookmark-last-read-sometimes-doesn-t-go-to-the-end-of-a-topic/4825/9","internal":true,"reflection":true,"title":"Bookmark/last read sometimes doesn't go to the end of a topic","clicks":0},{"url":"https://meta.discourse.org/t/roadplan-for-discourse/2939/5","internal":true,"reflection":true,"title":"Roadplan for Discourse 2013","clicks":0}],"read":true,"user_title":null,"actions_summary":[{"id":2,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":3,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":4,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":5,"count":0,"hidden":true,"can_act":true,"can_defer_flags":false},{"id":6,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":7,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":8,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false}],"moderator":false,"admin":false,"staff":false,"user_id":255,"hidden":false,"hidden_reason_id":null,"trust_level":2,"deleted_at":null,"user_deleted":false,"edit_reason":null,"can_view_edit_history":true,"wiki":false},{"id":419,"name":"Tim Stone","username":"tms","avatar_template":"/user_avatar/meta.discourse.org/tms/{size}/40181.png","uploaded_avatar_id":40181,"created_at":"2013-02-05T21:32:47.649Z","cooked":"

The application strings are externalized, so localization should be entirely possible with enough translation effort.

","post_number":2,"post_type":1,"updated_at":"2013-02-06T10:15:27.965Z","like_count":4,"reply_count":0,"reply_to_post_number":null,"quote_count":0,"avg_time":27,"incoming_link_count":16,"reads":460,"score":308.35,"yours":false,"topic_id":280,"topic_slug":"internationalization-localization","display_username":"Tim Stone","primary_group_name":null,"version":2,"can_edit":true,"can_delete":true,"can_recover":true,"link_counts":[{"url":"https://github.com/discourse/discourse/blob/master/config/locales/en.yml","internal":false,"reflection":false,"clicks":118}],"read":true,"user_title":"Great contributor","actions_summary":[{"id":2,"count":4,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":3,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":4,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":5,"count":0,"hidden":true,"can_act":true,"can_defer_flags":false},{"id":6,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":7,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":8,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false}],"moderator":false,"admin":false,"staff":false,"user_id":9,"hidden":false,"hidden_reason_id":null,"trust_level":2,"deleted_at":null,"user_deleted":false,"edit_reason":null,"can_view_edit_history":true,"wiki":false},{"id":1060,"name":"Jeff Atwood","username":"codinghorror","avatar_template":"/user_avatar/meta.discourse.org/codinghorror/{size}/5297.png","uploaded_avatar_id":5297,"created_at":"2013-02-06T02:26:24.922Z","cooked":"

Yep, all strings are going through a lookup table.*

\n\n

master/config/locales

\n\n

So you could replace that lookup table with the \"de\" one to get German.

\n\n

* we didn't get all the strings into the lookup table for launch, but the vast, vast majority of them are and the ones that are not, we will fix as we go!

","post_number":3,"post_type":1,"updated_at":"2014-02-24T05:23:39.211Z","like_count":4,"reply_count":3,"reply_to_post_number":null,"quote_count":0,"avg_time":33,"incoming_link_count":5,"reads":449,"score":191.45,"yours":false,"topic_id":280,"topic_slug":"internationalization-localization","display_username":"Jeff Atwood","primary_group_name":"discourse","version":4,"can_edit":true,"can_delete":true,"can_recover":true,"link_counts":[{"url":"https://github.com/discourse/discourse/blob/master/config/locales","internal":false,"reflection":false,"title":"discourse/config/locales at master · discourse/discourse · GitHub","clicks":62},{"url":"https://meta.discourse.org/t/github-onebox-rendering-issue/7616","internal":true,"reflection":true,"title":"GitHub OneBox Rendering Issue","clicks":0}],"read":true,"user_title":"co-founder","actions_summary":[{"id":2,"count":4,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":3,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":4,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":5,"count":0,"hidden":true,"can_act":true,"can_defer_flags":false},{"id":6,"count":1,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":7,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":8,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false}],"moderator":true,"admin":true,"staff":true,"user_id":32,"hidden":false,"hidden_reason_id":null,"trust_level":3,"deleted_at":null,"user_deleted":false,"edit_reason":"","can_view_edit_history":true,"wiki":false},{"id":3623,"name":"Shade","username":"shade","avatar_template":"/user_avatar/meta.discourse.org/shade/{size}/8306.png","uploaded_avatar_id":8306,"created_at":"2013-02-07T12:55:33.129Z","cooked":"

Is it a coincidence that the strings file is 1337 lines long? \"smiley\"

","post_number":4,"post_type":1,"updated_at":"2013-02-07T12:55:33.129Z","like_count":7,"reply_count":0,"reply_to_post_number":null,"quote_count":0,"avg_time":20,"incoming_link_count":15,"reads":401,"score":291.2,"yours":false,"topic_id":280,"topic_slug":"internationalization-localization","display_username":"Shade","primary_group_name":null,"version":1,"can_edit":true,"can_delete":true,"can_recover":true,"link_counts":[{"url":"https://meta.discourse.org/t/hi-support-chinese/4393/6","internal":true,"reflection":true,"title":"Hi, support Chinese?","clicks":0}],"read":true,"user_title":null,"actions_summary":[{"id":2,"count":7,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":3,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":4,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":5,"count":0,"hidden":true,"can_act":true,"can_defer_flags":false},{"id":6,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":7,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":8,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false}],"moderator":false,"admin":false,"staff":false,"user_id":1808,"hidden":false,"hidden_reason_id":null,"trust_level":1,"deleted_at":null,"user_deleted":false,"edit_reason":null,"can_view_edit_history":true,"wiki":false},{"id":3651,"name":"Pekka Gaiser","username":"pekka","avatar_template":"/user_avatar/meta.discourse.org/pekka/{size}/5253.png","uploaded_avatar_id":5253,"created_at":"2013-02-07T14:02:07.869Z","cooked":"

\n\n

The problem I see here is that this file is likely two grow and change massively over the next couple months, and tracking these changes in order to keep a localized file up to date is going to be a bitch.

\n\n

I wonder where there is a tool that can compare two yml structures and point out which nodes are missing? That would help keep track of new strings.

\n\n

Re keeping track of changed strings, @codinghorror I found this very interesting: http://stackoverflow.com/questions/4232922/why-do-people-use-plain-english-as-translation-placeholders if plain English placeholders were used, any change in strings would lead to a new node in the yml file, making keeping the translation up to date easier. Maybe worth thinking about in the future.

","post_number":5,"post_type":1,"updated_at":"2013-02-07T14:05:42.328Z","like_count":2,"reply_count":2,"reply_to_post_number":3,"quote_count":1,"avg_time":22,"incoming_link_count":10,"reads":386,"score":213.3,"yours":false,"topic_id":280,"topic_slug":"internationalization-localization","display_username":"Pekka Gaiser","primary_group_name":null,"version":1,"can_edit":true,"can_delete":true,"can_recover":true,"link_counts":[{"url":"http://stackoverflow.com/questions/4232922/why-do-people-use-plain-english-as-translation-placeholders","internal":false,"reflection":false,"title":"internationalization - Why do people use plain english as translation placeholders? - Stack Overflow","clicks":63}],"read":true,"user_title":null,"actions_summary":[{"id":2,"count":2,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":3,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":4,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":5,"count":0,"hidden":true,"can_act":true,"can_defer_flags":false},{"id":6,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":7,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":8,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false}],"moderator":false,"admin":false,"staff":false,"user_id":7,"hidden":false,"hidden_reason_id":null,"trust_level":2,"deleted_at":null,"user_deleted":false,"edit_reason":null,"can_view_edit_history":true,"wiki":false},{"id":3654,"name":"Sam Saffron","username":"sam","avatar_template":"/user_avatar/meta.discourse.org/sam/{size}/5243.png","uploaded_avatar_id":5243,"created_at":"2013-02-07T14:05:39.910Z","cooked":"

Yes, I really like the concept of fuzzy matching for localization, perhaps you can chase up alex sexton he was meaning to upload a localization tool for this kind of stuff.

\n\n

Also, I am a big fan of ICU message format, but it is not the \"Rails way (tm)\".

","post_number":6,"post_type":1,"updated_at":"2013-02-07T14:05:39.910Z","like_count":1,"reply_count":1,"reply_to_post_number":5,"quote_count":0,"avg_time":17,"incoming_link_count":4,"reads":329,"score":106.65,"yours":false,"topic_id":280,"topic_slug":"internationalization-localization","display_username":"Sam Saffron","primary_group_name":"discourse","version":1,"can_edit":true,"can_delete":true,"can_recover":true,"link_counts":[{"url":"https://github.com/SlexAxton/messageformat.js","internal":false,"reflection":false,"title":"SlexAxton/messageformat.js · GitHub","clicks":46},{"url":"https://github.com/SlexAxton","internal":false,"reflection":false,"title":"SlexAxton (Alex Sexton) · GitHub","clicks":10}],"read":true,"user_title":"co-founder","reply_to_user":{"username":"pekka","avatar_template":"/user_avatar/meta.discourse.org/pekka/{size}/5253.png","uploaded_avatar_id":5253},"actions_summary":[{"id":2,"count":1,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":3,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":4,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":5,"count":0,"hidden":true,"can_act":true,"can_defer_flags":false},{"id":6,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":7,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":8,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false}],"moderator":true,"admin":true,"staff":true,"user_id":1,"hidden":false,"hidden_reason_id":null,"trust_level":4,"deleted_at":null,"user_deleted":false,"edit_reason":null,"can_view_edit_history":true,"wiki":false},{"id":3655,"name":"Pekka Gaiser","username":"pekka","avatar_template":"/user_avatar/meta.discourse.org/pekka/{size}/5253.png","uploaded_avatar_id":5253,"created_at":"2013-02-07T14:08:17.493Z","cooked":"

Looks interesting, I'll take a peek.

\n\n

As said on dev, the best tool I can see in terms of giving translators a proper interface and quality control would be something like GlotPress. It's based on the PO messages format (is that somehow related to ICU?) but looks pretty great.

\n\n

\n\n

I'm not familiar with the term in this context, you mean keeping the English version in the code base (instead of a generic code like message_error_nametooshort ?)

","post_number":7,"post_type":1,"updated_at":"2013-02-07T14:12:02.965Z","like_count":1,"reply_count":1,"reply_to_post_number":6,"quote_count":1,"avg_time":16,"incoming_link_count":0,"reads":326,"score":86.0,"yours":false,"topic_id":280,"topic_slug":"internationalization-localization","display_username":"Pekka Gaiser","primary_group_name":null,"version":1,"can_edit":true,"can_delete":true,"can_recover":true,"link_counts":[{"url":"http://translate.wordpress.org/projects/bbpress/dev","internal":false,"reflection":false,"title":"WordPress › Development < GlotPress","clicks":16}],"read":true,"user_title":null,"actions_summary":[{"id":2,"count":1,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":3,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":4,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":5,"count":0,"hidden":true,"can_act":true,"can_defer_flags":false},{"id":6,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":7,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":8,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false}],"moderator":false,"admin":false,"staff":false,"user_id":7,"hidden":false,"hidden_reason_id":null,"trust_level":2,"deleted_at":null,"user_deleted":false,"edit_reason":null,"can_view_edit_history":true,"wiki":false},{"id":3658,"name":"Sam Saffron","username":"sam","avatar_template":"/user_avatar/meta.discourse.org/sam/{size}/5243.png","uploaded_avatar_id":5243,"created_at":"2013-02-07T14:12:22.582Z","cooked":"

ICU Message format is basically Gettext on steroids, Gettext has been around for so many years and actually works pretty well, being super prevalent in Linux.

\n\n

Trouble is you need a fuzzy matcher for translators if you are going to store stuff like mf.compile( 'This is a message.' ) in source, one letter change and all your translators need to validate it.

","post_number":8,"post_type":1,"updated_at":"2013-02-07T14:12:22.582Z","like_count":1,"reply_count":1,"reply_to_post_number":7,"quote_count":0,"avg_time":11,"incoming_link_count":2,"reads":296,"score":89.75,"yours":false,"topic_id":280,"topic_slug":"internationalization-localization","display_username":"Sam Saffron","primary_group_name":"discourse","version":1,"can_edit":true,"can_delete":true,"can_recover":true,"link_counts":[{"url":"https://meta.discourse.org/t/what-i-love-about-wordpress-plugins/5697","internal":true,"reflection":true,"title":"What I love about WordPress plugins","clicks":0}],"read":true,"user_title":"co-founder","reply_to_user":{"username":"pekka","avatar_template":"/user_avatar/meta.discourse.org/pekka/{size}/5253.png","uploaded_avatar_id":5253},"actions_summary":[{"id":2,"count":1,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":3,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":4,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":5,"count":0,"hidden":true,"can_act":true,"can_defer_flags":false},{"id":6,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":7,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":8,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false}],"moderator":true,"admin":true,"staff":true,"user_id":1,"hidden":false,"hidden_reason_id":null,"trust_level":4,"deleted_at":null,"user_deleted":false,"edit_reason":null,"can_view_edit_history":true,"wiki":false},{"id":3660,"name":"Pekka Gaiser","username":"pekka","avatar_template":"/user_avatar/meta.discourse.org/pekka/{size}/5253.png","uploaded_avatar_id":5253,"created_at":"2013-02-07T14:14:12.666Z","cooked":"

\n\n

Yeah, that's why I've always been a friend of message_error_nametooshort placeholders, until I asked the SO question linked above. The accepted answer makes a good argument against those placeholders: you want translations to break even on small changes in the English original because the translations will probably need to reflect the change, too. Maybe that's not the case right now as new stuff is being checked in pretty much every couple of hours, but in the long run, it'll be overwhelmingly true.

","post_number":9,"post_type":1,"updated_at":"2013-02-07T14:18:09.569Z","like_count":1,"reply_count":1,"reply_to_post_number":8,"quote_count":1,"avg_time":10,"incoming_link_count":0,"reads":293,"score":79.1,"yours":false,"topic_id":280,"topic_slug":"internationalization-localization","display_username":"Pekka Gaiser","primary_group_name":null,"version":1,"can_edit":true,"can_delete":true,"can_recover":true,"read":true,"user_title":null,"actions_summary":[{"id":2,"count":1,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":3,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":4,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":5,"count":0,"hidden":true,"can_act":true,"can_defer_flags":false},{"id":6,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":7,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":8,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false}],"moderator":false,"admin":false,"staff":false,"user_id":7,"hidden":false,"hidden_reason_id":null,"trust_level":2,"deleted_at":null,"user_deleted":false,"edit_reason":null,"can_view_edit_history":true,"wiki":false},{"id":3667,"name":"Tim Stone","username":"tms","avatar_template":"/user_avatar/meta.discourse.org/tms/{size}/40181.png","uploaded_avatar_id":40181,"created_at":"2013-02-07T14:25:16.859Z","cooked":"

Hmm...You could theoretically also build something into the development process that would monitor changes to the English locale file and make a translator-friendly list of changes between versions.

","post_number":10,"post_type":1,"updated_at":"2013-02-07T14:25:16.859Z","like_count":1,"reply_count":1,"reply_to_post_number":9,"quote_count":0,"avg_time":7,"incoming_link_count":0,"reads":275,"score":75.35,"yours":false,"topic_id":280,"topic_slug":"internationalization-localization","display_username":"Tim Stone","primary_group_name":null,"version":1,"can_edit":true,"can_delete":true,"can_recover":true,"read":true,"user_title":"Great contributor","reply_to_user":{"username":"pekka","avatar_template":"/user_avatar/meta.discourse.org/pekka/{size}/5253.png","uploaded_avatar_id":5253},"actions_summary":[{"id":2,"count":1,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":3,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":4,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":5,"count":0,"hidden":true,"can_act":true,"can_defer_flags":false},{"id":6,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":7,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":8,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false}],"moderator":false,"admin":false,"staff":false,"user_id":9,"hidden":false,"hidden_reason_id":null,"trust_level":2,"deleted_at":null,"user_deleted":false,"edit_reason":null,"can_view_edit_history":true,"wiki":false},{"id":3673,"name":"Sam Saffron","username":"sam","avatar_template":"/user_avatar/meta.discourse.org/sam/{size}/5243.png","uploaded_avatar_id":5243,"created_at":"2013-02-07T14:30:21.401Z","cooked":"

Yeah, totally, also we could build tools for dev that make introducing string less annoying and make it possible to garbage collect old unused strings, I hate trudging through that file.

","post_number":11,"post_type":1,"updated_at":"2013-02-07T14:30:21.401Z","like_count":1,"reply_count":1,"reply_to_post_number":10,"quote_count":0,"avg_time":7,"incoming_link_count":1,"reads":273,"score":79.95,"yours":false,"topic_id":280,"topic_slug":"internationalization-localization","display_username":"Sam Saffron","primary_group_name":"discourse","version":1,"can_edit":true,"can_delete":true,"can_recover":true,"read":true,"user_title":"co-founder","reply_to_user":{"username":"tms","avatar_template":"/user_avatar/meta.discourse.org/tms/{size}/40181.png","uploaded_avatar_id":40181},"actions_summary":[{"id":2,"count":1,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":3,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":4,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":5,"count":0,"hidden":true,"can_act":true,"can_defer_flags":false},{"id":6,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":7,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":8,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false}],"moderator":true,"admin":true,"staff":true,"user_id":1,"hidden":false,"hidden_reason_id":null,"trust_level":4,"deleted_at":null,"user_deleted":false,"edit_reason":null,"can_view_edit_history":true,"wiki":false},{"id":3675,"name":"Pekka Gaiser","username":"pekka","avatar_template":"/user_avatar/meta.discourse.org/pekka/{size}/5253.png","uploaded_avatar_id":5253,"created_at":"2013-02-07T14:33:38.280Z","cooked":"

\n\n

As said, I'd look into whether WP's tools can't be reused for this with some tweaking. They seem to be able to scan a code base for new strings, and make them available automatically to translators.

\n\n

They're PHP based which isn't ideal, but it looks like they've done a crapload of work to take the hassle out of translations.

","post_number":12,"post_type":1,"updated_at":"2013-02-07T14:34:39.910Z","like_count":1,"reply_count":1,"reply_to_post_number":11,"quote_count":1,"avg_time":7,"incoming_link_count":2,"reads":273,"score":84.95,"yours":false,"topic_id":280,"topic_slug":"internationalization-localization","display_username":"Pekka Gaiser","primary_group_name":null,"version":1,"can_edit":true,"can_delete":true,"can_recover":true,"read":true,"user_title":null,"actions_summary":[{"id":2,"count":1,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":3,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":4,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":5,"count":0,"hidden":true,"can_act":true,"can_defer_flags":false},{"id":6,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":7,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":8,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false}],"moderator":false,"admin":false,"staff":false,"user_id":7,"hidden":false,"hidden_reason_id":null,"trust_level":2,"deleted_at":null,"user_deleted":false,"edit_reason":null,"can_view_edit_history":true,"wiki":false},{"id":3690,"name":"Valts","username":"Vilx","avatar_template":"/user_avatar/meta.discourse.org/vilx/{size}/7299.png","uploaded_avatar_id":7299,"created_at":"2013-02-07T15:05:35.867Z","cooked":"

This site looks so nice with all the little tweaks like \"10 minutes ago\" instead of simply time, etc - I wonder if there will also be support for proper pluralization in other languages? That's a pretty hard task though, I don't think I've ever seen a website that has done that. But it would be awesome.

","post_number":13,"post_type":1,"updated_at":"2013-02-07T15:05:35.867Z","like_count":3,"reply_count":0,"reply_to_post_number":null,"quote_count":0,"avg_time":7,"incoming_link_count":11,"reads":290,"score":158.35,"yours":false,"topic_id":280,"topic_slug":"internationalization-localization","display_username":"Valts","primary_group_name":null,"version":1,"can_edit":true,"can_delete":true,"can_recover":true,"read":true,"user_title":null,"actions_summary":[{"id":2,"count":3,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":3,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":4,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":5,"count":0,"hidden":true,"can_act":true,"can_defer_flags":false},{"id":6,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":7,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":8,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false}],"moderator":false,"admin":false,"staff":false,"user_id":1216,"hidden":false,"hidden_reason_id":null,"trust_level":2,"deleted_at":null,"user_deleted":false,"edit_reason":null,"can_view_edit_history":true,"wiki":false},{"id":3925,"name":"Eric Kidd","username":"emk","avatar_template":"/user_avatar/meta.discourse.org/emk/{size}/8400.png","uploaded_avatar_id":8400,"created_at":"2013-02-07T19:37:06.194Z","cooked":"

\n\n

I've had pretty decent luck using Localeapp to localize Rails applications:

\n\n

http://www.localeapp.com/

\n\n

The developer workflow took me about an hour to really get used to, and there were a few minor glitches. But the non-technical translators had very few problems. One limitation: It insists on rewriting all those yaml files full of strings.

\n\n

Anyway, it's worth a look, and it's free for open source, if I recall correctly. Certainly easier than doing a whole bunch of toolsmithing from scratch.

","post_number":14,"post_type":1,"updated_at":"2013-02-07T19:37:06.194Z","like_count":3,"reply_count":1,"reply_to_post_number":12,"quote_count":1,"avg_time":9,"incoming_link_count":0,"reads":283,"score":137.05,"yours":false,"topic_id":280,"topic_slug":"internationalization-localization","display_username":"Eric Kidd","primary_group_name":null,"version":1,"can_edit":true,"can_delete":true,"can_recover":true,"link_counts":[{"url":"http://www.localeapp.com/","internal":false,"reflection":false,"title":"Easy localization for Rails apps | Locale","clicks":69}],"read":true,"user_title":null,"actions_summary":[{"id":2,"count":3,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":3,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":4,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":5,"count":0,"hidden":true,"can_act":true,"can_defer_flags":false},{"id":6,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":7,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":8,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false}],"moderator":false,"admin":false,"staff":false,"user_id":1860,"hidden":false,"hidden_reason_id":null,"trust_level":1,"deleted_at":null,"user_deleted":false,"edit_reason":null,"can_view_edit_history":true,"wiki":false},{"id":3938,"name":"Pekka Gaiser","username":"pekka","avatar_template":"/user_avatar/meta.discourse.org/pekka/{size}/5253.png","uploaded_avatar_id":5253,"created_at":"2013-02-07T19:52:13.748Z","cooked":"

\n\n

Ohhh. Looking sexy. droool

","post_number":15,"post_type":1,"updated_at":"2013-02-07T19:52:13.748Z","like_count":1,"reply_count":1,"reply_to_post_number":14,"quote_count":1,"avg_time":7,"incoming_link_count":0,"reads":260,"score":72.35,"yours":false,"topic_id":280,"topic_slug":"internationalization-localization","display_username":"Pekka Gaiser","primary_group_name":null,"version":1,"can_edit":true,"can_delete":true,"can_recover":true,"read":true,"user_title":null,"actions_summary":[{"id":2,"count":1,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":3,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":4,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":5,"count":0,"hidden":true,"can_act":true,"can_defer_flags":false},{"id":6,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":7,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":8,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false}],"moderator":false,"admin":false,"staff":false,"user_id":7,"hidden":false,"hidden_reason_id":null,"trust_level":2,"deleted_at":null,"user_deleted":false,"edit_reason":null,"can_view_edit_history":true,"wiki":false},{"id":3982,"name":"Eric Kidd","username":"emk","avatar_template":"/user_avatar/meta.discourse.org/emk/{size}/8400.png","uploaded_avatar_id":8400,"created_at":"2013-02-07T20:52:22.454Z","cooked":"

\n\n

Yeah, it's pretty. \"smile\" But there were still some rough edges as of a few months ago.

\n\n

Whether or not those rough edges are a deal-breaker will probably depends on whether or not localization is already a source of acute pain. If you're already hurting, Localeapp is a pretty useful tool, especially when it comes to enlisting non-technical translators.

\n\n

But it does require changing how you work with text, and adding one new tool to the mix. So for projects that just don't want to know about non-English languages, it's not yet seamless the way Unicode is these days.

\n\n

(Sweet forum software, by the way. I was just testing out Egyptian hieroglyphics on the test server, because they're well off the Basic Multilingual Plane, and tend to flush Unicode bugs. Everything worked flawlessly.)

","post_number":16,"post_type":1,"updated_at":"2013-02-07T20:52:22.454Z","like_count":1,"reply_count":1,"reply_to_post_number":15,"quote_count":1,"avg_time":7,"incoming_link_count":0,"reads":254,"score":71.15,"yours":false,"topic_id":280,"topic_slug":"internationalization-localization","display_username":"Eric Kidd","primary_group_name":null,"version":1,"can_edit":true,"can_delete":true,"can_recover":true,"read":true,"user_title":null,"actions_summary":[{"id":2,"count":1,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":3,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":4,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":5,"count":0,"hidden":true,"can_act":true,"can_defer_flags":false},{"id":6,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":7,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":8,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false}],"moderator":false,"admin":false,"staff":false,"user_id":1860,"hidden":false,"hidden_reason_id":null,"trust_level":1,"deleted_at":null,"user_deleted":false,"edit_reason":null,"can_view_edit_history":true,"wiki":false},{"id":3989,"name":"Pekka Gaiser","username":"pekka","avatar_template":"/user_avatar/meta.discourse.org/pekka/{size}/5253.png","uploaded_avatar_id":5253,"created_at":"2013-02-07T21:04:15.405Z","cooked":"

\n\n

Interesting, thanks for the insight. I don't think localization is seriously on their table right now, there's likely to be many other things on the table before it... but it will become an issue sooner or later.

","post_number":17,"post_type":1,"updated_at":"2013-02-07T21:04:15.405Z","like_count":1,"reply_count":2,"reply_to_post_number":16,"quote_count":1,"avg_time":7,"incoming_link_count":0,"reads":255,"score":76.35,"yours":false,"topic_id":280,"topic_slug":"internationalization-localization","display_username":"Pekka Gaiser","primary_group_name":null,"version":1,"can_edit":true,"can_delete":true,"can_recover":true,"read":true,"user_title":null,"actions_summary":[{"id":2,"count":1,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":3,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":4,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":5,"count":0,"hidden":true,"can_act":true,"can_defer_flags":false},{"id":6,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":7,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":8,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false}],"moderator":false,"admin":false,"staff":false,"user_id":7,"hidden":false,"hidden_reason_id":null,"trust_level":2,"deleted_at":null,"user_deleted":false,"edit_reason":null,"can_view_edit_history":true,"wiki":false},{"id":3996,"name":"Sam Saffron","username":"sam","avatar_template":"/user_avatar/meta.discourse.org/sam/{size}/5243.png","uploaded_avatar_id":5243,"created_at":"2013-02-07T21:12:06.575Z","cooked":"

I had an idea ... what if in dev mode, you could right-click on a page and get access to all the translations on the page, make your edits and have it refreshed live.

\n\n

I think it would be awesome, very doable technically.

","post_number":18,"post_type":1,"updated_at":"2013-02-07T21:12:06.575Z","like_count":7,"reply_count":2,"reply_to_post_number":17,"quote_count":0,"avg_time":8,"incoming_link_count":0,"reads":264,"score":168.2,"yours":false,"topic_id":280,"topic_slug":"internationalization-localization","display_username":"Sam Saffron","primary_group_name":"discourse","version":1,"can_edit":true,"can_delete":true,"can_recover":true,"read":true,"user_title":"co-founder","reply_to_user":{"username":"pekka","avatar_template":"/user_avatar/meta.discourse.org/pekka/{size}/5253.png","uploaded_avatar_id":5253},"actions_summary":[{"id":2,"count":7,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":3,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":4,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":5,"count":0,"hidden":true,"can_act":true,"can_defer_flags":false},{"id":6,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":7,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":8,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false}],"moderator":true,"admin":true,"staff":true,"user_id":1,"hidden":false,"hidden_reason_id":null,"trust_level":4,"deleted_at":null,"user_deleted":false,"edit_reason":null,"can_view_edit_history":true,"wiki":false},{"id":4009,"name":"Pekka Gaiser","username":"pekka","avatar_template":"/user_avatar/meta.discourse.org/pekka/{size}/5253.png","uploaded_avatar_id":5253,"created_at":"2013-02-07T21:18:47.422Z","cooked":"

That would be fricking cool. There'd still be some leftovers (like error messages that normally never show up, etc.) but you could corral those up on a specific page.

\n\n

It could have a dropdown giving you all the languages that you have a .yml for in the locale directory, and write the changes into the one selected. I'm sure people would love it.

","post_number":19,"post_type":1,"updated_at":"2013-02-07T21:22:10.692Z","like_count":1,"reply_count":0,"reply_to_post_number":18,"quote_count":0,"avg_time":8,"incoming_link_count":1,"reads":241,"score":68.6,"yours":false,"topic_id":280,"topic_slug":"internationalization-localization","display_username":"Pekka Gaiser","primary_group_name":null,"version":1,"can_edit":true,"can_delete":true,"can_recover":true,"read":true,"user_title":null,"reply_to_user":{"username":"sam","avatar_template":"/user_avatar/meta.discourse.org/sam/{size}/5243.png","uploaded_avatar_id":5243},"actions_summary":[{"id":2,"count":1,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":3,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":4,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":5,"count":0,"hidden":true,"can_act":true,"can_defer_flags":false},{"id":6,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":7,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":8,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false}],"moderator":false,"admin":false,"staff":false,"user_id":7,"hidden":false,"hidden_reason_id":null,"trust_level":2,"deleted_at":null,"user_deleted":false,"edit_reason":null,"can_view_edit_history":true,"wiki":false},{"id":4012,"name":"Marco Ceppi","username":"marcoceppi","avatar_template":"/user_avatar/meta.discourse.org/marcoceppi/{size}/6552.png","uploaded_avatar_id":6552,"created_at":"2013-02-07T21:22:46.376Z","cooked":"

If you use gettext format you could leverage Launchpad translations and the community behind it.

","post_number":20,"post_type":1,"updated_at":"2013-02-07T21:22:46.376Z","like_count":1,"reply_count":0,"reply_to_post_number":null,"quote_count":0,"avg_time":9,"incoming_link_count":2,"reads":244,"score":74.25,"yours":false,"topic_id":280,"topic_slug":"internationalization-localization","display_username":"Marco Ceppi","primary_group_name":null,"version":1,"can_edit":true,"can_delete":true,"can_recover":true,"link_counts":[{"url":"https://translations.launchpad.net/","internal":false,"reflection":false,"title":"Launchpad Translations","clicks":13}],"read":true,"user_title":null,"actions_summary":[{"id":2,"count":1,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":3,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":4,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":5,"count":0,"hidden":true,"can_act":true,"can_defer_flags":false},{"id":6,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":7,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":8,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false}],"moderator":false,"admin":false,"staff":false,"user_id":761,"hidden":false,"hidden_reason_id":null,"trust_level":2,"deleted_at":null,"user_deleted":false,"edit_reason":null,"can_view_edit_history":true,"wiki":false}],"stream":[398,419,1060,3623,3651,3654,3655,3658,3660,3667,3673,3675,3690,3925,3938,3982,3989,3996,4009,4012],"gaps":{"before":{"20706":[20125]},"after":{}}},"id":280,"title":"Internationalization / localization","fancy_title":"Internationalization / localization","posts_count":103,"created_at":"2013-02-05T21:29:00.174Z","views":5211,"reply_count":67,"participant_count":40,"like_count":135,"last_posted_at":"2015-03-04T15:07:10.487Z","visible":true,"closed":false,"archived":false,"has_summary":true,"archetype":"regular","slug":"internationalization-localization","category_id":2,"word_count":6198,"deleted_at":null,"draft":null,"draft_key":"topic_280","draft_sequence":4,"posted":true,"unpinned":null,"pinned_globally":false,"pinned":false,"pinned_at":null,"details":{"auto_close_at":null,"auto_close_hours":null,"auto_close_based_on_last_post":false,"created_by":{"id":255,"username":"uwe_keim","uploaded_avatar_id":5697,"avatar_template":"/user_avatar/meta.discourse.org/uwe_keim/{size}/5697.png"},"last_poster":{"id":14091,"username":"Luciano_Fantuzzi","uploaded_avatar_id":39484,"avatar_template":"/user_avatar/meta.discourse.org/luciano_fantuzzi/{size}/39484.png"},"participants":[{"id":212,"username":"alxndr","uploaded_avatar_id":5619,"avatar_template":"/user_avatar/meta.discourse.org/alxndr/{size}/5619.png","post_count":11},{"id":1,"username":"sam","uploaded_avatar_id":5243,"avatar_template":"/user_avatar/meta.discourse.org/sam/{size}/5243.png","post_count":11},{"id":7,"username":"pekka","uploaded_avatar_id":5253,"avatar_template":"/user_avatar/meta.discourse.org/pekka/{size}/5253.png","post_count":8},{"id":461,"username":"kuba","uploaded_avatar_id":6049,"avatar_template":"/user_avatar/meta.discourse.org/kuba/{size}/6049.png","post_count":7},{"id":2995,"username":"tattoo","uploaded_avatar_id":null,"avatar_template":"/letter_avatar/tattoo/{size}/3.png","post_count":6},{"id":2540,"username":"jgourdon","uploaded_avatar_id":9537,"avatar_template":"/user_avatar/meta.discourse.org/jgourdon/{size}/9537.png","post_count":5},{"id":1860,"username":"emk","uploaded_avatar_id":8400,"avatar_template":"/user_avatar/meta.discourse.org/emk/{size}/8400.png","post_count":4},{"id":1275,"username":"dacap","uploaded_avatar_id":7401,"avatar_template":"/user_avatar/meta.discourse.org/dacap/{size}/7401.png","post_count":4},{"id":19,"username":"eviltrout","uploaded_avatar_id":5275,"avatar_template":"/user_avatar/meta.discourse.org/eviltrout/{size}/5275.png","post_count":4},{"id":3704,"username":"mojzis","uploaded_avatar_id":31201,"avatar_template":"/user_avatar/meta.discourse.org/mojzis/{size}/31201.png","post_count":3},{"id":3190,"username":"gururea","uploaded_avatar_id":10663,"avatar_template":"/user_avatar/meta.discourse.org/gururea/{size}/10663.png","post_count":3},{"id":1895,"username":"maciek","uploaded_avatar_id":8463,"avatar_template":"/user_avatar/meta.discourse.org/maciek/{size}/8463.png","post_count":3},{"id":22,"username":"splattne","uploaded_avatar_id":5280,"avatar_template":"/user_avatar/meta.discourse.org/splattne/{size}/5280.png","post_count":2},{"id":1979,"username":"Superuser","uploaded_avatar_id":8604,"avatar_template":"/user_avatar/meta.discourse.org/superuser/{size}/8604.png","post_count":2},{"id":3818,"username":"Tudor","uploaded_avatar_id":11675,"avatar_template":"/user_avatar/meta.discourse.org/tudor/{size}/11675.png","post_count":2},{"id":32,"username":"codinghorror","uploaded_avatar_id":5297,"avatar_template":"/user_avatar/meta.discourse.org/codinghorror/{size}/5297.png","post_count":2},{"id":3620,"username":"potthast","uploaded_avatar_id":11363,"avatar_template":"/user_avatar/meta.discourse.org/potthast/{size}/11363.png","post_count":2},{"id":9,"username":"tms","uploaded_avatar_id":40181,"avatar_template":"/user_avatar/meta.discourse.org/tms/{size}/40181.png","post_count":2},{"id":14091,"username":"Luciano_Fantuzzi","uploaded_avatar_id":39484,"avatar_template":"/user_avatar/meta.discourse.org/luciano_fantuzzi/{size}/39484.png","post_count":1},{"id":255,"username":"uwe_keim","uploaded_avatar_id":5697,"avatar_template":"/user_avatar/meta.discourse.org/uwe_keim/{size}/5697.png","post_count":1},{"id":9006,"username":"berk","uploaded_avatar_id":19348,"avatar_template":"/user_avatar/meta.discourse.org/berk/{size}/19348.png","post_count":1},{"id":754,"username":"danneu","uploaded_avatar_id":6540,"avatar_template":"/user_avatar/meta.discourse.org/danneu/{size}/6540.png","post_count":1},{"id":761,"username":"marcoceppi","uploaded_avatar_id":6552,"avatar_template":"/user_avatar/meta.discourse.org/marcoceppi/{size}/6552.png","post_count":1},{"id":2753,"username":"mikl","uploaded_avatar_id":9918,"avatar_template":"/user_avatar/meta.discourse.org/mikl/{size}/9918.png","post_count":1}],"suggested_topics":[{"id":27331,"title":"Polls are still very buggy","fancy_title":"Polls are still very buggy","slug":"polls-are-still-very-buggy","posts_count":4,"reply_count":1,"highest_post_number":4,"image_url":"/uploads/default/_optimized/cd1/b8c/c162528887_690x401.png","created_at":"2015-04-08T09:51:00.357Z","last_posted_at":"2015-04-08T15:59:16.258Z","bumped":true,"bumped_at":"2015-04-08T16:05:09.842Z","unseen":false,"last_read_post_number":3,"unread":0,"new_posts":1,"pinned":false,"unpinned":null,"visible":true,"closed":false,"archived":false,"notification_level":2,"bookmarked":false,"liked":false,"archetype":"regular","like_count":11,"views":55,"category_id":1},{"id":27343,"title":"Mobile theme doesn't show last activity time for topics on category page","fancy_title":"Mobile theme doesn’t show last activity time for topics on category page","slug":"mobile-theme-doesnt-show-last-activity-time-for-topics-on-category-page","posts_count":4,"reply_count":2,"highest_post_number":4,"image_url":"/uploads/default/_optimized/13e/25c/bd30b466be_281x500.png","created_at":"2015-04-08T14:20:51.177Z","last_posted_at":"2015-04-08T15:40:30.037Z","bumped":true,"bumped_at":"2015-04-08T15:40:30.037Z","unseen":false,"last_read_post_number":2,"unread":0,"new_posts":2,"pinned":false,"unpinned":null,"visible":true,"closed":false,"archived":false,"notification_level":2,"bookmarked":false,"liked":false,"archetype":"regular","like_count":3,"views":23,"category_id":9},{"id":27346,"title":"Reply+{messagekey}@... optionaly in header \"from\" in addition to \"reply-to\"","fancy_title":"Reply+{messagekey}@… optionaly in header “from” in addition to “reply-to”","slug":"reply-messagekey-optionaly-in-header-from-in-addition-to-reply-to","posts_count":1,"reply_count":0,"highest_post_number":1,"image_url":null,"created_at":"2015-04-08T16:05:13.103Z","last_posted_at":"2015-04-08T16:05:13.415Z","bumped":true,"bumped_at":"2015-04-08T16:05:13.415Z","unseen":true,"pinned":false,"unpinned":null,"visible":true,"closed":false,"archived":false,"bookmarked":null,"liked":null,"archetype":"regular","like_count":0,"views":8,"category_id":2},{"id":19670,"title":"Parsing (Oneboxing) IMDB links","fancy_title":"Parsing (Oneboxing) IMDB links","slug":"parsing-oneboxing-imdb-links","posts_count":8,"reply_count":1,"highest_post_number":8,"image_url":null,"created_at":"2014-09-05T07:19:26.161Z","last_posted_at":"2015-04-07T09:21:21.570Z","bumped":true,"bumped_at":"2015-04-07T09:21:21.570Z","unseen":false,"last_read_post_number":8,"unread":0,"new_posts":0,"pinned":false,"unpinned":null,"visible":true,"closed":false,"archived":false,"notification_level":2,"bookmarked":false,"liked":false,"archetype":"regular","like_count":4,"views":253,"category_id":2},{"id":7512,"title":"Support for Piwik Analytics as an alternative to Google Analytics","fancy_title":"Support for Piwik Analytics as an alternative to Google Analytics","slug":"support-for-piwik-analytics-as-an-alternative-to-google-analytics","posts_count":53,"reply_count":41,"highest_post_number":65,"image_url":"/plugins/emoji/images/smile.png","created_at":"2013-06-16T01:32:30.596Z","last_posted_at":"2015-02-22T13:46:26.845Z","bumped":true,"bumped_at":"2015-02-22T13:46:26.845Z","unseen":false,"last_read_post_number":65,"unread":0,"new_posts":0,"pinned":false,"unpinned":null,"visible":true,"closed":false,"archived":false,"notification_level":2,"bookmarked":false,"liked":false,"archetype":"regular","like_count":62,"views":1877,"category_id":2},{"id":25480,"title":"CSS admin-contents reloaded","fancy_title":"CSS admin-contents reloaded","slug":"css-admin-contents-reloaded","posts_count":22,"reply_count":15,"highest_post_number":22,"image_url":null,"created_at":"2015-02-21T12:15:57.707Z","last_posted_at":"2015-03-02T23:24:18.899Z","bumped":true,"bumped_at":"2015-03-02T23:24:18.899Z","unseen":false,"pinned":false,"unpinned":null,"visible":true,"closed":false,"archived":false,"bookmarked":null,"liked":null,"archetype":"regular","like_count":21,"views":185,"category_id":2},{"id":26576,"title":"Badge timestamp should be the time the badge was granted?","fancy_title":"Badge timestamp should be the time the badge was granted?","slug":"badge-timestamp-should-be-the-time-the-badge-was-granted","posts_count":2,"reply_count":0,"highest_post_number":2,"image_url":null,"created_at":"2015-03-20T13:22:08.266Z","last_posted_at":"2015-03-21T00:33:52.243Z","bumped":true,"bumped_at":"2015-03-21T00:33:52.243Z","unseen":false,"last_read_post_number":1,"unread":0,"new_posts":0,"pinned":false,"unpinned":null,"visible":true,"closed":false,"archived":false,"notification_level":1,"bookmarked":false,"liked":false,"archetype":"regular","like_count":9,"views":87,"category_id":2}],"links":[{"url":"https://github.com/discourse/discourse/blob/master/config/locales/en.yml","title":null,"fancy_title":null,"internal":false,"reflection":false,"clicks":118,"user_id":9,"domain":"github.com"},{"url":"http://www.localeapp.com/","title":"Easy localization for Rails apps | Locale","fancy_title":null,"internal":false,"reflection":false,"clicks":69,"user_id":1860,"domain":"www.localeapp.com"},{"url":"http://stackoverflow.com/questions/4232922/why-do-people-use-plain-english-as-translation-placeholders","title":"internationalization - Why do people use plain english as translation placeholders? - Stack Overflow","fancy_title":null,"internal":false,"reflection":false,"clicks":63,"user_id":7,"domain":"stackoverflow.com"},{"url":"https://github.com/discourse/discourse/blob/master/config/locales","title":"discourse/config/locales at master · discourse/discourse · GitHub","fancy_title":null,"internal":false,"reflection":false,"clicks":62,"user_id":32,"domain":"github.com"},{"url":"https://github.com/SlexAxton/messageformat.js","title":"SlexAxton/messageformat.js · GitHub","fancy_title":null,"internal":false,"reflection":false,"clicks":46,"user_id":1,"domain":"github.com"},{"url":"http://www.localeapp.com/projects/1537/translations?utf8=%E2%9C%93&search=source_code","title":"langforums | Locale","fancy_title":null,"internal":false,"reflection":false,"clicks":25,"user_id":1860,"domain":"www.localeapp.com"},{"url":"https://translations.launchpad.net/","title":"Launchpad Translations","fancy_title":null,"internal":false,"reflection":false,"clicks":23,"user_id":761,"domain":"translations.launchpad.net"},{"url":"https://www.transifex.com/","title":"Transifex - Continuous Localization Platform","fancy_title":null,"internal":false,"reflection":false,"clicks":22,"user_id":1979,"domain":"www.transifex.com"},{"url":"https://github.com/berk/tr8n","title":"berk/tr8n · GitHub","fancy_title":null,"internal":false,"reflection":false,"clicks":22,"user_id":1,"domain":"github.com"},{"url":"http://translate.wordpress.org/projects/bbpress/dev","title":"WordPress › Development < GlotPress","fancy_title":null,"internal":false,"reflection":false,"clicks":16,"user_id":7,"domain":"translate.wordpress.org"},{"url":"http://weblate.org","title":"Weblate - web-based translation","fancy_title":null,"internal":false,"reflection":false,"clicks":15,"user_id":2316,"domain":"weblate.org"},{"url":"https://github.com/discourse/discourse/tree/master/config/locales","title":"discourse/config/locales at master · discourse/discourse · GitHub","fancy_title":null,"internal":false,"reflection":false,"clicks":14,"user_id":19,"domain":"github.com"},{"url":"https://github.com/discourse/discourse/pull/493","title":"Danish translation. by mikl · Pull Request #493 · discourse/discourse · GitHub","fancy_title":null,"internal":false,"reflection":false,"clicks":12,"user_id":2753,"domain":"github.com"},{"url":"https://github.com/SlexAxton","title":"SlexAxton (Alex Sexton) · GitHub","fancy_title":null,"internal":false,"reflection":false,"clicks":10,"user_id":1,"domain":"github.com"},{"url":"https://github.com/gururea/discourse/tree/master/config/locales","title":"discourse/config/locales at master · gururea/discourse · GitHub","fancy_title":null,"internal":false,"reflection":false,"clicks":9,"user_id":3190,"domain":"github.com"},{"url":"https://github.com/discourse/discourse/blob/master/config/locales/client.en.yml#L691","title":"discourse/config/locales/client.en.yml at master · discourse/discourse · GitHub","fancy_title":null,"internal":false,"reflection":false,"clicks":7,"user_id":461,"domain":"github.com"},{"url":"https://github.com/dacap/discourse/tree/spanish","title":"dacap/discourse · GitHub","fancy_title":null,"internal":false,"reflection":false,"clicks":7,"user_id":1275,"domain":"github.com"},{"url":"https://github.com/discourse/discourse/blob/master/config/locales/client.nl.yml","title":"discourse/config/locales/client.nl.yml at master · discourse/discourse · GitHub","fancy_title":null,"internal":false,"reflection":false,"clicks":7,"user_id":461,"domain":"github.com"},{"url":"https://github.com/discourse/discourse/commit/c5761eae8afe37e20cec0d0f9d14b85b6e585bda","title":"Support for Simplified Chinese thanks to tangramor · c5761ea · discourse/discourse · GitHub","fancy_title":null,"internal":false,"reflection":false,"clicks":6,"user_id":212,"domain":"github.com"},{"url":"http://tr8n.github.com/","title":"tr8n","fancy_title":null,"internal":false,"reflection":false,"clicks":6,"user_id":212,"domain":"tr8n.github.com"},{"url":"http://www.getlocalization.com/","title":"Crowdsourced, Social and Collaborative App & Website Translation - Get Localization","fancy_title":null,"internal":false,"reflection":false,"clicks":6,"user_id":22,"domain":"www.getlocalization.com"},{"url":"http://blog.discourse.org/2013/04/discourse-as-your-first-rails-app/","title":"Discourse as Your First Rails App","fancy_title":null,"internal":false,"reflection":false,"clicks":5,"user_id":1995,"domain":"blog.discourse.org"},{"url":"https://github.com/alxndr/discourse/blob/i18n-chinese/config/locales/server.zh.yml","title":null,"fancy_title":null,"internal":false,"reflection":false,"clicks":5,"user_id":212,"domain":"github.com"},{"url":"http://translate.sourceforge.net/wiki/virtaal/index","title":"Easy-to-use and powerful offline translation tool | Virtaal","fancy_title":null,"internal":false,"reflection":false,"clicks":4,"user_id":1979,"domain":"translate.sourceforge.net"},{"url":"https://poeditor.com/","title":"POEditor - online software localization tool","fancy_title":null,"internal":false,"reflection":false,"clicks":4,"user_id":1979,"domain":"poeditor.com"},{"url":"http://en.lichess.org/@/Hellball","title":null,"fancy_title":null,"internal":false,"reflection":false,"clicks":3,"user_id":1979,"domain":"en.lichess.org"},{"url":"http://en.wikipedia.org/wiki/T%E2%80%93V_distinction","title":"T–V distinction - Wikipedia, the free encyclopedia","fancy_title":null,"internal":false,"reflection":false,"clicks":3,"user_id":3620,"domain":"en.wikipedia.org"},{"url":"http://www.slideshare.net/HeatherRivers/linguistic-potluck-crowdsourcing-localization-with-rails","title":"Linguistic Potluck: Crowdsourcing localization with Rails","fancy_title":null,"internal":false,"reflection":false,"clicks":3,"user_id":212,"domain":"www.slideshare.net"},{"url":"https://meta.discourse.org/t/language-mirrors/2378/2","title":"Language mirrors","fancy_title":null,"internal":true,"reflection":true,"clicks":3,"user_id":32,"domain":"meta.discourse.org"},{"url":"http://www.madanalogy.com/2012/06/rails-i18n-translations-in-yaml.html","title":"Mad Analogy: Rails i18n translations in Yaml: translation tool support","fancy_title":null,"internal":false,"reflection":false,"clicks":3,"user_id":3190,"domain":"www.madanalogy.com"},{"url":"https://github.com/tr8n","title":"Translation Exchange · GitHub","fancy_title":null,"internal":false,"reflection":false,"clicks":3,"user_id":9006,"domain":"github.com"},{"url":"http://pootle.locamotion.org/","title":"Main | Pootle Demo","fancy_title":null,"internal":false,"reflection":false,"clicks":2,"user_id":3190,"domain":"pootle.locamotion.org"},{"url":"http://www.youtube.com/watch?v=MqqdzJ98q7s","title":"GoGaRuCo 2012 - Linguistic Potluck: Crowdsourcing Localization in Rails by Heather Rivers - YouTube","fancy_title":null,"internal":false,"reflection":false,"clicks":2,"user_id":212,"domain":"www.youtube.com"},{"url":"https://meta.discourse.org/t/translation-workflow/6102","title":"Translation workflow","fancy_title":null,"internal":true,"reflection":true,"clicks":2,"user_id":4702,"domain":"meta.discourse.org"},{"url":"https://meta.discourse.org/t/solving-xda-developer-style-forums/4368/4","title":"Solving XDA-Developer style forums","fancy_title":null,"internal":true,"reflection":true,"clicks":2,"user_id":639,"domain":"meta.discourse.org"},{"url":"https://tr8nhub.com","title":"TranslationExchange","fancy_title":null,"internal":false,"reflection":false,"clicks":2,"user_id":9006,"domain":"tr8nhub.com"},{"url":"https://meta.discourse.org/t/roadplan-for-discourse/2939/3","title":"Roadplan for Discourse 2013","fancy_title":null,"internal":true,"reflection":true,"clicks":1,"user_id":2540,"domain":"meta.discourse.org"},{"url":"http://sugarjs.com/dates#date_locales","title":"Dates - Sugar","fancy_title":null,"internal":false,"reflection":false,"clicks":1,"user_id":461,"domain":"sugarjs.com"},{"url":"http://blog.discourse.org/2013/03/localizing-discourse/","title":"Localizing Discourse","fancy_title":null,"internal":false,"reflection":false,"clicks":1,"user_id":893,"domain":"blog.discourse.org"},{"url":"https://github.com/discourse/discourse/blob/master/app/assets/javascripts/locales/date_locales.js","title":null,"fancy_title":null,"internal":false,"reflection":false,"clicks":1,"user_id":461,"domain":"github.com"},{"url":"http://transifex.com/projects/p/discourse-pt-br/","title":"Discourse-Translations-Project localization","fancy_title":null,"internal":false,"reflection":false,"clicks":1,"user_id":893,"domain":"transifex.com"},{"url":"https://github.com/discourse/discourse/issues/279","title":null,"fancy_title":null,"internal":false,"reflection":false,"clicks":1,"user_id":893,"domain":"github.com"},{"url":"https://meta.discourse.org/t/comrades-lets-join-our-efforts-on-ukrainian-and-russian-translations/4403/5","title":"Comrades let's join our efforts on ukrainian and russian translations","fancy_title":null,"internal":true,"reflection":true,"clicks":1,"user_id":3417,"domain":"meta.discourse.org"},{"url":"https://meta.discourse.org/t/translation-workflow/6102/6","title":"Translation workflow","fancy_title":null,"internal":true,"reflection":false,"clicks":0,"user_id":1995,"domain":"meta.discourse.org"},{"url":"https://meta.discourse.org/t/bookmark-last-read-sometimes-doesn-t-go-to-the-end-of-a-topic/4825/9","title":"Bookmark/last read sometimes doesn't go to the end of a topic","fancy_title":null,"internal":true,"reflection":true,"clicks":0,"user_id":3681,"domain":"meta.discourse.org"},{"url":"https://github.com/discourse/discourse/blob/master/config/locales/client.de.yml","title":"discourse/config/locales/client.de.yml at master · discourse/discourse · GitHub","fancy_title":null,"internal":false,"reflection":false,"clicks":0,"user_id":2,"domain":"github.com"},{"url":"https://meta.discourse.org/t/what-i-love-about-wordpress-plugins/5697","title":"What I love about WordPress plugins","fancy_title":null,"internal":true,"reflection":true,"clicks":0,"user_id":1,"domain":"meta.discourse.org"},{"url":"https://meta.discourse.org/t/github-onebox-rendering-issue/7616","title":"GitHub OneBox Rendering Issue","fancy_title":null,"internal":true,"reflection":true,"clicks":0,"user_id":5372,"domain":"meta.discourse.org"},{"url":"https://github.com/discourse/discourse/blob/master/config/locales/server.de.yml","title":"discourse/config/locales/server.de.yml at master · discourse/discourse · GitHub","fancy_title":null,"internal":false,"reflection":false,"clicks":0,"user_id":2,"domain":"github.com"},{"url":"https://meta.discourse.org/t/roadplan-for-discourse/2939/5","title":"Roadplan for Discourse 2013","fancy_title":null,"internal":true,"reflection":true,"clicks":0,"user_id":32,"domain":"meta.discourse.org"},{"url":"https://meta.discourse.org/t/translation-tools-transifex-localeapp/7763","title":"Translation Tools: Transifex? Localeapp?","fancy_title":null,"internal":true,"reflection":true,"clicks":0,"user_id":2,"domain":"meta.discourse.org"},{"url":"http://guides.rubyonrails.org/i18n.html#the-public-i18n-api","title":"Rails Internationalization (I18n) API — Ruby on Rails Guides","fancy_title":null,"internal":false,"reflection":false,"clicks":0,"user_id":1895,"domain":"guides.rubyonrails.org"},{"url":"https://meta.discourse.org/t/hi-support-chinese/4393/6","title":"Hi, support Chinese?","fancy_title":null,"internal":true,"reflection":true,"clicks":0,"user_id":2014,"domain":"meta.discourse.org"},{"url":"https://meta.discourse.org/t/translation-tools-transifex-localeapp/7763/41","title":"Translation Tools: Transifex? Localeapp?","fancy_title":null,"internal":true,"reflection":false,"clicks":0,"user_id":6626,"domain":"meta.discourse.org"}],"notification_level":2,"notifications_reason_id":4,"can_move_posts":true,"can_edit":true,"can_delete":true,"can_recover":true,"can_remove_allowed_users":true,"can_invite_to":true,"can_create_post":true,"can_reply_as_new_topic":true,"can_flag_topic":true},"highest_post_number":104,"last_read_post_number":104,"deleted_by":null,"has_deleted":true,"actions_summary":[{"id":4,"count":0,"hidden":false,"can_act":true},{"id":7,"count":0,"hidden":false,"can_act":true},{"id":8,"count":0,"hidden":false,"can_act":true}],"chunk_size":20,"bookmarked":false,"tags":null}}; diff --git a/test/javascripts/helpers/create-pretender.js.es6 b/test/javascripts/helpers/create-pretender.js.es6 index 71d2ab593f..85f45c6b6e 100644 --- a/test/javascripts/helpers/create-pretender.js.es6 +++ b/test/javascripts/helpers/create-pretender.js.es6 @@ -2,15 +2,21 @@ function parsePostData(query) { const result = {}; query.split("&").forEach(function(part) { const item = part.split("="); - result[item[0]] = decodeURIComponent(item[1]).replace(/\+/g, ' '); + const firstSeg = decodeURIComponent(item[0]); + const m = /^([^\[]+)\[([^\]]+)\]/.exec(firstSeg); + + const val = decodeURIComponent(item[1]).replace(/\+/g, ' '); + if (m) { + result[m[1]] = result[m[1]] || {}; + result[m[1]][m[2]] = val; + } else { + result[firstSeg] = val; + } + }); return result; } -function clone(obj) { - return JSON.parse(JSON.stringify(obj)); -} - function response(code, obj) { if (typeof code === "object") { obj = code; @@ -122,7 +128,10 @@ export default function() { this.put('/posts/:post_id/recover', success); this.put('/posts/:post_id', (request) => { - return response({ post: {id: request.params.post_id, version: 2 } }); + const data = parsePostData(request.requestBody); + data.post.id = request.params.post_id; + data.post.version = 2; + return response(200, data.post); }); this.put('/t/:slug/:id', (request) => { @@ -157,9 +166,15 @@ export default function() { } }); + this.post('/widgets', function(request) { + const widget = parsePostData(request.requestBody).widget; + widget.id = 100; + return response(200, {widget}); + }); + this.put('/widgets/:widget_id', function(request) { - const w = _widgets.findBy('id', parseInt(request.params.widget_id)); - return response({ widget: clone(w) }); + const widget = parsePostData(request.requestBody).widget; + return response({ widget }); }); this.get('/widgets', function(request) { diff --git a/test/javascripts/models/rest-model-test.js.es6 b/test/javascripts/models/rest-model-test.js.es6 index 0362706c97..9aa63c4c30 100644 --- a/test/javascripts/models/rest-model-test.js.es6 +++ b/test/javascripts/models/rest-model-test.js.es6 @@ -28,6 +28,21 @@ test('update', function() { }); }); +test('save new', function() { + const store = createStore(); + const widget = store.createRecord('widget'); + + ok(widget.get('isNew'), 'it is a new record'); + ok(!widget.get('isCreated'), 'it is not created'); + + widget.save({ name: 'Evil Widget' }).then(function() { + ok(widget.get('id'), 'it has an id'); + ok(widget.get('name'), 'Evil Widget'); + ok(widget.get('isCreated'), 'it is created'); + ok(!widget.get('isNew'), 'it is no longer new'); + }); +}); + test('destroyRecord', function() { const store = createStore(); store.find('widget', 123).then(function(widget) { diff --git a/test/javascripts/models/store-test.js.es6 b/test/javascripts/models/store-test.js.es6 index f47c99f1b2..9b3893cf43 100644 --- a/test/javascripts/models/store-test.js.es6 +++ b/test/javascripts/models/store-test.js.es6 @@ -5,6 +5,8 @@ import createStore from 'helpers/create-store'; test('createRecord', function() { const store = createStore(); const widget = store.createRecord('widget', {id: 111, name: 'hello'}); + + ok(!widget.get('isNew'), 'it is not a new record'); equal(widget.get('name'), 'hello'); equal(widget.get('id'), 111); }); @@ -13,6 +15,7 @@ test('createRecord without an `id`', function() { const store = createStore(); const widget = store.createRecord('widget', {name: 'hello'}); + ok(widget.get('isNew'), 'it is a new record'); ok(!widget.get('id'), 'there is no id'); }); @@ -21,6 +24,7 @@ test('createRecord without attributes', function() { const widget = store.createRecord('widget'); ok(!widget.get('id'), 'there is no id'); + ok(widget.get('isNew'), 'it is a new record'); }); test('createRecord with a record as attributes returns that record from the map', function() { @@ -36,6 +40,7 @@ test('find', function() { store.find('widget', 123).then(function(w) { equal(w.get('name'), 'Trout Lure'); equal(w.get('id'), 123); + ok(!w.get('isNew'), 'found records are not new'); // A second find by id returns the same object store.find('widget', 123).then(function(w2) { @@ -70,6 +75,7 @@ test('findAll', function() { store.findAll('widget').then(function(result) { equal(result.get('length'), 2); const w = result.findBy('id', 124); + ok(!w.get('isNew'), 'found records are not new'); equal(w.get('name'), 'Evil Repellant'); }); }); diff --git a/vendor/assets/javascripts/bootbox.js b/vendor/assets/javascripts/bootbox.js index 69ec027eff..275ef8f4f5 100644 --- a/vendor/assets/javascripts/bootbox.js +++ b/vendor/assets/javascripts/bootbox.js @@ -437,9 +437,10 @@ var bootbox = window.bootbox || (function(document, $) { // wire up button handlers div.on('click', '.modal-footer a', function(e) { + var self = this; Ember.run(function() { - var handler = $(this).data("handler"), + var handler = $(self).data("handler"), cb = callbacks[handler], hideModal = null; From 7f501a0c41f4287288581cc0969b73eb0b3c7c6b Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Thu, 9 Apr 2015 18:33:37 -0400 Subject: [PATCH 022/113] When a post returns `enqueued` don't insert it in the stream and notify - Includes removal of a lot of modal boilerplate --- .jshintrc | 2 + .../admin/routes/admin-badges-show.js.es6 | 8 +-- .../admin/routes/admin-flags-list.js.es6 | 8 +-- .../admin-logs-staff-action-logs.js.es6 | 10 ++-- .../admin/routes/admin-user-index.js.es6 | 4 +- .../components/bulk-select-button.js.es6 | 2 +- .../discourse/controllers/composer.js.es6 | 15 ++++-- .../discourse/lib/show-modal.js.es6 | 30 +++++++++-- .../discourse/models/composer.js.es6 | 11 ++-- .../javascripts/discourse/models/rest.js.es6 | 8 ++- .../discourse/routes/application.js.es6 | 24 +++++---- .../discourse/routes/discourse.js.es6 | 7 --- .../javascripts/discourse/routes/topic.js.es6 | 32 ++++++------ .../discourse/routes/user-invited.js.es6 | 2 +- .../{change_owner.hbs => change-owner.hbs} | 0 ...to_close.hbs => edit-topic-auto-close.hbs} | 0 ...orgot_password.hbs => forgot-password.hbs} | 0 ...s_help.hbs => keyboard-shortcuts-help.hbs} | 0 .../{merge_topic.hbs => merge-topic.hbs} | 0 .../{not_activated.hbs => not-activated.hbs} | 0 .../templates/modal/post-enqueued.hbs | 6 +++ ...ulk_actions.hbs => topic-bulk-actions.hbs} | 0 .../views/archetype-options-modal.js.es6 | 6 --- .../discourse/views/change-owner.js.es6 | 6 --- .../views/edit-topic-auto-close.js.es6 | 6 --- .../discourse/views/feature-topic.js.es6 | 6 --- .../discourse/views/forgot-password.js.es6 | 6 --- .../views/keyboard-shortcuts-help.js.es6 | 6 --- .../discourse/views/merge-topic.js.es6 | 6 --- .../discourse/views/not-activated.js.es6 | 6 --- .../discourse/views/topic-bulk-actions.js.es6 | 6 --- config/locales/client.en.yml | 6 +++ .../acceptance/composer-test.js.es6 | 50 ++++++++++++++++++- .../helpers/create-pretender.js.es6 | 18 ++++--- 34 files changed, 172 insertions(+), 125 deletions(-) rename app/assets/javascripts/discourse/templates/modal/{change_owner.hbs => change-owner.hbs} (100%) rename app/assets/javascripts/discourse/templates/modal/{auto_close.hbs => edit-topic-auto-close.hbs} (100%) rename app/assets/javascripts/discourse/templates/modal/{forgot_password.hbs => forgot-password.hbs} (100%) rename app/assets/javascripts/discourse/templates/modal/{keyboard_shortcuts_help.hbs => keyboard-shortcuts-help.hbs} (100%) rename app/assets/javascripts/discourse/templates/modal/{merge_topic.hbs => merge-topic.hbs} (100%) rename app/assets/javascripts/discourse/templates/modal/{not_activated.hbs => not-activated.hbs} (100%) create mode 100644 app/assets/javascripts/discourse/templates/modal/post-enqueued.hbs rename app/assets/javascripts/discourse/templates/modal/{topic_bulk_actions.hbs => topic-bulk-actions.hbs} (100%) delete mode 100644 app/assets/javascripts/discourse/views/archetype-options-modal.js.es6 delete mode 100644 app/assets/javascripts/discourse/views/change-owner.js.es6 delete mode 100644 app/assets/javascripts/discourse/views/edit-topic-auto-close.js.es6 delete mode 100644 app/assets/javascripts/discourse/views/feature-topic.js.es6 delete mode 100644 app/assets/javascripts/discourse/views/forgot-password.js.es6 delete mode 100644 app/assets/javascripts/discourse/views/keyboard-shortcuts-help.js.es6 delete mode 100644 app/assets/javascripts/discourse/views/merge-topic.js.es6 delete mode 100644 app/assets/javascripts/discourse/views/not-activated.js.es6 delete mode 100644 app/assets/javascripts/discourse/views/topic-bulk-actions.js.es6 diff --git a/.jshintrc b/.jshintrc index 962847d723..71726a3bd8 100644 --- a/.jshintrc +++ b/.jshintrc @@ -33,6 +33,8 @@ "triggerEvent", "count", "exists", + "visible", + "invisible", "asyncTestDiscourse", "fixture", "find", diff --git a/app/assets/javascripts/admin/routes/admin-badges-show.js.es6 b/app/assets/javascripts/admin/routes/admin-badges-show.js.es6 index 56d0f93daf..648730d9b0 100644 --- a/app/assets/javascripts/admin/routes/admin-badges-show.js.es6 +++ b/app/assets/javascripts/admin/routes/admin-badges-show.js.es6 @@ -24,8 +24,8 @@ export default Ember.Route.extend({ }, editGroupings() { - const groupings = this.controllerFor('admin-badges').get('badgeGroupings'); - showModal('modals/admin-edit-badge-groupings', groupings); + const model = this.controllerFor('admin-badges').get('badgeGroupings'); + showModal('modals/admin-edit-badge-groupings', { model }); }, preview(badge, explain) { @@ -38,9 +38,9 @@ export default Ember.Route.extend({ trigger: badge.get('trigger'), explain } - }).then(function(json) { + }).then(function(model) { badge.set('preview_loading', false); - showModal('modals/admin-badge-preview', json); + showModal('modals/admin-badge-preview', { model }); }).catch(function(error) { badge.set('preview_loading', false); Em.Logger.error(error); diff --git a/app/assets/javascripts/admin/routes/admin-flags-list.js.es6 b/app/assets/javascripts/admin/routes/admin-flags-list.js.es6 index 99ceba7717..e277ef4417 100644 --- a/app/assets/javascripts/admin/routes/admin-flags-list.js.es6 +++ b/app/assets/javascripts/admin/routes/admin-flags-list.js.es6 @@ -12,13 +12,13 @@ export default Discourse.Route.extend({ }, actions: { - showAgreeFlagModal(flaggedPost) { - showModal('modals/admin-agree-flag', flaggedPost); + showAgreeFlagModal(model) { + showModal('modals/admin-agree-flag', { model }); this.controllerFor('modal').set('modalClass', 'agree-flag-modal'); }, - showDeleteFlagModal(flaggedPost) { - showModal('modals/admin-delete-flag', flaggedPost); + showDeleteFlagModal(model) { + showModal('modals/admin-delete-flag', { model }); this.controllerFor('modal').set('modalClass', 'delete-flag-modal'); } diff --git a/app/assets/javascripts/admin/routes/admin-logs-staff-action-logs.js.es6 b/app/assets/javascripts/admin/routes/admin-logs-staff-action-logs.js.es6 index f0f08ab2f5..6ef900e843 100644 --- a/app/assets/javascripts/admin/routes/admin-logs-staff-action-logs.js.es6 +++ b/app/assets/javascripts/admin/routes/admin-logs-staff-action-logs.js.es6 @@ -12,14 +12,14 @@ export default Discourse.Route.extend({ }, actions: { - showDetailsModal(logRecord) { - showModal('modals/admin-staff-action-log-details', logRecord); + showDetailsModal(model) { + showModal('modals/admin-staff-action-log-details', { model }); this.controllerFor('modal').set('modalClass', 'log-details-modal'); }, - showCustomDetailsModal(logRecord) { - const modalName = "modals/" + (logRecord.action_name + '_details').replace("_", "-"); - showModal(modalName, logRecord); + showCustomDetailsModal(model) { + const modalName = "modals/" + (model.action_name + '_details').replace("_", "-"); + showModal(modalName, { model }); this.controllerFor('modal').set('modalClass', 'tabbed-modal log-details-modal'); } } diff --git a/app/assets/javascripts/admin/routes/admin-user-index.js.es6 b/app/assets/javascripts/admin/routes/admin-user-index.js.es6 index 07cbfa8fc3..fdcf844abd 100644 --- a/app/assets/javascripts/admin/routes/admin-user-index.js.es6 +++ b/app/assets/javascripts/admin/routes/admin-user-index.js.es6 @@ -24,8 +24,8 @@ export default Discourse.Route.extend({ }, actions: { - showSuspendModal(user) { - showModal('modals/admin-suspend-user', user); + showSuspendModal(model) { + showModal('modals/admin-suspend-user', { model }); this.controllerFor('modal').set('modalClass', 'suspend-user-modal'); } } diff --git a/app/assets/javascripts/discourse/components/bulk-select-button.js.es6 b/app/assets/javascripts/discourse/components/bulk-select-button.js.es6 index ec47bbd56f..8c50f5e0e4 100644 --- a/app/assets/javascripts/discourse/components/bulk-select-button.js.es6 +++ b/app/assets/javascripts/discourse/components/bulk-select-button.js.es6 @@ -3,7 +3,7 @@ import showModal from 'discourse/lib/show-modal'; export default Ember.Component.extend({ actions: { showBulkActions() { - const controller = showModal('topicBulkActions', this.get('selected')); + const controller = showModal('topic-bulk-actions', { model: this.get('selected'), title: 'topics.bulk.actions' }); controller.set('refreshTarget', this.get('refreshTarget')); } } diff --git a/app/assets/javascripts/discourse/controllers/composer.js.es6 b/app/assets/javascripts/discourse/controllers/composer.js.es6 index c7df684157..7a97eda7a9 100644 --- a/app/assets/javascripts/discourse/controllers/composer.js.es6 +++ b/app/assets/javascripts/discourse/controllers/composer.js.es6 @@ -218,14 +218,20 @@ export default DiscourseController.extend({ const promise = composer.save({ imageSizes: this.get('view').imageSizes(), editReason: this.get("editReason") - }).then(function(opts) { + }).then(function(result) { + + if (result.responseJson.action === "enqueued") { + self.send('postWasEnqueued'); + self.destroyDraft(); + self.close(); + return result; + } // If we replied as a new topic successfully, remove the draft. if (self.get('replyAsNewTopicDraft')) { self.destroyDraft(); } - opts = opts || {}; self.close(); const currentUser = Discourse.User.current(); @@ -238,8 +244,9 @@ export default DiscourseController.extend({ // TODO disableJumpReply is super crude, it needs to provide some sort // of notification to the end user if (!composer.get('replyingToTopic') || !disableJumpReply) { - if (opts.post && !staged) { - Discourse.URL.routeTo(opts.post.get('url')); + const post = result.target; + if (post && !staged) { + Discourse.URL.routeTo(post.get('url')); } } }).catch(function(error) { diff --git a/app/assets/javascripts/discourse/lib/show-modal.js.es6 b/app/assets/javascripts/discourse/lib/show-modal.js.es6 index 6007700930..91713ca707 100644 --- a/app/assets/javascripts/discourse/lib/show-modal.js.es6 +++ b/app/assets/javascripts/discourse/lib/show-modal.js.es6 @@ -1,13 +1,33 @@ -export default (name, model) => { +export default (name, opts) => { + opts = opts || {}; + + const container = Discourse.__container__; + // We use the container here because modals are like singletons // in Discourse. Only one can be shown with a particular state. - const route = Discourse.__container__.lookup('route:application'); + const route = container.lookup('route:application'); + const modalController = route.controllerFor('modal'); - route.controllerFor('modal').set('modalClass', null); - route.render(name, { into: 'modal', outlet: 'modalBody' }); + modalController.set('modalClass', null); + + const viewClass = container.lookupFactory('view:' + name); + const controller = container.lookup('controller:' + name); + if (viewClass) { + route.render(name, { into: 'modal', outlet: 'modalBody' }); + } else { + const templateName = Ember.String.dasherize(name); + + const renderArgs = { into: 'modal', outlet: 'modalBody', view: 'modal-body'}; + if (controller) { renderArgs.controller = name; } + + route.render('modal/' + templateName, renderArgs); + if (opts.title) { + modalController.set('title', I18n.t(opts.title)); + } + } - const controller = route.controllerFor(name); if (controller) { + const model = opts.model; if (model) { controller.set('model', model); } if (controller.onShow) { controller.onShow(); } controller.set('flashMessage', null); diff --git a/app/assets/javascripts/discourse/models/composer.js.es6 b/app/assets/javascripts/discourse/models/composer.js.es6 index a8ffe86735..1b75c77e94 100644 --- a/app/assets/javascripts/discourse/models/composer.js.es6 +++ b/app/assets/javascripts/discourse/models/composer.js.es6 @@ -440,8 +440,9 @@ const Composer = RestModel.extend({ this.set('composeState', CLOSED); return promise.then(function() { - return post.save(props).then(function() { + return post.save(props).then(function(result) { self.clearState(); + return result; }).catch(throwAjaxError(function() { post.set('cooked', oldCooked); self.set('composeState', OPEN); @@ -526,9 +527,13 @@ const Composer = RestModel.extend({ composer.set("stagedPost", state === "staged" && createdPost); return createdPost.save().then(function(result) { - let saving = true; + if (result.responseJson.action === "enqueued") { + if (postStream) { postStream.undoPost(createdPost); } + return result; + } + if (topic) { // It's no longer a new post topic.set('draft_sequence', result.target.draft_sequence); @@ -554,7 +559,7 @@ const Composer = RestModel.extend({ composer.set('composeState', SAVING); } - return { post: createdPost }; + return result; }).catch(throwAjaxError(function() { if (postStream) { postStream.undoPost(createdPost); diff --git a/app/assets/javascripts/discourse/models/rest.js.es6 b/app/assets/javascripts/discourse/models/rest.js.es6 index 37afe11eb9..a35da6edf4 100644 --- a/app/assets/javascripts/discourse/models/rest.js.es6 +++ b/app/assets/javascripts/discourse/models/rest.js.es6 @@ -30,9 +30,13 @@ const RestModel = Ember.Object.extend(Presence, { const self = this; return adapter.createRecord(store, type, props).then(function(res) { if (!res) { throw "Received no data back from createRecord"; } - self.setProperties(self.__munge(res.payload)); - self.set('__state', 'created'); + // We can get a response back without properties, for example + // when a post is queued. + if (res.payload) { + self.setProperties(self.__munge(res.payload)); + self.set('__state', 'created'); + } res.target = self; return res; diff --git a/app/assets/javascripts/discourse/routes/application.js.es6 b/app/assets/javascripts/discourse/routes/application.js.es6 index 45dbfbf77c..16bbdbebc5 100644 --- a/app/assets/javascripts/discourse/routes/application.js.es6 +++ b/app/assets/javascripts/discourse/routes/application.js.es6 @@ -37,6 +37,10 @@ const ApplicationRoute = Discourse.Route.extend({ this.controllerFor('topic-entrance').send('show', data); }, + postWasEnqueued() { + showModal('post-enqueued', {title: 'queue.approval.title' }); + }, + composePrivateMessage(user, post) { const self = this; this.transitionTo('userActivity', user).then(function () { @@ -76,12 +80,12 @@ const ApplicationRoute = Discourse.Route.extend({ showCreateAccount: unlessReadOnly('handleShowCreateAccount'), showForgotPassword() { - showModal('forgotPassword'); + showModal('forgotPassword', { title: 'forgot_password.title' }); }, showNotActivated(props) { - showModal('notActivated'); - this.controllerFor('notActivated').setProperties(props); + const controller = showModal('not-activated', {title: 'log_in' }); + controller.setProperties(props); }, showUploadSelector(composerView) { @@ -90,13 +94,13 @@ const ApplicationRoute = Discourse.Route.extend({ }, showKeyboardShortcutsHelp() { - showModal('keyboardShortcutsHelp'); + showModal('keyboard-shortcuts-help', { title: 'keyboard_shortcuts_help.title'}); }, showSearchHelp() { // TODO: @EvitTrout how do we get a loading indicator here? - Discourse.ajax("/static/search_help.html", { dataType: 'html' }).then(function(html){ - showModal('searchHelp', html); + Discourse.ajax("/static/search_help.html", { dataType: 'html' }).then(function(model){ + showModal('searchHelp', { model }); }); }, @@ -120,9 +124,9 @@ const ApplicationRoute = Discourse.Route.extend({ editCategory(category) { const self = this; - Discourse.Category.reloadById(category.get('id')).then(function (c) { - self.site.updateCategory(c); - showModal('editCategory', c); + Discourse.Category.reloadById(category.get('id')).then(function (model) { + self.site.updateCategory(model); + showModal('editCategory', { model }); self.controllerFor('editCategory').set('selectedTab', 'general'); }); }, @@ -140,7 +144,7 @@ const ApplicationRoute = Discourse.Route.extend({ const controllerName = w.replace('modal/', ''), factory = this.container.lookupFactory('controller:' + controllerName); - this.render(w, {into: 'topicBulkActions', outlet: 'bulkOutlet', controller: factory ? controllerName : 'topic-bulk-actions'}); + this.render(w, {into: 'modal/topic-bulk-actions', outlet: 'bulkOutlet', controller: factory ? controllerName : 'topic-bulk-actions'}); } }, diff --git a/app/assets/javascripts/discourse/routes/discourse.js.es6 b/app/assets/javascripts/discourse/routes/discourse.js.es6 index 9061124460..1f5bdab25f 100644 --- a/app/assets/javascripts/discourse/routes/discourse.js.es6 +++ b/app/assets/javascripts/discourse/routes/discourse.js.es6 @@ -1,5 +1,3 @@ -import showModal from 'discourse/lib/show-modal'; - const DiscourseRoute = Ember.Route.extend({ // Set to true to refresh a model without a transition if a query param @@ -210,11 +208,6 @@ DiscourseRoute.reopenClass({ this.route('unknown', {path: '*path'}); }); - }, - - showModal: function(route, name, model) { - Ember.warn('DEPRECATED `Discourse.Route.showModal` - use `showModal` instead'); - showModal(name, model); } }); diff --git a/app/assets/javascripts/discourse/routes/topic.js.es6 b/app/assets/javascripts/discourse/routes/topic.js.es6 index 0f23333859..381692afea 100644 --- a/app/assets/javascripts/discourse/routes/topic.js.es6 +++ b/app/assets/javascripts/discourse/routes/topic.js.es6 @@ -43,52 +43,52 @@ const TopicRoute = Discourse.Route.extend(ShowFooter, { this.controllerFor("topic-admin-menu").send("show"); }, - showFlags(post) { - showModal('flag', post); + showFlags(model) { + showModal('flag', { model }); this.controllerFor('flag').setProperties({ selected: null }); }, - showFlagTopic(topic) { - showModal('flag', topic); + showFlagTopic(model) { + showModal('flag', { model }); this.controllerFor('flag').setProperties({ selected: null, flagTopic: true }); }, showAutoClose() { - showModal('editTopicAutoClose', this.modelFor('topic')); + showModal('edit-topic-auto-close', { model: this.modelFor('topic'), title: 'topic.auto_close_title' }); this.controllerFor('modal').set('modalClass', 'edit-auto-close-modal'); }, showFeatureTopic() { - showModal('featureTopic', this.modelFor('topic')); + showModal('featureTopic', { model: this.modelFor('topic'), title: 'topic.feature_topic.title' }); this.controllerFor('modal').set('modalClass', 'feature-topic-modal'); }, showInvite() { - showModal('invite', this.modelFor('topic')); + showModal('invite', { model: this.modelFor('topic') }); this.controllerFor('invite').reset(); }, - showHistory(post) { - showModal('history', post); - this.controllerFor('history').refresh(post.get("id"), "latest"); + showHistory(model) { + showModal('history', { model }); + this.controllerFor('history').refresh(model.get("id"), "latest"); this.controllerFor('modal').set('modalClass', 'history-modal'); }, - showRawEmail(post) { - showModal('raw-email', post); - this.controllerFor('raw_email').loadRawEmail(post.get("id")); + showRawEmail(model) { + showModal('raw-email', { model }); + this.controllerFor('raw_email').loadRawEmail(model.get("id")); }, mergeTopic() { - showModal('mergeTopic', this.modelFor('topic')); + showModal('merge-topic', { model: this.modelFor('topic'), title: 'topic.merge_topic.title' }); }, splitTopic() { - showModal('split-topic', this.modelFor('topic')); + showModal('split-topic', { model: this.modelFor('topic') }); }, changeOwner() { - showModal('changeOwner', this.modelFor('topic')); + showModal('change-owner', { model: this.modelFor('topic'), title: 'topic.change_owner.title' }); }, // Use replaceState to update the URL once it changes diff --git a/app/assets/javascripts/discourse/routes/user-invited.js.es6 b/app/assets/javascripts/discourse/routes/user-invited.js.es6 index b0e03559e6..a36f49af45 100644 --- a/app/assets/javascripts/discourse/routes/user-invited.js.es6 +++ b/app/assets/javascripts/discourse/routes/user-invited.js.es6 @@ -21,7 +21,7 @@ export default Discourse.Route.extend(ShowFooter, { actions: { showInvite() { - showModal('invite', Discourse.User.current()); + showModal('invite', { model: this.currentUser }); this.controllerFor('invite').reset(); }, diff --git a/app/assets/javascripts/discourse/templates/modal/change_owner.hbs b/app/assets/javascripts/discourse/templates/modal/change-owner.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/modal/change_owner.hbs rename to app/assets/javascripts/discourse/templates/modal/change-owner.hbs diff --git a/app/assets/javascripts/discourse/templates/modal/auto_close.hbs b/app/assets/javascripts/discourse/templates/modal/edit-topic-auto-close.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/modal/auto_close.hbs rename to app/assets/javascripts/discourse/templates/modal/edit-topic-auto-close.hbs diff --git a/app/assets/javascripts/discourse/templates/modal/forgot_password.hbs b/app/assets/javascripts/discourse/templates/modal/forgot-password.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/modal/forgot_password.hbs rename to app/assets/javascripts/discourse/templates/modal/forgot-password.hbs diff --git a/app/assets/javascripts/discourse/templates/modal/keyboard_shortcuts_help.hbs b/app/assets/javascripts/discourse/templates/modal/keyboard-shortcuts-help.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/modal/keyboard_shortcuts_help.hbs rename to app/assets/javascripts/discourse/templates/modal/keyboard-shortcuts-help.hbs diff --git a/app/assets/javascripts/discourse/templates/modal/merge_topic.hbs b/app/assets/javascripts/discourse/templates/modal/merge-topic.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/modal/merge_topic.hbs rename to app/assets/javascripts/discourse/templates/modal/merge-topic.hbs diff --git a/app/assets/javascripts/discourse/templates/modal/not_activated.hbs b/app/assets/javascripts/discourse/templates/modal/not-activated.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/modal/not_activated.hbs rename to app/assets/javascripts/discourse/templates/modal/not-activated.hbs diff --git a/app/assets/javascripts/discourse/templates/modal/post-enqueued.hbs b/app/assets/javascripts/discourse/templates/modal/post-enqueued.hbs new file mode 100644 index 0000000000..050d02dcf1 --- /dev/null +++ b/app/assets/javascripts/discourse/templates/modal/post-enqueued.hbs @@ -0,0 +1,6 @@ +
+

{{i18n "queue.approval.description"}}

+
+
+ {{d-button action="closeModal" class="btn-primary" label="queue.approval.ok"}} +
diff --git a/app/assets/javascripts/discourse/templates/modal/topic_bulk_actions.hbs b/app/assets/javascripts/discourse/templates/modal/topic-bulk-actions.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/modal/topic_bulk_actions.hbs rename to app/assets/javascripts/discourse/templates/modal/topic-bulk-actions.hbs diff --git a/app/assets/javascripts/discourse/views/archetype-options-modal.js.es6 b/app/assets/javascripts/discourse/views/archetype-options-modal.js.es6 deleted file mode 100644 index d6ebb0c277..0000000000 --- a/app/assets/javascripts/discourse/views/archetype-options-modal.js.es6 +++ /dev/null @@ -1,6 +0,0 @@ -import ModalBodyView from "discourse/views/modal-body"; - -export default ModalBodyView.extend({ - templateName: 'modal/archetype_options', - title: I18n.t('topic.options') -}); diff --git a/app/assets/javascripts/discourse/views/change-owner.js.es6 b/app/assets/javascripts/discourse/views/change-owner.js.es6 deleted file mode 100644 index 604dfbe562..0000000000 --- a/app/assets/javascripts/discourse/views/change-owner.js.es6 +++ /dev/null @@ -1,6 +0,0 @@ -import ModalBodyView from "discourse/views/modal-body"; - -export default ModalBodyView.extend({ - templateName: 'modal/change_owner', - title: I18n.t('topic.change_owner.title') -}); diff --git a/app/assets/javascripts/discourse/views/edit-topic-auto-close.js.es6 b/app/assets/javascripts/discourse/views/edit-topic-auto-close.js.es6 deleted file mode 100644 index b5b5c33287..0000000000 --- a/app/assets/javascripts/discourse/views/edit-topic-auto-close.js.es6 +++ /dev/null @@ -1,6 +0,0 @@ -import ModalBodyView from "discourse/views/modal-body"; - -export default ModalBodyView.extend({ - templateName: 'modal/auto_close', - title: I18n.t('topic.auto_close_title') -}); diff --git a/app/assets/javascripts/discourse/views/feature-topic.js.es6 b/app/assets/javascripts/discourse/views/feature-topic.js.es6 deleted file mode 100644 index 2a106541e0..0000000000 --- a/app/assets/javascripts/discourse/views/feature-topic.js.es6 +++ /dev/null @@ -1,6 +0,0 @@ -import ModalBodyView from "discourse/views/modal-body"; - -export default ModalBodyView.extend({ - templateName: 'modal/feature-topic', - title: I18n.t('topic.feature_topic.title') -}); diff --git a/app/assets/javascripts/discourse/views/forgot-password.js.es6 b/app/assets/javascripts/discourse/views/forgot-password.js.es6 deleted file mode 100644 index 40f4094b0f..0000000000 --- a/app/assets/javascripts/discourse/views/forgot-password.js.es6 +++ /dev/null @@ -1,6 +0,0 @@ -import ModalBodyView from "discourse/views/modal-body"; - -export default ModalBodyView.extend({ - templateName: 'modal/forgot_password', - title: I18n.t('forgot_password.title'), -}); diff --git a/app/assets/javascripts/discourse/views/keyboard-shortcuts-help.js.es6 b/app/assets/javascripts/discourse/views/keyboard-shortcuts-help.js.es6 deleted file mode 100644 index eeb174f620..0000000000 --- a/app/assets/javascripts/discourse/views/keyboard-shortcuts-help.js.es6 +++ /dev/null @@ -1,6 +0,0 @@ -import ModalBodyView from "discourse/views/modal-body"; - -export default ModalBodyView.extend({ - templateName: 'modal/keyboard_shortcuts_help', - title: I18n.t('keyboard_shortcuts_help.title') -}); diff --git a/app/assets/javascripts/discourse/views/merge-topic.js.es6 b/app/assets/javascripts/discourse/views/merge-topic.js.es6 deleted file mode 100644 index bf31e00606..0000000000 --- a/app/assets/javascripts/discourse/views/merge-topic.js.es6 +++ /dev/null @@ -1,6 +0,0 @@ -import ModalBodyView from "discourse/views/modal-body"; - -export default ModalBodyView.extend({ - templateName: 'modal/merge_topic', - title: I18n.t('topic.merge_topic.title') -}); diff --git a/app/assets/javascripts/discourse/views/not-activated.js.es6 b/app/assets/javascripts/discourse/views/not-activated.js.es6 deleted file mode 100644 index 86e942fc3d..0000000000 --- a/app/assets/javascripts/discourse/views/not-activated.js.es6 +++ /dev/null @@ -1,6 +0,0 @@ -import ModalBodyView from "discourse/views/modal-body"; - -export default ModalBodyView.extend({ - templateName: 'modal/not_activated', - title: I18n.t('log_in') -}); diff --git a/app/assets/javascripts/discourse/views/topic-bulk-actions.js.es6 b/app/assets/javascripts/discourse/views/topic-bulk-actions.js.es6 deleted file mode 100644 index 8b8b693fb8..0000000000 --- a/app/assets/javascripts/discourse/views/topic-bulk-actions.js.es6 +++ /dev/null @@ -1,6 +0,0 @@ -import ModalBodyView from "discourse/views/modal-body"; - -export default ModalBodyView.extend({ - templateName: 'modal/topic-bulk-actions', - title: I18n.t('topics.bulk.actions') -}); diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml index 7ca4043164..6e2a443695 100644 --- a/config/locales/client.en.yml +++ b/config/locales/client.en.yml @@ -225,6 +225,12 @@ en: search: "Search for a Topic by name, url or id:" placeholder: "type the topic title here" + queue: + approval: + title: "Post Needs Approval" + description: "We've received your new post but it needs to be approved by a moderator before it will appear. Please be patient." + ok: "OK" + user_action: user_posted_topic: "{{user}} posted the topic" you_posted_topic: "You posted the topic" diff --git a/test/javascripts/acceptance/composer-test.js.es6 b/test/javascripts/acceptance/composer-test.js.es6 index 2456370e69..cb58860916 100644 --- a/test/javascripts/acceptance/composer-test.js.es6 +++ b/test/javascripts/acceptance/composer-test.js.es6 @@ -81,9 +81,31 @@ test("Create a Topic", () => { }); }); +test("Create an enqueued Topic", () => { + visit("/"); + click('#create-topic'); + fillIn('#reply-title', "Internationalization Localization"); + fillIn('#wmd-input', "enqueue this content please"); + click('#reply-control button.create'); + andThen(() => { + ok(visible('#discourse-modal'), 'it pops up a modal'); + equal(currentURL(), "/", "it doesn't change routes"); + }); + + click('.modal-footer button'); + andThen(() => { + ok(invisible('#discourse-modal'), 'the modal can be dismissed'); + }); +}); + + test("Create a Reply", () => { visit("/t/internationalization-localization/280"); + andThen(() => { + ok(!exists('article[data-post-id=12345]'), 'the post is not in the DOM'); + }); + click('#topic-footer-buttons .btn.create'); andThen(() => { ok(exists('#wmd-input'), 'the composer input is visible'); @@ -93,7 +115,32 @@ test("Create a Reply", () => { fillIn('#wmd-input', 'this is the content of my reply'); click('#reply-control button.create'); andThen(() => { - exists('#post_12345', 'it inserts the post into the document'); + equal(find('.cooked:last p').text(), 'this is the content of my reply'); + }); +}); + +test("Create an enqueued Reply", () => { + visit("/t/internationalization-localization/280"); + + click('#topic-footer-buttons .btn.create'); + andThen(() => { + ok(exists('#wmd-input'), 'the composer input is visible'); + ok(!exists('#reply-title'), 'there is no title since this is a reply'); + }); + + fillIn('#wmd-input', 'enqueue this content please'); + click('#reply-control button.create'); + andThen(() => { + ok(find('.cooked:last p').text() !== 'enqueue this content please', "it doesn't insert the post"); + }); + + andThen(() => { + ok(visible('#discourse-modal'), 'it pops up a modal'); + }); + + click('.modal-footer button'); + andThen(() => { + ok(invisible('#discourse-modal'), 'the modal can be dismissed'); }); }); @@ -118,3 +165,4 @@ test("Edit the first post", () => { ok(find('.topic-post:eq(0) .cooked').text().indexOf('This is the new text for the post') !== -1, 'it updates the post'); }); }); + diff --git a/test/javascripts/helpers/create-pretender.js.es6 b/test/javascripts/helpers/create-pretender.js.es6 index 85f45c6b6e..d07876fe22 100644 --- a/test/javascripts/helpers/create-pretender.js.es6 +++ b/test/javascripts/helpers/create-pretender.js.es6 @@ -88,6 +88,8 @@ export default function() { return [200, {"Content-Type": "text/html"}, "
not found
"]; }); + this.delete('/draft.json', success); + this.get('/draft.json', function() { return response({}); }); @@ -148,13 +150,17 @@ export default function() { if (data.title === "this title triggers an error") { return response(422, {errors: ['That title has already been taken']}); - } else { - return response(200, { - success: true, - action: 'create_post', - post: {id: 12345, topic_id: 280, topic_slug: 'internationalization-localization'} - }); } + + if (data.raw === "enqueue this content please") { + return response(200, { success: true, action: 'enqueued' }); + } + + return response(200, { + success: true, + action: 'create_post', + post: {id: 12345, topic_id: 280, topic_slug: 'internationalization-localization'} + }); }); this.get('/widgets/:widget_id', function(request) { From f1ede4256986c53075026f410586740ecaf2c4fa Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Fri, 10 Apr 2015 16:29:13 -0400 Subject: [PATCH 023/113] Add the posts that need to be reviewed to the hamburger --- .../javascripts/discourse/controllers/header.js.es6 | 1 + .../initializers/subscribe-user-notifications.js.es6 | 7 +++++-- .../javascripts/discourse/templates/site-map.hbs | 11 +++++++++++ app/models/queued_post.rb | 11 +++++++++++ app/serializers/current_user_serializer.rb | 11 ++++++++++- config/locales/client.en.yml | 2 ++ lib/new_post_manager.rb | 2 ++ spec/components/new_post_manager_spec.rb | 4 ++-- 8 files changed, 44 insertions(+), 5 deletions(-) diff --git a/app/assets/javascripts/discourse/controllers/header.js.es6 b/app/assets/javascripts/discourse/controllers/header.js.es6 index 74e2e133ce..c0c4cb17dd 100644 --- a/app/assets/javascripts/discourse/controllers/header.js.es6 +++ b/app/assets/javascripts/discourse/controllers/header.js.es6 @@ -99,6 +99,7 @@ HeaderController.reopenClass({ }); addFlagProperty('currentUser.site_flagged_posts_count'); +addFlagProperty('currentUser.post_queue_new_count'); export { addFlagProperty }; export default HeaderController; diff --git a/app/assets/javascripts/discourse/initializers/subscribe-user-notifications.js.es6 b/app/assets/javascripts/discourse/initializers/subscribe-user-notifications.js.es6 index 9689614dde..bb808e5c28 100644 --- a/app/assets/javascripts/discourse/initializers/subscribe-user-notifications.js.es6 +++ b/app/assets/javascripts/discourse/initializers/subscribe-user-notifications.js.es6 @@ -27,10 +27,13 @@ export default { bus.callbackInterval = siteSettings.polling_interval; bus.enableLongPolling = true; - if (user.admin || user.moderator) { - bus.subscribe('/flagged_counts', function(data) { + if (user.get('staff')) { + bus.subscribe('/flagged_counts', (data) => { user.set('site_flagged_posts_count', data.total); }); + bus.subscribe('/queue_counts', (data) => { + user.set('post_queue_new_count', data.post_queue_new_count); + }); } bus.subscribe("/notification/" + user.get('id'), (function(data) { const oldUnread = user.get('unread_notifications'); diff --git a/app/assets/javascripts/discourse/templates/site-map.hbs b/app/assets/javascripts/discourse/templates/site-map.hbs index c781c3a91d..0bbe1dd96d 100644 --- a/app/assets/javascripts/discourse/templates/site-map.hbs +++ b/app/assets/javascripts/discourse/templates/site-map.hbs @@ -26,6 +26,17 @@
  • {{#link-to 'users'}}{{i18n "directory.title"}}{{/link-to}}
    • {{/if}} + {{#if currentUser.staff}} +
  • + + {{i18n "queue.title"}} + {{#if currentUser.post_queue_new_count}} + {{currentUser.post_queue_new_count}} + {{/if}} + +
    • + {{/if}} + {{plugin-outlet "site-map-links"}} {{#if showKeyboardShortcuts}} diff --git a/app/models/queued_post.rb b/app/models/queued_post.rb index 2b1cdacaf2..03d5e352a6 100644 --- a/app/models/queued_post.rb +++ b/app/models/queued_post.rb @@ -26,6 +26,15 @@ class QueuedPost < ActiveRecord::Base @states ||= Enum.new(:new, :approved, :rejected) end + def self.new_count + where(state: states[:new]).count + end + + def self.publish_new! + msg = { post_queue_new_count: QueuedPost.new_count } + MessageBus.publish('/queue_counts', msg, user_ids: User.staff.pluck(:id)) + end + def reject!(rejected_by) change_to!(:rejected, rejected_by) end @@ -73,6 +82,8 @@ class QueuedPost < ActiveRecord::Base # Update the record in memory too, and clear the dirty flag updates.each {|k, v| send("#{k}=", v) } changes_applied + + QueuedPost.publish_new! end end diff --git a/app/serializers/current_user_serializer.rb b/app/serializers/current_user_serializer.rb index e8b3e717a2..7784d3545b 100644 --- a/app/serializers/current_user_serializer.rb +++ b/app/serializers/current_user_serializer.rb @@ -26,7 +26,8 @@ class CurrentUserSerializer < BasicUserSerializer :custom_fields, :muted_category_ids, :dismissed_banner_key, - :is_anonymous + :is_anonymous, + :post_queue_new_count def include_site_flagged_posts_count? object.staff? @@ -107,4 +108,12 @@ class CurrentUserSerializer < BasicUserSerializer object.anonymous? end + def post_queue_new_count + QueuedPost.new_count + end + + def include_post_queue_new_count? + object.staff? + end + end diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml index 6e2a443695..cbfa19f3a5 100644 --- a/config/locales/client.en.yml +++ b/config/locales/client.en.yml @@ -226,6 +226,8 @@ en: placeholder: "type the topic title here" queue: + title: "Needs Approval" + approval: title: "Post Needs Approval" description: "We've received your new post but it needs to be approved by a moderator before it will appear. Please be patient." diff --git a/lib/new_post_manager.rb b/lib/new_post_manager.rb index 323acaa7ed..f892dcbb6b 100644 --- a/lib/new_post_manager.rb +++ b/lib/new_post_manager.rb @@ -43,6 +43,8 @@ class NewPostManager enqueuer = PostEnqueuer.new(@user, queue) post = enqueuer.enqueue(@args) + QueuedPost.publish_new! if post && post.errors.empty? + result.check_errors_from(enqueuer) result end diff --git a/spec/components/new_post_manager_spec.rb b/spec/components/new_post_manager_spec.rb index 523d8652a0..78bc125060 100644 --- a/spec/components/new_post_manager_spec.rb +++ b/spec/components/new_post_manager_spec.rb @@ -52,7 +52,7 @@ describe NewPostManager do expect(result).to be_success expect(result.post).to be_blank expect(@counter).to be(1) - expect(QueuedPost.count).to be(0) + expect(QueuedPost.new_count).to be(0) end it "calls custom enqueuing handlers" do @@ -63,7 +63,7 @@ describe NewPostManager do expect(result.action).to eq(:enqueued) expect(result).to be_success expect(result.post).to be_blank - expect(QueuedPost.count).to be(1) + expect(QueuedPost.new_count).to be(1) expect(@counter).to be(0) end From 96d2c5069b74d5797c03669efca078ac7bd0bc04 Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Fri, 10 Apr 2015 17:00:50 -0400 Subject: [PATCH 024/113] Interface for reviewing queued posts --- .../discourse/controllers/queued-posts.js.es6 | 16 ++++++++++ .../discourse/helpers/cook-text.js.es6 | 6 ++++ .../discourse/routes/app-route-map.js.es6 | 2 ++ .../discourse/routes/queued-posts.js.es6 | 8 +++++ .../discourse/templates/queued-posts.hbs | 30 +++++++++++++++++++ .../discourse/templates/site-map.hbs | 4 +-- app/assets/stylesheets/desktop.scss | 1 + .../stylesheets/desktop/queued-posts.scss | 20 +++++++++++++ app/controllers/admin/admin_controller.rb | 7 ----- app/controllers/application_controller.rb | 4 +++ app/controllers/queued_posts_controller.rb | 20 +++++++++++++ app/models/queued_post.rb | 10 +++++-- app/serializers/queued_post_serializer.rb | 14 +++++++++ config/locales/client.en.yml | 3 ++ config/routes.rb | 3 ++ lib/new_post_manager.rb | 12 ++++++-- lib/new_post_result.rb | 1 + spec/components/new_post_manager_spec.rb | 8 +++-- .../queued_posts_controller_spec.rb | 28 +++++++++++++++++ .../acceptance/queued-posts-test.js.es6 | 29 ++++++++++++++++++ .../helpers/create-pretender.js.es6 | 10 +++++++ 21 files changed, 219 insertions(+), 17 deletions(-) create mode 100644 app/assets/javascripts/discourse/controllers/queued-posts.js.es6 create mode 100644 app/assets/javascripts/discourse/helpers/cook-text.js.es6 create mode 100644 app/assets/javascripts/discourse/routes/queued-posts.js.es6 create mode 100644 app/assets/javascripts/discourse/templates/queued-posts.hbs create mode 100644 app/assets/stylesheets/desktop/queued-posts.scss create mode 100644 app/controllers/queued_posts_controller.rb create mode 100644 app/serializers/queued_post_serializer.rb create mode 100644 spec/controllers/queued_posts_controller_spec.rb create mode 100644 test/javascripts/acceptance/queued-posts-test.js.es6 diff --git a/app/assets/javascripts/discourse/controllers/queued-posts.js.es6 b/app/assets/javascripts/discourse/controllers/queued-posts.js.es6 new file mode 100644 index 0000000000..a597c2cb40 --- /dev/null +++ b/app/assets/javascripts/discourse/controllers/queued-posts.js.es6 @@ -0,0 +1,16 @@ +export default Ember.Controller.extend({ + + actions: { + approve(post) { + post.update({ state: 'approved' }).then(() => { + this.get('model').removeObject(post); + }); + }, + + reject(post) { + post.update({ state: 'rejected' }).then(() => { + this.get('model').removeObject(post); + }); + } + } +}); diff --git a/app/assets/javascripts/discourse/helpers/cook-text.js.es6 b/app/assets/javascripts/discourse/helpers/cook-text.js.es6 new file mode 100644 index 0000000000..c7acadce1b --- /dev/null +++ b/app/assets/javascripts/discourse/helpers/cook-text.js.es6 @@ -0,0 +1,6 @@ +import registerUnbound from 'discourse/helpers/register-unbound'; + +registerUnbound('cook-text', function(text) { + return new Handlebars.SafeString(Discourse.Markdown.cook(text)); +}); + diff --git a/app/assets/javascripts/discourse/routes/app-route-map.js.es6 b/app/assets/javascripts/discourse/routes/app-route-map.js.es6 index b866d99a27..922183aebe 100644 --- a/app/assets/javascripts/discourse/routes/app-route-map.js.es6 +++ b/app/assets/javascripts/discourse/routes/app-route-map.js.es6 @@ -93,4 +93,6 @@ export default function() { this.resource('badges', function() { this.route('show', {path: '/:id/:slug'}); }); + + this.resource('queued-posts', { path: '/queued-posts' }); } diff --git a/app/assets/javascripts/discourse/routes/queued-posts.js.es6 b/app/assets/javascripts/discourse/routes/queued-posts.js.es6 new file mode 100644 index 0000000000..58b28dd8fa --- /dev/null +++ b/app/assets/javascripts/discourse/routes/queued-posts.js.es6 @@ -0,0 +1,8 @@ +import DiscourseRoute from 'discourse/routes/discourse'; + +export default DiscourseRoute.extend({ + model() { + return this.store.find('queuedPost', {status: 'new'}); + } +}); + diff --git a/app/assets/javascripts/discourse/templates/queued-posts.hbs b/app/assets/javascripts/discourse/templates/queued-posts.hbs new file mode 100644 index 0000000000..2119de912b --- /dev/null +++ b/app/assets/javascripts/discourse/templates/queued-posts.hbs @@ -0,0 +1,30 @@ +
    +
    + {{#each post in model}} +
    + {{#if post.title}} +

    {{post.title}}

    + {{/if}} +
    + {{avatar post.user imageSize="large"}} +
    +
    +
    + {{post.user.username}} +
    +
    + + {{{cook-text post.raw}}} + +
    + {{d-button action="approve" actionParam=post label="queue.approve" icon="check" class="btn-primary approve"}} + {{d-button action="reject" actionParam=post label="queue.reject" icon="times" class="btn-warning reject"}} +
    +
    +
    +
    + {{else}} +

    {{i18n "queue.none"}}

    + {{/each}} +
    +
    diff --git a/app/assets/javascripts/discourse/templates/site-map.hbs b/app/assets/javascripts/discourse/templates/site-map.hbs index 0bbe1dd96d..46e9080dfd 100644 --- a/app/assets/javascripts/discourse/templates/site-map.hbs +++ b/app/assets/javascripts/discourse/templates/site-map.hbs @@ -28,12 +28,12 @@ {{#if currentUser.staff}}
  • - + {{#link-to 'queued-posts'}} {{i18n "queue.title"}} {{#if currentUser.post_queue_new_count}} {{currentUser.post_queue_new_count}} {{/if}} - + {{/link-to}}
    • {{/if}} diff --git a/app/assets/stylesheets/desktop.scss b/app/assets/stylesheets/desktop.scss index abeab14927..426146d3be 100644 --- a/app/assets/stylesheets/desktop.scss +++ b/app/assets/stylesheets/desktop.scss @@ -16,6 +16,7 @@ @import "desktop/upload"; @import "desktop/user"; @import "desktop/history"; +@import "desktop/queued-posts"; /* These files doesn't actually exist, they are injected by DiscourseSassImporter. */ diff --git a/app/assets/stylesheets/desktop/queued-posts.scss b/app/assets/stylesheets/desktop/queued-posts.scss new file mode 100644 index 0000000000..50955c9970 --- /dev/null +++ b/app/assets/stylesheets/desktop/queued-posts.scss @@ -0,0 +1,20 @@ +.queued-posts { + .queued-post { + padding: 1em 0; + + .poster { + width: 70px; + float: left; + } + .cooked { + width: $topic-body-width; + float: left; + } + h4.title { + margin-bottom: 1em; + } + + border-bottom: 1px solid darken(scale-color-diff(), 10%); + } +} + diff --git a/app/controllers/admin/admin_controller.rb b/app/controllers/admin/admin_controller.rb index 77d12479cf..30785689e1 100644 --- a/app/controllers/admin/admin_controller.rb +++ b/app/controllers/admin/admin_controller.rb @@ -7,11 +7,4 @@ class Admin::AdminController < ApplicationController render nothing: true end - protected - - # this is not really necessary cause the routes are secure - def ensure_staff - raise Discourse::InvalidAccess.new unless current_user.staff? - end - end diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 3b76392c28..7ee38765d2 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -371,6 +371,10 @@ class ApplicationController < ActionController::Base raise Discourse::NotLoggedIn.new unless current_user.present? end + def ensure_staff + raise Discourse::InvalidAccess.new unless current_user && current_user.staff? + end + def redirect_to_login_if_required return if current_user || (request.format.json? && api_key_valid?) diff --git a/app/controllers/queued_posts_controller.rb b/app/controllers/queued_posts_controller.rb new file mode 100644 index 0000000000..e7dd20d79d --- /dev/null +++ b/app/controllers/queued_posts_controller.rb @@ -0,0 +1,20 @@ +require_dependency 'queued_post_serializer' + +class QueuedPostsController < ApplicationController + + before_filter :ensure_staff + + def index + state = QueuedPost.states[(params[:state] || 'new').to_sym] + state ||= QueuedPost.states[:new] + + @queued_posts = QueuedPost.where(state: state) + render_serialized(@queued_posts, QueuedPostSerializer, root: :queued_posts) + end + + def update + qp = QueuedPost.where(id: params[:id]).first + render_serialized(qp, QueuedPostSerializer, root: :queued_posts) + end + +end diff --git a/app/models/queued_post.rb b/app/models/queued_post.rb index 03d5e352a6..8dce4ffeef 100644 --- a/app/models/queued_post.rb +++ b/app/models/queued_post.rb @@ -30,7 +30,7 @@ class QueuedPost < ActiveRecord::Base where(state: states[:new]).count end - def self.publish_new! + def self.broadcast_new! msg = { post_queue_new_count: QueuedPost.new_count } MessageBus.publish('/queue_counts', msg, user_ids: User.staff.pluck(:id)) end @@ -60,10 +60,14 @@ class QueuedPost < ActiveRecord::Base created_post end + def self.all_attributes_for(queue) + [QueuedPost.attributes_by_queue[:base], QueuedPost.attributes_by_queue[queue.to_sym]].flatten.compact + end + private def post_attributes - [QueuedPost.attributes_by_queue[:base], QueuedPost.attributes_by_queue[queue.to_sym]].flatten.compact + QueuedPost.all_attributes_for(queue) end def change_to!(state, changed_by) @@ -83,7 +87,7 @@ class QueuedPost < ActiveRecord::Base updates.each {|k, v| send("#{k}=", v) } changes_applied - QueuedPost.publish_new! + QueuedPost.broadcast_new! end end diff --git a/app/serializers/queued_post_serializer.rb b/app/serializers/queued_post_serializer.rb new file mode 100644 index 0000000000..ed9b9a7003 --- /dev/null +++ b/app/serializers/queued_post_serializer.rb @@ -0,0 +1,14 @@ +class QueuedPostSerializer < ApplicationSerializer + attributes :id, + :queue, + :user_id, + :state, + :topic_id, + :approved_by_id, + :rejected_by_id, + :raw, + :post_options, + :created_at + + has_one :user, serializer: BasicUserSerializer, embed: :object +end diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml index cbfa19f3a5..d27df47321 100644 --- a/config/locales/client.en.yml +++ b/config/locales/client.en.yml @@ -226,7 +226,10 @@ en: placeholder: "type the topic title here" queue: + approve: 'Approve Post' + reject: 'Reject Post' title: "Needs Approval" + none: "There are no posts to review." approval: title: "Post Needs Approval" diff --git a/config/routes.rb b/config/routes.rb index 731838d2e7..17a9c307ff 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -454,6 +454,9 @@ Discourse::Application.routes.draw do get "/posts/:id/raw-email" => "posts#raw_email" get "raw/:topic_id(/:post_number)" => "posts#markdown_num" + resources :queued_posts, constraints: StaffConstraint.new + get 'queued-posts' => 'queued_posts#index' + resources :invites do collection do get "upload" => "invites#check_csv_chunk" diff --git a/lib/new_post_manager.rb b/lib/new_post_manager.rb index f892dcbb6b..d649cdf0af 100644 --- a/lib/new_post_manager.rb +++ b/lib/new_post_manager.rb @@ -21,7 +21,7 @@ class NewPostManager def initialize(user, args) @user = user - @args = args + @args = args.delete_if {|_, v| v.nil?} end def perform @@ -41,10 +41,16 @@ class NewPostManager def enqueue(queue) result = NewPostResult.new(:enqueued) enqueuer = PostEnqueuer.new(@user, queue) - post = enqueuer.enqueue(@args) - QueuedPost.publish_new! if post && post.errors.empty? + queued_args = {post_options: @args.dup} + queued_args[:raw] = queued_args[:post_options].delete(:raw) + queued_args[:topic_id] = queued_args[:post_options].delete(:topic_id) + post = enqueuer.enqueue(queued_args) + + QueuedPost.broadcast_new! if post && post.errors.empty? + + result.queued_post = post result.check_errors_from(enqueuer) result end diff --git a/lib/new_post_result.rb b/lib/new_post_result.rb index 1e8bdffb04..a14f0458a5 100644 --- a/lib/new_post_result.rb +++ b/lib/new_post_result.rb @@ -5,6 +5,7 @@ class NewPostResult attr_reader :action attr_accessor :post + attr_accessor :queued_post def initialize(action, success=false) @action = action diff --git a/spec/components/new_post_manager_spec.rb b/spec/components/new_post_manager_spec.rb index 78bc125060..48d81bd0f4 100644 --- a/spec/components/new_post_manager_spec.rb +++ b/spec/components/new_post_manager_spec.rb @@ -32,7 +32,7 @@ describe NewPostManager do result end - @queue_handler = -> (manager) { manager.args[:raw] =~ /queue me/ ? manager.enqueue('test') : nil } + @queue_handler = -> (manager) { manager.args[:raw] =~ /queue me/ ? manager.enqueue('new_topic') : nil } NewPostManager.add_handler(&@counter_handler) NewPostManager.add_handler(&@queue_handler) @@ -56,10 +56,14 @@ describe NewPostManager do end it "calls custom enqueuing handlers" do - manager = NewPostManager.new(topic.user, raw: 'to the handler I say enqueue me!', topic_id: topic.id) + manager = NewPostManager.new(topic.user, raw: 'to the handler I say enqueue me!', title: 'this is the title of the queued post') result = manager.perform + enqueued = result.queued_post + + expect(enqueued).to be_present + expect(enqueued.post_options['title']).to eq('this is the title of the queued post') expect(result.action).to eq(:enqueued) expect(result).to be_success expect(result.post).to be_blank diff --git a/spec/controllers/queued_posts_controller_spec.rb b/spec/controllers/queued_posts_controller_spec.rb new file mode 100644 index 0000000000..99cbd38344 --- /dev/null +++ b/spec/controllers/queued_posts_controller_spec.rb @@ -0,0 +1,28 @@ +require 'spec_helper' + +describe QueuedPostsController do + context 'without authentication' do + it 'fails' do + xhr :get, :index + expect(response).not_to be_success + end + end + + context 'as a regular user' do + let!(:user) { log_in(:user) } + it 'fails' do + xhr :get, :index + expect(response).not_to be_success + end + end + + context 'as an admin' do + let!(:user) { log_in(:moderator) } + + it 'returns the queued posts' do + xhr :get, :index + expect(response).to be_success + end + end +end + diff --git a/test/javascripts/acceptance/queued-posts-test.js.es6 b/test/javascripts/acceptance/queued-posts-test.js.es6 new file mode 100644 index 0000000000..33b301790f --- /dev/null +++ b/test/javascripts/acceptance/queued-posts-test.js.es6 @@ -0,0 +1,29 @@ +import { acceptance } from "helpers/qunit-helpers"; + +acceptance("Queued Posts", { loggedIn: true }); + +test("approve a post", () => { + visit("/queued-posts"); + + andThen(() => { + ok(exists('.queued-post'), 'it has posts listed'); + }); + + click('.queued-post:eq(0) button.approve'); + andThen(() => { + ok(!exists('.queued-post'), 'it removes the post'); + }); +}); + +test("reject a post", () => { + visit("/queued-posts"); + + andThen(() => { + ok(exists('.queued-post'), 'it has posts listed'); + }); + + click('.queued-post:eq(0) button.reject'); + andThen(() => { + ok(!exists('.queued-post'), 'it removes the post'); + }); +}); diff --git a/test/javascripts/helpers/create-pretender.js.es6 b/test/javascripts/helpers/create-pretender.js.es6 index d07876fe22..c71f168c46 100644 --- a/test/javascripts/helpers/create-pretender.js.es6 +++ b/test/javascripts/helpers/create-pretender.js.es6 @@ -94,6 +94,16 @@ export default function() { return response({}); }); + this.put('/queued_posts/:queued_post_id', function(request) { + return response({ queued_post: {id: request.params.queued_post_id } }); + }); + + this.get('/queued_posts', function() { + return response({ + queued_posts: [{id: 1}] + }); + }); + this.post('/session', function(request) { const data = parsePostData(request.requestBody); From 0c233e4e256426bee063b7512cc02a171f6edb7d Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Tue, 14 Apr 2015 14:21:02 -0400 Subject: [PATCH 025/113] Interface is wired up for Approving/Rejecting posts --- .../discourse/adapters/rest.js.es6 | 21 ++++++-- .../discourse/controllers/queued-posts.js.es6 | 24 ++++----- .../discourse/lib/ajax-error.js.es6 | 54 +++++++++++-------- .../javascripts/discourse/models/rest.js.es6 | 11 +++- .../javascripts/discourse/models/store.js.es6 | 37 +++++++++++-- .../discourse/routes/queued-posts.js.es6 | 1 - .../discourse/routes/topic-from-params.js.es6 | 3 ++ .../discourse/templates/queued-posts.hbs | 54 ++++++++++++------- .../stylesheets/desktop/queued-posts.scss | 6 ++- app/controllers/application_controller.rb | 1 + app/controllers/queued_posts_controller.rb | 12 ++++- app/serializers/queued_post_serializer.rb | 3 ++ config/locales/client.en.yml | 1 + .../queued_posts_controller_spec.rb | 31 +++++++++++ spec/fabricators/queued_post_fabricator.rb | 18 +++++++ spec/models/queued_post_spec.rb | 17 +----- test/javascripts/acceptance/topic-test.js.es6 | 2 +- .../helpers/create-pretender.js.es6 | 8 +++ .../javascripts/models/rest-model-test.js.es6 | 51 ++++++++++++++++-- test/javascripts/models/store-test.js.es6 | 8 +++ 20 files changed, 273 insertions(+), 90 deletions(-) create mode 100644 spec/fabricators/queued_post_fabricator.rb diff --git a/app/assets/javascripts/discourse/adapters/rest.js.es6 b/app/assets/javascripts/discourse/adapters/rest.js.es6 index bd56612354..ec25f2d134 100644 --- a/app/assets/javascripts/discourse/adapters/rest.js.es6 +++ b/app/assets/javascripts/discourse/adapters/rest.js.es6 @@ -6,6 +6,16 @@ export function Result(payload, responseJson) { this.target = null; } +const ajax = Discourse.ajax; + +// We use this to make sure 404s are caught +function rethrow(error) { + if (error.status === 404) { + throw "404: " + error.responseText; + } + throw(error); +} + export default Ember.Object.extend({ pathFor(store, type, findArgs) { let path = "/" + Ember.String.underscore(store.pluralize(type)); @@ -31,17 +41,18 @@ export default Ember.Object.extend({ }, findAll(store, type) { - return Discourse.ajax(this.pathFor(store, type)); + return ajax(this.pathFor(store, type)).catch(rethrow); }, + find(store, type, findArgs) { - return Discourse.ajax(this.pathFor(store, type, findArgs)); + return ajax(this.pathFor(store, type, findArgs)).catch(rethrow); }, update(store, type, id, attrs) { const data = {}; data[Ember.String.underscore(type)] = attrs; - return Discourse.ajax(this.pathFor(store, type, id), { method: 'PUT', data }).then(function(json) { + return ajax(this.pathFor(store, type, id), { method: 'PUT', data }).then(function(json) { return new Result(json[type], json); }); }, @@ -50,13 +61,13 @@ export default Ember.Object.extend({ const data = {}; const typeField = Ember.String.underscore(type); data[typeField] = attrs; - return Discourse.ajax(this.pathFor(store, type), { method: 'POST', data }).then(function (json) { + return ajax(this.pathFor(store, type), { method: 'POST', data }).then(function (json) { return new Result(json[typeField], json); }); }, destroyRecord(store, type, record) { - return Discourse.ajax(this.pathFor(store, type, record.get('id')), { method: 'DELETE' }); + return ajax(this.pathFor(store, type, record.get('id')), { method: 'DELETE' }); } }); diff --git a/app/assets/javascripts/discourse/controllers/queued-posts.js.es6 b/app/assets/javascripts/discourse/controllers/queued-posts.js.es6 index a597c2cb40..90939e3b71 100644 --- a/app/assets/javascripts/discourse/controllers/queued-posts.js.es6 +++ b/app/assets/javascripts/discourse/controllers/queued-posts.js.es6 @@ -1,16 +1,16 @@ +import { popupAjaxError } from 'discourse/lib/ajax-error'; + +function updateState(state) { + return function(post) { + post.update({ state }).then(() => { + this.get('model').removeObject(post); + }).catch(popupAjaxError); + }; +} + export default Ember.Controller.extend({ - actions: { - approve(post) { - post.update({ state: 'approved' }).then(() => { - this.get('model').removeObject(post); - }); - }, - - reject(post) { - post.update({ state: 'rejected' }).then(() => { - this.get('model').removeObject(post); - }); - } + approve: updateState('approved'), + reject: updateState('rejected') } }); diff --git a/app/assets/javascripts/discourse/lib/ajax-error.js.es6 b/app/assets/javascripts/discourse/lib/ajax-error.js.es6 index 0117c94a5b..f1a34add67 100644 --- a/app/assets/javascripts/discourse/lib/ajax-error.js.es6 +++ b/app/assets/javascripts/discourse/lib/ajax-error.js.es6 @@ -1,30 +1,38 @@ +function extractError(error) { + if (error instanceof Error) { + Ember.Logger.error(error.stack); + } + + if (typeof error === "string") { + Ember.Logger.error(error); + } + + let parsedError; + if (error.responseText) { + try { + const parsedJSON = $.parseJSON(error.responseText); + if (parsedJSON.errors) { + parsedError = parsedJSON.errors[0]; + } else if (parsedJSON.failed) { + parsedError = parsedJSON.message; + } + } catch(ex) { + // in case the JSON doesn't parse + Ember.Logger.error(ex.stack); + } + } + return parsedError || I18n.t('generic_error'); +} + export function throwAjaxError(undoCallback) { return function(error) { - if (error instanceof Error) { - Ember.Logger.error(error.stack); - } - - if (typeof error === "string") { - Ember.Logger.error(error); - } - // If we provided an `undo` callback if (undoCallback) { undoCallback(error); } - let parsedError; - if (error.responseText) { - try { - const parsedJSON = $.parseJSON(error.responseText); - if (parsedJSON.errors) { - parsedError = parsedJSON.errors[0]; - } else if (parsedJSON.failed) { - parsedError = parsedJSON.message; - } - } catch(ex) { - // in case the JSON doesn't parse - Ember.Logger.error(ex.stack); - } - } - throw parsedError || I18n.t('generic_error'); + throw extractError(error); }; } + +export function popupAjaxError(err) { + bootbox.alert(extractError(err)); +} diff --git a/app/assets/javascripts/discourse/models/rest.js.es6 b/app/assets/javascripts/discourse/models/rest.js.es6 index a35da6edf4..8bb5d0250f 100644 --- a/app/assets/javascripts/discourse/models/rest.js.es6 +++ b/app/assets/javascripts/discourse/models/rest.js.es6 @@ -3,24 +3,30 @@ import Presence from 'discourse/mixins/presence'; const RestModel = Ember.Object.extend(Presence, { isNew: Ember.computed.equal('__state', 'new'), isCreated: Ember.computed.equal('__state', 'created'), + isSaving: false, afterUpdate: Ember.K, update(props) { + if (this.get('isSaving')) { return Ember.RSVP.reject(); } + props = props || this.updateProperties(); const type = this.get('__type'), store = this.get('store'); const self = this; + self.set('isSaving', true); return store.update(type, this.get('id'), props).then(function(res) { self.setProperties(self.__munge(res.payload || res.responseJson)); self.afterUpdate(res); return res; - }); + }).finally(() => this.set('isSaving', false)); }, _saveNew(props) { + if (this.get('isSaving')) { return Ember.RSVP.reject(); } + props = props || this.createProperties(); const type = this.get('__type'), @@ -28,6 +34,7 @@ const RestModel = Ember.Object.extend(Presence, { adapter = store.adapterFor(type); const self = this; + self.set('isSaving', true); return adapter.createRecord(store, type, props).then(function(res) { if (!res) { throw "Received no data back from createRecord"; } @@ -40,7 +47,7 @@ const RestModel = Ember.Object.extend(Presence, { res.target = self; return res; - }); + }).finally(() => this.set('isSaving', false)); }, createProperties() { diff --git a/app/assets/javascripts/discourse/models/store.js.es6 b/app/assets/javascripts/discourse/models/store.js.es6 index e54eaee4a2..61ce9f581c 100644 --- a/app/assets/javascripts/discourse/models/store.js.es6 +++ b/app/assets/javascripts/discourse/models/store.js.es6 @@ -36,7 +36,7 @@ export default Ember.Object.extend({ if (typeof findArgs === "object") { return self._resultSet(type, result); } else { - return self._hydrate(type, result[Ember.String.underscore(type)]); + return self._hydrate(type, result[Ember.String.underscore(type)], result); } }); }, @@ -48,7 +48,7 @@ export default Ember.Object.extend({ const typeName = Ember.String.underscore(self.pluralize(type)), totalRows = result["total_rows_" + typeName] || result.get('totalRows'), loadMoreUrl = result["load_more_" + typeName], - content = result[typeName].map(obj => self._hydrate(type, obj)); + content = result[typeName].map(obj => self._hydrate(type, obj, result)); resultSet.setProperties({ totalRows, loadMoreUrl }); resultSet.get('content').pushObjects(content); @@ -86,7 +86,7 @@ export default Ember.Object.extend({ _resultSet(type, result) { const typeName = Ember.String.underscore(this.pluralize(type)), - content = result[typeName].map(obj => this._hydrate(type, obj)), + content = result[typeName].map(obj => this._hydrate(type, obj, result)), totalRows = result["total_rows_" + typeName] || content.length, loadMoreUrl = result["load_more_" + typeName]; @@ -111,10 +111,39 @@ export default Ember.Object.extend({ return this.container.lookup('adapter:' + type) || this.container.lookup('adapter:rest'); }, - _hydrate(type, obj) { + _hydrateEmbedded(obj, root) { + const self = this; + Object.keys(obj).forEach(function(k) { + const m = /(.+)\_id$/.exec(k); + if (m) { + const subType = m[1]; + const collection = root[self.pluralize(subType)]; + if (collection) { + const found = collection.findProperty('id', obj[k]); + if (found) { + const hydrated = self._hydrate(subType, found, root); + if (hydrated) { + obj[subType] = hydrated; + delete obj[k]; + } + } + } + } + }); + }, + + _hydrate(type, obj, root) { if (!obj) { throw "Can't hydrate " + type + " of `null`"; } if (!obj.id) { throw "Can't hydrate " + type + " without an `id`"; } + root = root || obj; + + // Experimental: If serialized with a certain option we'll wire up embedded objects + // automatically. + if (root.__rest_serializer === "1") { + this._hydrateEmbedded(obj, root); + } + _identityMap[type] = _identityMap[type] || {}; const existing = _identityMap[type][obj.id]; diff --git a/app/assets/javascripts/discourse/routes/queued-posts.js.es6 b/app/assets/javascripts/discourse/routes/queued-posts.js.es6 index 58b28dd8fa..700b9871a5 100644 --- a/app/assets/javascripts/discourse/routes/queued-posts.js.es6 +++ b/app/assets/javascripts/discourse/routes/queued-posts.js.es6 @@ -5,4 +5,3 @@ export default DiscourseRoute.extend({ return this.store.find('queuedPost', {status: 'new'}); } }); - diff --git a/app/assets/javascripts/discourse/routes/topic-from-params.js.es6 b/app/assets/javascripts/discourse/routes/topic-from-params.js.es6 index 9c414daac0..62dd9e5dbf 100644 --- a/app/assets/javascripts/discourse/routes/topic-from-params.js.es6 +++ b/app/assets/javascripts/discourse/routes/topic-from-params.js.es6 @@ -1,6 +1,9 @@ // This route is used for retrieving a topic based on params export default Discourse.Route.extend({ + // Avoid default model hook + model: function() { return; }, + setupController: function(controller, params) { params = params || {}; params.track_visit = true; diff --git a/app/assets/javascripts/discourse/templates/queued-posts.hbs b/app/assets/javascripts/discourse/templates/queued-posts.hbs index 2119de912b..e2d096514c 100644 --- a/app/assets/javascripts/discourse/templates/queued-posts.hbs +++ b/app/assets/javascripts/discourse/templates/queued-posts.hbs @@ -1,28 +1,44 @@
    {{#each post in model}} -
    - {{#if post.title}} -

    {{post.title}}

    - {{/if}} -
    - {{avatar post.user imageSize="large"}} -
    -
    -
    - {{post.user.username}} +
    +
    + {{avatar post.user imageSize="large"}} +
    +
    +
    + {{post.user.username}} +
    +
    + + + {{i18n "queue.topic"}} + {{#if post.topic}} + {{topic-link post.topic}} + {{else}} + {{post.post_options.title}} + {{/if}} + + + {{{cook-text post.raw}}} + +
    + {{d-button action="approve" + actionParam=post + disabled=post.isSaving + label="queue.approve" + icon="check" + class="btn-primary approve"}} + {{d-button action="reject" + actionParam=post + disabled=post.isSaving + label="queue.reject" + icon="times" + class="btn-warning reject"}} +
    - - {{{cook-text post.raw}}} - -
    - {{d-button action="approve" actionParam=post label="queue.approve" icon="check" class="btn-primary approve"}} - {{d-button action="reject" actionParam=post label="queue.reject" icon="times" class="btn-warning reject"}} -
    -
    -
    {{else}}

    {{i18n "queue.none"}}

    {{/each}} diff --git a/app/assets/stylesheets/desktop/queued-posts.scss b/app/assets/stylesheets/desktop/queued-posts.scss index 50955c9970..49cdb433de 100644 --- a/app/assets/stylesheets/desktop/queued-posts.scss +++ b/app/assets/stylesheets/desktop/queued-posts.scss @@ -10,8 +10,10 @@ width: $topic-body-width; float: left; } - h4.title { - margin-bottom: 1em; + + .post-title { + color: darken(scale-color-diff(), 50%); + font-weight: bold; } border-bottom: 1px solid darken(scale-color-diff(), 10%); diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 7ee38765d2..146fe5771b 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -219,6 +219,7 @@ class ApplicationController < ActionController::Base def render_json_dump(obj, opts=nil) opts ||= {} + obj['__rest_serializer'] = "1" if opts[:rest_serializer] render json: MultiJson.dump(obj), status: opts[:status] || 200 end diff --git a/app/controllers/queued_posts_controller.rb b/app/controllers/queued_posts_controller.rb index e7dd20d79d..8ee84538eb 100644 --- a/app/controllers/queued_posts_controller.rb +++ b/app/controllers/queued_posts_controller.rb @@ -8,12 +8,20 @@ class QueuedPostsController < ApplicationController state = QueuedPost.states[(params[:state] || 'new').to_sym] state ||= QueuedPost.states[:new] - @queued_posts = QueuedPost.where(state: state) - render_serialized(@queued_posts, QueuedPostSerializer, root: :queued_posts) + @queued_posts = QueuedPost.where(state: state).includes(:topic, :user) + render_serialized(@queued_posts, QueuedPostSerializer, root: :queued_posts, rest_serializer: true) end def update qp = QueuedPost.where(id: params[:id]).first + + state = params[:queued_post][:state] + if state == 'approved' + qp.approve!(current_user) + elsif state == 'rejected' + qp.reject!(current_user) + end + render_serialized(qp, QueuedPostSerializer, root: :queued_posts) end diff --git a/app/serializers/queued_post_serializer.rb b/app/serializers/queued_post_serializer.rb index ed9b9a7003..8e2637bce7 100644 --- a/app/serializers/queued_post_serializer.rb +++ b/app/serializers/queued_post_serializer.rb @@ -1,4 +1,5 @@ class QueuedPostSerializer < ApplicationSerializer + attributes :id, :queue, :user_id, @@ -11,4 +12,6 @@ class QueuedPostSerializer < ApplicationSerializer :created_at has_one :user, serializer: BasicUserSerializer, embed: :object + has_one :topic, serializer: BasicTopicSerializer + end diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml index d27df47321..f6a1d4e878 100644 --- a/config/locales/client.en.yml +++ b/config/locales/client.en.yml @@ -226,6 +226,7 @@ en: placeholder: "type the topic title here" queue: + topic: "Topic:" approve: 'Approve Post' reject: 'Reject Post' title: "Needs Approval" diff --git a/spec/controllers/queued_posts_controller_spec.rb b/spec/controllers/queued_posts_controller_spec.rb index 99cbd38344..1e4210797a 100644 --- a/spec/controllers/queued_posts_controller_spec.rb +++ b/spec/controllers/queued_posts_controller_spec.rb @@ -1,4 +1,6 @@ require 'spec_helper' +require_dependency 'queued_posts_controller' +require_dependency 'queued_post' describe QueuedPostsController do context 'without authentication' do @@ -24,5 +26,34 @@ describe QueuedPostsController do expect(response).to be_success end end + + + context 'update' do + let!(:user) { log_in(:moderator) } + let(:qp) { Fabricate(:queued_post) } + + context 'approved' do + it 'updates the post to approved' do + + xhr :put, :update, id: qp.id, queued_post: { state: 'approved' } + expect(response).to be_success + + qp.reload + expect(qp.state).to eq(QueuedPost.states[:approved]) + end + end + + context 'rejected' do + it 'updates the post to approved' do + + xhr :put, :update, id: qp.id, queued_post: { state: 'rejected' } + expect(response).to be_success + + qp.reload + expect(qp.state).to eq(QueuedPost.states[:rejected]) + end + end + + end end diff --git a/spec/fabricators/queued_post_fabricator.rb b/spec/fabricators/queued_post_fabricator.rb new file mode 100644 index 0000000000..45cae4006e --- /dev/null +++ b/spec/fabricators/queued_post_fabricator.rb @@ -0,0 +1,18 @@ +Fabricator(:queued_post) do + queue 'new_post' + state QueuedPost.states[:new] + user + topic + raw 'This post should be queued up' + post_options do + { reply_to_post_number: 1, + via_email: true, + raw_email: 'store_me', + auto_track: true, + custom_fields: { hello: 'world' }, + cooking_options: { cat: 'hat' }, + cook_method: Post.cook_methods[:raw_html], + image_sizes: {"http://foo.bar/image.png" => {"width" => 0, "height" => 222}} } + end +end + diff --git a/spec/models/queued_post_spec.rb b/spec/models/queued_post_spec.rb index 521819fef5..976c3faf16 100644 --- a/spec/models/queued_post_spec.rb +++ b/spec/models/queued_post_spec.rb @@ -7,22 +7,7 @@ describe QueuedPost do let(:topic) { Fabricate(:topic) } let(:user) { Fabricate(:user) } let(:admin) { Fabricate(:admin) } - let(:qp) { QueuedPost.create(queue: 'new_post', - state: QueuedPost.states[:new], - user_id: user.id, - topic_id: topic.id, - raw: 'This post should be queued up', - post_options: { - reply_to_post_number: 1, - via_email: true, - raw_email: 'store_me', - auto_track: true, - custom_fields: { hello: 'world' }, - cooking_options: { cat: 'hat' }, - cook_method: Post.cook_methods[:raw_html], - not_create_option: true, - image_sizes: {"http://foo.bar/image.png" => {"width" => 0, "height" => 222}} - }) } + let(:qp) { Fabricate(:queued_post, topic: topic, user: user) } it "returns the appropriate options for posting" do create_options = qp.create_options diff --git a/test/javascripts/acceptance/topic-test.js.es6 b/test/javascripts/acceptance/topic-test.js.es6 index 53bf0c3391..6d4aa67fc5 100644 --- a/test/javascripts/acceptance/topic-test.js.es6 +++ b/test/javascripts/acceptance/topic-test.js.es6 @@ -2,7 +2,7 @@ import { acceptance } from "helpers/qunit-helpers"; acceptance("View Topic"); test("Enter a Topic", () => { - visit("/t/internationalization-localization/280"); + visit("/t/internationalization-localization/280/1"); andThen(() => { ok(exists("#topic"), "The topic was rendered"); ok(exists("#topic .post-cloak"), "The topic has cloaked posts"); diff --git a/test/javascripts/helpers/create-pretender.js.es6 b/test/javascripts/helpers/create-pretender.js.es6 index c71f168c46..1a4de17aa0 100644 --- a/test/javascripts/helpers/create-pretender.js.es6 +++ b/test/javascripts/helpers/create-pretender.js.es6 @@ -173,6 +173,14 @@ export default function() { }); }); + this.get('/fruits/:id', function() { + return response({ + __rest_serializer: "1", + fruit: {id: 1, name: 'apple', farmer_id: 1}, + farmers: [{id: 1, name: 'Evil Trout'}] + }); + }); + this.get('/widgets/:widget_id', function(request) { const w = _widgets.findBy('id', parseInt(request.params.widget_id)); if (w) { diff --git a/test/javascripts/models/rest-model-test.js.es6 b/test/javascripts/models/rest-model-test.js.es6 index 9aa63c4c30..182532b139 100644 --- a/test/javascripts/models/rest-model-test.js.es6 +++ b/test/javascripts/models/rest-model-test.js.es6 @@ -19,23 +19,51 @@ test('munging', function() { test('update', function() { const store = createStore(); - store.find('widget', 123).then(function(widget) { equal(widget.get('name'), 'Trout Lure'); - widget.update({ name: 'new name' }).then(function() { + + ok(!widget.get('isSaving')); + const promise = widget.update({ name: 'new name' }); + ok(widget.get('isSaving')); + promise.then(function() { + ok(!widget.get('isSaving')); equal(widget.get('name'), 'new name'); }); }); }); +test('updating simultaneously', function() { + expect(2); + + const store = createStore(); + store.find('widget', 123).then(function(widget) { + + const firstPromise = widget.update({ name: 'new name' }); + const secondPromise = widget.update({ name: 'new name' }); + firstPromise.then(function() { + ok(true, 'the first promise succeeeds'); + }); + + secondPromise.catch(function() { + ok(true, 'the second promise fails'); + }); + + }); +}); + test('save new', function() { const store = createStore(); const widget = store.createRecord('widget'); ok(widget.get('isNew'), 'it is a new record'); ok(!widget.get('isCreated'), 'it is not created'); + ok(!widget.get('isSaving')); - widget.save({ name: 'Evil Widget' }).then(function() { + const promise = widget.save({ name: 'Evil Widget' }); + ok(widget.get('isSaving')); + + promise.then(function() { + ok(!widget.get('isSaving')); ok(widget.get('id'), 'it has an id'); ok(widget.get('name'), 'Evil Widget'); ok(widget.get('isCreated'), 'it is created'); @@ -43,6 +71,23 @@ test('save new', function() { }); }); +test('creating simultaneously', function() { + expect(2); + + const store = createStore(); + const widget = store.createRecord('widget'); + + const firstPromise = widget.save({ name: 'Evil Widget' }); + const secondPromise = widget.save({ name: 'Evil Widget' }); + firstPromise.then(function() { + ok(true, 'the first promise succeeeds'); + }); + + secondPromise.catch(function() { + ok(true, 'the second promise fails'); + }); +}); + test('destroyRecord', function() { const store = createStore(); store.find('widget', 123).then(function(widget) { diff --git a/test/javascripts/models/store-test.js.es6 b/test/javascripts/models/store-test.js.es6 index 9b3893cf43..13e2e8d004 100644 --- a/test/javascripts/models/store-test.js.es6 +++ b/test/javascripts/models/store-test.js.es6 @@ -88,3 +88,11 @@ test('destroyRecord', function() { }); }); }); + +test('find embedded', function() { + const store = createStore(); + store.find('fruit', 1).then(function(f) { + ok(f.get('farmer'), 'it has the embedded object'); + }); +}); + From af1571a58f9eed4bc14606fa180f5b9ecaf44cb4 Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Wed, 15 Apr 2015 12:12:20 -0400 Subject: [PATCH 026/113] Site Settings for post approval --- config/locales/server.en.yml | 3 ++ config/site_settings.yml | 5 ++++ lib/new_post_manager.rb | 9 ++++++ spec/components/new_post_manager_spec.rb | 36 ++++++++++++++++++++++++ 4 files changed, 53 insertions(+) diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml index f7d1fd83ac..5e36a93170 100644 --- a/config/locales/server.en.yml +++ b/config/locales/server.en.yml @@ -1139,6 +1139,9 @@ en: emoji_set: "How would you like your emoji?" enforce_square_emoji: "Force a square aspect ratio to all emojis." + approve_post_count: "The amount of posts from a new user that must be approved" + approve_unless_trust_level: "Posts for users below this trust level must be approved" + errors: invalid_email: "Invalid email address." invalid_username: "There's no user with that username." diff --git a/config/site_settings.yml b/config/site_settings.yml index f7ccfda3ce..aae5ac2b39 100644 --- a/config/site_settings.yml +++ b/config/site_settings.yml @@ -441,6 +441,11 @@ posting: enum: 'EmojiSetSiteSetting' enforce_square_emoji: default: true + approve_post_count: + default: 0 + approve_unless_trust_level: + default: 0 + enum: 'TrustLevelSetting' email: email_time_window_mins: diff --git a/lib/new_post_manager.rb b/lib/new_post_manager.rb index d649cdf0af..fdc7ea071f 100644 --- a/lib/new_post_manager.rb +++ b/lib/new_post_manager.rb @@ -19,6 +19,15 @@ class NewPostManager handlers << block end + def self.default_handler(manager) + if (manager.user.post_count < SiteSetting.approve_post_count) || + (manager.user.trust_level < SiteSetting.approve_unless_trust_level) + return manager.enqueue('default') + end + end + + add_handler {|manager| default_handler(manager) } + def initialize(user, args) @user = user @args = args.delete_if {|_, v| v.nil?} diff --git a/spec/components/new_post_manager_spec.rb b/spec/components/new_post_manager_spec.rb index 48d81bd0f4..6b692f03a1 100644 --- a/spec/components/new_post_manager_spec.rb +++ b/spec/components/new_post_manager_spec.rb @@ -17,6 +17,42 @@ describe NewPostManager do end end + context "default handler" do + let(:manager) { NewPostManager.new(topic.user, raw: 'this is new post content', topic_id: topic.id) } + + context 'with the settings zeroed out' do + before do + SiteSetting.approve_post_count = 0 + SiteSetting.approve_unless_trust_level = 0 + end + + it "doesn't return a result action" do + result = NewPostManager.default_handler(manager) + expect(result).to eq(nil) + end + end + + context 'with a high approval post count' do + before do + SiteSetting.approve_post_count = 100 + end + it "will return an enqueue result" do + result = NewPostManager.default_handler(manager) + expect(result.action).to eq(:enqueued) + end + end + + context 'with a high trust level setting' do + before do + SiteSetting.approve_unless_trust_level = 4 + end + it "will return an enqueue result" do + result = NewPostManager.default_handler(manager) + expect(result.action).to eq(:enqueued) + end + end + end + context "extensibility" do before do From 9ffec2807666f381d431d1a83ae39305cbc64769 Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Wed, 15 Apr 2015 14:32:10 -0400 Subject: [PATCH 027/113] Allow posts in any queue to support topic/post attributes --- app/models/queued_post.rb | 26 +--------------------- spec/fabricators/queued_post_fabricator.rb | 2 +- spec/models/queued_post_spec.rb | 2 +- 3 files changed, 3 insertions(+), 27 deletions(-) diff --git a/app/models/queued_post.rb b/app/models/queued_post.rb index 8dce4ffeef..9778c4f3e1 100644 --- a/app/models/queued_post.rb +++ b/app/models/queued_post.rb @@ -7,21 +7,6 @@ class QueuedPost < ActiveRecord::Base belongs_to :approved_by, class_name: "User" belongs_to :rejected_by, class_name: "User" - def self.attributes_by_queue - @attributes_by_queue ||= { - base: [:archetype, - :via_email, - :raw_email, - :auto_track, - :custom_fields, - :cooking_options, - :cook_method, - :image_sizes], - new_post: [:reply_to_post_number], - new_topic: [:title, :category, :meta_data, :archetype], - } - end - def self.states @states ||= Enum.new(:new, :approved, :rejected) end @@ -41,10 +26,9 @@ class QueuedPost < ActiveRecord::Base def create_options opts = {raw: raw} - post_attributes.each {|a| opts[a] = post_options[a.to_s] } + opts.merge!(post_options.symbolize_keys) opts[:cooking_options].symbolize_keys! if opts[:cooking_options] - opts[:topic_id] = topic_id if topic_id opts end @@ -60,16 +44,8 @@ class QueuedPost < ActiveRecord::Base created_post end - def self.all_attributes_for(queue) - [QueuedPost.attributes_by_queue[:base], QueuedPost.attributes_by_queue[queue.to_sym]].flatten.compact - end - private - def post_attributes - QueuedPost.all_attributes_for(queue) - end - def change_to!(state, changed_by) state_val = QueuedPost.states[state] diff --git a/spec/fabricators/queued_post_fabricator.rb b/spec/fabricators/queued_post_fabricator.rb index 45cae4006e..e838ef0ada 100644 --- a/spec/fabricators/queued_post_fabricator.rb +++ b/spec/fabricators/queued_post_fabricator.rb @@ -1,5 +1,5 @@ Fabricator(:queued_post) do - queue 'new_post' + queue 'test' state QueuedPost.states[:new] user topic diff --git a/spec/models/queued_post_spec.rb b/spec/models/queued_post_spec.rb index 976c3faf16..cd8d169d87 100644 --- a/spec/models/queued_post_spec.rb +++ b/spec/models/queued_post_spec.rb @@ -63,7 +63,7 @@ describe QueuedPost do context "with a valid topic" do let!(:category) { Fabricate(:category) } - let(:qp) { QueuedPost.create(queue: 'new_topic', + let(:qp) { QueuedPost.create(queue: 'eviltrout', state: QueuedPost.states[:new], user_id: user.id, raw: 'This post should be queued up', From d491d4f997e00454ef7f9d7b56ce9fbe4099125e Mon Sep 17 00:00:00 2001 From: Arpit Jalan Date: Mon, 13 Apr 2015 20:33:13 +0530 Subject: [PATCH 028/113] FEATURE: invite existing users to private topic --- .../discourse/components/user-selector.js.es6 | 6 ++- .../discourse/controllers/invite.js.es6 | 37 +++++++++++++------ .../discourse/lib/user-search.js.es6 | 8 ++-- .../discourse/templates/modal/invite.hbs | 6 ++- app/controllers/users_controller.rb | 3 +- app/models/user_search.rb | 13 +++++++ config/locales/client.en.yml | 1 + lib/guardian.rb | 2 - spec/controllers/users_controller_spec.rb | 19 ++++++++++ 9 files changed, 74 insertions(+), 21 deletions(-) diff --git a/app/assets/javascripts/discourse/components/user-selector.js.es6 b/app/assets/javascripts/discourse/components/user-selector.js.es6 index d0d210a689..d3bed034e2 100644 --- a/app/assets/javascripts/discourse/components/user-selector.js.es6 +++ b/app/assets/javascripts/discourse/components/user-selector.js.es6 @@ -7,7 +7,8 @@ export default TextField.extend({ var self = this, selected = [], currentUser = this.currentUser, - includeGroups = this.get('includeGroups') === 'true'; + includeGroups = this.get('includeGroups') === 'true', + allowedUsers = this.get('allowedUsers') === 'true'; function excludedUsernames() { if (currentUser && self.get('excludeCurrentUser')) { @@ -27,7 +28,8 @@ export default TextField.extend({ term: term.replace(/[^a-zA-Z0-9_]/, ''), topicId: self.get('topicId'), exclude: excludedUsernames(), - includeGroups: includeGroups + includeGroups, + allowedUsers }); }, diff --git a/app/assets/javascripts/discourse/controllers/invite.js.es6 b/app/assets/javascripts/discourse/controllers/invite.js.es6 index 0dcf67c695..2201c3eb57 100644 --- a/app/assets/javascripts/discourse/controllers/invite.js.es6 +++ b/app/assets/javascripts/discourse/controllers/invite.js.es6 @@ -15,11 +15,15 @@ export default ObjectController.extend(ModalFunctionality, { disabled: function() { if (this.get('saving')) return true; if (this.blank('emailOrUsername')) return true; + // when inviting to forum, email must be valid if (!this.get('invitingToTopic') && !Discourse.Utilities.emailValid(this.get('emailOrUsername'))) return true; + // normal users (not admin) can't invite users to private topic via email + if (!this.get('isAdmin') && this.get('isPrivateTopic') && Discourse.Utilities.emailValid(this.get('emailOrUsername'))) return true; + // when invting to private topic via email, group name must be specified + if (this.get('isPrivateTopic') && this.blank('groupNames') && Discourse.Utilities.emailValid(this.get('emailOrUsername'))) return true; if (this.get('model.details.can_invite_to')) return false; - if (this.get('isPrivateTopic') && this.blank('groupNames')) return true; return false; - }.property('emailOrUsername', 'invitingToTopic', 'isPrivateTopic', 'groupNames', 'saving'), + }.property('isAdmin', 'emailOrUsername', 'invitingToTopic', 'isPrivateTopic', 'groupNames', 'saving'), buttonTitle: function() { return this.get('saving') ? I18n.t('topic.inviting') : I18n.t('topic.invite_reply.action'); @@ -31,20 +35,23 @@ export default ObjectController.extend(ModalFunctionality, { return this.get('model') !== Discourse.User.current(); }.property('model'), + topicId: Ember.computed.alias('model.id'), + // Is Private Topic? (i.e. visible only to specific group members) isPrivateTopic: Em.computed.and('invitingToTopic', 'model.category.read_restricted'), + // Is Private Message? isMessage: Em.computed.equal('model.archetype', 'private_message'), // Allow Existing Members? (username autocomplete) allowExistingMembers: function() { - return this.get('invitingToTopic') && !this.get('isPrivateTopic'); - }.property('invitingToTopic', 'isPrivateTopic'), + return this.get('invitingToTopic'); + }.property('invitingToTopic'), // Show Groups? (add invited user to private group) showGroups: function() { - return this.get('isAdmin') && (Discourse.Utilities.emailValid(this.get('emailOrUsername')) || this.get('isPrivateTopic') || !this.get('invitingToTopic')) && !Discourse.SiteSettings.enable_sso; - }.property('isAdmin', 'emailOrUsername', 'isPrivateTopic', 'invitingToTopic'), + return this.get('isAdmin') && (Discourse.Utilities.emailValid(this.get('emailOrUsername')) || this.get('isPrivateTopic') || !this.get('invitingToTopic')) && !Discourse.SiteSettings.enable_sso && !this.get('isMessage'); + }.property('isAdmin', 'emailOrUsername', 'isPrivateTopic', 'isMessage', 'invitingToTopic'), // Instructional text for the modal. inviteInstructions: function() { @@ -55,13 +62,19 @@ export default ObjectController.extend(ModalFunctionality, { // inviting to a message return I18n.t('topic.invite_private.email_or_username'); } else if (this.get('invitingToTopic')) { - // when inviting to topic, display instructions based on provided entity - if (this.blank('emailOrUsername')) { - return I18n.t('topic.invite_reply.to_topic_blank'); - } else if (Discourse.Utilities.emailValid(this.get('emailOrUsername'))) { - return I18n.t('topic.invite_reply.to_topic_email'); + // inviting to a private/public topic + if (this.get('isPrivateTopic') && !this.get('isAdmin')) { + // inviting to a private topic and is not admin + return I18n.t('topic.invite_reply.to_username'); } else { - return I18n.t('topic.invite_reply.to_topic_username'); + // when inviting to a topic, display instructions based on provided entity + if (this.blank('emailOrUsername')) { + return I18n.t('topic.invite_reply.to_topic_blank'); + } else if (Discourse.Utilities.emailValid(this.get('emailOrUsername'))) { + return I18n.t('topic.invite_reply.to_topic_email'); + } else { + return I18n.t('topic.invite_reply.to_topic_username'); + } } } else { // inviting to forum diff --git a/app/assets/javascripts/discourse/lib/user-search.js.es6 b/app/assets/javascripts/discourse/lib/user-search.js.es6 index 3311f518d8..790a00ff09 100644 --- a/app/assets/javascripts/discourse/lib/user-search.js.es6 +++ b/app/assets/javascripts/discourse/lib/user-search.js.es6 @@ -6,7 +6,7 @@ var cache = {}, currentTerm, oldSearch; -function performSearch(term, topicId, includeGroups, resultsFn) { +function performSearch(term, topicId, includeGroups, allowedUsers, resultsFn) { var cached = cache[term]; if (cached) { resultsFn(cached); @@ -17,7 +17,8 @@ function performSearch(term, topicId, includeGroups, resultsFn) { oldSearch = $.ajax(Discourse.getURL('/users/search/users'), { data: { term: term, topic_id: topicId, - include_groups: includeGroups } + include_groups: includeGroups, + topic_allowed_users: allowedUsers } }); var returnVal = CANCELLED_STATUS; @@ -75,6 +76,7 @@ function organizeResults(r, options) { export default function userSearch(options) { var term = options.term || "", includeGroups = options.includeGroups, + allowedUsers = options.allowedUsers, topicId = options.topicId; @@ -101,7 +103,7 @@ export default function userSearch(options) { resolve(CANCELLED_STATUS); }, 5000); - debouncedSearch(term, topicId, includeGroups, function(r) { + debouncedSearch(term, topicId, includeGroups, allowedUsers, function(r) { clearTimeout(clearPromise); resolve(organizeResults(r, options)); }); diff --git a/app/assets/javascripts/discourse/templates/modal/invite.hbs b/app/assets/javascripts/discourse/templates/modal/invite.hbs index e5e17e32e2..5984aa86ab 100644 --- a/app/assets/javascripts/discourse/templates/modal/invite.hbs +++ b/app/assets/javascripts/discourse/templates/modal/invite.hbs @@ -10,7 +10,11 @@ {{else}} {{#if allowExistingMembers}} - {{user-selector single="true" allowAny=true excludeCurrentUser="true" usernames=emailOrUsername includeGroups="true" placeholderKey=placeholderKey}} + {{#if isPrivateTopic}} + {{user-selector single="true" allowAny=true excludeCurrentUser="true" usernames=emailOrUsername allowedUsers="true" topicId=topicId placeholderKey=placeholderKey}} + {{else}} + {{user-selector single="true" allowAny=true excludeCurrentUser="true" usernames=emailOrUsername placeholderKey=placeholderKey}} + {{/if}} {{else}} {{text-field value=emailOrUsername placeholderKey="topic.invite_reply.email_placeholder"}} {{/if}} diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 23dfb48705..28c4ea7c9f 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -445,8 +445,9 @@ class UsersController < ApplicationController term = params[:term].to_s.strip topic_id = params[:topic_id] topic_id = topic_id.to_i if topic_id + topic_allowed_users = params[:topic_allowed_users] || false - results = UserSearch.new(term, topic_id: topic_id, searching_user: current_user).search + results = UserSearch.new(term, topic_id: topic_id, topic_allowed_users: topic_allowed_users, searching_user: current_user).search user_fields = [:username, :upload_avatar_template, :uploaded_avatar_id] user_fields << :name if SiteSetting.enable_names? diff --git a/app/models/user_search.rb b/app/models/user_search.rb index 535d1c29f0..cbb18312f8 100644 --- a/app/models/user_search.rb +++ b/app/models/user_search.rb @@ -5,6 +5,7 @@ class UserSearch @term = term @term_like = "#{term.downcase}%" @topic_id = opts[:topic_id] + @topic_allowed_users = opts[:topic_allowed_users] @searching_user = opts[:searching_user] @limit = opts[:limit] || 20 end @@ -36,6 +37,18 @@ class UserSearch users = users.not_suspended end + # Only show users who have access to private topic + if @topic_id && @topic_allowed_users == "true" + allowed_user_ids = [] + topic = Topic.find_by(id: @topic_id) + + if topic.category && topic.category.read_restricted + users = users.includes(:secure_categories) + .where("users.admin = TRUE OR categories.id = ?", topic.category.id) + .references(:categories) + end + end + users.order("CASE WHEN last_seen_at IS NULL THEN 0 ELSE 1 END DESC, last_seen_at DESC, username ASC") .limit(@limit) end diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml index c2d95b258e..9dcca7b4ef 100644 --- a/config/locales/client.en.yml +++ b/config/locales/client.en.yml @@ -1089,6 +1089,7 @@ en: to_topic_blank: "Enter the username or email address of the person you'd like to invite to this topic." to_topic_email: "You've entered an email address. We'll email an invitation that allows your friend to immediately reply to this topic." to_topic_username: "You've entered a username. We'll send a notification to that user with a link inviting them to this topic." + to_username: "Enter the username of the person you'd like to invite. We'll send a notification to that user with a link inviting them to this topic." email_placeholder: 'name@example.com' success_email: "We mailed out an invitation to {{emailOrUsername}}. We'll notify you when the invitation is redeemed. Check the invitations tab on your user page to keep track of your invites." diff --git a/lib/guardian.rb b/lib/guardian.rb index 51cedb1e93..69f2db0b7e 100644 --- a/lib/guardian.rb +++ b/lib/guardian.rb @@ -214,14 +214,12 @@ class Guardian return false unless ( SiteSetting.enable_local_logins && (!SiteSetting.must_approve_users? || is_staff?) ) return true if is_admin? return false if ! can_see?(object) - return false if group_ids.present? if object.is_a?(Topic) && object.category if object.category.groups.any? return true if object.category.groups.all? { |g| can_edit_group?(g) } end - return false if object.category.read_restricted end user.has_trust_level?(TrustLevel[2]) diff --git a/spec/controllers/users_controller_spec.rb b/spec/controllers/users_controller_spec.rb index 159e007c71..f4a62a80b3 100644 --- a/spec/controllers/users_controller_spec.rb +++ b/spec/controllers/users_controller_spec.rb @@ -1164,6 +1164,25 @@ describe UsersController do expect(json["users"].map { |u| u["username"] }).to include(user.username) end + it "searches only for users who have access to private topic" do + privileged_user = Fabricate(:user, trust_level: 4, username: "joecabit", name: "Lawrence Tierney") + privileged_group = Fabricate(:group) + privileged_group.add(privileged_user) + privileged_group.save + + category = Fabricate(:category) + category.set_permissions(privileged_group => :readonly) + category.save + + private_topic = Fabricate(:topic, category: category) + + xhr :post, :search_users, term: user.name.split(" ").last, topic_id: private_topic.id, topic_allowed_users: "true" + expect(response).to be_success + json = JSON.parse(response.body) + expect(json["users"].map { |u| u["username"] }).to_not include(user.username) + expect(json["users"].map { |u| u["username"] }).to include(privileged_user.username) + end + context "when `enable_names` is true" do before do SiteSetting.enable_names = true From d2ed64751e54e6267adc72414889edada20da2e0 Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Wed, 15 Apr 2015 15:29:37 -0400 Subject: [PATCH 029/113] UX: Show category badge on enqueued posts --- .../javascripts/discourse/models/store.js.es6 | 30 ++++++++++++------- .../discourse/templates/queued-posts.hbs | 1 + .../stylesheets/desktop/queued-posts.scss | 4 +++ app/models/user_history.rb | 6 ++-- app/serializers/queued_post_serializer.rb | 12 +++++++- spec/models/queued_post_spec.rb | 2 +- 6 files changed, 41 insertions(+), 14 deletions(-) diff --git a/app/assets/javascripts/discourse/models/store.js.es6 b/app/assets/javascripts/discourse/models/store.js.es6 index 61ce9f581c..f0608b86b0 100644 --- a/app/assets/javascripts/discourse/models/store.js.es6 +++ b/app/assets/javascripts/discourse/models/store.js.es6 @@ -111,22 +111,32 @@ export default Ember.Object.extend({ return this.container.lookup('adapter:' + type) || this.container.lookup('adapter:rest'); }, + _lookupSubType(subType, id, root) { + + // cheat: we know we already have categories in memory + if (subType === 'category') { + return Discourse.Category.findById(id); + } + + const collection = root[this.pluralize(subType)]; + if (collection) { + const found = collection.findProperty('id', id); + if (found) { + return this._hydrate(subType, found, root); + } + } + }, + _hydrateEmbedded(obj, root) { const self = this; Object.keys(obj).forEach(function(k) { const m = /(.+)\_id$/.exec(k); if (m) { const subType = m[1]; - const collection = root[self.pluralize(subType)]; - if (collection) { - const found = collection.findProperty('id', obj[k]); - if (found) { - const hydrated = self._hydrate(subType, found, root); - if (hydrated) { - obj[subType] = hydrated; - delete obj[k]; - } - } + const hydrated = self._lookupSubType(subType, obj[k], root); + if (hydrated) { + obj[subType] = hydrated; + delete obj[k]; } } }); diff --git a/app/assets/javascripts/discourse/templates/queued-posts.hbs b/app/assets/javascripts/discourse/templates/queued-posts.hbs index e2d096514c..60fa6dbdd0 100644 --- a/app/assets/javascripts/discourse/templates/queued-posts.hbs +++ b/app/assets/javascripts/discourse/templates/queued-posts.hbs @@ -18,6 +18,7 @@ {{else}} {{post.post_options.title}} {{/if}} + {{category-badge post.category}} {{{cook-text post.raw}}} diff --git a/app/assets/stylesheets/desktop/queued-posts.scss b/app/assets/stylesheets/desktop/queued-posts.scss index 49cdb433de..19f1bc0737 100644 --- a/app/assets/stylesheets/desktop/queued-posts.scss +++ b/app/assets/stylesheets/desktop/queued-posts.scss @@ -14,6 +14,10 @@ .post-title { color: darken(scale-color-diff(), 50%); font-weight: bold; + + .badge-wrapper { + margin-left: 1em; + } } border-bottom: 1px solid darken(scale-color-diff(), 10%); diff --git a/app/models/user_history.rb b/app/models/user_history.rb index 3fe017d69a..94f48adecd 100644 --- a/app/models/user_history.rb +++ b/app/models/user_history.rb @@ -38,7 +38,8 @@ class UserHistory < ActiveRecord::Base :change_username, :custom, :custom_staff, - :anonymize_user) + :anonymize_user, + :reviewed_post) end # Staff actions is a subset of all actions, used to audit actions taken by staff users. @@ -59,7 +60,8 @@ class UserHistory < ActiveRecord::Base :roll_up, :change_username, :custom_staff, - :anonymize_user] + :anonymize_user, + :reviewed_post] end def self.staff_action_ids diff --git a/app/serializers/queued_post_serializer.rb b/app/serializers/queued_post_serializer.rb index 8e2637bce7..33b0bccf90 100644 --- a/app/serializers/queued_post_serializer.rb +++ b/app/serializers/queued_post_serializer.rb @@ -9,9 +9,19 @@ class QueuedPostSerializer < ApplicationSerializer :rejected_by_id, :raw, :post_options, - :created_at + :created_at, + :category_id has_one :user, serializer: BasicUserSerializer, embed: :object has_one :topic, serializer: BasicTopicSerializer + def category_id + cat_id = object.topic.try(:category_id) || object.post_options['category'] + cat_id.to_i if cat_id + end + + def include_category_id? + category_id.present? + end + end diff --git a/spec/models/queued_post_spec.rb b/spec/models/queued_post_spec.rb index cd8d169d87..c433b5c4c1 100644 --- a/spec/models/queued_post_spec.rb +++ b/spec/models/queued_post_spec.rb @@ -98,7 +98,7 @@ describe QueuedPost do expect(topic.category).to eq(category) end - it "doesn't create the post and topic" do + it "rejecting doesn't create the post and topic" do topic_count, post_count = Topic.count, Post.count qp.reject!(admin) From dcb9d6e16a5f2a1845438d974334ed635f28ecd9 Mon Sep 17 00:00:00 2001 From: Neil Lalonde Date: Wed, 15 Apr 2015 15:52:28 -0400 Subject: [PATCH 030/113] remove queue_size_check --- app/models/admin_dashboard_data.rb | 7 +------ config/locales/server.en.yml | 1 - 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/app/models/admin_dashboard_data.rb b/app/models/admin_dashboard_data.rb index 202bd3c27e..90c573581b 100644 --- a/app/models/admin_dashboard_data.rb +++ b/app/models/admin_dashboard_data.rb @@ -25,7 +25,7 @@ class AdminDashboardData ruby_version_check, host_names_check, gc_checks, - sidekiq_check || queue_size_check, + sidekiq_check, ram_check, old_google_config_check, both_googles_config_check, @@ -100,11 +100,6 @@ class AdminDashboardData I18n.t('dashboard.sidekiq_warning') if Jobs.queued > 0 and (last_job_performed_at.nil? or last_job_performed_at < 2.minutes.ago) end - def queue_size_check - queue_size = Jobs.queued - I18n.t('dashboard.queue_size_warning', queue_size: queue_size) unless queue_size < 100 - end - def ram_check I18n.t('dashboard.memory_warning') if MemInfo.new.mem_total and MemInfo.new.mem_total < 1_000_000 end diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml index 5e36a93170..8f1a054351 100644 --- a/config/locales/server.en.yml +++ b/config/locales/server.en.yml @@ -677,7 +677,6 @@ 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: Tuning Ruby and Rails for Discourse.' 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. Learn about Sidekiq here.' - 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.' enable_google_logins_warning: "WARNING! Support is ending for your current method of Google authentication on April 20, 2015! Please switch to the new method now!" both_googles_warning: "You have both enable_google_logins and enable_google_oauth2_logins checked in the site settings. Disable enable_google_logins." From 245777ba041945137eaa78cd2522548de0d2a952 Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Wed, 15 Apr 2015 16:18:32 -0400 Subject: [PATCH 031/113] FIX: Lost position in topic --- .../javascripts/discourse/routes/topic-from-params.js.es6 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/assets/javascripts/discourse/routes/topic-from-params.js.es6 b/app/assets/javascripts/discourse/routes/topic-from-params.js.es6 index 62dd9e5dbf..e13672afaf 100644 --- a/app/assets/javascripts/discourse/routes/topic-from-params.js.es6 +++ b/app/assets/javascripts/discourse/routes/topic-from-params.js.es6 @@ -2,7 +2,7 @@ export default Discourse.Route.extend({ // Avoid default model hook - model: function() { return; }, + model: function(p) { return p; }, setupController: function(controller, params) { params = params || {}; From 2303b1dcd016bc7ce82e5682fc9131a97abe36b6 Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Wed, 15 Apr 2015 17:08:34 -0400 Subject: [PATCH 032/113] FIX: Broken Qunit specs --- test/javascripts/fixtures/topic.js.es6 | 2 +- test/javascripts/helpers/create-pretender.js.es6 | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/test/javascripts/fixtures/topic.js.es6 b/test/javascripts/fixtures/topic.js.es6 index 55e124a0c7..60c5b4f71c 100644 --- a/test/javascripts/fixtures/topic.js.es6 +++ b/test/javascripts/fixtures/topic.js.es6 @@ -1,2 +1,2 @@ /*jshint maxlen:10000000 */ -export default {"/t/280.json": {"post_stream":{"posts":[{"id":398,"name":"Uwe Keim","username":"uwe_keim","avatar_template":"/user_avatar/meta.discourse.org/uwe_keim/{size}/5697.png","uploaded_avatar_id":5697,"created_at":"2013-02-05T21:29:00.280Z","cooked":"

    Any plans to support localization of UI elements, so that I (for example) could set up a completely German speaking forum?

    ","post_number":1,"post_type":1,"updated_at":"2013-02-05T21:29:00.280Z","like_count":0,"reply_count":1,"reply_to_post_number":null,"quote_count":0,"avg_time":25,"incoming_link_count":314,"reads":475,"score":1702.25,"yours":false,"topic_id":280,"topic_slug":"internationalization-localization","display_username":"Uwe Keim","primary_group_name":null,"version":1,"can_edit":true,"can_delete":false,"can_recover":true,"link_counts":[{"url":"https://meta.discourse.org/t/language-mirrors/2378/2","internal":true,"reflection":true,"title":"Language mirrors","clicks":3},{"url":"https://meta.discourse.org/t/translation-workflow/6102","internal":true,"reflection":true,"title":"Translation workflow","clicks":2},{"url":"https://meta.discourse.org/t/solving-xda-developer-style-forums/4368/4","internal":true,"reflection":true,"title":"Solving XDA-Developer style forums","clicks":2},{"url":"https://meta.discourse.org/t/comrades-lets-join-our-efforts-on-ukrainian-and-russian-translations/4403/5","internal":true,"reflection":true,"title":"Comrades let's join our efforts on ukrainian and russian translations","clicks":1},{"url":"https://meta.discourse.org/t/bookmark-last-read-sometimes-doesn-t-go-to-the-end-of-a-topic/4825/9","internal":true,"reflection":true,"title":"Bookmark/last read sometimes doesn't go to the end of a topic","clicks":0},{"url":"https://meta.discourse.org/t/roadplan-for-discourse/2939/5","internal":true,"reflection":true,"title":"Roadplan for Discourse 2013","clicks":0}],"read":true,"user_title":null,"actions_summary":[{"id":2,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":3,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":4,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":5,"count":0,"hidden":true,"can_act":true,"can_defer_flags":false},{"id":6,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":7,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":8,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false}],"moderator":false,"admin":false,"staff":false,"user_id":255,"hidden":false,"hidden_reason_id":null,"trust_level":2,"deleted_at":null,"user_deleted":false,"edit_reason":null,"can_view_edit_history":true,"wiki":false},{"id":419,"name":"Tim Stone","username":"tms","avatar_template":"/user_avatar/meta.discourse.org/tms/{size}/40181.png","uploaded_avatar_id":40181,"created_at":"2013-02-05T21:32:47.649Z","cooked":"

    The application strings are externalized, so localization should be entirely possible with enough translation effort.

    ","post_number":2,"post_type":1,"updated_at":"2013-02-06T10:15:27.965Z","like_count":4,"reply_count":0,"reply_to_post_number":null,"quote_count":0,"avg_time":27,"incoming_link_count":16,"reads":460,"score":308.35,"yours":false,"topic_id":280,"topic_slug":"internationalization-localization","display_username":"Tim Stone","primary_group_name":null,"version":2,"can_edit":true,"can_delete":true,"can_recover":true,"link_counts":[{"url":"https://github.com/discourse/discourse/blob/master/config/locales/en.yml","internal":false,"reflection":false,"clicks":118}],"read":true,"user_title":"Great contributor","actions_summary":[{"id":2,"count":4,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":3,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":4,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":5,"count":0,"hidden":true,"can_act":true,"can_defer_flags":false},{"id":6,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":7,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":8,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false}],"moderator":false,"admin":false,"staff":false,"user_id":9,"hidden":false,"hidden_reason_id":null,"trust_level":2,"deleted_at":null,"user_deleted":false,"edit_reason":null,"can_view_edit_history":true,"wiki":false},{"id":1060,"name":"Jeff Atwood","username":"codinghorror","avatar_template":"/user_avatar/meta.discourse.org/codinghorror/{size}/5297.png","uploaded_avatar_id":5297,"created_at":"2013-02-06T02:26:24.922Z","cooked":"

    Yep, all strings are going through a lookup table.*

    \n\n

    master/config/locales

    \n\n

    So you could replace that lookup table with the \"de\" one to get German.

    \n\n

    * we didn't get all the strings into the lookup table for launch, but the vast, vast majority of them are and the ones that are not, we will fix as we go!

    ","post_number":3,"post_type":1,"updated_at":"2014-02-24T05:23:39.211Z","like_count":4,"reply_count":3,"reply_to_post_number":null,"quote_count":0,"avg_time":33,"incoming_link_count":5,"reads":449,"score":191.45,"yours":false,"topic_id":280,"topic_slug":"internationalization-localization","display_username":"Jeff Atwood","primary_group_name":"discourse","version":4,"can_edit":true,"can_delete":true,"can_recover":true,"link_counts":[{"url":"https://github.com/discourse/discourse/blob/master/config/locales","internal":false,"reflection":false,"title":"discourse/config/locales at master · discourse/discourse · GitHub","clicks":62},{"url":"https://meta.discourse.org/t/github-onebox-rendering-issue/7616","internal":true,"reflection":true,"title":"GitHub OneBox Rendering Issue","clicks":0}],"read":true,"user_title":"co-founder","actions_summary":[{"id":2,"count":4,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":3,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":4,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":5,"count":0,"hidden":true,"can_act":true,"can_defer_flags":false},{"id":6,"count":1,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":7,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":8,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false}],"moderator":true,"admin":true,"staff":true,"user_id":32,"hidden":false,"hidden_reason_id":null,"trust_level":3,"deleted_at":null,"user_deleted":false,"edit_reason":"","can_view_edit_history":true,"wiki":false},{"id":3623,"name":"Shade","username":"shade","avatar_template":"/user_avatar/meta.discourse.org/shade/{size}/8306.png","uploaded_avatar_id":8306,"created_at":"2013-02-07T12:55:33.129Z","cooked":"

    Is it a coincidence that the strings file is 1337 lines long? \"smiley\"

    ","post_number":4,"post_type":1,"updated_at":"2013-02-07T12:55:33.129Z","like_count":7,"reply_count":0,"reply_to_post_number":null,"quote_count":0,"avg_time":20,"incoming_link_count":15,"reads":401,"score":291.2,"yours":false,"topic_id":280,"topic_slug":"internationalization-localization","display_username":"Shade","primary_group_name":null,"version":1,"can_edit":true,"can_delete":true,"can_recover":true,"link_counts":[{"url":"https://meta.discourse.org/t/hi-support-chinese/4393/6","internal":true,"reflection":true,"title":"Hi, support Chinese?","clicks":0}],"read":true,"user_title":null,"actions_summary":[{"id":2,"count":7,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":3,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":4,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":5,"count":0,"hidden":true,"can_act":true,"can_defer_flags":false},{"id":6,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":7,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":8,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false}],"moderator":false,"admin":false,"staff":false,"user_id":1808,"hidden":false,"hidden_reason_id":null,"trust_level":1,"deleted_at":null,"user_deleted":false,"edit_reason":null,"can_view_edit_history":true,"wiki":false},{"id":3651,"name":"Pekka Gaiser","username":"pekka","avatar_template":"/user_avatar/meta.discourse.org/pekka/{size}/5253.png","uploaded_avatar_id":5253,"created_at":"2013-02-07T14:02:07.869Z","cooked":"

    \n\n

    The problem I see here is that this file is likely two grow and change massively over the next couple months, and tracking these changes in order to keep a localized file up to date is going to be a bitch.

    \n\n

    I wonder where there is a tool that can compare two yml structures and point out which nodes are missing? That would help keep track of new strings.

    \n\n

    Re keeping track of changed strings, @codinghorror I found this very interesting: http://stackoverflow.com/questions/4232922/why-do-people-use-plain-english-as-translation-placeholders if plain English placeholders were used, any change in strings would lead to a new node in the yml file, making keeping the translation up to date easier. Maybe worth thinking about in the future.

    ","post_number":5,"post_type":1,"updated_at":"2013-02-07T14:05:42.328Z","like_count":2,"reply_count":2,"reply_to_post_number":3,"quote_count":1,"avg_time":22,"incoming_link_count":10,"reads":386,"score":213.3,"yours":false,"topic_id":280,"topic_slug":"internationalization-localization","display_username":"Pekka Gaiser","primary_group_name":null,"version":1,"can_edit":true,"can_delete":true,"can_recover":true,"link_counts":[{"url":"http://stackoverflow.com/questions/4232922/why-do-people-use-plain-english-as-translation-placeholders","internal":false,"reflection":false,"title":"internationalization - Why do people use plain english as translation placeholders? - Stack Overflow","clicks":63}],"read":true,"user_title":null,"actions_summary":[{"id":2,"count":2,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":3,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":4,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":5,"count":0,"hidden":true,"can_act":true,"can_defer_flags":false},{"id":6,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":7,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":8,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false}],"moderator":false,"admin":false,"staff":false,"user_id":7,"hidden":false,"hidden_reason_id":null,"trust_level":2,"deleted_at":null,"user_deleted":false,"edit_reason":null,"can_view_edit_history":true,"wiki":false},{"id":3654,"name":"Sam Saffron","username":"sam","avatar_template":"/user_avatar/meta.discourse.org/sam/{size}/5243.png","uploaded_avatar_id":5243,"created_at":"2013-02-07T14:05:39.910Z","cooked":"

    Yes, I really like the concept of fuzzy matching for localization, perhaps you can chase up alex sexton he was meaning to upload a localization tool for this kind of stuff.

    \n\n

    Also, I am a big fan of ICU message format, but it is not the \"Rails way (tm)\".

    ","post_number":6,"post_type":1,"updated_at":"2013-02-07T14:05:39.910Z","like_count":1,"reply_count":1,"reply_to_post_number":5,"quote_count":0,"avg_time":17,"incoming_link_count":4,"reads":329,"score":106.65,"yours":false,"topic_id":280,"topic_slug":"internationalization-localization","display_username":"Sam Saffron","primary_group_name":"discourse","version":1,"can_edit":true,"can_delete":true,"can_recover":true,"link_counts":[{"url":"https://github.com/SlexAxton/messageformat.js","internal":false,"reflection":false,"title":"SlexAxton/messageformat.js · GitHub","clicks":46},{"url":"https://github.com/SlexAxton","internal":false,"reflection":false,"title":"SlexAxton (Alex Sexton) · GitHub","clicks":10}],"read":true,"user_title":"co-founder","reply_to_user":{"username":"pekka","avatar_template":"/user_avatar/meta.discourse.org/pekka/{size}/5253.png","uploaded_avatar_id":5253},"actions_summary":[{"id":2,"count":1,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":3,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":4,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":5,"count":0,"hidden":true,"can_act":true,"can_defer_flags":false},{"id":6,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":7,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":8,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false}],"moderator":true,"admin":true,"staff":true,"user_id":1,"hidden":false,"hidden_reason_id":null,"trust_level":4,"deleted_at":null,"user_deleted":false,"edit_reason":null,"can_view_edit_history":true,"wiki":false},{"id":3655,"name":"Pekka Gaiser","username":"pekka","avatar_template":"/user_avatar/meta.discourse.org/pekka/{size}/5253.png","uploaded_avatar_id":5253,"created_at":"2013-02-07T14:08:17.493Z","cooked":"

    Looks interesting, I'll take a peek.

    \n\n

    As said on dev, the best tool I can see in terms of giving translators a proper interface and quality control would be something like GlotPress. It's based on the PO messages format (is that somehow related to ICU?) but looks pretty great.

    \n\n

    \n\n

    I'm not familiar with the term in this context, you mean keeping the English version in the code base (instead of a generic code like message_error_nametooshort ?)

    ","post_number":7,"post_type":1,"updated_at":"2013-02-07T14:12:02.965Z","like_count":1,"reply_count":1,"reply_to_post_number":6,"quote_count":1,"avg_time":16,"incoming_link_count":0,"reads":326,"score":86.0,"yours":false,"topic_id":280,"topic_slug":"internationalization-localization","display_username":"Pekka Gaiser","primary_group_name":null,"version":1,"can_edit":true,"can_delete":true,"can_recover":true,"link_counts":[{"url":"http://translate.wordpress.org/projects/bbpress/dev","internal":false,"reflection":false,"title":"WordPress › Development < GlotPress","clicks":16}],"read":true,"user_title":null,"actions_summary":[{"id":2,"count":1,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":3,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":4,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":5,"count":0,"hidden":true,"can_act":true,"can_defer_flags":false},{"id":6,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":7,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":8,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false}],"moderator":false,"admin":false,"staff":false,"user_id":7,"hidden":false,"hidden_reason_id":null,"trust_level":2,"deleted_at":null,"user_deleted":false,"edit_reason":null,"can_view_edit_history":true,"wiki":false},{"id":3658,"name":"Sam Saffron","username":"sam","avatar_template":"/user_avatar/meta.discourse.org/sam/{size}/5243.png","uploaded_avatar_id":5243,"created_at":"2013-02-07T14:12:22.582Z","cooked":"

    ICU Message format is basically Gettext on steroids, Gettext has been around for so many years and actually works pretty well, being super prevalent in Linux.

    \n\n

    Trouble is you need a fuzzy matcher for translators if you are going to store stuff like mf.compile( 'This is a message.' ) in source, one letter change and all your translators need to validate it.

    ","post_number":8,"post_type":1,"updated_at":"2013-02-07T14:12:22.582Z","like_count":1,"reply_count":1,"reply_to_post_number":7,"quote_count":0,"avg_time":11,"incoming_link_count":2,"reads":296,"score":89.75,"yours":false,"topic_id":280,"topic_slug":"internationalization-localization","display_username":"Sam Saffron","primary_group_name":"discourse","version":1,"can_edit":true,"can_delete":true,"can_recover":true,"link_counts":[{"url":"https://meta.discourse.org/t/what-i-love-about-wordpress-plugins/5697","internal":true,"reflection":true,"title":"What I love about WordPress plugins","clicks":0}],"read":true,"user_title":"co-founder","reply_to_user":{"username":"pekka","avatar_template":"/user_avatar/meta.discourse.org/pekka/{size}/5253.png","uploaded_avatar_id":5253},"actions_summary":[{"id":2,"count":1,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":3,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":4,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":5,"count":0,"hidden":true,"can_act":true,"can_defer_flags":false},{"id":6,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":7,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":8,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false}],"moderator":true,"admin":true,"staff":true,"user_id":1,"hidden":false,"hidden_reason_id":null,"trust_level":4,"deleted_at":null,"user_deleted":false,"edit_reason":null,"can_view_edit_history":true,"wiki":false},{"id":3660,"name":"Pekka Gaiser","username":"pekka","avatar_template":"/user_avatar/meta.discourse.org/pekka/{size}/5253.png","uploaded_avatar_id":5253,"created_at":"2013-02-07T14:14:12.666Z","cooked":"

    \n\n

    Yeah, that's why I've always been a friend of message_error_nametooshort placeholders, until I asked the SO question linked above. The accepted answer makes a good argument against those placeholders: you want translations to break even on small changes in the English original because the translations will probably need to reflect the change, too. Maybe that's not the case right now as new stuff is being checked in pretty much every couple of hours, but in the long run, it'll be overwhelmingly true.

    ","post_number":9,"post_type":1,"updated_at":"2013-02-07T14:18:09.569Z","like_count":1,"reply_count":1,"reply_to_post_number":8,"quote_count":1,"avg_time":10,"incoming_link_count":0,"reads":293,"score":79.1,"yours":false,"topic_id":280,"topic_slug":"internationalization-localization","display_username":"Pekka Gaiser","primary_group_name":null,"version":1,"can_edit":true,"can_delete":true,"can_recover":true,"read":true,"user_title":null,"actions_summary":[{"id":2,"count":1,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":3,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":4,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":5,"count":0,"hidden":true,"can_act":true,"can_defer_flags":false},{"id":6,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":7,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":8,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false}],"moderator":false,"admin":false,"staff":false,"user_id":7,"hidden":false,"hidden_reason_id":null,"trust_level":2,"deleted_at":null,"user_deleted":false,"edit_reason":null,"can_view_edit_history":true,"wiki":false},{"id":3667,"name":"Tim Stone","username":"tms","avatar_template":"/user_avatar/meta.discourse.org/tms/{size}/40181.png","uploaded_avatar_id":40181,"created_at":"2013-02-07T14:25:16.859Z","cooked":"

    Hmm...You could theoretically also build something into the development process that would monitor changes to the English locale file and make a translator-friendly list of changes between versions.

    ","post_number":10,"post_type":1,"updated_at":"2013-02-07T14:25:16.859Z","like_count":1,"reply_count":1,"reply_to_post_number":9,"quote_count":0,"avg_time":7,"incoming_link_count":0,"reads":275,"score":75.35,"yours":false,"topic_id":280,"topic_slug":"internationalization-localization","display_username":"Tim Stone","primary_group_name":null,"version":1,"can_edit":true,"can_delete":true,"can_recover":true,"read":true,"user_title":"Great contributor","reply_to_user":{"username":"pekka","avatar_template":"/user_avatar/meta.discourse.org/pekka/{size}/5253.png","uploaded_avatar_id":5253},"actions_summary":[{"id":2,"count":1,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":3,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":4,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":5,"count":0,"hidden":true,"can_act":true,"can_defer_flags":false},{"id":6,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":7,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":8,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false}],"moderator":false,"admin":false,"staff":false,"user_id":9,"hidden":false,"hidden_reason_id":null,"trust_level":2,"deleted_at":null,"user_deleted":false,"edit_reason":null,"can_view_edit_history":true,"wiki":false},{"id":3673,"name":"Sam Saffron","username":"sam","avatar_template":"/user_avatar/meta.discourse.org/sam/{size}/5243.png","uploaded_avatar_id":5243,"created_at":"2013-02-07T14:30:21.401Z","cooked":"

    Yeah, totally, also we could build tools for dev that make introducing string less annoying and make it possible to garbage collect old unused strings, I hate trudging through that file.

    ","post_number":11,"post_type":1,"updated_at":"2013-02-07T14:30:21.401Z","like_count":1,"reply_count":1,"reply_to_post_number":10,"quote_count":0,"avg_time":7,"incoming_link_count":1,"reads":273,"score":79.95,"yours":false,"topic_id":280,"topic_slug":"internationalization-localization","display_username":"Sam Saffron","primary_group_name":"discourse","version":1,"can_edit":true,"can_delete":true,"can_recover":true,"read":true,"user_title":"co-founder","reply_to_user":{"username":"tms","avatar_template":"/user_avatar/meta.discourse.org/tms/{size}/40181.png","uploaded_avatar_id":40181},"actions_summary":[{"id":2,"count":1,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":3,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":4,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":5,"count":0,"hidden":true,"can_act":true,"can_defer_flags":false},{"id":6,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":7,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":8,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false}],"moderator":true,"admin":true,"staff":true,"user_id":1,"hidden":false,"hidden_reason_id":null,"trust_level":4,"deleted_at":null,"user_deleted":false,"edit_reason":null,"can_view_edit_history":true,"wiki":false},{"id":3675,"name":"Pekka Gaiser","username":"pekka","avatar_template":"/user_avatar/meta.discourse.org/pekka/{size}/5253.png","uploaded_avatar_id":5253,"created_at":"2013-02-07T14:33:38.280Z","cooked":"

    \n\n

    As said, I'd look into whether WP's tools can't be reused for this with some tweaking. They seem to be able to scan a code base for new strings, and make them available automatically to translators.

    \n\n

    They're PHP based which isn't ideal, but it looks like they've done a crapload of work to take the hassle out of translations.

    ","post_number":12,"post_type":1,"updated_at":"2013-02-07T14:34:39.910Z","like_count":1,"reply_count":1,"reply_to_post_number":11,"quote_count":1,"avg_time":7,"incoming_link_count":2,"reads":273,"score":84.95,"yours":false,"topic_id":280,"topic_slug":"internationalization-localization","display_username":"Pekka Gaiser","primary_group_name":null,"version":1,"can_edit":true,"can_delete":true,"can_recover":true,"read":true,"user_title":null,"actions_summary":[{"id":2,"count":1,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":3,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":4,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":5,"count":0,"hidden":true,"can_act":true,"can_defer_flags":false},{"id":6,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":7,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":8,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false}],"moderator":false,"admin":false,"staff":false,"user_id":7,"hidden":false,"hidden_reason_id":null,"trust_level":2,"deleted_at":null,"user_deleted":false,"edit_reason":null,"can_view_edit_history":true,"wiki":false},{"id":3690,"name":"Valts","username":"Vilx","avatar_template":"/user_avatar/meta.discourse.org/vilx/{size}/7299.png","uploaded_avatar_id":7299,"created_at":"2013-02-07T15:05:35.867Z","cooked":"

    This site looks so nice with all the little tweaks like \"10 minutes ago\" instead of simply time, etc - I wonder if there will also be support for proper pluralization in other languages? That's a pretty hard task though, I don't think I've ever seen a website that has done that. But it would be awesome.

    ","post_number":13,"post_type":1,"updated_at":"2013-02-07T15:05:35.867Z","like_count":3,"reply_count":0,"reply_to_post_number":null,"quote_count":0,"avg_time":7,"incoming_link_count":11,"reads":290,"score":158.35,"yours":false,"topic_id":280,"topic_slug":"internationalization-localization","display_username":"Valts","primary_group_name":null,"version":1,"can_edit":true,"can_delete":true,"can_recover":true,"read":true,"user_title":null,"actions_summary":[{"id":2,"count":3,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":3,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":4,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":5,"count":0,"hidden":true,"can_act":true,"can_defer_flags":false},{"id":6,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":7,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":8,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false}],"moderator":false,"admin":false,"staff":false,"user_id":1216,"hidden":false,"hidden_reason_id":null,"trust_level":2,"deleted_at":null,"user_deleted":false,"edit_reason":null,"can_view_edit_history":true,"wiki":false},{"id":3925,"name":"Eric Kidd","username":"emk","avatar_template":"/user_avatar/meta.discourse.org/emk/{size}/8400.png","uploaded_avatar_id":8400,"created_at":"2013-02-07T19:37:06.194Z","cooked":"

    \n\n

    I've had pretty decent luck using Localeapp to localize Rails applications:

    \n\n

    http://www.localeapp.com/

    \n\n

    The developer workflow took me about an hour to really get used to, and there were a few minor glitches. But the non-technical translators had very few problems. One limitation: It insists on rewriting all those yaml files full of strings.

    \n\n

    Anyway, it's worth a look, and it's free for open source, if I recall correctly. Certainly easier than doing a whole bunch of toolsmithing from scratch.

    ","post_number":14,"post_type":1,"updated_at":"2013-02-07T19:37:06.194Z","like_count":3,"reply_count":1,"reply_to_post_number":12,"quote_count":1,"avg_time":9,"incoming_link_count":0,"reads":283,"score":137.05,"yours":false,"topic_id":280,"topic_slug":"internationalization-localization","display_username":"Eric Kidd","primary_group_name":null,"version":1,"can_edit":true,"can_delete":true,"can_recover":true,"link_counts":[{"url":"http://www.localeapp.com/","internal":false,"reflection":false,"title":"Easy localization for Rails apps | Locale","clicks":69}],"read":true,"user_title":null,"actions_summary":[{"id":2,"count":3,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":3,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":4,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":5,"count":0,"hidden":true,"can_act":true,"can_defer_flags":false},{"id":6,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":7,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":8,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false}],"moderator":false,"admin":false,"staff":false,"user_id":1860,"hidden":false,"hidden_reason_id":null,"trust_level":1,"deleted_at":null,"user_deleted":false,"edit_reason":null,"can_view_edit_history":true,"wiki":false},{"id":3938,"name":"Pekka Gaiser","username":"pekka","avatar_template":"/user_avatar/meta.discourse.org/pekka/{size}/5253.png","uploaded_avatar_id":5253,"created_at":"2013-02-07T19:52:13.748Z","cooked":"

    \n\n

    Ohhh. Looking sexy. droool

    ","post_number":15,"post_type":1,"updated_at":"2013-02-07T19:52:13.748Z","like_count":1,"reply_count":1,"reply_to_post_number":14,"quote_count":1,"avg_time":7,"incoming_link_count":0,"reads":260,"score":72.35,"yours":false,"topic_id":280,"topic_slug":"internationalization-localization","display_username":"Pekka Gaiser","primary_group_name":null,"version":1,"can_edit":true,"can_delete":true,"can_recover":true,"read":true,"user_title":null,"actions_summary":[{"id":2,"count":1,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":3,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":4,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":5,"count":0,"hidden":true,"can_act":true,"can_defer_flags":false},{"id":6,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":7,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":8,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false}],"moderator":false,"admin":false,"staff":false,"user_id":7,"hidden":false,"hidden_reason_id":null,"trust_level":2,"deleted_at":null,"user_deleted":false,"edit_reason":null,"can_view_edit_history":true,"wiki":false},{"id":3982,"name":"Eric Kidd","username":"emk","avatar_template":"/user_avatar/meta.discourse.org/emk/{size}/8400.png","uploaded_avatar_id":8400,"created_at":"2013-02-07T20:52:22.454Z","cooked":"

    \n\n

    Yeah, it's pretty. \"smile\" But there were still some rough edges as of a few months ago.

    \n\n

    Whether or not those rough edges are a deal-breaker will probably depends on whether or not localization is already a source of acute pain. If you're already hurting, Localeapp is a pretty useful tool, especially when it comes to enlisting non-technical translators.

    \n\n

    But it does require changing how you work with text, and adding one new tool to the mix. So for projects that just don't want to know about non-English languages, it's not yet seamless the way Unicode is these days.

    \n\n

    (Sweet forum software, by the way. I was just testing out Egyptian hieroglyphics on the test server, because they're well off the Basic Multilingual Plane, and tend to flush Unicode bugs. Everything worked flawlessly.)

    ","post_number":16,"post_type":1,"updated_at":"2013-02-07T20:52:22.454Z","like_count":1,"reply_count":1,"reply_to_post_number":15,"quote_count":1,"avg_time":7,"incoming_link_count":0,"reads":254,"score":71.15,"yours":false,"topic_id":280,"topic_slug":"internationalization-localization","display_username":"Eric Kidd","primary_group_name":null,"version":1,"can_edit":true,"can_delete":true,"can_recover":true,"read":true,"user_title":null,"actions_summary":[{"id":2,"count":1,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":3,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":4,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":5,"count":0,"hidden":true,"can_act":true,"can_defer_flags":false},{"id":6,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":7,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":8,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false}],"moderator":false,"admin":false,"staff":false,"user_id":1860,"hidden":false,"hidden_reason_id":null,"trust_level":1,"deleted_at":null,"user_deleted":false,"edit_reason":null,"can_view_edit_history":true,"wiki":false},{"id":3989,"name":"Pekka Gaiser","username":"pekka","avatar_template":"/user_avatar/meta.discourse.org/pekka/{size}/5253.png","uploaded_avatar_id":5253,"created_at":"2013-02-07T21:04:15.405Z","cooked":"

    \n\n

    Interesting, thanks for the insight. I don't think localization is seriously on their table right now, there's likely to be many other things on the table before it... but it will become an issue sooner or later.

    ","post_number":17,"post_type":1,"updated_at":"2013-02-07T21:04:15.405Z","like_count":1,"reply_count":2,"reply_to_post_number":16,"quote_count":1,"avg_time":7,"incoming_link_count":0,"reads":255,"score":76.35,"yours":false,"topic_id":280,"topic_slug":"internationalization-localization","display_username":"Pekka Gaiser","primary_group_name":null,"version":1,"can_edit":true,"can_delete":true,"can_recover":true,"read":true,"user_title":null,"actions_summary":[{"id":2,"count":1,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":3,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":4,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":5,"count":0,"hidden":true,"can_act":true,"can_defer_flags":false},{"id":6,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":7,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":8,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false}],"moderator":false,"admin":false,"staff":false,"user_id":7,"hidden":false,"hidden_reason_id":null,"trust_level":2,"deleted_at":null,"user_deleted":false,"edit_reason":null,"can_view_edit_history":true,"wiki":false},{"id":3996,"name":"Sam Saffron","username":"sam","avatar_template":"/user_avatar/meta.discourse.org/sam/{size}/5243.png","uploaded_avatar_id":5243,"created_at":"2013-02-07T21:12:06.575Z","cooked":"

    I had an idea ... what if in dev mode, you could right-click on a page and get access to all the translations on the page, make your edits and have it refreshed live.

    \n\n

    I think it would be awesome, very doable technically.

    ","post_number":18,"post_type":1,"updated_at":"2013-02-07T21:12:06.575Z","like_count":7,"reply_count":2,"reply_to_post_number":17,"quote_count":0,"avg_time":8,"incoming_link_count":0,"reads":264,"score":168.2,"yours":false,"topic_id":280,"topic_slug":"internationalization-localization","display_username":"Sam Saffron","primary_group_name":"discourse","version":1,"can_edit":true,"can_delete":true,"can_recover":true,"read":true,"user_title":"co-founder","reply_to_user":{"username":"pekka","avatar_template":"/user_avatar/meta.discourse.org/pekka/{size}/5253.png","uploaded_avatar_id":5253},"actions_summary":[{"id":2,"count":7,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":3,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":4,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":5,"count":0,"hidden":true,"can_act":true,"can_defer_flags":false},{"id":6,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":7,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":8,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false}],"moderator":true,"admin":true,"staff":true,"user_id":1,"hidden":false,"hidden_reason_id":null,"trust_level":4,"deleted_at":null,"user_deleted":false,"edit_reason":null,"can_view_edit_history":true,"wiki":false},{"id":4009,"name":"Pekka Gaiser","username":"pekka","avatar_template":"/user_avatar/meta.discourse.org/pekka/{size}/5253.png","uploaded_avatar_id":5253,"created_at":"2013-02-07T21:18:47.422Z","cooked":"

    That would be fricking cool. There'd still be some leftovers (like error messages that normally never show up, etc.) but you could corral those up on a specific page.

    \n\n

    It could have a dropdown giving you all the languages that you have a .yml for in the locale directory, and write the changes into the one selected. I'm sure people would love it.

    ","post_number":19,"post_type":1,"updated_at":"2013-02-07T21:22:10.692Z","like_count":1,"reply_count":0,"reply_to_post_number":18,"quote_count":0,"avg_time":8,"incoming_link_count":1,"reads":241,"score":68.6,"yours":false,"topic_id":280,"topic_slug":"internationalization-localization","display_username":"Pekka Gaiser","primary_group_name":null,"version":1,"can_edit":true,"can_delete":true,"can_recover":true,"read":true,"user_title":null,"reply_to_user":{"username":"sam","avatar_template":"/user_avatar/meta.discourse.org/sam/{size}/5243.png","uploaded_avatar_id":5243},"actions_summary":[{"id":2,"count":1,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":3,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":4,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":5,"count":0,"hidden":true,"can_act":true,"can_defer_flags":false},{"id":6,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":7,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":8,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false}],"moderator":false,"admin":false,"staff":false,"user_id":7,"hidden":false,"hidden_reason_id":null,"trust_level":2,"deleted_at":null,"user_deleted":false,"edit_reason":null,"can_view_edit_history":true,"wiki":false},{"id":4012,"name":"Marco Ceppi","username":"marcoceppi","avatar_template":"/user_avatar/meta.discourse.org/marcoceppi/{size}/6552.png","uploaded_avatar_id":6552,"created_at":"2013-02-07T21:22:46.376Z","cooked":"

    If you use gettext format you could leverage Launchpad translations and the community behind it.

    ","post_number":20,"post_type":1,"updated_at":"2013-02-07T21:22:46.376Z","like_count":1,"reply_count":0,"reply_to_post_number":null,"quote_count":0,"avg_time":9,"incoming_link_count":2,"reads":244,"score":74.25,"yours":false,"topic_id":280,"topic_slug":"internationalization-localization","display_username":"Marco Ceppi","primary_group_name":null,"version":1,"can_edit":true,"can_delete":true,"can_recover":true,"link_counts":[{"url":"https://translations.launchpad.net/","internal":false,"reflection":false,"title":"Launchpad Translations","clicks":13}],"read":true,"user_title":null,"actions_summary":[{"id":2,"count":1,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":3,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":4,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":5,"count":0,"hidden":true,"can_act":true,"can_defer_flags":false},{"id":6,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":7,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":8,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false}],"moderator":false,"admin":false,"staff":false,"user_id":761,"hidden":false,"hidden_reason_id":null,"trust_level":2,"deleted_at":null,"user_deleted":false,"edit_reason":null,"can_view_edit_history":true,"wiki":false}],"stream":[398,419,1060,3623,3651,3654,3655,3658,3660,3667,3673,3675,3690,3925,3938,3982,3989,3996,4009,4012],"gaps":{"before":{"20706":[20125]},"after":{}}},"id":280,"title":"Internationalization / localization","fancy_title":"Internationalization / localization","posts_count":103,"created_at":"2013-02-05T21:29:00.174Z","views":5211,"reply_count":67,"participant_count":40,"like_count":135,"last_posted_at":"2015-03-04T15:07:10.487Z","visible":true,"closed":false,"archived":false,"has_summary":true,"archetype":"regular","slug":"internationalization-localization","category_id":2,"word_count":6198,"deleted_at":null,"draft":null,"draft_key":"topic_280","draft_sequence":4,"posted":true,"unpinned":null,"pinned_globally":false,"pinned":false,"pinned_at":null,"details":{"auto_close_at":null,"auto_close_hours":null,"auto_close_based_on_last_post":false,"created_by":{"id":255,"username":"uwe_keim","uploaded_avatar_id":5697,"avatar_template":"/user_avatar/meta.discourse.org/uwe_keim/{size}/5697.png"},"last_poster":{"id":14091,"username":"Luciano_Fantuzzi","uploaded_avatar_id":39484,"avatar_template":"/user_avatar/meta.discourse.org/luciano_fantuzzi/{size}/39484.png"},"participants":[{"id":212,"username":"alxndr","uploaded_avatar_id":5619,"avatar_template":"/user_avatar/meta.discourse.org/alxndr/{size}/5619.png","post_count":11},{"id":1,"username":"sam","uploaded_avatar_id":5243,"avatar_template":"/user_avatar/meta.discourse.org/sam/{size}/5243.png","post_count":11},{"id":7,"username":"pekka","uploaded_avatar_id":5253,"avatar_template":"/user_avatar/meta.discourse.org/pekka/{size}/5253.png","post_count":8},{"id":461,"username":"kuba","uploaded_avatar_id":6049,"avatar_template":"/user_avatar/meta.discourse.org/kuba/{size}/6049.png","post_count":7},{"id":2995,"username":"tattoo","uploaded_avatar_id":null,"avatar_template":"/letter_avatar/tattoo/{size}/3.png","post_count":6},{"id":2540,"username":"jgourdon","uploaded_avatar_id":9537,"avatar_template":"/user_avatar/meta.discourse.org/jgourdon/{size}/9537.png","post_count":5},{"id":1860,"username":"emk","uploaded_avatar_id":8400,"avatar_template":"/user_avatar/meta.discourse.org/emk/{size}/8400.png","post_count":4},{"id":1275,"username":"dacap","uploaded_avatar_id":7401,"avatar_template":"/user_avatar/meta.discourse.org/dacap/{size}/7401.png","post_count":4},{"id":19,"username":"eviltrout","uploaded_avatar_id":5275,"avatar_template":"/user_avatar/meta.discourse.org/eviltrout/{size}/5275.png","post_count":4},{"id":3704,"username":"mojzis","uploaded_avatar_id":31201,"avatar_template":"/user_avatar/meta.discourse.org/mojzis/{size}/31201.png","post_count":3},{"id":3190,"username":"gururea","uploaded_avatar_id":10663,"avatar_template":"/user_avatar/meta.discourse.org/gururea/{size}/10663.png","post_count":3},{"id":1895,"username":"maciek","uploaded_avatar_id":8463,"avatar_template":"/user_avatar/meta.discourse.org/maciek/{size}/8463.png","post_count":3},{"id":22,"username":"splattne","uploaded_avatar_id":5280,"avatar_template":"/user_avatar/meta.discourse.org/splattne/{size}/5280.png","post_count":2},{"id":1979,"username":"Superuser","uploaded_avatar_id":8604,"avatar_template":"/user_avatar/meta.discourse.org/superuser/{size}/8604.png","post_count":2},{"id":3818,"username":"Tudor","uploaded_avatar_id":11675,"avatar_template":"/user_avatar/meta.discourse.org/tudor/{size}/11675.png","post_count":2},{"id":32,"username":"codinghorror","uploaded_avatar_id":5297,"avatar_template":"/user_avatar/meta.discourse.org/codinghorror/{size}/5297.png","post_count":2},{"id":3620,"username":"potthast","uploaded_avatar_id":11363,"avatar_template":"/user_avatar/meta.discourse.org/potthast/{size}/11363.png","post_count":2},{"id":9,"username":"tms","uploaded_avatar_id":40181,"avatar_template":"/user_avatar/meta.discourse.org/tms/{size}/40181.png","post_count":2},{"id":14091,"username":"Luciano_Fantuzzi","uploaded_avatar_id":39484,"avatar_template":"/user_avatar/meta.discourse.org/luciano_fantuzzi/{size}/39484.png","post_count":1},{"id":255,"username":"uwe_keim","uploaded_avatar_id":5697,"avatar_template":"/user_avatar/meta.discourse.org/uwe_keim/{size}/5697.png","post_count":1},{"id":9006,"username":"berk","uploaded_avatar_id":19348,"avatar_template":"/user_avatar/meta.discourse.org/berk/{size}/19348.png","post_count":1},{"id":754,"username":"danneu","uploaded_avatar_id":6540,"avatar_template":"/user_avatar/meta.discourse.org/danneu/{size}/6540.png","post_count":1},{"id":761,"username":"marcoceppi","uploaded_avatar_id":6552,"avatar_template":"/user_avatar/meta.discourse.org/marcoceppi/{size}/6552.png","post_count":1},{"id":2753,"username":"mikl","uploaded_avatar_id":9918,"avatar_template":"/user_avatar/meta.discourse.org/mikl/{size}/9918.png","post_count":1}],"suggested_topics":[{"id":27331,"title":"Polls are still very buggy","fancy_title":"Polls are still very buggy","slug":"polls-are-still-very-buggy","posts_count":4,"reply_count":1,"highest_post_number":4,"image_url":"/uploads/default/_optimized/cd1/b8c/c162528887_690x401.png","created_at":"2015-04-08T09:51:00.357Z","last_posted_at":"2015-04-08T15:59:16.258Z","bumped":true,"bumped_at":"2015-04-08T16:05:09.842Z","unseen":false,"last_read_post_number":3,"unread":0,"new_posts":1,"pinned":false,"unpinned":null,"visible":true,"closed":false,"archived":false,"notification_level":2,"bookmarked":false,"liked":false,"archetype":"regular","like_count":11,"views":55,"category_id":1},{"id":27343,"title":"Mobile theme doesn't show last activity time for topics on category page","fancy_title":"Mobile theme doesn’t show last activity time for topics on category page","slug":"mobile-theme-doesnt-show-last-activity-time-for-topics-on-category-page","posts_count":4,"reply_count":2,"highest_post_number":4,"image_url":"/uploads/default/_optimized/13e/25c/bd30b466be_281x500.png","created_at":"2015-04-08T14:20:51.177Z","last_posted_at":"2015-04-08T15:40:30.037Z","bumped":true,"bumped_at":"2015-04-08T15:40:30.037Z","unseen":false,"last_read_post_number":2,"unread":0,"new_posts":2,"pinned":false,"unpinned":null,"visible":true,"closed":false,"archived":false,"notification_level":2,"bookmarked":false,"liked":false,"archetype":"regular","like_count":3,"views":23,"category_id":9},{"id":27346,"title":"Reply+{messagekey}@... optionaly in header \"from\" in addition to \"reply-to\"","fancy_title":"Reply+{messagekey}@… optionaly in header “from” in addition to “reply-to”","slug":"reply-messagekey-optionaly-in-header-from-in-addition-to-reply-to","posts_count":1,"reply_count":0,"highest_post_number":1,"image_url":null,"created_at":"2015-04-08T16:05:13.103Z","last_posted_at":"2015-04-08T16:05:13.415Z","bumped":true,"bumped_at":"2015-04-08T16:05:13.415Z","unseen":true,"pinned":false,"unpinned":null,"visible":true,"closed":false,"archived":false,"bookmarked":null,"liked":null,"archetype":"regular","like_count":0,"views":8,"category_id":2},{"id":19670,"title":"Parsing (Oneboxing) IMDB links","fancy_title":"Parsing (Oneboxing) IMDB links","slug":"parsing-oneboxing-imdb-links","posts_count":8,"reply_count":1,"highest_post_number":8,"image_url":null,"created_at":"2014-09-05T07:19:26.161Z","last_posted_at":"2015-04-07T09:21:21.570Z","bumped":true,"bumped_at":"2015-04-07T09:21:21.570Z","unseen":false,"last_read_post_number":8,"unread":0,"new_posts":0,"pinned":false,"unpinned":null,"visible":true,"closed":false,"archived":false,"notification_level":2,"bookmarked":false,"liked":false,"archetype":"regular","like_count":4,"views":253,"category_id":2},{"id":7512,"title":"Support for Piwik Analytics as an alternative to Google Analytics","fancy_title":"Support for Piwik Analytics as an alternative to Google Analytics","slug":"support-for-piwik-analytics-as-an-alternative-to-google-analytics","posts_count":53,"reply_count":41,"highest_post_number":65,"image_url":"/plugins/emoji/images/smile.png","created_at":"2013-06-16T01:32:30.596Z","last_posted_at":"2015-02-22T13:46:26.845Z","bumped":true,"bumped_at":"2015-02-22T13:46:26.845Z","unseen":false,"last_read_post_number":65,"unread":0,"new_posts":0,"pinned":false,"unpinned":null,"visible":true,"closed":false,"archived":false,"notification_level":2,"bookmarked":false,"liked":false,"archetype":"regular","like_count":62,"views":1877,"category_id":2},{"id":25480,"title":"CSS admin-contents reloaded","fancy_title":"CSS admin-contents reloaded","slug":"css-admin-contents-reloaded","posts_count":22,"reply_count":15,"highest_post_number":22,"image_url":null,"created_at":"2015-02-21T12:15:57.707Z","last_posted_at":"2015-03-02T23:24:18.899Z","bumped":true,"bumped_at":"2015-03-02T23:24:18.899Z","unseen":false,"pinned":false,"unpinned":null,"visible":true,"closed":false,"archived":false,"bookmarked":null,"liked":null,"archetype":"regular","like_count":21,"views":185,"category_id":2},{"id":26576,"title":"Badge timestamp should be the time the badge was granted?","fancy_title":"Badge timestamp should be the time the badge was granted?","slug":"badge-timestamp-should-be-the-time-the-badge-was-granted","posts_count":2,"reply_count":0,"highest_post_number":2,"image_url":null,"created_at":"2015-03-20T13:22:08.266Z","last_posted_at":"2015-03-21T00:33:52.243Z","bumped":true,"bumped_at":"2015-03-21T00:33:52.243Z","unseen":false,"last_read_post_number":1,"unread":0,"new_posts":0,"pinned":false,"unpinned":null,"visible":true,"closed":false,"archived":false,"notification_level":1,"bookmarked":false,"liked":false,"archetype":"regular","like_count":9,"views":87,"category_id":2}],"links":[{"url":"https://github.com/discourse/discourse/blob/master/config/locales/en.yml","title":null,"fancy_title":null,"internal":false,"reflection":false,"clicks":118,"user_id":9,"domain":"github.com"},{"url":"http://www.localeapp.com/","title":"Easy localization for Rails apps | Locale","fancy_title":null,"internal":false,"reflection":false,"clicks":69,"user_id":1860,"domain":"www.localeapp.com"},{"url":"http://stackoverflow.com/questions/4232922/why-do-people-use-plain-english-as-translation-placeholders","title":"internationalization - Why do people use plain english as translation placeholders? - Stack Overflow","fancy_title":null,"internal":false,"reflection":false,"clicks":63,"user_id":7,"domain":"stackoverflow.com"},{"url":"https://github.com/discourse/discourse/blob/master/config/locales","title":"discourse/config/locales at master · discourse/discourse · GitHub","fancy_title":null,"internal":false,"reflection":false,"clicks":62,"user_id":32,"domain":"github.com"},{"url":"https://github.com/SlexAxton/messageformat.js","title":"SlexAxton/messageformat.js · GitHub","fancy_title":null,"internal":false,"reflection":false,"clicks":46,"user_id":1,"domain":"github.com"},{"url":"http://www.localeapp.com/projects/1537/translations?utf8=%E2%9C%93&search=source_code","title":"langforums | Locale","fancy_title":null,"internal":false,"reflection":false,"clicks":25,"user_id":1860,"domain":"www.localeapp.com"},{"url":"https://translations.launchpad.net/","title":"Launchpad Translations","fancy_title":null,"internal":false,"reflection":false,"clicks":23,"user_id":761,"domain":"translations.launchpad.net"},{"url":"https://www.transifex.com/","title":"Transifex - Continuous Localization Platform","fancy_title":null,"internal":false,"reflection":false,"clicks":22,"user_id":1979,"domain":"www.transifex.com"},{"url":"https://github.com/berk/tr8n","title":"berk/tr8n · GitHub","fancy_title":null,"internal":false,"reflection":false,"clicks":22,"user_id":1,"domain":"github.com"},{"url":"http://translate.wordpress.org/projects/bbpress/dev","title":"WordPress › Development < GlotPress","fancy_title":null,"internal":false,"reflection":false,"clicks":16,"user_id":7,"domain":"translate.wordpress.org"},{"url":"http://weblate.org","title":"Weblate - web-based translation","fancy_title":null,"internal":false,"reflection":false,"clicks":15,"user_id":2316,"domain":"weblate.org"},{"url":"https://github.com/discourse/discourse/tree/master/config/locales","title":"discourse/config/locales at master · discourse/discourse · GitHub","fancy_title":null,"internal":false,"reflection":false,"clicks":14,"user_id":19,"domain":"github.com"},{"url":"https://github.com/discourse/discourse/pull/493","title":"Danish translation. by mikl · Pull Request #493 · discourse/discourse · GitHub","fancy_title":null,"internal":false,"reflection":false,"clicks":12,"user_id":2753,"domain":"github.com"},{"url":"https://github.com/SlexAxton","title":"SlexAxton (Alex Sexton) · GitHub","fancy_title":null,"internal":false,"reflection":false,"clicks":10,"user_id":1,"domain":"github.com"},{"url":"https://github.com/gururea/discourse/tree/master/config/locales","title":"discourse/config/locales at master · gururea/discourse · GitHub","fancy_title":null,"internal":false,"reflection":false,"clicks":9,"user_id":3190,"domain":"github.com"},{"url":"https://github.com/discourse/discourse/blob/master/config/locales/client.en.yml#L691","title":"discourse/config/locales/client.en.yml at master · discourse/discourse · GitHub","fancy_title":null,"internal":false,"reflection":false,"clicks":7,"user_id":461,"domain":"github.com"},{"url":"https://github.com/dacap/discourse/tree/spanish","title":"dacap/discourse · GitHub","fancy_title":null,"internal":false,"reflection":false,"clicks":7,"user_id":1275,"domain":"github.com"},{"url":"https://github.com/discourse/discourse/blob/master/config/locales/client.nl.yml","title":"discourse/config/locales/client.nl.yml at master · discourse/discourse · GitHub","fancy_title":null,"internal":false,"reflection":false,"clicks":7,"user_id":461,"domain":"github.com"},{"url":"https://github.com/discourse/discourse/commit/c5761eae8afe37e20cec0d0f9d14b85b6e585bda","title":"Support for Simplified Chinese thanks to tangramor · c5761ea · discourse/discourse · GitHub","fancy_title":null,"internal":false,"reflection":false,"clicks":6,"user_id":212,"domain":"github.com"},{"url":"http://tr8n.github.com/","title":"tr8n","fancy_title":null,"internal":false,"reflection":false,"clicks":6,"user_id":212,"domain":"tr8n.github.com"},{"url":"http://www.getlocalization.com/","title":"Crowdsourced, Social and Collaborative App & Website Translation - Get Localization","fancy_title":null,"internal":false,"reflection":false,"clicks":6,"user_id":22,"domain":"www.getlocalization.com"},{"url":"http://blog.discourse.org/2013/04/discourse-as-your-first-rails-app/","title":"Discourse as Your First Rails App","fancy_title":null,"internal":false,"reflection":false,"clicks":5,"user_id":1995,"domain":"blog.discourse.org"},{"url":"https://github.com/alxndr/discourse/blob/i18n-chinese/config/locales/server.zh.yml","title":null,"fancy_title":null,"internal":false,"reflection":false,"clicks":5,"user_id":212,"domain":"github.com"},{"url":"http://translate.sourceforge.net/wiki/virtaal/index","title":"Easy-to-use and powerful offline translation tool | Virtaal","fancy_title":null,"internal":false,"reflection":false,"clicks":4,"user_id":1979,"domain":"translate.sourceforge.net"},{"url":"https://poeditor.com/","title":"POEditor - online software localization tool","fancy_title":null,"internal":false,"reflection":false,"clicks":4,"user_id":1979,"domain":"poeditor.com"},{"url":"http://en.lichess.org/@/Hellball","title":null,"fancy_title":null,"internal":false,"reflection":false,"clicks":3,"user_id":1979,"domain":"en.lichess.org"},{"url":"http://en.wikipedia.org/wiki/T%E2%80%93V_distinction","title":"T–V distinction - Wikipedia, the free encyclopedia","fancy_title":null,"internal":false,"reflection":false,"clicks":3,"user_id":3620,"domain":"en.wikipedia.org"},{"url":"http://www.slideshare.net/HeatherRivers/linguistic-potluck-crowdsourcing-localization-with-rails","title":"Linguistic Potluck: Crowdsourcing localization with Rails","fancy_title":null,"internal":false,"reflection":false,"clicks":3,"user_id":212,"domain":"www.slideshare.net"},{"url":"https://meta.discourse.org/t/language-mirrors/2378/2","title":"Language mirrors","fancy_title":null,"internal":true,"reflection":true,"clicks":3,"user_id":32,"domain":"meta.discourse.org"},{"url":"http://www.madanalogy.com/2012/06/rails-i18n-translations-in-yaml.html","title":"Mad Analogy: Rails i18n translations in Yaml: translation tool support","fancy_title":null,"internal":false,"reflection":false,"clicks":3,"user_id":3190,"domain":"www.madanalogy.com"},{"url":"https://github.com/tr8n","title":"Translation Exchange · GitHub","fancy_title":null,"internal":false,"reflection":false,"clicks":3,"user_id":9006,"domain":"github.com"},{"url":"http://pootle.locamotion.org/","title":"Main | Pootle Demo","fancy_title":null,"internal":false,"reflection":false,"clicks":2,"user_id":3190,"domain":"pootle.locamotion.org"},{"url":"http://www.youtube.com/watch?v=MqqdzJ98q7s","title":"GoGaRuCo 2012 - Linguistic Potluck: Crowdsourcing Localization in Rails by Heather Rivers - YouTube","fancy_title":null,"internal":false,"reflection":false,"clicks":2,"user_id":212,"domain":"www.youtube.com"},{"url":"https://meta.discourse.org/t/translation-workflow/6102","title":"Translation workflow","fancy_title":null,"internal":true,"reflection":true,"clicks":2,"user_id":4702,"domain":"meta.discourse.org"},{"url":"https://meta.discourse.org/t/solving-xda-developer-style-forums/4368/4","title":"Solving XDA-Developer style forums","fancy_title":null,"internal":true,"reflection":true,"clicks":2,"user_id":639,"domain":"meta.discourse.org"},{"url":"https://tr8nhub.com","title":"TranslationExchange","fancy_title":null,"internal":false,"reflection":false,"clicks":2,"user_id":9006,"domain":"tr8nhub.com"},{"url":"https://meta.discourse.org/t/roadplan-for-discourse/2939/3","title":"Roadplan for Discourse 2013","fancy_title":null,"internal":true,"reflection":true,"clicks":1,"user_id":2540,"domain":"meta.discourse.org"},{"url":"http://sugarjs.com/dates#date_locales","title":"Dates - Sugar","fancy_title":null,"internal":false,"reflection":false,"clicks":1,"user_id":461,"domain":"sugarjs.com"},{"url":"http://blog.discourse.org/2013/03/localizing-discourse/","title":"Localizing Discourse","fancy_title":null,"internal":false,"reflection":false,"clicks":1,"user_id":893,"domain":"blog.discourse.org"},{"url":"https://github.com/discourse/discourse/blob/master/app/assets/javascripts/locales/date_locales.js","title":null,"fancy_title":null,"internal":false,"reflection":false,"clicks":1,"user_id":461,"domain":"github.com"},{"url":"http://transifex.com/projects/p/discourse-pt-br/","title":"Discourse-Translations-Project localization","fancy_title":null,"internal":false,"reflection":false,"clicks":1,"user_id":893,"domain":"transifex.com"},{"url":"https://github.com/discourse/discourse/issues/279","title":null,"fancy_title":null,"internal":false,"reflection":false,"clicks":1,"user_id":893,"domain":"github.com"},{"url":"https://meta.discourse.org/t/comrades-lets-join-our-efforts-on-ukrainian-and-russian-translations/4403/5","title":"Comrades let's join our efforts on ukrainian and russian translations","fancy_title":null,"internal":true,"reflection":true,"clicks":1,"user_id":3417,"domain":"meta.discourse.org"},{"url":"https://meta.discourse.org/t/translation-workflow/6102/6","title":"Translation workflow","fancy_title":null,"internal":true,"reflection":false,"clicks":0,"user_id":1995,"domain":"meta.discourse.org"},{"url":"https://meta.discourse.org/t/bookmark-last-read-sometimes-doesn-t-go-to-the-end-of-a-topic/4825/9","title":"Bookmark/last read sometimes doesn't go to the end of a topic","fancy_title":null,"internal":true,"reflection":true,"clicks":0,"user_id":3681,"domain":"meta.discourse.org"},{"url":"https://github.com/discourse/discourse/blob/master/config/locales/client.de.yml","title":"discourse/config/locales/client.de.yml at master · discourse/discourse · GitHub","fancy_title":null,"internal":false,"reflection":false,"clicks":0,"user_id":2,"domain":"github.com"},{"url":"https://meta.discourse.org/t/what-i-love-about-wordpress-plugins/5697","title":"What I love about WordPress plugins","fancy_title":null,"internal":true,"reflection":true,"clicks":0,"user_id":1,"domain":"meta.discourse.org"},{"url":"https://meta.discourse.org/t/github-onebox-rendering-issue/7616","title":"GitHub OneBox Rendering Issue","fancy_title":null,"internal":true,"reflection":true,"clicks":0,"user_id":5372,"domain":"meta.discourse.org"},{"url":"https://github.com/discourse/discourse/blob/master/config/locales/server.de.yml","title":"discourse/config/locales/server.de.yml at master · discourse/discourse · GitHub","fancy_title":null,"internal":false,"reflection":false,"clicks":0,"user_id":2,"domain":"github.com"},{"url":"https://meta.discourse.org/t/roadplan-for-discourse/2939/5","title":"Roadplan for Discourse 2013","fancy_title":null,"internal":true,"reflection":true,"clicks":0,"user_id":32,"domain":"meta.discourse.org"},{"url":"https://meta.discourse.org/t/translation-tools-transifex-localeapp/7763","title":"Translation Tools: Transifex? Localeapp?","fancy_title":null,"internal":true,"reflection":true,"clicks":0,"user_id":2,"domain":"meta.discourse.org"},{"url":"http://guides.rubyonrails.org/i18n.html#the-public-i18n-api","title":"Rails Internationalization (I18n) API — Ruby on Rails Guides","fancy_title":null,"internal":false,"reflection":false,"clicks":0,"user_id":1895,"domain":"guides.rubyonrails.org"},{"url":"https://meta.discourse.org/t/hi-support-chinese/4393/6","title":"Hi, support Chinese?","fancy_title":null,"internal":true,"reflection":true,"clicks":0,"user_id":2014,"domain":"meta.discourse.org"},{"url":"https://meta.discourse.org/t/translation-tools-transifex-localeapp/7763/41","title":"Translation Tools: Transifex? Localeapp?","fancy_title":null,"internal":true,"reflection":false,"clicks":0,"user_id":6626,"domain":"meta.discourse.org"}],"notification_level":2,"notifications_reason_id":4,"can_move_posts":true,"can_edit":true,"can_delete":true,"can_recover":true,"can_remove_allowed_users":true,"can_invite_to":true,"can_create_post":true,"can_reply_as_new_topic":true,"can_flag_topic":true},"highest_post_number":104,"last_read_post_number":104,"deleted_by":null,"has_deleted":true,"actions_summary":[{"id":4,"count":0,"hidden":false,"can_act":true},{"id":7,"count":0,"hidden":false,"can_act":true},{"id":8,"count":0,"hidden":false,"can_act":true}],"chunk_size":20,"bookmarked":false,"tags":null}}; +export default {"/t/280/1.json": {"post_stream":{"posts":[{"id":398,"name":"Uwe Keim","username":"uwe_keim","avatar_template":"/user_avatar/meta.discourse.org/uwe_keim/{size}/5697.png","uploaded_avatar_id":5697,"created_at":"2013-02-05T21:29:00.280Z","cooked":"

    Any plans to support localization of UI elements, so that I (for example) could set up a completely German speaking forum?

    ","post_number":1,"post_type":1,"updated_at":"2013-02-05T21:29:00.280Z","like_count":0,"reply_count":1,"reply_to_post_number":null,"quote_count":0,"avg_time":25,"incoming_link_count":314,"reads":475,"score":1702.25,"yours":false,"topic_id":280,"topic_slug":"internationalization-localization","display_username":"Uwe Keim","primary_group_name":null,"version":1,"can_edit":true,"can_delete":false,"can_recover":true,"link_counts":[{"url":"https://meta.discourse.org/t/language-mirrors/2378/2","internal":true,"reflection":true,"title":"Language mirrors","clicks":3},{"url":"https://meta.discourse.org/t/translation-workflow/6102","internal":true,"reflection":true,"title":"Translation workflow","clicks":2},{"url":"https://meta.discourse.org/t/solving-xda-developer-style-forums/4368/4","internal":true,"reflection":true,"title":"Solving XDA-Developer style forums","clicks":2},{"url":"https://meta.discourse.org/t/comrades-lets-join-our-efforts-on-ukrainian-and-russian-translations/4403/5","internal":true,"reflection":true,"title":"Comrades let's join our efforts on ukrainian and russian translations","clicks":1},{"url":"https://meta.discourse.org/t/bookmark-last-read-sometimes-doesn-t-go-to-the-end-of-a-topic/4825/9","internal":true,"reflection":true,"title":"Bookmark/last read sometimes doesn't go to the end of a topic","clicks":0},{"url":"https://meta.discourse.org/t/roadplan-for-discourse/2939/5","internal":true,"reflection":true,"title":"Roadplan for Discourse 2013","clicks":0}],"read":true,"user_title":null,"actions_summary":[{"id":2,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":3,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":4,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":5,"count":0,"hidden":true,"can_act":true,"can_defer_flags":false},{"id":6,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":7,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":8,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false}],"moderator":false,"admin":false,"staff":false,"user_id":255,"hidden":false,"hidden_reason_id":null,"trust_level":2,"deleted_at":null,"user_deleted":false,"edit_reason":null,"can_view_edit_history":true,"wiki":false},{"id":419,"name":"Tim Stone","username":"tms","avatar_template":"/user_avatar/meta.discourse.org/tms/{size}/40181.png","uploaded_avatar_id":40181,"created_at":"2013-02-05T21:32:47.649Z","cooked":"

    The application strings are externalized, so localization should be entirely possible with enough translation effort.

    ","post_number":2,"post_type":1,"updated_at":"2013-02-06T10:15:27.965Z","like_count":4,"reply_count":0,"reply_to_post_number":null,"quote_count":0,"avg_time":27,"incoming_link_count":16,"reads":460,"score":308.35,"yours":false,"topic_id":280,"topic_slug":"internationalization-localization","display_username":"Tim Stone","primary_group_name":null,"version":2,"can_edit":true,"can_delete":true,"can_recover":true,"link_counts":[{"url":"https://github.com/discourse/discourse/blob/master/config/locales/en.yml","internal":false,"reflection":false,"clicks":118}],"read":true,"user_title":"Great contributor","actions_summary":[{"id":2,"count":4,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":3,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":4,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":5,"count":0,"hidden":true,"can_act":true,"can_defer_flags":false},{"id":6,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":7,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":8,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false}],"moderator":false,"admin":false,"staff":false,"user_id":9,"hidden":false,"hidden_reason_id":null,"trust_level":2,"deleted_at":null,"user_deleted":false,"edit_reason":null,"can_view_edit_history":true,"wiki":false},{"id":1060,"name":"Jeff Atwood","username":"codinghorror","avatar_template":"/user_avatar/meta.discourse.org/codinghorror/{size}/5297.png","uploaded_avatar_id":5297,"created_at":"2013-02-06T02:26:24.922Z","cooked":"

    Yep, all strings are going through a lookup table.*

    \n\n

    master/config/locales

    \n\n

    So you could replace that lookup table with the \"de\" one to get German.

    \n\n

    * we didn't get all the strings into the lookup table for launch, but the vast, vast majority of them are and the ones that are not, we will fix as we go!

    ","post_number":3,"post_type":1,"updated_at":"2014-02-24T05:23:39.211Z","like_count":4,"reply_count":3,"reply_to_post_number":null,"quote_count":0,"avg_time":33,"incoming_link_count":5,"reads":449,"score":191.45,"yours":false,"topic_id":280,"topic_slug":"internationalization-localization","display_username":"Jeff Atwood","primary_group_name":"discourse","version":4,"can_edit":true,"can_delete":true,"can_recover":true,"link_counts":[{"url":"https://github.com/discourse/discourse/blob/master/config/locales","internal":false,"reflection":false,"title":"discourse/config/locales at master · discourse/discourse · GitHub","clicks":62},{"url":"https://meta.discourse.org/t/github-onebox-rendering-issue/7616","internal":true,"reflection":true,"title":"GitHub OneBox Rendering Issue","clicks":0}],"read":true,"user_title":"co-founder","actions_summary":[{"id":2,"count":4,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":3,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":4,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":5,"count":0,"hidden":true,"can_act":true,"can_defer_flags":false},{"id":6,"count":1,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":7,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":8,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false}],"moderator":true,"admin":true,"staff":true,"user_id":32,"hidden":false,"hidden_reason_id":null,"trust_level":3,"deleted_at":null,"user_deleted":false,"edit_reason":"","can_view_edit_history":true,"wiki":false},{"id":3623,"name":"Shade","username":"shade","avatar_template":"/user_avatar/meta.discourse.org/shade/{size}/8306.png","uploaded_avatar_id":8306,"created_at":"2013-02-07T12:55:33.129Z","cooked":"

    Is it a coincidence that the strings file is 1337 lines long? \"smiley\"

    ","post_number":4,"post_type":1,"updated_at":"2013-02-07T12:55:33.129Z","like_count":7,"reply_count":0,"reply_to_post_number":null,"quote_count":0,"avg_time":20,"incoming_link_count":15,"reads":401,"score":291.2,"yours":false,"topic_id":280,"topic_slug":"internationalization-localization","display_username":"Shade","primary_group_name":null,"version":1,"can_edit":true,"can_delete":true,"can_recover":true,"link_counts":[{"url":"https://meta.discourse.org/t/hi-support-chinese/4393/6","internal":true,"reflection":true,"title":"Hi, support Chinese?","clicks":0}],"read":true,"user_title":null,"actions_summary":[{"id":2,"count":7,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":3,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":4,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":5,"count":0,"hidden":true,"can_act":true,"can_defer_flags":false},{"id":6,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":7,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":8,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false}],"moderator":false,"admin":false,"staff":false,"user_id":1808,"hidden":false,"hidden_reason_id":null,"trust_level":1,"deleted_at":null,"user_deleted":false,"edit_reason":null,"can_view_edit_history":true,"wiki":false},{"id":3651,"name":"Pekka Gaiser","username":"pekka","avatar_template":"/user_avatar/meta.discourse.org/pekka/{size}/5253.png","uploaded_avatar_id":5253,"created_at":"2013-02-07T14:02:07.869Z","cooked":"

    \n\n

    The problem I see here is that this file is likely two grow and change massively over the next couple months, and tracking these changes in order to keep a localized file up to date is going to be a bitch.

    \n\n

    I wonder where there is a tool that can compare two yml structures and point out which nodes are missing? That would help keep track of new strings.

    \n\n

    Re keeping track of changed strings, @codinghorror I found this very interesting: http://stackoverflow.com/questions/4232922/why-do-people-use-plain-english-as-translation-placeholders if plain English placeholders were used, any change in strings would lead to a new node in the yml file, making keeping the translation up to date easier. Maybe worth thinking about in the future.

    ","post_number":5,"post_type":1,"updated_at":"2013-02-07T14:05:42.328Z","like_count":2,"reply_count":2,"reply_to_post_number":3,"quote_count":1,"avg_time":22,"incoming_link_count":10,"reads":386,"score":213.3,"yours":false,"topic_id":280,"topic_slug":"internationalization-localization","display_username":"Pekka Gaiser","primary_group_name":null,"version":1,"can_edit":true,"can_delete":true,"can_recover":true,"link_counts":[{"url":"http://stackoverflow.com/questions/4232922/why-do-people-use-plain-english-as-translation-placeholders","internal":false,"reflection":false,"title":"internationalization - Why do people use plain english as translation placeholders? - Stack Overflow","clicks":63}],"read":true,"user_title":null,"actions_summary":[{"id":2,"count":2,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":3,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":4,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":5,"count":0,"hidden":true,"can_act":true,"can_defer_flags":false},{"id":6,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":7,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":8,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false}],"moderator":false,"admin":false,"staff":false,"user_id":7,"hidden":false,"hidden_reason_id":null,"trust_level":2,"deleted_at":null,"user_deleted":false,"edit_reason":null,"can_view_edit_history":true,"wiki":false},{"id":3654,"name":"Sam Saffron","username":"sam","avatar_template":"/user_avatar/meta.discourse.org/sam/{size}/5243.png","uploaded_avatar_id":5243,"created_at":"2013-02-07T14:05:39.910Z","cooked":"

    Yes, I really like the concept of fuzzy matching for localization, perhaps you can chase up alex sexton he was meaning to upload a localization tool for this kind of stuff.

    \n\n

    Also, I am a big fan of ICU message format, but it is not the \"Rails way (tm)\".

    ","post_number":6,"post_type":1,"updated_at":"2013-02-07T14:05:39.910Z","like_count":1,"reply_count":1,"reply_to_post_number":5,"quote_count":0,"avg_time":17,"incoming_link_count":4,"reads":329,"score":106.65,"yours":false,"topic_id":280,"topic_slug":"internationalization-localization","display_username":"Sam Saffron","primary_group_name":"discourse","version":1,"can_edit":true,"can_delete":true,"can_recover":true,"link_counts":[{"url":"https://github.com/SlexAxton/messageformat.js","internal":false,"reflection":false,"title":"SlexAxton/messageformat.js · GitHub","clicks":46},{"url":"https://github.com/SlexAxton","internal":false,"reflection":false,"title":"SlexAxton (Alex Sexton) · GitHub","clicks":10}],"read":true,"user_title":"co-founder","reply_to_user":{"username":"pekka","avatar_template":"/user_avatar/meta.discourse.org/pekka/{size}/5253.png","uploaded_avatar_id":5253},"actions_summary":[{"id":2,"count":1,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":3,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":4,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":5,"count":0,"hidden":true,"can_act":true,"can_defer_flags":false},{"id":6,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":7,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":8,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false}],"moderator":true,"admin":true,"staff":true,"user_id":1,"hidden":false,"hidden_reason_id":null,"trust_level":4,"deleted_at":null,"user_deleted":false,"edit_reason":null,"can_view_edit_history":true,"wiki":false},{"id":3655,"name":"Pekka Gaiser","username":"pekka","avatar_template":"/user_avatar/meta.discourse.org/pekka/{size}/5253.png","uploaded_avatar_id":5253,"created_at":"2013-02-07T14:08:17.493Z","cooked":"

    Looks interesting, I'll take a peek.

    \n\n

    As said on dev, the best tool I can see in terms of giving translators a proper interface and quality control would be something like GlotPress. It's based on the PO messages format (is that somehow related to ICU?) but looks pretty great.

    \n\n

    \n\n

    I'm not familiar with the term in this context, you mean keeping the English version in the code base (instead of a generic code like message_error_nametooshort ?)

    ","post_number":7,"post_type":1,"updated_at":"2013-02-07T14:12:02.965Z","like_count":1,"reply_count":1,"reply_to_post_number":6,"quote_count":1,"avg_time":16,"incoming_link_count":0,"reads":326,"score":86.0,"yours":false,"topic_id":280,"topic_slug":"internationalization-localization","display_username":"Pekka Gaiser","primary_group_name":null,"version":1,"can_edit":true,"can_delete":true,"can_recover":true,"link_counts":[{"url":"http://translate.wordpress.org/projects/bbpress/dev","internal":false,"reflection":false,"title":"WordPress › Development < GlotPress","clicks":16}],"read":true,"user_title":null,"actions_summary":[{"id":2,"count":1,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":3,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":4,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":5,"count":0,"hidden":true,"can_act":true,"can_defer_flags":false},{"id":6,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":7,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":8,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false}],"moderator":false,"admin":false,"staff":false,"user_id":7,"hidden":false,"hidden_reason_id":null,"trust_level":2,"deleted_at":null,"user_deleted":false,"edit_reason":null,"can_view_edit_history":true,"wiki":false},{"id":3658,"name":"Sam Saffron","username":"sam","avatar_template":"/user_avatar/meta.discourse.org/sam/{size}/5243.png","uploaded_avatar_id":5243,"created_at":"2013-02-07T14:12:22.582Z","cooked":"

    ICU Message format is basically Gettext on steroids, Gettext has been around for so many years and actually works pretty well, being super prevalent in Linux.

    \n\n

    Trouble is you need a fuzzy matcher for translators if you are going to store stuff like mf.compile( 'This is a message.' ) in source, one letter change and all your translators need to validate it.

    ","post_number":8,"post_type":1,"updated_at":"2013-02-07T14:12:22.582Z","like_count":1,"reply_count":1,"reply_to_post_number":7,"quote_count":0,"avg_time":11,"incoming_link_count":2,"reads":296,"score":89.75,"yours":false,"topic_id":280,"topic_slug":"internationalization-localization","display_username":"Sam Saffron","primary_group_name":"discourse","version":1,"can_edit":true,"can_delete":true,"can_recover":true,"link_counts":[{"url":"https://meta.discourse.org/t/what-i-love-about-wordpress-plugins/5697","internal":true,"reflection":true,"title":"What I love about WordPress plugins","clicks":0}],"read":true,"user_title":"co-founder","reply_to_user":{"username":"pekka","avatar_template":"/user_avatar/meta.discourse.org/pekka/{size}/5253.png","uploaded_avatar_id":5253},"actions_summary":[{"id":2,"count":1,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":3,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":4,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":5,"count":0,"hidden":true,"can_act":true,"can_defer_flags":false},{"id":6,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":7,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":8,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false}],"moderator":true,"admin":true,"staff":true,"user_id":1,"hidden":false,"hidden_reason_id":null,"trust_level":4,"deleted_at":null,"user_deleted":false,"edit_reason":null,"can_view_edit_history":true,"wiki":false},{"id":3660,"name":"Pekka Gaiser","username":"pekka","avatar_template":"/user_avatar/meta.discourse.org/pekka/{size}/5253.png","uploaded_avatar_id":5253,"created_at":"2013-02-07T14:14:12.666Z","cooked":"

    \n\n

    Yeah, that's why I've always been a friend of message_error_nametooshort placeholders, until I asked the SO question linked above. The accepted answer makes a good argument against those placeholders: you want translations to break even on small changes in the English original because the translations will probably need to reflect the change, too. Maybe that's not the case right now as new stuff is being checked in pretty much every couple of hours, but in the long run, it'll be overwhelmingly true.

    ","post_number":9,"post_type":1,"updated_at":"2013-02-07T14:18:09.569Z","like_count":1,"reply_count":1,"reply_to_post_number":8,"quote_count":1,"avg_time":10,"incoming_link_count":0,"reads":293,"score":79.1,"yours":false,"topic_id":280,"topic_slug":"internationalization-localization","display_username":"Pekka Gaiser","primary_group_name":null,"version":1,"can_edit":true,"can_delete":true,"can_recover":true,"read":true,"user_title":null,"actions_summary":[{"id":2,"count":1,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":3,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":4,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":5,"count":0,"hidden":true,"can_act":true,"can_defer_flags":false},{"id":6,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":7,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":8,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false}],"moderator":false,"admin":false,"staff":false,"user_id":7,"hidden":false,"hidden_reason_id":null,"trust_level":2,"deleted_at":null,"user_deleted":false,"edit_reason":null,"can_view_edit_history":true,"wiki":false},{"id":3667,"name":"Tim Stone","username":"tms","avatar_template":"/user_avatar/meta.discourse.org/tms/{size}/40181.png","uploaded_avatar_id":40181,"created_at":"2013-02-07T14:25:16.859Z","cooked":"

    Hmm...You could theoretically also build something into the development process that would monitor changes to the English locale file and make a translator-friendly list of changes between versions.

    ","post_number":10,"post_type":1,"updated_at":"2013-02-07T14:25:16.859Z","like_count":1,"reply_count":1,"reply_to_post_number":9,"quote_count":0,"avg_time":7,"incoming_link_count":0,"reads":275,"score":75.35,"yours":false,"topic_id":280,"topic_slug":"internationalization-localization","display_username":"Tim Stone","primary_group_name":null,"version":1,"can_edit":true,"can_delete":true,"can_recover":true,"read":true,"user_title":"Great contributor","reply_to_user":{"username":"pekka","avatar_template":"/user_avatar/meta.discourse.org/pekka/{size}/5253.png","uploaded_avatar_id":5253},"actions_summary":[{"id":2,"count":1,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":3,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":4,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":5,"count":0,"hidden":true,"can_act":true,"can_defer_flags":false},{"id":6,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":7,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":8,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false}],"moderator":false,"admin":false,"staff":false,"user_id":9,"hidden":false,"hidden_reason_id":null,"trust_level":2,"deleted_at":null,"user_deleted":false,"edit_reason":null,"can_view_edit_history":true,"wiki":false},{"id":3673,"name":"Sam Saffron","username":"sam","avatar_template":"/user_avatar/meta.discourse.org/sam/{size}/5243.png","uploaded_avatar_id":5243,"created_at":"2013-02-07T14:30:21.401Z","cooked":"

    Yeah, totally, also we could build tools for dev that make introducing string less annoying and make it possible to garbage collect old unused strings, I hate trudging through that file.

    ","post_number":11,"post_type":1,"updated_at":"2013-02-07T14:30:21.401Z","like_count":1,"reply_count":1,"reply_to_post_number":10,"quote_count":0,"avg_time":7,"incoming_link_count":1,"reads":273,"score":79.95,"yours":false,"topic_id":280,"topic_slug":"internationalization-localization","display_username":"Sam Saffron","primary_group_name":"discourse","version":1,"can_edit":true,"can_delete":true,"can_recover":true,"read":true,"user_title":"co-founder","reply_to_user":{"username":"tms","avatar_template":"/user_avatar/meta.discourse.org/tms/{size}/40181.png","uploaded_avatar_id":40181},"actions_summary":[{"id":2,"count":1,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":3,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":4,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":5,"count":0,"hidden":true,"can_act":true,"can_defer_flags":false},{"id":6,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":7,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":8,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false}],"moderator":true,"admin":true,"staff":true,"user_id":1,"hidden":false,"hidden_reason_id":null,"trust_level":4,"deleted_at":null,"user_deleted":false,"edit_reason":null,"can_view_edit_history":true,"wiki":false},{"id":3675,"name":"Pekka Gaiser","username":"pekka","avatar_template":"/user_avatar/meta.discourse.org/pekka/{size}/5253.png","uploaded_avatar_id":5253,"created_at":"2013-02-07T14:33:38.280Z","cooked":"

    \n\n

    As said, I'd look into whether WP's tools can't be reused for this with some tweaking. They seem to be able to scan a code base for new strings, and make them available automatically to translators.

    \n\n

    They're PHP based which isn't ideal, but it looks like they've done a crapload of work to take the hassle out of translations.

    ","post_number":12,"post_type":1,"updated_at":"2013-02-07T14:34:39.910Z","like_count":1,"reply_count":1,"reply_to_post_number":11,"quote_count":1,"avg_time":7,"incoming_link_count":2,"reads":273,"score":84.95,"yours":false,"topic_id":280,"topic_slug":"internationalization-localization","display_username":"Pekka Gaiser","primary_group_name":null,"version":1,"can_edit":true,"can_delete":true,"can_recover":true,"read":true,"user_title":null,"actions_summary":[{"id":2,"count":1,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":3,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":4,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":5,"count":0,"hidden":true,"can_act":true,"can_defer_flags":false},{"id":6,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":7,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":8,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false}],"moderator":false,"admin":false,"staff":false,"user_id":7,"hidden":false,"hidden_reason_id":null,"trust_level":2,"deleted_at":null,"user_deleted":false,"edit_reason":null,"can_view_edit_history":true,"wiki":false},{"id":3690,"name":"Valts","username":"Vilx","avatar_template":"/user_avatar/meta.discourse.org/vilx/{size}/7299.png","uploaded_avatar_id":7299,"created_at":"2013-02-07T15:05:35.867Z","cooked":"

    This site looks so nice with all the little tweaks like \"10 minutes ago\" instead of simply time, etc - I wonder if there will also be support for proper pluralization in other languages? That's a pretty hard task though, I don't think I've ever seen a website that has done that. But it would be awesome.

    ","post_number":13,"post_type":1,"updated_at":"2013-02-07T15:05:35.867Z","like_count":3,"reply_count":0,"reply_to_post_number":null,"quote_count":0,"avg_time":7,"incoming_link_count":11,"reads":290,"score":158.35,"yours":false,"topic_id":280,"topic_slug":"internationalization-localization","display_username":"Valts","primary_group_name":null,"version":1,"can_edit":true,"can_delete":true,"can_recover":true,"read":true,"user_title":null,"actions_summary":[{"id":2,"count":3,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":3,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":4,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":5,"count":0,"hidden":true,"can_act":true,"can_defer_flags":false},{"id":6,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":7,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":8,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false}],"moderator":false,"admin":false,"staff":false,"user_id":1216,"hidden":false,"hidden_reason_id":null,"trust_level":2,"deleted_at":null,"user_deleted":false,"edit_reason":null,"can_view_edit_history":true,"wiki":false},{"id":3925,"name":"Eric Kidd","username":"emk","avatar_template":"/user_avatar/meta.discourse.org/emk/{size}/8400.png","uploaded_avatar_id":8400,"created_at":"2013-02-07T19:37:06.194Z","cooked":"

    \n\n

    I've had pretty decent luck using Localeapp to localize Rails applications:

    \n\n

    http://www.localeapp.com/

    \n\n

    The developer workflow took me about an hour to really get used to, and there were a few minor glitches. But the non-technical translators had very few problems. One limitation: It insists on rewriting all those yaml files full of strings.

    \n\n

    Anyway, it's worth a look, and it's free for open source, if I recall correctly. Certainly easier than doing a whole bunch of toolsmithing from scratch.

    ","post_number":14,"post_type":1,"updated_at":"2013-02-07T19:37:06.194Z","like_count":3,"reply_count":1,"reply_to_post_number":12,"quote_count":1,"avg_time":9,"incoming_link_count":0,"reads":283,"score":137.05,"yours":false,"topic_id":280,"topic_slug":"internationalization-localization","display_username":"Eric Kidd","primary_group_name":null,"version":1,"can_edit":true,"can_delete":true,"can_recover":true,"link_counts":[{"url":"http://www.localeapp.com/","internal":false,"reflection":false,"title":"Easy localization for Rails apps | Locale","clicks":69}],"read":true,"user_title":null,"actions_summary":[{"id":2,"count":3,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":3,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":4,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":5,"count":0,"hidden":true,"can_act":true,"can_defer_flags":false},{"id":6,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":7,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":8,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false}],"moderator":false,"admin":false,"staff":false,"user_id":1860,"hidden":false,"hidden_reason_id":null,"trust_level":1,"deleted_at":null,"user_deleted":false,"edit_reason":null,"can_view_edit_history":true,"wiki":false},{"id":3938,"name":"Pekka Gaiser","username":"pekka","avatar_template":"/user_avatar/meta.discourse.org/pekka/{size}/5253.png","uploaded_avatar_id":5253,"created_at":"2013-02-07T19:52:13.748Z","cooked":"

    \n\n

    Ohhh. Looking sexy. droool

    ","post_number":15,"post_type":1,"updated_at":"2013-02-07T19:52:13.748Z","like_count":1,"reply_count":1,"reply_to_post_number":14,"quote_count":1,"avg_time":7,"incoming_link_count":0,"reads":260,"score":72.35,"yours":false,"topic_id":280,"topic_slug":"internationalization-localization","display_username":"Pekka Gaiser","primary_group_name":null,"version":1,"can_edit":true,"can_delete":true,"can_recover":true,"read":true,"user_title":null,"actions_summary":[{"id":2,"count":1,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":3,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":4,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":5,"count":0,"hidden":true,"can_act":true,"can_defer_flags":false},{"id":6,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":7,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":8,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false}],"moderator":false,"admin":false,"staff":false,"user_id":7,"hidden":false,"hidden_reason_id":null,"trust_level":2,"deleted_at":null,"user_deleted":false,"edit_reason":null,"can_view_edit_history":true,"wiki":false},{"id":3982,"name":"Eric Kidd","username":"emk","avatar_template":"/user_avatar/meta.discourse.org/emk/{size}/8400.png","uploaded_avatar_id":8400,"created_at":"2013-02-07T20:52:22.454Z","cooked":"

    \n\n

    Yeah, it's pretty. \"smile\" But there were still some rough edges as of a few months ago.

    \n\n

    Whether or not those rough edges are a deal-breaker will probably depends on whether or not localization is already a source of acute pain. If you're already hurting, Localeapp is a pretty useful tool, especially when it comes to enlisting non-technical translators.

    \n\n

    But it does require changing how you work with text, and adding one new tool to the mix. So for projects that just don't want to know about non-English languages, it's not yet seamless the way Unicode is these days.

    \n\n

    (Sweet forum software, by the way. I was just testing out Egyptian hieroglyphics on the test server, because they're well off the Basic Multilingual Plane, and tend to flush Unicode bugs. Everything worked flawlessly.)

    ","post_number":16,"post_type":1,"updated_at":"2013-02-07T20:52:22.454Z","like_count":1,"reply_count":1,"reply_to_post_number":15,"quote_count":1,"avg_time":7,"incoming_link_count":0,"reads":254,"score":71.15,"yours":false,"topic_id":280,"topic_slug":"internationalization-localization","display_username":"Eric Kidd","primary_group_name":null,"version":1,"can_edit":true,"can_delete":true,"can_recover":true,"read":true,"user_title":null,"actions_summary":[{"id":2,"count":1,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":3,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":4,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":5,"count":0,"hidden":true,"can_act":true,"can_defer_flags":false},{"id":6,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":7,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":8,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false}],"moderator":false,"admin":false,"staff":false,"user_id":1860,"hidden":false,"hidden_reason_id":null,"trust_level":1,"deleted_at":null,"user_deleted":false,"edit_reason":null,"can_view_edit_history":true,"wiki":false},{"id":3989,"name":"Pekka Gaiser","username":"pekka","avatar_template":"/user_avatar/meta.discourse.org/pekka/{size}/5253.png","uploaded_avatar_id":5253,"created_at":"2013-02-07T21:04:15.405Z","cooked":"

    \n\n

    Interesting, thanks for the insight. I don't think localization is seriously on their table right now, there's likely to be many other things on the table before it... but it will become an issue sooner or later.

    ","post_number":17,"post_type":1,"updated_at":"2013-02-07T21:04:15.405Z","like_count":1,"reply_count":2,"reply_to_post_number":16,"quote_count":1,"avg_time":7,"incoming_link_count":0,"reads":255,"score":76.35,"yours":false,"topic_id":280,"topic_slug":"internationalization-localization","display_username":"Pekka Gaiser","primary_group_name":null,"version":1,"can_edit":true,"can_delete":true,"can_recover":true,"read":true,"user_title":null,"actions_summary":[{"id":2,"count":1,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":3,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":4,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":5,"count":0,"hidden":true,"can_act":true,"can_defer_flags":false},{"id":6,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":7,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":8,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false}],"moderator":false,"admin":false,"staff":false,"user_id":7,"hidden":false,"hidden_reason_id":null,"trust_level":2,"deleted_at":null,"user_deleted":false,"edit_reason":null,"can_view_edit_history":true,"wiki":false},{"id":3996,"name":"Sam Saffron","username":"sam","avatar_template":"/user_avatar/meta.discourse.org/sam/{size}/5243.png","uploaded_avatar_id":5243,"created_at":"2013-02-07T21:12:06.575Z","cooked":"

    I had an idea ... what if in dev mode, you could right-click on a page and get access to all the translations on the page, make your edits and have it refreshed live.

    \n\n

    I think it would be awesome, very doable technically.

    ","post_number":18,"post_type":1,"updated_at":"2013-02-07T21:12:06.575Z","like_count":7,"reply_count":2,"reply_to_post_number":17,"quote_count":0,"avg_time":8,"incoming_link_count":0,"reads":264,"score":168.2,"yours":false,"topic_id":280,"topic_slug":"internationalization-localization","display_username":"Sam Saffron","primary_group_name":"discourse","version":1,"can_edit":true,"can_delete":true,"can_recover":true,"read":true,"user_title":"co-founder","reply_to_user":{"username":"pekka","avatar_template":"/user_avatar/meta.discourse.org/pekka/{size}/5253.png","uploaded_avatar_id":5253},"actions_summary":[{"id":2,"count":7,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":3,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":4,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":5,"count":0,"hidden":true,"can_act":true,"can_defer_flags":false},{"id":6,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":7,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":8,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false}],"moderator":true,"admin":true,"staff":true,"user_id":1,"hidden":false,"hidden_reason_id":null,"trust_level":4,"deleted_at":null,"user_deleted":false,"edit_reason":null,"can_view_edit_history":true,"wiki":false},{"id":4009,"name":"Pekka Gaiser","username":"pekka","avatar_template":"/user_avatar/meta.discourse.org/pekka/{size}/5253.png","uploaded_avatar_id":5253,"created_at":"2013-02-07T21:18:47.422Z","cooked":"

    That would be fricking cool. There'd still be some leftovers (like error messages that normally never show up, etc.) but you could corral those up on a specific page.

    \n\n

    It could have a dropdown giving you all the languages that you have a .yml for in the locale directory, and write the changes into the one selected. I'm sure people would love it.

    ","post_number":19,"post_type":1,"updated_at":"2013-02-07T21:22:10.692Z","like_count":1,"reply_count":0,"reply_to_post_number":18,"quote_count":0,"avg_time":8,"incoming_link_count":1,"reads":241,"score":68.6,"yours":false,"topic_id":280,"topic_slug":"internationalization-localization","display_username":"Pekka Gaiser","primary_group_name":null,"version":1,"can_edit":true,"can_delete":true,"can_recover":true,"read":true,"user_title":null,"reply_to_user":{"username":"sam","avatar_template":"/user_avatar/meta.discourse.org/sam/{size}/5243.png","uploaded_avatar_id":5243},"actions_summary":[{"id":2,"count":1,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":3,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":4,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":5,"count":0,"hidden":true,"can_act":true,"can_defer_flags":false},{"id":6,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":7,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":8,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false}],"moderator":false,"admin":false,"staff":false,"user_id":7,"hidden":false,"hidden_reason_id":null,"trust_level":2,"deleted_at":null,"user_deleted":false,"edit_reason":null,"can_view_edit_history":true,"wiki":false},{"id":4012,"name":"Marco Ceppi","username":"marcoceppi","avatar_template":"/user_avatar/meta.discourse.org/marcoceppi/{size}/6552.png","uploaded_avatar_id":6552,"created_at":"2013-02-07T21:22:46.376Z","cooked":"

    If you use gettext format you could leverage Launchpad translations and the community behind it.

    ","post_number":20,"post_type":1,"updated_at":"2013-02-07T21:22:46.376Z","like_count":1,"reply_count":0,"reply_to_post_number":null,"quote_count":0,"avg_time":9,"incoming_link_count":2,"reads":244,"score":74.25,"yours":false,"topic_id":280,"topic_slug":"internationalization-localization","display_username":"Marco Ceppi","primary_group_name":null,"version":1,"can_edit":true,"can_delete":true,"can_recover":true,"link_counts":[{"url":"https://translations.launchpad.net/","internal":false,"reflection":false,"title":"Launchpad Translations","clicks":13}],"read":true,"user_title":null,"actions_summary":[{"id":2,"count":1,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":3,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":4,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":5,"count":0,"hidden":true,"can_act":true,"can_defer_flags":false},{"id":6,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":7,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":8,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false}],"moderator":false,"admin":false,"staff":false,"user_id":761,"hidden":false,"hidden_reason_id":null,"trust_level":2,"deleted_at":null,"user_deleted":false,"edit_reason":null,"can_view_edit_history":true,"wiki":false}],"stream":[398,419,1060,3623,3651,3654,3655,3658,3660,3667,3673,3675,3690,3925,3938,3982,3989,3996,4009,4012],"gaps":{"before":{"20706":[20125]},"after":{}}},"id":280,"title":"Internationalization / localization","fancy_title":"Internationalization / localization","posts_count":103,"created_at":"2013-02-05T21:29:00.174Z","views":5211,"reply_count":67,"participant_count":40,"like_count":135,"last_posted_at":"2015-03-04T15:07:10.487Z","visible":true,"closed":false,"archived":false,"has_summary":true,"archetype":"regular","slug":"internationalization-localization","category_id":2,"word_count":6198,"deleted_at":null,"draft":null,"draft_key":"topic_280","draft_sequence":4,"posted":true,"unpinned":null,"pinned_globally":false,"pinned":false,"pinned_at":null,"details":{"auto_close_at":null,"auto_close_hours":null,"auto_close_based_on_last_post":false,"created_by":{"id":255,"username":"uwe_keim","uploaded_avatar_id":5697,"avatar_template":"/user_avatar/meta.discourse.org/uwe_keim/{size}/5697.png"},"last_poster":{"id":14091,"username":"Luciano_Fantuzzi","uploaded_avatar_id":39484,"avatar_template":"/user_avatar/meta.discourse.org/luciano_fantuzzi/{size}/39484.png"},"participants":[{"id":212,"username":"alxndr","uploaded_avatar_id":5619,"avatar_template":"/user_avatar/meta.discourse.org/alxndr/{size}/5619.png","post_count":11},{"id":1,"username":"sam","uploaded_avatar_id":5243,"avatar_template":"/user_avatar/meta.discourse.org/sam/{size}/5243.png","post_count":11},{"id":7,"username":"pekka","uploaded_avatar_id":5253,"avatar_template":"/user_avatar/meta.discourse.org/pekka/{size}/5253.png","post_count":8},{"id":461,"username":"kuba","uploaded_avatar_id":6049,"avatar_template":"/user_avatar/meta.discourse.org/kuba/{size}/6049.png","post_count":7},{"id":2995,"username":"tattoo","uploaded_avatar_id":null,"avatar_template":"/letter_avatar/tattoo/{size}/3.png","post_count":6},{"id":2540,"username":"jgourdon","uploaded_avatar_id":9537,"avatar_template":"/user_avatar/meta.discourse.org/jgourdon/{size}/9537.png","post_count":5},{"id":1860,"username":"emk","uploaded_avatar_id":8400,"avatar_template":"/user_avatar/meta.discourse.org/emk/{size}/8400.png","post_count":4},{"id":1275,"username":"dacap","uploaded_avatar_id":7401,"avatar_template":"/user_avatar/meta.discourse.org/dacap/{size}/7401.png","post_count":4},{"id":19,"username":"eviltrout","uploaded_avatar_id":5275,"avatar_template":"/user_avatar/meta.discourse.org/eviltrout/{size}/5275.png","post_count":4},{"id":3704,"username":"mojzis","uploaded_avatar_id":31201,"avatar_template":"/user_avatar/meta.discourse.org/mojzis/{size}/31201.png","post_count":3},{"id":3190,"username":"gururea","uploaded_avatar_id":10663,"avatar_template":"/user_avatar/meta.discourse.org/gururea/{size}/10663.png","post_count":3},{"id":1895,"username":"maciek","uploaded_avatar_id":8463,"avatar_template":"/user_avatar/meta.discourse.org/maciek/{size}/8463.png","post_count":3},{"id":22,"username":"splattne","uploaded_avatar_id":5280,"avatar_template":"/user_avatar/meta.discourse.org/splattne/{size}/5280.png","post_count":2},{"id":1979,"username":"Superuser","uploaded_avatar_id":8604,"avatar_template":"/user_avatar/meta.discourse.org/superuser/{size}/8604.png","post_count":2},{"id":3818,"username":"Tudor","uploaded_avatar_id":11675,"avatar_template":"/user_avatar/meta.discourse.org/tudor/{size}/11675.png","post_count":2},{"id":32,"username":"codinghorror","uploaded_avatar_id":5297,"avatar_template":"/user_avatar/meta.discourse.org/codinghorror/{size}/5297.png","post_count":2},{"id":3620,"username":"potthast","uploaded_avatar_id":11363,"avatar_template":"/user_avatar/meta.discourse.org/potthast/{size}/11363.png","post_count":2},{"id":9,"username":"tms","uploaded_avatar_id":40181,"avatar_template":"/user_avatar/meta.discourse.org/tms/{size}/40181.png","post_count":2},{"id":14091,"username":"Luciano_Fantuzzi","uploaded_avatar_id":39484,"avatar_template":"/user_avatar/meta.discourse.org/luciano_fantuzzi/{size}/39484.png","post_count":1},{"id":255,"username":"uwe_keim","uploaded_avatar_id":5697,"avatar_template":"/user_avatar/meta.discourse.org/uwe_keim/{size}/5697.png","post_count":1},{"id":9006,"username":"berk","uploaded_avatar_id":19348,"avatar_template":"/user_avatar/meta.discourse.org/berk/{size}/19348.png","post_count":1},{"id":754,"username":"danneu","uploaded_avatar_id":6540,"avatar_template":"/user_avatar/meta.discourse.org/danneu/{size}/6540.png","post_count":1},{"id":761,"username":"marcoceppi","uploaded_avatar_id":6552,"avatar_template":"/user_avatar/meta.discourse.org/marcoceppi/{size}/6552.png","post_count":1},{"id":2753,"username":"mikl","uploaded_avatar_id":9918,"avatar_template":"/user_avatar/meta.discourse.org/mikl/{size}/9918.png","post_count":1}],"suggested_topics":[{"id":27331,"title":"Polls are still very buggy","fancy_title":"Polls are still very buggy","slug":"polls-are-still-very-buggy","posts_count":4,"reply_count":1,"highest_post_number":4,"image_url":"/uploads/default/_optimized/cd1/b8c/c162528887_690x401.png","created_at":"2015-04-08T09:51:00.357Z","last_posted_at":"2015-04-08T15:59:16.258Z","bumped":true,"bumped_at":"2015-04-08T16:05:09.842Z","unseen":false,"last_read_post_number":3,"unread":0,"new_posts":1,"pinned":false,"unpinned":null,"visible":true,"closed":false,"archived":false,"notification_level":2,"bookmarked":false,"liked":false,"archetype":"regular","like_count":11,"views":55,"category_id":1},{"id":27343,"title":"Mobile theme doesn't show last activity time for topics on category page","fancy_title":"Mobile theme doesn’t show last activity time for topics on category page","slug":"mobile-theme-doesnt-show-last-activity-time-for-topics-on-category-page","posts_count":4,"reply_count":2,"highest_post_number":4,"image_url":"/uploads/default/_optimized/13e/25c/bd30b466be_281x500.png","created_at":"2015-04-08T14:20:51.177Z","last_posted_at":"2015-04-08T15:40:30.037Z","bumped":true,"bumped_at":"2015-04-08T15:40:30.037Z","unseen":false,"last_read_post_number":2,"unread":0,"new_posts":2,"pinned":false,"unpinned":null,"visible":true,"closed":false,"archived":false,"notification_level":2,"bookmarked":false,"liked":false,"archetype":"regular","like_count":3,"views":23,"category_id":9},{"id":27346,"title":"Reply+{messagekey}@... optionaly in header \"from\" in addition to \"reply-to\"","fancy_title":"Reply+{messagekey}@… optionaly in header “from” in addition to “reply-to”","slug":"reply-messagekey-optionaly-in-header-from-in-addition-to-reply-to","posts_count":1,"reply_count":0,"highest_post_number":1,"image_url":null,"created_at":"2015-04-08T16:05:13.103Z","last_posted_at":"2015-04-08T16:05:13.415Z","bumped":true,"bumped_at":"2015-04-08T16:05:13.415Z","unseen":true,"pinned":false,"unpinned":null,"visible":true,"closed":false,"archived":false,"bookmarked":null,"liked":null,"archetype":"regular","like_count":0,"views":8,"category_id":2},{"id":19670,"title":"Parsing (Oneboxing) IMDB links","fancy_title":"Parsing (Oneboxing) IMDB links","slug":"parsing-oneboxing-imdb-links","posts_count":8,"reply_count":1,"highest_post_number":8,"image_url":null,"created_at":"2014-09-05T07:19:26.161Z","last_posted_at":"2015-04-07T09:21:21.570Z","bumped":true,"bumped_at":"2015-04-07T09:21:21.570Z","unseen":false,"last_read_post_number":8,"unread":0,"new_posts":0,"pinned":false,"unpinned":null,"visible":true,"closed":false,"archived":false,"notification_level":2,"bookmarked":false,"liked":false,"archetype":"regular","like_count":4,"views":253,"category_id":2},{"id":7512,"title":"Support for Piwik Analytics as an alternative to Google Analytics","fancy_title":"Support for Piwik Analytics as an alternative to Google Analytics","slug":"support-for-piwik-analytics-as-an-alternative-to-google-analytics","posts_count":53,"reply_count":41,"highest_post_number":65,"image_url":"/plugins/emoji/images/smile.png","created_at":"2013-06-16T01:32:30.596Z","last_posted_at":"2015-02-22T13:46:26.845Z","bumped":true,"bumped_at":"2015-02-22T13:46:26.845Z","unseen":false,"last_read_post_number":65,"unread":0,"new_posts":0,"pinned":false,"unpinned":null,"visible":true,"closed":false,"archived":false,"notification_level":2,"bookmarked":false,"liked":false,"archetype":"regular","like_count":62,"views":1877,"category_id":2},{"id":25480,"title":"CSS admin-contents reloaded","fancy_title":"CSS admin-contents reloaded","slug":"css-admin-contents-reloaded","posts_count":22,"reply_count":15,"highest_post_number":22,"image_url":null,"created_at":"2015-02-21T12:15:57.707Z","last_posted_at":"2015-03-02T23:24:18.899Z","bumped":true,"bumped_at":"2015-03-02T23:24:18.899Z","unseen":false,"pinned":false,"unpinned":null,"visible":true,"closed":false,"archived":false,"bookmarked":null,"liked":null,"archetype":"regular","like_count":21,"views":185,"category_id":2},{"id":26576,"title":"Badge timestamp should be the time the badge was granted?","fancy_title":"Badge timestamp should be the time the badge was granted?","slug":"badge-timestamp-should-be-the-time-the-badge-was-granted","posts_count":2,"reply_count":0,"highest_post_number":2,"image_url":null,"created_at":"2015-03-20T13:22:08.266Z","last_posted_at":"2015-03-21T00:33:52.243Z","bumped":true,"bumped_at":"2015-03-21T00:33:52.243Z","unseen":false,"last_read_post_number":1,"unread":0,"new_posts":0,"pinned":false,"unpinned":null,"visible":true,"closed":false,"archived":false,"notification_level":1,"bookmarked":false,"liked":false,"archetype":"regular","like_count":9,"views":87,"category_id":2}],"links":[{"url":"https://github.com/discourse/discourse/blob/master/config/locales/en.yml","title":null,"fancy_title":null,"internal":false,"reflection":false,"clicks":118,"user_id":9,"domain":"github.com"},{"url":"http://www.localeapp.com/","title":"Easy localization for Rails apps | Locale","fancy_title":null,"internal":false,"reflection":false,"clicks":69,"user_id":1860,"domain":"www.localeapp.com"},{"url":"http://stackoverflow.com/questions/4232922/why-do-people-use-plain-english-as-translation-placeholders","title":"internationalization - Why do people use plain english as translation placeholders? - Stack Overflow","fancy_title":null,"internal":false,"reflection":false,"clicks":63,"user_id":7,"domain":"stackoverflow.com"},{"url":"https://github.com/discourse/discourse/blob/master/config/locales","title":"discourse/config/locales at master · discourse/discourse · GitHub","fancy_title":null,"internal":false,"reflection":false,"clicks":62,"user_id":32,"domain":"github.com"},{"url":"https://github.com/SlexAxton/messageformat.js","title":"SlexAxton/messageformat.js · GitHub","fancy_title":null,"internal":false,"reflection":false,"clicks":46,"user_id":1,"domain":"github.com"},{"url":"http://www.localeapp.com/projects/1537/translations?utf8=%E2%9C%93&search=source_code","title":"langforums | Locale","fancy_title":null,"internal":false,"reflection":false,"clicks":25,"user_id":1860,"domain":"www.localeapp.com"},{"url":"https://translations.launchpad.net/","title":"Launchpad Translations","fancy_title":null,"internal":false,"reflection":false,"clicks":23,"user_id":761,"domain":"translations.launchpad.net"},{"url":"https://www.transifex.com/","title":"Transifex - Continuous Localization Platform","fancy_title":null,"internal":false,"reflection":false,"clicks":22,"user_id":1979,"domain":"www.transifex.com"},{"url":"https://github.com/berk/tr8n","title":"berk/tr8n · GitHub","fancy_title":null,"internal":false,"reflection":false,"clicks":22,"user_id":1,"domain":"github.com"},{"url":"http://translate.wordpress.org/projects/bbpress/dev","title":"WordPress › Development < GlotPress","fancy_title":null,"internal":false,"reflection":false,"clicks":16,"user_id":7,"domain":"translate.wordpress.org"},{"url":"http://weblate.org","title":"Weblate - web-based translation","fancy_title":null,"internal":false,"reflection":false,"clicks":15,"user_id":2316,"domain":"weblate.org"},{"url":"https://github.com/discourse/discourse/tree/master/config/locales","title":"discourse/config/locales at master · discourse/discourse · GitHub","fancy_title":null,"internal":false,"reflection":false,"clicks":14,"user_id":19,"domain":"github.com"},{"url":"https://github.com/discourse/discourse/pull/493","title":"Danish translation. by mikl · Pull Request #493 · discourse/discourse · GitHub","fancy_title":null,"internal":false,"reflection":false,"clicks":12,"user_id":2753,"domain":"github.com"},{"url":"https://github.com/SlexAxton","title":"SlexAxton (Alex Sexton) · GitHub","fancy_title":null,"internal":false,"reflection":false,"clicks":10,"user_id":1,"domain":"github.com"},{"url":"https://github.com/gururea/discourse/tree/master/config/locales","title":"discourse/config/locales at master · gururea/discourse · GitHub","fancy_title":null,"internal":false,"reflection":false,"clicks":9,"user_id":3190,"domain":"github.com"},{"url":"https://github.com/discourse/discourse/blob/master/config/locales/client.en.yml#L691","title":"discourse/config/locales/client.en.yml at master · discourse/discourse · GitHub","fancy_title":null,"internal":false,"reflection":false,"clicks":7,"user_id":461,"domain":"github.com"},{"url":"https://github.com/dacap/discourse/tree/spanish","title":"dacap/discourse · GitHub","fancy_title":null,"internal":false,"reflection":false,"clicks":7,"user_id":1275,"domain":"github.com"},{"url":"https://github.com/discourse/discourse/blob/master/config/locales/client.nl.yml","title":"discourse/config/locales/client.nl.yml at master · discourse/discourse · GitHub","fancy_title":null,"internal":false,"reflection":false,"clicks":7,"user_id":461,"domain":"github.com"},{"url":"https://github.com/discourse/discourse/commit/c5761eae8afe37e20cec0d0f9d14b85b6e585bda","title":"Support for Simplified Chinese thanks to tangramor · c5761ea · discourse/discourse · GitHub","fancy_title":null,"internal":false,"reflection":false,"clicks":6,"user_id":212,"domain":"github.com"},{"url":"http://tr8n.github.com/","title":"tr8n","fancy_title":null,"internal":false,"reflection":false,"clicks":6,"user_id":212,"domain":"tr8n.github.com"},{"url":"http://www.getlocalization.com/","title":"Crowdsourced, Social and Collaborative App & Website Translation - Get Localization","fancy_title":null,"internal":false,"reflection":false,"clicks":6,"user_id":22,"domain":"www.getlocalization.com"},{"url":"http://blog.discourse.org/2013/04/discourse-as-your-first-rails-app/","title":"Discourse as Your First Rails App","fancy_title":null,"internal":false,"reflection":false,"clicks":5,"user_id":1995,"domain":"blog.discourse.org"},{"url":"https://github.com/alxndr/discourse/blob/i18n-chinese/config/locales/server.zh.yml","title":null,"fancy_title":null,"internal":false,"reflection":false,"clicks":5,"user_id":212,"domain":"github.com"},{"url":"http://translate.sourceforge.net/wiki/virtaal/index","title":"Easy-to-use and powerful offline translation tool | Virtaal","fancy_title":null,"internal":false,"reflection":false,"clicks":4,"user_id":1979,"domain":"translate.sourceforge.net"},{"url":"https://poeditor.com/","title":"POEditor - online software localization tool","fancy_title":null,"internal":false,"reflection":false,"clicks":4,"user_id":1979,"domain":"poeditor.com"},{"url":"http://en.lichess.org/@/Hellball","title":null,"fancy_title":null,"internal":false,"reflection":false,"clicks":3,"user_id":1979,"domain":"en.lichess.org"},{"url":"http://en.wikipedia.org/wiki/T%E2%80%93V_distinction","title":"T–V distinction - Wikipedia, the free encyclopedia","fancy_title":null,"internal":false,"reflection":false,"clicks":3,"user_id":3620,"domain":"en.wikipedia.org"},{"url":"http://www.slideshare.net/HeatherRivers/linguistic-potluck-crowdsourcing-localization-with-rails","title":"Linguistic Potluck: Crowdsourcing localization with Rails","fancy_title":null,"internal":false,"reflection":false,"clicks":3,"user_id":212,"domain":"www.slideshare.net"},{"url":"https://meta.discourse.org/t/language-mirrors/2378/2","title":"Language mirrors","fancy_title":null,"internal":true,"reflection":true,"clicks":3,"user_id":32,"domain":"meta.discourse.org"},{"url":"http://www.madanalogy.com/2012/06/rails-i18n-translations-in-yaml.html","title":"Mad Analogy: Rails i18n translations in Yaml: translation tool support","fancy_title":null,"internal":false,"reflection":false,"clicks":3,"user_id":3190,"domain":"www.madanalogy.com"},{"url":"https://github.com/tr8n","title":"Translation Exchange · GitHub","fancy_title":null,"internal":false,"reflection":false,"clicks":3,"user_id":9006,"domain":"github.com"},{"url":"http://pootle.locamotion.org/","title":"Main | Pootle Demo","fancy_title":null,"internal":false,"reflection":false,"clicks":2,"user_id":3190,"domain":"pootle.locamotion.org"},{"url":"http://www.youtube.com/watch?v=MqqdzJ98q7s","title":"GoGaRuCo 2012 - Linguistic Potluck: Crowdsourcing Localization in Rails by Heather Rivers - YouTube","fancy_title":null,"internal":false,"reflection":false,"clicks":2,"user_id":212,"domain":"www.youtube.com"},{"url":"https://meta.discourse.org/t/translation-workflow/6102","title":"Translation workflow","fancy_title":null,"internal":true,"reflection":true,"clicks":2,"user_id":4702,"domain":"meta.discourse.org"},{"url":"https://meta.discourse.org/t/solving-xda-developer-style-forums/4368/4","title":"Solving XDA-Developer style forums","fancy_title":null,"internal":true,"reflection":true,"clicks":2,"user_id":639,"domain":"meta.discourse.org"},{"url":"https://tr8nhub.com","title":"TranslationExchange","fancy_title":null,"internal":false,"reflection":false,"clicks":2,"user_id":9006,"domain":"tr8nhub.com"},{"url":"https://meta.discourse.org/t/roadplan-for-discourse/2939/3","title":"Roadplan for Discourse 2013","fancy_title":null,"internal":true,"reflection":true,"clicks":1,"user_id":2540,"domain":"meta.discourse.org"},{"url":"http://sugarjs.com/dates#date_locales","title":"Dates - Sugar","fancy_title":null,"internal":false,"reflection":false,"clicks":1,"user_id":461,"domain":"sugarjs.com"},{"url":"http://blog.discourse.org/2013/03/localizing-discourse/","title":"Localizing Discourse","fancy_title":null,"internal":false,"reflection":false,"clicks":1,"user_id":893,"domain":"blog.discourse.org"},{"url":"https://github.com/discourse/discourse/blob/master/app/assets/javascripts/locales/date_locales.js","title":null,"fancy_title":null,"internal":false,"reflection":false,"clicks":1,"user_id":461,"domain":"github.com"},{"url":"http://transifex.com/projects/p/discourse-pt-br/","title":"Discourse-Translations-Project localization","fancy_title":null,"internal":false,"reflection":false,"clicks":1,"user_id":893,"domain":"transifex.com"},{"url":"https://github.com/discourse/discourse/issues/279","title":null,"fancy_title":null,"internal":false,"reflection":false,"clicks":1,"user_id":893,"domain":"github.com"},{"url":"https://meta.discourse.org/t/comrades-lets-join-our-efforts-on-ukrainian-and-russian-translations/4403/5","title":"Comrades let's join our efforts on ukrainian and russian translations","fancy_title":null,"internal":true,"reflection":true,"clicks":1,"user_id":3417,"domain":"meta.discourse.org"},{"url":"https://meta.discourse.org/t/translation-workflow/6102/6","title":"Translation workflow","fancy_title":null,"internal":true,"reflection":false,"clicks":0,"user_id":1995,"domain":"meta.discourse.org"},{"url":"https://meta.discourse.org/t/bookmark-last-read-sometimes-doesn-t-go-to-the-end-of-a-topic/4825/9","title":"Bookmark/last read sometimes doesn't go to the end of a topic","fancy_title":null,"internal":true,"reflection":true,"clicks":0,"user_id":3681,"domain":"meta.discourse.org"},{"url":"https://github.com/discourse/discourse/blob/master/config/locales/client.de.yml","title":"discourse/config/locales/client.de.yml at master · discourse/discourse · GitHub","fancy_title":null,"internal":false,"reflection":false,"clicks":0,"user_id":2,"domain":"github.com"},{"url":"https://meta.discourse.org/t/what-i-love-about-wordpress-plugins/5697","title":"What I love about WordPress plugins","fancy_title":null,"internal":true,"reflection":true,"clicks":0,"user_id":1,"domain":"meta.discourse.org"},{"url":"https://meta.discourse.org/t/github-onebox-rendering-issue/7616","title":"GitHub OneBox Rendering Issue","fancy_title":null,"internal":true,"reflection":true,"clicks":0,"user_id":5372,"domain":"meta.discourse.org"},{"url":"https://github.com/discourse/discourse/blob/master/config/locales/server.de.yml","title":"discourse/config/locales/server.de.yml at master · discourse/discourse · GitHub","fancy_title":null,"internal":false,"reflection":false,"clicks":0,"user_id":2,"domain":"github.com"},{"url":"https://meta.discourse.org/t/roadplan-for-discourse/2939/5","title":"Roadplan for Discourse 2013","fancy_title":null,"internal":true,"reflection":true,"clicks":0,"user_id":32,"domain":"meta.discourse.org"},{"url":"https://meta.discourse.org/t/translation-tools-transifex-localeapp/7763","title":"Translation Tools: Transifex? Localeapp?","fancy_title":null,"internal":true,"reflection":true,"clicks":0,"user_id":2,"domain":"meta.discourse.org"},{"url":"http://guides.rubyonrails.org/i18n.html#the-public-i18n-api","title":"Rails Internationalization (I18n) API — Ruby on Rails Guides","fancy_title":null,"internal":false,"reflection":false,"clicks":0,"user_id":1895,"domain":"guides.rubyonrails.org"},{"url":"https://meta.discourse.org/t/hi-support-chinese/4393/6","title":"Hi, support Chinese?","fancy_title":null,"internal":true,"reflection":true,"clicks":0,"user_id":2014,"domain":"meta.discourse.org"},{"url":"https://meta.discourse.org/t/translation-tools-transifex-localeapp/7763/41","title":"Translation Tools: Transifex? Localeapp?","fancy_title":null,"internal":true,"reflection":false,"clicks":0,"user_id":6626,"domain":"meta.discourse.org"}],"notification_level":2,"notifications_reason_id":4,"can_move_posts":true,"can_edit":true,"can_delete":true,"can_recover":true,"can_remove_allowed_users":true,"can_invite_to":true,"can_create_post":true,"can_reply_as_new_topic":true,"can_flag_topic":true},"highest_post_number":104,"last_read_post_number":104,"deleted_by":null,"has_deleted":true,"actions_summary":[{"id":4,"count":0,"hidden":false,"can_act":true},{"id":7,"count":0,"hidden":false,"can_act":true},{"id":8,"count":0,"hidden":false,"can_act":true}],"chunk_size":20,"bookmarked":false,"tags":null}}; diff --git a/test/javascripts/helpers/create-pretender.js.es6 b/test/javascripts/helpers/create-pretender.js.es6 index 1a4de17aa0..43e35b8cab 100644 --- a/test/javascripts/helpers/create-pretender.js.es6 +++ b/test/javascripts/helpers/create-pretender.js.es6 @@ -80,6 +80,10 @@ export default function() { return response(json); }); + this.get("/t/280.json", function() { + return response(fixturesByUrl['/t/280/1.json']); + }); + this.get("/t/id_for/:slug", function() { return response({id: 280, slug: "internationalization-localization", url: "/t/internationalization-localization/280"}); }); From 08b4b7b7fff57a806711c16c81914ea9e2203fd3 Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Wed, 15 Apr 2015 17:20:34 -0400 Subject: [PATCH 033/113] Moderators can edit posts that are queued before they approve/reject --- .../discourse/controllers/queued-post.js.es6 | 39 ++++++++++++ .../discourse/controllers/queued-posts.js.es6 | 16 ----- .../discourse/templates/queued-posts.hbs | 62 +++++++++++++------ .../stylesheets/desktop/queued-posts.scss | 11 ++++ app/controllers/queued_posts_controller.rb | 4 ++ config/locales/client.en.yml | 7 ++- .../acceptance/queued-posts-test.js.es6 | 40 +++++++++--- .../helpers/create-pretender.js.es6 | 2 +- 8 files changed, 134 insertions(+), 47 deletions(-) create mode 100644 app/assets/javascripts/discourse/controllers/queued-post.js.es6 delete mode 100644 app/assets/javascripts/discourse/controllers/queued-posts.js.es6 diff --git a/app/assets/javascripts/discourse/controllers/queued-post.js.es6 b/app/assets/javascripts/discourse/controllers/queued-post.js.es6 new file mode 100644 index 0000000000..588e14711c --- /dev/null +++ b/app/assets/javascripts/discourse/controllers/queued-post.js.es6 @@ -0,0 +1,39 @@ +import BufferedContent from 'discourse/mixins/buffered-content'; +import { popupAjaxError } from 'discourse/lib/ajax-error'; + +function updateState(state) { + return function() { + const post = this.get('post'); + post.update({ state }).then(() => { + this.get('controllers.queued-posts.model').removeObject(post); + }).catch(popupAjaxError); + }; +} + +export default Ember.Controller.extend(BufferedContent, { + needs: ['queued-posts'], + post: Ember.computed.alias('model'), + + editing: false, + + actions: { + approve: updateState('approved'), + reject: updateState('rejected'), + + edit() { + this.set('editing', true); + }, + + confirmEdit() { + this.get('post').update({ raw: this.get('buffered.raw') }).then(() => { + this.commitBuffer(); + this.set('editing', false); + }); + }, + + cancelEdit() { + this.rollbackBuffer(); + this.set('editing', false); + } + } +}); diff --git a/app/assets/javascripts/discourse/controllers/queued-posts.js.es6 b/app/assets/javascripts/discourse/controllers/queued-posts.js.es6 deleted file mode 100644 index 90939e3b71..0000000000 --- a/app/assets/javascripts/discourse/controllers/queued-posts.js.es6 +++ /dev/null @@ -1,16 +0,0 @@ -import { popupAjaxError } from 'discourse/lib/ajax-error'; - -function updateState(state) { - return function(post) { - post.update({ state }).then(() => { - this.get('model').removeObject(post); - }).catch(popupAjaxError); - }; -} - -export default Ember.Controller.extend({ - actions: { - approve: updateState('approved'), - reject: updateState('rejected') - } -}); diff --git a/app/assets/javascripts/discourse/templates/queued-posts.hbs b/app/assets/javascripts/discourse/templates/queued-posts.hbs index 60fa6dbdd0..a0e99d9d4a 100644 --- a/app/assets/javascripts/discourse/templates/queued-posts.hbs +++ b/app/assets/javascripts/discourse/templates/queued-posts.hbs @@ -1,41 +1,63 @@
    - {{#each post in model}} + {{#each ctrl in model itemController='queued-post'}}
    - {{avatar post.user imageSize="large"}} + {{avatar ctrl.post.user imageSize="large"}}
    - {{post.user.username}} + {{ctrl.post.user.username}}
    {{i18n "queue.topic"}} - {{#if post.topic}} - {{topic-link post.topic}} + {{#if ctrl.post.topic}} + {{topic-link ctrl.post.topic}} {{else}} - {{post.post_options.title}} + {{ctrl.post.post_options.title}} {{/if}} - {{category-badge post.category}} + {{category-badge ctrl.post.category}} - {{{cook-text post.raw}}} +
    + {{#if ctrl.editing}} + {{pagedown-editor value=ctrl.buffered.raw}} + {{else}} + {{{cook-text ctrl.post.raw}}} + {{/if}} +
    - {{d-button action="approve" - actionParam=post - disabled=post.isSaving - label="queue.approve" - icon="check" - class="btn-primary approve"}} - {{d-button action="reject" - actionParam=post - disabled=post.isSaving - label="queue.reject" - icon="times" - class="btn-warning reject"}} + {{#if ctrl.editing}} + {{d-button action="confirmEdit" + label="queue.confirm" + disabled=ctrl.post.isSaving + class="btn-primary confirm"}} + {{d-button action="cancelEdit" + label="queue.cancel" + icon="times" + disabled=ctrl.post.isSaving + class="btn-danger cancel"}} + + {{else}} + {{d-button action="approve" + disabled=ctrl.post.isSaving + label="queue.approve" + icon="check" + class="btn-primary approve"}} + {{d-button action="reject" + disabled=ctrl.post.isSaving + label="queue.reject" + icon="times" + class="btn-danger reject"}} + {{d-button action="edit" + disabled=ctrl.post.isSaving + label="queue.edit" + icon="pencil" + class="edit"}} + {{/if}}
    diff --git a/app/assets/stylesheets/desktop/queued-posts.scss b/app/assets/stylesheets/desktop/queued-posts.scss index 19f1bc0737..dc3bb1fda7 100644 --- a/app/assets/stylesheets/desktop/queued-posts.scss +++ b/app/assets/stylesheets/desktop/queued-posts.scss @@ -9,8 +9,19 @@ .cooked { width: $topic-body-width; float: left; + + #wmd-input { + width: 98%; + height: 15em; + } } + .queue-controls { + button { + float: left; + margin-right: 0.5em; + } + } .post-title { color: darken(scale-color-diff(), 50%); font-weight: bold; diff --git a/app/controllers/queued_posts_controller.rb b/app/controllers/queued_posts_controller.rb index 8ee84538eb..ad4c0c5d05 100644 --- a/app/controllers/queued_posts_controller.rb +++ b/app/controllers/queued_posts_controller.rb @@ -15,6 +15,10 @@ class QueuedPostsController < ApplicationController def update qp = QueuedPost.where(id: params[:id]).first + if params[:queued_post][:raw].present? + qp.update_column(:raw, params[:queued_post][:raw]) + end + state = params[:queued_post][:state] if state == 'approved' qp.approve!(current_user) diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml index f6a1d4e878..8bcf0d01c5 100644 --- a/config/locales/client.en.yml +++ b/config/locales/client.en.yml @@ -227,10 +227,13 @@ en: queue: topic: "Topic:" - approve: 'Approve Post' - reject: 'Reject Post' + approve: 'Approve' + reject: 'Reject' title: "Needs Approval" none: "There are no posts to review." + edit: "Edit" + cancel: "Cancel" + confirm: "Save Changes" approval: title: "Post Needs Approval" diff --git a/test/javascripts/acceptance/queued-posts-test.js.es6 b/test/javascripts/acceptance/queued-posts-test.js.es6 index 33b301790f..de358c92a2 100644 --- a/test/javascripts/acceptance/queued-posts-test.js.es6 +++ b/test/javascripts/acceptance/queued-posts-test.js.es6 @@ -5,10 +5,6 @@ acceptance("Queued Posts", { loggedIn: true }); test("approve a post", () => { visit("/queued-posts"); - andThen(() => { - ok(exists('.queued-post'), 'it has posts listed'); - }); - click('.queued-post:eq(0) button.approve'); andThen(() => { ok(!exists('.queued-post'), 'it removes the post'); @@ -18,12 +14,40 @@ test("approve a post", () => { test("reject a post", () => { visit("/queued-posts"); - andThen(() => { - ok(exists('.queued-post'), 'it has posts listed'); - }); - click('.queued-post:eq(0) button.reject'); andThen(() => { ok(!exists('.queued-post'), 'it removes the post'); }); }); + +test("edit a post - cancel", () => { + visit("/queued-posts"); + + click('.queued-post:eq(0) button.edit'); + andThen(() => { + equal(find('.queued-post:eq(0) textarea').val(), 'queued post text', 'it shows an editor'); + }); + + fillIn('.queued-post:eq(0) textarea', 'new post text'); + click('.queued-post:eq(0) button.cancel'); + andThen(() => { + ok(!exists('textarea'), 'it disables editing'); + equal(find('.queued-post:eq(0) .body p').text(), 'queued post text', 'it reverts the new text'); + }); +}); + +test("edit a post - confirm", () => { + visit("/queued-posts"); + + click('.queued-post:eq(0) button.edit'); + andThen(() => { + equal(find('.queued-post:eq(0) textarea').val(), 'queued post text', 'it shows an editor'); + }); + + fillIn('.queued-post:eq(0) textarea', 'new post text'); + click('.queued-post:eq(0) button.confirm'); + andThen(() => { + ok(!exists('textarea'), 'it disables editing'); + equal(find('.queued-post:eq(0) .body p').text(), 'new post text', 'it has the new text'); + }); +}); diff --git a/test/javascripts/helpers/create-pretender.js.es6 b/test/javascripts/helpers/create-pretender.js.es6 index 43e35b8cab..4de1461546 100644 --- a/test/javascripts/helpers/create-pretender.js.es6 +++ b/test/javascripts/helpers/create-pretender.js.es6 @@ -104,7 +104,7 @@ export default function() { this.get('/queued_posts', function() { return response({ - queued_posts: [{id: 1}] + queued_posts: [{id: 1, raw: 'queued post text'}] }); }); From 43669f7b24bce1d84dfaddb8382183ce795c1dcb Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Wed, 15 Apr 2015 17:54:46 -0400 Subject: [PATCH 034/113] FIX: Posting was showing errors due to misfiring wiki observer --- app/assets/javascripts/discourse/models/composer.js.es6 | 3 ++- app/assets/javascripts/discourse/models/post.js.es6 | 9 ++------- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/app/assets/javascripts/discourse/models/composer.js.es6 b/app/assets/javascripts/discourse/models/composer.js.es6 index 1b75c77e94..dfb81f6da8 100644 --- a/app/assets/javascripts/discourse/models/composer.js.es6 +++ b/app/assets/javascripts/discourse/models/composer.js.es6 @@ -487,7 +487,8 @@ const Composer = RestModel.extend({ moderator: user.get('moderator'), admin: user.get('admin'), yours: true, - read: true + read: true, + wiki: false }); this.serialize(_create_serializer, createdPost); diff --git a/app/assets/javascripts/discourse/models/post.js.es6 b/app/assets/javascripts/discourse/models/post.js.es6 index 4ada9a1eb5..350f2e3c43 100644 --- a/app/assets/javascripts/discourse/models/post.js.es6 +++ b/app/assets/javascripts/discourse/models/post.js.es6 @@ -1,4 +1,5 @@ import RestModel from 'discourse/models/rest'; +import { popupAjaxError } from 'discourse/lib/ajax-error'; const Post = RestModel.extend({ @@ -79,13 +80,7 @@ const Post = RestModel.extend({ data: data }).then(function () { self.incrementProperty("version"); - }, function (error) { - if (error && error.responseText) { - bootbox.alert($.parseJSON(error.responseText).errors[0]); - } else { - bootbox.alert(I18n.t("generic_error")); - } - }); + }).catch(popupAjaxError); }, internalLinks: function() { From 2bec7253e9b3dea67c525fb0c004f7ed9a082829 Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Wed, 15 Apr 2015 18:01:29 -0400 Subject: [PATCH 035/113] FIX: Trust level comparison must be integer --- lib/new_post_manager.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/new_post_manager.rb b/lib/new_post_manager.rb index fdc7ea071f..a8c4554fdd 100644 --- a/lib/new_post_manager.rb +++ b/lib/new_post_manager.rb @@ -21,7 +21,7 @@ class NewPostManager def self.default_handler(manager) if (manager.user.post_count < SiteSetting.approve_post_count) || - (manager.user.trust_level < SiteSetting.approve_unless_trust_level) + (manager.user.trust_level < SiteSetting.approve_unless_trust_level.to_i) return manager.enqueue('default') end end From 9cb928e8930d2529fd676656f10e386415b7af15 Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Wed, 15 Apr 2015 19:08:16 -0400 Subject: [PATCH 036/113] FIX: Actions summary expanding was broken --- .../discourse-action-history.js.es6 | 30 +++++++------ .../discourse/controllers/flag.js.es6 | 3 +- .../discourse/controllers/topic.js.es6 | 2 +- .../discourse/models/action_summary.js | 43 ++++++------------- .../javascripts/discourse/models/post.js.es6 | 8 +++- 5 files changed, 39 insertions(+), 47 deletions(-) diff --git a/app/assets/javascripts/discourse/components/discourse-action-history.js.es6 b/app/assets/javascripts/discourse/components/discourse-action-history.js.es6 index 7dba3c5828..ec38fca1ad 100644 --- a/app/assets/javascripts/discourse/components/discourse-action-history.js.es6 +++ b/app/assets/javascripts/discourse/components/discourse-action-history.js.es6 @@ -10,20 +10,20 @@ export default Em.Component.extend(StringBuffer, { rerenderTriggers: ['actionsHistory.@each', 'actionsHistory.users.length', 'post.deleted'], // This was creating way too many bound ifs and subviews in the handlebars version. - renderString: function(buffer) { + renderString(buffer) { if (!this.get('emptyHistory')) { this.get('actionsHistory').forEach(function(c) { buffer.push("
    "); - var renderActionIf = function(property, dataAttribute, text) { + const renderActionIf = function(property, dataAttribute, text) { if (!c.get(property)) { return; } buffer.push(" " + text + "."); }; // TODO multi line expansion for flags - var iconsHtml = ""; + let iconsHtml = ""; if (c.get('usersExpanded')) { - var postUrl; + let postUrl; c.get('users').forEach(function(u) { iconsHtml += ""; if (u.post_url) { @@ -37,7 +37,7 @@ export default Em.Component.extend(StringBuffer, { iconsHtml += ""; }); - var key = 'post.actions.people.' + c.get('actionType.name_key'); + let key = 'post.actions.people.' + c.get('actionType.name_key'); if (postUrl) { key = key + "_with_url"; } // TODO postUrl might be uninitialized? pick a good default @@ -52,7 +52,7 @@ export default Em.Component.extend(StringBuffer, { }); } - var post = this.get('post'); + const post = this.get('post'); if (post.get('deleted')) { buffer.push("
    " + " " + @@ -62,32 +62,34 @@ export default Em.Component.extend(StringBuffer, { } }, - actionTypeById: function(actionTypeId) { + actionTypeById(actionTypeId) { return this.get('actionsHistory').findProperty('id', actionTypeId); }, - click: function(e) { - var $target = $(e.target), - actionTypeId; + click(e) { + const $target = $(e.target); + let actionTypeId; + + const post = this.get('post'); if (actionTypeId = $target.data('defer-flags')) { - this.actionTypeById(actionTypeId).deferFlags(); + this.actionTypeById(actionTypeId).deferFlags(post); return false; } // User wants to know who actioned it if (actionTypeId = $target.data('who-acted')) { - this.actionTypeById(actionTypeId).loadUsers(); + this.actionTypeById(actionTypeId).loadUsers(post); return false; } if (actionTypeId = $target.data('act')) { - this.get('actionsHistory').findProperty('id', actionTypeId).act(); + this.get('actionsHistory').findProperty('id', actionTypeId).act(post); return false; } if (actionTypeId = $target.data('undo')) { - this.get('actionsHistory').findProperty('id', actionTypeId).undo(); + this.get('actionsHistory').findProperty('id', actionTypeId).undo(post); return false; } diff --git a/app/assets/javascripts/discourse/controllers/flag.js.es6 b/app/assets/javascripts/discourse/controllers/flag.js.es6 index ed47740aa0..4691318c29 100644 --- a/app/assets/javascripts/discourse/controllers/flag.js.es6 +++ b/app/assets/javascripts/discourse/controllers/flag.js.es6 @@ -81,7 +81,8 @@ export default ObjectController.extend(ModalFunctionality, { if (opts) params = $.extend(params, opts); this.send('hideModal'); - postAction.act(params).then(function() { + + postAction.act(this.get('model'), params).then(function() { self.send('closeModal'); }, function(errors) { self.send('closeModal'); diff --git a/app/assets/javascripts/discourse/controllers/topic.js.es6 b/app/assets/javascripts/discourse/controllers/topic.js.es6 index c532e55ea1..205c750075 100644 --- a/app/assets/javascripts/discourse/controllers/topic.js.es6 +++ b/app/assets/javascripts/discourse/controllers/topic.js.es6 @@ -150,7 +150,7 @@ export default ObjectController.extend(Discourse.SelectedPostsCount, BufferedCon toggleLike(post) { const likeAction = post.get('actionByName.like'); if (likeAction && likeAction.get('canToggle')) { - likeAction.toggle(); + likeAction.toggle(post); } }, diff --git a/app/assets/javascripts/discourse/models/action_summary.js b/app/assets/javascripts/discourse/models/action_summary.js index c6140dc964..0f53c58d6f 100644 --- a/app/assets/javascripts/discourse/models/action_summary.js +++ b/app/assets/javascripts/discourse/models/action_summary.js @@ -1,11 +1,3 @@ -/** - A data model for summarizing actions a user has taken, for example liking a post. - - @class ActionSummary - @extends Discourse.Model - @namespace Discourse - @module Discourse -**/ Discourse.ActionSummary = Discourse.Model.extend({ // Description for the action @@ -44,16 +36,16 @@ Discourse.ActionSummary = Discourse.Model.extend({ } }, - toggle: function() { + toggle: function(post) { if (!this.get('acted')) { - this.act(); + this.act(post); } else { - this.undo(); + this.undo(post); } }, // Perform this action - act: function(opts) { + act: function(post, opts) { if (!opts) opts = {}; var action = this.get('actionType.name_key'); @@ -82,18 +74,14 @@ Discourse.ActionSummary = Discourse.Model.extend({ return Discourse.ajax("/post_actions", { type: 'POST', data: { - id: this.get('flagTopic') ? this.get('flagTopic.id') : this.get('post.id'), + id: this.get('flagTopic') ? this.get('flagTopic.id') : post.get('id'), post_action_type_id: this.get('id'), message: opts.message, take_action: opts.takeAction, flag_topic: this.get('flagTopic') ? true : false } }).then(function(result) { - var post = self.get('post'); - if (post && result && result.id === post.get('id')) { - post.updateFromJson(result); - } - return post; + return post.updateActionsSummary(result); }).catch(function (error) { self.removeAction(); var message = $.parseJSON(error.responseText).errors; @@ -102,43 +90,38 @@ Discourse.ActionSummary = Discourse.Model.extend({ }, // Undo this action - undo: function() { + undo: function(post) { this.removeAction(); // Remove our post action - var self = this; - return Discourse.ajax("/post_actions/" + (this.get('post.id')), { + return Discourse.ajax("/post_actions/" + post.get('id'), { type: 'DELETE', data: { post_action_type_id: this.get('id') } }).then(function(result) { - var post = self.get('post'); - if (post && result && result.id === post.get('id')) { - post.updateFromJson(result); - } - return post; + return post.updateActionsSummary(result); }); }, - deferFlags: function() { + deferFlags: function(post) { var self = this; return Discourse.ajax("/post_actions/defer_flags", { type: "POST", data: { post_action_type_id: this.get("id"), - id: this.get("post.id") + id: post.get('id') } }).then(function () { self.set("count", 0); }); }, - loadUsers: function() { + loadUsers: function(post) { var self = this; Discourse.ajax("/post_actions/users", { data: { - id: this.get('post.id'), + id: post.get('id'), post_action_type_id: this.get('id') } }).then(function (result) { diff --git a/app/assets/javascripts/discourse/models/post.js.es6 b/app/assets/javascripts/discourse/models/post.js.es6 index 350f2e3c43..e424d8111c 100644 --- a/app/assets/javascripts/discourse/models/post.js.es6 +++ b/app/assets/javascripts/discourse/models/post.js.es6 @@ -332,6 +332,13 @@ const Post = RestModel.extend({ if (bookmarkedTopic) {self.set("topic.bookmarked", false); } throw e; }); + }, + + updateActionsSummary(json) { + if (json && json.id === this.get('id')) { + json = Post.munge(json); + this.set('actions_summary', json.actions_summary); + } } }); @@ -343,7 +350,6 @@ Post.reopenClass({ const lookup = Em.Object.create(); // this area should be optimized, it is creating way too many objects per post json.actions_summary = json.actions_summary.map(function(a) { - a.post = json; a.actionType = Discourse.Site.current().postActionTypeById(a.id); const actionSummary = Discourse.ActionSummary.create(a); lookup[a.actionType.name_key] = actionSummary; From a5b25ad2afaaee70e553e27b0adda91dcdbf3a69 Mon Sep 17 00:00:00 2001 From: Sam Date: Thu, 16 Apr 2015 09:44:30 +1000 Subject: [PATCH 037/113] FEATURE: scale up likes per day as users increase trust level tl2 = 1.5 times the likes tl3 = 2 times the likes tl4 = 3 times the likes configurable via tl[234]_additional_likes_per_day_multiplier site setting --- app/models/post_action.rb | 11 ++++++++++- config/locales/server.en.yml | 4 ++++ config/site_settings.yml | 3 +++ lib/rate_limiter.rb | 2 ++ spec/models/post_action_spec.rb | 27 +++++++++++++++++++++++++++ 5 files changed, 46 insertions(+), 1 deletion(-) diff --git a/app/models/post_action.rb b/app/models/post_action.rb index eb72e7678b..dbd70dd961 100644 --- a/app/models/post_action.rb +++ b/app/models/post_action.rb @@ -320,7 +320,16 @@ class PostAction < ActiveRecord::Base %w(like flag bookmark).each do |type| if send("is_#{type}?") - @rate_limiter = RateLimiter.new(user, "create_#{type}", SiteSetting.send("max_#{type}s_per_day"), 1.day.to_i) + limit = SiteSetting.send("max_#{type}s_per_day") + + if is_like? && user && user.trust_level >= 2 + multiplier = SiteSetting.send("tl#{user.trust_level}_additional_likes_per_day_multiplier").to_f + multiplier = 1.0 if multiplier < 1.0 + + limit = (limit * multiplier ).to_i + end + + @rate_limiter = RateLimiter.new(user, "create_#{type}",limit, 1.day.to_i) return @rate_limiter end end diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml index ef09cf7418..5a17203573 100644 --- a/config/locales/server.en.yml +++ b/config/locales/server.en.yml @@ -808,6 +808,10 @@ en: max_topics_in_first_day: "The maximum number of topics a user is allowed to create in their first day on the site" max_replies_in_first_day: "The maximum number of replies a user is allowed to create in their first day on the site" + tl2_additional_likes_per_day_multiplier: "Increase limit of likes per day for tl2 (member) by multiplying with this number" + tl3_additional_likes_per_day_multiplier: "Increase limit of likes per day for tl3 (regular) by multiplying with this number" + tl4_additional_likes_per_day_multiplier: "Increase limit of likes per day for tl4 (leader) by multiplying with this number" + num_flags_to_block_new_user: "If a new user's posts get this many spam flags from num_users_to_block_new_user different users, hide all their posts and prevent future posting. 0 to disable." num_users_to_block_new_user: "If a new user's posts get num_flags_to_block_new_user spam flags from this many different users, hide all their posts and prevent future posting. 0 to disable." notify_mods_when_user_blocked: "If a user is automatically blocked, send a message to all moderators." diff --git a/config/site_settings.yml b/config/site_settings.yml index aae5ac2b39..3520141c6d 100644 --- a/config/site_settings.yml +++ b/config/site_settings.yml @@ -675,6 +675,9 @@ rate_limits: max_invites_per_day: 10 max_topics_in_first_day: 5 max_replies_in_first_day: 10 + tl2_additional_likes_per_day_multiplier: 1.5 + tl3_additional_likes_per_day_multiplier: 2 + tl4_additional_likes_per_day_multiplier: 3 developer: force_hostname: diff --git a/lib/rate_limiter.rb b/lib/rate_limiter.rb index b3e544912f..e8b51f0f49 100644 --- a/lib/rate_limiter.rb +++ b/lib/rate_limiter.rb @@ -4,6 +4,8 @@ require_dependency 'rate_limiter/on_create_record' # A redis backed rate limiter. class RateLimiter + attr_reader :max, :secs, :user, :key + def self.key_prefix "l-rate-limit:" end diff --git a/spec/models/post_action_spec.rb b/spec/models/post_action_spec.rb index bb364def59..2ea72a5dbe 100644 --- a/spec/models/post_action_spec.rb +++ b/spec/models/post_action_spec.rb @@ -506,6 +506,33 @@ describe PostAction do topic.reload expect(topic.posts.count).to eq(1) end + end + + describe "rate limiting" do + + def limiter(tl) + user = Fabricate.build(:user) + user.trust_level = tl + action = PostAction.new(user: user, post_action_type_id: PostActionType.types[:like]) + action.post_action_rate_limiter + end + + it "should scale up like limits depending on liker" do + expect(limiter(0).max).to eq SiteSetting.max_likes_per_day + expect(limiter(1).max).to eq SiteSetting.max_likes_per_day + expect(limiter(2).max).to eq (SiteSetting.max_likes_per_day * SiteSetting.tl2_additional_likes_per_day_multiplier).to_i + expect(limiter(3).max).to eq (SiteSetting.max_likes_per_day * SiteSetting.tl3_additional_likes_per_day_multiplier).to_i + expect(limiter(4).max).to eq (SiteSetting.max_likes_per_day * SiteSetting.tl4_additional_likes_per_day_multiplier).to_i + + SiteSetting.tl2_additional_likes_per_day_multiplier = -1 + expect(limiter(2).max).to eq SiteSetting.max_likes_per_day + + SiteSetting.tl2_additional_likes_per_day_multiplier = 0.8 + expect(limiter(2).max).to eq SiteSetting.max_likes_per_day + + SiteSetting.tl2_additional_likes_per_day_multiplier = "bob" + expect(limiter(2).max).to eq SiteSetting.max_likes_per_day + end end From 4919ec4c44ab7f840aad891f1896fb7353fe8205 Mon Sep 17 00:00:00 2001 From: Sam Date: Thu, 16 Apr 2015 10:44:55 +1000 Subject: [PATCH 038/113] FIX: don't hide "public invisible" groups from groups on user page --- app/assets/javascripts/admin/models/admin-user.js.es6 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/assets/javascripts/admin/models/admin-user.js.es6 b/app/assets/javascripts/admin/models/admin-user.js.es6 index 98230fbafe..674ea5e6a3 100644 --- a/app/assets/javascripts/admin/models/admin-user.js.es6 +++ b/app/assets/javascripts/admin/models/admin-user.js.es6 @@ -1,6 +1,6 @@ const AdminUser = Discourse.User.extend({ - customGroups: Em.computed.filter("groups", (g) => !g.automatic && g.visible && Discourse.Group.create(g)), + customGroups: Em.computed.filter("groups", (g) => !g.automatic && Discourse.Group.create(g)), automaticGroups: Em.computed.filter("groups", (g) => g.automatic && Discourse.Group.create(g)), generateApiKey() { From a1cbd311667408c601cc7bc6bf955f975e6df956 Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Wed, 15 Apr 2015 22:18:45 -0400 Subject: [PATCH 039/113] FIX: Tags plugin uses `Discourse.TopicList.list` --- app/assets/javascripts/discourse/models/topic-list.js.es6 | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/app/assets/javascripts/discourse/models/topic-list.js.es6 b/app/assets/javascripts/discourse/models/topic-list.js.es6 index 36b0ba6795..9c6d580f00 100644 --- a/app/assets/javascripts/discourse/models/topic-list.js.es6 +++ b/app/assets/javascripts/discourse/models/topic-list.js.es6 @@ -152,6 +152,11 @@ TopicList.reopenClass({ return store.findFiltered('topicList', {filter, params}); }, + list(filter) { + Ember.warn('`Discourse.TopicList.list` is deprecated. Use the store instead'); + return this.find(filter); + }, + // Sets `hideCategory` if all topics in the last have a particular category hideUniformCategory(list, category) { const hideCategory = !list.get('topics').any(function (t) { return t.get('category') !== category; }); From b2f34da4772841f4835a80fa5ef64c7a63463784 Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Wed, 15 Apr 2015 22:36:16 -0400 Subject: [PATCH 040/113] FIX: A couple of other deprecations to keep `discourse-tagging` happy --- .../javascripts/discourse/lib/show-modal.js.es6 | 5 +++++ app/assets/javascripts/discourse/models/rest.js.es6 | 11 ++++++++++- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/app/assets/javascripts/discourse/lib/show-modal.js.es6 b/app/assets/javascripts/discourse/lib/show-modal.js.es6 index 91713ca707..01cc024021 100644 --- a/app/assets/javascripts/discourse/lib/show-modal.js.es6 +++ b/app/assets/javascripts/discourse/lib/show-modal.js.es6 @@ -1,6 +1,11 @@ export default (name, opts) => { opts = opts || {}; + if (opts.__type) { + Ember.warn("showModal now takes `opts` as a second param instead of a model"); + opts = {model: opts}; + } + const container = Discourse.__container__; // We use the container here because modals are like singletons diff --git a/app/assets/javascripts/discourse/models/rest.js.es6 b/app/assets/javascripts/discourse/models/rest.js.es6 index 8bb5d0250f..de4d756d79 100644 --- a/app/assets/javascripts/discourse/models/rest.js.es6 +++ b/app/assets/javascripts/discourse/models/rest.js.es6 @@ -18,7 +18,16 @@ const RestModel = Ember.Object.extend(Presence, { const self = this; self.set('isSaving', true); return store.update(type, this.get('id'), props).then(function(res) { - self.setProperties(self.__munge(res.payload || res.responseJson)); + + res = self.__munge(res.payload || res.responseJson); + + console.log(res); + if (res.success === "OK") { + Ember.warn("An update call should return the updated attributes"); + res = props; + } + + self.setProperties(res); self.afterUpdate(res); return res; }).finally(() => this.set('isSaving', false)); From d186de05f427989fa843dd66b9980dd9a2a240a2 Mon Sep 17 00:00:00 2001 From: Sam Date: Thu, 16 Apr 2015 12:36:13 +1000 Subject: [PATCH 041/113] update logster --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index fca49b6c97..865cf4252e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -207,7 +207,7 @@ GEM thor (~> 0.15) libv8 (3.16.14.7) listen (0.7.3) - logster (0.1.8) + logster (0.8.0) lru_redux (0.8.4) mail (2.5.4) mime-types (~> 1.16) From 5c49c6b581da61e993ad23af8020f305e7d0a3a1 Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Wed, 15 Apr 2015 22:40:54 -0400 Subject: [PATCH 042/113] FIX: Crawler layout from within plugin routes --- app/views/layouts/crawler.html.erb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/views/layouts/crawler.html.erb b/app/views/layouts/crawler.html.erb index 3a448be191..bcfbf0bfbd 100644 --- a/app/views/layouts/crawler.html.erb +++ b/app/views/layouts/crawler.html.erb @@ -27,10 +27,10 @@

    <%= t 'powered_by_html' %>

    From 61f53a0de02a1dca3285287dec1acebe8975ba8c Mon Sep 17 00:00:00 2001 From: Sam Date: Thu, 16 Apr 2015 12:59:16 +1000 Subject: [PATCH 043/113] rogue console.log --- app/assets/javascripts/discourse/models/rest.js.es6 | 1 - 1 file changed, 1 deletion(-) diff --git a/app/assets/javascripts/discourse/models/rest.js.es6 b/app/assets/javascripts/discourse/models/rest.js.es6 index de4d756d79..a2b8bf676d 100644 --- a/app/assets/javascripts/discourse/models/rest.js.es6 +++ b/app/assets/javascripts/discourse/models/rest.js.es6 @@ -21,7 +21,6 @@ const RestModel = Ember.Object.extend(Presence, { res = self.__munge(res.payload || res.responseJson); - console.log(res); if (res.success === "OK") { Ember.warn("An update call should return the updated attributes"); res = props; From 67ed6b1e9a16c4800b6bf14bebedeb8177e2f372 Mon Sep 17 00:00:00 2001 From: Sam Saffron Date: Thu, 16 Apr 2015 14:54:24 +1000 Subject: [PATCH 044/113] FIX: missing pluralization, change topic card to use replies --- .../templates/components/topic-map.hbs | 14 ++++++------- config/locales/client.en.yml | 21 ++++++++++++++----- 2 files changed, 23 insertions(+), 12 deletions(-) diff --git a/app/assets/javascripts/discourse/templates/components/topic-map.hbs b/app/assets/javascripts/discourse/templates/components/topic-map.hbs index bf572caa3e..11a5a14b6c 100644 --- a/app/assets/javascripts/discourse/templates/components/topic-map.hbs +++ b/app/assets/javascripts/discourse/templates/components/topic-map.hbs @@ -15,33 +15,33 @@
  • -

    {{i18n 'last_post_lowercase'}}

    +

    {{i18n 'last_reply_lowercase'}}

    {{avatar details.last_poster imageSize="tiny"}} {{format-date topic.last_posted_at}}
  • - {{number topic.posts_count}} -

    {{i18n 'posts_lowercase'}}

    + {{number topic.replyCount}} +

    {{i18n 'replies_lowercase' count=topic.replyCount}}

  • {{number topic.views class=topic.viewsHeat}} -

    {{i18n 'views_lowercase'}}

    +

    {{i18n 'views_lowercase' count=topic.views}}

  • {{number topic.participant_count}} -

    {{i18n 'users_lowercase'}}

    +

    {{i18n 'users_lowercase' count=topic.participant_count}}

    • {{#if topic.like_count}}
  • {{number topic.like_count}} -

    {{i18n 'likes_lowercase'}}

    +

    {{i18n 'likes_lowercase' count=topic.like_count}}

    • {{/if}} {{#if details.links.length}}
  • {{number details.links.length}} -

    {{i18n 'links_lowercase'}}

    +

    {{i18n 'links_lowercase' count=details.links.length}}

    • {{/if}} {{#if showPosterAvatar}} diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml index 8bcf0d01c5..978929bd42 100644 --- a/config/locales/client.en.yml +++ b/config/locales/client.en.yml @@ -123,7 +123,9 @@ en: show_more: "show more" show_help: "help" links: "Links" - links_lowercase: "links" + links_lowercase: + one: "link" + other: "links" faq: "FAQ" guidelines: "Guidelines" privacy_policy: "Privacy Policy" @@ -628,7 +630,10 @@ en: mute: Mute unmute: Unmute last_post: Last post - last_post_lowercase: last post + last_reply_lowercase: last reply + replies_lowercase: + one: reply + other: replies summary: enabled_description: "You're viewing a summary of this topic: the most interesting posts as determined by the community." @@ -1497,15 +1502,21 @@ en: other {}} original_post: "Original Post" views: "Views" - views_lowercase: "views" + views_lowercase: + one: "view" + other: "views" replies: "Replies" views_long: "this topic has been viewed {{number}} times" activity: "Activity" likes: "Likes" - likes_lowercase: "likes" + likes_lowercase: + one: "like" + other: "likes" likes_long: "there are {{number}} likes in this topic" users: "Users" - users_lowercase: "users" + users_lowercase: + one: "user" + other: "users" category_title: "Category" history: "History" changed_by: "by {{author}}" From c2dd9564b3eb72eea9a7e83d1d4e0190345b506b Mon Sep 17 00:00:00 2001 From: Sam Saffron Date: Thu, 16 Apr 2015 15:10:55 +1000 Subject: [PATCH 045/113] creating new category was broken --- .../discourse/routes/discovery-categories-route.js.es6 | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/app/assets/javascripts/discourse/routes/discovery-categories-route.js.es6 b/app/assets/javascripts/discourse/routes/discovery-categories-route.js.es6 index 30d36bb332..636a646db2 100644 --- a/app/assets/javascripts/discourse/routes/discovery-categories-route.js.es6 +++ b/app/assets/javascripts/discourse/routes/discovery-categories-route.js.es6 @@ -46,11 +46,13 @@ Discourse.DiscoveryCategoriesRoute = Discourse.Route.extend(Discourse.OpenCompos const groups = this.site.groups, everyoneName = groups.findBy('id', 0).name; - showModal('editCategory', Discourse.Category.create({ + const model = Discourse.Category.create({ color: 'AB9364', text_color: 'FFFFFF', group_permissions: [{group_name: everyoneName, permission_type: 1}], available_groups: groups.map(g => g.name), allow_badges: true - })); + }); + + showModal('editCategory', { model }); this.controllerFor('editCategory').set('selectedTab', 'general'); }, From 948f9b357e49a437c0401990124da6ab15d4e6ba Mon Sep 17 00:00:00 2001 From: Sam Saffron Date: Thu, 16 Apr 2015 15:22:21 +1000 Subject: [PATCH 046/113] protect against failure --- app/assets/javascripts/discourse/controllers/composer.js.es6 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/assets/javascripts/discourse/controllers/composer.js.es6 b/app/assets/javascripts/discourse/controllers/composer.js.es6 index 7a97eda7a9..5afe148ffa 100644 --- a/app/assets/javascripts/discourse/controllers/composer.js.es6 +++ b/app/assets/javascripts/discourse/controllers/composer.js.es6 @@ -220,7 +220,7 @@ export default DiscourseController.extend({ editReason: this.get("editReason") }).then(function(result) { - if (result.responseJson.action === "enqueued") { + if (result.responseJson && result.responseJson.action === "enqueued") { self.send('postWasEnqueued'); self.destroyDraft(); self.close(); From 271d6f896ed8e85b977266ab04d9f06087953f27 Mon Sep 17 00:00:00 2001 From: Erick Guan Date: Thu, 16 Apr 2015 13:33:50 +0800 Subject: [PATCH 047/113] Update copyright notice --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index d2859ca822..51450402ff 100644 --- a/README.md +++ b/README.md @@ -83,7 +83,7 @@ The original Discourse code contributors can be found in [**AUTHORS.MD**](docs/A ## Copyright / License -Copyright 2014 Civilized Discourse Construction Kit, Inc. +Copyright 2014 - 2015 Civilized Discourse Construction Kit, Inc. Licensed under the GNU General Public License Version 2.0 (or later); you may not use this work except in compliance with the License. From 9baebcaf03f9e8439800282f69b30c2b2daad705 Mon Sep 17 00:00:00 2001 From: Sam Saffron Date: Thu, 16 Apr 2015 15:55:21 +1000 Subject: [PATCH 048/113] Use stackprof and memory_profiler under ruby 2.2 --- Gemfile | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/Gemfile b/Gemfile index 71286aeaa1..14b81a28c7 100644 --- a/Gemfile +++ b/Gemfile @@ -244,8 +244,13 @@ gem 'simple-rss', require: false # TODO mri_22 should be here, but bundler was real slow to pick it up # not even in production bundler yet, monkey patching it in feels bad gem 'gctools', require: false, platform: :mri_21 -gem 'stackprof', require: false, platform: :mri_21 -gem 'memory_profiler', require: false, platform: :mri_21 + +begin + gem 'stackprof', require: false, platform: [:mri_21, :mri_22] + gem 'memory_profiler', require: false, platform: [:mri_21, :mri_22] +rescue Bundler::GemfileError + STDERR.puts "You are running an old version of bundler, please upgrade bundler ASAP, if you are using Discourse docker, rebuild your container." +end gem 'rmmseg-cpp', require: false From 1adda31cbc6ae26d94191bf11d8165297b8d24c0 Mon Sep 17 00:00:00 2001 From: Sam Saffron Date: Thu, 16 Apr 2015 16:13:48 +1000 Subject: [PATCH 049/113] travis likes old bundler --- Gemfile | 2 ++ bin/rails | 18 +++++++++++++++--- bin/rake | 18 +++++++++++++++--- 3 files changed, 32 insertions(+), 6 deletions(-) diff --git a/Gemfile b/Gemfile index 14b81a28c7..50a64cb139 100644 --- a/Gemfile +++ b/Gemfile @@ -250,6 +250,8 @@ begin gem 'memory_profiler', require: false, platform: [:mri_21, :mri_22] rescue Bundler::GemfileError STDERR.puts "You are running an old version of bundler, please upgrade bundler ASAP, if you are using Discourse docker, rebuild your container." + gem 'stackprof', require: false, platform: [:mri_21] + gem 'memory_profiler', require: false, platform: [:mri_21] end gem 'rmmseg-cpp', require: false diff --git a/bin/rails b/bin/rails index 728cd85aa5..657440d20a 100755 --- a/bin/rails +++ b/bin/rails @@ -1,4 +1,16 @@ #!/usr/bin/env ruby -APP_PATH = File.expand_path('../../config/application', __FILE__) -require_relative '../config/boot' -require 'rails/commands' +# +# This file was generated by Bundler. +# +# The application 'rails' is installed as part of a gem, and +# this file is here to facilitate running it. +# + +require 'pathname' +ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile", + Pathname.new(__FILE__).realpath) + +require 'rubygems' +require 'bundler/setup' + +load Gem.bin_path('railties', 'rails') diff --git a/bin/rake b/bin/rake index 17240489f6..26c7a2d5b5 100755 --- a/bin/rake +++ b/bin/rake @@ -1,4 +1,16 @@ #!/usr/bin/env ruby -require_relative '../config/boot' -require 'rake' -Rake.application.run +# +# This file was generated by Bundler. +# +# The application 'rake' is installed as part of a gem, and +# this file is here to facilitate running it. +# + +require 'pathname' +ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile", + Pathname.new(__FILE__).realpath) + +require 'rubygems' +require 'bundler/setup' + +load Gem.bin_path('rake', 'rake') From b2c30d0e3458201f7bc269a4f29060f4ecb7327b Mon Sep 17 00:00:00 2001 From: Sam Saffron Date: Thu, 16 Apr 2015 16:15:04 +1000 Subject: [PATCH 050/113] Revert "travis likes old bundler" This reverts commit 1adda31cbc6ae26d94191bf11d8165297b8d24c0. --- Gemfile | 2 -- bin/rails | 18 +++--------------- bin/rake | 18 +++--------------- 3 files changed, 6 insertions(+), 32 deletions(-) diff --git a/Gemfile b/Gemfile index 50a64cb139..14b81a28c7 100644 --- a/Gemfile +++ b/Gemfile @@ -250,8 +250,6 @@ begin gem 'memory_profiler', require: false, platform: [:mri_21, :mri_22] rescue Bundler::GemfileError STDERR.puts "You are running an old version of bundler, please upgrade bundler ASAP, if you are using Discourse docker, rebuild your container." - gem 'stackprof', require: false, platform: [:mri_21] - gem 'memory_profiler', require: false, platform: [:mri_21] end gem 'rmmseg-cpp', require: false diff --git a/bin/rails b/bin/rails index 657440d20a..728cd85aa5 100755 --- a/bin/rails +++ b/bin/rails @@ -1,16 +1,4 @@ #!/usr/bin/env ruby -# -# This file was generated by Bundler. -# -# The application 'rails' is installed as part of a gem, and -# this file is here to facilitate running it. -# - -require 'pathname' -ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile", - Pathname.new(__FILE__).realpath) - -require 'rubygems' -require 'bundler/setup' - -load Gem.bin_path('railties', 'rails') +APP_PATH = File.expand_path('../../config/application', __FILE__) +require_relative '../config/boot' +require 'rails/commands' diff --git a/bin/rake b/bin/rake index 26c7a2d5b5..17240489f6 100755 --- a/bin/rake +++ b/bin/rake @@ -1,16 +1,4 @@ #!/usr/bin/env ruby -# -# This file was generated by Bundler. -# -# The application 'rake' is installed as part of a gem, and -# this file is here to facilitate running it. -# - -require 'pathname' -ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile", - Pathname.new(__FILE__).realpath) - -require 'rubygems' -require 'bundler/setup' - -load Gem.bin_path('rake', 'rake') +require_relative '../config/boot' +require 'rake' +Rake.application.run From fdb434f4a7f37b3022bfe67980fbd6c84e1e8a3e Mon Sep 17 00:00:00 2001 From: Sam Saffron Date: Thu, 16 Apr 2015 16:16:15 +1000 Subject: [PATCH 051/113] correct previous commit --- Gemfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Gemfile b/Gemfile index 14b81a28c7..50a64cb139 100644 --- a/Gemfile +++ b/Gemfile @@ -250,6 +250,8 @@ begin gem 'memory_profiler', require: false, platform: [:mri_21, :mri_22] rescue Bundler::GemfileError STDERR.puts "You are running an old version of bundler, please upgrade bundler ASAP, if you are using Discourse docker, rebuild your container." + gem 'stackprof', require: false, platform: [:mri_21] + gem 'memory_profiler', require: false, platform: [:mri_21] end gem 'rmmseg-cpp', require: false From b77cd1f287f7828fc5493c10823888d32cae2d1b Mon Sep 17 00:00:00 2001 From: Arpit Jalan Date: Thu, 16 Apr 2015 12:31:56 +0530 Subject: [PATCH 052/113] FIX: do not show send invites button if sso is enabled --- app/assets/javascripts/admin/templates/users_list.hbs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/assets/javascripts/admin/templates/users_list.hbs b/app/assets/javascripts/admin/templates/users_list.hbs index 7a5de029f4..2c4d8d4eb7 100644 --- a/app/assets/javascripts/admin/templates/users_list.hbs +++ b/app/assets/javascripts/admin/templates/users_list.hbs @@ -13,7 +13,9 @@
    - {{d-button action="sendInvites" title="admin.invite.button_title" icon="user-plus" label="admin.invite.button_text"}} + {{#unless siteSettings.enable_sso}} + {{d-button action="sendInvites" title="admin.invite.button_title" icon="user-plus" label="admin.invite.button_text"}} + {{/unless}} {{d-button action="exportUsers" title="admin.export_csv.button_title.user" icon="download" label="admin.export_csv.button_text"}}
    From 4387e05162f3d53d76732ab4964ae721cb05d444 Mon Sep 17 00:00:00 2001 From: Sam Date: Thu, 16 Apr 2015 17:29:18 +1000 Subject: [PATCH 053/113] PERF: speed up query --- app/models/post_action.rb | 26 +++++++++++++++++--------- spec/models/post_action_spec.rb | 12 ++++++++++++ 2 files changed, 29 insertions(+), 9 deletions(-) diff --git a/app/models/post_action.rb b/app/models/post_action.rb index dbd70dd961..5fc1330126 100644 --- a/app/models/post_action.rb +++ b/app/models/post_action.rb @@ -82,18 +82,26 @@ class PostAction < ActiveRecord::Base def self.lookup_for(user, topics, post_action_type_id) return if topics.blank? - + # in critical path 2x faster than AR + # + topic_ids = topics.map(&:id) map = {} - PostAction.where(user_id: user.id, post_action_type_id: post_action_type_id, deleted_at: nil) - .references(:post) - .includes(:post) - .where('posts.topic_id in (?)', topics.map(&:id)) - .order('posts.topic_id, posts.post_number') - .pluck('posts.topic_id, posts.post_number') - .each do |topic_id, post_number| - (map[topic_id] ||= []) << post_number + builder = SqlBuilder.new < [post.post_number]}) + end + end + describe ".add_moderator_post_if_needed" do it "should not add a moderator post when it's disabled" do From 295eebddc31c19cde15b65b00b45234030b82186 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9gis=20Hanol?= Date: Thu, 16 Apr 2015 10:15:06 +0200 Subject: [PATCH 054/113] less noise in JS specs --- test/javascripts/test_helper.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/javascripts/test_helper.js b/test/javascripts/test_helper.js index b59d22af6a..246b1a9297 100644 --- a/test/javascripts/test_helper.js +++ b/test/javascripts/test_helper.js @@ -99,7 +99,7 @@ QUnit.testStart(function(ctx) { // Allow our tests to change site settings and have them reset before the next test Discourse.SiteSettings = jQuery.extend(true, {}, Discourse.SiteSettingsOriginal); Discourse.BaseUri = "/"; - Discourse.BaseUrl = ""; + Discourse.BaseUrl = "localhost"; Discourse.User.resetCurrent(); Discourse.Site.resetCurrent(Discourse.Site.create(fixtures['site.json'].site)); PreloadStore.reset(); From 866d1cd8e3c949d944ba5f6dfcd5e4700da42ce8 Mon Sep 17 00:00:00 2001 From: Arpit Jalan Date: Thu, 16 Apr 2015 16:09:48 +0530 Subject: [PATCH 055/113] FIX: handle error for duplicate email_in address --- app/controllers/categories_controller.rb | 3 +++ config/locales/server.en.yml | 1 + spec/controllers/categories_controller_spec.rb | 8 ++++++++ 3 files changed, 12 insertions(+) diff --git a/app/controllers/categories_controller.rb b/app/controllers/categories_controller.rb index 74219e7d99..9de2c23383 100644 --- a/app/controllers/categories_controller.rb +++ b/app/controllers/categories_controller.rb @@ -87,6 +87,9 @@ class CategoriesController < ApplicationController if category_params.key? :email_in and category_params[:email_in].length == 0 # properly null the value so the database constrain doesn't catch us category_params[:email_in] = nil + elsif category_params.key? :email_in and existing_category = Category.find_by(email_in: category_params[:email_in]) and existing_category.id != @category.id + # check if email_in address is already in use for other category + return render_json_error I18n.t('category.errors.email_in_already_exist', {email_in: category_params[:email_in], category_name: existing_category.name}) end category_params.delete(:position) diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml index 5a17203573..e69873aefd 100644 --- a/config/locales/server.en.yml +++ b/config/locales/server.en.yml @@ -341,6 +341,7 @@ en: uncategorized_parent: "Uncategorized can't have a parent category" self_parent: "A subcategory's parent cannot be itself" depth: "You can't nest a subcategory under another" + email_in_already_exist: "Incoming email address '%{email_in}' is already in use for '%{category_name}' category." cannot_delete: uncategorized: "Can't delete Uncategorized" has_subcategories: "Can't delete this category because it has sub-categories." diff --git a/spec/controllers/categories_controller_spec.rb b/spec/controllers/categories_controller_spec.rb index 9a7d342ae6..0f1a4e9347 100644 --- a/spec/controllers/categories_controller_spec.rb +++ b/spec/controllers/categories_controller_spec.rb @@ -174,6 +174,14 @@ describe CategoriesController do end end + it "returns 422 if email_in address is already in use for other category" do + @other_category = Fabricate(:category, name: "Other", email_in: "mail@examle.com" ) + xhr :put, :update, id: @category.id, name: "Email", email_in: "mail@examle.com", color: "ff0", text_color: "fff" + + expect(response).not_to be_success + expect(response.code.to_i).to eq(422) + end + describe "success" do it "updates the group correctly" do From b973a7e83cfed0420fad43fc358b74843e6be876 Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Thu, 16 Apr 2015 10:36:17 -0400 Subject: [PATCH 056/113] FIX: `update` was not returning the `responseJson` --- .../javascripts/discourse/controllers/composer.js.es6 | 2 +- app/assets/javascripts/discourse/models/rest.js.es6 | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/assets/javascripts/discourse/controllers/composer.js.es6 b/app/assets/javascripts/discourse/controllers/composer.js.es6 index 5afe148ffa..7a97eda7a9 100644 --- a/app/assets/javascripts/discourse/controllers/composer.js.es6 +++ b/app/assets/javascripts/discourse/controllers/composer.js.es6 @@ -220,7 +220,7 @@ export default DiscourseController.extend({ editReason: this.get("editReason") }).then(function(result) { - if (result.responseJson && result.responseJson.action === "enqueued") { + if (result.responseJson.action === "enqueued") { self.send('postWasEnqueued'); self.destroyDraft(); self.close(); diff --git a/app/assets/javascripts/discourse/models/rest.js.es6 b/app/assets/javascripts/discourse/models/rest.js.es6 index a2b8bf676d..843e22eb1b 100644 --- a/app/assets/javascripts/discourse/models/rest.js.es6 +++ b/app/assets/javascripts/discourse/models/rest.js.es6 @@ -19,14 +19,14 @@ const RestModel = Ember.Object.extend(Presence, { self.set('isSaving', true); return store.update(type, this.get('id'), props).then(function(res) { - res = self.__munge(res.payload || res.responseJson); + const payload = self.__munge(res.payload || res.responseJson); - if (res.success === "OK") { + if (payload.success === "OK") { Ember.warn("An update call should return the updated attributes"); res = props; } - self.setProperties(res); + self.setProperties(payload); self.afterUpdate(res); return res; }).finally(() => this.set('isSaving', false)); From c216b3affe08f55c98be40470aaeee5a6ed198b6 Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Thu, 16 Apr 2015 11:47:18 -0400 Subject: [PATCH 057/113] FIX: Don't cloak in test mode. Should help with intermittant failures --- test/javascripts/acceptance/topic-test.js.es6 | 2 +- test/javascripts/test_helper.js | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/test/javascripts/acceptance/topic-test.js.es6 b/test/javascripts/acceptance/topic-test.js.es6 index 6d4aa67fc5..76813cd04e 100644 --- a/test/javascripts/acceptance/topic-test.js.es6 +++ b/test/javascripts/acceptance/topic-test.js.es6 @@ -5,7 +5,7 @@ test("Enter a Topic", () => { visit("/t/internationalization-localization/280/1"); andThen(() => { ok(exists("#topic"), "The topic was rendered"); - ok(exists("#topic .post-cloak"), "The topic has cloaked posts"); + ok(exists("#topic .cooked"), "The topic has cooked posts"); }); }); diff --git a/test/javascripts/test_helper.js b/test/javascripts/test_helper.js index 246b1a9297..9935676b67 100644 --- a/test/javascripts/test_helper.js +++ b/test/javascripts/test_helper.js @@ -115,6 +115,9 @@ QUnit.testStart(function(ctx) { } }); +// Don't cloak in testing +Ember.CloakedCollectionView = Ember.CollectionView; + QUnit.testDone(function() { Ember.run.debounce = origDebounce; window.sandbox.restore(); From e912b698ac580a83bc77e4c42da5a062fbbed108 Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Thu, 16 Apr 2015 13:53:30 -0400 Subject: [PATCH 058/113] FIX: Updating the category was not updating the UI --- .jshintrc | 1 + .../javascripts/discourse/models/topic.js.es6 | 17 +++++----- .../javascripts/discourse/templates/topic.hbs | 6 ++-- .../acceptance/topic-anonymous-test.js.es6 | 17 ++++++++++ test/javascripts/acceptance/topic-test.js.es6 | 32 ++++++++++++++----- .../javascripts/fixtures/site_fixtures.js.es6 | 2 +- test/javascripts/helpers/assertions.js | 6 ++++ 7 files changed, 60 insertions(+), 21 deletions(-) create mode 100644 test/javascripts/acceptance/topic-anonymous-test.js.es6 diff --git a/.jshintrc b/.jshintrc index 71726a3bd8..f7c6762ffa 100644 --- a/.jshintrc +++ b/.jshintrc @@ -35,6 +35,7 @@ "exists", "visible", "invisible", + "selectDropdown", "asyncTestDiscourse", "fixture", "find", diff --git a/app/assets/javascripts/discourse/models/topic.js.es6 b/app/assets/javascripts/discourse/models/topic.js.es6 index 2b51a06d66..abd3ef443f 100644 --- a/app/assets/javascripts/discourse/models/topic.js.es6 +++ b/app/assets/javascripts/discourse/models/topic.js.es6 @@ -40,18 +40,18 @@ const Topic = RestModel.extend({ return ({ type: 'topic', id: this.get('id') }); }.property('id'), - category: function() { - const categoryId = this.get('category_id'); - if (categoryId) { - return Discourse.Category.list().findProperty('id', categoryId); - } + _categoryIdChanged: function() { + this.set('category', Discourse.Category.findById(this.get('category_id'))); + }.observes('category_id').on('init'), + _categoryNameChanged: function() { const categoryName = this.get('categoryName'); + let category; if (categoryName) { - return Discourse.Category.list().findProperty('name', categoryName); + category = Discourse.Category.list().findProperty('name', categoryName); } - return null; - }.property('category_id', 'categoryName'), + this.set('category', category); + }.observes('categoryName'), categoryClass: function() { return 'category-' + this.get('category.fullSlug'); @@ -407,7 +407,6 @@ Topic.reopenClass({ // The title can be cleaned up server side props.title = result.basic_topic.title; props.fancy_title = result.basic_topic.fancy_title; - topic.setProperties(props); }); }, diff --git a/app/assets/javascripts/discourse/templates/topic.hbs b/app/assets/javascripts/discourse/templates/topic.hbs index ae4afee8fa..b061b7112b 100644 --- a/app/assets/javascripts/discourse/templates/topic.hbs +++ b/app/assets/javascripts/discourse/templates/topic.hbs @@ -22,8 +22,8 @@ {{plugin-outlet "edit-topic"}} - {{d-button action="finishedEditingTopic" class="btn-primary btn-small no-text" icon="check"}} - {{d-button action="cancelEditingTopic" class="btn-small no-text" icon="times"}} + {{d-button action="finishedEditingTopic" class="btn-primary btn-small no-text submit-edit" icon="check"}} + {{d-button action="cancelEditingTopic" class="btn-small no-text cancel-edit" icon="times"}} {{else}}

    {{#unless is_warning}} @@ -32,7 +32,7 @@ {{#if details.loaded}} {{topic-status topic=model}} - + {{{fancy_title}}} {{/if}} diff --git a/test/javascripts/acceptance/topic-anonymous-test.js.es6 b/test/javascripts/acceptance/topic-anonymous-test.js.es6 new file mode 100644 index 0000000000..1789fdc6d3 --- /dev/null +++ b/test/javascripts/acceptance/topic-anonymous-test.js.es6 @@ -0,0 +1,17 @@ +import { acceptance } from "helpers/qunit-helpers"; +acceptance("Topic - Anonymous"); + +test("Enter a Topic", () => { + visit("/t/internationalization-localization/280/1"); + andThen(() => { + ok(exists("#topic"), "The topic was rendered"); + ok(exists("#topic .cooked"), "The topic has cooked posts"); + }); +}); + +test("Enter without an id", () => { + visit("/t/internationalization-localization"); + andThen(() => { + ok(exists("#topic"), "The topic was rendered"); + }); +}); diff --git a/test/javascripts/acceptance/topic-test.js.es6 b/test/javascripts/acceptance/topic-test.js.es6 index 76813cd04e..56fcc173f4 100644 --- a/test/javascripts/acceptance/topic-test.js.es6 +++ b/test/javascripts/acceptance/topic-test.js.es6 @@ -1,17 +1,33 @@ import { acceptance } from "helpers/qunit-helpers"; -acceptance("View Topic"); +acceptance("Topic", { loggedIn: true }); + +test("Showing and hiding the edit controls", () => { + visit("/t/internationalization-localization/280"); + + click('#topic-title .fa-pencil'); -test("Enter a Topic", () => { - visit("/t/internationalization-localization/280/1"); andThen(() => { - ok(exists("#topic"), "The topic was rendered"); - ok(exists("#topic .cooked"), "The topic has cooked posts"); + ok(exists('#edit-title'), 'it shows the editing controls'); + }); + + fillIn('#edit-title', 'this is the new title'); + click('#topic-title .cancel-edit'); + andThen(() => { + ok(!exists('#edit-title'), 'it hides the editing controls'); }); }); -test("Enter without an id", () => { - visit("/t/internationalization-localization"); +test("Updating the topic title and category", () => { + visit("/t/internationalization-localization/280"); + click('#topic-title .fa-pencil'); + + fillIn('#edit-title', 'this is the new title'); + selectDropdown('.category-combobox', 4); + + click('#topic-title .submit-edit'); + andThen(() => { - ok(exists("#topic"), "The topic was rendered"); + equal(find('#topic-title .badge-category').text(), 'faq', 'it displays the new category'); + equal(find('.fancy-title').text().trim(), 'this is the new title', 'it displays the new title'); }); }); diff --git a/test/javascripts/fixtures/site_fixtures.js.es6 b/test/javascripts/fixtures/site_fixtures.js.es6 index 712b9a9df2..8af50ec747 100644 --- a/test/javascripts/fixtures/site_fixtures.js.es6 +++ b/test/javascripts/fixtures/site_fixtures.js.es6 @@ -1,3 +1,3 @@ export default { - "site.json": {"site":{"default_archetype":"regular","notification_types":{"mentioned":1,"replied":2,"quoted":3,"edited":4,"liked":5,"private_message":6,"invited_to_private_message":7,"invitee_accepted":8,"posted":9,"moved_post":10,"linked":11,"granted_badge":12},"post_types":{"regular":1,"moderator_action":2},"group_names":["admins","discourse","everyone","mcneel","moderators","newrelic","plugin_authors","sitepoint","staff","translators","trust_level_0","trust_level_1","trust_level_2","trust_level_3","trust_level_4","ubuntu"],"filters":["latest","unread","new","starred","read","posted"],"periods":["yearly","monthly","weekly","daily"],"top_menu_items":["latest","unread","new","starred","read","posted","category","categories","top"],"anonymous_top_menu_items":["latest","top","categories","category","categories","top"],"uncategorized_category_id":17,"is_readonly":false,"categories":[{"id":3,"name":"meta","color":"aaa","text_color":"FFFFFF","slug":"meta","topic_count":122,"post_count":1023,"description":"Discussion about meta.discourse.org itself, the organization of this forum about Discourse, how it works, and how we can improve this site.","topic_url":"/t/category-definition-for-meta/24","read_restricted":false,"permission":null,"notification_level":null,"logo_url":null,"background_url":null},{"id":10,"name":"howto","color":"76923C","text_color":"FFFFFF","slug":"howto","topic_count":72,"post_count":1022,"description":"Tutorial topics that describe how to set up, configure, or install Discourse using a specific platform or environment. Topics in this category may only be created by trust level 2 and up. ","topic_url":"/t/category-definition-for-howto/2629","read_restricted":false,"permission":null,"notification_level":null,"logo_url":null,"background_url":null},{"id":26,"name":"spec","color":"33B0B0","text_color":"FFFFFF","slug":"spec","topic_count":20,"post_count":278,"description":"My idea here is to have mini specs for features we would like built but have no bandwidth to build","topic_url":"/t/about-the-spec-category/13965","read_restricted":false,"permission":null,"parent_category_id":2,"notification_level":null,"logo_url":null,"background_url":null},{"id":7,"name":"dev","color":"000","text_color":"FFFFFF","slug":"dev","topic_count":481,"post_count":3575,"description":"This category is for topics related to hacking on Discourse: submitting pull requests, configuring development environments, coding conventions, and so forth.","topic_url":"/t/category-definition-for-dev/1026","read_restricted":false,"permission":null,"notification_level":null,"logo_url":null,"background_url":null},{"id":6,"name":"support","color":"b99","text_color":"FFFFFF","slug":"support","topic_count":1603,"post_count":11075,"description":"Support on configuring, using, and installing Discourse. Not for software development related topics, but for admins and end users configuring and using Discourse.","topic_url":"/t/category-definition-for-support/389","read_restricted":false,"permission":null,"notification_level":null,"logo_url":null,"background_url":null},{"id":24,"name":"sso","color":"92278F","text_color":"FFFFFF","slug":"sso","topic_count":13,"post_count":53,"description":"Only include actual maintained SSO (single sign on) implementations in this category. See the official documentation on Discourse's SSO support.","topic_url":"/t/about-the-sso-category/13110","read_restricted":false,"permission":null,"parent_category_id":5,"notification_level":null,"logo_url":null,"background_url":null},{"id":28,"name":"hack night","color":"B3B5B4","text_color":"FFFFFF","slug":"hack-night","topic_count":8,"post_count":33,"description":"This is a special, temporary category to organize work on the Discourse Hack Night in Toronto. ","topic_url":"/t/about-the-hack-night-category/17878","read_restricted":false,"permission":null,"parent_category_id":7,"notification_level":null,"logo_url":null,"background_url":null},{"id":27,"name":"translations","color":"808281","text_color":"FFFFFF","slug":"translations","topic_count":95,"post_count":827,"description":"This category is for discussion about localizing Discourse.","topic_url":"/t/about-the-translations-category/14549","read_restricted":false,"permission":null,"parent_category_id":7,"notification_level":null,"logo_url":null,"background_url":null},{"id":4,"name":"faq","color":"33b","text_color":"FFFFFF","slug":"faq","topic_count":48,"post_count":501,"description":"Topics that come up very often when discussing Discourse will eventually be classified into this Frequently Asked Questions category. Should only be added to popular topics.","topic_url":"/t/category-definition-for-faq/25","read_restricted":false,"permission":null,"notification_level":null,"logo_url":null,"background_url":null},{"id":14,"name":"marketplace","color":"8C6238","text_color":"FFFFFF","slug":"marketplace","topic_count":66,"post_count":361,"description":"About commercial Discourse related stuff: jobs or paid gigs, plugins, themes, hosting, etc.","topic_url":"/t/category-definition-for-marketplace/5425","read_restricted":false,"permission":null,"notification_level":null,"logo_url":null,"background_url":null},{"id":12,"name":"discourse hub","color":"b2c79f","text_color":"FFFFFF","slug":"discourse-hub","topic_count":10,"post_count":164,"description":"Topics about current or future Discourse Hub functionality at discourse.org including nickname registration, global user pages, and the site directory.","topic_url":"/t/category-definition-for-discourse-hub/3038","read_restricted":false,"permission":null,"notification_level":null,"logo_url":null,"background_url":null},{"id":13,"name":"blog","color":"ED207B","text_color":"FFFFFF","slug":"blog","topic_count":22,"post_count":390,"description":"Discussion topics generated from the official Discourse Blog. These topics are linked from the bottom of each blog entry where the blog comments would normally be.","topic_url":"/t/category-definition-for-blog/5250","read_restricted":false,"permission":null,"notification_level":null,"logo_url":null,"background_url":null},{"id":5,"name":"extensibility","color":"FE8432","text_color":"FFFFFF","slug":"extensibility","topic_count":226,"post_count":1874,"description":"Topics about extending the functionality of Discourse with plugins, themes, add-ons, or other mechanisms for extensibility. ","topic_url":"/t/about-the-extensibility-category/28","read_restricted":false,"permission":null,"notification_level":null,"logo_url":null,"background_url":null},{"id":11,"name":"login","color":"edb400","text_color":"FFFFFF","slug":"login","topic_count":48,"post_count":357,"description":"Topics about logging in to Discourse, using any standard third party provider (Twitter, Facebook, Google), traditional username and password, or with a custom plugin.","topic_url":"/t/category-definition-for-login/2828","read_restricted":false,"permission":null,"notification_level":null,"logo_url":null,"background_url":null},{"id":22,"name":"plugin","color":"d47711","text_color":"FFFFFF","slug":"plugin","topic_count":40,"post_count":466,"description":"One post per plugin! Only plugin owners should post here. ","topic_url":"/t/about-the-plugin-category/12648","read_restricted":false,"permission":null,"parent_category_id":5,"notification_level":null,"logo_url":null,"background_url":null},{"id":1,"name":"bug","color":"e9dd00","text_color":"000000","slug":"bug","topic_count":1469,"post_count":9295,"description":"A bug report means something is broken, preventing normal/typical use of Discourse. Do be sure to search prior to submitting bugs. Include repro steps, and only describe one bug per topic please.","topic_url":"/t/category-definition-for-bug/2","read_restricted":false,"permission":null,"notification_level":null,"logo_url":null,"background_url":null},{"id":17,"name":"uncategorized","color":"AB9364","text_color":"FFFFFF","slug":"uncategorized","topic_count":342,"post_count":3090,"description":"Topics that don't need a category, or don't fit into any other existing category.","topic_url":null,"read_restricted":false,"permission":null,"notification_level":null,"logo_url":"","background_url":""},{"id":21,"name":"wordpress","color":"1E8CBE","text_color":"FFFFFF","slug":"wordpress","topic_count":26,"post_count":135,"description":"Support for the official Discourse WordPress plugin at https://github.com/discourse/wp-discourse","topic_url":"/t/category-definition-for-wordpress/12282","read_restricted":false,"permission":null,"parent_category_id":6,"notification_level":null,"logo_url":null,"background_url":null},{"id":8,"name":"hosting","color":"74CCED","text_color":"FFFFFF","slug":"hosting","topic_count":100,"post_count":917,"description":"Topics about hosting Discourse, either on your own servers, in the cloud, or with specific hosting services.","topic_url":"/t/category-definition-for-hosting/2626","read_restricted":false,"permission":null,"notification_level":null,"logo_url":null,"background_url":null},{"id":9,"name":"ux","color":"5F497A","text_color":"FFFFFF","slug":"ux","topic_count":452,"post_count":4472,"description":"Discussion about the user interface of Discourse, how features are presented to the user in the client, including language and UI elements.","topic_url":"/t/category-definition-for-ux/2628","read_restricted":false,"permission":null,"notification_level":null,"logo_url":null,"background_url":null},{"id":2,"name":"feature","color":"0E76BD","text_color":"FFFFFF","slug":"feature","topic_count":1367,"post_count":11942,"description":"Discussion about features or potential features of Discourse: how they work, why they work, etc.","topic_url":"/t/category-definition-for-feature/11","read_restricted":false,"permission":null,"notification_level":null,"logo_url":null,"background_url":null}],"post_action_types":[{"name_key":"bookmark","name":"Bookmark","description":"Bookmark this post","long_form":"bookmarked this post","is_flag":false,"icon":null,"id":1,"is_custom_flag":false},{"name_key":"like","name":"Like","description":"Like this post","long_form":"liked this","is_flag":false,"icon":"heart","id":2,"is_custom_flag":false},{"name_key":"off_topic","name":"Off-Topic","description":"This post is radically off-topic in the current topic, and should probably be moved. If this is a topic, perhaps it does not belong here.","long_form":"flagged this as off-topic","is_flag":true,"icon":null,"id":3,"is_custom_flag":false},{"name_key":"inappropriate","name":"Inappropriate","description":"This post contains content that a reasonable person would consider offensive, abusive, or a violation of our community guidelines.","long_form":"flagged this as inappropriate","is_flag":true,"icon":null,"id":4,"is_custom_flag":false},{"name_key":"vote","name":"Vote","description":"Vote for this post","long_form":"voted for this post","is_flag":false,"icon":null,"id":5,"is_custom_flag":false},{"name_key":"spam","name":"Spam","description":"This post is an advertisement. It is not useful or relevant to the current topic, but promotional in nature.","long_form":"flagged this as spam","is_flag":true,"icon":null,"id":8,"is_custom_flag":false},{"name_key":"notify_user","name":"Notify {{username}}","description":"This post contains something I want to talk to this person directly and privately about. Does not cast a flag.","long_form":"notified user","is_flag":true,"icon":null,"id":6,"is_custom_flag":true},{"name_key":"notify_moderators","name":"Notify moderators","description":"This post requires general moderator attention based on the guidelines, TOS, or for another reason not listed above.","long_form":"notified moderators","is_flag":true,"icon":null,"id":7,"is_custom_flag":true}],"topic_flag_types":[{"name_key":"inappropriate","name":"Inappropriate","description":"This topic contains content that a reasonable person would consider offensive, abusive, or a violation of our community guidelines.","long_form":"flagged this as inappropriate","is_flag":true,"icon":null,"id":4,"is_custom_flag":false},{"name_key":"spam","name":"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","is_flag":true,"icon":null,"id":8,"is_custom_flag":false},{"name_key":"notify_moderators","name":"Notify moderators","description":"This topic requires general moderator attention based on the guidelines, TOS, or for another reason not listed above.","long_form":"notified moderators","is_flag":true,"icon":null,"id":7,"is_custom_flag":true}],"trust_levels":[{"id":0,"name":"new user"},{"id":1,"name":"basic user"},{"id":2,"name":"member"},{"id":3,"name":"regular"},{"id":4,"name":"leader"}],"archetypes":[{"id":"regular","name":"Regular Topic","options":[]},{"id":"banner","name":"translation missing: en.archetypes.banner.title","options":[]}]}} + "site.json": {"site":{"default_archetype":"regular","notification_types":{"mentioned":1,"replied":2,"quoted":3,"edited":4,"liked":5,"private_message":6,"invited_to_private_message":7,"invitee_accepted":8,"posted":9,"moved_post":10,"linked":11,"granted_badge":12},"post_types":{"regular":1,"moderator_action":2},"group_names":["admins","discourse","everyone","mcneel","moderators","newrelic","plugin_authors","sitepoint","staff","translators","trust_level_0","trust_level_1","trust_level_2","trust_level_3","trust_level_4","ubuntu"],"filters":["latest","unread","new","starred","read","posted"],"periods":["yearly","monthly","weekly","daily"],"top_menu_items":["latest","unread","new","starred","read","posted","category","categories","top"],"anonymous_top_menu_items":["latest","top","categories","category","categories","top"],"uncategorized_category_id":17,"is_readonly":false,"categories":[{"id":3,"name":"meta","color":"aaa","text_color":"FFFFFF","slug":"meta","topic_count":122,"post_count":1023,"description":"Discussion about meta.discourse.org itself, the organization of this forum about Discourse, how it works, and how we can improve this site.","topic_url":"/t/category-definition-for-meta/24","read_restricted":false,"permission":1,"notification_level":null,"logo_url":null,"background_url":null},{"id":10,"name":"howto","color":"76923C","text_color":"FFFFFF","slug":"howto","topic_count":72,"post_count":1022,"description":"Tutorial topics that describe how to set up, configure, or install Discourse using a specific platform or environment. Topics in this category may only be created by trust level 2 and up. ","topic_url":"/t/category-definition-for-howto/2629","read_restricted":false,"permission":1,"notification_level":null,"logo_url":null,"background_url":null},{"id":26,"name":"spec","color":"33B0B0","text_color":"FFFFFF","slug":"spec","topic_count":20,"post_count":278,"description":"My idea here is to have mini specs for features we would like built but have no bandwidth to build","topic_url":"/t/about-the-spec-category/13965","read_restricted":false,"permission":1,"parent_category_id":2,"notification_level":null,"logo_url":null,"background_url":null},{"id":7,"name":"dev","color":"000","text_color":"FFFFFF","slug":"dev","topic_count":481,"post_count":3575,"description":"This category is for topics related to hacking on Discourse: submitting pull requests, configuring development environments, coding conventions, and so forth.","topic_url":"/t/category-definition-for-dev/1026","read_restricted":false,"permission":1,"notification_level":null,"logo_url":null,"background_url":null},{"id":6,"name":"support","color":"b99","text_color":"FFFFFF","slug":"support","topic_count":1603,"post_count":11075,"description":"Support on configuring, using, and installing Discourse. Not for software development related topics, but for admins and end users configuring and using Discourse.","topic_url":"/t/category-definition-for-support/389","read_restricted":false,"permission":1,"notification_level":null,"logo_url":null,"background_url":null},{"id":24,"name":"sso","color":"92278F","text_color":"FFFFFF","slug":"sso","topic_count":13,"post_count":53,"description":"Only include actual maintained SSO (single sign on) implementations in this category. See the official documentation on Discourse's SSO support.","topic_url":"/t/about-the-sso-category/13110","read_restricted":false,"permission":1,"parent_category_id":5,"notification_level":null,"logo_url":null,"background_url":null},{"id":28,"name":"hack night","color":"B3B5B4","text_color":"FFFFFF","slug":"hack-night","topic_count":8,"post_count":33,"description":"This is a special, temporary category to organize work on the Discourse Hack Night in Toronto. ","topic_url":"/t/about-the-hack-night-category/17878","read_restricted":false,"permission":1,"parent_category_id":7,"notification_level":null,"logo_url":null,"background_url":null},{"id":27,"name":"translations","color":"808281","text_color":"FFFFFF","slug":"translations","topic_count":95,"post_count":827,"description":"This category is for discussion about localizing Discourse.","topic_url":"/t/about-the-translations-category/14549","read_restricted":false,"permission":1,"parent_category_id":7,"notification_level":null,"logo_url":null,"background_url":null},{"id":4,"name":"faq","color":"33b","text_color":"FFFFFF","slug":"faq","topic_count":48,"post_count":501,"description":"Topics that come up very often when discussing Discourse will eventually be classified into this Frequently Asked Questions category. Should only be added to popular topics.","topic_url":"/t/category-definition-for-faq/25","read_restricted":false,"permission":1,"notification_level":null,"logo_url":null,"background_url":null},{"id":14,"name":"marketplace","color":"8C6238","text_color":"FFFFFF","slug":"marketplace","topic_count":66,"post_count":361,"description":"About commercial Discourse related stuff: jobs or paid gigs, plugins, themes, hosting, etc.","topic_url":"/t/category-definition-for-marketplace/5425","read_restricted":false,"permission":1,"notification_level":null,"logo_url":null,"background_url":null},{"id":12,"name":"discourse hub","color":"b2c79f","text_color":"FFFFFF","slug":"discourse-hub","topic_count":10,"post_count":164,"description":"Topics about current or future Discourse Hub functionality at discourse.org including nickname registration, global user pages, and the site directory.","topic_url":"/t/category-definition-for-discourse-hub/3038","read_restricted":false,"permission":1,"notification_level":null,"logo_url":null,"background_url":null},{"id":13,"name":"blog","color":"ED207B","text_color":"FFFFFF","slug":"blog","topic_count":22,"post_count":390,"description":"Discussion topics generated from the official Discourse Blog. These topics are linked from the bottom of each blog entry where the blog comments would normally be.","topic_url":"/t/category-definition-for-blog/5250","read_restricted":false,"permission":1,"notification_level":null,"logo_url":null,"background_url":null},{"id":5,"name":"extensibility","color":"FE8432","text_color":"FFFFFF","slug":"extensibility","topic_count":226,"post_count":1874,"description":"Topics about extending the functionality of Discourse with plugins, themes, add-ons, or other mechanisms for extensibility. ","topic_url":"/t/about-the-extensibility-category/28","read_restricted":false,"permission":1,"notification_level":null,"logo_url":null,"background_url":null},{"id":11,"name":"login","color":"edb400","text_color":"FFFFFF","slug":"login","topic_count":48,"post_count":357,"description":"Topics about logging in to Discourse, using any standard third party provider (Twitter, Facebook, Google), traditional username and password, or with a custom plugin.","topic_url":"/t/category-definition-for-login/2828","read_restricted":false,"permission":1,"notification_level":null,"logo_url":null,"background_url":null},{"id":22,"name":"plugin","color":"d47711","text_color":"FFFFFF","slug":"plugin","topic_count":40,"post_count":466,"description":"One post per plugin! Only plugin owners should post here. ","topic_url":"/t/about-the-plugin-category/12648","read_restricted":false,"permission":1,"parent_category_id":5,"notification_level":null,"logo_url":null,"background_url":null},{"id":1,"name":"bug","color":"e9dd00","text_color":"000000","slug":"bug","topic_count":1469,"post_count":9295,"description":"A bug report means something is broken, preventing normal/typical use of Discourse. Do be sure to search prior to submitting bugs. Include repro steps, and only describe one bug per topic please.","topic_url":"/t/category-definition-for-bug/2","read_restricted":false,"permission":1,"notification_level":null,"logo_url":null,"background_url":null},{"id":17,"name":"uncategorized","color":"AB9364","text_color":"FFFFFF","slug":"uncategorized","topic_count":342,"post_count":3090,"description":"Topics that don't need a category, or don't fit into any other existing category.","topic_url":null,"read_restricted":false,"permission":1,"notification_level":null,"logo_url":"","background_url":""},{"id":21,"name":"wordpress","color":"1E8CBE","text_color":"FFFFFF","slug":"wordpress","topic_count":26,"post_count":135,"description":"Support for the official Discourse WordPress plugin at https://github.com/discourse/wp-discourse","topic_url":"/t/category-definition-for-wordpress/12282","read_restricted":false,"permission":1,"parent_category_id":6,"notification_level":null,"logo_url":null,"background_url":null},{"id":8,"name":"hosting","color":"74CCED","text_color":"FFFFFF","slug":"hosting","topic_count":100,"post_count":917,"description":"Topics about hosting Discourse, either on your own servers, in the cloud, or with specific hosting services.","topic_url":"/t/category-definition-for-hosting/2626","read_restricted":false,"permission":1,"notification_level":null,"logo_url":null,"background_url":null},{"id":9,"name":"ux","color":"5F497A","text_color":"FFFFFF","slug":"ux","topic_count":452,"post_count":4472,"description":"Discussion about the user interface of Discourse, how features are presented to the user in the client, including language and UI elements.","topic_url":"/t/category-definition-for-ux/2628","read_restricted":false,"permission":1,"notification_level":null,"logo_url":null,"background_url":null},{"id":2,"name":"feature","color":"0E76BD","text_color":"FFFFFF","slug":"feature","topic_count":1367,"post_count":11942,"description":"Discussion about features or potential features of Discourse: how they work, why they work, etc.","topic_url":"/t/category-definition-for-feature/11","read_restricted":false,"permission":1,"notification_level":null,"logo_url":null,"background_url":null}],"post_action_types":[{"name_key":"bookmark","name":"Bookmark","description":"Bookmark this post","long_form":"bookmarked this post","is_flag":false,"icon":null,"id":1,"is_custom_flag":false},{"name_key":"like","name":"Like","description":"Like this post","long_form":"liked this","is_flag":false,"icon":"heart","id":2,"is_custom_flag":false},{"name_key":"off_topic","name":"Off-Topic","description":"This post is radically off-topic in the current topic, and should probably be moved. If this is a topic, perhaps it does not belong here.","long_form":"flagged this as off-topic","is_flag":true,"icon":null,"id":3,"is_custom_flag":false},{"name_key":"inappropriate","name":"Inappropriate","description":"This post contains content that a reasonable person would consider offensive, abusive, or a violation of our community guidelines.","long_form":"flagged this as inappropriate","is_flag":true,"icon":null,"id":4,"is_custom_flag":false},{"name_key":"vote","name":"Vote","description":"Vote for this post","long_form":"voted for this post","is_flag":false,"icon":null,"id":5,"is_custom_flag":false},{"name_key":"spam","name":"Spam","description":"This post is an advertisement. It is not useful or relevant to the current topic, but promotional in nature.","long_form":"flagged this as spam","is_flag":true,"icon":null,"id":8,"is_custom_flag":false},{"name_key":"notify_user","name":"Notify {{username}}","description":"This post contains something I want to talk to this person directly and privately about. Does not cast a flag.","long_form":"notified user","is_flag":true,"icon":null,"id":6,"is_custom_flag":true},{"name_key":"notify_moderators","name":"Notify moderators","description":"This post requires general moderator attention based on the guidelines, TOS, or for another reason not listed above.","long_form":"notified moderators","is_flag":true,"icon":null,"id":7,"is_custom_flag":true}],"topic_flag_types":[{"name_key":"inappropriate","name":"Inappropriate","description":"This topic contains content that a reasonable person would consider offensive, abusive, or a violation of our community guidelines.","long_form":"flagged this as inappropriate","is_flag":true,"icon":null,"id":4,"is_custom_flag":false},{"name_key":"spam","name":"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","is_flag":true,"icon":null,"id":8,"is_custom_flag":false},{"name_key":"notify_moderators","name":"Notify moderators","description":"This topic requires general moderator attention based on the guidelines, TOS, or for another reason not listed above.","long_form":"notified moderators","is_flag":true,"icon":null,"id":7,"is_custom_flag":true}],"trust_levels":[{"id":0,"name":"new user"},{"id":1,"name":"basic user"},{"id":2,"name":"member"},{"id":3,"name":"regular"},{"id":4,"name":"leader"}],"archetypes":[{"id":"regular","name":"Regular Topic","options":[]},{"id":"banner","name":"translation missing: en.archetypes.banner.title","options":[]}]}} }; diff --git a/test/javascripts/helpers/assertions.js b/test/javascripts/helpers/assertions.js index 31e99bca1a..454bdb7912 100644 --- a/test/javascripts/helpers/assertions.js +++ b/test/javascripts/helpers/assertions.js @@ -28,6 +28,12 @@ function visible(selector) { return find(selector + ":visible").length > 0; } +Ember.Test.registerAsyncHelper('selectDropdown', function(app, selector, itemId) { + var $select2 = find(selector); + $select2.select2('val', itemId.toString()); + $select2.trigger("change"); +}); + function invisible(selector) { var $items = find(selector + ":visible"); return $items.length === 0 || From c7d367996a09032b53f03e44809a769cb566808e Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Thu, 16 Apr 2015 15:40:23 -0400 Subject: [PATCH 059/113] PERF: Concatenate scripts in development mode This improves my DOMContentLoaded from 9s+ to less than 4s. Pinging @SamSaffron on this because this was previously controversial. This implementation adds the `@sourceURL` directive so chrome correctly identifies the source files. --- config/environments/development.rb | 2 +- lib/discourse_iife.rb | 1 + .../tilt/es6_module_transpiler_template.rb | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/config/environments/development.rb b/config/environments/development.rb index 160ee7dc68..6edea4c1fc 100644 --- a/config/environments/development.rb +++ b/config/environments/development.rb @@ -22,7 +22,7 @@ Discourse::Application.configure do # Don't Digest assets, makes debugging uglier config.assets.digest = false - config.assets.debug = true + config.assets.debug = false # Raise an error on page load if there are pending migrations config.active_record.migration_error = :page_load diff --git a/lib/discourse_iife.rb b/lib/discourse_iife.rb index fa80aa43fd..80033a11bb 100644 --- a/lib/discourse_iife.rb +++ b/lib/discourse_iife.rb @@ -32,6 +32,7 @@ class DiscourseIIFE < Sprockets::Processor .sub("/app/assets/javascripts", "") .sub("/test/javascripts", "") res << "\nwindow.__jshintSrc = window.__jshintSrc || {}; window.__jshintSrc['/assets#{req_path}'] = #{data.to_json};\n" + res << "\n//@ sourceURL=/#{context.logical_path}\n" end res diff --git a/lib/es6_module_transpiler/tilt/es6_module_transpiler_template.rb b/lib/es6_module_transpiler/tilt/es6_module_transpiler_template.rb index 2777603580..d404d42fc6 100644 --- a/lib/es6_module_transpiler/tilt/es6_module_transpiler_template.rb +++ b/lib/es6_module_transpiler/tilt/es6_module_transpiler_template.rb @@ -127,6 +127,7 @@ module Tilt req_path = "/assets/#{scope.logical_path}.#{extension}" @output << "\nwindow.__jshintSrc = window.__jshintSrc || {}; window.__jshintSrc['#{req_path}'] = #{data.to_json};\n" + @output << "\n//@ sourceURL=/#{scope.logical_path}\n" end @output From e83bf7dc07c24ddeb5e9a3d2319c42394c4ce081 Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Thu, 16 Apr 2015 15:50:47 -0400 Subject: [PATCH 060/113] FIX: Restrict editing queued posts to one at a time --- .../javascripts/discourse/controllers/queued-post.js.es6 | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/app/assets/javascripts/discourse/controllers/queued-post.js.es6 b/app/assets/javascripts/discourse/controllers/queued-post.js.es6 index 588e14711c..a64cd8b25b 100644 --- a/app/assets/javascripts/discourse/controllers/queued-post.js.es6 +++ b/app/assets/javascripts/discourse/controllers/queued-post.js.es6 @@ -13,27 +13,28 @@ function updateState(state) { export default Ember.Controller.extend(BufferedContent, { needs: ['queued-posts'], post: Ember.computed.alias('model'), + currentlyEditing: Ember.computed.alias('controllers.queued-posts.editing'), - editing: false, + editing: Discourse.computed.propertyEqual('model', 'currentlyEditing'), actions: { approve: updateState('approved'), reject: updateState('rejected'), edit() { - this.set('editing', true); + this.set('currentlyEditing', this.get('model')); }, confirmEdit() { this.get('post').update({ raw: this.get('buffered.raw') }).then(() => { this.commitBuffer(); - this.set('editing', false); + this.set('currentlyEditing', null); }); }, cancelEdit() { this.rollbackBuffer(); - this.set('editing', false); + this.set('currentlyEditing', null); } } }); From 788b66e4a31533d0263cce28ee4cc55f08ba4393 Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Thu, 16 Apr 2015 16:44:24 -0400 Subject: [PATCH 061/113] Update SourceURL to work better --- config/initializers/10-discourse_iife.rb | 4 +++- lib/discourse_iife.rb | 1 - .../tilt/es6_module_transpiler_template.rb | 1 - lib/source_url.rb | 15 +++++++++++++++ 4 files changed, 18 insertions(+), 3 deletions(-) create mode 100644 lib/source_url.rb diff --git a/config/initializers/10-discourse_iife.rb b/config/initializers/10-discourse_iife.rb index 56e6a4cb8c..73f343071f 100644 --- a/config/initializers/10-discourse_iife.rb +++ b/config/initializers/10-discourse_iife.rb @@ -1,3 +1,5 @@ require 'discourse_iife' +require 'source_url' -Rails.application.assets.register_preprocessor('application/javascript', DiscourseIIFE) \ No newline at end of file +Rails.application.assets.register_preprocessor('application/javascript', DiscourseIIFE) +Rails.application.assets.register_postprocessor('application/javascript', SourceURL) diff --git a/lib/discourse_iife.rb b/lib/discourse_iife.rb index 80033a11bb..fa80aa43fd 100644 --- a/lib/discourse_iife.rb +++ b/lib/discourse_iife.rb @@ -32,7 +32,6 @@ class DiscourseIIFE < Sprockets::Processor .sub("/app/assets/javascripts", "") .sub("/test/javascripts", "") res << "\nwindow.__jshintSrc = window.__jshintSrc || {}; window.__jshintSrc['/assets#{req_path}'] = #{data.to_json};\n" - res << "\n//@ sourceURL=/#{context.logical_path}\n" end res diff --git a/lib/es6_module_transpiler/tilt/es6_module_transpiler_template.rb b/lib/es6_module_transpiler/tilt/es6_module_transpiler_template.rb index d404d42fc6..2777603580 100644 --- a/lib/es6_module_transpiler/tilt/es6_module_transpiler_template.rb +++ b/lib/es6_module_transpiler/tilt/es6_module_transpiler_template.rb @@ -127,7 +127,6 @@ module Tilt req_path = "/assets/#{scope.logical_path}.#{extension}" @output << "\nwindow.__jshintSrc = window.__jshintSrc || {}; window.__jshintSrc['#{req_path}'] = #{data.to_json};\n" - @output << "\n//@ sourceURL=/#{scope.logical_path}\n" end @output diff --git a/lib/source_url.rb b/lib/source_url.rb new file mode 100644 index 0000000000..a5b79ae6af --- /dev/null +++ b/lib/source_url.rb @@ -0,0 +1,15 @@ +class SourceURL < Tilt::Template + self.default_mime_type = 'application/javascript' + + def prepare + end + + def evaluate(scope, locals, &block) + code = '' + code << 'eval(' + code << data.inspect + code << " + \"\\n//@ sourceURL=/#{scope.logical_path}\"" + code << ");\n" + code + end +end From 2599b949201e978ebcdc71b5eb9a802199427445 Mon Sep 17 00:00:00 2001 From: Sam Date: Fri, 17 Apr 2015 12:16:37 +1000 Subject: [PATCH 062/113] ignore uploads for mini profiler --- config/environments/development.rb | 2 +- config/initializers/06-mini_profiler.rb | 29 +++++++++++++++---------- 2 files changed, 19 insertions(+), 12 deletions(-) diff --git a/config/environments/development.rb b/config/environments/development.rb index 6edea4c1fc..ee06ba01b4 100644 --- a/config/environments/development.rb +++ b/config/environments/development.rb @@ -41,8 +41,8 @@ Discourse::Application.configure do config.load_mini_profiler = true require 'middleware/turbo_dev' - require 'middleware/missing_avatars' config.middleware.insert 0, Middleware::TurboDev + require 'middleware/missing_avatars' config.middleware.insert 1, Middleware::MissingAvatars config.enable_anon_caching = false diff --git a/config/initializers/06-mini_profiler.rb b/config/initializers/06-mini_profiler.rb index cc583b4bb3..4feac54b98 100644 --- a/config/initializers/06-mini_profiler.rb +++ b/config/initializers/06-mini_profiler.rb @@ -18,21 +18,28 @@ if defined?(Rack::MiniProfiler) # namespacing gets complex, cause mini profiler is in the rack chain way before multisite Rack::MiniProfiler.config.storage_instance = Rack::MiniProfiler::RedisStore.new(connection: DiscourseRedis.raw_connection) + skip = [ + /^\/message-bus/, + /topics\/timings/, + /assets/, + /\/user_avatar\//, + /\/letter_avatar\//, + /\/highlight-js\//, + /qunit/, + /srv\/status/, + /commits-widget/, + /^\/cdn_asset/, + /^\/logs/, + /^\/site_customizations/, + /^\/uploads/ + ] + # For our app, let's just show mini profiler always, polling is chatty so nuke that Rack::MiniProfiler.config.pre_authorize_cb = lambda do |env| path = env['PATH_INFO'] + (env['HTTP_USER_AGENT'] !~ /iPad|iPhone|Nexus 7|Android/) && - (path !~ /^\/message-bus/) && - (path !~ /topics\/timings/) && - (path !~ /assets/) && - (path !~ /\/user_avatar\//) && - (path !~ /\/letter_avatar\//) && - (path !~ /\/highlight-js\//) && - (path !~ /qunit/) && - (path !~ /srv\/status/) && - (path !~ /commits-widget/) && - (path !~ /^\/cdn_asset/) && - (path !~ /^\/logs/) + (env['REQUEST_METHOD'] != "GET" || !skip.any?{|re| re =~ path}) end # without a user provider our results will use the ip address for namespacing From 0c11b4c7070fffa9c99ad58fd497b84eb015559e Mon Sep 17 00:00:00 2001 From: Sam Date: Fri, 17 Apr 2015 12:49:55 +1000 Subject: [PATCH 063/113] timings is a POST --- config/initializers/06-mini_profiler.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/initializers/06-mini_profiler.rb b/config/initializers/06-mini_profiler.rb index 4feac54b98..a3827f08b3 100644 --- a/config/initializers/06-mini_profiler.rb +++ b/config/initializers/06-mini_profiler.rb @@ -39,7 +39,7 @@ if defined?(Rack::MiniProfiler) path = env['PATH_INFO'] (env['HTTP_USER_AGENT'] !~ /iPad|iPhone|Nexus 7|Android/) && - (env['REQUEST_METHOD'] != "GET" || !skip.any?{|re| re =~ path}) + !skip.any?{|re| re =~ path} end # without a user provider our results will use the ip address for namespacing From 832cb9fdc338e993fdaf216cf1ad3175fd9afd53 Mon Sep 17 00:00:00 2001 From: Sam Date: Fri, 17 Apr 2015 14:03:08 +1000 Subject: [PATCH 064/113] FIX: admin check missing from topic tracking state FIX: handle muted categories correctly --- app/models/topic_tracking_state.rb | 5 +++-- spec/models/topic_tracking_state_spec.rb | 25 +++++++++++++++++++++++- 2 files changed, 27 insertions(+), 3 deletions(-) diff --git a/app/models/topic_tracking_state.rb b/app/models/topic_tracking_state.rb index 05334ccada..0bf3fa7096 100644 --- a/app/models/topic_tracking_state.rb +++ b/app/models/topic_tracking_state.rb @@ -148,14 +148,15 @@ class TopicTrackingState ((#{unread}) OR (#{new})) AND (topics.visible OR u.admin OR u.moderator) AND topics.deleted_at IS NULL AND - ( category_id IS NULL OR NOT c.read_restricted OR category_id IN ( + ( category_id IS NULL OR NOT c.read_restricted OR u.admin OR category_id IN ( SELECT c2.id FROM categories c2 JOIN category_groups cg ON cg.category_id = c2.id JOIN group_users gu ON gu.user_id = u.id AND cg.group_id = gu.group_id WHERE c2.read_restricted ) ) AND NOT EXISTS( SELECT 1 FROM category_users cu - WHERE cu.user_id = u.id AND + WHERE last_read_post_number IS NULL AND + cu.user_id = u.id AND cu.category_id = topics.category_id AND cu.notification_level = #{CategoryUser.notification_levels[:muted]}) diff --git a/spec/models/topic_tracking_state_spec.rb b/spec/models/topic_tracking_state_spec.rb index 3c94c26b15..6897a2550a 100644 --- a/spec/models/topic_tracking_state_spec.rb +++ b/spec/models/topic_tracking_state_spec.rb @@ -15,11 +15,34 @@ describe TopicTrackingState do TopicTrackingState.publish_unread(post) end + it "correctly handles muted categories" do + + user = Fabricate(:user) + post + + report = TopicTrackingState.report([user.id]) + expect(report.length).to eq(1) + + CategoryUser.create!(user_id: user.id, + notification_level: CategoryUser.notification_levels[:muted], + category_id: post.topic.category_id + ) + + create_post(topic_id: post.topic_id) + + report = TopicTrackingState.report([user.id]) + expect(report.length).to eq(0) + + TopicUser.create!(user_id: user.id, topic_id: post.topic_id, last_read_post_number: 1, notification_level: 3) + + report = TopicTrackingState.report([user.id]) + expect(report.length).to eq(1) + end + it "correctly gets the tracking state" do report = TopicTrackingState.report([user.id]) expect(report.length).to eq(0) - new_post = post post.topic.notifier.watch_topic!(post.topic.user_id) report = TopicTrackingState.report([user.id]) From 51b747346ec2df85b5386cd2667a596de8c5a96a Mon Sep 17 00:00:00 2001 From: Sam Date: Fri, 17 Apr 2015 16:01:20 +1000 Subject: [PATCH 065/113] PREF: speed up grabbing unread counts --- app/models/user.rb | 42 +++++++++++++++++++++++++++------ spec/models/post_timing_spec.rb | 2 -- 2 files changed, 35 insertions(+), 9 deletions(-) diff --git a/app/models/user.rb b/app/models/user.rb index 62604333f7..47b994997e 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -235,23 +235,51 @@ class User < ActiveRecord::Base User.email_hash(email) end - def unread_notifications_by_type - @unread_notifications_by_type ||= notifications.visible.where("id > ? and read = false", seen_notification_id).group(:notification_type).count - end - def reload - @unread_notifications_by_type = nil + @unread_notifications = nil @unread_total_notifications = nil @unread_pms = nil super end def unread_private_messages - @unread_pms ||= notifications.visible.where("read = false AND notification_type = ?", Notification.types[:private_message]).count + @unread_pms ||= + begin + # perf critical, much more efficient than AR + sql = " + SELECT COUNT(*) FROM notifications n + LEFT JOIN topics t ON n.topic_id = t.id + WHERE + t.deleted_at IS NULL AND + n.notification_type = :type AND + n.user_id = :user_id AND + NOT read" + + User.exec_sql(sql, user_id: id, + type: Notification.types[:private_message]) + .getvalue(0,0).to_i + end end def unread_notifications - unread_notifications_by_type.except(Notification.types[:private_message]).values.sum + @unread_notifications ||= + begin + # perf critical, much more efficient than AR + sql = " + SELECT COUNT(*) FROM notifications n + LEFT JOIN topics t ON n.topic_id = t.id + WHERE + t.deleted_at IS NULL AND + n.notification_type <> :pm AND + n.user_id = :user_id AND + NOT read AND + n.id > :seen_notification_id" + + User.exec_sql(sql, user_id: id, + seen_notification_id: seen_notification_id, + pm: Notification.types[:private_message]) + .getvalue(0,0).to_i + end end def total_unread_notifications diff --git a/spec/models/post_timing_spec.rb b/spec/models/post_timing_spec.rb index b2c18dd804..002ba5729c 100644 --- a/spec/models/post_timing_spec.rb +++ b/spec/models/post_timing_spec.rb @@ -90,12 +90,10 @@ describe PostTiming do PostAction.act(user2, post, PostActionType.types[:like]) expect(post.user.unread_notifications).to eq(1) - expect(post.user.unread_notifications_by_type).to eq({Notification.types[:liked] => 1 }) PostTiming.process_timings(post.user, post.topic_id, 1, [[post.post_number, 100]]) post.user.reload - expect(post.user.unread_notifications_by_type).to eq({}) expect(post.user.unread_notifications).to eq(0) end From c3f163ca73fd0512a08984bb04f7c023590f34a2 Mon Sep 17 00:00:00 2001 From: Arpit Jalan Date: Fri, 17 Apr 2015 12:29:28 +0530 Subject: [PATCH 066/113] FIX: about tab was not showing on Privacy / ToS / FAQ topnav --- app/views/static/show.html.erb | 1 + 1 file changed, 1 insertion(+) diff --git a/app/views/static/show.html.erb b/app/views/static/show.html.erb index 2f73233a03..0f84dbcaac 100644 --- a/app/views/static/show.html.erb +++ b/app/views/static/show.html.erb @@ -1,6 +1,7 @@
    {{else}} diff --git a/app/assets/javascripts/discourse/templates/site-map.hbs b/app/assets/javascripts/discourse/templates/site-map.hbs index 46e9080dfd..5efeea4c9a 100644 --- a/app/assets/javascripts/discourse/templates/site-map.hbs +++ b/app/assets/javascripts/discourse/templates/site-map.hbs @@ -2,19 +2,23 @@
      {{#if showAdminLinks}}
    • - {{i18n 'admin_title'}} + {{#link-to "admin" class="admin-link"}} + {{i18n 'admin_title'}} + {{/link-to}}
    • - + {{#link-to "adminFlags" class="flagged-posts-link"}} {{fa-icon "flag"}} {{i18n 'flags_title'}} {{#if currentUser.site_flagged_posts_count}} {{currentUser.site_flagged_posts_count}} {{/if}} - + {{/link-to}}
      • {{/if}}
    • - {{i18n 'filters.latest.title'}} + {{#link-to "discovery.latest" class="latest-topics-link"}} + {{i18n 'filters.latest.title'}} + {{/link-to}}
      • {{#if showBadgesLink}}
    • From 6d2e6518623238ca212262f70ef515eca9f1770b Mon Sep 17 00:00:00 2001 From: Sam Saffron Date: Mon, 20 Apr 2015 06:41:08 +1000 Subject: [PATCH 084/113] Revert "FIX: Missing letter avatars" This reverts commit 03943554c6f8ece7f2b07d9aa34131ad1954e544. --- app/controllers/user_avatars_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/user_avatars_controller.rb b/app/controllers/user_avatars_controller.rb index d29351b379..80093b600e 100644 --- a/app/controllers/user_avatars_controller.rb +++ b/app/controllers/user_avatars_controller.rb @@ -24,7 +24,7 @@ class UserAvatarsController < ApplicationController params.require(:version) params.require(:size) - return render_dot if params[:version].to_i != LetterAvatar::VERSION + return render_dot if params[:version] != LetterAvatar.version image = LetterAvatar.generate(params[:username].to_s, params[:size].to_i) From 296add56e663b233fef15f1b3cb9d4d09f8f6715 Mon Sep 17 00:00:00 2001 From: Sam Saffron Date: Mon, 20 Apr 2015 13:07:12 +1000 Subject: [PATCH 085/113] correct letter avatar template --- app/models/user.rb | 2 +- spec/models/user_spec.rb | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/models/user.rb b/app/models/user.rb index 47b994997e..53bc343b5e 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -417,7 +417,7 @@ class User < ActiveRecord::Base end def self.letter_avatar_template(username) - "/letter_avatar/#{username.downcase}/{size}/#{LetterAvatar::VERSION}.png" + "/letter_avatar/#{username.downcase}/{size}/#{LetterAvatar.version}.png" end def avatar_template diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb index 5c58b5a714..d3d3001711 100644 --- a/spec/models/user_spec.rb +++ b/spec/models/user_spec.rb @@ -860,7 +860,7 @@ describe User do let(:user) { build(:user, username: 'Sam') } it "returns a 45-pixel-wide avatar" do - expect(user.small_avatar_url).to eq("//test.localhost/letter_avatar/sam/45/#{LetterAvatar::VERSION}.png") + expect(user.small_avatar_url).to eq("//test.localhost/letter_avatar/sam/45/#{LetterAvatar.version}.png") end end @@ -1037,7 +1037,7 @@ describe User do u = User.create!(username: "bob", email: "bob@bob.com") u.reload expect(u.uploaded_avatar_id).to eq(nil) - expect(u.avatar_template).to eq("/letter_avatar/bob/{size}/#{LetterAvatar::VERSION}.png") + expect(u.avatar_template).to eq("/letter_avatar/bob/{size}/#{LetterAvatar.version}.png") end end From a3b6e3cb975ac63393beb8a1d3322fb389fb7a5e Mon Sep 17 00:00:00 2001 From: Neil Lalonde Date: Sun, 19 Apr 2015 23:35:53 -0400 Subject: [PATCH 086/113] FIX: permalinks redirects with relative_url_root --- app/controllers/permalinks_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/permalinks_controller.rb b/app/controllers/permalinks_controller.rb index c32b88e96c..3b243d955e 100644 --- a/app/controllers/permalinks_controller.rb +++ b/app/controllers/permalinks_controller.rb @@ -5,7 +5,7 @@ class PermalinksController < ApplicationController url = request.fullpath[1..-1] permalink = Permalink.find_by_url(url) if permalink && permalink.target_url - redirect_to permalink.target_url, status: :moved_permanently + redirect_to "#{Discourse::base_uri}#{permalink.target_url}", status: :moved_permanently else raise Discourse::NotFound end From 3071650eb3bc8b13d6de6b73fc85c2828d9d16a5 Mon Sep 17 00:00:00 2001 From: Neil Lalonde Date: Mon, 20 Apr 2015 11:10:56 -0400 Subject: [PATCH 087/113] FEATURE: when post is too short, suggest using the like button instead --- .../javascripts/discourse/templates/popup_input_tip.hbs | 2 +- app/assets/javascripts/discourse/views/composer.js.es6 | 4 ++++ config/locales/client.en.yml | 1 + 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/app/assets/javascripts/discourse/templates/popup_input_tip.hbs b/app/assets/javascripts/discourse/templates/popup_input_tip.hbs index 6a65bdeacf..73e4589d05 100644 --- a/app/assets/javascripts/discourse/templates/popup_input_tip.hbs +++ b/app/assets/javascripts/discourse/templates/popup_input_tip.hbs @@ -1,2 +1,2 @@ -{{view.validation.reason}} +{{{view.validation.reason}}} diff --git a/app/assets/javascripts/discourse/views/composer.js.es6 b/app/assets/javascripts/discourse/views/composer.js.es6 index e67e5c0102..95138ebc95 100644 --- a/app/assets/javascripts/discourse/views/composer.js.es6 +++ b/app/assets/javascripts/discourse/views/composer.js.es6 @@ -573,6 +573,10 @@ const ComposerView = Discourse.View.extend(Ember.Evented, { reason = I18n.t('composer.error.post_missing'); } else if( missingChars > 0 ) { reason = I18n.t('composer.error.post_length', {min: this.get('model.minimumPostLength')}); + let tl = Discourse.User.currentProp("trust_level"); + if (tl === 0 || tl === 1) { + reason += "
      " + I18n.t('composer.error.try_like'); + } } if( reason ) { diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml index 226f0ceb98..309cc13d91 100644 --- a/config/locales/client.en.yml +++ b/config/locales/client.en.yml @@ -738,6 +738,7 @@ en: title_too_long: "Title can't be more than {{max}} characters" post_missing: "Post can't be empty" post_length: "Post must be at least {{min}} characters" + try_like: 'Have you tried the button?' category_missing: "You must choose a category" save_edit: "Save Edit" From 6ae58d41a77ced6e14d05634c1fd0e5ec8b710bc Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Mon, 20 Apr 2015 12:06:52 -0400 Subject: [PATCH 088/113] PERF: Only refresh the Daily stats hourly, do the others daily. --- app/jobs/scheduled/directory_refresh.rb | 9 --- app/jobs/scheduled/directory_refresh_daily.rb | 9 +++ app/jobs/scheduled/directory_refresh_older.rb | 10 +++ app/models/directory_item.rb | 80 +++++++++---------- 4 files changed, 59 insertions(+), 49 deletions(-) delete mode 100644 app/jobs/scheduled/directory_refresh.rb create mode 100644 app/jobs/scheduled/directory_refresh_daily.rb create mode 100644 app/jobs/scheduled/directory_refresh_older.rb diff --git a/app/jobs/scheduled/directory_refresh.rb b/app/jobs/scheduled/directory_refresh.rb deleted file mode 100644 index 2809ac210a..0000000000 --- a/app/jobs/scheduled/directory_refresh.rb +++ /dev/null @@ -1,9 +0,0 @@ -module Jobs - class DirectoryRefresh < Jobs::Scheduled - every 1.hour - - def execute(args) - DirectoryItem.refresh! - end - end -end diff --git a/app/jobs/scheduled/directory_refresh_daily.rb b/app/jobs/scheduled/directory_refresh_daily.rb new file mode 100644 index 0000000000..ea28067454 --- /dev/null +++ b/app/jobs/scheduled/directory_refresh_daily.rb @@ -0,0 +1,9 @@ +module Jobs + class DirectoryRefreshDaily < Jobs::Scheduled + every 1.hour + + def execute(args) + DirectoryItem.refresh_period!(:daily) + end + end +end diff --git a/app/jobs/scheduled/directory_refresh_older.rb b/app/jobs/scheduled/directory_refresh_older.rb new file mode 100644 index 0000000000..3c25c8151f --- /dev/null +++ b/app/jobs/scheduled/directory_refresh_older.rb @@ -0,0 +1,10 @@ +module Jobs + class DirectoryRefreshOlder < Jobs::Scheduled + every 1.day + + def execute(args) + periods = DirectoryItem.period_types.keys - [:daily] + periods.each {|p| DirectoryItem.refresh_period!(p)} + end + end +end diff --git a/app/models/directory_item.rb b/app/models/directory_item.rb index aa954ea841..666749126f 100644 --- a/app/models/directory_item.rb +++ b/app/models/directory_item.rb @@ -17,10 +17,7 @@ class DirectoryItem < ActiveRecord::Base end def self.refresh! - ActiveRecord::Base.transaction do - exec_sql "TRUNCATE TABLE directory_items" - period_types.each_key {|p| refresh_period!(p)} - end + period_types.each_key {|p| refresh_period!(p)} end def self.refresh_period!(period_type) @@ -36,41 +33,44 @@ class DirectoryItem < ActiveRecord::Base else 1000.years.ago end - exec_sql "INSERT INTO directory_items - (period_type, user_id, likes_received, likes_given, topics_entered, days_visited, posts_read, topic_count, post_count) - SELECT - :period_type, - u.id, - SUM(CASE WHEN ua.action_type = :was_liked_type THEN 1 ELSE 0 END), - SUM(CASE WHEN ua.action_type = :like_type THEN 1 ELSE 0 END), - COALESCE((SELECT COUNT(topic_id) FROM topic_views AS v WHERE v.user_id = u.id AND v.viewed_at >= :since), 0), - COALESCE((SELECT COUNT(id) FROM user_visits AS uv WHERE uv.user_id = u.id AND uv.visited_at >= :since), 0), - COALESCE((SELECT SUM(posts_read) FROM user_visits AS uv2 WHERE uv2.user_id = u.id AND uv2.visited_at >= :since), 0), - SUM(CASE WHEN ua.action_type = :new_topic_type THEN 1 ELSE 0 END), - SUM(CASE WHEN ua.action_type = :reply_type THEN 1 ELSE 0 END) - FROM users AS u - LEFT OUTER JOIN user_actions AS ua ON ua.user_id = u.id - LEFT OUTER JOIN topics AS t ON ua.target_topic_id = t.id - LEFT OUTER JOIN posts AS p ON ua.target_post_id = p.id - LEFT OUTER JOIN categories AS c ON t.category_id = c.id - WHERE u.active - AND NOT u.blocked - AND COALESCE(ua.created_at, :since) >= :since - AND t.deleted_at IS NULL - AND COALESCE(t.visible, true) - AND COALESCE(t.archetype, 'regular') = 'regular' - AND p.deleted_at IS NULL - AND (NOT (COALESCE(p.hidden, false))) - AND COALESCE(p.post_type, :regular_post_type) != :moderator_action - AND u.id > 0 - GROUP BY u.id", - period_type: period_types[period_type], - since: since, - like_type: UserAction::LIKE, - was_liked_type: UserAction::WAS_LIKED, - new_topic_type: UserAction::NEW_TOPIC, - reply_type: UserAction::REPLY, - regular_post_type: Post.types[:regular], - moderator_action: Post.types[:moderator_action] + ActiveRecord::Base.transaction do + exec_sql "DELETE FROM directory_items WHERE period_type = :period_type", period_type: period_types[period_type] + exec_sql "INSERT INTO directory_items + (period_type, user_id, likes_received, likes_given, topics_entered, days_visited, posts_read, topic_count, post_count) + SELECT + :period_type, + u.id, + SUM(CASE WHEN ua.action_type = :was_liked_type THEN 1 ELSE 0 END), + SUM(CASE WHEN ua.action_type = :like_type THEN 1 ELSE 0 END), + COALESCE((SELECT COUNT(topic_id) FROM topic_views AS v WHERE v.user_id = u.id AND v.viewed_at >= :since), 0), + COALESCE((SELECT COUNT(id) FROM user_visits AS uv WHERE uv.user_id = u.id AND uv.visited_at >= :since), 0), + COALESCE((SELECT SUM(posts_read) FROM user_visits AS uv2 WHERE uv2.user_id = u.id AND uv2.visited_at >= :since), 0), + SUM(CASE WHEN ua.action_type = :new_topic_type THEN 1 ELSE 0 END), + SUM(CASE WHEN ua.action_type = :reply_type THEN 1 ELSE 0 END) + FROM users AS u + LEFT OUTER JOIN user_actions AS ua ON ua.user_id = u.id + LEFT OUTER JOIN topics AS t ON ua.target_topic_id = t.id + LEFT OUTER JOIN posts AS p ON ua.target_post_id = p.id + LEFT OUTER JOIN categories AS c ON t.category_id = c.id + WHERE u.active + AND NOT u.blocked + AND COALESCE(ua.created_at, :since) >= :since + AND t.deleted_at IS NULL + AND COALESCE(t.visible, true) + AND COALESCE(t.archetype, 'regular') = 'regular' + AND p.deleted_at IS NULL + AND (NOT (COALESCE(p.hidden, false))) + AND COALESCE(p.post_type, :regular_post_type) != :moderator_action + AND u.id > 0 + GROUP BY u.id", + period_type: period_types[period_type], + since: since, + like_type: UserAction::LIKE, + was_liked_type: UserAction::WAS_LIKED, + new_topic_type: UserAction::NEW_TOPIC, + reply_type: UserAction::REPLY, + regular_post_type: Post.types[:regular], + moderator_action: Post.types[:moderator_action] + end end end From 5990ab855bbfc1085eead60d3a82a849ff241bad Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Mon, 20 Apr 2015 13:34:57 -0400 Subject: [PATCH 089/113] PERF: Move post alerting into async --- app/jobs/regular/post_alert.rb | 11 +++++++++++ app/services/post_alerter.rb | 1 + lib/post_creator.rb | 1 - lib/post_jobs_enqueuer.rb | 7 ++++++- spec/components/post_creator_spec.rb | 4 ++++ 5 files changed, 22 insertions(+), 2 deletions(-) create mode 100644 app/jobs/regular/post_alert.rb diff --git a/app/jobs/regular/post_alert.rb b/app/jobs/regular/post_alert.rb new file mode 100644 index 0000000000..99b1860c5f --- /dev/null +++ b/app/jobs/regular/post_alert.rb @@ -0,0 +1,11 @@ +module Jobs + class PostAlert < Jobs::Base + + def execute(args) + post = Post.find(args[:post_id]) + PostAlerter.post_created(post) + end + + end +end + diff --git a/app/services/post_alerter.rb b/app/services/post_alerter.rb index 56c2fbe20b..819e4b2a05 100644 --- a/app/services/post_alerter.rb +++ b/app/services/post_alerter.rb @@ -190,6 +190,7 @@ class PostAlerter exclude_user_ids << reply_to_user.id if reply_to_user.present? exclude_user_ids.flatten! + TopicUser .where(topic_id: post.topic_id, notification_level: TopicUser.notification_levels[:watching]) .includes(:user).each do |tu| diff --git a/lib/post_creator.rb b/lib/post_creator.rb index 7183793794..ae261c0221 100644 --- a/lib/post_creator.rb +++ b/lib/post_creator.rb @@ -129,7 +129,6 @@ class PostCreator if @post && errors.blank? publish - PostAlerter.post_created(@post) unless @opts[:import_mode] track_latest_on_category enqueue_jobs diff --git a/lib/post_jobs_enqueuer.rb b/lib/post_jobs_enqueuer.rb index 207780e269..3d17c8c66c 100644 --- a/lib/post_jobs_enqueuer.rb +++ b/lib/post_jobs_enqueuer.rb @@ -9,17 +9,22 @@ class PostJobsEnqueuer def enqueue_jobs # We need to enqueue jobs after the transaction. Otherwise they might begin before the data has # been comitted. + enqueue_post_alerts unless @opts[:import_mode] feature_topic_users unless @opts[:import_mode] trigger_post_post_process + unless skip_after_create? after_post_create after_topic_create end end - private + def enqueue_post_alerts + Jobs.enqueue(:post_alert, post_id: @post.id) + end + def feature_topic_users Jobs.enqueue(:feature_topic_users, topic_id: @topic.id) end diff --git a/spec/components/post_creator_spec.rb b/spec/components/post_creator_spec.rb index 950af81885..bc7137c703 100644 --- a/spec/components/post_creator_spec.rb +++ b/spec/components/post_creator_spec.rb @@ -137,6 +137,7 @@ describe PostCreator do it 'queues up post processing job when saved' do Jobs.expects(:enqueue).with(:feature_topic_users, has_key(:topic_id)) Jobs.expects(:enqueue).with(:process_post, has_key(:post_id)) + Jobs.expects(:enqueue).with(:post_alert, has_key(:post_id)) Jobs.expects(:enqueue).with(:notify_mailing_list_subscribers, has_key(:post_id)) creator.create end @@ -144,6 +145,7 @@ describe PostCreator do it 'passes the invalidate_oneboxes along to the job if present' do Jobs.stubs(:enqueue).with(:feature_topic_users, has_key(:topic_id)) Jobs.expects(:enqueue).with(:notify_mailing_list_subscribers, has_key(:post_id)) + Jobs.expects(:enqueue).with(:post_alert, has_key(:post_id)) Jobs.expects(:enqueue).with(:process_post, has_key(:invalidate_oneboxes)) creator.opts[:invalidate_oneboxes] = true creator.create @@ -152,6 +154,7 @@ describe PostCreator do it 'passes the image_sizes along to the job if present' do Jobs.stubs(:enqueue).with(:feature_topic_users, has_key(:topic_id)) Jobs.expects(:enqueue).with(:notify_mailing_list_subscribers, has_key(:post_id)) + Jobs.expects(:enqueue).with(:post_alert, has_key(:post_id)) Jobs.expects(:enqueue).with(:process_post, has_key(:image_sizes)) creator.opts[:image_sizes] = {'http://an.image.host/image.jpg' => {'width' => 17, 'height' => 31}} creator.create @@ -491,6 +494,7 @@ describe PostCreator do # does not notify an unrelated user expect(unrelated.notifications.count).to eq(0) expect(post.topic.subtype).to eq(TopicSubtype.user_to_user) + expect(target_user1.notifications.count).to eq(1) expect(target_user2.notifications.count).to eq(1) end From 2c53a8b7bc779c1db0ea5786e804037b220e8e37 Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Mon, 20 Apr 2015 16:18:00 -0400 Subject: [PATCH 090/113] Link queued post avatar and username to user profile --- .../javascripts/discourse/components/user-link.js.es6 | 6 ++++++ .../javascripts/discourse/templates/queued-posts.hbs | 11 +++++++++-- app/serializers/queued_post_serializer.rb | 2 +- 3 files changed, 16 insertions(+), 3 deletions(-) create mode 100644 app/assets/javascripts/discourse/components/user-link.js.es6 diff --git a/app/assets/javascripts/discourse/components/user-link.js.es6 b/app/assets/javascripts/discourse/components/user-link.js.es6 new file mode 100644 index 0000000000..4c1665fd2a --- /dev/null +++ b/app/assets/javascripts/discourse/components/user-link.js.es6 @@ -0,0 +1,6 @@ +export default Ember.Component.extend({ + tagName: 'a', + attributeBindings: ['href', 'data-user-card'], + href: Ember.computed.alias('user.path'), + 'data-user-card': Ember.computed.alias('user.username_lower') +}); diff --git a/app/assets/javascripts/discourse/templates/queued-posts.hbs b/app/assets/javascripts/discourse/templates/queued-posts.hbs index a0e99d9d4a..b7e4815b2b 100644 --- a/app/assets/javascripts/discourse/templates/queued-posts.hbs +++ b/app/assets/javascripts/discourse/templates/queued-posts.hbs @@ -3,11 +3,18 @@ {{#each ctrl in model itemController='queued-post'}}
      - {{avatar ctrl.post.user imageSize="large"}} + {{#user-link user=ctrl.post.user}} + {{avatar ctrl.post.user imageSize="large"}} + {{/user-link}} +
      - {{ctrl.post.user.username}} + + {{#user-link user=ctrl.post.user}} + {{ctrl.post.user.username}} + {{/user-link}} +
      diff --git a/app/serializers/queued_post_serializer.rb b/app/serializers/queued_post_serializer.rb index 33b0bccf90..39017c2142 100644 --- a/app/serializers/queued_post_serializer.rb +++ b/app/serializers/queued_post_serializer.rb @@ -12,7 +12,7 @@ class QueuedPostSerializer < ApplicationSerializer :created_at, :category_id - has_one :user, serializer: BasicUserSerializer, embed: :object + has_one :user, serializer: BasicUserSerializer has_one :topic, serializer: BasicTopicSerializer def category_id From 5476723906de2804448c89458e24173d26292b35 Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Mon, 20 Apr 2015 16:34:36 -0400 Subject: [PATCH 091/113] Add post date to moderator queue --- app/assets/javascripts/discourse/models/user.js.es6 | 3 ++- .../javascripts/discourse/templates/queued-posts.hbs | 3 +++ app/assets/stylesheets/desktop/queued-posts.scss | 9 ++++++++- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/app/assets/javascripts/discourse/models/user.js.es6 b/app/assets/javascripts/discourse/models/user.js.es6 index b458c11888..4fc9d1a8f5 100644 --- a/app/assets/javascripts/discourse/models/user.js.es6 +++ b/app/assets/javascripts/discourse/models/user.js.es6 @@ -1,6 +1,7 @@ +import RestModel from 'discourse/models/rest'; import avatarTemplate from 'discourse/lib/avatar-template'; -const User = Discourse.Model.extend({ +const User = RestModel.extend({ hasPMs: Em.computed.gt("private_messages_stats.all", 0), hasStartedPMs: Em.computed.gt("private_messages_stats.mine", 0), diff --git a/app/assets/javascripts/discourse/templates/queued-posts.hbs b/app/assets/javascripts/discourse/templates/queued-posts.hbs index b7e4815b2b..9a72cd50f4 100644 --- a/app/assets/javascripts/discourse/templates/queued-posts.hbs +++ b/app/assets/javascripts/discourse/templates/queued-posts.hbs @@ -16,6 +16,9 @@ {{/user-link}}
      +
      + {{age-with-tooltip ctrl.post.created_at}} +
      diff --git a/app/assets/stylesheets/desktop/queued-posts.scss b/app/assets/stylesheets/desktop/queued-posts.scss index dc3bb1fda7..d927ce5b4c 100644 --- a/app/assets/stylesheets/desktop/queued-posts.scss +++ b/app/assets/stylesheets/desktop/queued-posts.scss @@ -6,6 +6,14 @@ width: 70px; float: left; } + .post-info { + display: inline-block; + float: right; + font-size: 0.929em; + margin-top: 1px; + span {color: scale-color($primary, $lightness: 50%);} + } + .cooked { width: $topic-body-width; float: left; @@ -31,7 +39,6 @@ } } - border-bottom: 1px solid darken(scale-color-diff(), 10%); } } From 66be9147a05898e9efab13b3afb705b30ec2dd7b Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Mon, 20 Apr 2015 16:49:11 -0400 Subject: [PATCH 092/113] FIX: You can edit two queued posts simultaneously --- .../javascripts/discourse/controllers/queued-post.js.es6 | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/assets/javascripts/discourse/controllers/queued-post.js.es6 b/app/assets/javascripts/discourse/controllers/queued-post.js.es6 index a64cd8b25b..47ac01a006 100644 --- a/app/assets/javascripts/discourse/controllers/queued-post.js.es6 +++ b/app/assets/javascripts/discourse/controllers/queued-post.js.es6 @@ -22,7 +22,9 @@ export default Ember.Controller.extend(BufferedContent, { reject: updateState('rejected'), edit() { - this.set('currentlyEditing', this.get('model')); + // This is stupid but pagedown cannot be on the screen twice or it will break + this.set('currentlyEditing', null); + Ember.run.scheduleOnce('afterRender', () => this.set('currentlyEditing', this.get('model'))); }, confirmEdit() { From 2cdd96718871c2a4e79894813fc738040f20ca65 Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Mon, 20 Apr 2015 17:19:05 -0400 Subject: [PATCH 093/113] Adds support for invisible approval queues, which we'll need for Akismet --- app/controllers/queued_posts_controller.rb | 2 +- app/models/queued_post.rb | 17 +++++++++++++++-- spec/components/new_post_manager_spec.rb | 2 +- spec/models/queued_post_spec.rb | 17 +++++++++++++++++ 4 files changed, 34 insertions(+), 4 deletions(-) diff --git a/app/controllers/queued_posts_controller.rb b/app/controllers/queued_posts_controller.rb index ad4c0c5d05..78d2cd9249 100644 --- a/app/controllers/queued_posts_controller.rb +++ b/app/controllers/queued_posts_controller.rb @@ -8,7 +8,7 @@ class QueuedPostsController < ApplicationController state = QueuedPost.states[(params[:state] || 'new').to_sym] state ||= QueuedPost.states[:new] - @queued_posts = QueuedPost.where(state: state).includes(:topic, :user) + @queued_posts = QueuedPost.visible.where(state: state).includes(:topic, :user) render_serialized(@queued_posts, QueuedPostSerializer, root: :queued_posts, rest_serializer: true) end diff --git a/app/models/queued_post.rb b/app/models/queued_post.rb index 9778c4f3e1..232d86e21d 100644 --- a/app/models/queued_post.rb +++ b/app/models/queued_post.rb @@ -11,8 +11,21 @@ class QueuedPost < ActiveRecord::Base @states ||= Enum.new(:new, :approved, :rejected) end + # By default queues are hidden from moderators + def self.visible_queues + @visible_queues ||= Set.new(['default']) + end + + def self.visible + where(queue: visible_queues.to_a) + end + def self.new_count - where(state: states[:new]).count + visible.where(state: states[:new]).count + end + + def visible? + QueuedPost.visible_queues.include?(queue) end def self.broadcast_new! @@ -63,7 +76,7 @@ class QueuedPost < ActiveRecord::Base updates.each {|k, v| send("#{k}=", v) } changes_applied - QueuedPost.broadcast_new! + QueuedPost.broadcast_new! if visible? end end diff --git a/spec/components/new_post_manager_spec.rb b/spec/components/new_post_manager_spec.rb index 6b692f03a1..5d0dfb747a 100644 --- a/spec/components/new_post_manager_spec.rb +++ b/spec/components/new_post_manager_spec.rb @@ -68,7 +68,7 @@ describe NewPostManager do result end - @queue_handler = -> (manager) { manager.args[:raw] =~ /queue me/ ? manager.enqueue('new_topic') : nil } + @queue_handler = -> (manager) { manager.args[:raw] =~ /queue me/ ? manager.enqueue('default') : nil } NewPostManager.add_handler(&@counter_handler) NewPostManager.add_handler(&@queue_handler) diff --git a/spec/models/queued_post_spec.rb b/spec/models/queued_post_spec.rb index c433b5c4c1..bc1289b441 100644 --- a/spec/models/queued_post_spec.rb +++ b/spec/models/queued_post_spec.rb @@ -109,4 +109,21 @@ describe QueuedPost do end end + context "visibility" do + + it "works as expected in the invisible queue" do + qp = Fabricate(:queued_post, queue: 'invisible') + expect(qp).to_not be_visible + expect(QueuedPost.visible).to_not include(qp) + expect(QueuedPost.new_count).to eq(0) + end + + it "works as expected in the visible queue" do + qp = Fabricate(:queued_post, queue: 'default') + expect(qp).to be_visible + expect(QueuedPost.visible).to include(qp) + expect(QueuedPost.new_count).to eq(1) + end + end + end From dc6b2df2a2b7dff103491aaf6c9116819c200ee2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9gis=20Hanol?= Date: Tue, 21 Apr 2015 11:03:10 +0200 Subject: [PATCH 094/113] increase url length on topic_embed --- ...0150421085850_increase_url_length_on_topic_embed.rb | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 db/migrate/20150421085850_increase_url_length_on_topic_embed.rb diff --git a/db/migrate/20150421085850_increase_url_length_on_topic_embed.rb b/db/migrate/20150421085850_increase_url_length_on_topic_embed.rb new file mode 100644 index 0000000000..3f0ea315be --- /dev/null +++ b/db/migrate/20150421085850_increase_url_length_on_topic_embed.rb @@ -0,0 +1,10 @@ +class IncreaseUrlLengthOnTopicEmbed < ActiveRecord::Migration + def up + remove_index :topic_embeds, :embed_url + change_column :topic_embeds, :embed_url, :string, limit: 1000, null: false + add_index :topic_embeds, :embed_url, unique: true + end + + def down + end +end From f600ead5874e3753b04b4e5a1b461197b030407b Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Tue, 21 Apr 2015 11:59:35 -0400 Subject: [PATCH 095/113] FIX: Don't validate approved posts. A moderator has already validated them. Otherwise we hit things like rate limits. --- app/models/queued_post.rb | 2 +- spec/models/queued_post_spec.rb | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/app/models/queued_post.rb b/app/models/queued_post.rb index 232d86e21d..f93e7e8f11 100644 --- a/app/models/queued_post.rb +++ b/app/models/queued_post.rb @@ -51,7 +51,7 @@ class QueuedPost < ActiveRecord::Base QueuedPost.transaction do change_to!(:approved, approved_by) - creator = PostCreator.new(user, create_options) + creator = PostCreator.new(user, create_options.merge(skip_validations: true)) created_post = creator.create end created_post diff --git a/spec/models/queued_post_spec.rb b/spec/models/queued_post_spec.rb index bc1289b441..7ddeaed5b5 100644 --- a/spec/models/queued_post_spec.rb +++ b/spec/models/queued_post_spec.rb @@ -41,7 +41,12 @@ describe QueuedPost do # We can't approve twice expect(-> { qp.approve!(admin) }).to raise_error(QueuedPost::InvalidStateTransition) + end + it "skips validations" do + qp.post_options[:title] = 'too short' + post = qp.approve!(admin) + expect(post).to be_present end it "follows the correct workflow for rejection" do From b2ab95f9c247c8407117a57ce1104af32970d8d4 Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Tue, 21 Apr 2015 13:15:40 -0400 Subject: [PATCH 096/113] Fix an issue with the store hydrating embedded objects --- .../javascripts/discourse/models/store.js.es6 | 59 +++++++++++++++---- .../helpers/create-pretender.js.es6 | 19 ++++-- test/javascripts/models/store-test.js.es6 | 9 +++ 3 files changed, 69 insertions(+), 18 deletions(-) diff --git a/app/assets/javascripts/discourse/models/store.js.es6 b/app/assets/javascripts/discourse/models/store.js.es6 index f0608b86b0..6708ea8def 100644 --- a/app/assets/javascripts/discourse/models/store.js.es6 +++ b/app/assets/javascripts/discourse/models/store.js.es6 @@ -8,6 +8,32 @@ function flushMap() { _identityMap = {}; } +function storeMap(type, id, obj) { + if (!id) { return; } + + _identityMap[type] = _identityMap[type] || {}; + _identityMap[type][id] = obj; +} + +function fromMap(type, id) { + const byType = _identityMap[type]; + if (byType) { return byType[id]; } +} + +function removeMap(type, id) { + const byType = _identityMap[type]; + if (byType) { delete byType[id]; } +} + +function findAndRemoveMap(type, id) { + const byType = _identityMap[type]; + if (byType) { + const result = byType[id]; + delete byType[id]; + return result; + } +} + flushMap(); export default Ember.Object.extend({ @@ -63,9 +89,8 @@ export default Ember.Object.extend({ update(type, id, attrs) { return this.adapterFor(type).update(this, type, id, attrs, function(result) { if (result && result[type] && result[type].id) { - const oldRecord = _identityMap[type][id]; - delete _identityMap[type][id]; - _identityMap[type][result[type].id] = oldRecord; + const oldRecord = findAndRemoveMap(type, id); + storeMap(type, result[type].id, oldRecord); } return result; }); @@ -78,8 +103,7 @@ export default Ember.Object.extend({ destroyRecord(type, record) { return this.adapterFor(type).destroyRecord(this, type, record).then(function(result) { - const forType = _identityMap[type]; - if (forType) { delete forType[record.get('id')]; } + removeMap(type, record.get('id')); return result; }); }, @@ -101,9 +125,7 @@ export default Ember.Object.extend({ const klass = this.container.lookupFactory('model:' + type) || RestModel; const model = klass.create(obj); - if (obj.id) { - _identityMap[type][obj.id] = model; - } + storeMap(type, obj.id, model); return model; }, @@ -118,11 +140,24 @@ export default Ember.Object.extend({ return Discourse.Category.findById(id); } + const pluralType = this.pluralize(subType); const collection = root[this.pluralize(subType)]; if (collection) { - const found = collection.findProperty('id', id); + const hashedProp = "__hashed_" + pluralType; + let hashedCollection = root[hashedProp]; + if (!hashedCollection) { + hashedCollection = {}; + collection.forEach(function(it) { + hashedCollection[it.id] = it; + }); + root[hashedProp] = hashedCollection; + } + + const found = hashedCollection[id]; if (found) { - return this._hydrate(subType, found, root); + const hydrated = this._hydrate(subType, found, root); + hashedCollection[id] = hydrated; + return hydrated; } } }, @@ -154,9 +189,7 @@ export default Ember.Object.extend({ this._hydrateEmbedded(obj, root); } - _identityMap[type] = _identityMap[type] || {}; - - const existing = _identityMap[type][obj.id]; + const existing = fromMap(type, obj.id); if (existing === obj) { return existing; } if (existing) { diff --git a/test/javascripts/helpers/create-pretender.js.es6 b/test/javascripts/helpers/create-pretender.js.es6 index 4de1461546..b29a618e8c 100644 --- a/test/javascripts/helpers/create-pretender.js.es6 +++ b/test/javascripts/helpers/create-pretender.js.es6 @@ -39,6 +39,13 @@ const _moreWidgets = [ {id: 224, name: 'Good Repellant'} ]; +const fruits = [{id: 1, name: 'apple', farmer_id: 1, category_id: 4}, + {id: 2, name: 'banana', farmer_id: 1, category_id: 3}, + {id: 3, name: 'grape', farmer_id: 2, category_id: 5}]; + +const farmers = [{id: 1, name: 'Old MacDonald'}, + {id: 2, name: 'Luke Skywalker'}]; + function loggedIn() { return !!Discourse.User.current(); } @@ -178,11 +185,13 @@ export default function() { }); this.get('/fruits/:id', function() { - return response({ - __rest_serializer: "1", - fruit: {id: 1, name: 'apple', farmer_id: 1}, - farmers: [{id: 1, name: 'Evil Trout'}] - }); + const fruit = fruits[0]; + + return response({ __rest_serializer: "1", fruit, farmers: [farmers[0]] }); + }); + + this.get('/fruits', function() { + return response({ __rest_serializer: "1", fruits, farmers }); }); this.get('/widgets/:widget_id', function(request) { diff --git a/test/javascripts/models/store-test.js.es6 b/test/javascripts/models/store-test.js.es6 index 13e2e8d004..6411f141f4 100644 --- a/test/javascripts/models/store-test.js.es6 +++ b/test/javascripts/models/store-test.js.es6 @@ -93,6 +93,15 @@ test('find embedded', function() { const store = createStore(); store.find('fruit', 1).then(function(f) { ok(f.get('farmer'), 'it has the embedded object'); + ok(f.get('category'), 'categories are found automatically'); }); }); +test('findAll embedded', function() { + const store = createStore(); + store.findAll('fruit').then(function(fruits) { + equal(fruits.objectAt(0).get('farmer.name'), 'Old MacDonald'); + equal(fruits.objectAt(0).get('farmer'), fruits.objectAt(1).get('farmer'), 'points at the same object'); + equal(fruits.objectAt(2).get('farmer.name'), 'Luke Skywalker'); + }); +}); From 2713b77e280ebd9af995f498548d866bbdb126d7 Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Tue, 21 Apr 2015 13:16:05 -0400 Subject: [PATCH 097/113] FIX: If validations were disabled some rate limits continued to run --- lib/post_creator.rb | 1 + lib/rate_limiter/on_create_record.rb | 16 +++++++++++++++- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/lib/post_creator.rb b/lib/post_creator.rb index ae261c0221..c9cac0374e 100644 --- a/lib/post_creator.rb +++ b/lib/post_creator.rb @@ -276,6 +276,7 @@ class PostCreator end def save_post + @post.disable_rate_limits! if skip_validations? saved = @post.save(validate: !skip_validations?) rollback_from_errors!(@post) unless saved end diff --git a/lib/rate_limiter/on_create_record.rb b/lib/rate_limiter/on_create_record.rb index 764aae73a4..15155b727c 100644 --- a/lib/rate_limiter/on_create_record.rb +++ b/lib/rate_limiter/on_create_record.rb @@ -23,6 +23,16 @@ class RateLimiter def self.included(base) base.extend(ClassMethods) + base.include(InstanceMethods) + end + + module InstanceMethods + + # For the lifetime of this instance, don't enforce rate limits. + def disable_rate_limits! + @rate_limits_disabled = true + end + end module ClassMethods @@ -30,7 +40,9 @@ class RateLimiter limiter_method = limiter_method || :default_rate_limiter - self.after_create do + self.after_create do |*args| + next if @rate_limits_disabled + if rate_limiter = send(limiter_method) rate_limiter.performed! @performed ||= {} @@ -39,12 +51,14 @@ class RateLimiter end self.after_destroy do + next if @rate_limits_disabled if rate_limiter = send(limiter_method) rate_limiter.rollback! end end self.after_rollback do + next if @rate_limits_disabled if rate_limiter = send(limiter_method) if @performed.present? && @performed[limiter_method] rate_limiter.rollback! From dd3953bf190163a6bc8f5c1ff65c16a71a7f7119 Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Tue, 21 Apr 2015 13:35:00 -0400 Subject: [PATCH 098/113] FIX: Ruby 2.2 has `include` as private --- lib/rate_limiter/on_create_record.rb | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/lib/rate_limiter/on_create_record.rb b/lib/rate_limiter/on_create_record.rb index 15155b727c..a9a0d7ed28 100644 --- a/lib/rate_limiter/on_create_record.rb +++ b/lib/rate_limiter/on_create_record.rb @@ -23,16 +23,11 @@ class RateLimiter def self.included(base) base.extend(ClassMethods) - base.include(InstanceMethods) end - module InstanceMethods - - # For the lifetime of this instance, don't enforce rate limits. - def disable_rate_limits! - @rate_limits_disabled = true - end - + # For the lifetime of this instance, don't enforce rate limits. + def disable_rate_limits! + @rate_limits_disabled = true end module ClassMethods From 26693c16ac1f3362a8305bba7db72beb9db4d45a Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Tue, 21 Apr 2015 13:59:57 -0400 Subject: [PATCH 099/113] Don't show the link to "Needs Approval" unless approval is enabled. Note that any plugin that extends the NewPostMananger to support enqueuing will enable it. --- .../javascripts/discourse/templates/site-map.hbs | 4 ++-- app/serializers/current_user_serializer.rb | 13 ++++++++++++- lib/new_post_manager.rb | 6 ++++++ spec/components/new_post_manager_spec.rb | 7 +++++++ 4 files changed, 27 insertions(+), 3 deletions(-) diff --git a/app/assets/javascripts/discourse/templates/site-map.hbs b/app/assets/javascripts/discourse/templates/site-map.hbs index 5efeea4c9a..c4e4b45779 100644 --- a/app/assets/javascripts/discourse/templates/site-map.hbs +++ b/app/assets/javascripts/discourse/templates/site-map.hbs @@ -30,12 +30,12 @@
    • {{#link-to 'users'}}{{i18n "directory.title"}}{{/link-to}}
      • {{/if}} - {{#if currentUser.staff}} + {{#if currentUser.show_queued_posts}}
    • {{#link-to 'queued-posts'}} {{i18n "queue.title"}} {{#if currentUser.post_queue_new_count}} - {{currentUser.post_queue_new_count}} + {{currentUser.post_queue_new_count}} {{/if}} {{/link-to}}
      • diff --git a/app/serializers/current_user_serializer.rb b/app/serializers/current_user_serializer.rb index 7784d3545b..2a310295e1 100644 --- a/app/serializers/current_user_serializer.rb +++ b/app/serializers/current_user_serializer.rb @@ -1,3 +1,5 @@ +require_dependency 'new_post_manager' + class CurrentUserSerializer < BasicUserSerializer attributes :name, @@ -27,7 +29,8 @@ class CurrentUserSerializer < BasicUserSerializer :muted_category_ids, :dismissed_banner_key, :is_anonymous, - :post_queue_new_count + :post_queue_new_count, + :show_queued_posts def include_site_flagged_posts_count? object.staff? @@ -116,4 +119,12 @@ class CurrentUserSerializer < BasicUserSerializer object.staff? end + def show_queued_posts + true + end + + def include_show_queued_posts? + object.staff? && NewPostManager.queue_enabled? + end + end diff --git a/lib/new_post_manager.rb b/lib/new_post_manager.rb index a8c4554fdd..cc3e7c01fd 100644 --- a/lib/new_post_manager.rb +++ b/lib/new_post_manager.rb @@ -26,6 +26,12 @@ class NewPostManager end end + def self.queue_enabled? + SiteSetting.approve_post_count > 0 || + SiteSetting.approve_unless_trust_level.to_i > 0 || + handlers.size > 1 + end + add_handler {|manager| default_handler(manager) } def initialize(user, args) diff --git a/spec/components/new_post_manager_spec.rb b/spec/components/new_post_manager_spec.rb index 5d0dfb747a..ebc8ae5eca 100644 --- a/spec/components/new_post_manager_spec.rb +++ b/spec/components/new_post_manager_spec.rb @@ -28,6 +28,7 @@ describe NewPostManager do it "doesn't return a result action" do result = NewPostManager.default_handler(manager) + expect(NewPostManager.queue_enabled?).to eq(false) expect(result).to eq(nil) end end @@ -38,6 +39,7 @@ describe NewPostManager do end it "will return an enqueue result" do result = NewPostManager.default_handler(manager) + expect(NewPostManager.queue_enabled?).to eq(true) expect(result.action).to eq(:enqueued) end end @@ -48,6 +50,7 @@ describe NewPostManager do end it "will return an enqueue result" do result = NewPostManager.default_handler(manager) + expect(NewPostManager.queue_enabled?).to eq(true) expect(result.action).to eq(:enqueued) end end @@ -79,6 +82,10 @@ describe NewPostManager do NewPostManager.handlers.delete(@queue_handler) end + it "has a queue enabled" do + expect(NewPostManager.queue_enabled?).to eq(true) + end + it "calls custom handlers" do manager = NewPostManager.new(topic.user, raw: 'this post increases counter', topic_id: topic.id) From 5bf8c31af40eb62c5051ae76a0657644abcdb348 Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Tue, 21 Apr 2015 14:36:46 -0400 Subject: [PATCH 100/113] Users can see their pending posts --- .../discourse/controllers/user.js.es6 | 5 +- .../discourse/models/user_action.js | 12 +- .../routes/user-activity-pending.js.es6 | 5 + .../discourse/templates/user/user.hbs | 2 +- app/controllers/user_actions_controller.rb | 25 ++-- app/models/user_action.rb | 123 ++++++++++++------ app/serializers/user_action_serializer.rb | 11 +- app/serializers/user_serializer.rb | 7 +- config/locales/client.en.yml | 1 + config/routes.rb | 1 + ...0714_add_queued_post_id_to_user_actions.rb | 5 + lib/post_enqueuer.rb | 11 +- spec/components/post_enqueuer_spec.rb | 4 + .../user_actions_controller_spec.rb | 31 +++++ .../acceptance/user-anonymous-test.js.es6 | 41 ++++++ test/javascripts/acceptance/user-test.js.es6 | 40 +----- .../helpers/create-pretender.js.es6 | 2 + 17 files changed, 225 insertions(+), 101 deletions(-) create mode 100644 app/assets/javascripts/discourse/routes/user-activity-pending.js.es6 create mode 100644 db/migrate/20150421190714_add_queued_post_id_to_user_actions.rb create mode 100644 test/javascripts/acceptance/user-anonymous-test.js.es6 diff --git a/app/assets/javascripts/discourse/controllers/user.js.es6 b/app/assets/javascripts/discourse/controllers/user.js.es6 index e3a055627b..4a0e666cfa 100644 --- a/app/assets/javascripts/discourse/controllers/user.js.es6 +++ b/app/assets/javascripts/discourse/controllers/user.js.es6 @@ -19,10 +19,7 @@ export default ObjectController.extend(CanCheckEmails, { linkWebsite: Em.computed.not('isBasic'), - canSeePrivateMessages: function() { - return this.get('viewingSelf') || Discourse.User.currentProp('admin'); - }.property('viewingSelf'), - + canSeePrivateMessages: Ember.computed.or('viewingSelf', 'currentUser.admin'), canSeeNotificationHistory: Em.computed.alias('canSeePrivateMessages'), showBadges: function() { diff --git a/app/assets/javascripts/discourse/models/user_action.js b/app/assets/javascripts/discourse/models/user_action.js index ba555e8483..2c5060258d 100644 --- a/app/assets/javascripts/discourse/models/user_action.js +++ b/app/assets/javascripts/discourse/models/user_action.js @@ -1,12 +1,3 @@ -/** - A data model representing actions users have taken - - @class UserAction - @extends Discourse.Model - @namespace Discourse - @module Discourse -**/ - var UserActionTypes = { likes_given: 1, likes_received: 2, @@ -18,7 +9,8 @@ var UserActionTypes = { quotes: 9, edits: 11, messages_sent: 12, - messages_received: 13 + messages_received: 13, + pending: 14 }, InvertedActionTypes = {}; diff --git a/app/assets/javascripts/discourse/routes/user-activity-pending.js.es6 b/app/assets/javascripts/discourse/routes/user-activity-pending.js.es6 new file mode 100644 index 0000000000..5d7e9e47b7 --- /dev/null +++ b/app/assets/javascripts/discourse/routes/user-activity-pending.js.es6 @@ -0,0 +1,5 @@ +import UserActivityStreamRoute from "discourse/routes/user-activity-stream"; + +export default UserActivityStreamRoute.extend({ + userActionType: Discourse.UserAction.TYPES.pending +}); diff --git a/app/assets/javascripts/discourse/templates/user/user.hbs b/app/assets/javascripts/discourse/templates/user/user.hbs index 8fdb0ceeab..2aaa4a90cc 100644 --- a/app/assets/javascripts/discourse/templates/user/user.hbs +++ b/app/assets/javascripts/discourse/templates/user/user.hbs @@ -168,7 +168,7 @@ {{#if canSeeNotificationHistory}} {{#link-to 'user.notifications' tagName="li"}} {{#link-to 'user.notifications'}} - + {{fa-icon "comment" class="glyph"}} {{i18n 'user.notifications'}} ({{notification_count}}) {{/link-to}} diff --git a/app/controllers/user_actions_controller.rb b/app/controllers/user_actions_controller.rb index da2e042d48..e4d4079fec 100644 --- a/app/controllers/user_actions_controller.rb +++ b/app/controllers/user_actions_controller.rb @@ -8,16 +8,23 @@ class UserActionsController < ApplicationController user = fetch_user_from_params - opts = { - user_id: user.id, - offset: params[:offset].to_i, - limit: per_chunk, - action_types: (params[:filter] || "").split(",").map(&:to_i), - guardian: guardian, - ignore_private_messages: params[:filter] ? false : true - } + opts = { user_id: user.id, + user: user, + offset: params[:offset].to_i, + limit: per_chunk, + action_types: (params[:filter] || "").split(",").map(&:to_i), + guardian: guardian, + ignore_private_messages: params[:filter] ? false : true } - render_serialized(UserAction.stream(opts), UserActionSerializer, root: "user_actions") + # Pending is restricted + stream = if opts[:action_types].include?(UserAction::PENDING) + guardian.ensure_can_see_notifications!(user) + UserAction.stream_queued(opts) + else + UserAction.stream(opts) + end + + render_serialized(stream, UserActionSerializer, root: "user_actions") end def show diff --git a/app/models/user_action.rb b/app/models/user_action.rb index 95f87387d5..0e979991c0 100644 --- a/app/models/user_action.rb +++ b/app/models/user_action.rb @@ -17,10 +17,12 @@ class UserAction < ActiveRecord::Base EDIT = 11 NEW_PRIVATE_MESSAGE = 12 GOT_PRIVATE_MESSAGE = 13 + PENDING = 14 ORDER = Hash[*[ GOT_PRIVATE_MESSAGE, NEW_PRIVATE_MESSAGE, + PENDING, NEW_TOPIC, REPLY, RESPONSE, @@ -56,15 +58,14 @@ class UserAction < ActiveRecord::Base SELECT action_type, COUNT(*) count FROM user_actions a - JOIN topics t ON t.id = a.target_topic_id + LEFT JOIN topics t ON t.id = a.target_topic_id LEFT JOIN posts p on p.id = a.target_post_id - JOIN posts p2 on p2.topic_id = a.target_topic_id and p2.post_number = 1 + LEFT JOIN posts p2 on p2.topic_id = a.target_topic_id and p2.post_number = 1 LEFT JOIN categories c ON c.id = t.category_id /*where*/ GROUP BY action_type SQL - builder.where('a.user_id = :user_id', user_id: user_id) apply_common_filters(builder, user_id, guardian) @@ -91,48 +92,82 @@ SQL stream(action_id: action_id, guardian: guardian).first end - def self.stream(opts={}) - user_id = opts[:user_id] + def self.stream_queued(opts=nil) + opts ||= {} + offset = opts[:offset] || 0 limit = opts[:limit] || 60 - action_id = opts[:action_id] + + builder = SqlBuilder.new <<-SQL + SELECT + a.id, + t.title, a.action_type, a.created_at, t.id topic_id, + u.username, u.name, u.id AS user_id, + qp.raw, + t.category_id + FROM user_actions as a + JOIN queued_posts AS qp ON qp.id = a.queued_post_id + LEFT OUTER JOIN topics t on t.id = qp.topic_id + JOIN users u on u.id = a.user_id + LEFT JOIN categories c on c.id = t.category_id + /*where*/ + /*order_by*/ + /*offset*/ + /*limit*/ + SQL + + builder + .where('a.user_id = :user_id', user_id: opts[:user_id].to_i) + .where('action_type = :pending', pending: UserAction::PENDING) + .order_by("a.created_at desc") + .offset(offset.to_i) + .limit(limit.to_i) + .map_exec(UserActionRow) + end + + def self.stream(opts=nil) + opts ||= {} + action_types = opts[:action_types] + user_id = opts[:user_id] + action_id = opts[:action_id] guardian = opts[:guardian] ignore_private_messages = opts[:ignore_private_messages] + offset = opts[:offset] || 0 + limit = opts[:limit] || 60 # The weird thing is that target_post_id can be null, so it makes everything # ever so more complex. Should we allow this, not sure. - - builder = SqlBuilder.new(" -SELECT - a.id, - t.title, a.action_type, a.created_at, t.id topic_id, - a.user_id AS target_user_id, au.name AS target_name, au.username AS target_username, - coalesce(p.post_number, 1) post_number, p.id as post_id, - p.reply_to_post_number, - pu.email, pu.username, pu.name, pu.id user_id, - pu.uploaded_avatar_id, - u.email acting_email, u.username acting_username, u.name acting_name, u.id acting_user_id, - u.uploaded_avatar_id acting_uploaded_avatar_id, - coalesce(p.cooked, p2.cooked) cooked, - CASE WHEN coalesce(p.deleted_at, p2.deleted_at, t.deleted_at) IS NULL THEN false ELSE true END deleted, - p.hidden, - p.post_type, - p.edit_reason, - t.category_id -FROM user_actions as a -JOIN topics t on t.id = a.target_topic_id -LEFT JOIN posts p on p.id = a.target_post_id -JOIN posts p2 on p2.topic_id = a.target_topic_id and p2.post_number = 1 -JOIN users u on u.id = a.acting_user_id -JOIN users pu on pu.id = COALESCE(p.user_id, t.user_id) -JOIN users au on au.id = a.user_id -LEFT JOIN categories c on c.id = t.category_id -/*where*/ -/*order_by*/ -/*offset*/ -/*limit*/ -") + builder = SqlBuilder.new <<-SQL + SELECT + a.id, + t.title, a.action_type, a.created_at, t.id topic_id, + a.user_id AS target_user_id, au.name AS target_name, au.username AS target_username, + coalesce(p.post_number, 1) post_number, p.id as post_id, + p.reply_to_post_number, + pu.username, pu.name, pu.id user_id, + pu.uploaded_avatar_id, + u.username acting_username, u.name acting_name, u.id acting_user_id, + u.uploaded_avatar_id acting_uploaded_avatar_id, + coalesce(p.cooked, p2.cooked) cooked, + CASE WHEN coalesce(p.deleted_at, p2.deleted_at, t.deleted_at) IS NULL THEN false ELSE true END deleted, + p.hidden, + p.post_type, + p.edit_reason, + t.category_id + FROM user_actions as a + JOIN topics t on t.id = a.target_topic_id + LEFT JOIN posts p on p.id = a.target_post_id + JOIN posts p2 on p2.topic_id = a.target_topic_id and p2.post_number = 1 + JOIN users u on u.id = a.acting_user_id + JOIN users pu on pu.id = COALESCE(p.user_id, t.user_id) + JOIN users au on au.id = a.user_id + LEFT JOIN categories c on c.id = t.category_id + /*where*/ + /*order_by*/ + /*offset*/ + /*limit*/ + SQL apply_common_filters(builder, user_id, guardian, ignore_private_messages) @@ -151,7 +186,15 @@ LEFT JOIN categories c on c.id = t.category_id end def self.log_action!(hash) - required_parameters = [:action_type, :user_id, :acting_user_id, :target_topic_id, :target_post_id] + required_parameters = [:action_type, :user_id, :acting_user_id] + + if hash[:action_type] == UserAction::PENDING + required_parameters << :queued_post_id + else + required_parameters << :target_post_id + required_parameters << :target_topic_id + end + require_parameters(hash, *required_parameters) transaction(requires_new: true) do @@ -269,6 +312,10 @@ SQL builder.where("t.visible") end + unless guardian.can_see_notifications?(User.where(id: user_id).first) + builder.where('a.action_type <> :pending', pending: UserAction::PENDING) + end + if !guardian.can_see_private_messages?(user_id) || ignore_private_messages builder.where("t.archetype != :archetype", archetype: Archetype::private_message) end diff --git a/app/serializers/user_action_serializer.rb b/app/serializers/user_action_serializer.rb index 188ed1b69d..503aabe626 100644 --- a/app/serializers/user_action_serializer.rb +++ b/app/serializers/user_action_serializer.rb @@ -29,7 +29,8 @@ class UserActionSerializer < ApplicationSerializer :acting_uploaded_avatar_id def excerpt - PrettyText.excerpt(object.cooked, 300) if object.cooked + cooked = object.cooked || PrettyText.cook(object.raw) + PrettyText.excerpt(cooked, 300) if cooked end def avatar_template @@ -40,6 +41,10 @@ class UserActionSerializer < ApplicationSerializer User.avatar_template(object.acting_username, object.acting_uploaded_avatar_id) end + def include_acting_avatar_template? + object.acting_username.present? + end + def include_name? SiteSetting.enable_names? end @@ -56,6 +61,10 @@ class UserActionSerializer < ApplicationSerializer Slug.for(object.title) end + def include_slug? + object.title.present? + end + def moderator_action object.post_type == Post.types[:moderator_action] end diff --git a/app/serializers/user_serializer.rb b/app/serializers/user_serializer.rb index 350b026201..f9ba6563b6 100644 --- a/app/serializers/user_serializer.rb +++ b/app/serializers/user_serializer.rb @@ -64,7 +64,8 @@ class UserSerializer < BasicUserSerializer :edit_history_public, :custom_fields, :user_fields, - :topic_post_count + :topic_post_count, + :pending_count has_one :invited_by, embed: :object, serializer: BasicUserSerializer has_many :custom_groups, embed: :object, serializer: BasicGroupSerializer @@ -312,4 +313,8 @@ class UserSerializer < BasicUserSerializer {} end end + + def pending_count + 0 + end end diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml index 309cc13d91..79eddd24ce 100644 --- a/config/locales/client.en.yml +++ b/config/locales/client.en.yml @@ -308,6 +308,7 @@ en: "11": "Edits" "12": "Sent Items" "13": "Inbox" + "14": "Pending" categories: all: "all categories" diff --git a/config/routes.rb b/config/routes.rb index 536a0929af..d71ecc3c5b 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -270,6 +270,7 @@ Discourse::Application.routes.draw do get "users/:username/activity/:filter" => "users#show", constraints: {username: USERNAME_ROUTE_FORMAT} get "users/:username/badges" => "users#show", constraints: {username: USERNAME_ROUTE_FORMAT} get "users/:username/notifications" => "users#show", constraints: {username: USERNAME_ROUTE_FORMAT} + get "users/:username/pending" => "users#show", constraints: {username: USERNAME_ROUTE_FORMAT} delete "users/:username" => "users#destroy", constraints: {username: USERNAME_ROUTE_FORMAT} get "users/by-external/:external_id" => "users#show" get "users/:username/flagged-posts" => "users#show", constraints: {username: USERNAME_ROUTE_FORMAT} diff --git a/db/migrate/20150421190714_add_queued_post_id_to_user_actions.rb b/db/migrate/20150421190714_add_queued_post_id_to_user_actions.rb new file mode 100644 index 0000000000..d6987afc25 --- /dev/null +++ b/db/migrate/20150421190714_add_queued_post_id_to_user_actions.rb @@ -0,0 +1,5 @@ +class AddQueuedPostIdToUserActions < ActiveRecord::Migration + def change + add_column :user_actions, :queued_post_id, :integer, null: true + end +end diff --git a/lib/post_enqueuer.rb b/lib/post_enqueuer.rb index 78242d405d..64a6accc50 100644 --- a/lib/post_enqueuer.rb +++ b/lib/post_enqueuer.rb @@ -23,7 +23,16 @@ class PostEnqueuer return unless send(validate_method, queued_post.create_options) end - add_errors_from(queued_post) unless queued_post.save + if queued_post.save + UserAction.log_action!(action_type: UserAction::PENDING, + user_id: @user.id, + acting_user_id: @user.id, + target_topic_id: args[:topic_id], + queued_post_id: queued_post.id) + else + add_errors_from(queued_post) + end + queued_post end diff --git a/spec/components/post_enqueuer_spec.rb b/spec/components/post_enqueuer_spec.rb index 0c9d5a1dee..964ba891bc 100644 --- a/spec/components/post_enqueuer_spec.rb +++ b/spec/components/post_enqueuer_spec.rb @@ -10,6 +10,9 @@ describe PostEnqueuer do let(:enqueuer) { PostEnqueuer.new(user, 'new_post') } it 'enqueues the post' do + + old_count = user.user_actions.count + qp = enqueuer.enqueue(raw: 'This should be enqueued', topic_id: topic.id, post_options: { reply_to_post_number: 1 }) @@ -18,6 +21,7 @@ describe PostEnqueuer do expect(qp).to be_present expect(qp.topic).to eq(topic) expect(qp.user).to eq(user) + expect(UserAction.where(user_id: user.id).count).to eq(old_count + 1) end end diff --git a/spec/controllers/user_actions_controller_spec.rb b/spec/controllers/user_actions_controller_spec.rb index c119ad3bea..38be920764 100644 --- a/spec/controllers/user_actions_controller_spec.rb +++ b/spec/controllers/user_actions_controller_spec.rb @@ -1,4 +1,5 @@ require 'spec_helper' +require_dependency 'post_enqueuer' describe UserActionsController do context 'index' do @@ -22,5 +23,35 @@ describe UserActionsController do expect(action["email"]).to eq(nil) expect(action["post_number"]).to eq(1) end + + context "queued posts" do + context "without access" do + let(:user) { Fabricate(:user) } + it "raises an exception" do + xhr :get, :index, username: user.username, filter: UserAction::PENDING + expect(response).to_not be_success + + end + end + + context "with access" do + let(:user) { log_in } + + it 'finds queued posts' do + queued_post = PostEnqueuer.new(user, 'default').enqueue(raw: 'this is the raw enqueued content') + + xhr :get, :index, username: user.username, filter: UserAction::PENDING + + expect(response.status).to eq(200) + parsed = JSON.parse(response.body) + actions = parsed["user_actions"] + expect(actions.length).to eq(1) + + action = actions.first + expect(action['username']).to eq(user.username) + expect(action['excerpt']).to be_present + end + end + end end end diff --git a/test/javascripts/acceptance/user-anonymous-test.js.es6 b/test/javascripts/acceptance/user-anonymous-test.js.es6 new file mode 100644 index 0000000000..85b606ba62 --- /dev/null +++ b/test/javascripts/acceptance/user-anonymous-test.js.es6 @@ -0,0 +1,41 @@ +import { acceptance } from "helpers/qunit-helpers"; +acceptance("User Anonymous"); + +export function hasStream() { + andThen(() => { + ok(exists('.user-main .about'), 'it has the about section'); + ok(count('.user-stream .item') > 0, 'it has stream items'); + }); +} + +function hasTopicList() { + andThen(() => { + equal(count('.user-stream .item'), 0, "has no stream displayed"); + ok(count('.topic-list tr') > 0, 'it has a topic list'); + }); +} + +test("Filters", () => { + expect(14); + + visit("/users/eviltrout"); + hasStream(); + + visit("/users/eviltrout/activity/topics"); + hasTopicList(); + + visit("/users/eviltrout/activity/posts"); + hasStream(); + + visit("/users/eviltrout/activity/replies"); + hasStream(); + + visit("/users/eviltrout/activity/likes-given"); + hasStream(); + + visit("/users/eviltrout/activity/likes-received"); + hasStream(); + + visit("/users/eviltrout/activity/edits"); + hasStream(); +}); diff --git a/test/javascripts/acceptance/user-test.js.es6 b/test/javascripts/acceptance/user-test.js.es6 index 9d38301ff1..e642d2aad4 100644 --- a/test/javascripts/acceptance/user-test.js.es6 +++ b/test/javascripts/acceptance/user-test.js.es6 @@ -1,41 +1,9 @@ import { acceptance } from "helpers/qunit-helpers"; -acceptance("User"); +import { hasStream } from 'acceptance/user-anonymous-test'; -function hasStream() { - andThen(() => { - ok(exists('.user-main .about'), 'it has the about section'); - ok(count('.user-stream .item') > 0, 'it has stream items'); - }); -} +acceptance("User", {loggedIn: true}); -function hasTopicList() { - andThen(() => { - equal(count('.user-stream .item'), 0, "has no stream displayed"); - ok(count('.topic-list tr') > 0, 'it has a topic list'); - }); -} - -test("Filters", () => { - expect(14); - - visit("/users/eviltrout"); - hasStream(); - - visit("/users/eviltrout/activity/topics"); - hasTopicList(); - - visit("/users/eviltrout/activity/posts"); - hasStream(); - - visit("/users/eviltrout/activity/replies"); - hasStream(); - - visit("/users/eviltrout/activity/likes-given"); - hasStream(); - - visit("/users/eviltrout/activity/likes-received"); - hasStream(); - - visit("/users/eviltrout/activity/edits"); +test("Pending", () => { + visit("/users/eviltrout/activity/pending"); hasStream(); }); diff --git a/test/javascripts/helpers/create-pretender.js.es6 b/test/javascripts/helpers/create-pretender.js.es6 index b29a618e8c..563e1ab137 100644 --- a/test/javascripts/helpers/create-pretender.js.es6 +++ b/test/javascripts/helpers/create-pretender.js.es6 @@ -101,6 +101,8 @@ export default function() { this.delete('/draft.json', success); + this.get('/users/:username/staff-info.json', () => response({})); + this.get('/draft.json', function() { return response({}); }); From 405edebfedf7f01d196ba8aae2cf08f89d65ca03 Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Tue, 21 Apr 2015 16:48:39 -0400 Subject: [PATCH 101/113] FIX: Don't rate limit the creation of topics when skipping validations --- lib/topic_creator.rb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/topic_creator.rb b/lib/topic_creator.rb index 790da802ed..38fbcd5236 100644 --- a/lib/topic_creator.rb +++ b/lib/topic_creator.rb @@ -124,6 +124,8 @@ class TopicCreator end def save_topic(topic) + topic.disable_rate_limits! if @opts[:skip_validations] + unless topic.save(validate: !@opts[:skip_validations]) rollback_from_errors!(topic) end From 444fe5757d3a76a4db36452185014818c5b1d48f Mon Sep 17 00:00:00 2001 From: Jeff Atwood Date: Tue, 21 Apr 2015 17:10:49 -0700 Subject: [PATCH 102/113] improve new topic copy --- config/locales/server.en.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml index 947b5af253..36960de796 100644 --- a/config/locales/server.en.yml +++ b/config/locales/server.en.yml @@ -200,11 +200,11 @@ en: 'new-topic': | Welcome to %{site_name} — **thanks for starting a new conversation!** - - Does the title accurately describe your topic? Does it sound interesting? + - Does the title sound interesting if you read it out loud? Is it a good summary? - - What is this about? Who would be interested in it? Why does it matter? What kind of responses are you hoping for from the community? + - Who would be interested in this? Why does it matter? What kind of responses do you want? - - Include good search words in your topic so others can *find* it. To group your topic with related topics, select a category. + - Include commonly used words in your topic so others can *find* it. To group your topic with related topics, select a category. For more, [see our community guidelines](/guidelines). This panel will only appear for your first %{education_posts_text}. From 706183f88675fe76028653aa345cfe16d4ee6366 Mon Sep 17 00:00:00 2001 From: Jeff Atwood Date: Tue, 21 Apr 2015 17:35:10 -0700 Subject: [PATCH 103/113] hide editor button bar overflow --- app/assets/stylesheets/common/base/pagedown.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/app/assets/stylesheets/common/base/pagedown.scss b/app/assets/stylesheets/common/base/pagedown.scss index 9de92d9715..ec26be9829 100644 --- a/app/assets/stylesheets/common/base/pagedown.scss +++ b/app/assets/stylesheets/common/base/pagedown.scss @@ -19,6 +19,7 @@ margin-top: 5px; padding: 0; height: 20px; + overflow: hidden; } .wmd-spacer { From c30e65b3c280e83809ee4d920bca2417ebe68b3d Mon Sep 17 00:00:00 2001 From: Paul Anunda Date: Tue, 21 Apr 2015 23:52:21 -0500 Subject: [PATCH 104/113] Update Docker package URL --- docs/INSTALL-cloud.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/INSTALL-cloud.md b/docs/INSTALL-cloud.md index da0903add0..dc47b87443 100644 --- a/docs/INSTALL-cloud.md +++ b/docs/INSTALL-cloud.md @@ -36,7 +36,7 @@ You will be asked for permission to connect, type `yes`, then enter the root pas # Install Docker / Git - wget -qO- https://get.docker.io/ | sh + wget -qO- https://get.docker.com/ | sh From 694ee30e86b531ad63721a4da10bec1cd374920d Mon Sep 17 00:00:00 2001 From: riking Date: Tue, 21 Apr 2015 23:06:40 -0700 Subject: [PATCH 105/113] FIX: Uploaded files could not be oneboxed --- lib/onebox/engine/discourse_local_onebox.rb | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/lib/onebox/engine/discourse_local_onebox.rb b/lib/onebox/engine/discourse_local_onebox.rb index 7857f55556..d8bf15376e 100644 --- a/lib/onebox/engine/discourse_local_onebox.rb +++ b/lib/onebox/engine/discourse_local_onebox.rb @@ -10,6 +10,25 @@ module Onebox 1 end + def self.===(other) + if other.kind_of?(URI) + uri = other + begin + route = Rails.application.routes.recognize_path(uri.path) + case route[:controller] + when 'topics' + true + else + false + end + rescue ActionController::RoutingError + false + end + else + super + end + end + def to_html uri = URI::parse(@url) route = Rails.application.routes.recognize_path(uri.path) From 3681674ec4dfc01ace08276c224faad5dd2befe8 Mon Sep 17 00:00:00 2001 From: riking Date: Tue, 21 Apr 2015 23:11:25 -0700 Subject: [PATCH 106/113] FIX: Don't cache-bust onebox requests --- app/assets/javascripts/discourse/lib/onebox.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/assets/javascripts/discourse/lib/onebox.js b/app/assets/javascripts/discourse/lib/onebox.js index bb282ce150..e39635bea5 100644 --- a/app/assets/javascripts/discourse/lib/onebox.js +++ b/app/assets/javascripts/discourse/lib/onebox.js @@ -51,7 +51,8 @@ Discourse.Onebox = { // Retrieve the onebox var promise = Discourse.ajax("/onebox", { dataType: 'html', - data: { url: url, refresh: refresh } + data: { url: url, refresh: refresh }, + cache: true }); // We can call this when loading is complete From c4e813cc11651da9b2251aa691aea56ac6928208 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9gis=20Hanol?= Date: Wed, 22 Apr 2015 10:41:40 +0200 Subject: [PATCH 107/113] update SFN importer to handle merge with existing instance --- script/import_scripts/sfn.rb | 162 +++++++++++++++++------------------ 1 file changed, 81 insertions(+), 81 deletions(-) diff --git a/script/import_scripts/sfn.rb b/script/import_scripts/sfn.rb index 41c2b37607..b5178146c2 100644 --- a/script/import_scripts/sfn.rb +++ b/script/import_scripts/sfn.rb @@ -17,7 +17,7 @@ class ImportScripts::Sfn < ImportScripts::Base def execute load_external_users import_users - import_categories + # import_categories import_topics import_posts end @@ -113,91 +113,91 @@ class ImportScripts::Sfn < ImportScripts::Base end end - NEW_CATEGORIES = [ - "Abstract Topic Matching Forum", - "Animals in Research", - "Brain Awareness and Teaching", - "Career Advice", - "Career Paths", - "Diversity", - "Early Career Policy Advocates", - "LATP Associates", - "LATP Fellows", - "Mid and Advanced Career", - "Neurobiology of Disease Workshop", - "Neuronline Champions", - "Neuroscience 2015", - "Neuroscience Scholars Program", - "NSP Associates", - "NSP Fellows", - "Outreach", - "Postdocs and Early Career", - "Program Committee", - "Program Development", - "Roommate Matching Forum", - "Scientific Research", - "Students", - ] + # NEW_CATEGORIES = [ + # "Abstract Topic Matching Forum", + # "Animals in Research", + # "Brain Awareness & Teaching", + # "Career Advice", + # "Career Paths", + # "Diversity", + # "Early Career Policy Advocates", + # "LATP Associates", + # "LATP Fellows", + # "Mid & Advanced Career", + # "Neurobiology of Disease Workshop", + # "Neuronline Champions", + # "Neuroscience 2015", + # "Neuroscience Scholars Program", + # "NSP Associates", + # "NSP Fellows", + # "Outreach", + # "Postdocs & Early Career", + # "Program Committee", + # "Program Development", + # "Roommate Matching Forum", + # "Scientific Research", + # "Students", + # ] # EgroupKey => New Category Name CATEGORY_MAPPING = { - "{DE10E4F4-621A-48BF-9B45-05D9F774A590}" => "Abstract Topic Matching Forum", - "{3FFC1217-1576-4D38-BB81-D6CADC7FB793}" => "Animals in Research", - "{9362BB21-BF6C-4E55-A3E0-18CD5D9F3323}" => "Brain Awareness and Teaching", - "{3AC01B09-A21F-4166-95DA-0E585E271075}" => "Brain Awareness and Teaching", - "{C249728D-8C9E-4138-AA49-D02467C28EAD}" => "Career Advice", - "{01570B85-0124-478F-A8B9-B028BD1B1F2F}" => "Career Paths", - "{2A430528-278A-46CD-BE1A-07CFA1122919}" => "Diversity", - "{2F211345-3C19-43C9-90B5-27BA9FCD4DB0}" => "Diversity", - "{8092297D-8DF4-404A-8BEB-4D5D0DC6A191}" => "Early Career Policy Advocates", - "{8CB58762-D562-448C-9AF1-8DAE6C482C9B}" => "LATP Associates", - "{CDF80A92-925A-46DD-A867-8558FA72D016}" => "LATP Fellows", - "{E71E237B-7C23-4596-AECA-655BD8ED50DB}" => "Mid and Advanced Career", - "{1D674C38-17CB-4C48-826A-D465AC3F8948}" => "Neurobiology of Disease Workshop", - "{80C5835E-974E-4D44-BA01-C2C4F8BA91D7}" => "Neuronline Champions", - "{3D4F885B-0037-403B-83DD-62FAA8E81DF1}" => "Neuroscience 2015", - "{9ACC3B40-E4A3-4FFD-AADC-C8403EB6231D}" => "Neuroscience 2015", - "{9FC30FFB-E450-4361-8844-0266C3D96868}" => "Neuroscience Scholars Program", - "{3E78123E-87CE-435E-B4B7-7DAB1A21C541}" => "NSP Associates", - "{12D889D3-5CFD-49D5-93E4-32AAB2CFFCDA}" => "NSP Fellows", - "{FA86D79E-170E-4F53-8F1C-942CB3FFB19E}" => "Outreach", - "{D7041C64-3D32-4010-B3D8-71858323CB4A}" => "Outreach", - "{69B76913-4E23-4C80-A11E-9CDB4130722E}" => "Outreach", - "{774878EA-96AD-49F5-9D29-105AEA488007}" => "Outreach", - "{E6349704-FD01-41B1-9C59-68E928DD4318}" => "Postdocs and Early Career", - "{31CF5944-2567-4E79-9730-18EEC23E5B52}" => "Postdocs and Early Career", - "{5625C403-AFAE-4323-A470-33FC32B12B53}" => "Program Committee", - "{8415D871-54F5-4128-B099-E5A376A6B41B}" => "Program Development", - "{B4DF2044-47AB-4329-8BF7-0D832CAB402C}" => "Roommate Matching Forum", - "{6A3A12B9-5C72-472F-97AC-F34983674960}" => "Scientific Research", - "{2CF635E9-4866-451C-A4F2-E2A8A80FED54}" => "Scientific Research", - "{CF2DDCCE-737F-499D-AFE4-E5C36F195C8B}" => "Scientific Research", - "{282B48D7-AC1D-453E-9806-3C6CE6830EF9}" => "Scientific Research", - "{6D750CAF-E96F-4AD1-A45B-7B74FDFF0B40}" => "Scientific Research", - "{10AF5D45-BEB3-4F07-BE77-0BAB6910DE10}" => "Scientific Research", - "{18D7F624-26D1-44B9-BF33-AB5C5A2AB2BF}" => "Scientific Research", - "{6016FF4F-D834-4888-BA03-F9FE8CB1D4CC}" => "Scientific Research", - "{B0290A37-EA39-4CB8-B6CB-3E0B7EF6D036}" => "Scientific Research", - "{97CC60D0-B93A-43FF-BB48-366FAAEE2BAC}" => "Scientific Research", - "{8FC9B57B-2755-4FC5-90E8-CCDB56CF2F66}" => "Scientific Research", - "{57C8BF37-357E-4FE6-952D-906248642792}" => "Scientific Research", - "{7B2A3B63-BC2C-4219-830C-BA1DECB33337}" => "Scientific Research", - "{0ED1D205-0E48-48D2-B82B-3CE80C6C553F}" => "Scientific Research", - "{10355962-D172-4294-AA8E-1BC381B67971}" => "Scientific Research", - "{C84B0222-5232-4B94-9FB8-DDF802241171}" => "Scientific Research", - "{9143F984-0D67-46CB-AAAF-7FE3B6335E07}" => "Scientific Research", - "{1392DC10-37A0-46A6-9979-4568D0224C5F}" => "Scientific Research", - "{E4891409-0F4F-4151-B550-ECE53655E231}" => "Scientific Research", - "{9613BAC2-229B-4563-9E1C-35C31CDDCE2F}" => "Students", + "{DE10E4F4-621A-48BF-9B45-05D9F774A590}" => 52, # "Abstract Topic Matching Forum", + "{3FFC1217-1576-4D38-BB81-D6CADC7FB793}" => 66, # "Animals in Research", + "{9362BB21-BF6C-4E55-A3E0-18CD5D9F3323}" => 67, # "Brain Awareness & Teaching", + "{3AC01B09-A21F-4166-95DA-0E585E271075}" => 67, # "Brain Awareness & Teaching", + "{C249728D-8C9E-4138-AA49-D02467C28EAD}" => 42, # "Career Advice", + "{01570B85-0124-478F-A8B9-B028BD1B1F2F}" => 43, # "Career Paths", + "{2A430528-278A-46CD-BE1A-07CFA1122919}" => 44, # "Diversity", + "{2F211345-3C19-43C9-90B5-27BA9FCD4DB0}" => 44, # "Diversity", + "{8092297D-8DF4-404A-8BEB-4D5D0DC6A191}" => 56, # "Early Career Policy Advocates", + "{8CB58762-D562-448C-9AF1-8DAE6C482C9B}" => 61, # "LATP Associates", + "{CDF80A92-925A-46DD-A867-8558FA72D016}" => 60, # "LATP Fellows", + "{E71E237B-7C23-4596-AECA-655BD8ED50DB}" => 51, # "Mid & Advanced Career", + "{1D674C38-17CB-4C48-826A-D465AC3F8948}" => 55, # "Neurobiology of Disease Workshop", + "{80C5835E-974E-4D44-BA01-C2C4F8BA91D7}" => 65, # "Neuronline Champions", + "{3D4F885B-0037-403B-83DD-62FAA8E81DF1}" => 54, # "Neuroscience 2015", + "{9ACC3B40-E4A3-4FFD-AADC-C8403EB6231D}" => 54, # "Neuroscience 2015", + "{9FC30FFB-E450-4361-8844-0266C3D96868}" => 57, # "Neuroscience Scholars Program", + "{3E78123E-87CE-435E-B4B7-7DAB1A21C541}" => 59, # "NSP Associates", + "{12D889D3-5CFD-49D5-93E4-32AAB2CFFCDA}" => 58, # "NSP Fellows", + "{FA86D79E-170E-4F53-8F1C-942CB3FFB19E}" => 45, # "Outreach", + "{D7041C64-3D32-4010-B3D8-71858323CB4A}" => 45, # "Outreach", + "{69B76913-4E23-4C80-A11E-9CDB4130722E}" => 45, # "Outreach", + "{774878EA-96AD-49F5-9D29-105AEA488007}" => 45, # "Outreach", + "{E6349704-FD01-41B1-9C59-68E928DD4318}" => 50, # "Postdocs & Early Career", + "{31CF5944-2567-4E79-9730-18EEC23E5B52}" => 50, # "Postdocs & Early Career", + "{5625C403-AFAE-4323-A470-33FC32B12B53}" => 62, # "Program Committee", + "{8415D871-54F5-4128-B099-E5A376A6B41B}" => 47, # "Program Development", + "{B4DF2044-47AB-4329-8BF7-0D832CAB402C}" => 53, # "Roommate Matching Forum", + "{6A3A12B9-5C72-472F-97AC-F34983674960}" => 48, # "Scientific Research", + "{2CF635E9-4866-451C-A4F2-E2A8A80FED54}" => 48, # "Scientific Research", + "{CF2DDCCE-737F-499D-AFE4-E5C36F195C8B}" => 48, # "Scientific Research", + "{282B48D7-AC1D-453E-9806-3C6CE6830EF9}" => 48, # "Scientific Research", + "{6D750CAF-E96F-4AD1-A45B-7B74FDFF0B40}" => 48, # "Scientific Research", + "{10AF5D45-BEB3-4F07-BE77-0BAB6910DE10}" => 48, # "Scientific Research", + "{18D7F624-26D1-44B9-BF33-AB5C5A2AB2BF}" => 48, # "Scientific Research", + "{6016FF4F-D834-4888-BA03-F9FE8CB1D4CC}" => 48, # "Scientific Research", + "{B0290A37-EA39-4CB8-B6CB-3E0B7EF6D036}" => 48, # "Scientific Research", + "{97CC60D0-B93A-43FF-BB48-366FAAEE2BAC}" => 48, # "Scientific Research", + "{8FC9B57B-2755-4FC5-90E8-CCDB56CF2F66}" => 48, # "Scientific Research", + "{57C8BF37-357E-4FE6-952D-906248642792}" => 48, # "Scientific Research", + "{7B2A3B63-BC2C-4219-830C-BA1DECB33337}" => 48, # "Scientific Research", + "{0ED1D205-0E48-48D2-B82B-3CE80C6C553F}" => 48, # "Scientific Research", + "{10355962-D172-4294-AA8E-1BC381B67971}" => 48, # "Scientific Research", + "{C84B0222-5232-4B94-9FB8-DDF802241171}" => 48, # "Scientific Research", + "{9143F984-0D67-46CB-AAAF-7FE3B6335E07}" => 48, # "Scientific Research", + "{1392DC10-37A0-46A6-9979-4568D0224C5F}" => 48, # "Scientific Research", + "{E4891409-0F4F-4151-B550-ECE53655E231}" => 48, # "Scientific Research", + "{9613BAC2-229B-4563-9E1C-35C31CDDCE2F}" => 49, # "Students", } - def import_categories - puts "", "importing categories..." + # def import_categories + # puts "", "importing categories..." - create_categories(NEW_CATEGORIES) do |category| - { id: category, name: category } - end - end + # create_categories(NEW_CATEGORIES) do |category| + # { id: category, name: category } + # end + # end def import_topics puts "", "importing topics..." @@ -240,7 +240,7 @@ class ImportScripts::Sfn < ImportScripts::Base { id: topic["id"], - category: category_id_from_imported_category_id(category_id), + category: category_id, user_id: user_id_from_imported_user_id(topic["user_id"]) || Discourse::SYSTEM_USER_ID, title: title, raw: raw, From ccb1d4bcfbf5c82138184c52be347cb1ce4ef399 Mon Sep 17 00:00:00 2001 From: Jeff Atwood Date: Wed, 22 Apr 2015 03:07:45 -0700 Subject: [PATCH 108/113] add link to invites page in quick start --- docs/ADMIN-QUICK-START-GUIDE.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/ADMIN-QUICK-START-GUIDE.md b/docs/ADMIN-QUICK-START-GUIDE.md index eaa2232655..2a0965077e 100644 --- a/docs/ADMIN-QUICK-START-GUIDE.md +++ b/docs/ADMIN-QUICK-START-GUIDE.md @@ -42,7 +42,7 @@ Staff members are official representatives of this community. There are two kind To add additional staff members: -- have them sign up on the site (or send out an invitation to join via your user page) +- have them sign up on the site (or [send out an invitation to join via your user page](/my/invited)) - click the admin button :wrench: on their user page - look for the Grant Admin and Grant Moderator buttons there From 6037a6b0c9e0116e9d67c3d5b2b3009e6efcdecc Mon Sep 17 00:00:00 2001 From: Sam Saffron Date: Wed, 22 Apr 2015 23:34:29 +1000 Subject: [PATCH 109/113] update highlightjs --- lib/highlight_js/assets/highlight.js | 2 +- lib/highlight_js/assets/lang/cal.js | 1 + lib/highlight_js/assets/lang/clojure-repl.js | 2 +- lib/highlight_js/assets/lang/cpp.js | 2 +- lib/highlight_js/assets/lang/cs.js | 2 +- lib/highlight_js/assets/lang/css.js | 2 +- lib/highlight_js/assets/lang/diff.js | 2 +- lib/highlight_js/assets/lang/dust.js | 2 +- lib/highlight_js/assets/lang/elixir.js | 2 +- lib/highlight_js/assets/lang/fix.js | 2 +- lib/highlight_js/assets/lang/haml.js | 2 +- lib/highlight_js/assets/lang/handlebars.js | 2 +- lib/highlight_js/assets/lang/http.js | 2 +- lib/highlight_js/assets/lang/javascript.js | 2 +- lib/highlight_js/assets/lang/kotlin.js | 1 + lib/highlight_js/assets/lang/lisp.js | 2 +- lib/highlight_js/assets/lang/markdown.js | 2 +- lib/highlight_js/assets/lang/prolog.js | 1 + lib/highlight_js/assets/lang/python.js | 2 +- lib/highlight_js/assets/lang/scss.js | 2 +- lib/highlight_js/assets/lang/stylus.js | 2 +- lib/highlight_js/assets/lang/swift.js | 2 +- lib/highlight_js/assets/lang/twig.js | 2 +- lib/highlight_js/assets/lang/typescript.js | 2 +- lib/highlight_js/assets/lang/vbscript-html.js | 2 +- 25 files changed, 25 insertions(+), 22 deletions(-) create mode 100644 lib/highlight_js/assets/lang/cal.js create mode 100644 lib/highlight_js/assets/lang/kotlin.js create mode 100644 lib/highlight_js/assets/lang/prolog.js diff --git a/lib/highlight_js/assets/highlight.js b/lib/highlight_js/assets/highlight.js index 98da88297b..e2a581c1c0 100644 --- a/lib/highlight_js/assets/highlight.js +++ b/lib/highlight_js/assets/highlight.js @@ -1 +1 @@ -!function(e){"undefined"!=typeof exports?e(exports):(window.hljs=e({}),"function"==typeof define&&define.amd&&define([],function(){return window.hljs}))}(function(e){function n(e){return e.replace(/&/gm,"&").replace(//gm,">")}function t(e){return e.nodeName.toLowerCase()}function r(e,n){var t=e&&e.exec(n);return t&&0==t.index}function a(e){var n=(e.className+" "+(e.parentNode?e.parentNode.className:"")).split(/\s+/);return n=n.map(function(e){return e.replace(/^lang(uage)?-/,"")}),n.filter(function(e){return N(e)||/no(-?)highlight|plain|text/.test(e)})[0]}function i(e,n){var t,r={};for(t in e)r[t]=e[t];if(n)for(t in n)r[t]=n[t];return r}function o(e){var n=[];return function r(e,a){for(var i=e.firstChild;i;i=i.nextSibling)3==i.nodeType?a+=i.nodeValue.length:1==i.nodeType&&(n.push({event:"start",offset:a,node:i}),a=r(i,a),t(i).match(/br|hr|img|input/)||n.push({event:"stop",offset:a,node:i}));return a}(e,0),n}function u(e,r,a){function i(){return e.length&&r.length?e[0].offset!=r[0].offset?e[0].offset"}function u(e){l+=""}function c(e){("start"==e.event?o:u)(e.node)}for(var s=0,l="",f=[];e.length||r.length;){var g=i();if(l+=n(a.substr(s,g[0].offset-s)),s=g[0].offset,g==e){f.reverse().forEach(u);do c(g.splice(0,1)[0]),g=i();while(g==e&&g.length&&g[0].offset==s);f.reverse().forEach(o)}else"start"==g[0].event?f.push(g[0].node):f.pop(),c(g.splice(0,1)[0])}return l+n(a.substr(s))}function c(e){function n(e){return e&&e.source||e}function t(t,r){return new RegExp(n(t),"m"+(e.cI?"i":"")+(r?"g":""))}function r(a,o){if(!a.compiled){if(a.compiled=!0,a.k=a.k||a.bK,a.k){var u={},c=function(n,t){e.cI&&(t=t.toLowerCase()),t.split(" ").forEach(function(e){var t=e.split("|");u[t[0]]=[n,t[1]?Number(t[1]):1]})};"string"==typeof a.k?c("keyword",a.k):Object.keys(a.k).forEach(function(e){c(e,a.k[e])}),a.k=u}a.lR=t(a.l||/\b\w+\b/,!0),o&&(a.bK&&(a.b="\\b("+a.bK.split(" ").join("|")+")\\b"),a.b||(a.b=/\B|\b/),a.bR=t(a.b),a.e||a.eW||(a.e=/\B|\b/),a.e&&(a.eR=t(a.e)),a.tE=n(a.e)||"",a.eW&&o.tE&&(a.tE+=(a.e?"|":"")+o.tE)),a.i&&(a.iR=t(a.i)),void 0===a.r&&(a.r=1),a.c||(a.c=[]);var s=[];a.c.forEach(function(e){e.v?e.v.forEach(function(n){s.push(i(e,n))}):s.push("self"==e?a:e)}),a.c=s,a.c.forEach(function(e){r(e,a)}),a.starts&&r(a.starts,o);var l=a.c.map(function(e){return e.bK?"\\.?("+e.b+")\\.?":e.b}).concat([a.tE,a.i]).map(n).filter(Boolean);a.t=l.length?t(l.join("|"),!0):{exec:function(){return null}}}}r(e)}function s(e,t,a,i){function o(e,n){for(var t=0;t";return i+=e+'">',i+n+o}function d(){if(!L.k)return n(y);var e="",t=0;L.lR.lastIndex=0;for(var r=L.lR.exec(y);r;){e+=n(y.substr(t,r.index-t));var a=g(L,r);a?(B+=a[1],e+=p(a[0],n(r[0]))):e+=n(r[0]),t=L.lR.lastIndex,r=L.lR.exec(y)}return e+n(y.substr(t))}function h(){if(L.sL&&!w[L.sL])return n(y);var e=L.sL?s(L.sL,y,!0,M[L.sL]):l(y);return L.r>0&&(B+=e.r),"continuous"==L.subLanguageMode&&(M[L.sL]=e.top),p(e.language,e.value,!1,!0)}function b(){return void 0!==L.sL?h():d()}function v(e,t){var r=e.cN?p(e.cN,"",!0):"";e.rB?(k+=r,y=""):e.eB?(k+=n(t)+r,y=""):(k+=r,y=t),L=Object.create(e,{parent:{value:L}})}function m(e,t){if(y+=e,void 0===t)return k+=b(),0;var r=o(t,L);if(r)return k+=b(),v(r,t),r.rB?0:t.length;var a=u(L,t);if(a){var i=L;i.rE||i.eE||(y+=t),k+=b();do L.cN&&(k+=""),B+=L.r,L=L.parent;while(L!=a.parent);return i.eE&&(k+=n(t)),y="",a.starts&&v(a.starts,""),i.rE?0:t.length}if(f(t,L))throw new Error('Illegal lexeme "'+t+'" for mode "'+(L.cN||"")+'"');return y+=t,t.length||1}var E=N(e);if(!E)throw new Error('Unknown language: "'+e+'"');c(E);var R,L=i||E,M={},k="";for(R=L;R!=E;R=R.parent)R.cN&&(k=p(R.cN,"",!0)+k);var y="",B=0;try{for(var C,j,I=0;;){if(L.t.lastIndex=I,C=L.t.exec(t),!C)break;j=m(t.substr(I,C.index-I),C[0]),I=C.index+j}for(m(t.substr(I)),R=L;R.parent;R=R.parent)R.cN&&(k+="");return{r:B,value:k,language:e,top:L}}catch(S){if(-1!=S.message.indexOf("Illegal"))return{r:0,value:n(t)};throw S}}function l(e,t){t=t||x.languages||Object.keys(w);var r={r:0,value:n(e)},a=r;return t.forEach(function(n){if(N(n)){var t=s(n,e,!1);t.language=n,t.r>a.r&&(a=t),t.r>r.r&&(a=r,r=t)}}),a.language&&(r.second_best=a),r}function f(e){return x.tabReplace&&(e=e.replace(/^((<[^>]+>|\t)+)/gm,function(e,n){return n.replace(/\t/g,x.tabReplace)})),x.useBR&&(e=e.replace(/\n/g,"
      ")),e}function g(e,n,t){var r=n?E[n]:t,a=[e.trim()];return e.match(/\bhljs\b/)||a.push("hljs"),-1===e.indexOf(r)&&a.push(r),a.join(" ").trim()}function p(e){var n=a(e);if(!/no(-?)highlight|plain|text/.test(n)){var t;x.useBR?(t=document.createElementNS("http://www.w3.org/1999/xhtml","div"),t.innerHTML=e.innerHTML.replace(/\n/g,"").replace(//g,"\n")):t=e;var r=t.textContent,i=n?s(n,r,!0):l(r),c=o(t);if(c.length){var p=document.createElementNS("http://www.w3.org/1999/xhtml","div");p.innerHTML=i.value,i.value=u(c,o(p),r)}i.value=f(i.value),e.innerHTML=i.value,e.className=g(e.className,n,i.language),e.result={language:i.language,re:i.r},i.second_best&&(e.second_best={language:i.second_best.language,re:i.second_best.r})}}function d(e){x=i(x,e)}function h(){if(!h.called){h.called=!0;var e=document.querySelectorAll("pre code");Array.prototype.forEach.call(e,p)}}function b(){addEventListener("DOMContentLoaded",h,!1),addEventListener("load",h,!1)}function v(n,t){var r=w[n]=t(e);r.aliases&&r.aliases.forEach(function(e){E[e]=n})}function m(){return Object.keys(w)}function N(e){return w[e]||w[E[e]]}var x={classPrefix:"hljs-",tabReplace:null,useBR:!1,languages:void 0},w={},E={};return e.highlight=s,e.highlightAuto=l,e.fixMarkup=f,e.highlightBlock=p,e.configure=d,e.initHighlighting=h,e.initHighlightingOnLoad=b,e.registerLanguage=v,e.listLanguages=m,e.getLanguage=N,e.inherit=i,e.IR="[a-zA-Z]\\w*",e.UIR="[a-zA-Z_]\\w*",e.NR="\\b\\d+(\\.\\d+)?",e.CNR="\\b(0[xX][a-fA-F0-9]+|(\\d+(\\.\\d*)?|\\.\\d+)([eE][-+]?\\d+)?)",e.BNR="\\b(0b[01]+)",e.RSR="!|!=|!==|%|%=|&|&&|&=|\\*|\\*=|\\+|\\+=|,|-|-=|/=|/|:|;|<<|<<=|<=|<|===|==|=|>>>=|>>=|>=|>>>|>>|>|\\?|\\[|\\{|\\(|\\^|\\^=|\\||\\|=|\\|\\||~",e.BE={b:"\\\\[\\s\\S]",r:0},e.ASM={cN:"string",b:"'",e:"'",i:"\\n",c:[e.BE]},e.QSM={cN:"string",b:'"',e:'"',i:"\\n",c:[e.BE]},e.PWM={b:/\b(a|an|the|are|I|I'm|isn't|don't|doesn't|won't|but|just|should|pretty|simply|enough|gonna|going|wtf|so|such)\b/},e.C=function(n,t,r){var a=e.inherit({cN:"comment",b:n,e:t,c:[]},r||{});return a.c.push(e.PWM),a},e.CLCM=e.C("//","$"),e.CBCM=e.C("/\\*","\\*/"),e.HCM=e.C("#","$"),e.NM={cN:"number",b:e.NR,r:0},e.CNM={cN:"number",b:e.CNR,r:0},e.BNM={cN:"number",b:e.BNR,r:0},e.CSSNM={cN:"number",b:e.NR+"(%|em|ex|ch|rem|vw|vh|vmin|vmax|cm|mm|in|pt|pc|px|deg|grad|rad|turn|s|ms|Hz|kHz|dpi|dpcm|dppx)?",r:0},e.RM={cN:"regexp",b:/\//,e:/\/[gimuy]*/,i:/\n/,c:[e.BE,{b:/\[/,e:/\]/,r:0,c:[e.BE]}]},e.TM={cN:"title",b:e.IR,r:0},e.UTM={cN:"title",b:e.UIR,r:0},e}); \ No newline at end of file +!function(e){"undefined"!=typeof exports?e(exports):(window.hljs=e({}),"function"==typeof define&&define.amd&&define([],function(){return window.hljs}))}(function(e){function n(e){return e.replace(/&/gm,"&").replace(//gm,">")}function t(e){return e.nodeName.toLowerCase()}function r(e,n){var t=e&&e.exec(n);return t&&0==t.index}function a(e){return/no-?highlight|plain|text/.test(e)}function i(e){var n,t,r,i=e.className+" ";for(i+=e.parentNode?e.parentNode.className:"",i=i.split(/\s+/),n=0,r=i.length;r>n;n++)if(t=i[n].replace(/^lang(uage)?-/,""),w(t)||a(t))return t}function o(e,n){var t,r={};for(t in e)r[t]=e[t];if(n)for(t in n)r[t]=n[t];return r}function u(e){var n=[];return function r(e,a){for(var i=e.firstChild;i;i=i.nextSibling)3==i.nodeType?a+=i.nodeValue.length:1==i.nodeType&&(n.push({event:"start",offset:a,node:i}),a=r(i,a),t(i).match(/br|hr|img|input/)||n.push({event:"stop",offset:a,node:i}));return a}(e,0),n}function c(e,r,a){function i(){return e.length&&r.length?e[0].offset!=r[0].offset?e[0].offset"}function u(e){f+=""}function c(e){("start"==e.event?o:u)(e.node)}for(var s=0,f="",l=[];e.length||r.length;){var g=i();if(f+=n(a.substr(s,g[0].offset-s)),s=g[0].offset,g==e){l.reverse().forEach(u);do c(g.splice(0,1)[0]),g=i();while(g==e&&g.length&&g[0].offset==s);l.reverse().forEach(o)}else"start"==g[0].event?l.push(g[0].node):l.pop(),c(g.splice(0,1)[0])}return f+n(a.substr(s))}function s(e){function n(e){return e&&e.source||e}function t(t,r){return new RegExp(n(t),"m"+(e.cI?"i":"")+(r?"g":""))}function r(a,i){if(!a.compiled){if(a.compiled=!0,a.k=a.k||a.bK,a.k){var u={},c=function(n,t){e.cI&&(t=t.toLowerCase()),t.split(" ").forEach(function(e){var t=e.split("|");u[t[0]]=[n,t[1]?Number(t[1]):1]})};"string"==typeof a.k?c("keyword",a.k):Object.keys(a.k).forEach(function(e){c(e,a.k[e])}),a.k=u}a.lR=t(a.l||/\b\w+\b/,!0),i&&(a.bK&&(a.b="\\b("+a.bK.split(" ").join("|")+")\\b"),a.b||(a.b=/\B|\b/),a.bR=t(a.b),a.e||a.eW||(a.e=/\B|\b/),a.e&&(a.eR=t(a.e)),a.tE=n(a.e)||"",a.eW&&i.tE&&(a.tE+=(a.e?"|":"")+i.tE)),a.i&&(a.iR=t(a.i)),void 0===a.r&&(a.r=1),a.c||(a.c=[]);var s=[];a.c.forEach(function(e){e.v?e.v.forEach(function(n){s.push(o(e,n))}):s.push("self"==e?a:e)}),a.c=s,a.c.forEach(function(e){r(e,a)}),a.starts&&r(a.starts,i);var f=a.c.map(function(e){return e.bK?"\\.?("+e.b+")\\.?":e.b}).concat([a.tE,a.i]).map(n).filter(Boolean);a.t=f.length?t(f.join("|"),!0):{exec:function(){return null}}}}r(e)}function f(e,t,a,i){function o(e,n){for(var t=0;t";return i+=e+'">',i+n+o}function d(){if(!L.k)return n(y);var e="",t=0;L.lR.lastIndex=0;for(var r=L.lR.exec(y);r;){e+=n(y.substr(t,r.index-t));var a=g(L,r);a?(B+=a[1],e+=p(a[0],n(r[0]))):e+=n(r[0]),t=L.lR.lastIndex,r=L.lR.exec(y)}return e+n(y.substr(t))}function h(){if(L.sL&&!E[L.sL])return n(y);var e=L.sL?f(L.sL,y,!0,M[L.sL]):l(y);return L.r>0&&(B+=e.r),"continuous"==L.subLanguageMode&&(M[L.sL]=e.top),p(e.language,e.value,!1,!0)}function b(){return void 0!==L.sL?h():d()}function v(e,t){var r=e.cN?p(e.cN,"",!0):"";e.rB?(k+=r,y=""):e.eB?(k+=n(t)+r,y=""):(k+=r,y=t),L=Object.create(e,{parent:{value:L}})}function m(e,t){if(y+=e,void 0===t)return k+=b(),0;var r=o(t,L);if(r)return k+=b(),v(r,t),r.rB?0:t.length;var a=u(L,t);if(a){var i=L;i.rE||i.eE||(y+=t),k+=b();do L.cN&&(k+=""),B+=L.r,L=L.parent;while(L!=a.parent);return i.eE&&(k+=n(t)),y="",a.starts&&v(a.starts,""),i.rE?0:t.length}if(c(t,L))throw new Error('Illegal lexeme "'+t+'" for mode "'+(L.cN||"")+'"');return y+=t,t.length||1}var N=w(e);if(!N)throw new Error('Unknown language: "'+e+'"');s(N);var R,L=i||N,M={},k="";for(R=L;R!=N;R=R.parent)R.cN&&(k=p(R.cN,"",!0)+k);var y="",B=0;try{for(var C,j,I=0;;){if(L.t.lastIndex=I,C=L.t.exec(t),!C)break;j=m(t.substr(I,C.index-I),C[0]),I=C.index+j}for(m(t.substr(I)),R=L;R.parent;R=R.parent)R.cN&&(k+="");return{r:B,value:k,language:e,top:L}}catch(S){if(-1!=S.message.indexOf("Illegal"))return{r:0,value:n(t)};throw S}}function l(e,t){t=t||x.languages||Object.keys(E);var r={r:0,value:n(e)},a=r;return t.forEach(function(n){if(w(n)){var t=f(n,e,!1);t.language=n,t.r>a.r&&(a=t),t.r>r.r&&(a=r,r=t)}}),a.language&&(r.second_best=a),r}function g(e){return x.tabReplace&&(e=e.replace(/^((<[^>]+>|\t)+)/gm,function(e,n){return n.replace(/\t/g,x.tabReplace)})),x.useBR&&(e=e.replace(/\n/g,"
      ")),e}function p(e,n,t){var r=n?R[n]:t,a=[e.trim()];return e.match(/\bhljs\b/)||a.push("hljs"),-1===e.indexOf(r)&&a.push(r),a.join(" ").trim()}function d(e){var n=i(e);if(!a(n)){var t;x.useBR?(t=document.createElementNS("http://www.w3.org/1999/xhtml","div"),t.innerHTML=e.innerHTML.replace(/\n/g,"").replace(//g,"\n")):t=e;var r=t.textContent,o=n?f(n,r,!0):l(r),s=u(t);if(s.length){var d=document.createElementNS("http://www.w3.org/1999/xhtml","div");d.innerHTML=o.value,o.value=c(s,u(d),r)}o.value=g(o.value),e.innerHTML=o.value,e.className=p(e.className,n,o.language),e.result={language:o.language,re:o.r},o.second_best&&(e.second_best={language:o.second_best.language,re:o.second_best.r})}}function h(e){x=o(x,e)}function b(){if(!b.called){b.called=!0;var e=document.querySelectorAll("pre code");Array.prototype.forEach.call(e,d)}}function v(){addEventListener("DOMContentLoaded",b,!1),addEventListener("load",b,!1)}function m(n,t){var r=E[n]=t(e);r.aliases&&r.aliases.forEach(function(e){R[e]=n})}function N(){return Object.keys(E)}function w(e){return E[e]||E[R[e]]}var x={classPrefix:"hljs-",tabReplace:null,useBR:!1,languages:void 0},E={},R={};return e.highlight=f,e.highlightAuto=l,e.fixMarkup=g,e.highlightBlock=d,e.configure=h,e.initHighlighting=b,e.initHighlightingOnLoad=v,e.registerLanguage=m,e.listLanguages=N,e.getLanguage=w,e.inherit=o,e.IR="[a-zA-Z]\\w*",e.UIR="[a-zA-Z_]\\w*",e.NR="\\b\\d+(\\.\\d+)?",e.CNR="\\b(0[xX][a-fA-F0-9]+|(\\d+(\\.\\d*)?|\\.\\d+)([eE][-+]?\\d+)?)",e.BNR="\\b(0b[01]+)",e.RSR="!|!=|!==|%|%=|&|&&|&=|\\*|\\*=|\\+|\\+=|,|-|-=|/=|/|:|;|<<|<<=|<=|<|===|==|=|>>>=|>>=|>=|>>>|>>|>|\\?|\\[|\\{|\\(|\\^|\\^=|\\||\\|=|\\|\\||~",e.BE={b:"\\\\[\\s\\S]",r:0},e.ASM={cN:"string",b:"'",e:"'",i:"\\n",c:[e.BE]},e.QSM={cN:"string",b:'"',e:'"',i:"\\n",c:[e.BE]},e.PWM={b:/\b(a|an|the|are|I|I'm|isn't|don't|doesn't|won't|but|just|should|pretty|simply|enough|gonna|going|wtf|so|such)\b/},e.C=function(n,t,r){var a=e.inherit({cN:"comment",b:n,e:t,c:[]},r||{});return a.c.push(e.PWM),a},e.CLCM=e.C("//","$"),e.CBCM=e.C("/\\*","\\*/"),e.HCM=e.C("#","$"),e.NM={cN:"number",b:e.NR,r:0},e.CNM={cN:"number",b:e.CNR,r:0},e.BNM={cN:"number",b:e.BNR,r:0},e.CSSNM={cN:"number",b:e.NR+"(%|em|ex|ch|rem|vw|vh|vmin|vmax|cm|mm|in|pt|pc|px|deg|grad|rad|turn|s|ms|Hz|kHz|dpi|dpcm|dppx)?",r:0},e.RM={cN:"regexp",b:/\//,e:/\/[gimuy]*/,i:/\n/,c:[e.BE,{b:/\[/,e:/\]/,r:0,c:[e.BE]}]},e.TM={cN:"title",b:e.IR,r:0},e.UTM={cN:"title",b:e.UIR,r:0},e}); \ No newline at end of file diff --git a/lib/highlight_js/assets/lang/cal.js b/lib/highlight_js/assets/lang/cal.js new file mode 100644 index 0000000000..409b3fe92d --- /dev/null +++ b/lib/highlight_js/assets/lang/cal.js @@ -0,0 +1 @@ +hljs.registerLanguage("cal",function(e){var r="div mod in and or not xor asserterror begin case do downto else end exit for if of repeat then to until while with var",t="false true",a=[e.CLCM,e.C(/\{/,/\}/,{r:0}),e.C(/\(\*/,/\*\)/,{r:10})],c={cN:"string",b:/'/,e:/'/,c:[{b:/''/}]},o={cN:"string",b:/(#\d+)+/},n={cN:"date",b:"\\b\\d+(\\.\\d+)?(DT|D|T)",r:0},i={cN:"variable",b:'"',e:'"'},d={cN:"function",bK:"procedure",e:/[:;]/,k:"procedure|10",c:[e.TM,{cN:"params",b:/\(/,e:/\)/,k:r,c:[c,o]}].concat(a)},b={cN:"class",b:"OBJECT (Table|Form|Report|Dataport|Codeunit|XMLport|MenuSuite|Page|Query) (\\d+) ([^\\r\\n]+)",rB:!0,c:[e.TM,d]};return{cI:!0,k:{keyword:r,literal:t},c:[c,o,n,i,e.NM,b,d]}}); \ No newline at end of file diff --git a/lib/highlight_js/assets/lang/clojure-repl.js b/lib/highlight_js/assets/lang/clojure-repl.js index 6d89bd2cad..0d7541d012 100644 --- a/lib/highlight_js/assets/lang/clojure-repl.js +++ b/lib/highlight_js/assets/lang/clojure-repl.js @@ -1 +1 @@ -hljs.registerLanguage("clojure-repl",function(){return{c:[{cN:"prompt",b:/^([\w.-]+|\s*#_)=>/,starts:{e:/$/,sL:"clojure",subLanguageMode:"continuous"}}]}}); \ No newline at end of file +hljs.registerLanguage("clojure-repl",function(e){return{c:[{cN:"prompt",b:/^([\w.-]+|\s*#_)=>/,starts:{e:/$/,sL:"clojure",subLanguageMode:"continuous"}}]}}); \ No newline at end of file diff --git a/lib/highlight_js/assets/lang/cpp.js b/lib/highlight_js/assets/lang/cpp.js index 67ef5a60e4..c10e19991e 100644 --- a/lib/highlight_js/assets/lang/cpp.js +++ b/lib/highlight_js/assets/lang/cpp.js @@ -1 +1 @@ -hljs.registerLanguage("cpp",function(t){var i={keyword:"false int float while private char catch export virtual operator sizeof dynamic_cast|10 typedef const_cast|10 const struct for static_cast|10 union namespace unsigned long volatile static protected bool template mutable if public friend do goto auto void enum else break extern using true class asm case typeid short reinterpret_cast|10 default double register explicit signed typename try this switch continue wchar_t inline delete alignof char16_t char32_t constexpr decltype noexcept nullptr static_assert thread_local restrict _Bool complex _Complex _Imaginary intmax_t uintmax_t int8_t uint8_t int16_t uint16_t int32_t uint32_t int64_t uint64_t int_least8_t uint_least8_t int_least16_t uint_least16_t int_least32_t uint_least32_t int_least64_t uint_least64_t int_fast8_t uint_fast8_t int_fast16_t uint_fast16_t int_fast32_t uint_fast32_t int_fast64_t uint_fast64_t intptr_t uintptr_t atomic_bool atomic_char atomic_schar atomic_uchar atomic_short atomic_ushort atomic_int atomic_uint atomic_long atomic_ulong atomic_llong atomic_ullong atomic_wchar_t atomic_char16_t atomic_char32_t atomic_intmax_t atomic_uintmax_t atomic_intptr_t atomic_uintptr_t atomic_size_t atomic_ptrdiff_t atomic_int_least8_t atomic_int_least16_t atomic_int_least32_t atomic_int_least64_t atomic_uint_least8_t atomic_uint_least16_t atomic_uint_least32_t atomic_uint_least64_t atomic_int_fast8_t atomic_int_fast16_t atomic_int_fast32_t atomic_int_fast64_t atomic_uint_fast8_t atomic_uint_fast16_t atomic_uint_fast32_t atomic_uint_fast64_t",built_in:"std string cin cout cerr clog stringstream istringstream ostringstream auto_ptr deque list queue stack vector map set bitset multiset multimap unordered_set unordered_map unordered_multiset unordered_multimap array shared_ptr abort abs acos asin atan2 atan calloc ceil cosh cos exit exp fabs floor fmod fprintf fputs free frexp fscanf isalnum isalpha iscntrl isdigit isgraph islower isprint ispunct isspace isupper isxdigit tolower toupper labs ldexp log10 log malloc memchr memcmp memcpy memset modf pow printf putchar puts scanf sinh sin snprintf sprintf sqrt sscanf strcat strchr strcmp strcpy strcspn strlen strncat strncmp strncpy strpbrk strrchr strspn strstr tanh tan vfprintf vprintf vsprintf"};return{aliases:["c","cc","h","c++","h++","hpp"],k:i,i:""]',k:"include",i:"\\n"},t.CLCM]},{b:"\\b(deque|list|queue|stack|vector|map|set|bitset|multiset|multimap|unordered_map|unordered_set|unordered_multiset|unordered_multimap|array)\\s*<",e:">",k:i,c:["self"]},{b:t.IR+"::",k:i},{bK:"new throw return else",r:0},{cN:"function",b:"("+t.IR+"\\s+)+"+t.IR+"\\s*\\(",rB:!0,e:/[{;=]/,eE:!0,k:i,c:[{b:t.IR+"\\s*\\(",rB:!0,c:[t.TM],r:0},{cN:"params",b:/\(/,e:/\)/,k:i,r:0,c:[t.CBCM]},t.CLCM,t.CBCM]}]}}); \ No newline at end of file +hljs.registerLanguage("cpp",function(t){var e={cN:"keyword",b:"[a-z\\d_]*_t"},r={keyword:"false int float while private char catch export virtual operator sizeof dynamic_cast|10 typedef const_cast|10 const struct for static_cast|10 union namespace unsigned long volatile static protected bool template mutable if public friend do goto auto void enum else break extern using true class asm case typeid short reinterpret_cast|10 default double register explicit signed typename try this switch continue inline delete alignof constexpr decltype noexcept nullptr static_assert thread_local restrict _Bool complex _Complex _Imaginary atomic_bool atomic_char atomic_schar atomic_uchar atomic_short atomic_ushort atomic_int atomic_uint atomic_long atomic_ulong atomic_llong atomic_ullong",built_in:"std string cin cout cerr clog stringstream istringstream ostringstream auto_ptr deque list queue stack vector map set bitset multiset multimap unordered_set unordered_map unordered_multiset unordered_multimap array shared_ptr abort abs acos asin atan2 atan calloc ceil cosh cos exit exp fabs floor fmod fprintf fputs free frexp fscanf isalnum isalpha iscntrl isdigit isgraph islower isprint ispunct isspace isupper isxdigit tolower toupper labs ldexp log10 log malloc memchr memcmp memcpy memset modf pow printf putchar puts scanf sinh sin snprintf sprintf sqrt sscanf strcat strchr strcmp strcpy strcspn strlen strncat strncmp strncpy strpbrk strrchr strspn strstr tanh tan vfprintf vprintf vsprintf"};return{aliases:["c","cc","h","c++","h++","hpp"],k:r,i:""]',k:"include",i:"\\n"},t.CLCM]},{b:"\\b(deque|list|queue|stack|vector|map|set|bitset|multiset|multimap|unordered_map|unordered_set|unordered_multiset|unordered_multimap|array)\\s*<",e:">",k:r,c:["self",e]},{b:t.IR+"::",k:r},{bK:"new throw return else",r:0},{cN:"function",b:"("+t.IR+"\\s+)+"+t.IR+"\\s*\\(",rB:!0,e:/[{;=]/,eE:!0,k:r,c:[{b:t.IR+"\\s*\\(",rB:!0,c:[t.TM],r:0},{cN:"params",b:/\(/,e:/\)/,k:r,r:0,c:[t.CBCM]},t.CLCM,t.CBCM]}]}}); \ No newline at end of file diff --git a/lib/highlight_js/assets/lang/cs.js b/lib/highlight_js/assets/lang/cs.js index dae456dc44..c6e09c6d60 100644 --- a/lib/highlight_js/assets/lang/cs.js +++ b/lib/highlight_js/assets/lang/cs.js @@ -1 +1 @@ -hljs.registerLanguage("cs",function(e){var r="abstract as base bool break byte case catch char checked const continue decimal dynamic default delegate do double else enum event explicit extern false finally fixed float for foreach goto if implicit in int interface internal is lock long null when object operator out override params private protected public readonly ref sbyte sealed short sizeof stackalloc static string struct switch this true try typeof uint ulong unchecked unsafe ushort using virtual volatile void while async protected public private internal ascending descending from get group into join let orderby partial select set value var where yield",t=e.IR+"(<"+e.IR+">)?";return{aliases:["csharp"],k:r,i:/::/,c:[e.C("///","$",{rB:!0,c:[{cN:"xmlDocTag",v:[{b:"///",r:0},{b:""},{b:""}]}]}),e.CLCM,e.CBCM,{cN:"preprocessor",b:"#",e:"$",k:"if else elif endif define undef warning error line region endregion pragma checksum"},{cN:"string",b:'@"',e:'"',c:[{b:'""'}]},e.ASM,e.QSM,e.CNM,{bK:"class namespace interface",e:/[{;=]/,i:/[^\s:]/,c:[e.TM,e.CLCM,e.CBCM]},{bK:"new return throw await",r:0},{cN:"function",b:"("+t+"\\s+)+"+e.IR+"\\s*\\(",rB:!0,e:/[{;=]/,eE:!0,k:r,c:[{b:e.IR+"\\s*\\(",rB:!0,c:[e.TM],r:0},{cN:"params",b:/\(/,e:/\)/,k:r,r:0,c:[e.ASM,e.QSM,e.CNM,e.CBCM]},e.CLCM,e.CBCM]}]}}); \ No newline at end of file +hljs.registerLanguage("cs",function(e){var r="abstract as base bool break byte case catch char checked const continue decimal dynamic default delegate do double else enum event explicit extern false finally fixed float for foreach goto if implicit in int interface internal is lock long null when object operator out override params private protected public readonly ref sbyte sealed short sizeof stackalloc static string struct switch this true try typeof uint ulong unchecked unsafe ushort using virtual volatile void while async protected public private internal ascending descending from get group into join let orderby partial select set value var where yield",t=e.IR+"(<"+e.IR+">)?";return{aliases:["csharp"],k:r,i:/::/,c:[e.C("///","$",{rB:!0,c:[{cN:"xmlDocTag",v:[{b:"///",r:0},{b:""},{b:""}]}]}),e.CLCM,e.CBCM,{cN:"preprocessor",b:"#",e:"$",k:"if else elif endif define undef warning error line region endregion pragma checksum"},{cN:"string",b:'@"',e:'"',c:[{b:'""'}]},e.ASM,e.QSM,e.CNM,{bK:"class interface",e:/[{;=]/,i:/[^\s:]/,c:[e.TM,e.CLCM,e.CBCM]},{bK:"namespace",e:/[{;=]/,i:/[^\s:]/,c:[{cN:"title",b:"[a-zA-Z](\\.?\\w)*",r:0},e.CLCM,e.CBCM]},{bK:"new return throw await",r:0},{cN:"function",b:"("+t+"\\s+)+"+e.IR+"\\s*\\(",rB:!0,e:/[{;=]/,eE:!0,k:r,c:[{b:e.IR+"\\s*\\(",rB:!0,c:[e.TM],r:0},{cN:"params",b:/\(/,e:/\)/,eB:!0,eE:!0,k:r,r:0,c:[e.ASM,e.QSM,e.CNM,e.CBCM]},e.CLCM,e.CBCM]}]}}); \ No newline at end of file diff --git a/lib/highlight_js/assets/lang/css.js b/lib/highlight_js/assets/lang/css.js index 08ab217234..eba92b40dc 100644 --- a/lib/highlight_js/assets/lang/css.js +++ b/lib/highlight_js/assets/lang/css.js @@ -1 +1 @@ -hljs.registerLanguage("css",function(e){var c="[a-zA-Z-][a-zA-Z0-9_-]*",a={cN:"function",b:c+"\\(",rB:!0,eE:!0,e:"\\("};return{cI:!0,i:"[=/|']",c:[e.CBCM,{cN:"id",b:"\\#[A-Za-z0-9_-]+"},{cN:"class",b:"\\.[A-Za-z0-9_-]+",r:0},{cN:"attr_selector",b:"\\[",e:"\\]",i:"$"},{cN:"pseudo",b:":(:)?[a-zA-Z0-9\\_\\-\\+\\(\\)\\\"\\']+"},{cN:"at_rule",b:"@(font-face|page)",l:"[a-z-]+",k:"font-face page"},{cN:"at_rule",b:"@",e:"[{;]",c:[{cN:"keyword",b:/\S+/},{b:/\s/,eW:!0,eE:!0,r:0,c:[a,e.ASM,e.QSM,e.CSSNM]}]},{cN:"tag",b:c,r:0},{cN:"rules",b:"{",e:"}",i:"[^\\s]",r:0,c:[e.CBCM,{cN:"rule",b:"[^\\s]",rB:!0,e:";",eW:!0,c:[{cN:"attribute",b:"[A-Z\\_\\.\\-]+",e:":",eE:!0,i:"[^\\s]",starts:{cN:"value",eW:!0,eE:!0,c:[a,e.CSSNM,e.QSM,e.ASM,e.CBCM,{cN:"hexcolor",b:"#[0-9A-Fa-f]+"},{cN:"important",b:"!important"}]}}]}]}]}}); \ No newline at end of file +hljs.registerLanguage("css",function(e){var c="[a-zA-Z-][a-zA-Z0-9_-]*",a={cN:"function",b:c+"\\(",rB:!0,eE:!0,e:"\\("},r={cN:"rule",b:/[A-Z\_\.\-]+\s*:/,rB:!0,e:";",eW:!0,c:[{cN:"attribute",b:/\S/,e:":",eE:!0,starts:{cN:"value",eW:!0,eE:!0,c:[a,e.CSSNM,e.QSM,e.ASM,e.CBCM,{cN:"hexcolor",b:"#[0-9A-Fa-f]+"},{cN:"important",b:"!important"}]}}]};return{cI:!0,i:/[=\/|']/,c:[e.CBCM,r,{cN:"id",b:/\#[A-Za-z0-9_-]+/},{cN:"class",b:/\.[A-Za-z0-9_-]+/,r:0},{cN:"attr_selector",b:/\[/,e:/\]/,i:"$"},{cN:"pseudo",b:/:(:)?[a-zA-Z0-9\_\-\+\(\)"']+/},{cN:"at_rule",b:"@(font-face|page)",l:"[a-z-]+",k:"font-face page"},{cN:"at_rule",b:"@",e:"[{;]",c:[{cN:"keyword",b:/\S+/},{b:/\s/,eW:!0,eE:!0,r:0,c:[a,e.ASM,e.QSM,e.CSSNM]}]},{cN:"tag",b:c,r:0},{cN:"rules",b:"{",e:"}",i:/\S/,r:0,c:[e.CBCM,r]}]}}); \ No newline at end of file diff --git a/lib/highlight_js/assets/lang/diff.js b/lib/highlight_js/assets/lang/diff.js index c2102c9adb..bbc14301e4 100644 --- a/lib/highlight_js/assets/lang/diff.js +++ b/lib/highlight_js/assets/lang/diff.js @@ -1 +1 @@ -hljs.registerLanguage("diff",function(){return{aliases:["patch"],c:[{cN:"chunk",r:10,v:[{b:/^@@ +\-\d+,\d+ +\+\d+,\d+ +@@$/},{b:/^\*\*\* +\d+,\d+ +\*\*\*\*$/},{b:/^\-\-\- +\d+,\d+ +\-\-\-\-$/}]},{cN:"header",v:[{b:/Index: /,e:/$/},{b:/=====/,e:/=====$/},{b:/^\-\-\-/,e:/$/},{b:/^\*{3} /,e:/$/},{b:/^\+\+\+/,e:/$/},{b:/\*{5}/,e:/\*{5}$/}]},{cN:"addition",b:"^\\+",e:"$"},{cN:"deletion",b:"^\\-",e:"$"},{cN:"change",b:"^\\!",e:"$"}]}}); \ No newline at end of file +hljs.registerLanguage("diff",function(e){return{aliases:["patch"],c:[{cN:"chunk",r:10,v:[{b:/^@@ +\-\d+,\d+ +\+\d+,\d+ +@@$/},{b:/^\*\*\* +\d+,\d+ +\*\*\*\*$/},{b:/^\-\-\- +\d+,\d+ +\-\-\-\-$/}]},{cN:"header",v:[{b:/Index: /,e:/$/},{b:/=====/,e:/=====$/},{b:/^\-\-\-/,e:/$/},{b:/^\*{3} /,e:/$/},{b:/^\+\+\+/,e:/$/},{b:/\*{5}/,e:/\*{5}$/}]},{cN:"addition",b:"^\\+",e:"$"},{cN:"deletion",b:"^\\-",e:"$"},{cN:"change",b:"^\\!",e:"$"}]}}); \ No newline at end of file diff --git a/lib/highlight_js/assets/lang/dust.js b/lib/highlight_js/assets/lang/dust.js index dc98b882e9..a5503261a7 100644 --- a/lib/highlight_js/assets/lang/dust.js +++ b/lib/highlight_js/assets/lang/dust.js @@ -1 +1 @@ -hljs.registerLanguage("dust",function(){var e="if eq ne lt lte gt gte select default math sep";return{aliases:["dst"],cI:!0,sL:"xml",subLanguageMode:"continuous",c:[{cN:"expression",b:"{",e:"}",r:0,c:[{cN:"begin-block",b:"#[a-zA-Z- .]+",k:e},{cN:"string",b:'"',e:'"'},{cN:"end-block",b:"\\/[a-zA-Z- .]+",k:e},{cN:"variable",b:"[a-zA-Z-.]+",k:e,r:0}]}]}}); \ No newline at end of file +hljs.registerLanguage("dust",function(e){var a="if eq ne lt lte gt gte select default math sep";return{aliases:["dst"],cI:!0,sL:"xml",subLanguageMode:"continuous",c:[{cN:"expression",b:"{",e:"}",r:0,c:[{cN:"begin-block",b:"#[a-zA-Z- .]+",k:a},{cN:"string",b:'"',e:'"'},{cN:"end-block",b:"\\/[a-zA-Z- .]+",k:a},{cN:"variable",b:"[a-zA-Z-.]+",k:a,r:0}]}]}}); \ No newline at end of file diff --git a/lib/highlight_js/assets/lang/elixir.js b/lib/highlight_js/assets/lang/elixir.js index 06827aa027..4e8f54cab3 100644 --- a/lib/highlight_js/assets/lang/elixir.js +++ b/lib/highlight_js/assets/lang/elixir.js @@ -1 +1 @@ -hljs.registerLanguage("elixir",function(e){var r="[a-zA-Z_][a-zA-Z0-9_]*(\\!|\\?)?",b="[a-zA-Z_]\\w*[!?=]?|[-+~]\\@|<<|>>|=~|===?|<=>|[<>]=?|\\*\\*|[-/+%^&*~`|]|\\[\\]=?",n="and false then defined module in return redo retry end for true self when next until do begin unless nil break not case cond alias while ensure or include use alias fn quote",c={cN:"subst",b:"#\\{",e:"}",l:r,k:n},a={cN:"string",c:[e.BE,c],v:[{b:/'/,e:/'/},{b:/"/,e:/"/}]},s={eW:!0,rE:!0,l:r,k:n,r:0},i={cN:"function",bK:"def defp defmacro",e:/\bdo\b/,c:[e.inherit(e.TM,{b:b,starts:s})]},l=e.inherit(i,{cN:"class",bK:"defmodule defrecord",e:/\bdo\b|$|;/}),t=[a,e.HCM,l,i,{cN:"constant",b:"(\\b[A-Z_]\\w*(.)?)+",r:0},{cN:"symbol",b:":",c:[a,{b:b}],r:0},{cN:"symbol",b:r+":",r:0},{cN:"number",b:"(\\b0[0-7_]+)|(\\b0x[0-9a-fA-F_]+)|(\\b[1-9][0-9_]*(\\.[0-9_]+)?)|[0_]\\b",r:0},{cN:"variable",b:"(\\$\\W)|((\\$|\\@\\@?)(\\w+))"},{b:"->"},{b:"("+e.RSR+")\\s*",c:[e.HCM,{cN:"regexp",i:"\\n",c:[e.BE,c],v:[{b:"/",e:"/[a-z]*"},{b:"%r\\[",e:"\\][a-z]*"}]}],r:0}];return c.c=t,s.c=t,{l:r,k:n,c:t}}); \ No newline at end of file +hljs.registerLanguage("elixir",function(e){var n="[a-zA-Z_][a-zA-Z0-9_]*(\\!|\\?)?",r="[a-zA-Z_]\\w*[!?=]?|[-+~]\\@|<<|>>|=~|===?|<=>|[<>]=?|\\*\\*|[-/+%^&*~`|]|\\[\\]=?",b="and false then defined module in return redo retry end for true self when next until do begin unless nil break not case cond alias while ensure or include use alias fn quote",c={cN:"subst",b:"#\\{",e:"}",l:n,k:b},a={cN:"string",c:[e.BE,c],v:[{b:/'/,e:/'/},{b:/"/,e:/"/}]},i={cN:"function",bK:"def defp defmacro",e:/\B\b/,c:[e.inherit(e.TM,{b:n,endsParent:!0})]},s=e.inherit(i,{cN:"class",bK:"defmodule defrecord",e:/\bdo\b|$|;/}),l=[a,e.HCM,s,i,{cN:"constant",b:"(\\b[A-Z_]\\w*(.)?)+",r:0},{cN:"symbol",b:":",c:[a,{b:r}],r:0},{cN:"symbol",b:n+":",r:0},{cN:"number",b:"(\\b0[0-7_]+)|(\\b0x[0-9a-fA-F_]+)|(\\b[1-9][0-9_]*(\\.[0-9_]+)?)|[0_]\\b",r:0},{cN:"variable",b:"(\\$\\W)|((\\$|\\@\\@?)(\\w+))"},{b:"->"},{b:"("+e.RSR+")\\s*",c:[e.HCM,{cN:"regexp",i:"\\n",c:[e.BE,c],v:[{b:"/",e:"/[a-z]*"},{b:"%r\\[",e:"\\][a-z]*"}]}],r:0}];return c.c=l,{l:n,k:b,c:l}}); \ No newline at end of file diff --git a/lib/highlight_js/assets/lang/fix.js b/lib/highlight_js/assets/lang/fix.js index 0da7d375da..042d23b15d 100644 --- a/lib/highlight_js/assets/lang/fix.js +++ b/lib/highlight_js/assets/lang/fix.js @@ -1 +1 @@ -hljs.registerLanguage("fix",function(){return{c:[{b:/[^\u2401\u0001]+/,e:/[\u2401\u0001]/,eE:!0,rB:!0,rE:!1,c:[{b:/([^\u2401\u0001=]+)/,e:/=([^\u2401\u0001=]+)/,rE:!0,rB:!1,cN:"attribute"},{b:/=/,e:/([\u2401\u0001])/,eE:!0,eB:!0,cN:"string"}]}],cI:!0}}); \ No newline at end of file +hljs.registerLanguage("fix",function(u){return{c:[{b:/[^\u2401\u0001]+/,e:/[\u2401\u0001]/,eE:!0,rB:!0,rE:!1,c:[{b:/([^\u2401\u0001=]+)/,e:/=([^\u2401\u0001=]+)/,rE:!0,rB:!1,cN:"attribute"},{b:/=/,e:/([\u2401\u0001])/,eE:!0,eB:!0,cN:"string"}]}],cI:!0}}); \ No newline at end of file diff --git a/lib/highlight_js/assets/lang/haml.js b/lib/highlight_js/assets/lang/haml.js index b6b7cc8421..faa9c3babb 100644 --- a/lib/highlight_js/assets/lang/haml.js +++ b/lib/highlight_js/assets/lang/haml.js @@ -1 +1 @@ -hljs.registerLanguage("haml",function(s){return{cI:!0,c:[{cN:"doctype",b:"^!!!( (5|1\\.1|Strict|Frameset|Basic|Mobile|RDFa|XML\\b.*))?$",r:10},s.C("^\\s*(!=#|=#|-#|/).*$",!1,{r:0}),{b:"^\\s*(-|=|!=)(?!#)",starts:{e:"\\n",sL:"ruby"}},{cN:"tag",b:"^\\s*%",c:[{cN:"title",b:"\\w+"},{cN:"value",b:"[#\\.]\\w+"},{b:"{\\s*",e:"\\s*}",eE:!0,c:[{b:":\\w+\\s*=>",e:",\\s+",rB:!0,eW:!0,c:[{cN:"symbol",b:":\\w+"},{cN:"string",b:'"',e:'"'},{cN:"string",b:"'",e:"'"},{b:"\\w+",r:0}]}]},{b:"\\(\\s*",e:"\\s*\\)",eE:!0,c:[{b:"\\w+\\s*=",e:"\\s+",rB:!0,eW:!0,c:[{cN:"attribute",b:"\\w+",r:0},{cN:"string",b:'"',e:'"'},{cN:"string",b:"'",e:"'"},{b:"\\w+",r:0}]}]}]},{cN:"bullet",b:"^\\s*[=~]\\s*",r:0},{b:"#{",starts:{e:"}",sL:"ruby"}}]}}); \ No newline at end of file +hljs.registerLanguage("haml",function(s){return{cI:!0,c:[{cN:"doctype",b:"^!!!( (5|1\\.1|Strict|Frameset|Basic|Mobile|RDFa|XML\\b.*))?$",r:10},s.C("^\\s*(!=#|=#|-#|/).*$",!1,{r:0}),{b:"^\\s*(-|=|!=)(?!#)",starts:{e:"\\n",sL:"ruby"}},{cN:"tag",b:"^\\s*%",c:[{cN:"title",b:"\\w+"},{cN:"value",b:"[#\\.][\\w-]+"},{b:"{\\s*",e:"\\s*}",eE:!0,c:[{b:":\\w+\\s*=>",e:",\\s+",rB:!0,eW:!0,c:[{cN:"symbol",b:":\\w+"},s.ASM,s.QSM,{b:"\\w+",r:0}]}]},{b:"\\(\\s*",e:"\\s*\\)",eE:!0,c:[{b:"\\w+\\s*=",e:"\\s+",rB:!0,eW:!0,c:[{cN:"attribute",b:"\\w+",r:0},s.ASM,s.QSM,{b:"\\w+",r:0}]}]}]},{cN:"bullet",b:"^\\s*[=~]\\s*",r:0},{b:"#{",starts:{e:"}",sL:"ruby"}}]}}); \ No newline at end of file diff --git a/lib/highlight_js/assets/lang/handlebars.js b/lib/highlight_js/assets/lang/handlebars.js index 21387ac325..ca5655c621 100644 --- a/lib/highlight_js/assets/lang/handlebars.js +++ b/lib/highlight_js/assets/lang/handlebars.js @@ -1 +1 @@ -hljs.registerLanguage("handlebars",function(){var e="each in with if else unless bindattr action collection debugger log outlet template unbound view yield";return{aliases:["hbs","html.hbs","html.handlebars"],cI:!0,sL:"xml",subLanguageMode:"continuous",c:[{cN:"expression",b:"{{",e:"}}",c:[{cN:"begin-block",b:"#[a-zA-Z- .]+",k:e},{cN:"string",b:'"',e:'"'},{cN:"end-block",b:"\\/[a-zA-Z- .]+",k:e},{cN:"variable",b:"[a-zA-Z-.]+",k:e}]}]}}); \ No newline at end of file +hljs.registerLanguage("handlebars",function(e){var a="each in with if else unless bindattr action collection debugger log outlet template unbound view yield";return{aliases:["hbs","html.hbs","html.handlebars"],cI:!0,sL:"xml",subLanguageMode:"continuous",c:[{cN:"expression",b:"{{",e:"}}",c:[{cN:"begin-block",b:"#[a-zA-Z- .]+",k:a},{cN:"string",b:'"',e:'"'},{cN:"end-block",b:"\\/[a-zA-Z- .]+",k:a},{cN:"variable",b:"[a-zA-Z-.]+",k:a}]}]}}); \ No newline at end of file diff --git a/lib/highlight_js/assets/lang/http.js b/lib/highlight_js/assets/lang/http.js index 0322887205..ad06182a84 100644 --- a/lib/highlight_js/assets/lang/http.js +++ b/lib/highlight_js/assets/lang/http.js @@ -1 +1 @@ -hljs.registerLanguage("http",function(){return{aliases:["https"],i:"\\S",c:[{cN:"status",b:"^HTTP/[0-9\\.]+",e:"$",c:[{cN:"number",b:"\\b\\d{3}\\b"}]},{cN:"request",b:"^[A-Z]+ (.*?) HTTP/[0-9\\.]+$",rB:!0,e:"$",c:[{cN:"string",b:" ",e:" ",eB:!0,eE:!0}]},{cN:"attribute",b:"^\\w",e:": ",eE:!0,i:"\\n|\\s|=",starts:{cN:"string",e:"$"}},{b:"\\n\\n",starts:{sL:"",eW:!0}}]}}); \ No newline at end of file +hljs.registerLanguage("http",function(t){return{aliases:["https"],i:"\\S",c:[{cN:"status",b:"^HTTP/[0-9\\.]+",e:"$",c:[{cN:"number",b:"\\b\\d{3}\\b"}]},{cN:"request",b:"^[A-Z]+ (.*?) HTTP/[0-9\\.]+$",rB:!0,e:"$",c:[{cN:"string",b:" ",e:" ",eB:!0,eE:!0}]},{cN:"attribute",b:"^\\w",e:": ",eE:!0,i:"\\n|\\s|=",starts:{cN:"string",e:"$"}},{b:"\\n\\n",starts:{sL:"",eW:!0}}]}}); \ No newline at end of file diff --git a/lib/highlight_js/assets/lang/javascript.js b/lib/highlight_js/assets/lang/javascript.js index a06bc721c1..ed9320fb7e 100644 --- a/lib/highlight_js/assets/lang/javascript.js +++ b/lib/highlight_js/assets/lang/javascript.js @@ -1 +1 @@ -hljs.registerLanguage("javascript",function(e){return{aliases:["js"],k:{keyword:"in of if for while finally var new function do return void else break catch instanceof with throw case default try this switch continue typeof delete let yield const export super debugger as",literal:"true false null undefined NaN Infinity",built_in:"eval isFinite isNaN parseFloat parseInt decodeURI decodeURIComponent encodeURI encodeURIComponent escape unescape Object Function Boolean Error EvalError InternalError RangeError ReferenceError StopIteration SyntaxError TypeError URIError Number Math Date String RegExp Array Float32Array Float64Array Int16Array Int32Array Int8Array Uint16Array Uint32Array Uint8Array Uint8ClampedArray ArrayBuffer DataView JSON Intl arguments require module console window document Symbol Set Map WeakSet WeakMap Proxy Reflect Promise"},c:[{cN:"pi",r:10,v:[{b:/^\s*('|")use strict('|")/},{b:/^\s*('|")use asm('|")/}]},e.ASM,e.QSM,{cN:"string",b:"`",e:"`",c:[e.BE,{cN:"subst",b:"\\$\\{",e:"\\}"}]},e.CLCM,e.CBCM,{cN:"number",b:"\\b(0[xXbBoO][a-fA-F0-9]+|(\\d+(\\.\\d*)?|\\.\\d+)([eE][-+]?\\d+)?)",r:0},{b:"("+e.RSR+"|\\b(case|return|throw)\\b)\\s*",k:"return throw case",c:[e.CLCM,e.CBCM,e.RM,{b:/\s*[);\]]/,r:0,sL:"xml"}],r:0},{cN:"function",bK:"function",e:/\{/,eE:!0,c:[e.inherit(e.TM,{b:/[A-Za-z$_][0-9A-Za-z$_]*/}),{cN:"params",b:/\(/,e:/\)/,c:[e.CLCM,e.CBCM],i:/["'\(]/}],i:/\[|%/},{b:/\$[(.]/},{b:"\\."+e.IR,r:0},{bK:"import",e:"[;$]",k:"import from as",c:[e.ASM,e.QSM]},{cN:"class",bK:"class",e:/[{;=]/,eE:!0,i:/[:"\[\]]/,c:[{bK:"extends"},e.UTM]}]}}); \ No newline at end of file +hljs.registerLanguage("javascript",function(e){return{aliases:["js"],k:{keyword:"in of if for while finally var new function do return void else break catch instanceof with throw case default try this switch continue typeof delete let yield const export super debugger as async await",literal:"true false null undefined NaN Infinity",built_in:"eval isFinite isNaN parseFloat parseInt decodeURI decodeURIComponent encodeURI encodeURIComponent escape unescape Object Function Boolean Error EvalError InternalError RangeError ReferenceError StopIteration SyntaxError TypeError URIError Number Math Date String RegExp Array Float32Array Float64Array Int16Array Int32Array Int8Array Uint16Array Uint32Array Uint8Array Uint8ClampedArray ArrayBuffer DataView JSON Intl arguments require module console window document Symbol Set Map WeakSet WeakMap Proxy Reflect Promise"},c:[{cN:"pi",r:10,v:[{b:/^\s*('|")use strict('|")/},{b:/^\s*('|")use asm('|")/}]},e.ASM,e.QSM,{cN:"string",b:"`",e:"`",c:[e.BE,{cN:"subst",b:"\\$\\{",e:"\\}"}]},e.CLCM,e.CBCM,{cN:"number",b:"\\b(0[xXbBoO][a-fA-F0-9]+|(\\d+(\\.\\d*)?|\\.\\d+)([eE][-+]?\\d+)?)",r:0},{b:"("+e.RSR+"|\\b(case|return|throw)\\b)\\s*",k:"return throw case",c:[e.CLCM,e.CBCM,e.RM,{b:/\s*[);\]]/,r:0,sL:"xml"}],r:0},{cN:"function",bK:"function",e:/\{/,eE:!0,c:[e.inherit(e.TM,{b:/[A-Za-z$_][0-9A-Za-z$_]*/}),{cN:"params",b:/\(/,e:/\)/,eB:!0,eE:!0,c:[e.CLCM,e.CBCM],i:/["'\(]/}],i:/\[|%/},{b:/\$[(.]/},{b:"\\."+e.IR,r:0},{bK:"import",e:"[;$]",k:"import from as",c:[e.ASM,e.QSM]},{cN:"class",bK:"class",e:/[{;=]/,eE:!0,i:/[:"\[\]]/,c:[{bK:"extends"},e.UTM]}]}}); \ No newline at end of file diff --git a/lib/highlight_js/assets/lang/kotlin.js b/lib/highlight_js/assets/lang/kotlin.js new file mode 100644 index 0000000000..237d7270c1 --- /dev/null +++ b/lib/highlight_js/assets/lang/kotlin.js @@ -0,0 +1 @@ +hljs.registerLanguage("kotlin",function(e){var a="val var get set class trait object public open private protected final enum if else do while for when break continue throw try catch finally import package is as in return fun override default companion reified inline volatile transient native";return{k:{typename:"Byte Short Char Int Long Boolean Float Double Void Unit Nothing",literal:"true false null",keyword:a},c:[e.CLCM,{cN:"javadoc",b:"/\\*\\*",e:"\\*//*",r:0,c:[{cN:"javadoctag",b:"(^|\\s)@[A-Za-z]+"}]},e.CBCM,{cN:"type",b://,rB:!0,eE:!1,r:0},{cN:"function",bK:"fun",e:"[(]|$",rB:!0,eE:!0,k:a,i:/fun\s+(<.*>)?[^\s\(]+(\s+[^\s\(]+)\s*=/,r:5,c:[{b:e.UIR+"\\s*\\(",rB:!0,r:0,c:[e.UTM]},{cN:"type",b://,k:"reified",r:0},{cN:"params",b:/\(/,e:/\)/,k:a,r:0,i:/\([^\(,\s:]+,/,c:[{cN:"typename",b:/:\s*/,e:/\s*[=\)]/,eB:!0,rE:!0,r:0}]},e.CLCM,e.CBCM]},{cN:"class",bK:"class trait",e:/[:\{(]|$/,eE:!0,i:"extends implements",c:[e.UTM,{cN:"type",b://,eB:!0,eE:!0,r:0},{cN:"typename",b:/[,:]\s*/,e:/[<\(,]|$/,eB:!0,rE:!0}]},{cN:"variable",bK:"var val",e:/\s*[=:$]/,eE:!0},e.QSM,{cN:"shebang",b:"^#!/usr/bin/env",e:"$",i:"\n"},e.CNM]}}); \ No newline at end of file diff --git a/lib/highlight_js/assets/lang/lisp.js b/lib/highlight_js/assets/lang/lisp.js index ca9b5814e8..0338f37ca1 100644 --- a/lib/highlight_js/assets/lang/lisp.js +++ b/lib/highlight_js/assets/lang/lisp.js @@ -1 +1 @@ -hljs.registerLanguage("lisp",function(e){var b="[a-zA-Z_\\-\\+\\*\\/\\<\\=\\>\\&\\#][a-zA-Z0-9_\\-\\+\\*\\/\\<\\=\\>\\&\\#!]*",c="\\|[^]*?\\|",r="(\\-|\\+)?\\d+(\\.\\d+|\\/\\d+)?((d|e|f|l|s)(\\+|\\-)?\\d+)?",a={cN:"shebang",b:"^#!",e:"$"},i={cN:"literal",b:"\\b(t{1}|nil)\\b"},l={cN:"number",v:[{b:r,r:0},{b:"#b[0-1]+(/[0-1]+)?"},{b:"#o[0-7]+(/[0-7]+)?"},{b:"#x[0-9a-f]+(/[0-9a-f]+)?"},{b:"#c\\("+r+" +"+r,e:"\\)"}]},t=e.inherit(e.QSM,{i:null}),d=e.C(";","$",{r:0}),n={cN:"variable",b:"\\*",e:"\\*"},u={cN:"keyword",b:"[:&]"+b},N={b:c},o={b:"\\(",e:"\\)",c:["self",i,t,l]},s={cN:"quoted",c:[l,t,n,u,o],v:[{b:"['`]\\(",e:"\\)"},{b:"\\(quote ",e:"\\)",k:"quote"},{b:"'"+c}]},f={cN:"quoted",b:"'"+b},v={cN:"list",b:"\\(",e:"\\)"},g={eW:!0,r:0};return v.c=[{cN:"keyword",v:[{b:b},{b:c}]},g],g.c=[s,f,v,i,l,t,d,n,u,N],{i:/\S/,c:[l,a,i,t,d,s,f,v]}}); \ No newline at end of file +hljs.registerLanguage("lisp",function(b){var e="[a-zA-Z_\\-\\+\\*\\/\\<\\=\\>\\&\\#][a-zA-Z0-9_\\-\\+\\*\\/\\<\\=\\>\\&\\#!]*",c="\\|[^]*?\\|",r="(\\-|\\+)?\\d+(\\.\\d+|\\/\\d+)?((d|e|f|l|s|D|E|F|L|S)(\\+|\\-)?\\d+)?",a={cN:"shebang",b:"^#!",e:"$"},i={cN:"literal",b:"\\b(t{1}|nil)\\b"},l={cN:"number",v:[{b:r,r:0},{b:"#(b|B)[0-1]+(/[0-1]+)?"},{b:"#(o|O)[0-7]+(/[0-7]+)?"},{b:"#(x|X)[0-9a-fA-F]+(/[0-9a-fA-F]+)?"},{b:"#(c|C)\\("+r+" +"+r,e:"\\)"}]},t=b.inherit(b.QSM,{i:null}),d=b.C(";","$",{r:0}),n={cN:"variable",b:"\\*",e:"\\*"},u={cN:"keyword",b:"[:&]"+e},N={b:e,r:0},o={b:c},s={b:"\\(",e:"\\)",c:["self",i,t,l,N]},v={cN:"quoted",c:[l,t,n,u,s,N],v:[{b:"['`]\\(",e:"\\)"},{b:"\\(quote ",e:"\\)",k:"quote"},{b:"'"+c}]},f={cN:"quoted",v:[{b:"'"+e},{b:"#'"+e+"(::"+e+")*"}]},g={cN:"list",b:"\\(\\s*",e:"\\)"},q={eW:!0,r:0};return g.c=[{cN:"keyword",v:[{b:e},{b:c}]},q],q.c=[v,f,g,i,l,t,d,n,u,o,N],{i:/\S/,c:[l,a,i,t,d,v,f,g,N]}}); \ No newline at end of file diff --git a/lib/highlight_js/assets/lang/markdown.js b/lib/highlight_js/assets/lang/markdown.js index 521ab6f751..765a55c030 100644 --- a/lib/highlight_js/assets/lang/markdown.js +++ b/lib/highlight_js/assets/lang/markdown.js @@ -1 +1 @@ -hljs.registerLanguage("markdown",function(){return{aliases:["md","mkdown","mkd"],c:[{cN:"header",v:[{b:"^#{1,6}",e:"$"},{b:"^.+?\\n[=-]{2,}$"}]},{b:"<",e:">",sL:"xml",r:0},{cN:"bullet",b:"^([*+-]|(\\d+\\.))\\s+"},{cN:"strong",b:"[*_]{2}.+?[*_]{2}"},{cN:"emphasis",v:[{b:"\\*.+?\\*"},{b:"_.+?_",r:0}]},{cN:"blockquote",b:"^>\\s+",e:"$"},{cN:"code",v:[{b:"`.+?`"},{b:"^( {4}| )",e:"$",r:0}]},{cN:"horizontal_rule",b:"^[-\\*]{3,}",e:"$"},{b:"\\[.+?\\][\\(\\[].*?[\\)\\]]",rB:!0,c:[{cN:"link_label",b:"\\[",e:"\\]",eB:!0,rE:!0,r:0},{cN:"link_url",b:"\\]\\(",e:"\\)",eB:!0,eE:!0},{cN:"link_reference",b:"\\]\\[",e:"\\]",eB:!0,eE:!0}],r:10},{b:"^\\[.+\\]:",rB:!0,c:[{cN:"link_reference",b:"\\[",e:"\\]:",eB:!0,eE:!0,starts:{cN:"link_url",e:"$"}}]}]}}); \ No newline at end of file +hljs.registerLanguage("markdown",function(e){return{aliases:["md","mkdown","mkd"],c:[{cN:"header",v:[{b:"^#{1,6}",e:"$"},{b:"^.+?\\n[=-]{2,}$"}]},{b:"<",e:">",sL:"xml",r:0},{cN:"bullet",b:"^([*+-]|(\\d+\\.))\\s+"},{cN:"strong",b:"[*_]{2}.+?[*_]{2}"},{cN:"emphasis",v:[{b:"\\*.+?\\*"},{b:"_.+?_",r:0}]},{cN:"blockquote",b:"^>\\s+",e:"$"},{cN:"code",v:[{b:"`.+?`"},{b:"^( {4}| )",e:"$",r:0}]},{cN:"horizontal_rule",b:"^[-\\*]{3,}",e:"$"},{b:"\\[.+?\\][\\(\\[].*?[\\)\\]]",rB:!0,c:[{cN:"link_label",b:"\\[",e:"\\]",eB:!0,rE:!0,r:0},{cN:"link_url",b:"\\]\\(",e:"\\)",eB:!0,eE:!0},{cN:"link_reference",b:"\\]\\[",e:"\\]",eB:!0,eE:!0}],r:10},{b:"^\\[.+\\]:",rB:!0,c:[{cN:"link_reference",b:"\\[",e:"\\]:",eB:!0,eE:!0,starts:{cN:"link_url",e:"$"}}]}]}}); \ No newline at end of file diff --git a/lib/highlight_js/assets/lang/prolog.js b/lib/highlight_js/assets/lang/prolog.js new file mode 100644 index 0000000000..bf53b52dd1 --- /dev/null +++ b/lib/highlight_js/assets/lang/prolog.js @@ -0,0 +1 @@ +hljs.registerLanguage("prolog",function(c){var r={cN:"atom",b:/[a-z][A-Za-z0-9_]*/,r:0},b={cN:"name",v:[{b:/[A-Z][a-zA-Z0-9_]*/},{b:/_[A-Za-z0-9_]*/}],r:0},a={b:/\(/,e:/\)/,r:0},e={b:/\[/,e:/\]/},n={cN:"comment",b:/%/,e:/$/,c:[c.PWM]},t={cN:"string",b:/`/,e:/`/,c:[c.BE]},g={cN:"string",b:/0\'(\\\'|.)/},N={cN:"string",b:/0\'\\s/},o={b:/:-/},s=[r,b,a,o,e,n,c.CBCM,c.QSM,c.ASM,t,g,N,c.CNM];return a.c=s,e.c=s,{c:s.concat([{b:/\.$/}])}}); \ No newline at end of file diff --git a/lib/highlight_js/assets/lang/python.js b/lib/highlight_js/assets/lang/python.js index 6547de692c..d3dd86c985 100644 --- a/lib/highlight_js/assets/lang/python.js +++ b/lib/highlight_js/assets/lang/python.js @@ -1 +1 @@ -hljs.registerLanguage("python",function(e){var r={cN:"prompt",b:/^(>>>|\.\.\.) /},b={cN:"string",c:[e.BE],v:[{b:/(u|b)?r?'''/,e:/'''/,c:[r],r:10},{b:/(u|b)?r?"""/,e:/"""/,c:[r],r:10},{b:/(u|r|ur)'/,e:/'/,r:10},{b:/(u|r|ur)"/,e:/"/,r:10},{b:/(b|br)'/,e:/'/},{b:/(b|br)"/,e:/"/},e.ASM,e.QSM]},l={cN:"number",r:0,v:[{b:e.BNR+"[lLjJ]?"},{b:"\\b(0o[0-7]+)[lLjJ]?"},{b:e.CNR+"[lLjJ]?"}]},c={cN:"params",b:/\(/,e:/\)/,c:["self",r,l,b]};return{aliases:["py","gyp"],k:{keyword:"and elif is global as in if from raise for except finally print import pass return exec else break not with class assert yield try while continue del or def lambda nonlocal|10 None True False",built_in:"Ellipsis NotImplemented"},i:/(<\/|->|\?)/,c:[r,l,b,e.HCM,{v:[{cN:"function",bK:"def",r:10},{cN:"class",bK:"class"}],e:/:/,i:/[${=;\n]/,c:[e.UTM,c]},{cN:"decorator",b:/@/,e:/$/},{b:/\b(print|exec)\(/}]}}); \ No newline at end of file +hljs.registerLanguage("python",function(e){var r={cN:"prompt",b:/^(>>>|\.\.\.) /},b={cN:"string",c:[e.BE],v:[{b:/(u|b)?r?'''/,e:/'''/,c:[r],r:10},{b:/(u|b)?r?"""/,e:/"""/,c:[r],r:10},{b:/(u|r|ur)'/,e:/'/,r:10},{b:/(u|r|ur)"/,e:/"/,r:10},{b:/(b|br)'/,e:/'/},{b:/(b|br)"/,e:/"/},e.ASM,e.QSM]},l={cN:"number",r:0,v:[{b:e.BNR+"[lLjJ]?"},{b:"\\b(0o[0-7]+)[lLjJ]?"},{b:e.CNR+"[lLjJ]?"}]},c={cN:"params",b:/\(/,e:/\)/,c:["self",r,l,b]};return{aliases:["py","gyp"],k:{keyword:"and elif is global as in if from raise for except finally print import pass return exec else break not with class assert yield try while continue del or def lambda nonlocal|10 None True False",built_in:"Ellipsis NotImplemented"},i:/(<\/|->|\?)/,c:[r,l,b,e.HCM,{v:[{cN:"function",bK:"def",r:10},{cN:"class",bK:"class"}],e:/:/,i:/[${=;\n,]/,c:[e.UTM,c]},{cN:"decorator",b:/@/,e:/$/},{b:/\b(print|exec)\(/}]}}); \ No newline at end of file diff --git a/lib/highlight_js/assets/lang/scss.js b/lib/highlight_js/assets/lang/scss.js index d45dc48070..f09e8f1950 100644 --- a/lib/highlight_js/assets/lang/scss.js +++ b/lib/highlight_js/assets/lang/scss.js @@ -1 +1 @@ -hljs.registerLanguage("scss",function(e){{var t="[a-zA-Z-][a-zA-Z0-9_-]*",i={cN:"variable",b:"(\\$"+t+")\\b"},r={cN:"function",b:t+"\\(",rB:!0,eE:!0,e:"\\("},o={cN:"hexcolor",b:"#[0-9A-Fa-f]+"};({cN:"attribute",b:"[A-Z\\_\\.\\-]+",e:":",eE:!0,i:"[^\\s]",starts:{cN:"value",eW:!0,eE:!0,c:[r,o,e.CSSNM,e.QSM,e.ASM,e.CBCM,{cN:"important",b:"!important"}]}})}return{cI:!0,i:"[=/|']",c:[e.CLCM,e.CBCM,r,{cN:"id",b:"\\#[A-Za-z0-9_-]+",r:0},{cN:"class",b:"\\.[A-Za-z0-9_-]+",r:0},{cN:"attr_selector",b:"\\[",e:"\\]",i:"$"},{cN:"tag",b:"\\b(a|abbr|acronym|address|area|article|aside|audio|b|base|big|blockquote|body|br|button|canvas|caption|cite|code|col|colgroup|command|datalist|dd|del|details|dfn|div|dl|dt|em|embed|fieldset|figcaption|figure|footer|form|frame|frameset|(h[1-6])|head|header|hgroup|hr|html|i|iframe|img|input|ins|kbd|keygen|label|legend|li|link|map|mark|meta|meter|nav|noframes|noscript|object|ol|optgroup|option|output|p|param|pre|progress|q|rp|rt|ruby|samp|script|section|select|small|span|strike|strong|style|sub|sup|table|tbody|td|textarea|tfoot|th|thead|time|title|tr|tt|ul|var|video)\\b",r:0},{cN:"pseudo",b:":(visited|valid|root|right|required|read-write|read-only|out-range|optional|only-of-type|only-child|nth-of-type|nth-last-of-type|nth-last-child|nth-child|not|link|left|last-of-type|last-child|lang|invalid|indeterminate|in-range|hover|focus|first-of-type|first-line|first-letter|first-child|first|enabled|empty|disabled|default|checked|before|after|active)"},{cN:"pseudo",b:"::(after|before|choices|first-letter|first-line|repeat-index|repeat-item|selection|value)"},i,{cN:"attribute",b:"\\b(z-index|word-wrap|word-spacing|word-break|width|widows|white-space|visibility|vertical-align|unicode-bidi|transition-timing-function|transition-property|transition-duration|transition-delay|transition|transform-style|transform-origin|transform|top|text-underline-position|text-transform|text-shadow|text-rendering|text-overflow|text-indent|text-decoration-style|text-decoration-line|text-decoration-color|text-decoration|text-align-last|text-align|tab-size|table-layout|right|resize|quotes|position|pointer-events|perspective-origin|perspective|page-break-inside|page-break-before|page-break-after|padding-top|padding-right|padding-left|padding-bottom|padding|overflow-y|overflow-x|overflow-wrap|overflow|outline-width|outline-style|outline-offset|outline-color|outline|orphans|order|opacity|object-position|object-fit|normal|none|nav-up|nav-right|nav-left|nav-index|nav-down|min-width|min-height|max-width|max-height|mask|marks|margin-top|margin-right|margin-left|margin-bottom|margin|list-style-type|list-style-position|list-style-image|list-style|line-height|letter-spacing|left|justify-content|initial|inherit|ime-mode|image-orientation|image-resolution|image-rendering|icon|hyphens|height|font-weight|font-variant-ligatures|font-variant|font-style|font-stretch|font-size-adjust|font-size|font-language-override|font-kerning|font-feature-settings|font-family|font|float|flex-wrap|flex-shrink|flex-grow|flex-flow|flex-direction|flex-basis|flex|filter|empty-cells|display|direction|cursor|counter-reset|counter-increment|content|column-width|column-span|column-rule-width|column-rule-style|column-rule-color|column-rule|column-gap|column-fill|column-count|columns|color|clip-path|clip|clear|caption-side|break-inside|break-before|break-after|box-sizing|box-shadow|box-decoration-break|bottom|border-width|border-top-width|border-top-style|border-top-right-radius|border-top-left-radius|border-top-color|border-top|border-style|border-spacing|border-right-width|border-right-style|border-right-color|border-right|border-radius|border-left-width|border-left-style|border-left-color|border-left|border-image-width|border-image-source|border-image-slice|border-image-repeat|border-image-outset|border-image|border-color|border-collapse|border-bottom-width|border-bottom-style|border-bottom-right-radius|border-bottom-left-radius|border-bottom-color|border-bottom|border|background-size|background-repeat|background-position|background-origin|background-image|background-color|background-clip|background-attachment|background|backface-visibility|auto|animation-timing-function|animation-play-state|animation-name|animation-iteration-count|animation-fill-mode|animation-duration|animation-direction|animation-delay|animation|align-self|align-items|align-content)\\b",i:"[^\\s]"},{cN:"value",b:"\\b(whitespace|wait|w-resize|visible|vertical-text|vertical-ideographic|uppercase|upper-roman|upper-alpha|underline|transparent|top|thin|thick|text|text-top|text-bottom|tb-rl|table-header-group|table-footer-group|sw-resize|super|strict|static|square|solid|small-caps|separate|se-resize|scroll|s-resize|rtl|row-resize|ridge|right|repeat|repeat-y|repeat-x|relative|progress|pointer|overline|outside|outset|oblique|nowrap|not-allowed|normal|none|nw-resize|no-repeat|no-drop|newspaper|ne-resize|n-resize|move|middle|medium|ltr|lr-tb|lowercase|lower-roman|lower-alpha|loose|list-item|line|line-through|line-edge|lighter|left|keep-all|justify|italic|inter-word|inter-ideograph|inside|inset|inline|inline-block|inherit|inactive|ideograph-space|ideograph-parenthesis|ideograph-numeric|ideograph-alpha|horizontal|hidden|help|hand|groove|fixed|ellipsis|e-resize|double|dotted|distribute|distribute-space|distribute-letter|distribute-all-lines|disc|disabled|default|decimal|dashed|crosshair|collapse|col-resize|circle|char|center|capitalize|break-word|break-all|bottom|both|bolder|bold|block|bidi-override|below|baseline|auto|always|all-scroll|absolute|table|table-cell)\\b"},{cN:"value",b:":",e:";",c:[r,i,o,e.CSSNM,e.QSM,e.ASM,{cN:"important",b:"!important"}]},{cN:"at_rule",b:"@",e:"[{;]",k:"mixin include extend for if else each while charset import debug media page content font-face namespace warn",c:[r,i,e.QSM,e.ASM,o,e.CSSNM,{cN:"preprocessor",b:"\\s[A-Za-z0-9_.-]+",r:0}]}]}}); \ No newline at end of file +hljs.registerLanguage("scss",function(e){{var t="[a-zA-Z-][a-zA-Z0-9_-]*",i={cN:"variable",b:"(\\$"+t+")\\b"},r={cN:"function",b:t+"\\(",rB:!0,eE:!0,e:"\\("},o={cN:"hexcolor",b:"#[0-9A-Fa-f]+"};({cN:"attribute",b:"[A-Z\\_\\.\\-]+",e:":",eE:!0,i:"[^\\s]",starts:{cN:"value",eW:!0,eE:!0,c:[r,o,e.CSSNM,e.QSM,e.ASM,e.CBCM,{cN:"important",b:"!important"}]}})}return{cI:!0,i:"[=/|']",c:[e.CLCM,e.CBCM,r,{cN:"id",b:"\\#[A-Za-z0-9_-]+",r:0},{cN:"class",b:"\\.[A-Za-z0-9_-]+",r:0},{cN:"attr_selector",b:"\\[",e:"\\]",i:"$"},{cN:"tag",b:"\\b(a|abbr|acronym|address|area|article|aside|audio|b|base|big|blockquote|body|br|button|canvas|caption|cite|code|col|colgroup|command|datalist|dd|del|details|dfn|div|dl|dt|em|embed|fieldset|figcaption|figure|footer|form|frame|frameset|(h[1-6])|head|header|hgroup|hr|html|i|iframe|img|input|ins|kbd|keygen|label|legend|li|link|map|mark|meta|meter|nav|noframes|noscript|object|ol|optgroup|option|output|p|param|pre|progress|q|rp|rt|ruby|samp|script|section|select|small|span|strike|strong|style|sub|sup|table|tbody|td|textarea|tfoot|th|thead|time|title|tr|tt|ul|var|video)\\b",r:0},{cN:"pseudo",b:":(visited|valid|root|right|required|read-write|read-only|out-range|optional|only-of-type|only-child|nth-of-type|nth-last-of-type|nth-last-child|nth-child|not|link|left|last-of-type|last-child|lang|invalid|indeterminate|in-range|hover|focus|first-of-type|first-line|first-letter|first-child|first|enabled|empty|disabled|default|checked|before|after|active)"},{cN:"pseudo",b:"::(after|before|choices|first-letter|first-line|repeat-index|repeat-item|selection|value)"},i,{cN:"attribute",b:"\\b(z-index|word-wrap|word-spacing|word-break|width|widows|white-space|visibility|vertical-align|unicode-bidi|transition-timing-function|transition-property|transition-duration|transition-delay|transition|transform-style|transform-origin|transform|top|text-underline-position|text-transform|text-shadow|text-rendering|text-overflow|text-indent|text-decoration-style|text-decoration-line|text-decoration-color|text-decoration|text-align-last|text-align|tab-size|table-layout|right|resize|quotes|position|pointer-events|perspective-origin|perspective|page-break-inside|page-break-before|page-break-after|padding-top|padding-right|padding-left|padding-bottom|padding|overflow-y|overflow-x|overflow-wrap|overflow|outline-width|outline-style|outline-offset|outline-color|outline|orphans|order|opacity|object-position|object-fit|normal|none|nav-up|nav-right|nav-left|nav-index|nav-down|min-width|min-height|max-width|max-height|mask|marks|margin-top|margin-right|margin-left|margin-bottom|margin|list-style-type|list-style-position|list-style-image|list-style|line-height|letter-spacing|left|justify-content|initial|inherit|ime-mode|image-orientation|image-resolution|image-rendering|icon|hyphens|height|font-weight|font-variant-ligatures|font-variant|font-style|font-stretch|font-size-adjust|font-size|font-language-override|font-kerning|font-feature-settings|font-family|font|float|flex-wrap|flex-shrink|flex-grow|flex-flow|flex-direction|flex-basis|flex|filter|empty-cells|display|direction|cursor|counter-reset|counter-increment|content|column-width|column-span|column-rule-width|column-rule-style|column-rule-color|column-rule|column-gap|column-fill|column-count|columns|color|clip-path|clip|clear|caption-side|break-inside|break-before|break-after|box-sizing|box-shadow|box-decoration-break|bottom|border-width|border-top-width|border-top-style|border-top-right-radius|border-top-left-radius|border-top-color|border-top|border-style|border-spacing|border-right-width|border-right-style|border-right-color|border-right|border-radius|border-left-width|border-left-style|border-left-color|border-left|border-image-width|border-image-source|border-image-slice|border-image-repeat|border-image-outset|border-image|border-color|border-collapse|border-bottom-width|border-bottom-style|border-bottom-right-radius|border-bottom-left-radius|border-bottom-color|border-bottom|border|background-size|background-repeat|background-position|background-origin|background-image|background-color|background-clip|background-attachment|background-blend-mode|background|backface-visibility|auto|animation-timing-function|animation-play-state|animation-name|animation-iteration-count|animation-fill-mode|animation-duration|animation-direction|animation-delay|animation|align-self|align-items|align-content)\\b",i:"[^\\s]"},{cN:"value",b:"\\b(whitespace|wait|w-resize|visible|vertical-text|vertical-ideographic|uppercase|upper-roman|upper-alpha|underline|transparent|top|thin|thick|text|text-top|text-bottom|tb-rl|table-header-group|table-footer-group|sw-resize|super|strict|static|square|solid|small-caps|separate|se-resize|scroll|s-resize|rtl|row-resize|ridge|right|repeat|repeat-y|repeat-x|relative|progress|pointer|overline|outside|outset|oblique|nowrap|not-allowed|normal|none|nw-resize|no-repeat|no-drop|newspaper|ne-resize|n-resize|move|middle|medium|ltr|lr-tb|lowercase|lower-roman|lower-alpha|loose|list-item|line|line-through|line-edge|lighter|left|keep-all|justify|italic|inter-word|inter-ideograph|inside|inset|inline|inline-block|inherit|inactive|ideograph-space|ideograph-parenthesis|ideograph-numeric|ideograph-alpha|horizontal|hidden|help|hand|groove|fixed|ellipsis|e-resize|double|dotted|distribute|distribute-space|distribute-letter|distribute-all-lines|disc|disabled|default|decimal|dashed|crosshair|collapse|col-resize|circle|char|center|capitalize|break-word|break-all|bottom|both|bolder|bold|block|bidi-override|below|baseline|auto|always|all-scroll|absolute|table|table-cell)\\b"},{cN:"value",b:":",e:";",c:[r,i,o,e.CSSNM,e.QSM,e.ASM,{cN:"important",b:"!important"}]},{cN:"at_rule",b:"@",e:"[{;]",k:"mixin include extend for if else each while charset import debug media page content font-face namespace warn",c:[r,i,e.QSM,e.ASM,o,e.CSSNM,{cN:"preprocessor",b:"\\s[A-Za-z0-9_.-]+",r:0}]}]}}); \ No newline at end of file diff --git a/lib/highlight_js/assets/lang/stylus.js b/lib/highlight_js/assets/lang/stylus.js index b1250298d8..d78cc84e40 100644 --- a/lib/highlight_js/assets/lang/stylus.js +++ b/lib/highlight_js/assets/lang/stylus.js @@ -1 +1 @@ -hljs.registerLanguage("stylus",function(t){var e={cN:"variable",b:"\\$"+t.IR},o={cN:"hexcolor",b:"#([a-fA-F0-9]{6}|[a-fA-F0-9]{3})",r:10},i=["charset","css","debug","extend","font-face","for","import","include","media","mixin","page","warn","while"],r=["after","before","first-letter","first-line","active","first-child","focus","hover","lang","link","visited"],n=["a","abbr","address","article","aside","audio","b","blockquote","body","button","canvas","caption","cite","code","dd","del","details","dfn","div","dl","dt","em","fieldset","figcaption","figure","footer","form","h1","h2","h3","h4","h5","h6","header","hgroup","html","i","iframe","img","input","ins","kbd","label","legend","li","mark","menu","nav","object","ol","p","q","quote","samp","section","span","strong","summary","sup","table","tbody","td","textarea","tfoot","th","thead","time","tr","ul","var","video"],a="[\\.\\s\\n\\[\\:,]",l=["align-content","align-items","align-self","animation","animation-delay","animation-direction","animation-duration","animation-fill-mode","animation-iteration-count","animation-name","animation-play-state","animation-timing-function","auto","backface-visibility","background","background-attachment","background-clip","background-color","background-image","background-origin","background-position","background-repeat","background-size","border","border-bottom","border-bottom-color","border-bottom-left-radius","border-bottom-right-radius","border-bottom-style","border-bottom-width","border-collapse","border-color","border-image","border-image-outset","border-image-repeat","border-image-slice","border-image-source","border-image-width","border-left","border-left-color","border-left-style","border-left-width","border-radius","border-right","border-right-color","border-right-style","border-right-width","border-spacing","border-style","border-top","border-top-color","border-top-left-radius","border-top-right-radius","border-top-style","border-top-width","border-width","bottom","box-decoration-break","box-shadow","box-sizing","break-after","break-before","break-inside","caption-side","clear","clip","clip-path","color","column-count","column-fill","column-gap","column-rule","column-rule-color","column-rule-style","column-rule-width","column-span","column-width","columns","content","counter-increment","counter-reset","cursor","direction","display","empty-cells","filter","flex","flex-basis","flex-direction","flex-flow","flex-grow","flex-shrink","flex-wrap","float","font","font-family","font-feature-settings","font-kerning","font-language-override","font-size","font-size-adjust","font-stretch","font-style","font-variant","font-variant-ligatures","font-weight","height","hyphens","icon","image-orientation","image-rendering","image-resolution","ime-mode","inherit","initial","justify-content","left","letter-spacing","line-height","list-style","list-style-image","list-style-position","list-style-type","margin","margin-bottom","margin-left","margin-right","margin-top","marks","mask","max-height","max-width","min-height","min-width","nav-down","nav-index","nav-left","nav-right","nav-up","none","normal","object-fit","object-position","opacity","order","orphans","outline","outline-color","outline-offset","outline-style","outline-width","overflow","overflow-wrap","overflow-x","overflow-y","padding","padding-bottom","padding-left","padding-right","padding-top","page-break-after","page-break-before","page-break-inside","perspective","perspective-origin","pointer-events","position","quotes","resize","right","tab-size","table-layout","text-align","text-align-last","text-decoration","text-decoration-color","text-decoration-line","text-decoration-style","text-indent","text-overflow","text-rendering","text-shadow","text-transform","text-underline-position","top","transform","transform-origin","transform-style","transition","transition-delay","transition-duration","transition-property","transition-timing-function","unicode-bidi","vertical-align","visibility","white-space","widows","width","word-break","word-spacing","word-wrap","z-index"],d=["\\{","\\}","\\?","(\\bReturn\\b)","(\\bEnd\\b)","(\\bend\\b)",";","#\\s","\\*\\s","===\\s","\\|"];return{aliases:["styl"],cI:!1,i:"("+d.join("|")+")",k:"if else for in",c:[t.QSM,t.ASM,t.CLCM,t.CBCM,o,{b:"\\.[a-zA-Z][a-zA-Z0-9_-]*"+a,rB:!0,c:[{cN:"class",b:"\\.[a-zA-Z][a-zA-Z0-9_-]*"}]},{b:"\\#[a-zA-Z][a-zA-Z0-9_-]*"+a,rB:!0,c:[{cN:"id",b:"\\#[a-zA-Z][a-zA-Z0-9_-]*"}]},{b:"\\b("+n.join("|")+")"+a,rB:!0,c:[{cN:"tag",b:"\\b[a-zA-Z][a-zA-Z0-9_-]*"}]},{cN:"pseudo",b:"&?:?:\\b("+r.join("|")+")"+a},{cN:"at_rule",b:"@("+i.join("|")+")\\b"},e,t.CSSNM,t.NM,{cN:"function",b:"\\b[a-zA-Z][a-zA-Z0-9_-]*\\(.*\\)",i:"[\\n]",rB:!0,c:[{cN:"title",b:"\\b[a-zA-Z][a-zA-Z0-9_-]*"},{cN:"params",b:/\(/,e:/\)/,c:[o,e,t.ASM,t.CSSNM,t.NM,t.QSM]}]},{cN:"attribute",b:"\\b("+l.reverse().join("|")+")\\b"}]}}); \ No newline at end of file +hljs.registerLanguage("stylus",function(t){var e={cN:"variable",b:"\\$"+t.IR},o={cN:"hexcolor",b:"#([a-fA-F0-9]{6}|[a-fA-F0-9]{3})",r:10},i=["charset","css","debug","extend","font-face","for","import","include","media","mixin","page","warn","while"],r=["after","before","first-letter","first-line","active","first-child","focus","hover","lang","link","visited"],n=["a","abbr","address","article","aside","audio","b","blockquote","body","button","canvas","caption","cite","code","dd","del","details","dfn","div","dl","dt","em","fieldset","figcaption","figure","footer","form","h1","h2","h3","h4","h5","h6","header","hgroup","html","i","iframe","img","input","ins","kbd","label","legend","li","mark","menu","nav","object","ol","p","q","quote","samp","section","span","strong","summary","sup","table","tbody","td","textarea","tfoot","th","thead","time","tr","ul","var","video"],a="[\\.\\s\\n\\[\\:,]",l=["align-content","align-items","align-self","animation","animation-delay","animation-direction","animation-duration","animation-fill-mode","animation-iteration-count","animation-name","animation-play-state","animation-timing-function","auto","backface-visibility","background","background-attachment","background-clip","background-color","background-image","background-origin","background-position","background-repeat","background-size","border","border-bottom","border-bottom-color","border-bottom-left-radius","border-bottom-right-radius","border-bottom-style","border-bottom-width","border-collapse","border-color","border-image","border-image-outset","border-image-repeat","border-image-slice","border-image-source","border-image-width","border-left","border-left-color","border-left-style","border-left-width","border-radius","border-right","border-right-color","border-right-style","border-right-width","border-spacing","border-style","border-top","border-top-color","border-top-left-radius","border-top-right-radius","border-top-style","border-top-width","border-width","bottom","box-decoration-break","box-shadow","box-sizing","break-after","break-before","break-inside","caption-side","clear","clip","clip-path","color","column-count","column-fill","column-gap","column-rule","column-rule-color","column-rule-style","column-rule-width","column-span","column-width","columns","content","counter-increment","counter-reset","cursor","direction","display","empty-cells","filter","flex","flex-basis","flex-direction","flex-flow","flex-grow","flex-shrink","flex-wrap","float","font","font-family","font-feature-settings","font-kerning","font-language-override","font-size","font-size-adjust","font-stretch","font-style","font-variant","font-variant-ligatures","font-weight","height","hyphens","icon","image-orientation","image-rendering","image-resolution","ime-mode","inherit","initial","justify-content","left","letter-spacing","line-height","list-style","list-style-image","list-style-position","list-style-type","margin","margin-bottom","margin-left","margin-right","margin-top","marks","mask","max-height","max-width","min-height","min-width","nav-down","nav-index","nav-left","nav-right","nav-up","none","normal","object-fit","object-position","opacity","order","orphans","outline","outline-color","outline-offset","outline-style","outline-width","overflow","overflow-wrap","overflow-x","overflow-y","padding","padding-bottom","padding-left","padding-right","padding-top","page-break-after","page-break-before","page-break-inside","perspective","perspective-origin","pointer-events","position","quotes","resize","right","tab-size","table-layout","text-align","text-align-last","text-decoration","text-decoration-color","text-decoration-line","text-decoration-style","text-indent","text-overflow","text-rendering","text-shadow","text-transform","text-underline-position","top","transform","transform-origin","transform-style","transition","transition-delay","transition-duration","transition-property","transition-timing-function","unicode-bidi","vertical-align","visibility","white-space","widows","width","word-break","word-spacing","word-wrap","z-index"],d=["\\{","\\}","\\?","(\\bReturn\\b)","(\\bEnd\\b)","(\\bend\\b)",";","#\\s","\\*\\s","===\\s","\\|","%"];return{aliases:["styl"],cI:!1,i:"("+d.join("|")+")",k:"if else for in",c:[t.QSM,t.ASM,t.CLCM,t.CBCM,o,{b:"\\.[a-zA-Z][a-zA-Z0-9_-]*"+a,rB:!0,c:[{cN:"class",b:"\\.[a-zA-Z][a-zA-Z0-9_-]*"}]},{b:"\\#[a-zA-Z][a-zA-Z0-9_-]*"+a,rB:!0,c:[{cN:"id",b:"\\#[a-zA-Z][a-zA-Z0-9_-]*"}]},{b:"\\b("+n.join("|")+")"+a,rB:!0,c:[{cN:"tag",b:"\\b[a-zA-Z][a-zA-Z0-9_-]*"}]},{cN:"pseudo",b:"&?:?:\\b("+r.join("|")+")"+a},{cN:"at_rule",b:"@("+i.join("|")+")\\b"},e,t.CSSNM,t.NM,{cN:"function",b:"\\b[a-zA-Z][a-zA-Z0-9_-]*\\(.*\\)",i:"[\\n]",rB:!0,c:[{cN:"title",b:"\\b[a-zA-Z][a-zA-Z0-9_-]*"},{cN:"params",b:/\(/,e:/\)/,c:[o,e,t.ASM,t.CSSNM,t.NM,t.QSM]}]},{cN:"attribute",b:"\\b("+l.reverse().join("|")+")\\b"}]}}); \ No newline at end of file diff --git a/lib/highlight_js/assets/lang/swift.js b/lib/highlight_js/assets/lang/swift.js index b4f3e48b42..f4d42bce7c 100644 --- a/lib/highlight_js/assets/lang/swift.js +++ b/lib/highlight_js/assets/lang/swift.js @@ -1 +1 @@ -hljs.registerLanguage("swift",function(e){var i={keyword:"class deinit enum extension func import init let protocol static struct subscript typealias var break case continue default do else fallthrough if in for return switch where while as dynamicType is new super self Self Type __COLUMN__ __FILE__ __FUNCTION__ __LINE__ associativity didSet get infix inout left mutating none nonmutating operator override postfix precedence prefix right set unowned unowned safe unsafe weak willSet",literal:"true false nil",built_in:"abs advance alignof alignofValue assert bridgeFromObjectiveC bridgeFromObjectiveCUnconditional bridgeToObjectiveC bridgeToObjectiveCUnconditional c contains count countElements countLeadingZeros debugPrint debugPrintln distance dropFirst dropLast dump encodeBitsAsWords enumerate equal false filter find getBridgedObjectiveCType getVaList indices insertionSort isBridgedToObjectiveC isBridgedVerbatimToObjectiveC isUniquelyReferenced join lexicographicalCompare map max maxElement min minElement nil numericCast partition posix print println quickSort reduce reflect reinterpretCast reverse roundUpToAlignment sizeof sizeofValue sort split startsWith strideof strideofValue swap swift toString transcode true underestimateCount unsafeReflect withExtendedLifetime withObjectAtPlusZero withUnsafePointer withUnsafePointerToObject withUnsafePointers withVaList"},t={cN:"type",b:"\\b[A-Z][\\w']*",r:0},n=e.C("/\\*","\\*/",{c:["self"]}),r={cN:"subst",b:/\\\(/,e:"\\)",k:i,c:[]},s={cN:"number",b:"\\b([\\d_]+(\\.[\\deE_]+)?|0x[a-fA-F0-9_]+(\\.[a-fA-F0-9p_]+)?|0b[01_]+|0o[0-7_]+)\\b",r:0},o=e.inherit(e.QSM,{c:[r,e.BE]});return r.c=[s],{k:i,c:[o,e.CLCM,n,t,s,{cN:"func",bK:"func",e:"{",eE:!0,c:[e.inherit(e.TM,{b:/[A-Za-z$_][0-9A-Za-z$_]*/,i:/\(/}),{cN:"generics",b://,i:/>/},{cN:"params",b:/\(/,e:/\)/,k:i,c:["self",s,o,e.CBCM,{b:":"}],i:/["']/}],i:/\[|%/},{cN:"class",bK:"struct protocol class extension enum",k:i,e:"\\{",eE:!0,c:[e.inherit(e.TM,{b:/[A-Za-z$_][0-9A-Za-z$_]*/})]},{cN:"preprocessor",b:"(@assignment|@class_protocol|@exported|@final|@lazy|@noreturn|@NSCopying|@NSManaged|@objc|@optional|@required|@auto_closure|@noreturn|@IBAction|@IBDesignable|@IBInspectable|@IBOutlet|@infix|@prefix|@postfix)"}]}}); \ No newline at end of file +hljs.registerLanguage("swift",function(e){var i={keyword:"class deinit enum extension func import init let protocol static struct subscript typealias var break case continue default do else fallthrough if in for return switch where while as dynamicType is new super self Self Type __COLUMN__ __FILE__ __FUNCTION__ __LINE__ associativity didSet get infix inout left mutating none nonmutating operator override postfix precedence prefix right set unowned unowned safe unsafe weak willSet",literal:"true false nil",built_in:"abs advance alignof alignofValue assert bridgeFromObjectiveC bridgeFromObjectiveCUnconditional bridgeToObjectiveC bridgeToObjectiveCUnconditional c contains count countElements countLeadingZeros debugPrint debugPrintln distance dropFirst dropLast dump encodeBitsAsWords enumerate equal filter find getBridgedObjectiveCType getVaList indices insertionSort isBridgedToObjectiveC isBridgedVerbatimToObjectiveC isUniquelyReferenced join lexicographicalCompare map max maxElement min minElement numericCast partition posix print println quickSort reduce reflect reinterpretCast reverse roundUpToAlignment sizeof sizeofValue sort split startsWith strideof strideofValue swap swift toString transcode underestimateCount unsafeReflect withExtendedLifetime withObjectAtPlusZero withUnsafePointer withUnsafePointerToObject withUnsafePointers withVaList"},t={cN:"type",b:"\\b[A-Z][\\w']*",r:0},n=e.C("/\\*","\\*/",{c:["self"]}),r={cN:"subst",b:/\\\(/,e:"\\)",k:i,c:[]},s={cN:"number",b:"\\b([\\d_]+(\\.[\\deE_]+)?|0x[a-fA-F0-9_]+(\\.[a-fA-F0-9p_]+)?|0b[01_]+|0o[0-7_]+)\\b",r:0},o=e.inherit(e.QSM,{c:[r,e.BE]});return r.c=[s],{k:i,c:[o,e.CLCM,n,t,s,{cN:"func",bK:"func",e:"{",eE:!0,c:[e.inherit(e.TM,{b:/[A-Za-z$_][0-9A-Za-z$_]*/,i:/\(/}),{cN:"generics",b://,i:/>/},{cN:"params",b:/\(/,e:/\)/,endsParent:!0,k:i,c:["self",s,o,e.CBCM,{b:":"}],i:/["']/}],i:/\[|%/},{cN:"class",bK:"struct protocol class extension enum",k:i,e:"\\{",eE:!0,c:[e.inherit(e.TM,{b:/[A-Za-z$_][0-9A-Za-z$_]*/})]},{cN:"preprocessor",b:"(@assignment|@class_protocol|@exported|@final|@lazy|@noreturn|@NSCopying|@NSManaged|@objc|@optional|@required|@auto_closure|@noreturn|@IBAction|@IBDesignable|@IBInspectable|@IBOutlet|@infix|@prefix|@postfix)"}]}}); \ No newline at end of file diff --git a/lib/highlight_js/assets/lang/twig.js b/lib/highlight_js/assets/lang/twig.js index 3d7f9edbcd..b3c4456bd5 100644 --- a/lib/highlight_js/assets/lang/twig.js +++ b/lib/highlight_js/assets/lang/twig.js @@ -1 +1 @@ -hljs.registerLanguage("twig",function(e){var t={cN:"params",b:"\\(",e:"\\)"},a="attribute block constant cycle date dump include max min parent random range source template_from_string",r={cN:"function",bK:a,r:0,c:[t]},c={cN:"filter",b:/\|[A-Za-z]+:?/,k:"abs batch capitalize convert_encoding date date_modify default escape first format join json_encode keys last length lower merge nl2br number_format raw replace reverse round slice sort split striptags title trim upper url_encode",c:[r]},n="autoescape block do embed extends filter flush for if import include macro sandbox set spaceless use verbatim";return n=n+" "+n.split(" ").map(function(e){return"end"+e}).join(" "),{aliases:["craftcms"],cI:!0,sL:"xml",subLanguageMode:"continuous",c:[e.C(/\{#/,/#}/),{cN:"template_tag",b:/\{%/,e:/%}/,k:n,c:[c,r]},{cN:"variable",b:/\{\{/,e:/}}/,c:[c,r]}]}}); \ No newline at end of file +hljs.registerLanguage("twig",function(e){var t={cN:"params",b:"\\(",e:"\\)"},a="attribute block constant cycle date dump include max min parent random range source template_from_string",r={cN:"function",bK:a,r:0,c:[t]},c={cN:"filter",b:/\|[A-Za-z_]+:?/,k:"abs batch capitalize convert_encoding date date_modify default escape first format join json_encode keys last length lower merge nl2br number_format raw replace reverse round slice sort split striptags title trim upper url_encode",c:[r]},n="autoescape block do embed extends filter flush for if import include macro sandbox set spaceless use verbatim";return n=n+" "+n.split(" ").map(function(e){return"end"+e}).join(" "),{aliases:["craftcms"],cI:!0,sL:"xml",subLanguageMode:"continuous",c:[e.C(/\{#/,/#}/),{cN:"template_tag",b:/\{%/,e:/%}/,k:n,c:[c,r]},{cN:"variable",b:/\{\{/,e:/}}/,c:[c,r]}]}}); \ No newline at end of file diff --git a/lib/highlight_js/assets/lang/typescript.js b/lib/highlight_js/assets/lang/typescript.js index 7479cab8b1..2c0658e9ad 100644 --- a/lib/highlight_js/assets/lang/typescript.js +++ b/lib/highlight_js/assets/lang/typescript.js @@ -1 +1 @@ -hljs.registerLanguage("typescript",function(e){return{aliases:["ts"],k:{keyword:"in if for while finally var new function|0 do return void else break catch instanceof with throw case default try this switch continue typeof delete let yield const class public private get set super interface extendsstatic constructor implements enum export import declare type protected",literal:"true false null undefined NaN Infinity",built_in:"eval isFinite isNaN parseFloat parseInt decodeURI decodeURIComponent encodeURI encodeURIComponent escape unescape Object Function Boolean Error EvalError InternalError RangeError ReferenceError StopIteration SyntaxError TypeError URIError Number Math Date String RegExp Array Float32Array Float64Array Int16Array Int32Array Int8Array Uint16Array Uint32Array Uint8Array Uint8ClampedArray ArrayBuffer DataView JSON Intl arguments require module console window document any number boolean string void"},c:[{cN:"pi",b:/^\s*('|")use strict('|")/,r:0},e.ASM,e.QSM,e.CLCM,e.CBCM,e.CNM,{b:"("+e.RSR+"|\\b(case|return|throw)\\b)\\s*",k:"return throw case",c:[e.CLCM,e.CBCM,e.RM,{b:/;/,r:0,sL:"xml"}],r:0},{cN:"function",bK:"function",e:/\{/,eE:!0,c:[e.inherit(e.TM,{b:/[A-Za-z$_][0-9A-Za-z$_]*/}),{cN:"params",b:/\(/,e:/\)/,c:[e.CLCM,e.CBCM],i:/["'\(]/}],i:/\[|%/,r:0},{cN:"constructor",bK:"constructor",e:/\{/,eE:!0,r:10},{cN:"module",bK:"module",e:/\{/,eE:!0},{cN:"interface",bK:"interface",e:/\{/,eE:!0},{b:/\$[(.]/},{b:"\\."+e.IR,r:0}]}}); \ No newline at end of file +hljs.registerLanguage("typescript",function(e){return{aliases:["ts"],k:{keyword:"in if for while finally var new function|0 do return void else break catch instanceof with throw case default try this switch continue typeof delete let yield const class public private get set super interface extendsstatic constructor implements enum export import declare type protected",literal:"true false null undefined NaN Infinity",built_in:"eval isFinite isNaN parseFloat parseInt decodeURI decodeURIComponent encodeURI encodeURIComponent escape unescape Object Function Boolean Error EvalError InternalError RangeError ReferenceError StopIteration SyntaxError TypeError URIError Number Math Date String RegExp Array Float32Array Float64Array Int16Array Int32Array Int8Array Uint16Array Uint32Array Uint8Array Uint8ClampedArray ArrayBuffer DataView JSON Intl arguments require module console window document any number boolean string void"},c:[{cN:"pi",b:/^\s*('|")use strict('|")/,r:0},e.ASM,e.QSM,e.CLCM,e.CBCM,e.CNM,{b:"("+e.RSR+"|\\b(case|return|throw)\\b)\\s*",k:"return throw case",c:[e.CLCM,e.CBCM,e.RM,{b:/;/,r:0,sL:"xml"}],r:0},{cN:"function",bK:"function",e:/\{/,eE:!0,c:[e.inherit(e.TM,{b:/[A-Za-z$_][0-9A-Za-z$_]*/}),{cN:"params",b:/\(/,e:/\)/,eB:!0,eE:!0,c:[e.CLCM,e.CBCM],i:/["'\(]/}],i:/\[|%/,r:0},{cN:"constructor",bK:"constructor",e:/\{/,eE:!0,r:10},{cN:"module",bK:"module",e:/\{/,eE:!0},{cN:"interface",bK:"interface",e:/\{/,eE:!0},{b:/\$[(.]/},{b:"\\."+e.IR,r:0}]}}); \ No newline at end of file diff --git a/lib/highlight_js/assets/lang/vbscript-html.js b/lib/highlight_js/assets/lang/vbscript-html.js index 3d731f4bd0..e90c004c8d 100644 --- a/lib/highlight_js/assets/lang/vbscript-html.js +++ b/lib/highlight_js/assets/lang/vbscript-html.js @@ -1 +1 @@ -hljs.registerLanguage("vbscript-html",function(){return{sL:"xml",subLanguageMode:"continuous",c:[{b:"<%",e:"%>",sL:"vbscript"}]}}); \ No newline at end of file +hljs.registerLanguage("vbscript-html",function(s){return{sL:"xml",subLanguageMode:"continuous",c:[{b:"<%",e:"%>",sL:"vbscript"}]}}); \ No newline at end of file From 574052b7866cf40d0363d54c66e630d3ddd316dc Mon Sep 17 00:00:00 2001 From: Arpit Jalan Date: Wed, 22 Apr 2015 19:05:15 +0530 Subject: [PATCH 110/113] Update Translations --- config/locales/client.ar.yml | 6 - config/locales/client.cs.yml | 208 ++++++++++++++++- config/locales/client.da.yml | 6 - config/locales/client.de.yml | 47 +++- config/locales/client.es.yml | 6 - config/locales/client.fa_IR.yml | 33 ++- config/locales/client.fi.yml | 40 +++- config/locales/client.fr.yml | 77 +++++- config/locales/client.he.yml | 6 - config/locales/client.id.yml | 2 - config/locales/client.it.yml | 6 - config/locales/client.ja.yml | 74 +++++- config/locales/client.ko.yml | 6 - config/locales/client.nb_NO.yml | 29 ++- config/locales/client.nl.yml | 6 - config/locales/client.pl_PL.yml | 43 +++- config/locales/client.pt.yml | 275 +++++++++++++++++++++- config/locales/client.pt_BR.yml | 6 - config/locales/client.ru.yml | 41 +++- config/locales/client.sq.yml | 22 +- config/locales/client.sv.yml | 6 - config/locales/client.te.yml | 6 - config/locales/client.tr_TR.yml | 6 - config/locales/client.uk.yml | 3 - config/locales/client.zh_CN.yml | 33 ++- config/locales/client.zh_TW.yml | 10 +- config/locales/server.cs.yml | 156 ++++++++++++- config/locales/server.da.yml | 1 - config/locales/server.de.yml | 12 +- config/locales/server.es.yml | 5 +- config/locales/server.fa_IR.yml | 354 +++++++++++++++++++++++++++- config/locales/server.fi.yml | 27 ++- config/locales/server.fr.yml | 124 +++++++++- config/locales/server.he.yml | 5 +- config/locales/server.it.yml | 5 +- config/locales/server.ja.yml | 3 - config/locales/server.ko.yml | 3 - config/locales/server.nl.yml | 1 - config/locales/server.pl_PL.yml | 1 - config/locales/server.pt.yml | 401 +++++++++++++++++++++++++++++++- config/locales/server.pt_BR.yml | 14 +- config/locales/server.ru.yml | 53 ++++- config/locales/server.sq.yml | 3 - config/locales/server.sv.yml | 1 - config/locales/server.te.yml | 1 - config/locales/server.tr_TR.yml | 3 - config/locales/server.uk.yml | 1 - config/locales/server.zh_CN.yml | 19 +- config/locales/server.zh_TW.yml | 7 +- 49 files changed, 1970 insertions(+), 233 deletions(-) diff --git a/config/locales/client.ar.yml b/config/locales/client.ar.yml index 884cec54ec..ed7922cb47 100644 --- a/config/locales/client.ar.yml +++ b/config/locales/client.ar.yml @@ -171,7 +171,6 @@ ar: show_more: "أعرض المزيد" show_help: "مساعدة" links: "روابط" - links_lowercase: "روابط" faq: "التعليمات" guidelines: "توجيهات " privacy_policy: "سياسة الخصوصية " @@ -536,7 +535,6 @@ ar: auto_track_topics: "متابعة المواضيع التي أدخلها بشكل تلقائي" auto_track_options: never: "ابداً" - always: "دائما" after_n_seconds: zero: "بعد 0 ثانية" one: "بعد ثانية" @@ -637,7 +635,6 @@ ar: mute: كتم unmute: إلغاء الكتم last_post: أخر مشاركة - last_post_lowercase: أخر مشاركة summary: enabled_description: "أنت تنظر الى ملخص لهذا الموضوع , مشاركات مثيرة للإهتمام بحسب رأي المجتمع" description: "هناك {{count}} ردود" @@ -1289,15 +1286,12 @@ ar: posts_long: "هناك {{number}} مشاركات في هذا الموضوع" original_post: "المشاركة الاصلية" views: "مشاهدات" - views_lowercase: "مشاهدات" replies: "ردود " views_long: "هذا الموضوع قد تمت مشاهدته {{number}} مرات" activity: "النشاط" likes: "اعجابات" - likes_lowercase: "اعجابات" likes_long: "هناك {{number}} اعجابات في هذا الموضوع" users: "مستخدمين" - users_lowercase: "مستخدمين" category_title: "قسم" history: "تاريخ" changed_by: "الكاتب {{author}}" diff --git a/config/locales/client.cs.yml b/config/locales/client.cs.yml index ffcfaf7559..35e8f67b38 100644 --- a/config/locales/client.cs.yml +++ b/config/locales/client.cs.yml @@ -108,6 +108,7 @@ cs: email: 'odeslat odkaz emailem' topic_admin_menu: "akce administrátora tématu" emails_are_disabled: "Všechny odchozí emaily byly administrátorem vypnuty. Žádné odchozí emaily nebudou odeslány." + s3_deprecation_warning: "WARNING! Amazon S3 will soon be deprecated for image/attachment storage. Please, follow the instructions to migrate to local storage." edit: 'upravit název a kategorii příspěvku' not_implemented: "Tato fičura ještě není implementovaná" no_value: "Ne" @@ -123,7 +124,10 @@ cs: show_more: "zobrazit více" show_help: "pomoc" links: "Odkazy" - links_lowercase: "odkazy" + links_lowercase: + one: "odkaz" + few: "odkazy" + other: "odkazů" faq: "FAQ" guidelines: "Pokyny" privacy_policy: "Ochrana soukromí" @@ -141,6 +145,7 @@ cs: daily: "denně" weekly: "týdně" every_two_weeks: "jednou za 14 dní" + every_three_days: "každé tři dny" max_of_count: "max z" character_count: one: "{{count}} znak" @@ -177,6 +182,7 @@ cs: not_bookmarked: "Tento příspěvek jste již četli. Klikněte pro přidání záložky." last_read: "Toto je váš poslední přečtený příspěvek. Klikněte pro přidání záložky." remove: "Odstranit záložku" + confirm_clear: "Opravdu chcete odstranit všechny záložky z tohoto tématu?" topic_count_latest: one: "{{count}} nové nebo upravené téma." few: "{{count}} nová nebo upravená témata." @@ -203,6 +209,8 @@ cs: undo: "Zpět" revert: "Vrátit" failed: "Selhání" + switch_to_anon: "Anonymní mód" + switch_from_anon: "Opustit anonymní mód" banner: close: "Odmítnout tento banner." choose_topic: @@ -210,6 +218,19 @@ cs: title: search: "Hledat téma podle názvu, URL nebo ID:" placeholder: "sem napište název tématu" + queue: + topic: "Téma:" + approve: 'Schválit' + reject: 'Odmítnout' + title: "Potřebuje schválení" + none: "Žádné příspěvky ke kontrole." + edit: "Upravit" + cancel: "Zrušit" + confirm: "Uložit změny" + approval: + title: "Příspěvek potřebuje schválení" + description: "Obdrželi jsme váš příspěvek, ale musí být před zveřejněním schválen moderátorem. Buďte trpěliví." + ok: "OK" user_action: user_posted_topic: "{{user}} zaslal téma" you_posted_topic: "Zaslal jste téma" @@ -265,6 +286,8 @@ cs: '2': "Obdržených 'líbí se'" '3': "Záložky" '4': "Témata" + '5': "Odpovědi" + '6': "Odezva" '7': "Zmínění" '9': "Citace" '10': "Oblíbené" @@ -313,6 +336,8 @@ cs: mute: "Ignorovat" edit: "Upravit nastavení" download_archive: "Stáhnout moje příspěvky" + new_private_message: "Nová zpráva" + private_message: "Zpráva" private_messages: "Zprávy" activity_stream: "Aktivita" preferences: "Nastavení" @@ -349,7 +374,8 @@ cs: delete_yourself_not_allowed: "Váš účet teď nejde odstranit. Obraťte se na správce aby váš účet smazal za vás." unread_message_count: "Zprávy" admin_delete: "Smazat" - muted_users: "Zjišení" + users: "Uživatelé" + muted_users: "Ztišení" muted_users_instructions: "Umlčet všechny notifikace od těchto uživatelů." staff_counters: flags_given: "užitečná nahlášení" @@ -389,6 +415,8 @@ cs: uploaded_avatar_empty: "Přidat vlastní obrázek" upload_title: "Nahrát obrázek" upload_picture: "Nahrát obrázek" + image_is_not_a_square: "Varování: Ořízli jsme váš avatar; šířka a délka nebyla stejná." + cache_notice: "Úspěšně jste změnili avatar, ale může chvíli trvat než se změna projeví." change_profile_background: title: "Pozadí profilu" instructions: "Pozadí profilu je zarovnáno doprostřed a má výchozí šířku 850px." @@ -408,6 +436,7 @@ cs: name: title: "Jméno" instructions: "Celé jméno (volitelně)" + instructions_required: "Vaše celé jméno" too_short: "Máte moc krátké jméno" ok: "Parádní jméno" username: @@ -442,7 +471,11 @@ cs: email_digests: title: "Když tady dlouho nebudu, chci emailem zaslat co je nového:" daily: "denně" + every_three_days: "každé tři dny" weekly: "týdně" + every_two_weeks: "každé dva týdny" + email_direct: "Zašli mi email, pokud mě někde cituje, odpoví na můj příspěvek, zmíní mé @jméno nebo mě pozve do tématu" + email_private_messages: "Zašli mi email, pokud mi někdo pošle zprávu" email_always: "Posílat upozorňovací emaily i když jsem zrovna na webu aktivní" other_settings: "Ostatní" categories_settings: "Kategorie" @@ -461,7 +494,7 @@ cs: auto_track_topics: "Automaticky sledovat témata, která navštívím" auto_track_options: never: "nikdy" - always: "vždy" + immediately: "ihned" after_n_seconds: one: "po 1 vteřině" few: "po {{count}} vteřinách" @@ -494,6 +527,7 @@ cs: none: "Zatím jste nikoho nepozval. Můžete poslat individuální pozvánku nebo pozvat skupinu lidí naráz pomocí nahrání souboru." text: "Hromadné pozvání s pomocí souboru" uploading: "Nahrávám..." + success: "Nahrání souboru proběhlo úspěšně. O dokončení celého procesu budete informování pomocí zprávy." error: "Nastala chyba při nahrávání '{{filename}}': {{message}}" password: title: "Heslo" @@ -517,6 +551,7 @@ cs: stream: posted_by: "Zaslal" sent_by: "Odeslal" + private_message: "zpráva" the_topic: "téma" loading: "Načítám..." errors: @@ -556,7 +591,11 @@ cs: mute: Ignorovat unmute: Zrušit ignorování last_post: Poslední příspěvek - last_post_lowercase: poslední příspěvek + last_reply_lowercase: poslední odpověď + replies_lowercase: + one: odpověď + few: odpovědi + other: odpovědí summary: enabled_description: "Čtete shrnutí tohoto tématu: nejzajímavější příspěvky podle komunity." description: "Obsahuje {{count}} odpovědí." @@ -569,7 +608,9 @@ cs: enable: "Schovat smazané příspěvky" disable: "Zobrazit smazané příspěvky" private_message_info: + title: "Zpráva" invite: "pozvat účastníka" + remove_allowed_user: "Určitě chcete odstranit {{name}} z této zprávy?" email: 'Email' username: 'Uživatelské jméno' last_seen: 'Naposledy viděn' @@ -581,6 +622,7 @@ cs: title: "Vytvořit nový účet" failed: "Něco se nepovedlo, možná je tato e-mailová adresa již použita. Zkuste použít formulář pro obnovení hesla." forgot_password: + title: "Obnovení hesla" action: "Zapomněl jsem své heslo" invite: "Vložte svoje uživatelské jméno nebo e-mailovou adresu a my vám zašleme postup pro obnovení hesla." reset: "Resetovat heslo" @@ -636,6 +678,7 @@ cs: emoji: "Emoji :smile:" add_warning: "Toto je oficiální varování." posting_not_on_topic: "Rozepsali jste odpověď na téma \"{{title}}\", ale nyní máte otevřené jiné téma." + saving_draft_tip: "ukládá se..." saved_draft_tip: "uloženo" saved_local_draft_tip: "uloženo lokálně" similar_topics: "Podobná témata" @@ -652,6 +695,8 @@ cs: reply_here: "Odpovědět sem" reply: "Odpovědět" cancel: "Zrušit" + create_topic: "Vytvořit téma" + create_pm: "Zpráva" title: "Nebo zmáčkněte Ctrl+Enter" users_placeholder: "Přidat uživatele" title_placeholder: "O čem je ve zkratce tato diskuze?" @@ -701,9 +746,11 @@ cs: units: "(počet hodin)" examples: 'Zadejte počet hodin (24).' notifications: + title: "oznámení o zmínkách pomocí @name, odpovědi na vaše příspěvky a témata, zprávy, atd." none: "Notifikace nebylo možné načíst." more: "zobrazit starší oznámení" total_flagged: "celkem nahlášeno příspěvků" + mentioned: "

      {{username}} {{description}}

      " quoted: "

      {{username}} {{description}}

      " replied: "

      {{username}} {{description}}

      " posted: "

      {{username}} {{description}}

      " @@ -711,6 +758,7 @@ cs: liked: "

      {{username}} {{description}}

      " private_message: "

      {{username}} {{description}}

      " invited_to_private_message: "

      {{username}} {{description}}

      " + invited_to_topic: "

      {{username}} {{description}}

      " invitee_accepted: "

      {{username}} přijal vaši pozvánku

      " moved_post: "

      {{username}} přesunul {{description}}

      " linked: "

      {{username}} {{description}}

      " @@ -737,6 +785,7 @@ cs: user: "Vyhledat příspěvky od @{{username}}" category: "Vyhledat v kategorii „{{category}}“" topic: "Vyhledat v tomto tématu" + private_messages: "Hledat ve zprávách" site_map: "přejít na jiný seznam témat nebo kategorii" go_back: 'jít zpět' not_logged_in_user: 'stránka uživatele s přehledem o aktuální činnosti a nastavení' @@ -756,6 +805,7 @@ cs: close_topics: "Zavřít téma" archive_topics: "Archivovat témata" notification_level: "Změnit úroveň upozornění" + choose_new_category: "Zvolte novou kategorii pro témata:" selected: one: "Vybrali jste 1 téma." few: "Vybrali jste {{count}} témata." @@ -770,6 +820,7 @@ cs: bookmarks: "V tématech nemáte žádné záložky." category: "V kategorii {{category}} nejsou žádná témata." top: "Nejsou tu žádná populární témata." + search: "There are no search results." educate: new: '

      Zde se zobrazují nová témata.

      Podle výchozího nastavení jsou za nová témata považována ta, která byla vytvořena v posledních 2 dnech.

      U těch se ukáže ukazatel Nové.

      Můžete to změnit ve vašem nastavení.

      ' unread: '

      Zde se zobrazují vaše nepřečtená témata.

      Podle výchozího nastavení jsou za nepřečtená témata, ukterých se zobrazuje počet nepřečtení 1, považována ta, která jste:

      • Vytvořil toto téma
      • Odpovědětl v tématu
      • Četl téma více než 4 minuty

      Nebo pokud jste nastavil téma jako Hlídané či Sledované pomocí nabídky na spodku každého tématu.

      You can change this in your preferences.

      ' @@ -783,10 +834,12 @@ cs: category: "V kategorii {{category}} nejsou žádná další témata." top: "Nejsou tu žádná další populární témata." bookmarks: "Žádná další oblíbená témata nejsou k dispozici." + search: "There are no more search results." topic: filter_to: "{{post_count}} příspěvků v tématu" create: 'Nové téma' create_long: 'Vytvořit nové téma' + private_message: 'Vytvořit zprávu' list: 'Témata' new: 'nové téma' unread: 'nepřečtený' @@ -871,11 +924,13 @@ cs: '0': 'Ignorujete všechna oznámení z tohoto tématu.' watching_pm: title: "Hlídání" + description: "Budete informováni o každém novém příspěvku v této zprávě. Vedle názvu tématu se objeví počet nepřečtených a nových příspěvků." watching: title: "Hlídané" description: "Budete informováni o každém novém příspěvku v tomto tématu. Vedle názvu tématu se objeví počet nepřečtených a nových příspěvků." tracking_pm: title: "Sledování" + description: "Počet nepřečtených a nových příspěvků se objeví vedle zprávy. Budete upozorněni, pokud někdo zmíní vaše @jméno nebo odpoví na váš příspěvek." tracking: title: "Sledované" description: "U tématu se zobrazí počet nepřečtených a nových příspěvků. Budete uporozněni když vás někdo zmíní jako @jmeno nebo odpoví na váš příspěvek." @@ -884,6 +939,7 @@ cs: description: "Budete informováni pokud někdo zmíní vaše @jméno nebo odpoví na váš příspěvek." regular_pm: title: "Normální" + description: "Budete upozorněni, když vás někdo zmíní vaše @jmeno nebo odpoví na váš příspěvek pomocí zprávy." muted_pm: title: "Ztišení" description: "Nikdy nedostanete oznámení týkající se čehokoliv v této zprávě." @@ -895,11 +951,21 @@ cs: delete: "Odstranit téma" open: "Otevřít téma" close: "Zavřít téma" + multi_select: "Zvolte příspěvky…" + auto_close: "Automaticky zavřít" + pin: "Připevnit téma" + unpin: "Odstranit připevnění" unarchive: "Navrátit z archivu" archive: "Archivovat téma" invisible: "Zneviditelnit" visible: "Zviditelnit" reset_read: "Vynulovat počet čtení" + feature: + pin: "Připevnit téma" + unpin: "Odstranit připevnění" + pin_globally: "Připnout téma globálně" + make_banner: "Banner Topic" + remove_banner: "Remove Banner Topic" reply: title: 'Odpovědět' help: 'začněte psát odpověď na toto téma' @@ -913,19 +979,50 @@ cs: title: 'Nahlásit' help: 'Soukromě nahlásit tento příspěvek moderátorům' success_message: 'Téma úspěšně nahlášeno.' + feature_topic: + title: "Povýšit téma" + pin: "Zobrazovat toto téma na vrcholu {{categoryLink}} kategorie." + confirm_pin: "Již máte {{count}} připevněných příspěvků. Příliš mnoho připevněných příspěvků může zatěžovat nové nebo anonymní uživatele. Určitě chcete připevnit další téma v této kategorii?" + unpin: "Odstranit toto téma z vrcholu {{categoryLink}} kategorie." + pin_note: "Uživatelé mohou odepnout téma sami pro sebe." + already_pinned: + zero: "V {{categoryLink}} nejsou žádná připevněná témata." + one: "V současnosti připevněná téma v {{categoryLink}}: 1." + other: "V současnosti připevněná téma v {{categoryLink}}: {{count}}." + pin_globally: "Zobrazit toto téma na vrcholu všech seznamů témat, dokud do správce neodepne." + confirm_pin_globally: "Již máte {{count}} globálně připevněných příspěvků. Příliš mnoho připevněných příspěvků může zatěžovat nové nebo anonymní uživatele. Určitě chcete připevnit další téma globálně?" + unpin_globally: "Odstranit toto téma z vrcholu všech seznamů s tématy." + global_pin_note: "Uživatelé mohou odepnout téma sami pro sebe." + already_pinned_globally: + zero: "Nemáte žádná globálně připevněná témata." + one: "V současnosti globálně připevněná témata: 1." + other: "V současnosti globálně připevněná témata: {{count}}." + make_banner: "Udělat z tohoto tématu banner, který se zobrazí na vrcholu všech stránek." + remove_banner: "Odstranit banner, který se zobrazuje na vrcholu všech stránek." + banner_note: "Uživatelé mohou odmítnout banner jeho zavřením. V jeden moment může být pouze jedno téma jako banner." + already_banner: + zero: "Žádné téma není jako banner." inviting: "Odesílám pozvánku..." automatically_add_to_groups_optional: "Tato pozvánka obsahuje také přístup do této skupiny: (volitelné, pouze administrátor)" automatically_add_to_groups_required: "Tato pozvánka obsahuje také přístup do těchto skupin: (Vyžadováno, pouze administrátor)" invite_private: + title: 'Pozvat do konverzace' email_or_username: "Email nebo uživatelské jméno pozvaného" email_or_username_placeholder: "emailová adresa nebo uživatelské jméno" action: "Pozvat" + success: "Pozvali jsme tohoto uživatele, aby se připojil do této zprávy." error: "Bohužel nastala chyba při odesílání pozvánky." group_name: "název skupiny" invite_reply: title: 'Pozvat k diskuzi' + username_placeholder: "uživatelské jméno" + action: 'Poslat pozvánku' to_forum: "Pošleme krátký email dovolující vašemu příteli se okamžitě zapojit s pomocí kliknutí na odkaz. Nebude potřeba registrace." + to_topic_username: "Zadali jste uživatelské jméno. Zašleme mu oznámení s pozváním do tohoto tématu." email_placeholder: 'jmeno@priklad.cz' + success_email: "Zaslali jsme pozvánku na {{emailOrUsername}}. Upozorníme vás až bude pozvánka použita. Své pozvánky můžete sledovat v tabulce pozvánek na svém uživatelském profilu." + success_username: "Pozvali jsme zadaného uživatele, aby se zúčastnil tématu." + error: "Bohužel se nepodařilo pozvat tuto osobu. Možná už byla pozvána? (Počet opakovaných pozvánek je omezen)." login_reply: 'Přihlaste se, chcete-li odpovědět' filters: n_posts: @@ -973,8 +1070,10 @@ cs: few: Máte označeny {{count}} příspěvky. other: Máte označeno {{count}} příspěvků. post: + reply: "Odpovídáte na {{link}} {{replyAvatar}} {{username}}" reply_topic: "Odpověď na {{link}}" quote_reply: "odpověď s citací" + edit: "Editujete {{link}} {{replyAvatar}} {{username}}" edit_reason: "Důvod: " post_number: "příspěvek č. {{number}}" last_edited_on: "příspěvek naposledy upraven" @@ -1071,6 +1170,8 @@ cs: inappropriate: "{{icons}} označili tento příspěvek jako nevhodný" notify_moderators: "{{icons}} nahlásili tento příspěvek" notify_moderators_with_url: "{{icons}} nahlásili tento příspěvek" + notify_user: "{{icons}} poslal zprávu" + notify_user_with_url: "{{icons}} poslal zprávu" bookmark: "{{icons}} si přidali příspěvek do záložek" like: "{{icons}} se líbí tento příspěvek" vote: "{{icons}} hlasovali pro tento příspěvek" @@ -1079,6 +1180,7 @@ cs: spam: "Označili jste tento příspěvek jako spam" inappropriate: "Označili jste tento příspěvek jako nevhodný" notify_moderators: "Nahlásili jste tento příspěvek" + notify_user: "Tomuto uživateli jste zaslali zprávu" bookmark: "Přidali jste si tento příspěvek do záložek" like: "Toto se vám líbí" vote: "Hlasovali jste pro tento příspěvek" @@ -1099,6 +1201,10 @@ cs: one: "Vy a 1 další člověk jste nahlásili tento příspěvek" few: "Vy a {{count}} další lidé jste nahlásili tento příspěvek" other: "Vy a {{count}} dalších lidí jste nahlásili tento příspěvek" + notify_user: + one: "Vy a 1 další uživatel jste poslali zprávu tomuto uživateli" + few: "Vy a {{count}} ostatní lidé jste poslali zprávu tomuto uživateli" + other: "Vy a {{count}} ostatních lidí jste poslali zprávu tomuto uživateli" bookmark: one: "Vy a 1 další člověk jste si přidali tento příspěvek do záložek" few: "Vy a {{count}} další lidé jste si přidali tento příspěvek do záložek" @@ -1128,6 +1234,10 @@ cs: one: "1 člověk nahlásil tento příspěvek" few: "{{count}} lidé nahlásili tento příspěvek" other: "{{count}} lidí nahlásilo tento příspěvek" + notify_user: + one: "1 člověk poslal zprávu tomuto uživateli" + few: "{{count}} lidé poslali zprávu tomuto uživateli" + other: "{{count}} lidí poslalo zprávu tomuto uživateli" bookmark: one: "1 člověk si přidal tento příspěvek do záložek" few: "{{count}} lidé si přidali tento příspěvek do záložek" @@ -1236,6 +1346,7 @@ cs: private_reminder: 'nahlášení jsou soukromá, viditelná pouze pro správce' action: 'Nahlásit příspěvek' take_action: "Zakročit" + notify_action: 'Zpráva' delete_spammer: "Odstranit spamera" delete_confirm: "Chystáte se odstranit %{posts} příspěvků a %{topics} témat od tohoto uživatele, smazat jeho účet, a vložit jeho emailovou adresu %{email} na seznam permanentně blokovaných. Jste si jistí, že je tento uživatel opravdu spamer?" yes_delete_spammer: "Ano, odstranit spamera" @@ -1256,6 +1367,7 @@ cs: flagging_topic: title: "Děkujeme, že pomáháte udržovat komunitu zdvořilou!" action: "Nahlásit téma" + notify_action: "Zpráva" topic_map: title: "Souhrn tématu" links_shown: "zobrazit všech {{totalLinks}} odkazů..." @@ -1288,15 +1400,24 @@ cs: posts_long: "v tomto tématu je {{number}} příspěvků" original_post: "Původní příspěvek" views: "Zobrazení" - views_lowercase: "zobrazení" + views_lowercase: + one: "zobrazení" + few: "zobrazení" + other: "zobrazení" replies: "Odpovědi" views_long: "toto téma bylo zobrazeno {{number}}krát" activity: "Aktivita" likes: "Líbí se" - likes_lowercase: "líbí se" + likes_lowercase: + one: "líbí se" + few: "líbí se" + other: "líbí se" likes_long: "v tomto tématu je {{number}} 'líbí se'" users: "Účastníci" - users_lowercase: "uživatelé" + users_lowercase: + one: "uživatel" + few: "uživatelé" + other: "uživatelů" category_title: "Kategorie" history: "Historie" changed_by: "od uživatele {{author}}" @@ -1316,6 +1437,9 @@ cs: read: title: "Přečtená" help: "témata, která jste si přečetli" + search: + title: "Vyhledat" + help: "prohledat všechna témata" categories: title: "Kategorie" title_in: "Kategorie - {{categoryName}}" @@ -1353,6 +1477,16 @@ cs: top: title: "Nejlepší" help: "výběr nejlepších témat za rok, měsíc, týden nebo den" + all: + title: "Za celou dobu" + yearly: + title: "Ročně" + monthly: + title: "Měsíčně" + weekly: + title: "Týdně" + daily: + title: "Denně" all_time: "Za celou dobu" this_year: "Letos" this_month: "Tenhle měsíc" @@ -1390,6 +1524,8 @@ cs: admins: 'Administrátoři:' blocked: 'Blokováno:' suspended: 'Zakázáno:' + private_messages_short: "Msgs" + private_messages_title: "Zprávy" space_free: "{{size}} prázdné" uploads: "Nahrané soubory" backups: "zálohy" @@ -1423,6 +1559,7 @@ cs: agree_title: "Potvrdit toto hlášení jako právoplatné a korektní" agree_flag_modal_title: "Schvaluji a..." agree_flag_hide_post: "Schvaluji (skrýt příspěvek + poslat soukromou zprávu)" + agree_flag_hide_post_title: "Skrýt tento příspěvek a automaticky odeslat zprávu, která uživatele žádá o editaci" agree_flag_restore_post: "Schvaluji (obnovit příspěvek)" agree_flag_restore_post_title: "Obnovit tento příspěvek" agree_flag: "Souhlasit s hlášením" @@ -1499,6 +1636,8 @@ cs: name: "Jméno" add: "Přidat" add_members: "Přidat členy" + custom: "Přizpůsobené" + automatic: "Automatické" automatic_membership_email_domains: "Uživatelé zaregistrovaní s emailem jehož doména se přesně shoduje s jednou z tohoto seznamu budou automaticky přidáni to této skupiny:" automatic_membership_retroactive: "Aplikovat stejné doménové pravidlo na už existující uživatele" api: @@ -1514,6 +1653,7 @@ cs: confirm_revoke: "Jste si jisti, že chcete tento klíč zrušit?" info_html: "Váš API klíč umožní vytvářet a aktualizovat témata pomocí JSONových volání." all_users: "Všichni uživatelé" + note_html: "Uchovejte tento klíč v bezpečí, každý, kdo má tento klíč, může libovolně vytvářet příspěvky na fóru i za ostatní uživatele." plugins: title: "Pluginy" installed: "Nainstalované pluginy" @@ -1531,15 +1671,18 @@ cs: read_only: enable: title: "Zapnout režim jen pro čtení" + label: "Zapnout režim jen pro čtení" confirm: "Určitě chcete zapnout režim jen pro čtení?" disable: title: "Vypnout režim jen pro čtení" + label: "Vypnout režim jen pro čtení" logs: none: "Zatím je log prázdný..." columns: filename: "Název souboru" size: "Velikost" upload: + label: "Nahrát" uploading: "Nahrávání..." success: "'{{filename}}' has successfully been uploaded." error: "There has been an error while uploading '{{filename}}': {{message}}" @@ -1547,18 +1690,22 @@ cs: is_running: "An operation is currently running..." failed: "The {{operation}} failed. Please check the logs." cancel: + label: "Zrušit" title: "Cancel the current operation" confirm: "Are you sure you want to cancel the current operation?" backup: + label: "Záloha" title: "Vytvořit zálohu" confirm: "Chcete začít novou zálohu?" download: + label: "Stáhnout" title: "Stáhnout zálohu" destroy: title: "Odstranit zálohu" confirm: "Are you sure you want to destroy this backup?" restore: is_disabled: "Restore is disabled in the site settings." + label: "Obnovit" title: "Restore the backup" confirm: "Are your sure you want to restore this backup?" rollback: @@ -1669,6 +1816,7 @@ cs: user_placeholder: "uživatelské jméno" address_placeholder: "jmeno@priklad.cz" type_placeholder: "souhrn, registrace..." + reply_key_placeholder: "klíč pro odpověď" skipped_reason_placeholder: "důvod" logs: title: "Logy a filtry" @@ -1712,8 +1860,11 @@ cs: unsuspend_user: "zrušit suspendování" grant_badge: "udělit odznak" revoke_badge: "vzít odznak" + check_email: "zkontrolujte email" delete_topic: "smazat téma" delete_post: "smazat příspěvek" + impersonate: "vydávat se za uživatele" + anonymize_user: "anonymní uživatel" screened_emails: title: "Filtrované emaily" description: "When someone tries to create a new account, the following email addresses will be checked and the registration will be blocked, or some other action performed." @@ -1736,6 +1887,7 @@ cs: label: "Nové:" ip_address: "IP adresa" add: "Přidat" + filter: "Vyhledat" logster: title: "Chybové záznamy" users: @@ -1840,8 +1992,13 @@ cs: approve_success: "Uživatel bys schválen a byl mu zaslán aktivační email s instrukcemi." approve_bulk_success: "Povedlo se! Všichni uživatelé byli schváleni a byly jim rozeslány notifikace." time_read: "Čas strávený čtením" + anonymize: "Anonymní uživatel" + anonymize_confirm: "Jsi si JISTÝ, že chceš udělat tento účet anonymním? Změní se uživatelské jméno a email a vymažou se všechny informace v profilu." + anonymize_yes: "Ano, udělejte tento účet anonymním" + anonymize_failed: "Nastal problém při anonymizování účtu." delete: "Smazat uživatele" delete_forbidden_because_staff: "Správci ani moderátoři nemůžou být odstraněni." + delete_posts_forbidden_because_staff: "Nemohu smazat všechny příspěvky administrátorů a moderátorů." delete_forbidden: one: "Uživatelé nemůžou být smazáni pokud mají příspěvky. Před smazáním uživatele smažte všechny jeho příspěvky. (Příspěvky starší než den nemůžou být smazány.)" few: "Uživatelé nemůžou být smazáni pokud mají příspěvky. Před smazáním uživatele smažte všechny jeho příspěvky. (Příspěvky starší než %{count} dny nemůžou být smazány.)" @@ -1877,6 +2034,8 @@ cs: suspend_modal_title: "Suspend User" trust_level_2_users: "Uživatelé důvěryhodnosti 2" trust_level_3_requirements: "Požadavky pro důvěryhodnost 3" + trust_level_locked_tip: "úroveň důvěryhodnosti uzamčena. Systém nebude povyšovat ani degradovat uživatele" + trust_level_unlocked_tip: "úroveň důvěryhodnosti odemčena. Systém může povyšovat nebo degradovat uživatele" lock_trust_level: "Zamknout úroveň důvěryhodnosti" unlock_trust_level: "Odemknout úroveň důvěryhodnosti" tl3_requirements: @@ -1892,19 +2051,38 @@ cs: posts_read: "Přečteno příspěvků" posts_read_all_time: "Přečteno příspěvků (od počátku věků)" flagged_posts: "Nahlášené příspěvky" + flagged_by_users: "Users Who Flagged" likes_given: "Rozdaných 'líbí se'" likes_received: "Obdržených 'líbí se'" + likes_received_days: "Obdržených 'líbí se': unikátní dny" + likes_received_users: "Obdržených 'líbí se': unikátní uživatelé" + qualifies: "Splňuje úroveň důvěryhodnosti 3." + does_not_qualify: "Nesplňuje úroveň důvěryhodnosti 3." + will_be_promoted: "Bude brzy povýšen." + will_be_demoted: "Bude brzy degradován." + on_grace_period: "Currently in promotion grace period, will not be demoted." + locked_will_not_be_promoted: "Úroveň důvěryhodnosti uzamčena. Nikdy nebude povýšen." + locked_will_not_be_demoted: "Úroveň důvěryhodnosti uzamčena. Nikdy nebude degradován." sso: + title: "Jednorázové přihlášení" external_id: "Externí ID" external_username: "Uživatelské jméno" external_name: "Jméno" external_email: "Email" external_avatar_url: "URL na profilový obrázek" user_fields: + title: "User Fields" + help: "Přidej fields, které tvoji uživatelé mohou vyplnit." + create: "Create User Field" + untitled: "Untitled" + name: "Field Name" + type: "Field Type" + description: "Field Description" save: "Uložit" edit: "Upravit" delete: "Smazat" cancel: "Zrušit" + delete_confirm: "Jsi si jistý, že chceš smazat toto user field?" required: title: "Povinné pro registraci?" enabled: "povinné" @@ -1913,7 +2091,12 @@ cs: title: "Editovatelné po registraci?" enabled: "editovatelné" disabled: "není editovatelné" + show_on_profile: + title: "Zveřejnit na uživatelském profilu?" + enabled: "zveřejněno na profilu" + disabled: "nezveřejněno na profilu" field_types: + text: 'Text Field' confirm: 'Potvrzení' site_settings: show_overriden: 'Zobrazit pouze změněná nastavení' @@ -1922,6 +2105,7 @@ cs: none: 'žádné' no_results: "Nenalezeny žádné výsledky." clear_filter: "Zrušit" + add_url: "přidat URL" categories: all_results: 'Všechny' required: 'Nezbytnosti' @@ -1941,6 +2125,7 @@ cs: uncategorized: 'Ostatní' backups: "Zálohy" login: "Login" + plugins: "Pluginy" badges: title: Odznaky new_badge: Nový odznak @@ -1973,6 +2158,8 @@ cs: image: Obrázek icon_help: "Použijte buď Font Awesome nebo URL k obrázku." trigger: Spouštěč + trigger_type: + user_change: "Když je uživatel upraven nebo vytvořen" preview: bad_count_warning: header: "VAROVÁNÍ!" @@ -1984,8 +2171,11 @@ cs: grant: with: %{username} emoji: + title: "Emoji" + add: "Vložit nový Emoji" name: "Jméno" image: "Obrázek" + delete_confirm: "Určitě chcete smazat :%{name}: emoji?" lightbox: download: "download" search_help: @@ -2020,6 +2210,7 @@ cs: dismiss_topics: 'x, t Dismiss Topics' actions: title: 'Actions' + bookmark_topic: 'f Toggle bookmark topic' pin_unpin_topic: 'shift+p Připnout/Odepnout téma' share_topic: 'shift+s Sdílet téma' share_post: 's Share post' @@ -2069,6 +2260,7 @@ cs: description: První úprava příspěvku. basic_user: name: Základní + description: Granted all essential community functions member: name: Člen regular: @@ -2081,6 +2273,8 @@ cs: autobiographer: name: Autor vlastního životopisu description: Vypněné informace v profilu. + anniversary: + name: Výročí nice_post: name: Zdařilý příspěvek description: Obdrženo 10 líbí se na příspěvku. Tento odznak můžete získat opakovaně diff --git a/config/locales/client.da.yml b/config/locales/client.da.yml index ff86f9206d..0fb91aed5e 100644 --- a/config/locales/client.da.yml +++ b/config/locales/client.da.yml @@ -108,7 +108,6 @@ da: show_more: "vis mere" show_help: "hjælp" links: "Links" - links_lowercase: "links" faq: "FAQ" guidelines: "Retningslinier" privacy_policy: "Privatlivspolitik" @@ -443,7 +442,6 @@ da: auto_track_topics: "Følg automatisk emner jeg åbner" auto_track_options: never: "aldrig" - always: "altid" after_n_seconds: one: "efter et sekund" other: "efter {{count}} sekunder" @@ -538,7 +536,6 @@ da: mute: Mute unmute: Unmute last_post: Sidste indlæg - last_post_lowercase: Sidste indlæg summary: enabled_description: "Du ser et sammendrag af dette emne: kun de mest interessante indlæg som andre finder interresante." description: "Der er {{count}} svar." @@ -1270,15 +1267,12 @@ da: other {}} original_post: "Oprindeligt indlæg" views: "Visninger" - views_lowercase: "visninger" replies: "Svar" views_long: "dette emne er blevet vist {{number}} gange" activity: "Aktivitet" likes: "Likes" - likes_lowercase: "likes" likes_long: "der er {{number}} likes i dette emne" users: "Deltagere" - users_lowercase: "brugere" category_title: "Kategori" history: "Historik" changed_by: "af {{author}}" diff --git a/config/locales/client.de.yml b/config/locales/client.de.yml index c16b27af06..09516ae707 100644 --- a/config/locales/client.de.yml +++ b/config/locales/client.de.yml @@ -108,7 +108,9 @@ de: show_more: "mehr anzeigen" show_help: "Hilfe" links: "Links" - links_lowercase: "Links" + links_lowercase: + one: "Link" + other: "Links" faq: "FAQ" guidelines: "Richtlinien" privacy_policy: "Datenschutzrichtlinie" @@ -195,6 +197,19 @@ de: title: search: "Suche nach Thema anhand von Name, URL oder ID:" placeholder: "Gib hier den Titel des Themas ein" + queue: + topic: "Thema:" + approve: 'Genehmigen' + reject: 'Ablehnen' + title: "Benötigt Genehmigung" + none: "Es sind keine Beiträge zur Überprüfung vorhanden." + edit: "Bearbeiten" + cancel: "Abbrechen" + confirm: "Änderungen speichern" + approval: + title: "Beitrag muss genehmigt werden" + description: "Wir haben deinen neuen Beitrag erhalten. Dieser muss allerdings zunächst durch einen Moderator freigeschaltet werden. Bitte habe etwas Geduld. " + ok: "OK" user_action: user_posted_topic: "{{user}} hat das Thema verfasst" you_posted_topic: "Du hast das Thema verfasst" @@ -376,6 +391,7 @@ de: upload_title: "Lade dein Bild hoch" upload_picture: "Bild hochladen" image_is_not_a_square: "Achtung: Wir haben dein Bild zugeschnitten, weil Höhe und Breite nicht übereingestimmt haben." + cache_notice: "Dein Profilbild wurde erfolgreich geändert. Aufgrund von Caching im Browser kann es allerdings eine Weile dauern, bis dieses angezeigt wird." change_profile_background: title: "Profilhintergrund" instructions: "Hintergrundbilder werden zentriert und haben eine Standardbreite von 850px." @@ -433,6 +449,7 @@ de: every_three_days: "alle drei Tage" weekly: "wöchentlich" every_two_weeks: "alle drei Tage" + email_direct: "Sende mir eine E-Mail, wenn mich jemand zitiert, auf meine Beiträge antwortet, meinen @Namen erwähnt oder mich zu einem Thema einlädt." email_private_messages: "Sende mir eine E-Mail, wenn mir jemand eine Nachricht sendet." email_always: "E-Mail-Benachrichtigungen nicht unterdrücken, während ich im Forum aktiv bin" other_settings: "Andere" @@ -450,7 +467,7 @@ de: auto_track_topics: "Betrachteten Themen automatisch folgen" auto_track_options: never: "niemals" - always: "immer" + immediately: "sofort" after_n_seconds: one: "nach einer Sekunde" other: "nach {{count}} Sekunden" @@ -545,7 +562,10 @@ de: mute: Stummschalten unmute: Stummschaltung aufheben last_post: Letzter Beitrag - last_post_lowercase: letzter Beitrag + last_reply_lowercase: letzte Antwort + replies_lowercase: + one: Antwort + other: Antworten summary: enabled_description: "Du siehst gerade eine Zusammenfassung des Themas: die interessantesten Beiträge, die von der Community bestimmt wurden." description: "Es gibt {{count}} Antworten." @@ -955,7 +975,7 @@ de: email_or_username: "E-Mail-Adresse oder Benutzername des Eingeladenen" email_or_username_placeholder: "E-Mail-Adresse oder Benutzername" action: "Einladen" - success: "Wir haben den Benutzer eingeladen, an dieser Unterhaltung teilzunehmen." + success: "Wir haben den Benutzer gebeten, sich an dieser Unterhaltung zu beteiligen." error: "Entschuldige, es gab einen Fehler beim Einladen des Benutzers." group_name: "Gruppenname" invite_reply: @@ -964,8 +984,13 @@ de: action: 'Einladung versenden' help: 'per E-Mail oder Benachrichtigung weitere Personen zu diesem Thema einladen' to_forum: "Wir senden deinem Freund eine kurze E-Mail, die es ihm ermöglicht, dem Forum sofort beizutreten. Es ist keine Anmeldung erforderlich." + sso_enabled: "Gib den Benutzername der Person ein, die du zu diesem Thema einladen willst." to_topic_blank: "Gib den Benutzername oder die E-Mail-Adresse der Person ein, die du zu diesem Thema einladen willst." + to_topic_email: "Du hast eine E-Mail-Adresse eingegeben. Wir werden eine Einladung versenden, die ein direktes Antworten auf dieses Thema ermöglicht." + to_topic_username: "Du hast einen Benutzernamen eingegeben. Wir werden diesen Benutzer benachrichtigen und zur Teilnahme an diesem Thema einladen." email_placeholder: 'name@example.com' + success_email: "Wir haben an {{email}} eine Einladung verschickt und werden dich benachrichtigen, sobald die Einladung angenommen wurde. In deinem Benutzerprofil kannst du alle deine Einladungen überwachen." + success_username: "Wir haben den Benutzer gebeten, sich an diesem Thema zu beteiligen." error: "Es tut uns leid, wir konnten diese Person nicht einladen. Wurde diese Person vielleicht schon eingeladen? (Einladungen sind in ihrer Zahl beschränkt)" login_reply: 'Anmelden, um zu antworten' filters: @@ -1323,15 +1348,21 @@ de: Dieses Thema hat {count, plural, one {1 Antwort} other {# Antworten}} {ratio, select, low {mit einem hohen Verhältnis von Likes zu Beiträgen} med {mit einem sehr hohen Verhältnis von Likes zu Beiträgen} high {mit einem extrem hohen Verhältnis von Likes zu Beiträgen} other {}} original_post: "Original-Beitrag" views: "Aufrufe" - views_lowercase: "Aufrufe" + views_lowercase: + one: "Aufruf" + other: "Aufrufe" replies: "Antworten" views_long: "dieses Thema wurde {{number}} mal betrachtet" activity: "Aktivität" likes: "Likes" - likes_lowercase: "Likes" + likes_lowercase: + one: "Like" + other: "Likes" likes_long: "es gibt {{number}} Likes in diesem Thema" users: "Benutzer" - users_lowercase: "Benutzer" + users_lowercase: + one: "Benutzer" + other: "Benutzer" category_title: "Kategorie" history: "Verlauf" changed_by: "von {{author}}" @@ -1550,6 +1581,8 @@ de: automatic: "Automatisch" automatic_membership_email_domains: "Benutzer, deren E-Mail-Domain mit einem der folgenden Listeneinträge genau übereinstimmt, werden automatisch zu dieser Gruppe hinzugefügt:" automatic_membership_retroactive: "Diese Regel auch auf existierende Benutzer anwenden, um diese zur Gruppe hinzuzufügen." + default_title: "Standardtitel für alle Benutzer in dieser Gruppe" + primary_group: "Automatisch als primäre Gruppe festlegen" api: generate_master: "Master API Key erzeugen" none: "Es gibt momentan keine aktiven API-Keys" diff --git a/config/locales/client.es.yml b/config/locales/client.es.yml index b764da1c3f..03502feabd 100644 --- a/config/locales/client.es.yml +++ b/config/locales/client.es.yml @@ -108,7 +108,6 @@ es: show_more: "ver más" show_help: "ayuda" links: "Enlaces" - links_lowercase: "Enlaces" faq: "FAQ" guidelines: "Directrices" privacy_policy: "Política de Privacidad" @@ -452,7 +451,6 @@ es: auto_track_topics: "Seguir automáticamente temas en los que entre" auto_track_options: never: "nunca" - always: "siempre" after_n_seconds: one: "después de 1 segundo" other: "después de {{count}} segundos" @@ -547,7 +545,6 @@ es: mute: Silenciar unmute: No silenciar last_post: Último post - last_post_lowercase: Última publicación summary: enabled_description: "Estás viendo un resumen de este tema: los posts más interesantes determinados por la comunidad." description: "Hay {{count}} respuestas." @@ -1332,15 +1329,12 @@ es: other {}} original_post: "Post Original" views: "Visitas" - views_lowercase: "Vistas" replies: "Respuestas" views_long: "este tema se ha visto {{number}} veces" activity: "Actividad" likes: "Likes" - likes_lowercase: "Likes" likes_long: "este tema tiene {{number}} me gusta" users: "Usuarios" - users_lowercase: "usuarios" category_title: "Categoría" history: "Historia" changed_by: "por {{author}}" diff --git a/config/locales/client.fa_IR.yml b/config/locales/client.fa_IR.yml index 9053b1127b..6b8c7aa649 100644 --- a/config/locales/client.fa_IR.yml +++ b/config/locales/client.fa_IR.yml @@ -92,7 +92,8 @@ fa_IR: show_more: "بیش‌تر نشان بده" show_help: "کمک" links: "پیوندها" - links_lowercase: "پیوندها" + links_lowercase: + other: "پیوندها" faq: "پرسش‌های متداول" guidelines: "راهنماها" privacy_policy: "سیاست حریم خصوصی" @@ -175,6 +176,19 @@ fa_IR: title: search: "جستجو برای یک موضوع از روی نام، نشانی (url) یا شناسه (id)" placeholder: "سرنویس موضوع را اینجا بنویسید" + queue: + topic: "جستار" + approve: 'تصویب' + reject: 'رد کردن' + title: "به تایید نیاز است" + none: "نوشته ای برای بازبینی وجود ندارد." + edit: "ویرایش" + cancel: "لغو کردن" + confirm: "ذخیره سازی تغییرها" + approval: + title: "نوشته نیاز به تایید دارد" + description: "ما نوشته شما را دریافت کرده ایم ولی نیاز به تایید آن توسط یکی از مدیران است قبل از اینکه نمایش داده شود. لطفا صبر داشته باشید." + ok: "باشه" user_action: user_posted_topic: "{{user}}نوشته شدموضوع" you_posted_topic: "شما در این موضوع نوشته گذاشتید" @@ -426,7 +440,7 @@ fa_IR: auto_track_topics: "دنبال کردن خودکار موضوعاتی که وارد می‌شوم" auto_track_options: never: "هرگز" - always: "همیشه" + immediately: "فورا" after_n_seconds: other: "پس از {{count}} ثانیه" after_n_minutes: @@ -519,7 +533,9 @@ fa_IR: mute: بی صدا unmute: صدادار last_post: آخرین نوشته - last_post_lowercase: آخرین نوشته + last_reply_lowercase: آخرین پاسخ + replies_lowercase: + other: 'پاسخ ها ' summary: enabled_description: "شما خلاصه ای از این موضوع را می بینید: بالاترین‌ نوشته های انتخاب شده توسط انجمن." description: "{{count}} پاسخ" @@ -1269,15 +1285,18 @@ fa_IR: other {}} original_post: "نوشته اصلی" views: "نمایش‌ها" - views_lowercase: "نمایش‌ها" + views_lowercase: + other: "بازدیدها" replies: "پاسخ‌ها" views_long: "از این موضوع {{number}} بار بازدید شده" activity: "فعالیت" likes: "پسندها" - likes_lowercase: "پسند ها" + likes_lowercase: + other: "پسند ها" likes_long: "{{number}} پسند در این موضوع وجود دارد" users: "کاربران" - users_lowercase: "کاربران" + users_lowercase: + other: "کاربران" category_title: "دسته" history: "تاریخچه" changed_by: "توسط {{author}}" @@ -1491,6 +1510,8 @@ fa_IR: automatic: "خودکار" automatic_membership_email_domains: " کاربرانی که با ایمیل دامنه ثبت نام کرده اند،دقیقا شبیه دامنه های لیست، بصورت خودکار به این گروه اضافه می شوند :" automatic_membership_retroactive: "درخواست همان قاعده دامنه ایمیل برای اضافه کردن برای کاربران ثبت نام کرده" + default_title: "عنوان را پیش فرض کن برای تمام اعضا در این گروه" + primary_group: "بطور خودکار به گروه اصلی تبدیل شد" api: generate_master: "ایجاد کلید اصلی API" none: "هم اکنون هیچ کلید API فعالی وجود ندارد" diff --git a/config/locales/client.fi.yml b/config/locales/client.fi.yml index 0ee1226e4e..73f9c01501 100644 --- a/config/locales/client.fi.yml +++ b/config/locales/client.fi.yml @@ -108,7 +108,9 @@ fi: show_more: "näytä lisää" show_help: "ohje" links: "Linkit" - links_lowercase: "linkit" + links_lowercase: + one: "linkki" + other: "linkit" faq: "UKK" guidelines: "Ohjeet" privacy_policy: "Rekisteriseloste" @@ -195,6 +197,19 @@ fi: title: search: "Etsi ketjua nimen, url:n tai id:n perusteella" placeholder: "kirjoita ketjun otsikko tähän" + queue: + topic: "Ketju:" + approve: 'Hyväksy' + reject: 'Hylkää' + title: "Odottaa hyväksyntää" + none: "Tarkastettavia viestejä ei ole" + edit: "Muokkaa" + cancel: "Peruuta" + confirm: "Tallenna muutokset" + approval: + title: "Viesti odottaa hyväksyntää" + description: "Olemme vastaanottaneet viestisi, mutta se täytyy vielä hyväksyä ennen, kuin se näytetään sivustolla. Ole kärsivällinen." + ok: "OK" user_action: user_posted_topic: "{{user}} kirjoitti ketjuun" you_posted_topic: "Sinä kirjoitit ketjuun" @@ -452,7 +467,7 @@ fi: auto_track_topics: "Seuraa automaattisesti ketjuja, jotka avaan" auto_track_options: never: "ei koskaan" - always: "aina" + immediately: "heti" after_n_seconds: one: "yhden sekunnin jälkeen" other: "{{count}} sekunnin jälkeen" @@ -530,7 +545,7 @@ fi: close: "Sulje" assets_changed_confirm: "Sivustolla on tehty päivityksiä. Ladataanko uudelleen?" logout: "Sinut kirjattiin ulos." - refresh: "Lataa uudelleen" + refresh: "Lataa sivu uudelleen" read_only_mode: enabled: "Ylläpitäjä on käynnistänyt vain luku -tilan. Voit jatkaa sivuston selaamista, mutta osa toiminallisuudesta on poistettu käytöstä." login_disabled: "Kirjautuminen ei ole käytössä sivuston ollessa vain luku -tilassa." @@ -547,7 +562,10 @@ fi: mute: Vaienna unmute: Poista vaimennus last_post: Viimeisin viesti - last_post_lowercase: viimeisin viesti + last_reply_lowercase: edellinen vastaus + replies_lowercase: + one: vastaus + other: vastaukset summary: enabled_description: "Tarkastelet tiivistelmää tästä ketjusta, sen mielenkiintoisimpia viestejä käyttäjien toiminnan perusteella." description: "Tässä kejussa on {{count}} viestiä." @@ -1332,15 +1350,21 @@ fi: other {}} original_post: "Aloitusviesti" views: "Katselut" - views_lowercase: "katselut" + views_lowercase: + one: "katselu" + other: "katselut" replies: "Vastaukset" views_long: "tätä ketjua on katseltu {{number}} kertaa" activity: "Toiminta" likes: "Tykkäykset" - likes_lowercase: "tykkäykset" + likes_lowercase: + one: "tykkäys" + other: "tykkäykset" likes_long: "tässä ketjussa on {{number}} tykkäystä" users: "Käyttäjät" - users_lowercase: "käyttäjät" + users_lowercase: + one: "käyttäjä" + other: "käyttäjät" category_title: "Alue" history: "Historia" changed_by: "käyttäjältä {{author}}" @@ -1559,6 +1583,8 @@ fi: automatic: "Automaattiset" automatic_membership_email_domains: "Käyttäjät, jotka luovat tunnuksen sähköpostiosoitteella, jonka verkkotunnus on tällä listalla, lisätään tähän ryhmään:" automatic_membership_retroactive: "Lisää jo olemassa olevat käyttäjät käyttäen samaa sääntöä verkkotunnuksista" + default_title: "Tämä ryhmän jäsenten oletustitteli" + primary_group: "Aseta automaattisesti ensisijaiseksi ryhmäksi" api: generate_master: "Luo rajapinnan pääavain" none: "Aktiivisia API avaimia ei ole määritelty." diff --git a/config/locales/client.fr.yml b/config/locales/client.fr.yml index 0e2947af81..b80985a532 100644 --- a/config/locales/client.fr.yml +++ b/config/locales/client.fr.yml @@ -108,7 +108,9 @@ fr: show_more: "afficher plus" show_help: "aide" links: "Liens" - links_lowercase: "liens" + links_lowercase: + one: "lien" + other: "liens" faq: "FAQ" guidelines: "Règlement" privacy_policy: "Politique de confidentialité" @@ -186,6 +188,8 @@ fr: undo: "Annuler" revert: "Rétablir" failed: "Echec" + switch_to_anon: "Mode anonyme" + switch_from_anon: "Sortir du mode anonyme" banner: close: "Ignorer cette bannière." choose_topic: @@ -193,6 +197,19 @@ fr: title: search: "Rechercher un sujet par son nom, url ou id :" placeholder: "renseignez ici le titre du sujet" + queue: + topic: "Sujet :" + approve: 'Approuver' + reject: 'Rejeter' + title: "Nécessite l'approbation" + none: "Il n'y a pas de messages à vérifier." + edit: "Éditer" + cancel: "Annuler" + confirm: "Sauvegarder les changements" + approval: + title: "Ce message doit être approuvé." + description: "Votre nouveau message a bien été envoyé, mais il doit être approuvé par un modérateur avant d'apparaître publiquement. Merci de votre patience." + ok: "OK" user_action: user_posted_topic: "{{user}} a démarré le sujet" you_posted_topic: "Vous avez démarré le sujet" @@ -374,6 +391,7 @@ fr: upload_title: "Envoyer votre avatar" upload_picture: "Envoyer une image" image_is_not_a_square: "Attention : nous avons découpé votre image; la largeur et la hauteur n'étaient pas égales." + cache_notice: "Votre avatar a été mis à jour, mais il se peut qu'il mette un certain temps à apparaître à cause des caches de navigateur." change_profile_background: title: "Arrière plan du profil" instructions: "L'arrière-plan du profil sera centré avec une largeur par défaut de 850 pixels." @@ -431,6 +449,7 @@ fr: every_three_days: "tous les trois jours" weekly: "hebdomadaire" every_two_weeks: "toutes les deux semaines" + email_direct: "M'envoyer un courriel quand quelqu'un me cite, répond à mon message ou mentionne mon @pseudo ou m'invite à rejoindre un sujet" email_private_messages: "M'envoyer un courriel quand quelqu'un m'envoie un message privé" email_always: "Ne pas recevoir de courriel de notifications lorsque je suis actif sur le site" other_settings: "Autre" @@ -448,7 +467,7 @@ fr: auto_track_topics: "Suivre automatiquement les sujets que je consulte" auto_track_options: never: "jamais" - always: "toujours" + immediately: "immédiatement" after_n_seconds: one: "après une seconde" other: "après {{count}} secondes" @@ -543,7 +562,10 @@ fr: mute: Désactiver unmute: Activer last_post: Dernier message - last_post_lowercase: dernier message + last_reply_lowercase: dernière réponse + replies_lowercase: + one: réponse + other: réponses summary: enabled_description: "Vous visualisez un résumé de ce sujet : les messages importants choisis par la communauté." description: "Il y a {{count}} réponses." @@ -874,7 +896,7 @@ fr: description: "Vous serez notifier de chaque nouveau message de ce sujet. Les nombres de messages non lus et de nouveaux messages apparaîtront également à côté du sujet." tracking_pm: title: "Suivi simple" - description: "Le nombre de publications non lues et nouvelles apparaîtra à côté du message. Vous serez averti si quelqu'un mentionne votre @pseudo ou réponds à votre publication." + description: "Le nombre de publications non lues et nouvelles apparaîtra à côté du message. Vous serez averti si quelqu'un mentionne votre @pseudo ou répond à votre publication." tracking: title: "Suivi" description: "Le nombre de messages non lus et de nouveaux messages apparaîtra à côté du sujet. Vous serez averti si quelqu'un mentionne votre @pseudo ou répond à votre message." @@ -883,7 +905,7 @@ fr: description: "Vous serez averti si quelqu'un mentionne votre @pseudo ou répond à votre message." regular_pm: title: "Normal" - description: "Vous serez averti si quelqu'un mentionne votre @pseudo ou réponds à votre publication dans le message." + description: "Vous serez averti si quelqu'un mentionne votre @pseudo ou répond à votre publication dans le message." muted_pm: title: "Silencieux" description: "Vous ne serez jamais averti de quoi que ce soit à propos de ce message." @@ -895,11 +917,21 @@ fr: delete: "Supprimer Sujet" open: "Ouvrir Sujet" close: "Fermer le sujet" + multi_select: "Sélectionner les messages..." + auto_close: "Fermeture automatique..." + pin: "Épingler la discussion..." + unpin: "Désépingler la discussion..." unarchive: "Désarchiver le sujet" archive: "Archiver le sujet" invisible: "Retirer de la liste des sujets" visible: "Afficher dans la liste des sujets" reset_read: "Réinitialiser les lectures" + feature: + pin: "Épingler la discussion" + unpin: "Désépingler la discussion" + pin_globally: "Épingler le sujet globalement" + make_banner: "Bannière de sujet" + remove_banner: "Retirer la bannière de sujet" reply: title: 'Répondre' help: 'commencez à répondre à ce sujet' @@ -945,18 +977,22 @@ fr: email_or_username: "Adresse de courriel ou @pseudo de l'invité" email_or_username_placeholder: "adresse de courriel ou @pseudo" action: "Inviter" - success: "Nous avons invité cet utilisateur à participer à ce message." + success: "Nous avons invité cet utilisateur à participer à cette discussion." error: "Désolé, il y a eu une erreur lors de l'invitation de cet utilisateur." group_name: "nom du groupe" invite_reply: title: 'Inviter' + username_placeholder: "pseudo" action: 'Envoyer une invitation' help: 'inviter d''autres personnes sur ce sujet par email ou notifications' to_forum: "Nous allons envoyer un courriel à votre ami pour lui permettre de participer au forum juste en cliquant sur un lien, sans qu'il ait à se connecter." - to_topic_blank: "Entrez le nom d'utilisateur ou l'adresse email de la personne que vous souhaitez inviter sur ce sujet." + sso_enabled: "Entrez le nom d'utilisateur de la personne que vous souhaitez inviter sur ce sujet." + to_topic_blank: "Entrez le pseudo ou l'adresse email de la personne que vous souhaitez inviter sur ce sujet." to_topic_email: "Vous avez entré une adresse email. Nous allons envoyer une invitation à votre ami lui permettant de répondre immédiatement à ce sujet." - to_topic_username: "Vous avez entré un nom d'utilisateur. Nous allons envoyer une notification à cet utilisateur avec un lien l'invitant sur ce sujet." + to_topic_username: "Vous avez entré un pseudo. Nous allons envoyer une notification à cet utilisateur avec un lien l'invitant sur ce sujet." email_placeholder: 'nom@exemple.com' + success_email: "Nous avons envoyé un email à {{emailOrUsername}}. Nous vous avertirons lorsqu'il aura répondu à votre invitation. Suivez l'état de vos invitations dans l'onglet prévu à cet effet sur votre page utilisateur." + success_username: "Nous avons invité cet utilisateur à participer à ce sujet." error: "Désolé, nous n'avons pas pu inviter cette personne. Elle a peut-être déjà été invitée ? (Le nombre d'invitations est limité)" login_reply: 'Se connecter pour répondre' filters: @@ -1318,15 +1354,21 @@ fr: other {}} original_post: "Message original" views: "Vues" - views_lowercase: "vues" + views_lowercase: + one: "vue" + other: "vues" replies: "Réponses" views_long: "ce sujet a été vu {{number}} fois" activity: "Activité" likes: "J'aime" - likes_lowercase: "j'aimes" + likes_lowercase: + one: "J'aime" + other: "J'aime" likes_long: "il y a {{number}} j'aime dans ce sujet" users: "Utilisateurs" - users_lowercase: "utilisateurs" + users_lowercase: + one: "utilisateur" + other: "utilisateurs" category_title: "Catégorie" history: "Historique" changed_by: "par {{author}}" @@ -1387,6 +1429,17 @@ fr: top: title: "Top" help: "les meilleurs sujets de l'année, du mois, de la semaine ou du jour" + all: + title: "depuis toujours" + yearly: + title: "Annuel" + monthly: + title: "Mensuel" + weekly: + title: "Hebdomadaire" + daily: + title: "Quotidien" + all_time: "Depuis toujours" this_year: "Cette année" this_month: "Ce mois-ci" this_week: "Cette semaine" @@ -1534,6 +1587,8 @@ fr: automatic: "Automatique" automatic_membership_email_domains: "Les utilisateurs qui s'enregistrent avec un domaine courriel qui correspond exactement à un élément de cette liste seront automatiquement ajoutés à ce groupe:" automatic_membership_retroactive: "Appliquer la même règle de domaine courriel pour les utilisateurs existants" + default_title: "Titre par défaut pour tous les utilisateurs de ce groupe" + primary_group: "Définir comme groupe primaire automatiquement" api: generate_master: "Générer une clé Maître pour l'API" none: "Il n'y a pas de clés API actives en ce moment." diff --git a/config/locales/client.he.yml b/config/locales/client.he.yml index 611655d6d4..4bf9f8fc77 100644 --- a/config/locales/client.he.yml +++ b/config/locales/client.he.yml @@ -108,7 +108,6 @@ he: show_more: "הראה עוד" show_help: "עזרה" links: "קישורים" - links_lowercase: "קישורים" faq: "שאלות נפוצות" guidelines: "כללי התנהלות" privacy_policy: "מדיניות פרטיות" @@ -452,7 +451,6 @@ he: auto_track_topics: "מעקב אוטומטי נושאים אליהם נכנסתי" auto_track_options: never: "אף פעם" - always: "תמיד" after_n_seconds: one: "אחרי שנייה אחת" other: "אחרי {{count}} שניות" @@ -547,7 +545,6 @@ he: mute: השתק unmute: בטל השתקה last_post: הודעה אחרונה - last_post_lowercase: פרסום אחרון summary: enabled_description: "אתם צופים בסיכום נושא זה: הפרסומים המעניינים ביותר כפי שסומנו על ידי הקהילה." description: "ישנן {{count}} תגובות" @@ -1304,15 +1301,12 @@ he: אחר {}} original_post: "הודעה מקורית" views: "צפיות" - views_lowercase: "תצוגות" replies: "תגובות" views_long: "הנושא הזה נצפה {{number}} פעמים" activity: "פעילות" likes: "לייקים" - likes_lowercase: "לייקים" likes_long: "יש {{number}} לייקים לנושא הזה" users: "משתמשים" - users_lowercase: "משתמשים" category_title: "קטגוריה" history: "היסטוריה" changed_by: "מאת {{author}}" diff --git a/config/locales/client.id.yml b/config/locales/client.id.yml index a1ee66ad0e..349e5d8df3 100644 --- a/config/locales/client.id.yml +++ b/config/locales/client.id.yml @@ -90,7 +90,6 @@ id: show_more: "show more" show_help: "Bantuan" links: "Links" - links_lowercase: "links" faq: "FAQ" guidelines: "Guidelines" privacy_policy: "Privacy Policy" @@ -285,7 +284,6 @@ id: weekly: "mingguan" auto_track_options: never: "tidak pernah" - always: "selalu" password: title: "Password" too_short: "Password kamu terlalu pendek." diff --git a/config/locales/client.it.yml b/config/locales/client.it.yml index e61067cf25..2305734df4 100644 --- a/config/locales/client.it.yml +++ b/config/locales/client.it.yml @@ -108,7 +108,6 @@ it: show_more: "Altro" show_help: "aiuto" links: "Link" - links_lowercase: "collegamenti" faq: "FAQ" guidelines: "Linee Guida" privacy_policy: "Tutela Privacy" @@ -452,7 +451,6 @@ it: auto_track_topics: "Segui automaticamente gli argomenti che leggo" auto_track_options: never: "mai" - always: "sempre" after_n_seconds: one: "per un minuto" other: "dopo {{count}} secondi" @@ -547,7 +545,6 @@ it: mute: Ignora unmute: Attiva last_post: Ultimo messaggio - last_post_lowercase: ultimo messaggio summary: enabled_description: "Stai visualizzando un riepilogo dell'argomento: è la comunità a determinare quali sono i messaggi più interessanti." description: "Ci sono {{count}} risposte." @@ -1284,15 +1281,12 @@ it: Questo argomento ha {count, plural, one {1 risposta} other {# risposte}} {ratio, select, low {con un alto rapporto "mi piace" / messaggi} med {con un altissimo rapporto "mi piace" / messaggi} high {con un estremamente alto rapporto "mi piace" / messaggi} other {}} original_post: "Messaggio Originale" views: "Visualizzazioni" - views_lowercase: "visualizzazioni" replies: "Risposte" views_long: "questo argomento è stato visualizzato {{number}} volte" activity: "Attività" likes: "Mi piace" - likes_lowercase: "mi piace" likes_long: "ci sono {{number}} \"Mi piace\" in questo argomento" users: "Utenti" - users_lowercase: "utenti" category_title: "Categoria" history: "Storia" changed_by: "da {{author}}" diff --git a/config/locales/client.ja.yml b/config/locales/client.ja.yml index 609d5a5fd3..5b6c0a0e84 100644 --- a/config/locales/client.ja.yml +++ b/config/locales/client.ja.yml @@ -76,6 +76,7 @@ ja: email: 'メールでこのリンクを送る' topic_admin_menu: "トピック管理" emails_are_disabled: "全てのメールアドレスの送信が管理者によって無効化されています。全ての種類のメール通知は行われません" + s3_deprecation_warning: "ご注意下さい。Amazon S3への対応ですが間もなく廃止されます。この リンク先に説明されているようにローラル・ストレージに切り替えて下さい。" edit: 'このトピックのタイトルとカテゴリを編集' not_implemented: "申し訳ありませんが、この機能はまだ実装されていません" no_value: "いいえ" @@ -91,7 +92,8 @@ ja: show_more: "もっと見る" show_help: "ヘルプ" links: "リンク" - links_lowercase: "リンク" + links_lowercase: + other: "リンク集" faq: "よくある質問" guidelines: "ガイドライン" privacy_policy: "プライバシーポリシー" @@ -100,7 +102,7 @@ ja: mobile_view: "モバイル表示" desktop_view: "デスクトップ表示" you: "あなた" - or: "or" + or: "あるいは" now: "たった今" read_more: 'もっと読む' more: "More" @@ -118,11 +120,11 @@ ja: about: simple_title: "このサイトについて" title: "%{title}について" - stats: "Site Statistics" + stats: " サイト統計" our_admins: "管理者" our_moderators: "モデレーター" stat: - all_time: "All Time" + all_time: "今まで" last_7_days: "過去7日間" last_30_days: "過去30日間" like_count: "いいね！" @@ -165,6 +167,8 @@ ja: undo: "取り消す" revert: "戻す" failed: "失敗" + switch_to_anon: "匿名モード" + switch_from_anon: "匿名モード停止" banner: close: "バナーを閉じる" choose_topic: @@ -172,6 +176,19 @@ ja: title: search: "トピック名、URL、または ID でトピックを検索:" placeholder: "ここにトピックのタイトルを入力" + queue: + topic: "トピック：" + approve: '承認' + reject: 'リジェクト' + title: "承認待ち" + none: "レビュー待ちの投稿はございません。" + edit: "編集" + cancel: "取り消し" + confirm: "変更を保存" + approval: + title: "この投稿は承認が必要" + description: "投稿された新規のポストは受付されましたがモデレイターによる承認が必要です。もう少々お待ち下さい。" + ok: "実行" user_action: user_posted_topic: "{{user}} が トピック を作成" you_posted_topic: "あなた が トピック を作成" @@ -191,10 +208,18 @@ ja: title: "ユーザ" likes_given: "与えた" likes_received: "もらった" + topics_entered: "入力された" + topics_entered_long: "入力されたトピック数" time_read: "読んだ時間" topic_count: "トピック" + topic_count_long: "作成されたトピック数" post_count: "返信" + post_count_long: "投稿された回答数" no_results: "結果はありませんでした" + days_visited: "訪問数" + days_visited_long: "訪問された日数" + posts_read: "閲覧済み" + posts_read_long: "閲覧された投稿数" total_rows: other: "%{count} 人のユーザ" groups: @@ -215,6 +240,8 @@ ja: '2': "「いいね！」 された" '3': "ブックマーク" '4': "トピック" + '5': "回答数" + '6': "レスポンス数" '7': "タグ付け" '9': "引用" '10': "お気に入り" @@ -259,6 +286,8 @@ ja: mute: "ミュート" edit: "プロフィールを編集" download_archive: "自分の投稿をダウンロード" + new_private_message: "新規メッセージ" + private_message: "メッセージ" private_messages: "メッセージ" activity_stream: "アクティビティ" preferences: "設定" @@ -336,6 +365,8 @@ ja: uploaded_avatar_empty: "カスタム画像を追加" upload_title: "画像をアップロード" upload_picture: "画像アップロード" + image_is_not_a_square: " ご注意ください。アップロードされた画像はクロップされました。高さと幅が同じ長さではありませんでした。" + cache_notice: "プロフィール画像の変更は無事に完了されましたがブラウザのキャッシングによって反映されるまで少々時間が掛かる場合もあります。" change_profile_background: title: "プロフィール背景" instructions: "プロフィール背景は、幅850pxでセンタリングされます" @@ -355,6 +386,7 @@ ja: name: title: "名前" instructions: "フルネーム(任意)" + instructions_required: "氏名" too_short: "名前が短すぎます" ok: "よい名前です" username: @@ -392,6 +424,8 @@ ja: every_three_days: "３日毎" weekly: "毎週" every_two_weeks: "２週間に１回" + email_direct: "投稿されたポストに対する回答があった場合または自分のユーザーネームのメンションがあった場合または他ユーザーより自分の名前がタグされた場合またはトピックへの招待があった場合、Eメールを送信して下さい。" + email_private_messages: "メッセージを受け取ったときにメールで通知を受け取る。" email_always: "ログインしている際にメール通知を受け取る。" other_settings: "その他" categories_settings: "カテゴリ設定" @@ -406,7 +440,7 @@ ja: auto_track_topics: "自動でトピックをトラックする" auto_track_options: never: "トラックしない" - always: "常にトラックする" + immediately: "今すぐ" after_n_seconds: other: "{{count}} 秒後" after_n_minutes: @@ -435,6 +469,7 @@ ja: none: "あなたはまだ誰も招待していません。" text: "ファイルからまとめて招待をする" uploading: "アップロード中..." + success: "ファイルは無事にアップロードされました。完了されましたらメッセージでお知らせをさせていただきます。" error: "ファイルアップロードエラー：'{{filename}}': {{message}}" password: title: "パスワード" @@ -458,6 +493,7 @@ ja: stream: posted_by: "投稿者" sent_by: "送信者" + private_message: "メッセージ" the_topic: "トピック" loading: "読み込み中..." errors: @@ -497,7 +533,9 @@ ja: mute: ミュート unmute: ミュート解除 last_post: 最終投稿時刻 - last_post_lowercase: 最後の投稿 + last_reply_lowercase: 最新の回答 + replies_lowercase: + other: 回答 summary: enabled_description: "トピックのまとめを表示されています。" description: "{{count}} 返信があります。" @@ -510,7 +548,9 @@ ja: enable: "削除されたポストを非表示する" disable: "削除されたポストを表示" private_message_info: + title: "メッセージ" invite: "友人を招待..." + remove_allowed_user: "このメッセージから{{ユーザーネーム}}を本当に取り除きたいでしょうか？" email: 'メール' username: 'ユーザ名' last_seen: '最終アクティビティ' @@ -596,6 +636,7 @@ ja: reply: "回答" cancel: "キャンセル" create_topic: "トピック作成" + create_pm: "メッセージ" title: "またはCtrl+Enter" users_placeholder: "ユーザの追加" title_placeholder: "このディスカッションを簡潔に説明してください。" @@ -645,9 +686,11 @@ ja: units: "(# of hours)" examples: '時間(24)を入力してください' notifications: + title: "ユーザーネームのメンションやご自身が投稿された記事やトピックやメッセージなどに対する回答に関する通知" none: "通知はありません" more: "古い通知を確認する" total_flagged: "フラグがたったポストの総数" + mentioned: "

      {{ユーザーネーム}} {{説明}}

      " quoted: "

      {{username}} {{description}}

      " replied: "

      {{username}} {{description}}

      " posted: "

      {{username}} {{description}}

      " @@ -655,6 +698,7 @@ ja: liked: "

      {{username}} {{description}}

      " private_message: "

      {{username}} {{description}}

      " invited_to_private_message: "

      {{username}} {{description}}

      " + invited_to_topic: "

      {{ユーザーネーム}} {{説明}}

      " invitee_accepted: "

      {{username}} accepted your invitation

      " moved_post: "

      {{username}} moved {{description}}

      " linked: "

      {{username}} {{description}}

      " @@ -681,6 +725,7 @@ ja: user: "@{{username}}のポストを検索" category: "\"{{category}}\" カテゴリで検索する" topic: "このトピックを探す" + private_messages: "メッセージ検索" site_map: "別のトピックリストやカテゴリに移動" go_back: '戻る' not_logged_in_user: 'ユーザアクチビティと設定ページ' @@ -713,6 +758,7 @@ ja: bookmarks: "ブックマークしたトピックがありません" category: "{{category}} トピックはありません。" top: "トップトピック無し" + search: "検索結果はありません。" educate: new: '２日以内に投稿されたトピックは「最新」トピックとして表示されます。設定画面sで日数変更が可能です。' unread: '参加中のトピックに対して新しい投稿がある場合、未読記事として表示されます。' @@ -726,10 +772,12 @@ ja: category: "{{category}} トピックは以上です。" top: "トップトピックはありません。" bookmarks: "これ以上ブックマーク済みのトピックはありません" + search: "それ以上の検索結果はありません。" topic: filter_to: "トピック内の{{post_count}}個のポストを表示" create: 'トピック' create_long: '新しいトピックの作成' + private_message: 'メッセージを書く' list: 'トピック' new: '新規トピック' unread: '未読' @@ -824,11 +872,17 @@ ja: delete: "トピック削除" open: "トピックを開く" close: "トピックを終了する" + multi_select: "投稿の選択。。。" + pin: "トピックをピンで留める。。。" + unpin: "トピックのピンを取り除く。。。" unarchive: "トピックのアーカイブ解除" archive: "トピックのアーカイブ" invisible: "リストされないようにする" visible: "リストする" reset_read: "読み込みデータをリセット" + feature: + pin: "トピックをピンで留める。。。" + unpin: "トピックをピンで留める。。。" reply: title: '回答' help: 'このトピックに回答する' @@ -1120,7 +1174,7 @@ ja: position: "ポジション" default_position: "デフォルトポジション" position_disabled: "カテゴリはアクティビティで並び替えられます。カテゴリ一覧の順番を制御するには" - position_disabled_click: '"fixed category positions"設定を有効にしてください' + position_disabled_click: '「固定されたケテゴリーの位置付け」の設定を有効にしてください。' parent: "親カテゴリ" notifications: watching: @@ -1197,15 +1251,12 @@ ja: other {}} original_post: "大元のポスト" views: "閲覧" - views_lowercase: "閲覧" replies: "回答" views_long: "このトピックは{{number}}回閲覧されました" activity: "アクティビティ" likes: "いいね！" - likes_lowercase: "「いいね！」" likes_long: "このトピックには{{number}}つ「いいね！」がついています" users: "ユーザ" - users_lowercase: "ユーザ" category_title: "カテゴリ" history: "History" changed_by: "by {{author}}" @@ -1263,6 +1314,9 @@ ja: top: title: "トップ" help: "過去年間、月間、週間及び日間のアクティブトピック" + all: + title: "今まで" + all_time: "今まで" this_year: "今年" this_month: "今月" this_week: "今週" diff --git a/config/locales/client.ko.yml b/config/locales/client.ko.yml index 1ced13adc7..dd0368a287 100644 --- a/config/locales/client.ko.yml +++ b/config/locales/client.ko.yml @@ -91,7 +91,6 @@ ko: show_more: "더 보기" show_help: "도움말" links: "링크" - links_lowercase: "링크" faq: "FAQ" guidelines: "가이드라인" privacy_policy: "개인보호 정책" @@ -401,7 +400,6 @@ ko: auto_track_topics: "마지막 방문이후 작성된 토픽" auto_track_options: never: "하지않음" - always: "항상" after_n_seconds: other: "{{count}}초 후" after_n_minutes: @@ -492,7 +490,6 @@ ko: mute: 음소거 unmute: 음소거 해제 last_post: 최근 게시물 - last_post_lowercase: 마지막 글 summary: enabled_description: "현재 토픽에서 가장 인기 있는 몇 개의 글들을 보고 있습니다." description: "{{count}}개의 답글이 있습니다." @@ -1162,15 +1159,12 @@ ko: posts_long: "이 토픽의 게시물 수는 {{number}}개 입니다." original_post: "원본 게시물" views: "조회수" - views_lowercase: "조회" replies: "답변" views_long: "이 토픽은 {{number}}번 조회 되었습니다." activity: "활동" likes: "좋아요" - likes_lowercase: "좋아요" likes_long: "이 주제에 {{number}}개의 '좋아요'가 있습니다." users: "사용자" - users_lowercase: "참여자" category_title: "카테고리" history: "기록" changed_by: "{{author}}에 의해" diff --git a/config/locales/client.nb_NO.yml b/config/locales/client.nb_NO.yml index 66d8f23d2c..3c604476f4 100644 --- a/config/locales/client.nb_NO.yml +++ b/config/locales/client.nb_NO.yml @@ -107,7 +107,6 @@ nb_NO: show_more: "vis mer" show_help: "hjelp" links: "Lenker" - links_lowercase: "lenker" faq: "FAQ" guidelines: "Retningslinjer" privacy_policy: "Personvern" @@ -432,7 +431,6 @@ nb_NO: auto_track_topics: "Følg automatisk emner jeg åpner" auto_track_options: never: "aldri" - always: "alltid" after_n_seconds: one: "etter 1 sekund" other: "etter {{count}} sekunder" @@ -525,7 +523,6 @@ nb_NO: mute: Demp unmute: Fjern demping last_post: Siste innlegg - last_post_lowercase: siste innlegg summary: enabled_description: "Du ser for øyeblikket en oppsummering av dette emnet: de mest interessante innleggene i følge nettsamfunnet." description: "Det er {{count}} svar." @@ -864,6 +861,12 @@ nb_NO: invisible: "Skjul Emnet" visible: "Vist Emnet" reset_read: "Tilbakestill Lesedata" + feature: + pin: "Lås Emne" + unpin: "Lås Opp Emne" + pin_globally: "Lås Emne Globalt" + make_banner: "Banneremne" + remove_banner: "Fjern Banneremne" reply: title: 'Svar' help: 'begynn å skrive et svar til dette emnet' @@ -878,12 +881,29 @@ nb_NO: help: 'rapporter dette innlegget privat eller send et privat varsel om det' success_message: 'Du har rapportert dette emnet' feature_topic: + title: "Fremhev dette emnet" pin: "Plasser dette emnet på toppen av {{categoryLink}} kategorien." confirm_pin: "Du har allerede {{count}} låste emner. For mange låste emner kan være et problem for nye og anonyme brukere. Er du sikker på at du ønsker å låse et til emne i denne kategorien?" unpin: "Fjern dette emnet fra toppen av {{categoryLink}} kategorien." pin_note: "Brukere kan låse opp emnet selv." already_pinned: zero: "Det er ingen låste emner i {{categoryLink}}." + one: "Emner for øyeblikket låst i {{categoryLink}}: 1." + other: "Emner for øyeblikket låst i {{categoryLink}}: {{count}}." + pin_globally: "Gjør at dette emnet dukker opp på toppen av alle emnelister frem til en i staben låser det opp. " + confirm_pin_globally: "Du har allerede {{count}} globalt låste emner. For mange låste emner kan bli en byrde for nye og anonyme brukere. Er du sikker på at du vil låse et til emne globalt? " + unpin_globally: "Fjern dette emnet fra toppen av alle emnelister. " + global_pin_note: "Brukere kan låse opp emner for dem selv. " + already_pinned_globally: + zero: "Det er ingen låste emner globalt." + one: "Emner for øyeblikket låst globalt: 1." + other: "Dette enmnet er låst globalt: {{count}}." + make_banner: "Gjør dette emnet til et banner som dukker opp på toppen av alle sider." + remove_banner: "Fjern banneret som dukker opp på toppen av alle sider. " + banner_note: "Brukere kan fjerne banneret ved å lukke det. Kun et emne kan være banner på en og samme tid. " + already_banner: + zero: "Det er ingen banneremner. " + one: "Det er for øyeblikket et banneremne. " inviting: "Inviterer..." automatically_add_to_groups_optional: "Denne invitasjonen inkluderer også tilgang på disse gruppene: (valgfritt, kun for admin)" automatically_add_to_groups_required: "Denne invitasjonen inkluderer også tilgang til disse gruppene: (påkrevet, kun for admin)" @@ -1238,15 +1258,12 @@ nb_NO: posts_long: "{{number}} innlegg i dette emnet" original_post: "Originalt Innlegg" views: "Visninger" - views_lowercase: "visninger" replies: "Svar" views_long: "dette emnet har blit sett {{number}} ganger" activity: "Aktivitet" likes: "Liker" - likes_lowercase: "liker" likes_long: "det er {{number}} liker i dette emnet" users: "Deltakere" - users_lowercase: "brukere" category_title: "Kategori" history: "Historie" changed_by: "av {{author}}" diff --git a/config/locales/client.nl.yml b/config/locales/client.nl.yml index 0305e0e53b..087ce4271e 100644 --- a/config/locales/client.nl.yml +++ b/config/locales/client.nl.yml @@ -107,7 +107,6 @@ nl: show_more: "meer..." show_help: "help" links: "Links" - links_lowercase: "links" faq: "FAQ" guidelines: "Richtlijnen" privacy_policy: "Privacy Policy" @@ -445,7 +444,6 @@ nl: auto_track_topics: "Automatisch topics volgen die ik bezocht heb" auto_track_options: never: "nooit" - always: "altijd" after_n_seconds: one: "na één seconde" other: "na {{count}} seconden" @@ -540,7 +538,6 @@ nl: mute: Negeer unmute: Tonen last_post: Laatste bericht - last_post_lowercase: laatste bericht summary: enabled_description: "Je leest een samenvatting van dit topic: alleen de meeste interessante berichten zoals bepaald door de community. " description: "Er zijn {{count}} reacties." @@ -1228,15 +1225,12 @@ nl: posts_long: "er zijn {{number}} berichten in deze topic" original_post: "Originele bericht" views: "Bekeken" - views_lowercase: "weergaves" replies: "Reacties" views_long: "deze topic is {{number}} keer bekeken" activity: "Activiteit" likes: "Leuk" - likes_lowercase: "likes" likes_long: "er zijn {{count}} likes in deze topic" users: "Gebruikers" - users_lowercase: "leden" category_title: "Categorie" history: "Geschiedenis" changed_by: "door {{author}}" diff --git a/config/locales/client.pl_PL.yml b/config/locales/client.pl_PL.yml index 1948883b9b..2fc5c0a457 100644 --- a/config/locales/client.pl_PL.yml +++ b/config/locales/client.pl_PL.yml @@ -124,7 +124,10 @@ pl_PL: show_more: "pokaż więcej" show_help: "pomoc" links: "Odnośniki" - links_lowercase: "linki" + links_lowercase: + one: "link" + few: "linki" + other: "linków" faq: "FAQ" guidelines: "Przewodnik" privacy_policy: "Polityka prywatności" @@ -215,6 +218,19 @@ pl_PL: title: search: "Szukaj tematu po nazwie, URL-u albo ID:" placeholder: "tutaj wpisz tytuł tematu" + queue: + topic: "Temat:" + approve: 'Zatwierdź' + reject: 'Odrzuć' + title: "Wymaga zatwierdzenia" + none: "Brak wpisów wymagających uwagi." + edit: "Edytuj" + cancel: "Anuluj" + confirm: "Zapisz zmiany" + approval: + title: "Wpis wymaga zatwierdzenia" + description: "Twój nowy wpis został umieszczony w kolejce i pojawi się po zatwierdzeniu przez moderatora. Prosimy o cierpliwość." + ok: "OK" user_action: user_posted_topic: "{{user}} tworzy temat" you_posted_topic: "Dodajesz temat" @@ -478,7 +494,7 @@ pl_PL: auto_track_topics: "Automatycznie śledź tematy które odwiedzę" auto_track_options: never: "nigdy" - always: "zawsze" + immediately: "natychmiast" after_n_seconds: one: "po 1 sekundzie" few: "po {{count}} sekundach" @@ -575,7 +591,11 @@ pl_PL: mute: Wycisz unmute: Wyłącz wyciszenie last_post: Ostatni wpis - last_post_lowercase: ostatni wpis + last_reply_lowercase: ostatnia odpowiedź + replies_lowercase: + one: odpowiedź + few: odpowiedzi + other: odpowiedzi summary: enabled_description: "Przeglądasz podsumowanie tego tematu: widoczne są jedynie najbardziej wartościowe wpisy zdaniem uczestników. " description: "Istnieją {{count}} odpowiedzi." @@ -1391,15 +1411,24 @@ pl_PL: posts_long: "jest {{number}} wpisów w tym temacie" original_post: "Oryginalny wpis" views: "Wyświetlenia" - views_lowercase: "wyświetlenia" + views_lowercase: + one: "wyświetlenie" + few: "wyświetlenia" + other: "wyświetleń" replies: "Odpowiedzi" views_long: "ten temat był oglądany {number}} razy" activity: "Aktywność" likes: "Polubienia" - likes_lowercase: "polubienia" + likes_lowercase: + one: "polubienie" + few: "polubienia" + other: "polubień" likes_long: "jest {{number}} polubień w tym temacie" users: "Użytkownicy" - users_lowercase: "użytkownicy" + users_lowercase: + one: "użytkownik" + few: "użytkownicy" + other: "użytkowników" category_title: "Kategoria" history: "Historia" changed_by: "przez {{author}}" @@ -1623,6 +1652,8 @@ pl_PL: automatic: "Automatyczne" automatic_membership_email_domains: "Użytkownicy rejestrujący się przy pomocy adresu z tej listy zostaną automatycznie przypisani do tej grupy." automatic_membership_retroactive: "Zastosuj tę regułę domenową do już istniejących użytkowników." + default_title: "Domyślny tytuł użytkowników należących do tej grupy" + primary_group: "Automatycznie ustawiaj jako główną grupę" api: generate_master: "Generuj Master API Key" none: "Nie ma teraz aktywnych kluczy API." diff --git a/config/locales/client.pt.yml b/config/locales/client.pt.yml index 5c2cdcce08..cc6219ee06 100644 --- a/config/locales/client.pt.yml +++ b/config/locales/client.pt.yml @@ -91,7 +91,8 @@ pt: google+: 'partilhar esta hiperligação no Google+' email: 'enviar esta hiperligação por email' topic_admin_menu: "Ações administrativas dos Tópicos" - emails_are_disabled: "Todos os envios de email foram desactivados por um administrador. Nenhuma notificação de email será enviada." + emails_are_disabled: "Todos os envios de e-mail foram globalmente desativados por um administrador. Nenhum e-mail de notificação será enviado." + s3_deprecation_warning: "CUIDADO! O Amazon S3 irá tornar-se obsoleto para armazenamento de imagens/anexos. Por favor, siga as instruções para migrar para armazenamento local." edit: 'editar o título e a categoria deste tópico' not_implemented: "Essa funcionalidade ainda não foi implementada, pedimos desculpa!" no_value: "Não" @@ -107,7 +108,9 @@ pt: show_more: "mostrar mais" show_help: "Ajuda" links: "Hiperligações" - links_lowercase: "hiperligações" + links_lowercase: + one: "hiperligação" + other: "hiperligações" faq: "FAQ" guidelines: "Diretrizes" privacy_policy: "Política de Privacidade" @@ -125,6 +128,7 @@ pt: daily: "diário" weekly: "semanal" every_two_weeks: "a cada duas semanas" + every_three_days: "a cada três dias" max_of_count: "máximo de {{count}}" character_count: one: "{{count}} caracter" @@ -147,11 +151,12 @@ pt: user_count: "Novos Utilizadores" active_user_count: "Utilizadores Activos" contact: "Contacte-nos" + contact_info: "No caso de um problema crítico ou de algum assunto urgente que afecte este sítio, por favor contacte-nos em %{contact_info}." bookmarked: title: "Adicionar Marcador" clear_bookmarks: "Remover Marcadores" help: - bookmark: "Clique para adicionar marcador ao primeiro post deste tópico" + bookmark: "Clique para adicionar um marcador à primeira mensagem deste tópico" unbookmark: "Clique para remover todos os marcadores deste tópico" bookmarks: not_logged_in: "Pedimos desculpa, é necessário ter sessão iniciada para marcar mensagens" @@ -159,6 +164,7 @@ pt: not_bookmarked: "leu esta mensagem; clique para adicioná-la aos marcadores" last_read: "esta foi a última mensagem que leu; clique para adicioná-la aos marcadores" remove: "Remover Marcador" + confirm_clear: "Tem a certeza que pretende eliminar todos os marcadores deste tópico?" topic_count_latest: one: "{{count}} tópico novo ou atualizado." other: "{{count}} tópicos novos ou atualizados." @@ -182,6 +188,8 @@ pt: undo: "Desfazer" revert: "Reverter" failed: "Falhou" + switch_to_anon: "Modo Anónimo" + switch_from_anon: "Sair do Modo Anónimo" banner: close: "Destituir esta faixa." choose_topic: @@ -189,6 +197,19 @@ pt: title: search: "Procurar Tópico por nome, URL ou id:" placeholder: "digite o título do tópico aqui" + queue: + topic: "Tópico:" + approve: 'Aprovar' + reject: 'Rejeitar' + title: "Necessita de Aprovação" + none: "Não há mensagens para rever." + edit: "Editar" + cancel: "Cancelar" + confirm: "Guardar Alterações" + approval: + title: "A Mensagem Necessita de Aprovação" + description: "Recebemos a sua nova mensagem mas necessita de ser aprovada pelo moderador antes de aparecer. Por favor seja paciente." + ok: "OK" user_action: user_posted_topic: "{{user}} publicou o tópico" you_posted_topic: " publicouo tópico" @@ -203,6 +224,26 @@ pt: posted_by_you: "Publicado por si" sent_by_user: "Enviado por {{user}}" sent_by_you: "Enviado por si" + directory: + filter_name: "filtrar por nome de utilizador" + title: "Utilizadores" + likes_given: "Dado" + likes_received: "Recebido" + topics_entered: "Inserido" + topics_entered_long: "Tópicos Inseridos" + time_read: "Tempo Lido" + topic_count: "Tópicos" + topic_count_long: "Tópicos Criados" + post_count: "Respostas" + post_count_long: "Respostas Publicadas" + no_results: "Não foram encontrados resultados." + days_visited: "Visitas" + days_visited_long: "Dias Visitados" + posts_read: "Ler" + posts_read_long: "Mensagens Lidas" + total_rows: + one: "1 utilizador" + other: "%{count} utilizadores" groups: visible: "O grupo é visível para todos os utilizadores" title: @@ -222,6 +263,8 @@ pt: '2': "Gostos Recebidos" '3': "Marcadores" '4': "Tópicos" + '5': "Respostas" + '6': "Respostas" '7': "Menções" '9': "Citações" '10': "Favoritos" @@ -268,6 +311,8 @@ pt: mute: "Silenciar" edit: "Editar Preferências" download_archive: "Descarregar As Minhas Mensagens" + new_private_message: "Nova Mensagem" + private_message: "Mensagem" private_messages: "Mensagens" activity_stream: "Atividade" preferences: "Preferências" @@ -278,6 +323,7 @@ pt: notifications: "Notificações" dismiss_notifications: "Marcar tudo como lido" dismiss_notifications_tooltip: "Marcar como lidas todas as notificações por ler" + disable_jump_reply: "Não voltar para a minha mensagem após ter respondido" dynamic_favicon: "Exibir notificações de novas mensagens no favicon (experimental)" edit_history_public: "Permitir que outros utilizadores vejam as minhas revisões de publicação" external_links_in_new_tab: "Abrir todas as hiperligações externas num novo separador" @@ -290,6 +336,7 @@ pt: suspended_notice: "Este utilizador está suspenso até {{date}}." suspended_reason: "Motivo: " github_profile: "Github" + mailing_list_mode: "Enviar-me um email por cada nova mensagem (a não ser que eu silencie o tópico ou categoria)" watched_categories: "Vigiado" watched_categories_instructions: "Irá vigiar automaticamente todos os novos tópicos nestas categorias. Será notificado de todos as novas mensagens e tópicos. Além disso, a contagem de mensagens novas e não lidas surgirá junto do tópico. " tracked_categories: "Acompanhado" @@ -302,6 +349,9 @@ pt: delete_yourself_not_allowed: "Neste momento não pode eliminar a sua conta. Contacte um administrador para que este elimine a sua conta por si." unread_message_count: "Mensagens" admin_delete: "Apagar" + users: "Utilizadores" + muted_users: "Mudo" + muted_users_instructions: "Suprimir todas as notificações destes utilizadores." staff_counters: flags_given: "sinalizações úteis" flagged_posts: "mensagens sinalizadas" @@ -340,6 +390,8 @@ pt: uploaded_avatar_empty: "Adicionar foto personalizada" upload_title: "Carregar a sua foto" upload_picture: "Carregar Imagem" + image_is_not_a_square: "Alerta: cortámos a sua imagem; o comprimento e a altura não eram iguais." + cache_notice: "Alterou o seu avatar com sucesso mas poderá demorar algum tempo até este aparecer devido à cache do navegador de internet." change_profile_background: title: "Fundo de Perfil" instructions: "O fundo do perfil será centrado e terá por defeito uma largura de 850px." @@ -354,9 +406,12 @@ pt: authenticated: "O seu email foi autenticado por {{provider}}" frequency: zero: "Enviar-lhe-emos um email imediatamente caso não leia o que lhe estamos a enviar." + one: "Só iremos enviar-lhe um email se não o tivermos visto no último minuto." + other: "Só iremos enviar-lhe um email se não o tivermos visto nos últimos {{count}} minutos." name: title: "Nome" instructions: "O seu nome completo (opcional)" + instructions_required: "O seu nome completo" too_short: "O seu nome é demasiado curto" ok: "O seu nome parece adequado" username: @@ -389,22 +444,30 @@ pt: website: "Sítio da Internet" email_settings: "Email" email_digests: + title: "Quando não visitar o sítio, enviar um email com o resumo das novidades:" daily: "diariamente" + every_three_days: "a cada três dias" weekly: "semanalmente" + every_two_weeks: "a cada duas semanas" + email_direct: "Enviar-me um email quando alguém me citar, responder às minhas mensagens, mencionar o meu @nomedeutilizador, ou convidar-me para um tópico" + email_private_messages: "Enviar-me um email quando alguém me envia uma mensagem" email_always: "Não suprimir notificações de email quando estou ativo no sítio" other_settings: "Outros" categories_settings: "Categorias" new_topic_duration: label: "Considerar tópicos como novos quando" + not_viewed: "Ainda não os vi" + last_here: "criado desde a última vez que aqui estive" after_n_days: one: "criadas no último dia" other: "criadas nos últimos {{count}} dias" after_n_weeks: one: "criada na última semana" other: "criadas nas últimas {{count}} semanas" + auto_track_topics: "Acompanhar automaticamente os tópicos em que eu entro" auto_track_options: never: "nunca" - always: "sempre" + immediately: "imediatamente" after_n_seconds: one: "passado 1 segundo" other: "passado {{count}} segundos" @@ -435,11 +498,14 @@ pt: none: "Ainda não convidou ninguém. Pode enviar convites individuais, ou convidar um grupo de pessoas de uma única vez carregando um ficheiro com convites em massa." text: "Convite em massa a partir de ficheiro" uploading: "A carregar…" + success: "Ficheiro carregado corretamente, será notificado via mensagem assim que o processo esteja concluído." error: "Erro de carregamento '{{filename}}': {{message}}" password: title: "Palavra-passe" too_short: "A sua palavra-passe é muito curta." common: "Essa palavra-passe é demasiado comum." + same_as_username: "A sua palavra-passe é a mesma que o seu nome de utilizador." + same_as_email: "A sua palavra-passe é a mesma que o seu email." ok: "A sua palavra-passe parece correta." instructions: "Pelo menos %{count} caracteres." associated_accounts: "Contas associadas" @@ -447,6 +513,8 @@ pt: title: "Último endereço IP" registration_ip_address: title: "Endereço IP de registo" + avatar: + title: "Imagem de Perfil" title: title: "Título" filters: @@ -454,6 +522,7 @@ pt: stream: posted_by: "Publicado por" sent_by: "Enviado por" + private_message: "mensagem" the_topic: "o tópico" loading: "A carregar..." errors: @@ -493,7 +562,10 @@ pt: mute: Silenciar unmute: Reativar last_post: Última mensagem - last_post_lowercase: última mensagem + last_reply_lowercase: última resposta + replies_lowercase: + one: resposta + other: respostas summary: enabled_description: "Está a ver um resumo deste tópico: as mensagens mais interessantes são determinados pela comunidade." description: "Existem {{count}} respostas." @@ -506,7 +578,9 @@ pt: enable: "Ocultar mensagens eliminadas" disable: "Exibir mensagens eliminadas" private_message_info: + title: "Mensagem" invite: "Convidar Outros..." + remove_allowed_user: "Deseja mesmo remover {{name}} desta mensagem?" email: 'Email' username: 'Nome de utilizador' last_seen: 'Visto' @@ -518,6 +592,7 @@ pt: title: "Criar Nova Conta" failed: "Ocorreu um erro, talvez este email já esteja registado, tente usar a hiperligação \"Esqueci-me da Palavra-passe\"." forgot_password: + title: "Repor Palavra-Passe" action: "Esqueci-me da minha palavra-passe" invite: "Insira o seu nome de utilizador ou endereço de email, e enviar-lhe-emos um email para refazer a sua palavra-passe." reset: "Repor Palavra-passe" @@ -544,6 +619,7 @@ pt: requires_invite: "Pedimos desculpa, o acesso a este fórum é permitido somente por convite de outro membro." not_activated: "Ainda não pode iniciar sessão. Enviámos anteriormente um email de ativação para o endereço {{sentTo}}. Por favor siga as instruções contidas nesse email para ativar a sua conta." not_allowed_from_ip_address: "Não pode iniciar sessão a partir desse endereço IP." + admin_not_allowed_from_ip_address: "Não pode iniciar sessão como administrador a partir desse endereço IP." resend_activation_email: "Clique aqui para enviar o email de ativação novamente." sent_activation_email_again: "Enviámos mais um email de ativação para o endereço {{currentEmail}}. Pode ser que demore alguns minutos; certifique-se que verifica a sua pasta de spam ou lixo." google: @@ -572,6 +648,7 @@ pt: emoji: "Emoji :smile:" add_warning: "Este é um aviso oficial." posting_not_on_topic: "A que tópico quer responder?" + saving_draft_tip: "a guardar..." saved_draft_tip: "guardado" saved_local_draft_tip: "guardado localmente" similar_topics: "O seu tópico é similar a..." @@ -588,6 +665,8 @@ pt: reply_here: "Responda Aqui" reply: "Responder" cancel: "Cancelar" + create_topic: "Criar Tópico" + create_pm: "Mensagem" title: "Ou prima Ctrl+Enter" users_placeholder: "Adicionar um utilizador" title_placeholder: "Numa breve frase, de que se trata esta discussão?" @@ -637,8 +716,11 @@ pt: units: "(# de horas)" examples: 'Introduza o número de horas (24).' notifications: + title: "notificações de menções de @nome, respostas às suas publicações e tópicos, mensagens, etc" + none: "Impossível de carregar as notificações neste momento." more: "ver notificações antigas" total_flagged: "total de mensagens sinalizadas" + mentioned: "

      {{username}} {{description}}

      " quoted: "

      {{username}} {{description}}

      " replied: "

      {{username}} {{description}}

      " posted: "

      {{username}} {{description}}

      " @@ -646,6 +728,7 @@ pt: liked: "

      {{username}} {{description}}

      " private_message: "

      {{username}} {{description}}

      " invited_to_private_message: "

      {{username}} {{description}}

      " + invited_to_topic: "

      {{username}} {{description}}

      " invitee_accepted: "

      {{username}} aceitou o seu convite

      " moved_post: "

      {{username}} moveu {{description}}

      " linked: "

      {{username}} {{description}}

      " @@ -672,6 +755,7 @@ pt: user: "Procurar mensagens de @{{username}}" category: "Procurar na categoria \"{{category}}\"" topic: "Pesquisar este tópico" + private_messages: "Pesquisar mensagens" site_map: "ir para outra lista de tópicos ou categorias" go_back: 'voltar atrás' not_logged_in_user: 'página de utilizador com resumo da atividade atual e preferências ' @@ -691,6 +775,7 @@ pt: close_topics: "Fechar Tópicos" archive_topics: "Arquivar tópicos" notification_level: "Mudar Nível de Notificação" + choose_new_category: "Escolha a nova categoria para os tópicos:" selected: one: "Selecionou 1 tópico." other: "Selecionou {{count}} tópicos." @@ -701,8 +786,10 @@ pt: posted: "Ainda não publicou nenhum tópico." latest: "Não há tópicos recentes." hot: "Não há tópicos quentes." + bookmarks: "Ainda não marcou nenhum tópico." category: "Não há tópicos na categoria {{category}}." top: "Não existem tópicos recentes." + search: "Não há resultados na pesquisa." educate: new: '

      Os seus novos tópicos aparecem aqui.

      Por defeito, os tópicos são considerados novos e mostrarão o indicador novo caso tenham sido criados nos últimos 2 dias.

      Pode alterar isto nas suas preferências.

      ' unread: '

      Os seus tópicos não lidos aparecem aqui.

      Por defeito, os tópicos são considerados não lidos e aparecem nas contagens de não lidos 1 Se:

      • Criou o tópico
      • Respondeu ao tópico
      • Leu o tópico por mais de 4 minutos

      Ou, se definiu explicitamente o tópico para acompanhar ou vigiar através do controlo de notificações que se encontra na parte inferior de cada tópico.

      Pode alterar isto nas suas preferências.

      ' @@ -715,10 +802,13 @@ pt: unread: "Não existem mais tópicos não lidos." category: "Não existem mais tópicos na categoria {{category}}." top: "Não existem mais tópicos recentes." + bookmarks: "Não há mais tópicos marcados." + search: "Não há mais resultados na pesquisa." topic: filter_to: "{{post_count}} mensagens no tópico" create: 'Novo Tópico' create_long: 'Criar um novo Tópico' + private_message: 'Iniciar uma mensagem' list: 'Tópicos' new: 'novo tópico' unread: 'não lido' @@ -796,11 +886,13 @@ pt: '0': 'Está a ignorar todas as notificações para este tópico.' watching_pm: title: "A vigiar" + description: "Será notificado de todas as novas publicações nesta mensagem. Uma contagem das publicações não lidas e novas irá também aparecer junto do tópico." watching: title: "A vigiar" description: "Será notificado sobre todas as novas mensagens neste tópico. Será também apresentada uma contagem de mensagens novas e não lidas junto do tópico." tracking_pm: title: "Acompanhar" + description: "Uma contagem de publicações não lidas e novas irá aparecer junto à mensagem. Será notificado se alguém mencionar o seu @nome ou responder à sua publicação." tracking: title: "Acompanhar" description: "Será apresentada uma contagem de mensagens novas e não lidas junto do tópico Será notificado se alguém mencionar o seu @nome ou responder à sua mensagem." @@ -809,8 +901,10 @@ pt: description: "Será notificado se alguém mencionar o seu @nome ou responder às suas mensagens." regular_pm: title: "Habitual" + description: "Será notificado se alguém mencionar o seu @nome ou responder à sua publicação na mensagem." muted_pm: title: "Silenciado" + description: "Não será notificado de nada relacionado com esta mensagem." muted: title: "Silenciado" description: "Não será notificado de nada que esteja relacionado com este tópico, e este não será apresentado no seu separador de 'não lido'." @@ -819,11 +913,21 @@ pt: delete: "Eliminar Tópico" open: "Abrir Tópico" close: "Fechar Tópico" + multi_select: "Selecionar Mensagens..." + auto_close: "Fechar Automaticamente..." + pin: "Fixar Tópico..." + unpin: "Desafixar Tópico..." unarchive: "Desarquivar Tópico" archive: "Arquivar Tópico" invisible: "Tornar Não Listado" visible: "Tornar Listado" reset_read: "Repor Data de Leitura" + feature: + pin: "Fixar Tópico" + unpin: "Desafixar Tópico" + pin_globally: "Fixar Tópico Globalmente" + make_banner: "Tópico de Faixa" + remove_banner: "Remover Tópico de Faixa" reply: title: 'Responder' help: 'começa a compor uma resposta a este tópico' @@ -837,19 +941,55 @@ pt: title: 'Sinalizar' help: 'sinalizar privadamente este tópico para consideração ou enviar uma notificação privada sobre o mesmo' success_message: 'Sinalizou este tópico com sucesso.' + feature_topic: + title: "Destacar este tópico" + pin: "Fazer com que este tópico apareça no topo da categoria {{categoryLink}}." + confirm_pin: "Já tem {{count}} tópicos fixados. Demasiados tópicos fixados podem ser um fardo para utilizadores novos e anónimos. Tem a certeza que deseja fixar outro tópico nesta categoria?" + unpin: "Remover este tópico do topo da categoria {{categoryLink}}." + pin_note: "Os utilizadores podem desafixar individualmente o tópico por si próprios." + already_pinned: + zero: "Não há tópicos fixados em {{categoryLink}}." + one: "Tópicos atualmente fixados em {{categoryLink}}: 1." + other: "Tópicos atualmente fixados em {{categoryLink}}: {{count}}." + pin_globally: "Fazer este tópico aparecer no topo de todas as listas de tópicos, até que um membro do pessoal o desafixe." + confirm_pin_globally: "Já tem {{count}} tópicos fixados globalmente. Demasiados tópicos fixados podem ser um fardo para utilizadores novos e anónimos. Tem a certeza que deseja fixar outro tópico globalmente?" + unpin_globally: "Remover este tópico do topo de todas as listas de tópicos." + global_pin_note: "Os utilizadores podem desafixar individualmente o tópico por si próprios." + already_pinned_globally: + zero: "Não há tópicos fixados globalmente." + one: "Tópicos atualmente fixados globalmente: 1." + other: "Tópicos atualmente fixados globalmente: {{count}}." + make_banner: "Tornar este tópico numa faixa que apareça no topo de todas as páginas." + remove_banner: "Remover a faixa que aparece no topo de todas as páginas." + banner_note: "Os utilizadores podem destituir a faixa ao fecharem-na. Apenas um tópico pode ser considerado uma faixa em qualquer momento." + already_banner: + zero: "Não há nenhum tópico de faixa." + one: "Há atualmente um tópico de faixa." inviting: "A Convidar..." automatically_add_to_groups_optional: "Este convite também inclui acesso a estes grupos: (opcional, apenas Administração)" automatically_add_to_groups_required: "Esse convite também inclui acesso a estes grupos: (Obrigatório, apenas Administração)" invite_private: + title: 'Convidar para Mensagem' email_or_username: "Email ou Nome de Utilizador do Convidado" email_or_username_placeholder: "endereço de email ou nome de utilizador" action: "Convidar" + success: "Convidámos esse utilizador para participar nesta mensagem." error: "Pedimos desculpa, ocorreu um erro ao convidar esse utilizador." group_name: "nome do grupo" invite_reply: title: 'Convidar' + username_placeholder: "nome de utilizador" + action: 'Enviar Convite' + help: 'convidar outros para este tópico via email ou notificações' to_forum: "Enviaremos um breve email que permitirá ao seu amigo juntar-se imediatamente clicando numa hiperligação, não sendo necessário ter sessão iniciada." + sso_enabled: "Introduza o nome de utilizador da pessoa que gostaria de convidar para este tópico." + to_topic_blank: "Introduza o nome de utilizador ou endereço de email da pessoa que gostaria de convidar para este tópico." + to_topic_email: "Introduziu um endereço de email. Iremos enviar um email com um convite que permite aos seus amigos responderem a este tópico imediatamente." + to_topic_username: "Introduziu um nome de utilizador. Iremos enviar uma notificação a esse utilizador com uma hiperligação convidando-o para este tópico." email_placeholder: 'nome@exemplo.com' + success_email: "Enviámos por email um convite para {{emailOrUsername}}. Iremos notificá-lo quando o convite for utilizado. Verifique o separador de convites na sua página de utilizador para acompanhar os seus convites." + success_username: "Convidámos esse utilizador para participar neste tópico." + error: "Pedimos desculpa, não conseguimos convidar essa pessoa. Talvez já tenha sido convidado? (Os convites são limitados)" login_reply: 'Iniciar sessão para Responder' filters: n_posts: @@ -893,8 +1033,10 @@ pt: one: Selecionou 1 mensagem. other: Selecionou {{count}} mensagens. post: + reply: "Em resposta a {{link}} {{replyAvatar}} {{username}}" reply_topic: "Responder a {{link}}" quote_reply: "citar resposta" + edit: "Editar {{link}} {{replyAvatar}} {{username}}" edit_reason: "Motivo:" post_number: "mensagem {{number}}" last_edited_on: "mensagem editada pela última vez em" @@ -922,6 +1064,7 @@ pt: attachment_too_large: "Pedimos desculpa, o ficheiro que está a carregar é muito grande (o tamanho máximo permitido é {{max_size_kb}}kb)." file_too_large: "Pedimos desculpa, o ficheiro que está a tentar carregar é muito grande (o tamanho máximo permitido é {{max_size_kb}}kb)." too_many_uploads: "Pedimos desculpa, só pode carregar um ficheiro de cada vez." + too_many_dragged_and_dropped_files: "Pedimos desculpa, só pode arrastar e largar até 10 ficheiros de cada vez." upload_not_authorized: "Pedimos desculpa, o tipo de ficheiro que está a carregar não está autorizado (extensões autorizadas: {{authorized_extensions}})." image_upload_not_allowed_for_new_user: "Pedimos desculpa, os novos utilizadores não podem carregar imagens." attachment_upload_not_allowed_for_new_user: "Pedimos desculpa, os novos utilizadores não podem carregar anexos." @@ -983,9 +1126,12 @@ pt: people: off_topic: "{{icons}} sinalizou isto como fora de contexto" spam: "{{icons}} sinalizou isto como spam" + spam_with_url: "{{icons}} sinalizaram isto como spam" inappropriate: "{{icons}} sinalizou isto como inapropriado" notify_moderators: "{{icons}} moderadores notificados" notify_moderators_with_url: "{{icons}} moderadores notificados" + notify_user: "{{icons}} enviou uma mensagem" + notify_user_with_url: "{{icons}} enviou uma mensagem" bookmark: "{{icons}} adicionaram um marcador a isto" like: "{{icons}} gostaram disto" vote: "{{icons}} votaram nisto" @@ -994,6 +1140,7 @@ pt: spam: "Sinalizou isto como spam" inappropriate: "Sinalizou isto como inapropriado" notify_moderators: "Sinalizou isto para moderação" + notify_user: "Enviou uma mensagem a este utilizador" bookmark: "Adicionou um marcador a esta mensagem" like: "Gostou disto" vote: "Votou nesta mensagem" @@ -1010,6 +1157,9 @@ pt: notify_moderators: one: "Para além de si, 1 pessoa sinalizaram isto para moderação" other: "Para além de si, {{count}} pessoas sinalizaram isto para moderação" + notify_user: + one: "Para além de si, 1 outro utilizador enviaram uma mensagem a este utilizador" + other: "Para além de si, {{count}} outros utilizadores enviaram uma mensagem a este utilizador" bookmark: one: "Para além de si, 1 pessoa adicionou um marcador a esta mensagem" other: "Para além de si, {{count}} adicionaram um marcador a esta mensagem" @@ -1032,6 +1182,9 @@ pt: notify_moderators: one: "1 pessoa sinalizou isto para moderação" other: "{{count}} pessoas sinalizaram isto para moderação" + notify_user: + one: "1 pessoa enviou uma mensagem a este utilizador" + other: "{{count}} enviaram uma mensagem a este utilizador" bookmark: one: "1 pessoa adicionou um marcador a esta mensagem" other: "{{count}} pessoas adicionaram um marcador a esta mensagem" @@ -1137,6 +1290,7 @@ pt: private_reminder: 'as sinalizações são privadas, visíveis apenas para o pessoal' action: 'Sinalizar Mensagem' take_action: "Acionar" + notify_action: 'Mensagem' delete_spammer: "Eliminar Spammer" delete_confirm: "Está prestes a apagar %{posts} mensagens e %{topics} tópicos deste utilizador, remover a sua conta, bloquear acessos do seu endereço IP %{ip_address}, e adicionar o seu endereço de email %{email} a uma lista negra. Tem a certeza que este utilizador é de facto um spammer?" yes_delete_spammer: "Sim, Eliminar Spammer" @@ -1158,6 +1312,7 @@ pt: flagging_topic: title: "Obrigado por ajudar a manter a nossa comunidade cívica!" action: "Sinalizar Tópico" + notify_action: "Mensagem" topic_map: title: "Sumário do Tópico" links_shown: "mostrar todas as {{totalLinks}} hiperligações..." @@ -1173,11 +1328,13 @@ pt: help: "Este tópico está fechado; já não são aceites novas respostas" unpinned: title: "Desafixado" + help: "Este tópico foi desafixado por si; será mostrado na ordem habitual" pinned_globally: title: "Fixado Globalmente" help: "Este tópico está fixado globalmente; será mostrado no topo de todas as listas" pinned: title: "Fixado" + help: "Este tópico foi fixado por si; será mostrado no topo da sua categoria" archived: help: "Este tópico está arquivado; está congelado e não pode ser alterado" invisible: @@ -1185,17 +1342,29 @@ pt: posts: "Mensagens" posts_lowercase: "mensagens" posts_long: "existem {{number}} mensagens neste tópico" + posts_likes_MF: | + Este tópico tem {count, plural, one {1 resposta} other {# respostas}} {ratio, select, + baixo {com uma proporção de gostos alta} + med {com uma proporção de gostos muito alta} + alta {com uma proporção de gostos extremamente alta} + outros {}} original_post: "Mensagem Original" views: "Visualizações" - views_lowercase: "visualizações" + views_lowercase: + one: "visualização" + other: "visualizações" replies: "Respostas" views_long: "este tópico foi visto {{number}} vezes" activity: "Atividade" likes: "Gostos" - likes_lowercase: "gostos" + likes_lowercase: + one: "gosto" + other: "gostos" likes_long: "existem {{number}} gostos neste tópico" users: "Utilizadores" - users_lowercase: "utilizadores" + users_lowercase: + one: "utilizador" + other: "utilizadores" category_title: "Categoria" history: "Histórico" changed_by: "por {{author}}" @@ -1215,6 +1384,9 @@ pt: read: title: "Lido" help: "tópicos que leu, na ordem que os leu" + search: + title: "Pesquisar" + help: "pesquisar todos os tópicos" categories: title: "Categorias" title_in: "Categoria - {{categoryName}}" @@ -1241,6 +1413,9 @@ pt: posted: title: "As Minhas mensagens" help: "tópicos nos quais publicou uma mensagem" + bookmarks: + title: "Marcadores" + help: "tópicos marcados" category: title: zero: "{{categoryName}}" @@ -1250,6 +1425,17 @@ pt: top: title: "Os Melhores" help: "os tópicos mais ativos no último ano, mês, semana ou dia" + all: + title: "Todo o Tempo" + yearly: + title: "Anual" + monthly: + title: "Mensal" + weekly: + title: "Semanal" + daily: + title: "Diário" + all_time: "Todo o Tempo" this_year: "Este ano" this_month: "Este mês" this_week: "Esta semana" @@ -1286,6 +1472,16 @@ pt: admins: 'Administradores:' blocked: 'Bloqueado:' suspended: 'Suspenso: ' + private_messages_short: "Msgs" + private_messages_title: "Mensagens" + space_free: "{{size}} livre" + uploads: "carregamentos" + backups: "cópias de segurança" + traffic_short: "Tráfego" + traffic: "Pedidos de aplicação web" + page_views: "Pedidos API" + page_views_short: "Pedidos API" + show_traffic_report: "Mostrar Relatório Detalhado do Tráfego" reports: today: "Hoje" yesterday: "Ontem" @@ -1311,6 +1507,7 @@ pt: agree_title: "Confirmar esta sinalização como válida e correta" agree_flag_modal_title: "Aceitar e..." agree_flag_hide_post: "Aceitar (esconder mensagem + enviar MP)" + agree_flag_hide_post_title: "Esconder esta publicação e enviar automaticamente uma mensagem ao utilizador solicitando a edição urgente da mesma" agree_flag_restore_post: "Concordar (restaurar mensagem)" agree_flag_restore_post_title: "Restaurar esta mensagem" agree_flag: "Concordar com a sinalização" @@ -1382,6 +1579,12 @@ pt: name: "Nome" add: "Adicionar" add_members: "Adicionar membros" + custom: "Personalizar" + automatic: "Automático" + automatic_membership_email_domains: "Utilizadores que registem um domínio de email que corresponde exactamente a algum desta lista irão ser automaticamente adicionados a este grupo:" + automatic_membership_retroactive: "Aplicar a mesma regra de domínio de email para adicionar utilizadores registados existentes" + default_title: "Título padrão para todos os utilizadores neste grupo" + primary_group: "Definir automaticamente como grupo primário" api: generate_master: "Gerar Chave Mestra API " none: "Não existem chaves API ativas neste momento." @@ -1396,6 +1599,14 @@ pt: info_html: "A sua chave API permitirá a criação e edição de tópicos usando pedidos JSON." all_users: "Todos os Utilizadores" note_html: "Manter esta chave secreta, todos os utilizadores que a tenham poderão criar mensagens arbitrárias como qualquer utilizador." + plugins: + title: "Plugins" + installed: "Plugins Instalados" + name: "Nome" + none_installed: "Não tem nenhum plugin instalado." + version: "Versão" + change_settings: "Alterar Configurações" + howto: "Como instalo plugins?" backups: title: "Cópias de Segurança" menu: @@ -1405,15 +1616,19 @@ pt: read_only: enable: title: "Ativar o modo só de leitura" + label: "Ativar modo só de leitura" confirm: "Tem a certeza que quer ativar o modo só de leitura?" disable: title: "Desativar o modo só de leitura" + label: "Desativar modo só de leitura" logs: none: "Nenhuns logs ainda..." columns: filename: "Nome do ficheiro" size: "Tamanho" upload: + label: "Carregar" + title: "Carregar uma cópia de segurança para esta instância" uploading: "A carregar…" success: "'{{filename}}' foi carregado com sucesso." error: "Verificou-se um erro no carregamento de '{{filename}}': {{message}}" @@ -1421,25 +1636,32 @@ pt: is_running: "Existe atualmente uma operação em execução..." failed: "A {{operation}} falhou. Por favor verifique o registo dos logs." cancel: + label: "Cancelar" title: "Cancelar a operação atual" confirm: "Tem a certeza que deseja cancelar a operação atual?" backup: + label: "Cópia de segurança" title: "Criar uma cópia de segurança" confirm: "Deseja criar uma nova cópia de segurança?" without_uploads: "Sim (não incluir ficheiros)" download: + label: "Descarregar" title: "Descarregar a cópia de segurança" destroy: title: "Remover a cópia de segurança" confirm: "Tem a certeza que deseja destruir esta cópia de segurança?" restore: is_disabled: "A opção de restauro encontra-se desativada nas configurações do sítio." + label: "Restaurar" title: "Restaurar a cópia de segurança" confirm: "Tem a certeza que deseja restaurar esta cópia de segurança?" rollback: + label: "Reverter" title: "Reverter a base de dados para um estado anterior operacional" confirm: "Tem a certeza que deseja reverter a base de dados para um estado anterior operacional?" export_csv: + user_archive_confirm: "Tem a certeza que deseja descarregar as suas mensagens?" + success: "Exportação iniciada, será notificado através de mensagem assim que o processo estiver concluído." failed: "A exportação falhou. Por favor verifique os registos dos logs." rate_limit_error: "As mensagens podem ser descarregadas uma vez por dia. Por favor, tente novamente amanhã." button_text: "Exportar" @@ -1449,12 +1671,22 @@ pt: screened_email: "Exportar lista total de emails selecionados em formato CSV." screened_ip: "Exportar lista total de IP selecionados em formato CSV." screened_url: "Exportar lista total de URL selecionados em formato CSV." + invite: + button_text: "Enviar Convites" + button_title: "Enviar Convites" customize: title: "Personalizar" long_title: "Personalizações do Sítio" css: "CSS" header: "Cabeçalho" + top: "Topo" footer: "Rodapé" + head_tag: + text: "" + title: "HTML que será introduzido antes da tag " + body_tag: + text: "" + title: "HTML que será introduzido antes da tag " override_default: "Não incluir a folha de estilo por defeito" enabled: "Ativado?" preview: "pré-visualização" @@ -1572,6 +1804,7 @@ pt: do_nothing: "não fazer nada" staff_actions: title: "Ações do Pessoal" + instructions: "Clique nos nomes de utilizadores e nas ações para filtrar a lista. Clique nas fotografias de perfil para ir para as páginas dos utilizadores." clear_filters: "Mostrar Tudo" staff_user: "Utilizador do Pessoal" target_user: "Utilizador Destino" @@ -1589,6 +1822,7 @@ pt: actions: delete_user: "remover utilizador" change_trust_level: "modificar Nível de Confiança" + change_username: "alterar nome de utilizador" change_site_setting: "alterar configurações do sítio" change_site_customization: "alterar personalização do sítio" delete_site_customization: "remover personalização do sítio" @@ -1600,6 +1834,7 @@ pt: delete_topic: "eliminar tópico" delete_post: "eliminar mensagem" impersonate: "personificar" + anonymize_user: "tornar utilizador anónimo" screened_emails: title: "Emails Filtrados" description: "Quando alguém tenta criar uma nova conta, os seguintes endereços de email serão verificados e o registo será bloqueado, ou outra ação será executada." @@ -1626,6 +1861,7 @@ pt: label: "Novo:" ip_address: "Endereço IP" add: "Adicionar" + filter: "Pesquisar" roll_up: text: "Adicionar" title: "Cria interdições de sub-redes se existir pelo menos 'min_ban_entries_for_roll_up' entradas." @@ -1732,8 +1968,13 @@ pt: approve_success: "Utilizador aprovado e email enviado com instruções de ativação." approve_bulk_success: "Sucesso! Todos os utilizadores selecionados foram aprovados e notificados." time_read: "Tempo de leitura" + anonymize: "Tornar utilizador anónimo" + anonymize_confirm: "Tem a CERTEZA que deseja tornar esta conta anónima? Isto irá alterar o nome de utilizador e email e repor todas as informações de perfil." + anonymize_yes: "Sim, tornar esta conta anónima" + anonymize_failed: "Ocorreu um problema ao tornar esta conta anónima." delete: "Eliminar Utilizador" delete_forbidden_because_staff: "Administradores e moderadores não podem ser eliminados." + delete_posts_forbidden_because_staff: "Não é possível eliminar todas as mensagens dos administradores e moderadores." delete_forbidden: one: "Utilizadores não podem ser eliminados se tiverem mensagens. Apague todas as mensagens antes de eliminar o utilizador. (Mensagens com mais de %{count} dia de existência não podem ser eliminadas.)" other: "Utilizadores não podem ser eliminados se tiverem mensagens. Apague todas as mensagens antes de eliminar o utilizador. (Mensagens com mais de %{count} dias de existência não podem ser eliminadas.)" @@ -1761,6 +2002,8 @@ pt: suspended_explanation: "Um utilizador suspenso não pode iniciar sessão." block_explanation: "Um utilizador bloqueado não pode publicar mensagens ou iniciar tópicos." trust_level_change_failed: "Ocorreu um problema ao alterar o Nível de Confiança do utilizador." + grant_admin_failed: "Ocorreu um problema ao conceder privilégios de administrador." + grant_moderation_failed: "Ocorreu um problema ao conceder privilégios de moderador." suspend_modal_title: "Utilizador Suspenso" trust_level_2_users: "Utilizadores no Nível de Confiança 2" trust_level_3_requirements: "Requisitos do Nível de Confiança 3" @@ -1799,6 +2042,7 @@ pt: external_username: "Nome de Utilizador" external_name: "Nome" external_email: "Email" + external_avatar_url: "URL da Fotografia de Perfil" user_fields: title: "Campos de utilizador" help: "Adicione campos que os seus utilizadores poderão preencher." @@ -1820,6 +2064,10 @@ pt: title: "Editável depois da inscrição?" enabled: "editável" disabled: "não editável" + show_on_profile: + title: "Exibir no perfil público?" + enabled: "exibido no perfil" + disabled: "não exibido no perfil" field_types: text: 'Campo de Texto' confirm: 'Confirmação' @@ -1833,6 +2081,7 @@ pt: none: 'nenhum' no_results: "Não foi encontrado nenhum resultado." clear_filter: "Limpar" + add_url: "adicionar URL" categories: all_results: 'Todos' required: 'Necessário' @@ -1853,6 +2102,7 @@ pt: uncategorized: 'Outro' backups: "Cópias de Segurança" login: "Iniciar Sessão" + plugins: "Plugins" badges: title: Distintivos new_badge: Novo Distintivo @@ -1867,10 +2117,13 @@ pt: modal_title: Agrupamento de Distintivos granted_by: Concedido Por granted_at: Concedido Em + reason_help: (Uma hiperligação para uma mensagem ou tópico) save: Guardar delete: Apagar delete_confirm: Tem a certeza que quer eliminar este distintivo? revoke: Revogar + reason: Motivo + expand: Expandir … revoke_confirm: Tem a certeza que quer revogar este distintivo? edit_badges: Editar Distintivos grant_badge: Conceder Distintivo @@ -1957,6 +2210,7 @@ pt: dismiss_topics: 'x, t Destituir Tópicos' actions: title: 'Ações' + bookmark_topic: 'f Alternar marcador de tópico' pin_unpin_topic: 'shift+p Tópico Fixado/Desafixado' share_topic: 'shift+s Partilhar tópico' share_post: 's Partilhar mensagem' @@ -1975,6 +2229,8 @@ pt: mark_watching: 'm, w Vigiar este tópico' badges: title: Distintivos + allow_title: "pode ser usado como título" + multiple_grant: "pode ser premiado múltiplas vezes" badge_count: one: "1 Distintivo" other: "%{count} Distintivos" @@ -2019,6 +2275,9 @@ pt: autobiographer: name: Autobiógrafo description: 'Preencheu informações no perfil de utilizador ' + anniversary: + name: Aniversário + description: Membro ativo há um ano, publicou pelo menos uma vez nice_post: name: Boa Mensagem description: Recebeu 10 gostos numa mensagem. Este distintivo pode ser concedido diversas vezes diff --git a/config/locales/client.pt_BR.yml b/config/locales/client.pt_BR.yml index c13ed9f1be..5479adfe21 100644 --- a/config/locales/client.pt_BR.yml +++ b/config/locales/client.pt_BR.yml @@ -108,7 +108,6 @@ pt_BR: show_more: "mostrar mais" show_help: "Ajuda" links: "Links" - links_lowercase: "links" faq: "FAQ" guidelines: "Orientações" privacy_policy: "Política de Privacidade" @@ -452,7 +451,6 @@ pt_BR: auto_track_topics: "Seguir automaticamente tópicos que eu entro" auto_track_options: never: "nunca" - always: "sempre" after_n_seconds: one: "passado 1 segundo" other: "passado {{count}} segundos" @@ -547,7 +545,6 @@ pt_BR: mute: Silenciar unmute: Reativar last_post: Última resposta - last_post_lowercase: último post summary: enabled_description: "Você está vendo um sumário deste tópico: os posts mais interessantes conforme determinados pela comunidade." description: "Há {{count}} respostas." @@ -1332,15 +1329,12 @@ pt_BR: outro {}} original_post: "Resposta original" views: "Visualizações" - views_lowercase: "visualizações" replies: "Respostas" views_long: "este tópico foi visto {{number}} vezes" activity: "Atividade" likes: "Curtidas" - likes_lowercase: "likes" likes_long: "há {{number}} curtidas neste tópico" users: "Usuários" - users_lowercase: "usuários" category_title: "Categoria" history: "Histórico" changed_by: "por {{author}}" diff --git a/config/locales/client.ru.yml b/config/locales/client.ru.yml index 4a3935430f..68ff24e1f6 100644 --- a/config/locales/client.ru.yml +++ b/config/locales/client.ru.yml @@ -124,7 +124,10 @@ ru: show_more: "показать дальше" show_help: "справка" links: "Ссылки" - links_lowercase: "ссылки" + links_lowercase: + one: "ссылка" + few: "ссылки" + other: "ссылок" faq: "Вопрос-ответ" guidelines: "Руководство" privacy_policy: "Политика конфиденциальности" @@ -215,6 +218,19 @@ ru: title: search: "Искать тему по названию, ссылке или уникальному номеру:" placeholder: "введите название темы здесь" + queue: + topic: "Тема:" + approve: 'Одобрить' + reject: 'Отклонить' + title: "Требуют одобрения" + none: "Нет сообщений для проверки" + edit: "Изменить" + cancel: "Отменить" + confirm: "Сохранить" + approval: + title: "Сообщения для проверки" + description: "Ваше сообщение отправлено, но требует проверки и утверждения модератором. Пожалуйста, будьте терпеливы." + ok: "ОК" user_action: user_posted_topic: "{{user}} создал тему" you_posted_topic: "Вы создали тему" @@ -478,7 +494,7 @@ ru: auto_track_topics: "Автоматически отслеживать темы, которые я просматриваю" auto_track_options: never: "никогда" - always: "всегда" + immediately: "немедленно" after_n_seconds: one: "через 1 секунду" few: "через несколько секунд" @@ -575,7 +591,11 @@ ru: mute: Отключить unmute: Включить last_post: Последнее сообщение - last_post_lowercase: последнее сообщение + last_reply_lowercase: последний ответ + replies_lowercase: + one: ответ + few: ответа + other: ответов summary: enabled_description: "Вы просматриваете выдержку из темы - только самые интересные сообщения по мнению сообщества." description: "Есть {{count}} ответ(ов)." @@ -1395,15 +1415,24 @@ ru: other {}} original_post: "Начальное сообщение" views: "Просм." - views_lowercase: "просм." + views_lowercase: + one: "просмотр" + few: "просмотра" + other: "просмотров" replies: "Ответов" views_long: "тема просмотрена {{number}} раз" activity: "Активность" likes: "Нрав." - likes_lowercase: "нрав." + likes_lowercase: + one: "лайк" + few: "лайка" + other: "лайков" likes_long: "{{number}} лайков в теме" users: "Пользователи" - users_lowercase: "пользователи" + users_lowercase: + one: "пользователь" + few: "пользователя" + other: "пользователей" category_title: "Раздел" history: "История" changed_by: "автором {{author}}" diff --git a/config/locales/client.sq.yml b/config/locales/client.sq.yml index 31d54c540e..b1aa357f3c 100644 --- a/config/locales/client.sq.yml +++ b/config/locales/client.sq.yml @@ -106,7 +106,6 @@ sq: show_more: "trego më shumë" show_help: "ndihmë" links: "Lidhjet" - links_lowercase: "lidhjet" faq: "Pyetje" guidelines: "Udhëzimet" privacy_policy: "Politika e Privatësis" @@ -174,6 +173,7 @@ sq: undo: "Zhbëj" revert: "Rikthe" failed: "Dështojë" + switch_to_anon: "Mënyrë Anonime" banner: close: "Hiq këtë reklamë." choose_topic: @@ -198,6 +198,8 @@ sq: directory: time_read: "Koha e Leximit" post_count: "Përgjigje" + days_visited: "Vizita" + days_visited_long: "Vizita Ditore" groups: visible: "Grupi është i dukshëm për të gjithë përdoruesit" title: @@ -217,6 +219,7 @@ sq: '2': "Pëlqime të marra" '3': "Të Preferuarat" '4': "Tema" + '5': "Përgjigje" '7': "Përmendje" '9': "Citim" '10': "Shënuar" @@ -249,6 +252,7 @@ sq: location_not_found: (i panjohur) organisation: Organizata phone: Telefoni + username: "pseudonimi" trust_level: "TL" read_time: "koha e leximit" post_count: "# postimeve" @@ -257,6 +261,8 @@ sq: profile: "Profili" mute: "Mute" edit: "Ndrysho Preferencat" + new_private_message: "Mesazh i Ri" + private_message: "Mesazh" private_messages: "Mesazhet" activity_stream: "Aktiviteti" preferences: "Preferencat" @@ -321,6 +327,7 @@ sq: error: "Hasëm një gabim gjatë ndryshimit të adresës email. Mos vallë është në përdorim nga dikush tjetër?" success: "Ju dërguam një email tek adresa që shkruajtët. Ju ftojmë të ndiqni udhëzimet e konfirmimit." change_avatar: + title: "Ndrysho fotografinë e profilit" gravatar: "Gravatar, bazur në" refresh_gravatar_title: "Rifresko Gravatar tuaj" uploaded_avatar: "Foto personalizuar" @@ -337,6 +344,8 @@ sq: title: "Email" name: title: "Emri" + instructions_required: "Emri i plotë" + too_short: "Emri juaj është shumë i shkurtër" username: title: "Pseudonimi" global_mismatch: "Jeni vallë regjistruar më parë. Provo {{suggestion}}?" @@ -374,7 +383,6 @@ sq: other: "created in the last {{count}} weeks" auto_track_options: never: "asnjëherë" - always: "gjithmon" after_n_seconds: one: "pas 1 sekonde" other: "pas {{count}} sekonda" @@ -460,7 +468,6 @@ sq: mute: Mute unmute: Unmute last_post: Postimi fundit - last_post_lowercase: last post summary: enabled_description: "You're viewing a summary of this topic: the most interesting posts as determined by the community." description: "Janë {{count}} përgjigje." @@ -1146,15 +1153,12 @@ sq: posts_long: "there are {{number}} posts in this topic" original_post: "Postimi Origjinal" views: "Shikimet" - views_lowercase: "shikime" replies: "Përgjigjet" views_long: "this topic has been viewed {{number}} times" activity: "Aktiviteti" likes: "Pëlqimet" - likes_lowercase: "pëlqime" likes_long: "there are {{number}} likes in this topic" users: "Anëtarët" - users_lowercase: "users" category_title: "Kategori" history: "Historia" changed_by: "nga {{author}}" @@ -1777,7 +1781,7 @@ sq: email: 'Email' files: 'Skedarë' trust: 'Niveli Besimit' - security: 'Sigura' + security: 'Siguria' onebox: "Onebox" seo: 'SEO' spam: 'Spam' @@ -1851,6 +1855,8 @@ sq: with_post: %{username} for post in %{link} with_post_time: %{username} for post in %{link} at %{time} with_time: %{username} at %{time} + emoji: + image: "Imazh" lightbox: download: "shkarko" search_help: @@ -1943,6 +1949,8 @@ sq: autobiographer: name: Autobiographer description: Filled user profile information + anniversary: + name: Përvjetori nice_post: name: Nice Post description: Received 10 likes on a post. This badge can be granted multiple times diff --git a/config/locales/client.sv.yml b/config/locales/client.sv.yml index 0427d0ac32..2880c8dc5e 100644 --- a/config/locales/client.sv.yml +++ b/config/locales/client.sv.yml @@ -106,7 +106,6 @@ sv: show_more: "visa mer" show_help: "hjälp" links: "Länkar" - links_lowercase: "länkar" faq: "FAQ" guidelines: "Riktlinjer" privacy_policy: "Integritetspolicy" @@ -423,7 +422,6 @@ sv: auto_track_topics: "Följ automatiskt nya trådar jag går in i" auto_track_options: never: "aldrig" - always: "alltid" after_n_seconds: one: "efter 1 sekund" other: "efter {{count}} sekunder" @@ -514,7 +512,6 @@ sv: mute: Dämpa unmute: Avdämpa last_post: Senaste inlägg - last_post_lowercase: senaste inlägg summary: enabled_description: "Sammanfattning över de inlägg som användarna tycker är mest intressanta." description: "Det finns {{count}} svar." @@ -1205,15 +1202,12 @@ sv: posts_long: "{{number}} inlägg i den här tråden" original_post: "Originalinlägg" views: "Visningar" - views_lowercase: "visningar" replies: "Svar" views_long: "denna tråd har visats {{number}} gånger" activity: "Aktivitet" likes: "Gillningar" - likes_lowercase: "gillningar" likes_long: "det finns {{number}} gillningar i den här tråden" users: "Användare" - users_lowercase: "användare" category_title: "Kategori" history: "Historik" changed_by: "av {{author}}" diff --git a/config/locales/client.te.yml b/config/locales/client.te.yml index ba419a6017..f306deb116 100644 --- a/config/locales/client.te.yml +++ b/config/locales/client.te.yml @@ -107,7 +107,6 @@ te: show_more: "మరింత చూపు" show_help: "సహాయం" links: "లంకెలు" - links_lowercase: "లంకెలు" faq: "తవసం" guidelines: "మార్గదర్శకాలు" privacy_policy: "ప్రైవసీ పోలసీ" @@ -416,7 +415,6 @@ te: auto_track_topics: "నేను రాసే విషయాలు ఆటోమేటిగ్గా గమనించు" auto_track_options: never: "ఎప్పటికీ వద్దు" - always: "ఎప్పుడూ" after_n_seconds: one: "ఒక సెకన్ తర్వాత" other: "{{count}} సెకన్ల తర్వాత" @@ -509,7 +507,6 @@ te: mute: నిశ్శబ్దం unmute: వినిశ్శబ్దం last_post: చివరి టపా - last_post_lowercase: చివరి టపా summary: enabled_description: "మీరు ఈ విషయపు సారాంశము చదువుతున్నారు. ఆసక్తికర టపాలు కమ్యునిటీ ఎంచుకుంటుంది. " description: "అక్కడ మొత్తం {{count}} జవాబులు ఉన్నాయి" @@ -1211,15 +1208,12 @@ te: posts_long: "ఈ విషయానికి {{number}} టపాలు ఉన్నాయి. " original_post: "మూల టపా" views: "చూపులు" - views_lowercase: "చూపులు" replies: "జవాబులు" views_long: "ఈ విషయం {{number}} సార్లు చూడబడింది." activity: "కలాపం" likes: "ఇష్టాలు" - likes_lowercase: "ఇష్టాలు" likes_long: "ఈ విషయానికి {{number}} ఇష్టాలు ఉన్నాయి" users: "సభ్యులు" - users_lowercase: "సభ్యులు" category_title: "వర్గం" history: "చరిత్ర" changed_by: " {{author}} రాసిన" diff --git a/config/locales/client.tr_TR.yml b/config/locales/client.tr_TR.yml index 63c6a21432..15ac96d06a 100644 --- a/config/locales/client.tr_TR.yml +++ b/config/locales/client.tr_TR.yml @@ -91,7 +91,6 @@ tr_TR: show_more: "devamını göster" show_help: "yardım" links: "Bağlantılar" - links_lowercase: "bağlantılar" faq: "SSS/Yönergeler" guidelines: "Yönergeler" privacy_policy: "Gizlilik İlkeleri" @@ -400,7 +399,6 @@ tr_TR: auto_track_topics: "Girdiğim konuları otomatik olarak takip et" auto_track_options: never: "asla" - always: "her zaman" after_n_seconds: other: "{{count}} saniye sonra" after_n_minutes: @@ -491,7 +489,6 @@ tr_TR: mute: Sustur unmute: Susturma last_post: Son gönderi - last_post_lowercase: son gönderi summary: enabled_description: "Bu konunun özetini görüntülemektesiniz: topluluğun en çok ilgisini çeken gönderiler" description: "{{count}} sayıdacevap var." @@ -1164,15 +1161,12 @@ tr_TR: posts_long: "bu konuda {{number}} gönderi var" original_post: "Ana Gönderi" views: "Görüntüleme" - views_lowercase: "görüntüleme" replies: "Cevaplar" views_long: "bu konu {{number}} defa görüntülendi" activity: "Aktivite" likes: "Beğeni" - likes_lowercase: "beğeni" likes_long: "bu konuda {{number}} beğeni var" users: "Kullanıcı" - users_lowercase: "kullanıcı" category_title: "Kategori" history: "Geçmiş" changed_by: "Yazan {{author}}" diff --git a/config/locales/client.uk.yml b/config/locales/client.uk.yml index 67deb7aa0a..bab5f8fd95 100644 --- a/config/locales/client.uk.yml +++ b/config/locales/client.uk.yml @@ -58,7 +58,6 @@ uk: show_more: "показати більше" show_help: "Допомога" links: "Посилання" - links_lowercase: "посилання" faq: "Часті запитання" guidelines: "Інструкції" privacy_policy: "Політика конфіденційності" @@ -327,7 +326,6 @@ uk: label: "Вважати теми новими, якщо" auto_track_options: never: "ніколи" - always: "завжди" invited: search: "шукати запрошення..." title: "Запрошення" @@ -393,7 +391,6 @@ uk: mute: Mute unmute: Unmute last_post: Останній допис - last_post_lowercase: останній допис summary: description: "Тут {{count}} відповідей." enable: 'Підсумувати цю тему' diff --git a/config/locales/client.zh_CN.yml b/config/locales/client.zh_CN.yml index 9558084000..139772f1c1 100644 --- a/config/locales/client.zh_CN.yml +++ b/config/locales/client.zh_CN.yml @@ -92,7 +92,8 @@ zh_CN: show_more: "显示更多" show_help: "帮助" links: "链接" - links_lowercase: "链接" + links_lowercase: + other: "链接" faq: "常见问题（FAQ）" guidelines: "指引" privacy_policy: "隐私政策" @@ -175,6 +176,19 @@ zh_CN: title: search: "通过名称、URL 或者 ID，搜索主题：" placeholder: "在此输入主题标题" + queue: + topic: "主题：" + approve: '许可' + reject: '拒绝' + title: "需要许可" + none: "没有帖子可以审核。" + edit: "编辑" + cancel: "取消" + confirm: "保存修改" + approval: + title: "帖子需要审核" + description: "我们已经保存了你的帖子，不过帖子需要由管理员先审核才能显示。请耐心。" + ok: "确认" user_action: user_posted_topic: "{{user}} 发起了 本主题" you_posted_topic: "你 发起了 本主题" @@ -426,7 +440,7 @@ zh_CN: auto_track_topics: "自动追踪我进入的主题" auto_track_options: never: "从不" - always: "始终" + immediately: "立刻" after_n_seconds: other: "{{count}} 秒之后" after_n_minutes: @@ -519,7 +533,9 @@ zh_CN: mute: 防打扰 unmute: 解除防打扰 last_post: 最后一帖 - last_post_lowercase: 最后一帖 + last_reply_lowercase: 最后回复 + replies_lowercase: + other: 回复 summary: enabled_description: "你正在查看这个主题的概括版本：由社群认定的最有意思的帖子。" description: "有 {{count}} 个回复。" @@ -1269,15 +1285,18 @@ zh_CN: other {}} original_post: "原始帖" views: "浏览" - views_lowercase: "浏览" + views_lowercase: + other: "浏览" replies: "回复" views_long: "本主题已经被浏览过 {{number}} 次" activity: "活动" likes: "赞" - likes_lowercase: "赞" + likes_lowercase: + other: "赞" likes_long: "本主题已有 {{number}} 次赞" users: "参与者" - users_lowercase: "参与者" + users_lowercase: + other: "用户" category_title: "分类" history: "历史" changed_by: "由 {{author}}" @@ -1491,6 +1510,8 @@ zh_CN: automatic: "自动" automatic_membership_email_domains: "用户注册时邮箱域名若与列表完全匹配则自动添加至这个群组：" automatic_membership_retroactive: "应用同样的邮件域名规则添加已经注册的用户" + default_title: "群组内所有用户的默认头衔" + primary_group: "自动设置为主要群组" api: generate_master: "生成主 API 密钥" none: "当前没有活动的 API 密钥。" diff --git a/config/locales/client.zh_TW.yml b/config/locales/client.zh_TW.yml index 0309aefb9b..f9c67fc239 100644 --- a/config/locales/client.zh_TW.yml +++ b/config/locales/client.zh_TW.yml @@ -91,7 +91,8 @@ zh_TW: show_more: "顯示更多" show_help: "幫助" links: "連結" - links_lowercase: "Links" + links_lowercase: + other: "鏈結" faq: "常見問答集" guidelines: "守則" privacy_policy: "隱私政策" @@ -165,6 +166,8 @@ zh_TW: undo: "復原" revert: "回復" failed: "失敗" + switch_to_anon: "匿名模式" + switch_from_anon: "退出匿名模式" banner: close: "關閉此橫幅" choose_topic: @@ -406,7 +409,6 @@ zh_TW: auto_track_topics: "自動追蹤我參與的討論" auto_track_options: never: "永不" - always: "總是" after_n_seconds: other: "{{count}} 秒後" after_n_minutes: @@ -497,7 +499,6 @@ zh_TW: mute: 靜音 unmute: 取消靜音 last_post: 最後一篇文章 - last_post_lowercase: 最近發表 summary: enabled_description: "你正在檢視此討論話題的摘要：在這個社群裡最熱門的文章。" description: "共有 {{count}} 個回覆。" @@ -1174,15 +1175,12 @@ zh_TW: posts_long: "此討論話題有 {{number}} 篇文章" original_post: "原始文章" views: "觀看" - views_lowercase: "觀看" replies: "回覆" views_long: "此討論話題已被看過 {{number}} 次" activity: "活動" likes: "讚" - likes_lowercase: "讚" likes_long: "此討論話題收到了 {{number}} 個讚" users: "用戶" - users_lowercase: "用戶" category_title: "分類" history: "歷史" changed_by: "作者 {{author}}" diff --git a/config/locales/server.cs.yml b/config/locales/server.cs.yml index f76a467687..95c40fdf61 100644 --- a/config/locales/server.cs.yml +++ b/config/locales/server.cs.yml @@ -19,10 +19,31 @@ cs: via: "%{username} přes %{site_name}" is_reserved: "je rezervováno" disable_remote_images_download_reason: "Stahování obrázků z cizích serverů bylo vypnuto protože na disku není dostatek místa." + anonymous: "Anonymní" errors: + format: '%{attribute} %{message}' messages: too_long_validation: "je limitováno na %{max} znaků; zadali jste %{length}." invalid_boolean: "Nevalidní boolean." + taken: "už je zabráno" + accepted: musí být odsouhlasen + empty: nemůže být prázdný + equal_to: musí být roven %{count} + even: musí být sudý + exclusion: je rezervováno + greater_than: musí být větší než %{count} + greater_than_or_equal_to: musí být větší nebo rovno %{count} + inclusion: není zahrnutý v seznamu + invalid: je neplatný + less_than: musí být menší než %{count} + less_than_or_equal_to: musí být menší nebo roven %{count} + not_a_number: není číslo + not_an_integer: musí být celé číslo + odd: musí být lichý + record_invalid: 'Ověření selhalo: %{errors}' + other_than: "musí být jiný než %{count}" + template: + body: 'Nastaly problémy s následujícími poli: ' embed: load_from_remote: "Při načítání příspěvku nastala chyba." bulk_invite: @@ -88,13 +109,16 @@ cs: num_posts: "Příspěvky:" num_participants: "Účastníci:" read_full_topic: "Číst celé téma" + private_message_abbrev: "Msg" rss_description: latest: "Poslední témata" hot: "Populární témata" too_late_to_edit: "Tento příspěvek byl vytvořen velmi dávno. Už ho není možné smazat ani upravovat." + excerpt_image: "obrázek" groups: errors: can_not_modify_automatic: "Automatickou skupinu nelze upravit" + member_already_exist: "'%{username}' je už členem této skupiny." default_names: everyone: "kdokoliv" admins: "admins" @@ -179,6 +203,8 @@ cs: attributes: password: common: "je jedno z 10 000 nejčastějších hesel. Použijte prosím bezpečnější heslo." + same_as_username: "je stejné jako vaše uživatelské jméno. Zkuste vymyslet bezpečnější heslo." + same_as_email: "je stejné jako váš email. Zkuste vymyslet bezpečnější heslo." ip_address: signup_not_allowed: "Registrace z této adresy není povolena." color_scheme_color: @@ -362,10 +388,13 @@ cs: title: 'Spam' description: 'Tento příspěvek je reklama. Není užitečný ani relevantní k tématu.' long_form: 'označeno jako spam' + email_title: '"%{title}" byl označen jako spam' + email_body: "%{link}\n\n%{message}" inappropriate: title: 'Nevhodné' long_form: 'nahlášeno jako nevhodné' notify_user: + title: 'Zpráva @{{username}}' description: 'Tato zpráva obsahuje něco o čem bych s autorem rád mluvil přímo a soukromě. Nevytvoří varování moderátorům.' email_title: 'Váš příspěvek v „%{title}“' email_body: "%{link}\\\n\\\n%{message}\n" @@ -399,6 +428,7 @@ cs: notify_moderators: title: "Něco jiného" description: 'Toto téma vyžaduje pozornost moderátorů na základě pravidel komunity, pravidel použítí, nebo z jiného výše neuvedeného důvodu.' + long_form: 'nahlášeno moderátorům' email_title: 'The topic "%{title}" requires moderator attention' email_body: "%{link}\\\n\\\n%{message}\n" archetypes: @@ -425,6 +455,7 @@ cs: xaxis: "Den" yaxis: "Počet návštěv" signups: + title: "Noví uživatelé" xaxis: "Den" yaxis: "Počet nových uživatelů" topics: @@ -462,18 +493,23 @@ cs: user_to_user_private_messages: title: "Uživatelské soukromé zprávy" xaxis: "Den" + yaxis: "Počet zpráv" system_private_messages: title: "Systémové soukromé zprávy" xaxis: "Den" + yaxis: "Počet zpráv" moderator_warning_private_messages: title: "Moderátorská varování" xaxis: "Den" + yaxis: "Počet zpráv" notify_moderators_private_messages: title: "Moderátorská upozornění" xaxis: "Den" + yaxis: "Počet zpráv" notify_user_private_messages: title: "Uživatelská upozornění" xaxis: "Den" + yaxis: "Počet zpráv" top_referrers: title: "Odkazovatelé" xaxis: "Uživatel" @@ -489,13 +525,47 @@ cs: title: "Odkazovaná témata" xaxis: "Témata" num_clicks: "Kliknutí" + page_view_anon_reqs: + title: "Anonymní" + xaxis: "Den" + yaxis: "Anonymní API požadavky" + page_view_logged_in_reqs: + xaxis: "Den" + page_view_crawler_reqs: + xaxis: "Den" + page_view_total_reqs: + title: "Celkem" + xaxis: "Den" + yaxis: "Celkem API požadavků" + http_background_reqs: + title: "Pozadí" + xaxis: "Den" + http_2xx_reqs: + title: "Status 2xx (OK)" + xaxis: "Den" + yaxis: "Successful requests (Status 2xx)" + http_3xx_reqs: + title: "HTTP 3xx (Redirect)" + xaxis: "Den" + yaxis: "Redirect requests (Status 3xx)" + http_4xx_reqs: + title: "HTTP 4xx (Client Error)" + xaxis: "Den" + yaxis: "Client Errors (Status 4xx)" + http_5xx_reqs: + title: "HTTP 5xx (Server Error)" + xaxis: "Den" + yaxis: "Server Errors (Status 5xx)" + http_total_reqs: + title: "Celkem" + xaxis: "Den" + yaxis: "Celkem požadavků" dashboard: rails_env_warning: "Váš server běží v módu %{env}." ruby_version_warning: "You are running a version of Ruby 2.0.0 that is known to have problems. Upgrade to patch level 247 or later." host_names_warning: "Vaše konfigurace v souboru config/database.yml používá 'localhost' jako jméno hostitele. Změňte toto nastavení na doménu vašeho webu." gc_warning: 'Váš server používá výchozí nastavení ruby garbage collectoru, což způsobuje snížený výkon. Přečtěte si toto téma ohledně ladění výkonu: Tuning Ruby and Rails for Discourse.' sidekiq_warning: 'Sidekiq neběží. Řada úloh, jako je zasílání emailů, se provádí asynchronně na pozadí přes sidekiq. Prosím, ujistěte se, že alespoň jeden process sidekiq běží. Více o Sidekiq.' - queue_size_warning: 'Počet čekajících úloh je %{queue_size}, což je příliš mnoho. Mohlo by to indikovat problém se službou Sidekiq, nebo je zapotřebí spustit více Sidekiq worker procesů.' memory_warning: 'Váš server má méně než 1 GB paměti. Doporučená konfigurace je alespoň 1 GB paměti.' facebook_config_warning: 'Server je nakonfigurován, aby povoloval registraci a přihlášení přes Facebook (enable_facebook_logins), ale nejsou nastaveny hodnoty "app id" a "app secret". Navštivte nastevení webu a opravte nastavení. Pro více informací si přečtěte tento návod.' twitter_config_warning: 'Server je nakonfigurován, aby povoloval registraci a přihlášení přes Twitter (enable_twitter_logins), ale nejsou nastaveny hodnoty "key" a "secret". Navštivte nastevení webu a opravte nastavení. Pro více informací si přečtěte tento návod.' @@ -646,7 +716,9 @@ cs: closed_enabled: "Toto téma je uzavřeno. Nové odpovědi nebudou přijímány." closed_disabled: "Toto téma je otevřeno. Nové odpovědi jsou povoleny." autoclosed_disabled: "Toto téma je otevřeno. Nové odpovědi jsou povoleny." + autoclosed_disabled_lastpost: "Toto téma je otevřeno. Nové odpovědi jsou povoleny." pinned_disabled: "Toto téma již není připevněno. Nebude se zobrazovat na vrcholu seznamu témat v kategorii." + pinned_globally_disabled: "Toto téma již není připevněno. Nebude se zobrazovat na vrcholu seznamu témat v kategorii." login: not_approved: "Váš účet ještě nebyl schválen. Až se tak stane, obdržíte oznámení emailem." incorrect_username_email_or_password: "Neplatné uživatelské jméno, email nebo heslo" @@ -693,6 +765,8 @@ cs: subject_template: "Zálohování bylo úspěšně dokončeno." backup_failed: subject_template: "Zálohování selhalo." + csv_export_succeeded: + subject_template: "Exportování dat dokončeno" too_many_spam_flags: subject_template: "Účet zablokován" blocked_by_staff: @@ -819,6 +893,9 @@ cs: Pokud tento odkaz nefunguje, zkuste ho zkopírovat a vložit přes schránku do adresního řádku vaše webového prohlížeče. page_not_found: title: "Stránka, kterou žádáte, na tomto diskuzním fóru neexistuje. Možná vám můžeme pomoci ji najít, nebo poradit jiné téma, které se vám může líbit:" + popular_topics: "Populární" + recent_topics: "Nedávné" + see_more: "Více" search_google: "Google" login_required: welcome_message: | @@ -850,12 +927,18 @@ cs: message_to_blank: "message.to is blank" text_part_body_blank: "text_part.body is blank" body_blank: "body is blank" + about: "O fóru" + guidelines: "Pokyny" + privacy: "Soukromí" csv_export: boolean_yes: "Ano" boolean_no: "Ne" + guidelines_topic: + title: "FAQ/Pokyny" tos_topic: title: "Podmínky používání" privacy_topic: + title: "Ochrana soukromí" body: | @@ -938,3 +1021,74 @@ cs: Pokud se rozhodneme změnit naše zásady ochrany osobních údajů, oznámíme tyto změny na této stránce. Tento text je pod licencí CC-BY-SA. Naposledy byl změněn 22. listopadu 2014. + badges: + long_descriptions: + autobiographer: | + Blah blah blah + Blah blah blah + first_like: | + Blah blah blah + Blah blah blah + first_link: | + Blah blah blah + Blah blah blah + first_quote: | + Blah blah blah + Blah blah blah + first_share: | + Blah blah blah + Blah blah blah + read_guidelines: | + Blah blah blah + Blah blah blah + reader: | + Blah blah blah + Blah blah blah + editor: | + Blah blah blah + Blah blah blah + nice_share: | + Blah blah blah + Blah blah blah + welcome: | + Blah blah blah + Blah blah blah + anniversary: | + Blah blah blah + Blah blah blah + good_share: | + Blah blah blah + Blah blah blah + great_share: | + Blah blah blah + Blah blah blah + nice_post: | + Blah blah blah + Blah blah blah + nice_topic: | + Blah blah blah + Blah blah blah + good_post: | + Blah blah blah + Blah blah blah + good_topic: | + Blah blah blah + Blah blah blah + great_post: | + Blah blah blah + Blah blah blah + great_topic: | + Blah blah blah + Blah blah blah + basic: | + Blah blah blah + Blah blah blah + member: | + Blah blah blah + Blah blah blah + regular: | + Blah blah blah + Blah blah blah + leader: | + Blah blah blah + Blah blah blah diff --git a/config/locales/server.da.yml b/config/locales/server.da.yml index b2e0fcd3fb..32ee572ebd 100644 --- a/config/locales/server.da.yml +++ b/config/locales/server.da.yml @@ -503,7 +503,6 @@ da: host_names_warning: "Filen config/database.yml bruger localhost som værtsnavn. Opdatér den med sitets værtsnavn." gc_warning: 'Din server bruger Rubys standard garbage collection, hvilket ikke giver dig den bedste performance. Læs dette emne om performance-tuning: Tuning Ruby and Rails for Discourse.' sidekiq_warning: 'Sidekiq kører ikke. Mange opgaver, som f.eks. udsendelse af e-mail, afvikles asynkront af sidekiq. Du skal sikre dig at der kører mindst én sidekiq-proces. Læs mere om Sidekiq her.' - queue_size_warning: 'Der er %{queue_size} job i køen, hvilket er ret mange. Det kan tyde på, at der er et problem med Sidekiq-processen eller det kan være nødvendigt at tilføje flere Sidekiq workers.' memory_warning: 'Din server kører med mindre end 1 GB samlet hukommelse. Det anbefales at have mindst 1 GB hukommelse.' facebook_config_warning: 'Serveren er konfigureret til at tillade tilmelding og login med Facebook (enable_facebook_logins), men app id og app secret værdierne er ikke angivet. Gå til indstillinger og opdatér indstillingerne. Se denne vejledning for mere information.' twitter_config_warning: 'Serveren er konfigureret til at tillade tilmelding og login med Twitter (enable_twitter_logins), men key og secret værdierne er ikke angivet. Gå til indstillinger og opdatér indstillingerne. Se denne vejledning for mere information.' diff --git a/config/locales/server.de.yml b/config/locales/server.de.yml index 49bc2f04dc..4f99095813 100644 --- a/config/locales/server.de.yml +++ b/config/locales/server.de.yml @@ -121,6 +121,7 @@ de: next_page: "nächste Seite →" prev_page: "← vorherige Seite" page_num: "Seite %{num}" + home_title: "Startseite" topics_in_category: "Themen in der Kategorie '%{category}'" rss_posts_in_topic: "RSS-Feed von '%{topic}'" rss_topics_in_category: "RSS-Feed von Themen in der Kategorie '%{category}'" @@ -128,6 +129,7 @@ de: num_posts: "Beiträge:" num_participants: "Teilnehmer:" read_full_topic: "Lese das vollständige Thema" + private_message_abbrev: "Nachricht" rss_description: latest: "Aktuelle Themen" hot: "Beliebte Themen" @@ -136,6 +138,7 @@ de: groups: errors: can_not_modify_automatic: "Du kannst eine automatisch verwaltete Gruppe nicht verändern." + member_already_exist: "'%{username}' ist bereits Mitglied dieser Gruppe." default_names: everyone: "jeder" admins: "admins" @@ -435,6 +438,7 @@ de: email_title: 'Das Thema "%{title}" benötigt die Aufmerksamkeit eines Moderators' email_body: "%{link}\n\n%{message}" flagging: + you_must_edit: '

      Dein Beitrag wurde von der Community gemeldet. Bitte lese deine Nachrichten.

      ' user_must_edit: '

      Dieser Beitrag wurde von der Community gemeldet und ist vorübergehend ausgeblendet.

      ' archetypes: regular: @@ -577,7 +581,6 @@ de: host_names_warning: "Deine config/database.yml-Datei verwendet localhost als Hostname. Trage hier den Hostnamen deiner Webseite ein." gc_warning: 'Dein Server verwendet die Standardparameter für Rubys Garbage-Collector, die nicht optimal sind. Lese dieses Thema über Performanzeinstellungen (en): Tuning Ruby and Rails for Discourse.' sidekiq_warning: 'Sidekiq läuft nicht. Viele Aufgaben, wie zum Beispiel das Versenden von Mails, werden asynchron durch Sidekiq ausgeführt. Stelle sicher, dass mindestens eine Sidekiq-Prozess läuft. Mehr über Sidekiq erfährst du hier (en).' - queue_size_warning: 'Es befinden sich sehr viele (%{queue_size}) Jobs in der Warteschlange. Dies könnte auf ein Problem mit Sidekiq hinweisen oder du musst zusätzliche Sidekiq Worker starten.' memory_warning: 'Dein Server läuft mit weniger als 1 GB Hauptspeicher. Mindestens 1 GB Hauptspeicher werden empfohlen.' enable_google_logins_warning: "ACHTUNG! Die derzeit von dir genutzte Methode für die Authentifizierung mit Google wird ab dem 20. April 2015 nicht mehr unterstützt! Bitte steige möglichst bald auf die neue Methode um!" both_googles_warning: "Sowohl enable_google_logins als auch enable_google_oauth2_logins sind in den Einstellungen aktiviert. Bitte deaktiviere enable_google_logins." @@ -595,6 +598,7 @@ de: title_nag: "Gib einen Namen für deine Website ein. Aktualisiere dazu den „title“ in den Einstellungen." site_description_missing: "Gib eine kurze Beschreibung deiner Website ein, die in Suchergebnissen angezeigt werden soll. Aktualisiere dazu die „site_description“ in den Einstellungen." consumer_email_warning: "Deine Seite verwendet Gmail (oder einen anderen für Endkunden gedachten Mailserver) um E-Mails zu versenden. Gmail hat eine Schranke bezüglich des Sendens von E-Mails. Um die E-Mail-Zustellung zu gewährleisten, solltest du die Verwendung eines anderen E-Mail-Diensts in Erwägung ziehen." + site_contact_username_warning: "Gib den Namen des Benutzerkontos eines freundlichen Mitarbeiters an, der als Absender für wichtige automatische Nachrichten verwendet wird. Aktualisiere site_contact_username in den Website-Einstellungen." notification_email_warning: "Benachrichtigungs-E-Mails werden nicht von einer gültigen, zu deiner Domain gehörenden E-Mail-Adresse versandt; der E-Mail-Versand wird unberechenbar und unzuverlässig sein. Bitte trage in den Einstellungen unter notification_email eine gültige lokale E-Mail-Adresse ein." content_types: education_new_reply: @@ -611,6 +615,7 @@ de: description: "Eine Nachricht, welche automatisch an alle Benutzer gesendet wird welche sich anmelden." welcome_invite: title: "Willkommen: Eingeladener Benutzer" + description: "Eine Nachricht welche automatisch an alle eingeladenen Benutzer gesendet wird, wenn diese die Einladung eines anderen Benutzers annehmen." login_required_welcome_message: title: "Anmeldung erforderlich: Willkommensnachricht" description: "Willkommensnachricht welche angezeigt wird wenn der Benutzer nicht angemeldet ist und die Einstellung 'login required' aktiviert ist." @@ -633,9 +638,11 @@ de: allow_user_locale: "Erlaube Benutzern ihre eigene Interfacesprache zu wählen" min_post_length: "Minimal zulässige Beitragslänge in Zeichen." min_first_post_length: "Minimal zulässige Länge des ersten Beitrags (eines Themas) in Zeichen" + min_private_message_post_length: "Minimale zulässige Beitragslänge in Zeichen für Nachrichten" max_post_length: "Maximale zulässige Beitragslänge in Zeichen." min_topic_title_length: "Minimale zulässige Titellänge von Themen in Zeichen." max_topic_title_length: "Maximale zulässige Titellänge von Themen in Zeichen." + min_private_message_title_length: "Minimale zulässige Titellänge von Nachrichten in Zeichen." min_search_term_length: "Minimale zulässige Länge der Suche in Zeichen." allow_uncategorized_topics: "Erlaube Themen ohne Kategorie" uncategorized_description: "Beschreibung der Kategorie für unkategorisierte Themen. Leer lassen, wenn keine Beschreibung erwünscht ist." @@ -669,6 +676,7 @@ de: digest_logo_url: "Alternatives Logo, das oben in E-Mail-Zusammenfassungen verwendet wird. Wenn leer wird `logo_url` verwendet. Zum Beispiel: http://example.com/logo.png " logo_small_url: "Kleine Logo-Grafik oben links auf der Seite, die beim Herunterscrollen angezeigt wird. Falls leer wird ein \"Home\" Zeichen angezeigt." favicon_url: "Das Favicon deiner Website, siehe http://de.wikipedia.org/wiki/Favicon" + mobile_logo_url: "Die statische Logo-Grafik oben links auf deiner Seite für mobile Geräte. Falls leer wird `logo_url` verwendet." apple_touch_icon_url: "Icon für berührungsempfindliche Apple Geräte. Empfohlene Grösse ist 144px auf 144px." notification_email: "Die E-Mail-Adresse die als \"From:\" Absender aller wichtiger System-Emails benutzt wird. Die benutzte Domain sollte über korrekte SPF, DKIM und PTR Einträge verfügen, damit Emails sicher zugestellt werden können." email_custom_headers: "Eine Pipe-getrennte (|) Liste von eigenen Mail Headern" @@ -724,8 +732,6 @@ de: email_token_grace_period_hours: "Tokens zur Passwort-Wiederherstellung / Aktivierung eines Kontos sind auch nach ihrer Verwendung noch für eine Frist von (n) Stunden gültig." enable_badges: "Abzeichen aktivieren" allow_index_in_robots_txt: "Suchmaschinen mittels der robots.txt Datei erlauben, die Seite zu indizieren." - email_domains_blacklist: "Eine Liste von E-Mail-Domains, die bei der Registrierung neuer Konten nicht erlaubt sind. Beispiel: mailinator.com trashmail.net" - email_domains_whitelist: "Eine Liste von E-Mail-Domains, mit denen neue Konten registriert werden dürfen. ACHTUNG: Benutzer mit E-Mail-Adressen anderer Domains können sich dann nicht mehr registrieren!" forgot_password_strict: "Benutzer nicht über das Vorhandensein von Konten informieren, wenn sie den \"„Passwort vergessen“-Dialog verwenden." log_out_strict: "Beim Abmelden ALLE Sitzungen des Benutzers auf allen Geräten beenden" version_checks: "Kontaktiere den Discourse Hub zur Überprüfung auf neue Versionen und zeige Benachrichtigungen über neue Versionen auf der Administratorkonsole an." diff --git a/config/locales/server.es.yml b/config/locales/server.es.yml index 1055ca3f1b..f89d09c131 100644 --- a/config/locales/server.es.yml +++ b/config/locales/server.es.yml @@ -457,7 +457,7 @@ es: email_title: 'El tema "%{title}" requiere la atención de un moderador' email_body: "%{link}\n\n%{message}" flagging: - you_must_edit: '

      Tu post ha sido reportado por la comunidad. Por favor mira tus mensajes.

      ' + you_must_edit: '

      Tu post ha sido reportado por la comunidad. Por favor mira tus mensajes.

      ' user_must_edit: '

      Este post fue reportado por la comunidad y está oculto temporalmente.

      ' archetypes: regular: @@ -600,7 +600,6 @@ es: host_names_warning: "Tu archivo 'config/database.yml' está utilizando un hostname predeterminado de 'localhost'. Actualízalo para usar el hostname de tu sitio." gc_warning: 'Tu servidor está usando recolección de residuos predeterminada por Ruby, que no te proveerá el mejor rendimiento. Lee este tema acerca de optimización del rendimiento: Tuning Ruby and Rails for Discourse.' sidekiq_warning: 'Sidekiq no está funcionando. Muchas tareas, por ejemplo el envío de correos, están realizadas desincronizadamente por sidekiq. Por favor asegúrate de que por lo menos un proceso de sidekiq está funcionando. Learn about Sidekiq here.' - queue_size_warning: 'El número de tareas en espera es %{queue_size}, que es elevado. Esto podría indicar un problema con el proceso(s) de Sidekiq, o tal vez necesitas añadir más trabajadores de Sidekiq.' memory_warning: 'Tu servidor está funcionando con menos de 1 GB de memoria total. Por lo menos 1 GB de memoria es recomendado.' enable_google_logins_warning: "¡ADVERTENCIA! El soporte técnico de su actual método de autenticación de Google finalizará el 20 de abril 2015! ¡Cámbiate al nuevo método ahora!" both_googles_warning: "Has habilitado tanto enable_google_logins como enable_google_oauth2_logins en las opciones del sitio. Deshabilita enable_google_logins." @@ -756,8 +755,6 @@ es: email_token_grace_period_hours: "Los tokens para restablecer contraseña olvidada / activar cuenta son válidos durante (n) horas de periodo de gracia, después de ser redimidos." enable_badges: "Activar el sistema de distintivos" allow_index_in_robots_txt: "Especificar en robots.txt que este sitio puede ser indexado por los motores de búsqueda web." - email_domains_blacklist: "Una lista de dominios de email con los cuales los usuarios no podrán registrarse. Ejemplo: mailinator.com trashmail.net" - email_domains_whitelist: "Una lista de dominios de email con los que los usuarios DEBERÁN registrar sus cuentas. AVISO: ¡los usuarios con un email con diferente dominio a los listados no estarán permitidos!" forgot_password_strict: "No informar de la existencia de la cuenta de un usuario cuando ellos use la opción de olvidar contraseña." log_out_strict: "Al cerrar sesión, cierra TODAS las sesiones del usuario en todos los dispositivos" version_checks: "Ping el 'Discourse Hub' para actualizaciones de versión y mostrar mensajes del número de versión en el dashboard /admin" diff --git a/config/locales/server.fa_IR.yml b/config/locales/server.fa_IR.yml index 89272f2a73..7fbb036691 100644 --- a/config/locales/server.fa_IR.yml +++ b/config/locales/server.fa_IR.yml @@ -57,6 +57,8 @@ fa_IR: other_than: "باید غیر از {count}% باشد" template: body: 'مشکلاتی با زمینه های دنبال شده وجود دارد:' + header: + other: '%{count} خطاهای ممنوع این %{model} از ذخیره شد ' embed: load_from_remote: "خطایی در بارگذاری آن پست رخ داده است." bulk_invite: @@ -78,6 +80,7 @@ fa_IR: other: "%{count} پاسخ دیگر" loading: "بارگزاری مبحث ..." permalink: " پیوند یکتا" + imported_from: "این گفتگو همراه این جستار است برای ورود اصلی در %{link}" in_reply_to: "▶ %{username}" replies: other: "%{count} پاسخ" @@ -128,6 +131,7 @@ fa_IR: groups: errors: can_not_modify_automatic: "شما امکان تغییر یک گروه خودکار را ندارید." + member_already_exist: "%{username}' در حال حاضر عضو این گروه است." default_names: everyone: "همه" admins: "مدیران" @@ -227,6 +231,9 @@ fa_IR: attributes: hex: invalid: "این یک رنگ معتبر نیست" + user_profile: + no_info_me: "
      درباره من نمایه شما خالی در حال حاضر خالی است٬ علاقه دارید آن را تکمیل کنید ؟
      " + no_info_other: "
      %{name}هنوز چیزی وارد نکرده درباره خودش در نمایه شان. " vip_category_name: "زبان" vip_category_description: "دسته مخصوص برای اعضا با سطح اعتماد 3 و بالاتر." meta_category_name: "متا" @@ -259,9 +266,12 @@ fa_IR: [trust]: https://meta.discourse.org/t/what-do-user-trust-levels-do/4924 category: topic_prefix: "در رابطه با دسته بندی {category}% " + replace_paragraph: "[به جای پاراگراف اول توضیحات کوتاهی درباره دسته جدیدتون قرار بدید. این راهنما در قسمت دسته ها نمایش داده می شود٬ پس سعی کن زیر 200 کلمه اون را نگاه دارید. قبل از اینکه این متن را ویرایش کنید یا جستار جدیدی بوجود بیاورید٬ این دسته در صفحه دسته ها نمایش داده نمی شود.]" post_template: "%{replace_paragraph}\n\nUse the following paragraphs for a longer description, as well as to establish any category guidelines or rules.\n\nSome things to consider in any discussion replies below:\n\n- What is this category for? Why should people select this category for their topic?\n\n- How is this different than the other categories we already have?\n\n- Do we need this category?\n\n- Should we merge this with another category, or split it into more categories?\n" errors: uncategorized_parent: "بدون دسته بندی نمی تواند طبقه خانواده داشته باشد" + self_parent: "والد زیر شاخه نمی تواند خودش باشد." + depth: "شما نمی توانید یک زیر شاخه را به آشیانه تبدیل کنید تحت دیگری " cannot_delete: uncategorized: "بدون دسته بندی را نمی توان حذف کرد" has_subcategories: "این دسته بندی به دلیل داشتن زیردسته قابل پاک شدن نیست." @@ -279,6 +289,7 @@ fa_IR: title: "عمومی" elder: title: "رهبر" + change_failed_explanation: "شما تلاش برای تنزل رتبه دادید %{user_name} به '%{new_trust_level}'. در هر صورت سطح اعتمادشان در حال حاضر '%{current_trust_level}' است. %{user_name} می ماند در '%{current_trust_level}' - اگر شما امید با تنزل رتبه شان را دارید اول سطح اعتمادشان را نگاه کنید" rate_limiter: slow_down: "شما این عمل را بیش از حد انجام داده اید، بعدا دوباره تلاش کنید" too_many_requests: "ما روزانه محدودیت زمانی داریم برای اینکه این اقدام چند بار انجام شود. لطفا صبر کنید %{time_left} قبل ازاینکه دوباره تلاش کنید. " @@ -338,6 +349,7 @@ fa_IR: almost_x_years: other: "حداقل %{count} سال قبل" password_reset: + no_token: "با عرض پوزش٬ نشانه رمز شما منقضی شده است. لطفا دوباره رمز عبور خود را ریست کنید. " choose_new: "لطفا یک رمز عبور جدید وارد کنید" choose: "لطفا یک رمز عبور وارد کنید" update: 'به‌روز کردن گذرواژه' @@ -360,6 +372,7 @@ fa_IR: post_action_types: off_topic: title: 'جستار های قدیمی' + description: 'این نوشته به گفتگوی جاری بر اساس عنوان و اولین نوشته ربطی ندارد٬ و باید به جای دیگری جابجا شود.' long_form: 'ابن جستار قدیمی را پرچم بزن' spam: title: 'هرزنامه' @@ -369,6 +382,7 @@ fa_IR: email_body: "%{link}\n\n%{message}" inappropriate: title: 'نامناسب' + description: 'محتوای این موضوع شامل مواردی میشود که یک شخص می تونه آن را توهین آمیز٬ آزار دهنده٬‌ یا نقض کننده قوانین انجمن باشد. اصول انجمن .' long_form: 'این مورد نامناسب دانسته شد.' notify_user: title: 'پیام @{{username}}' @@ -410,7 +424,7 @@ fa_IR: email_title: 'این موضوع "%{title}" نیاز به توجه مدیر دارد. ' email_body: "%{link}\n\n%{message}" flagging: - you_must_edit: '

      نوشته شما توسط انجمن پرچم گزاری شده. لطفا پیامت را نگاه کن.

      ' + you_must_edit: '

      نوشته شما توسط انجمن پرچم گزاری شده. لطفا پیامت را نگاه کن.

      ' user_must_edit: '

      این نوشته توسط انجمن پرچم گزاری شده و بطور موقت مخفی شده است.

      ' archetypes: regular: @@ -518,6 +532,7 @@ fa_IR: page_view_crawler_reqs: title: "خزنده وب" xaxis: "روز" + yaxis: "API درخواست وب زنجیره ای " page_view_total_reqs: title: "کل" xaxis: "روز" @@ -549,10 +564,17 @@ fa_IR: dashboard: rails_env_warning: "سرور شما در حال اجراست در %{env} حالت " ruby_version_warning: "شما نسخه Ruby 2.0.0 را اجرا کرده اید که به مشکل دارا بودن شناخته شده است. به روز کنید به بخش 247 یا بعدتر" + sidekiq_warning: 'Sidekiq کار نمی کند. با تشکر٬ مثل ارسال ایمیل ها٬‌ برای اجرا ناهمگام هستند با sidekiq. لطفا مطمن شوید که آخرین پروسه sidekiq کار می کند. درباره Sidekiq بیشتر بدانید.' memory_warning: 'سرور شما با کمتر از 1 گیگ رم راه اندازی شده است،برای دیسکورس حداقل 1 گیگ رم لازم است تا به درستی کار کنند.' + failing_emails_warning: 'تعدادی %{num_failed_jobs} ایمیل کار هست که نا موفق شد. فایل config/discourse.conf را چک کن و مطمئن شو که تنظیمات سرور ایمیل درست است. کارهای ناموفق را در Sidekiq ببین .' default_logo_warning: "یک لوگوی گرافیکی برای سایت خود انتخاب نمایید. تگ های logo_url, logo_small_url, و favicon_url را بروز رسانی کنید. تنظیمات سایت" + contact_email_missing: "ایمیل وب سایت را وارد کن که سریعا قابل دسترسی باشد برای مواقعی که مشکلی در وب سایت وجود دارد. به روز کن در تنظیمات سایت." + contact_email_invalid: "ایمیل تماس با وب سایت اشتباه است. به روز کنید در تنظیمات سایت ." title_nag: "اسمت را در وب سایت وارد کن. عنوان به روز کن در تنظیمات سایت ." site_description_missing: "یک جمله برای توضیحات سایتت وارد کن که در جستجو نشان داده بشود. توضیحات سایتت را به روز کن در اینجا تنظیمات سایت ." + site_contact_username_warning: "برای ارسال پیام خودکار ایمیل یکی از کارکنان مهربان را وارد کن . اطلاعات تماس وب سایت را به روز کن در تنظیمات سایت ." + notification_email_warning: "ایمیل های آگهی دهنده از طریق ایمیل نا صحیح در دامنه شما ارسال نمی شوند; تحویل ایمیل نامنظم و غیر قابل اعتماد خواهد بود. لطفا ایمیل آگهی دهنده را با یک ایمیل آدرس محلی وارد کنید در تنظیمات سایت ." + s3_deprecation_warning: "اخطار! آمازون S3 برای ذخیره سازی تصویر / فایل ضمیمه توصیه نمی شود. لطفا، دنبال کنید دستورالعمل ها و مهاجرت به ذخیره سازی محلی." content_types: education_new_reply: title: "آموزش کاربر جدید: پاسخ های اول" @@ -575,8 +597,10 @@ fa_IR: description: "نوشته نشان داده شده برای کاربران غیرمجاز است وقتی که ورود مورد نیاز است در سایت. " head: title: "HTML head" + description: "HTML هایی که در قبل از تگ باید استفاده شوند." top: title: "بالای صفحه ها " + description: "HTML هایی در بالای هر صفحه اضافه می شوند ( بعد از سربرگ٬ قبل از جهت نما یا عنوان جستار)." bottom: title: "پایین صفحه ها" description: "HTML که قبل از تگ به آن اضافه می شه " @@ -592,13 +616,53 @@ fa_IR: min_topic_title_length: "حداقل طول عنوان نوشته در کاراکتر" max_topic_title_length: "حداکثر طول مجاز عنوان جستار در کاراکتر" min_private_message_title_length: "حداقل طول مجاز عنوان برای پیام در کاراکتر" + min_search_term_length: "حداقل طول واژه جستجوی معتبر در کاراکتر" allow_uncategorized_topics: "به جستار اجازه ساخت بده بدون دسته بندی " + allow_duplicate_topic_titles: "جستارها را با عناوین یکسان و تکراری اجازه بده " + unique_posts_mins: "چند دقیقه قبل از اینکه کاربر بتواند دوباره نوشته ای با محتویات یکسان را بگذارد." + educate_until_posts: "وقتی کاربر شروع کرد به نوشتن اولین (n) پست جدید٬ آموزش ها را برای کاربران جدید بصورت بالاپر در قسمت نویسنده نشان بدهو" title: "نام این وب سایت،استفاده شده در عنوان تگ" site_description: "سایتت را در یک جمله توصیف کن٬‌ همنطور که در تگ متا توضیح داده شده بود" + contact_email: "ایمیل آدرس تماس کلیدی که مسولیت دارند برای این سایت. برای آگهی سازی های حساس مثل پرچم گزاری های پیگیری نشده استفاده می شود٬ و همچنین برای تماس در موارد ضروری. " + contact_url: "با URL برای این سایت تماس بگیر. برای تماس درباره مسائل مهم و ضروری استفاده میشود. " + queue_jobs: "فقط برنامه نویسان!‌ اخطار! بصورت پیش فرض٬ کارها در نوبت هستند در sidekiq. . اگر غیر فعال باشد٬ وب سایت شما خراب می شود." show_subcategory_list: "نمایش زیر دسته بندی ها به جای لیست موضوع هنگام ورود به یک دسته بندی." + post_excerpt_maxlength: "حداکثر طول یک نوشته گزیده شده / خلاصه. " + flag_sockpuppets: "اگر کاربری به جستاری با ای پی برابر با کاربری که نوشته را شروع کرده ٬ آنها را به عنوان هرزنامه پرچم گزاری کن." + post_undo_action_window_mins: "تعداد دقایقی که کاربران اجازه دارند اقدامی را که در نوشته انجام داده اند باز گردانند. (پسند٬‌ پرچم گزاری٬‌ چیزهای دیگر)." + must_approve_users: "مدیران باید کاربران جدید را قبل از اجازه دسترسی به سایت تایید کنند." + ga_tracking_code: " Google analytics (ga.js) کد پیگری کد٬ eg: UA-12345678-9;این را ببین http://google.com/analytics" + ga_domain_name: "Google analytics (ga.js) اسم دامنه٬ eg: mysite.com; این را ببین http://google.com/analytics" + ga_universal_tracking_code: "Google Universal Analytics (analytics.js) کد پیگری کد٬ UA-12345678-9; این را ببین http://google.com/analytics" + ga_universal_domain_name: "Google Universal Analytics (analytics.js) اسم دامنه٬‌ eg: mysite.com; این را ببین http://google.com/analytics" + enable_escaped_fragments: "عقب نشینی به Google's Ajax-Crawling API اگر webcrawler شناسایی نشد. این را ببین https://support.google.com/webmasters/answer/174992?hl=en" + enable_noscript_support: "webcrawler موتور جستجوی استاندارد را فعال کناز طریق تگ noscript" allow_moderators_to_create_categories: "اجازه دادن به مدیران برای ساخت دسته‌بندی‌های جدید" + site_contact_username: "یک نام کاربری مدیر برای ارسال خودکار پیام ها از. اگر خالی گذاشته شود از حساب کاربری پیش فرض سیستم استفاده می شود. " + send_welcome_message: "برای تمام کاربران جدید پیام خوش آمدید به همراه راهنمای شروع سریع کار بفرستید." + email_token_valid_hours: "رمز عبور فراموش شده/ حساب کاربری فعال اعتبار دارد برای (n) ساعت." enable_badges: "فعال سازی سیستم مدال دهی" + invite_expiry_days: "برای چه مدت کلید دعوتنامه فراخوان اعتبار دارد٬ در روزها" + invite_passthrough_hours: "برای چه مدت کاربر می تواند از کلید فراخوان بخشوده شده برای ورود به سیستم استفاده کند٬‌ در ساعت" + invite_only: "ثبت نام عمومی از کار افتاده است٬ تمام کاربران جدید باید از توسط کاربران عضو دعوت شده شوند." + login_required: "نیاز به تصدیق است برای خواندن محتوا در سایت٬ دسترسی ناشناس رد شود." min_password_length: "حداقل طول رمز عبور" + block_common_passwords: "رمز عبوری که جزو 10,000 رمز عبور رایج است را قبول نکنید. " + enable_yahoo_logins: "احراز هویت یاهو را فعال کن " + enable_google_oauth2_logins: "احراز هویت Google Oauth2 را فعال کن. این روش احراز هویت است که گوگل در حال حاضر ساپورت می کند. به راز و کلید نیاز دارد ." + google_oauth2_client_id: "ID مشتری برای نرم افزار گوگل شما. " + google_oauth2_client_secret: "راز مشتری برای بر نرم افزار گوگل شما. " + enable_twitter_logins: "احراز هویت تیوتر را فعال کن٬‌ نیاز است به twitter_consumer_key و twitter_consumer_secret" + twitter_consumer_key: "کلید مصرف کننده برای احراز هویت در تیوتر٬ ثبت نام در http://dev.twitter.com" + twitter_consumer_secret: "رمز مصرف کننده برای احراز هویت تیوتر ٬‌ ثبت نام در http://dev.twitter.com" + enable_facebook_logins: "فعال کردن احراز هویت فیس بوک٬ نیار دارد به facebook_app_id و facebook_app_secret" + facebook_app_id: "ID برنامه برای احراز هویت فیس بوک٬ ثبت نام در https://developers.facebook.com/apps" + facebook_app_secret: "راز برنامه برای احراز هویت فیس بوک٬ ثبت نام در https://developers.facebook.com/apps" + enable_github_logins: "احراز هویت در Github را فعال کن٬ نیاز به github_client_id و github_client_secret" + github_client_id: "ID مشتری برای احراز هویت در Github ٬ ثبت نام در https://github.com/settings/applications" + github_client_secret: "راز مشتری را برای احراز هویت Github@٬ ثبت نام در https://github.com/settings/applications" + maximum_backups: "حداکثر تعداد پشتیبان برای نگه داری بر روی دیسک. نسخه های پشتیبان قدیمی بطور خودکار پاک شده است" + backup_daily: "بصورت خودکار هر روز یک پشتیبان از سایت تهیه کن" max_likes_per_day: "حداکثر تعداد پسند هر کاربر در روز" max_flags_per_day: "حداکثر تعداد پرچم هر کاربر در روز" max_bookmarks_per_day: "حداکثر تعداد نشانک هر کاربر در روز" @@ -629,15 +693,93 @@ fa_IR: newuser_max_mentions_per_post: "حداکثر تعداد @name اطلاعیه ها که کاربر جدید در یک پست می تواند استفاده کند. " newuser_max_replies_per_topic: "حداکثر تعداد پاسخهایی که کاربر جدید می تواند در یک جستار بدهد قبل از اینکه شخص دیگری پاسخ دهد. " max_mentions_per_post: "حداکثر تعداد @name اطلاعیه هایی که کسی می تواند در یک نوشته استفاده کند. " + newuser_spam_host_threshold: "چندبار کاربر جدید می تواند پیوندی را در یک فضا پست کند قبل از اینکه هرزنامه شناخته شوند. " + staff_like_weight: "چقدر عوامل بیشتر تا به مدیران پسند داده بشود." + topic_view_duration_hours: "بازدید از یک جستار جدید زا بشمار با IP/User هر N ساعت" + max_age_unmatched_emails: "ایمیل های ورودی همسان نشده نمایش داده شده بعد از (N) روز پاک شوند." + max_age_unmatched_ips: "IP ورودی همسان نشده نمایش داده شده بعد از (N) روز پاک شوند. " + num_flaggers_to_close_topic: "حداقل تعداد پرچم های خاصی که نیاز دارند بصورت خودکار جستار را از مداخله کردن متوقف کنند" + num_flags_to_close_topic: "حداقل تعداد پرچم های فعالی که نیاز دارند بصورت خودکار جستار را از مداخله کردن متوقف کنند" + auto_respond_to_flag_actions: "فعال کردن پاسخ خودکار برای زمانی که پرچم گزاری دفع می شود." + reply_by_email_enabled: "فعال کردن پاسخ به جستارها از طریق ایمیل." + reply_by_email_address: "نمونه برای پاسخ به ایمیل٬ آدرس های ایمیل آمده٬ برای مثال : %{reply_key}@reply.example.com or replies+%{reply_key}@example.com" + disable_emails: "از ارسال هر گونه ایمیلی را از دیسکورس جلوگیری کن." + strip_images_from_short_emails: "تصاویر باریک از ایمیل های که سایزشان کمتر از 2800 بایت است." + short_email_length: "طول ایمیل کوتاه به بایت" + pop3_polling_enabled: "نظرسنجی از طریق POP3 برای پاسخ های ایمیل. " + pop3_polling_ssl: "از SSL استفاده کن وقتی که به سرور POP3 متصل هستی. (پیشنهاد شده)" + pop3_polling_port: "ورودی برای نظرسنجی حساب کاربری POP3" + pop3_polling_host: "فضا برای نظرسنجی با ایمیل از طریق POP3. " + pop3_polling_username: "نام کاربری برای حساب کاربری POP3 برای نظرسنجی در ایمیل." + pop3_polling_password: "رمز عبور برای حساب کاربری POP3 برای نظرسنجی در ایمیل." + email_in: "به کاربران اجازه بده نوشته های جدید را از طریق ایمیل ارسال کنند. (بهpop3 polling نیاز است). آدرس ها را پیکربندی کنید در تنظیمات هر دسته بندی. " + email_in_min_trust: "حداقل میزان سطح اعتماد برای کاربران تا بتوانند نوشته را از طریق ایمیل ارسال کنند. " + email_prefix: "این [لیبل] در موضوع ایمیل استفاده شده. این به عنوان پیش فرض میشه اگر تنظیم نشده." + email_site_title: "عنوان این سایت به فرستنده ایمیل ها در سایت استفاده شده. به عنوان پیش فرض میشه اگر تنظیم نشده. اگر کاراکترها در عنوانت اجازه استفاده شدن در ایمیل فرستنده را ندارند از این تنظیمات استفاده کن. " + delete_user_max_post_age: "به کاربرانی که عمر نوشته های بیشتر از(x) روز است اجازه پاک کردن نده." + delete_all_posts_max: "حداکثر تعداد نوشته هایی که می تواند یکباره پاک شود با کلید همه نوشته ها را پاک کن. اگر کاربر بییشتر از این نوشته ها دارد٬ نوشته نمی تواند یکبار پاک شود و کاربر نمی تواند حذف شود." + username_change_period: "تعداد روزهایی که بعد از ثبت نام می توانند نام کاربری خود را عوض کنند ( 0 برای جلوگیری از عوض کردن نام کاربرایشان.)" + email_editable: "به کاربران اجازه بده ایمیل آدرس خود را عوض کنند بعد از ثبت نام. " + logout_redirect: "مکان برای جابجایی مرورگر بعد از خارج شدن EG: (http://somesite.com/logout)" allow_uploaded_avatars: "اجازه دادن به کاربران برای بارگذاری آواتارهای سفارشی" + allow_animated_avatars: "به کاربران اجازه بده تا از تصاویر متحرک آواتار استفاده کنند. اخطار: avatars:refresh را اجرا کن از تسک جمع آوری عوض کردن این تنظیمات." + allow_animated_thumbnails: "تولید ریز عکسهای متحرک از تصاویر GIF انیمیشن." + default_avatars: "URLs برای آواتارهایی که کاربران جدید از آن بطور پیش فرض می توانند استفاده کنند قبل از اینکه آنها را عوض کنند. " + automatically_download_gravatars: "آواتار را برای کاربران دریافت کن برای ساختن حساب کاربری یا ایمیل. " + digest_topics: "حداکثر تعداد جستارهایی که در دایجست ایمیل نشان داده می شود " + digest_min_excerpt_length: "حداقل نوشته های گزیده در ایمیل دایجست٬‌ در کاراکتر." + default_digest_email_frequency: "هر چند وقت یکبار کاربران ایمیل های دایجست دریافت کنند بطور پیش فرض. آنها می توانند آن را در بخش تنظیمات عوض کنند. " + suppress_digest_email_after_days: "ایمیل های خلاصه را مهار کن برای کاربرانی که در وب سایت دیده نشده اند بیشتر از (n) روز " + disable_digest_emails: "ایمیل های دایجست را برای تمام کاربران غیر فعال کن. " + default_external_links_in_new_tab: "پیوند های خارجی را در یک تب جدید باز کن. کاربران می توانند این را در قسمت تنظیماتشان تغییر دهند." + detect_custom_avatars: "خواه ناخواه برای چک کردن کاربرانی که آواتار سفارشی بارگزاری کرده اند. " + max_daily_gravatar_crawls: "حداکثرتعداد زمانی که دیسکورس Gravatar را چک می کند برای آواتار سفارشی در هر روز. " + enable_user_directory: "شاخه کاربری را برای مرور ارائه کن" + allow_anonymous_posting: "به کاربر اجازه بده که در حالت ناشناس بروند" + anonymous_posting_min_trust_level: "حداقل سطح اعتماد برای فعال سازی نوشته گذاشتن در حالت ناشناس" + allow_profile_backgrounds: "به کاربر اجازه بده تا پس زمینه نمایه خود را آپلود کنند." + enable_mobile_theme: "دستگاه های موبایلی که از تم دوستانه موبایل استفاده می کنن٬‌ با قابلیت جابجایی به حالت تمام سایت. این را از کار بیانداز اگر می خواهی از شیوه سفارشی استفاده کنی که بطور کامل پاسخگو است." + suppress_uncategorized_badge: "مدال برای جستارهای شناخته نشده در لیست جستارها نشان نده. " + global_notice: "بنر فوری ٬‌ اضطراری را بصورت سراسری به تمام بازدیدکنندگان نشان بده٬ برای مخفی کردن آن را به خالی عوض کن (HTML allowed)." + disable_edit_notifications: "آگاهی ساز ویرایش را از کار بینداز از طریق کاربر سیستم وقتی 'download_remote_images_to_local' فعال است " + full_name_required: "اسم کامل برای کامل کردن نمایه کاربر مورد نیاز است." enable_names: "نام کامل کاربران را در نمایه، کارت کاربری و ایمیل‌هایشان نمایش بده. قابلیت پنهان کردن نام کامل را در هرجایی غیرفعال کن." + display_name_on_posts: "نام کامل کاربران را در نوشته نشان بده بعلاوه ی نام کاربری @username." + invites_per_page: "دعوتنامه های معمولی در صفحه کاربر نشان داده می شوند. " + short_progress_text_threshold: "بعد از اینکه تعداد نوشته ها در این جستار از این تعداد پایین تر آمد٬ نوار پیشرفت تعداد نوشته ها را در حال حاضر نشان می دهد. اگر عرض نوار پیشرفت را تعویض کنید٬ شاید باید مقدار را هم عوض کنی. " + warn_reviving_old_topic_age: "وقتی کسی شروع می کند با پاسخ دادن به جستاری که آخرین پاسخ برمی گردد به خیلی قبل یک هشدار نمایش داده می شود. نمایش با تنظیمات تا 0. " + highlighted_languages: "شامل نحوه قوانین برجسته شده. ( اخطار: شامل زبان های متفاوت ممکن است در نحوه اجرا تاثیر گذار باشد) ببین: https://highlightjs.org/static/demo/ برای دمو" + embeddable_host: "سروری که می تونه در نوشته ها جا سازی بشه از انجمن دیسکورس. فقط نام سروری که با http:// شروع می شود" + feed_polling_enabled: "فقط جاسازی: چه جاسازی RSS/ATOM feed به عنوان نوشته" + feed_polling_url: "فقط جاسازی: URL of RSS/ATOM feed to embed." + embed_by_username: "نام کاربری دیسکورس کاربری که نوشته های جاسازی شده را ساخته." + embed_username_key_from_feed: "کلیدی برای کشیدن نام کاربری دیسکورس از فید." + embed_truncate: "کوتاه کردن نوشته های جاسازی شده " + embed_category: "دسته بندی موضوعات جاسازی شده." + embed_post_limit: "حداکثر تعداد پست هایی که می توانید جا سازی کنید. " + embed_whitelist_selector: "CSS انتخاب کننده برای المان های که اجازه دارند جاسازی شوند." + embed_blacklist_selector: "CSS انتخاب کننده برای المان های که از جاسازی پاک شده اند. " + notify_about_flags_after: "اگر پرچم هایی هست که به آنها بعد از چند ساعت رسیدگی نشده٬ ایمیلی ارسال کن به contact_email. برای از کار انداختن 0 را تنظیم کن." + show_create_topics_notice: "اگر سایت کمتر از 5 جستار عمومی دارد٬ اطلاع بده به مدیران تا جستارهای بیشتری بسازند." + prevent_anons_from_downloading_files: "جلوگیری از دانلود کردن فایل پیوست توسط افراد ناشناس. اخطار: این جلوگیری می کنه از هر سایت دارای بدون عکسی. " enable_emoji: "فعالسازی ایموجی" emoji_set: "می‌خواهید ایموجی شما چطور باشد؟" + approve_post_count: "تعداد پست ها برای کاربران جدید باید تایید شود" + approve_unless_trust_level: "نوشته ها برای کاربران پایین ت از این سطح اعتماد نیاز به تایید دارد. " errors: invalid_email: "آدرس ایمیل نامعتبر" invalid_username: "هیچ کاربری با این نام کاربری وجود ندارد." + invalid_integer_min_max: "مقدار باید بین %{min} و %{max} باشد." + invalid_integer_min: "مقدار باید %{min} باشد یا بیشتر." + invalid_integer_max: "مقدار نمی تواند بیشتر از %{max} باشد." invalid_integer: "مقدار باید یک عدد صحیح باشد." + regex_mismatch: "مقدار با فرمت مورد نیاز یکی نیست." + must_include_latest: "بهترین فهرست باید شامل آخرین تب ها باشد. " invalid_string: "مقدار نامعتبر." + invalid_string_min_max: "باید بین %{min} و %{max} کاراکتر باشد" + invalid_string_min: "باید حداقل %{min} کاراکتر باشد " + invalid_string_max: "نباید بیشتر از %{max} کاراکتر باشد" + invalid_reply_by_email_address: "مقدار باید شامل '%{reply_key}' و متفاوت باشد از ایمیل آگاه سازی " notification_types: mentioned: "%{display_username} به شما اشاره شد در %{link}" liked: "%{display_username} نوشته شما پسندیدهشد در %{link}" @@ -647,6 +789,8 @@ fa_IR: posted: "%{display_username} نوشته ارسال شد در %{link}" moved_post: "%{display_username} نوشته شما منتقل شد به %{link}" private_message: "%{display_username} یک پیام ارسال کنید: %{link}" + invited_to_private_message: "%{display_username} شما را به این پیام دعوت کرده : %{link}" + invited_to_topic: "%{display_username} شما را به این جستار دعوت کرده: %{link}" invitee_accepted: " %{display_username} دعوت نامه شما را پذیرفته شد " linked: "%{display_username} شما پیوند خوردید در %{link}" granted_badge: "شما وارد شدید %{link}" @@ -656,8 +800,18 @@ fa_IR: category: 'دسته‌ها' topic: 'درخواست ها' user: 'کاربران' + sso: + not_found: "نمی توانی مراجعه کنی یا حساب کاربری بسازی٬ با مدیر سایت تماس بگیر " + account_not_approved: "حساب کاربری در انتظار تایید است٬ شما ایمیلی دریافت خواهید کرد زمانی که تایید شد" + unknown_error: "ایراد به روز رسانی اطلاعات٬ با مدیر سایت تماس بگیرید" + timeout_expired: "ورود حساب کاربری از زمان خارج شد است. لطفا دوباره وارد سیستم شوید" original_poster: "نویسنده اصلی" most_posts: "بیشترین نوشته ها" + most_recent_poster: "جدیدترین نویسنده ها" + frequent_poster: "نویسنده مکرر" + redirected_to_top_reasons: + new_user: "به انجمن ما خوش آمدید! اینها بهترین جستارهای ما هستند. " + not_seen_in_a_month: "خوش آمدید دوباره!‌ شما را برای مدت طولانی ندیده ایم. اینها بهترین جستارهاست از وقتی که شما نبودید." move_posts: new_topic_moderator_post: other: "من {count}% تا از نوشته‌ها را به این موضوع جدید انتقال دادم: {topic_link}%" @@ -670,6 +824,8 @@ fa_IR: name_already_exists: "متأسفیم، در حال حاضر نام '{name}%' توسط ایموجی دیگری استفاده می‌شود." error_while_storing_emoji: "متأسفیم، در هنگام ذخیره‌سازی ایموجی خطایی رخ داده است." topic_statuses: + archived_enabled: "این جستار بایگانی شده است. غیر قابل دسترسی است و قادر به تغییر آن نیستید." + archived_disabled: "این جستار الان از بایگانی خارج شد.این دیگر غیر قابل دسترسی نیست و قادر به عوض شدن است." closed_enabled: "این موضوع در حال حاضر بسته شده است. پاسخ جدید دیگر مجاز نیست." closed_disabled: "موضوع اکنون باز است. پاسخ‌های جدید اجازه‌ی ثبت دارند." autoclosed_enabled_days: @@ -686,25 +842,61 @@ fa_IR: other: "این موضوع به صورت خود کار بعد از %{count} دقیقه بعد از آخرین پاسخ بسته شد. پاسخ جدید دیگر مجاز نیست." autoclosed_disabled: "این موضوع اکنون باز است. پاسخ‌های جدید اجازه‌ی ثبت دارند." autoclosed_disabled_lastpost: "این موضوع اکنون باز است. پاسخ‌های جدید اجازه‌ی ثبت دارند." + pinned_enabled: "این جستار الان سنجاق شد. این در بالای تمام دسته ها نمایش داده خواهد شد تا زمانی که توسط مدیران از سنجاق خارج شود و یا کاربران برای خودشان از سنجاق خارج کنند. " + pinned_disabled: "این جستار الان از سنجاق خارج شد. دیگر در بالای دسته بندی ها نمایش داده نمی شود." + pinned_globally_enabled: "این جستار بطور سراسری سنجاق زده شد. این در بالای تمام لیست جستار ها نمایش داده خواهد شد تا زمانی که از سنجاق خارج شود از طرف مدیران٬ یا بطور شخصی توسط کاربران برای خودشان." + pinned_globally_disabled: "این جستار الان از سنجاق خارج شد. دیگر در بالای دسته بندی ها نمایش داده نخواهد شد. " + visible_enabled: "این جستار الان در لیست است. در لیست جستارها نمایش داده خواهد شد." + visible_disabled: "این جستار از لیست خارج شده است. دیگر درهیچ لیست جستار ها نمایش داده نخواهد شد. تنها دسترسی به این جستار تنها از طریق پیوند مستقیم است. " login: + not_approved: "حساب کاربری شما هنوز تایید نشده است. به شما اطلاع داده می شود وقتی شما آماده ورود به سیستم هستید" incorrect_username_email_or_password: "نام کاربری، ایمیل یا رمز عبور نادرست" + wait_approval: "ممنون برای ثبت نام. ما به شما اطلاع می دهیم وقتی حساب کاربری شما تایید شد." active: "حساب کاربریتان فعال شده و آماده‌ی استفاده است." activate_email: "

      تقریبا ثبت نام انجام شد! ما ایمیل فعال سازی را برای ما ارسال کردیم %{email}. لطفا به ایمیل خود برای فعال سازی حساب کاربر خود مراجعه نمایید.

      اگر ایمل فعال سازی نبود، لطفا پوشه اسپم ایمیل خود را برسی نمایید،اگر ایمیل ارسال نشده است با ورود به سایت دوباره ایمیل فعال سازی ارسال نمایید.

      " + not_activated: "هنوز نمی توانید وارد سیستم شوید. ما ایمیل برای فعال سازی برای شما ارسال کردیم. لطفا دستور عمل را در ایمیل برای فعال سازی حساب کاربریتان دنبال کنید." not_allowed_from_ip_address: "شما نمی‌توانید با این آی‌پی آدرس وارد حساب کاربری {username}% شوید." admin_not_allowed_from_ip_address: "شما نمی تواند با این اپی آدرس به عنوان مدیر وارد سیستم شوید." suspended: "شما تا تاریخ {date}% نمی‌توانید وارید سیستم شوید." suspended_with_reason: "شما تا تاریخ {date}% نمی‌توانید وارید سیستم شوید. علت مسدود شدن حسابتان: {reason}%" errors: "{errors}%" + not_available: "موجود نیست. این را امتحان کنید %{suggestion}?" + something_already_taken: "ایرادی روی داد٬‌ شاید نام کاربری و ایمیل قبلا ثبت نام شده است. از پیوند پیش رو برای بازیابی رمز عبور استفاده کنید." + omniauth_error: "با عرض پوزش٬ یک ایراد برای تایید حساب کاربری شما وجود داشت. شاید شما مجوز تایید نگرفته اید ؟ " + omniauth_error_unknown: "یک چیزی برای پروسه وارد شدن شما به سیستم با مشکل مواجه شد٬‌ لطفا دوباره تلاش کنید." new_registrations_disabled: "ثبت حساب‌ کاربری جدید اکنون امکان‌پذیر نیست." password_too_long: "رمزهای عبور به 200 کاراکتر محدود شده‌اند." + missing_user_field: "شما تمام فیلد های کاربری را تکمیل نکرده اید" + close_window: "احراز هویت تمام شد. پنجره را ببندید برای ادامه." user: + no_accounts_associated: "بدون حساب کاربری مرتبط" + username: + short: "نباید کمتر از %{min} کاراکتر باشد" + long: "نباید بیشتر از %{max} کاراکتر باشد" + characters: "باید شامل٬‌اعداد٬ حروف و زیر خط باشد" + unique: "باید خاص باشد" + blank: "باید حاضر باشد" + must_begin_with_alphanumeric: "حتما باید با حرف یا عدد شروع شود" email: + not_allowed: "این قابل قبول نیست با این ایمیل ارائه شده. لطفا از یک ایمیل دیگر استفاده کنید. " blocked: "مجاز نیست." ip_address: blocked: "مسدود شده است." + invite_mailer: + subject_template: "%{invitee_name} شما را دعوت کرده به %{topic_title}' در %{site_domain_name}" + text_body_template: "%{invitee_name} شما را دعوت کرده به یک گفتگو\n\n> **%{topic_title}**\n>\n> %{topic_excerpt}\n\nدر \n\n> %{site_title} -- %{site_description}\n\nاگر علاقه مند هستید بر روی پیوند پایین کلیک کنید:‌\n\n%{invite_link}\n\nاین دعوتنامه از طرف یک کاربر قابل اعتماد است٬ پس شما نیازی به ورود ندارید. \n" + invite_forum_mailer: + subject_template: "%{invitee_name} دعوت شدید به عضویت در %{site_domain_name}" + text_body_template: "%{invitee_name} شما را دعوت کرده تا عضو شوید \n\n> **%{site_title}**\n>> %{site_description}\n\nاگر علاقه مند هستید بر روی پیوند پیش رو کلیک کنید: \n\n%{invite_link}\n\nاین دعوتنامه از طرف یک کاربر قابل اعتماد است٬ پس شما نیازی به ورود ندارید. \n" invite_password_instructions: subject_template: "تنظیم رمز عبور برای حساب کاربری {site_name}%" + text_body_template: | + ممنون برای قبول دعوتنامه از %{site_name} -- خوش آمدید! + + برای ورود دوباره٬ بر روی پیوند پیش رو کلیک کنید و رمز عبور را انتخاب کنید: + %{base_url}/users/password-reset/%{email_token} test_mailer: + subject_template: "[%{site_name}] ایمیل تست دهش" text_body_template: | This is a test email from @@ -742,22 +934,161 @@ fa_IR: [md]: http://mandrill.com [mg]: http://www.mailgun.com/ [mj]: https://www.mailjet.com/pricing + new_version_mailer: + subject_template: "[%{site_name}] نسخه جدید Discourse برای به روز رسانی موجود است" + text_body_template: "نسخه جدید [Discourse](http://www.discourse.org) آماده است. \n\nنسخه جدید %{installed_version}\n\nنسخه جدید: **%{new_version}**\n\nشاید شما بخواهید: \n\n- جدیدترین ها را ببینید در [GitHub changelog] (https://github.com/discourse/discourse/commits/master).\n\nبه روز رسانی با بازدید از [%{base_url}/admin/upgrade](%{base_url}/admin/upgrade), و فشار دادن دکمه \"به روز رسانی\". \n\nبازدید کن از [meta.discourse.org](http://meta.discourse.org) برای خبر٬ گفتگو٬ و کمک به دیسکورس.\n" new_version_mailer_with_notes: subject_template: "[%{site_name}] بروزرسانی در دسترس" + text_body_template: "نسخه جدید [Discourse](http://www.discourse.org) آماده است. \n\nنسخه جدید %{installed_version}\nنسخه جدید: **%{new_version}**\n\nشاید شما بخواهید: \n\n- جدیدترین ها را در [GitHub changelog](https://github.com/discourse/discourse/commits/master).\n\nبه روز رسانی با بازدید از [%{base_url}/admin/upgrade](%{base_url}/admin/upgrade), و فشار دادن دکمه \"به روز رسانی\". \n\nبازدید کن از [meta.discourse.org](http://meta.discourse.org) برای خبر٬ گفتگو٬ و کمک به دیسکورس.\n\n### نکته های رها شده \n\n%{notes}\n" flags_reminder: + flags_were_submitted: + other: "این پرچم گزاری ها در %{count} ساعت پیش ارسال شده است." + please_review: "لطفا بازبینی کن." post_number: "نوشته" + how_to_disable: 'شما می توانید تکرار یاد توسط این ایمیل را عوض کنید یا از کار بیندازید از طریق اعلام کردت بعد ازتنظیم پرچم گزاری .' subject_template: other: "%{count} نشانه ها منتظر استفاده" + flag_reasons: + off_topic: "نوشته شما به عنوان **بی ربط به جستار** پرچم گزاری شده. انجمن احساس خوبی برای جا دادن آن در جستار ندارد٬ آن طور که در عنوان و نوشته اول تعریف شده. " + inappropriate: "نوشاه شما به عنوان ** نامناسب** پرچم گزاری شده. انجمن احساس کرده این تهاجمی، توهین آمیز، و یا نقض [دستورالعمل انجمن ما است](دستورعمل انجمن/)" + spam: "نوشته شما به عنوان **هرزنامه** پرچم گزاری شده. انجمن احساس کرده که این یک تبلیغ هست٬ چیزی بیش از حد تبلیغات بجای اینکه بدرد بخور باشد یا به جستار ربط داشته باشد. " + notify_moderators: "نوشته شما پرچم گزاری شده ** برای توجه مدیران**. انجمن احساس کرده که نوشته شما نیاز به دخالت دستی یکی از مدیران را دارد." + flags_dispositions: + agreed: "ممنون از اینکه به ما اطلاع دادید. ما قبول کردیم که مشکلی وجود دارد و در حال نگاه کردن هستیم. " + agreed_and_deleted: "ممنون از اینکه به ما اطلاع دادید. ما قبول کردیم که مشکلی وجود دارد و نوشته را پاک کردیم. " + disagreed: "ممنون از اینکه به ما اطلاع دادید. ما بهش نگاه می کنیم" + deferred: "ممنون از اینکه به ما اطلاع دادید. ما بهش نگاه می کنیم" + deferred_and_deleted: "ممنون از اینکه به ما اطلاع دادید. ما نوشته را پاک می کنیم." + temporarily_closed_due_to_flags: "این جستار بصورت موقت بسته است بخاطر پرچم گزاری های زیاد انجمن" system_messages: + post_hidden: + subject_template: "پست مخفی شده بدلیل پرچم گزاری انجمن " + text_body_template: "سلام٬ \n\nاین یک پیام خودکار است از %{site_name} برای اطلاع دادن به شما بابت مخفی شدن نوشته تان. \n\n%{base_url}%{url}\n\n%{flag_reason}\n\nچند عضو انجمن این پست را پرچم گزاری کردند قبل از اینکه نوشته شما مخفی شود٬ پس لطفا فکر کنید تا با استفاده از نظر آنها موجب تجدید نظردر مورد نوشته ات شوید. **‌می توانی نوشته ات را ویرایش کنی بعد از %{edit_delay} دقیقه٬ و این بطور خودکار از حالت مخفی خارج می شود. این باعث افزایش سطح اعتماد هم می شود. \n\nبه هر حال٬ اگر نوشته شما برای بار دوم توسط اعضای انجمن مخفی شد٬ این بار مخفی خواهی ماند تا زمانی که یکی از مدیران آن را بررسی کند - و شاید اقدامات دیگری را هم در بر بگیرید٬‌ از جمله تعلیق حساب کاربری شما.\n\nبرای توضیحات بیشتر درباره اصول٬ لطفا سری بزنید به [اصول انجمن](%{base_url}/guidelines).\n" + usage_tips: + text_body_template: "چند راهنمای کوتاه برای شروع کار: \n\n##همنیطور اسکرول کنید\n\nشماره صفحه یا کلیدی در صفحه وجود ندارد - برای خواندن بیشتر ٬ ** فقط همنیطور اسکرول کنید**! \n\nنوشته های جدید وقتی می آیند٬ بطور خودکار نمایش داده می شوند.\n\n## من کجا هستم ؟! \n\n- برای جستجو٬‌ صفحه کاربریت٬ یا منو از ** آیکون ☰ دکمه های بالا سمت راست استفاده کن**.\n\n-عنوان هر جستاری شما را به نوشته خوانده نشده ی بعدی می برد. از زمان آخرین فعالیتت و شمارنده نوشته ها برای وارد شدن به بالا یا پایین استفاده کن. \n\n-همزمان با خواندن جستار٬‌ بپرید به بالا یا uarr ; با انتخاب عنوان جستار. بار سبز رنگ در پایین سمت راست را انتخاب کنید برای کنترل تمام جابجایی ها. یا از خانه و پایانکلید استفاده کنید.\n\n\n\n## چگونه پاسخ دهم ؟ \n\n- - برای پاسخ با تمام جستار ها از کلید پاسخ استفاده کن در پایین ترین قسمت صفحه. \n\n- برای پاسخ به یک نوشته خاص از کلید پاسخ استفاده کن در همان نوشته.\n\n- برای بردن گفتگو در مسیری متفاوت ولی مرتبط بهم از این استفاده کنید٬ پاسخ به عنوان جستار مرتبط در بالا سمت راست نوشته.\n\nبرای اشاره کردن به شخصی در پاسخ٬ متنی را که علاقه دارید انتخاب کنید و بعد کلید پاسخ را فشار دهید.\n\n\n\nبرای پینگ شخصی در پاسخ از اسم آنها نام بربید. `@` را تایپ کنید و autocompleter (کامل کننده خودکار) بالا می آید.\n\n\n\nبرای [ Emoji استاندارد]٬ (http://www.emoji.codes/)٬ فقط تایپ کنید `:` یا از خنده های سنتی استفاده کنید `:)`\n\n## چه کارهای دیگری می توانم انجام دهم ؟ \n\nدکمه های فعالیت در پایین هر نوشته است. \n\n\n\nبرای اطلاع دادن به دیگران از اینکه شما نوشته آنها لذت بردید از کلید **like** استفاده کنید.\ + \ اگر در نوشته مشکلی را میبینید٬‌ بطور شخصی به آنها یا مدیران اطلاع دهید با کلید پرچم گزاری **flag**.\n\nهمچنین شما می توانید پیوند را در نوشته به **اشتراک** بگذارید٬ یا **نشانه گزاری** کنید برای مرجع بعد در صفحه کاربریتان. \n\n##چه کسی می تواند با من حرف بزند ؟ \n\nوقتی کسی به شما پاسخ داد در نوشته٬ نوشته شما را جایی ذکر کرد٬‌ یا کسی اسمی از شما برد `@username`, شماره ای به سرعت در بالای صفحه سمت راست نمایان می شود. استفاده کن برای دسترسی به **آگاه سازی ها**.\n\n\n\nنگران نباش اگر پاسخ دادن را فراموش کردی - اگر آنلاین نیستی پاسخ ها در ایمیل یا (و پیام ها ) برایت می آید وقتی آن ها می رسند. \n\n##گفتگو ها چه وقت جدید هستند ؟ \n\nبطور معمول تمام گفتگوهایی با عمر کمتر از دو روز جدید محسوب می شوند٬ و هر گفتگویی که شما در آن شرکت دارید (پاسخ دادن٬ ساختن٬ یا خواندن برای مدت طولانی) بطور خودکار دنبال می شوند.\n\nشما یک آبی جدید و شاخص تعداد را در مقابل آنها می بینید: \n\n\n\nشما می توانید تعداد آگهی سازها را در هر جستار تغییر دهید از طریق کنترل در پاییت جستار ( این می تواند در دسته تنظیم شود). برای تغییر دنبال کردن جستارها یا معنی جدید) نگاه کن به [تنظیمات کاربر](%{base_url}/my/preferences\n\n## چرا یک سری کارها خاص را نمی توانم انجام دهم ؟ \n\nکاربران جدید به تا حدودی محدودند به دلایل امنیتی. با بودنت در اینجا٬ تو اعتماد انجمن را بدست میاری و بعد شهروند اینجا می شی و اون محدودیت ها به مرور زمان بر داشته می شوند. در اندزه کافی [سطح اعتماد] ](https://meta.discourse.org/t/what-do-user-trust-levels-do/4924), شما اعتماد انجمن را بدست می آورید و قادر خواهید بود به ما کمک کنید تا با هم انجمن را مدیریت کنیم.\n" + welcome_user: + subject_template: "به %{site_name} خوش آمدید!" + text_body_template: "ممنون برای عضویت%{site_name},٬ و خوش آمدید \n\n\n%{new_user_tips}\n\n\nما به [رفتار جامعه ای متمدن] همیشه اعتقاد داریم (%{base_url}/guidelines). \n\n\nاز بودنتان در انجمن لذت ببرید!\n\n\n(اگر نیاز به تماس با یکی از مدیران[staff members] را دارید(%{base_url}/about) به عنوان یک کاربر جدید٬ فقط به این پیام پاسخ دهید.)\n" welcome_invite: subject_template: "به %{site_name} خوش آمدید!" + text_body_template: "ممنون برای قبول دعتونامه به %{site_name} -- خوش آمدید!\n\n\nبرای شما یک حساب کاربری جدید ساختیم **%{username}** و شما الان در سیستم هستید. می توانید اسم خود را عوض کنید با مراجعه به [your user profile][prefs].\n\nبرای ورود بعدتر : \n\n\n1. همیشه برای ورود ** از ایمیل آدرسی استفاده کن که در دعوتنامه اصلی استفاده کردید**. در غیر اینصورت نمی تونیم بگوییم این شمایید! \n\n\n2. رمز عبور خیلی خوبی بساز برای [کاربری نمایه ات][prefs]٬ و برای ورود از آن استفاده کن.\n\n%{new_user_tips}\n\n\nما به [رفتار جامعه ای متمدن] همیشه اعتقاد داریم (%{base_url}/guidelines). \n\n\nاز بودنتان در انجمن لذت ببرید!\n\n\n(اگر نیاز به تماس با یکی از مدیران[staff members] را دارید(%{base_url}/about) به عنوان یک کاربر جدید٬ فقط به این پیام پاسخ دهید. )\n\n\n[prefs]: %{user_preferences_url}\n" + backup_succeeded: + subject_template: "پشتیبان گیری با موفقیت انجام شد" + text_body_template: "پشتیبان گیری با موفقیت انجام شد. \n\nبازدید کنید از [ ادیمین> قسمت پشتیبان گیری](/ادمین/پشتیبان گیری) برای دریافت پشتیبان جدید." backup_failed: subject_template: "پشتیبان گیری با شکست مواجه شد." + text_body_template: "پشتیبان گیری ناموفق شد\n\nاینجا وارد سیستم شوید: \n\n```\n%{logs}\n\n```\n\n" + restore_succeeded: + subject_template: "بازیابی با موفقیت کامل شد " + text_body_template: "بازیابی با موفقیت انجام شد. " restore_failed: subject_template: "بازگردانی ناموفق" + text_body_template: | + بازگرداندن انجام نشد. + + اینجا وارد شوید: + + ``` + %{logs} + + ``` + bulk_invite_succeeded: + subject_template: "دعوت انبوهی کاربر با موفقیت انجام شد" + text_body_template: "فایل دعوت انبوهی کاربر شما پردازش شد٬ %{sent} دعوتنامه ها ایمیل شد. " + bulk_invite_failed: + subject_template: "دعوت انبوه کاربر با ایراد پردازش شد" + text_body_template: "فایل دعوت انبوهی کاربر شما پردازش شد٬ %{sent} دعوتنامه ها ایمیل شد با %{failed} ایراد(s).\n\nاینجا وارد سیستم شوید: \n\n```\n%{logs}\n\n```\n" + csv_export_succeeded: + subject_template: "خارج کردن اطلاعات کامل شد" + text_body_template: |+ + خارج کردن فایل ها با موفقیت انجام شد! :dvd: + + + %{file_name} (%{file_size}) + + پیوند زیر برای دانلود فقط برای 48 ساعت اعتبار دارد. + + csv_export_failed: + subject_template: "خارج کردن فایل ها ناموفق شد" + text_body_template: "ما متاسفیم٬ ولی خارج کردن اطلاعات ناموفق شد. لطفا سیستم را چک کنید یا با یکی از مدیران تماس بگیرید. " + email_reject_trust_level: + subject_template: "[%{site_name}] مشکل ایمیل -- سطح اعتماد کافی نیست" + text_body_template: "ما متاسفیم٬ ولی پیام شما در ایمیل به %{destination} (titled %{former_title}) کار نکرد. \n\nحساب کاربری شما دارای سطح اعتماد کافی برای ارسال نوشته جدید به این ایمیل نیست. اگر این مشکل را قبول دارید٬ با یکی از مدیران تماس بگیرید.\n" + email_reject_no_account: + subject_template: "[%{site_name}] مشکل ایمیل -- حساب کاربری ناشناس " + text_body_template: "ما متاسفیم٬ ولی پیام شما در ایمیل به %{destination} (titled %{former_title}) کار نکرد. \n\n\nحساب کاربری با این ایمیل شناخته نمی شود. دوباره برای ارسال تلاش کنید با ایمیل دیگری٬ یا با یکی از مدیران تماس بگیرید.\n" + email_reject_empty: + subject_template: "[%{site_name}] مشکل ایمیل -- بدون محتوا" + text_body_template: "ما متاسفیم٬ ولی پیام ایمیل شما به %{destination} (titled %{former_title}) کار نکرد.\n\nما هیچگونه محتوایی در این ایمیل پیدا نکردیم. مطمئن شو که پاسخت در بالای ایمیل است -- ما نمی توانیم پاسخ های خطی را پروسس دهیم.\n\nاگر این را دریافت می کنید _ درحالی که _ شامل محتوا بود٬ با محتوای HTML در ایمیلتان امتحان کنید (نه فقط متن خالی ). \n" + email_reject_parsing: + subject_template: "[%{site_name}] مشکل ایمیل -- محتوا ناشناخته است" + text_body_template: "ما متاسفیم٫ ولی مسج ایمیل شما به %{destination} (titled %{former_title}) کار نکرد. \n\nما پاسخ شما را در ایمیل ذکر شده پیدا نکردیم** مطمئن شوید پاسخ شما در بالای ایمیل است** -- ما پاسخ های در یک خط را نمی تواینم پروسس کنیم.\n" + email_reject_invalid_access: + subject_template: "[%{site_name}] مشکل ایمیل -- دسترسی نامعتبر " + text_body_template: "ما متاسفیم٬ ولی پیام شما در ایمیل به %{destination} (titled %{former_title}) کار نکرد. \n\nحساب کاربری شما دارای سطح اعتماد کافی برای ارسال نوشته جدید به این ایمیل نیست. اگر این مشکل را قبول دارید٬ با یکی از مدیران تماس بگیرید.\n" + email_reject_post_error: + subject_template: "[%{site_name}] مشکل ایمیل -- ایراد ارسال" + text_body_template: "ما متاسفیم٫ ولی پیام ایمیل شما به %{destination} (titled %{former_title}) کار نکرد. \n\nبعضی ایراد های ممکن : قالب های پیچیده٬ پیغام بسیار بزرگ٬ پیغام بسیار کوچک. لطفا دوباره تلاش کنید٬ یا با وب سایت ارسال کنید اگر این ادامه داشت. \n" + email_reject_post_error_specified: + subject_template: "[%{site_name}] مشکل ایمیل -- ایراد ارسال" + text_body_template: "ما متاسفیم٬ ولی پیام ایمیل شما به %{destination} (titled %{former_title}) کار نکرد.\n\nدلیل: \n\n%{post_error}\n\nاگر می توانید مشکل را حل کنید٬ لطفا دوباره تلاش کنیدو\n\n\n" + email_reject_reply_key: + subject_template: "[%{site_name}] مشکل ایمیل -- کلید پاسخ ناشناس" + text_body_template: |+ + ما متاسفیم٬ ولی پیام ایمیل شما به %{destination} (titled %{former_title}) کار نکرد. + + کلید پاسخ وارد شده خراب یا ناشناس است٬ پس ما نمی دانیم این ایمیل در پاسخ چی هست. با یکی از مدیران تماس بگیرید. + + email_reject_destination: + subject_template: "[%{site_name}] مشکل ایمیل -- به ناشناس: آدرس" + text_body_template: "ما متاسفیم٬ ولی پیام شما در ایمیل به %{destination} (titled %{former_title}) کار نکرد. \n\n\nهیچ کدام این آدرس ها قابل شناسایی نیستند. مطمئن شو که آدرس سایت در : خط (نیست Cc: or Bcc:)٬ و شما به آدرس ایمیل صحیحی می فرستید که توسط مدیران ارائه شده.\n" + email_reject_topic_not_found: + subject_template: "[%{site_name}] مشکل ایمیل -- جستار یافت نشد" + text_body_template: "ما متاسفیم٬ ولی پیام شما در ایمیل به %{destination} (titled %{former_title}) کار نکرد. \n\n\nاین جستار یافت نشد٬ این شاید پاک شده باشد. اگر این ایراد را قبول دارید٬‌ با یکی از مدیران تماس بگیرید.\n" + email_reject_topic_closed: + subject_template: "[%{site_name}] مشکل ایمیل -- جستار بسته است" + text_body_template: "ما متاسفیم٬ ولی پیام شما در ایمیل به %{destination} (titled %{former_title}) کار نکرد. \n\nاین جستار بسته است. اگر این ایراد را قبول دارید با یکی از مدیران تماس بگیرید.\n\n" + email_reject_auto_generated: + subject_template: "[%{site_name}] مشکل ایمیل -- پاسخ خودکار" + text_body_template: "ما متاسفیم٬ ولی پیام شما در ایمیل به %{destination} (titled %{former_title}) کار نکرد. \n\nپاسخ ایمیل شما خودکار بود٬ که ما آن را قبول نمی کنیم. اگر این ایراد را قبول دارید با یکی از مدیران تماس بگیرید. \n" + email_error_notification: + subject_template: "[%{site_name}] مشکل ایمیل -- ایراد تصدیق POP " + text_body_template: "ایراد تصدیقی وجود داشته همزمان با گرفتن ایمیل ها از سرور POP. \n\n\nلطفا اطمینان حاصل کنید از اینکه بطور درست تنظیم اعتبارنامه POP را در [تنظیمات وب سایت] انجام داده اید. (%{base_url}/ریس/تنظیمات _ سایت /دسته/ایمیل)\n" + too_many_spam_flags: + subject_template: "حساب جدید کاربری انسداد شد " + text_body_template: "سلام \n\nاین یک پیغام خوکار است از %{site_name} برای تایید اینکه نوشته های شما بطور خودکار مخفی شده اند زیرا آنها توسط انجمن پرچم گزاری شده اند. \n\n\nبه عنوان یک اقدام احتیاطی٬ حساب کاربری جدید شما مسدود شده است از ساختن پاسخ های جدید یا جستارهای جدید تا قبل از اینکه یک مدیران حساب کاربری شما را بررسی کند.\n\n\nبرای راهنمایی بیشتر به[ دستور عمل های انجمن] مراجعه کنید. (%{base_url}/guidelines).\n" + blocked_by_staff: + subject_template: "حساب کاربری مسدود شد" + text_body_template: "سلام٬ \n\n\nاین یک پیام خودکار است از طرف %{site_name} برای اطلاع در جهت اینکه حساب کاربری شما توسط یکی از مدیران مدیران مسدود شده است.\n\nبرای راهنمایی بیشتر٬ لطفا مراجعه کنید به [دستورالعمل انجمن](%{base_url}/guidelines).\n" + user_automatically_blocked: + subject_template: "کاربر جدید%{username} مسدود شد بخاطر پرچم های انجمن" + text_body_template: "این یک پیام خودکار است. \n\n\nکاربر جدید [%{username}](%{base_url}%{user_url}) بطور خودکار مسدود شد زیرا چند کاربر متفاوت %{username}'s این نوشته(ها) را پرچم گزاری کرده اند.\n\n\nلطفا [پرچم ها را بررسی کن](%{base_url}/admin/flags). اگر %{username} به اشتباه مسدود شده بود لطفا به روی کلید رفع مسدود کلیک کنید[مدیرصفحه برای این کاربر](%{base_url}%{user_url}). \n\n\nاین آستانه می تواند تغییر کند از طریق `block_new_user` تنظیمات سایت.\n" + spam_post_blocked: + subject_template: "کاربر جدید%{username} نوشته مسدود شده است بدلیل پیوند های تکراری" + text_body_template: | + این یک پیام خودکار است. + + کاربرجدید [%{username}](%{base_url}%{user_url}) تلاش کرد برای ساخت چند نوشته با پیوندهایی به %{domains}, ولی آن نوشته ها مسدود شده اند برای جلوگیری از هرزنامه. کاربر هنوز قادر به ساخت نوشته های جدید است که به پیوندی به این %{domains} ندارد. + + + لطفا [کاربر را بررسی کنید](%{base_url}%{user_url}). + + + این می تواند تغییر کند با `newuser_spam_host_threshold` و `white_listed_spam_host_domains` site settings. + unblocked: + subject_template: "حساب کاربری رفع انسداد شد " + text_body_template: "سلام \n\nاین یک پیام خودکار هست از طرف %{site_name} برای تایید باز شدن حساب کاربری شما بعد از بررسی مدیران. \n\n\nشما می توانید دوباره پاسخ ها و جستارهای جدید را بوجود بیاورید.\n" pending_users_reminder: subject_template: other: "%{count} کاربران منتظر تایید" + text_body_template: | + تعدادی درخواست کاربران جدید عضو شده منتظر هستند برای تایید (یا رد شدن) قبل از اینکه به انجمن دسترسی داشته باشند. + + [ لطفا آنها را در بخش مدیریت بررسی کن] (%{base_url}/admin/users/list/pending) + download_remote_images_disabled: + subject_template: "دانلود کردن عکس های سیار از کار افتاده" + unsubscribe_link: "برای لغو اشتراک ار ایمیل ها٬‌ بازدید کن از [تنظیمات کاربر] (%{user_preferences_url})." subject_re: "پاسخ:" subject_pm: "[PM] " user_notifications: @@ -765,8 +1096,15 @@ fa_IR: unsubscribe: title: "لغو اشتراک" description: "آیا تمایلی به دریافت این ایمیل‌ها ندارید؟ مشکلی نیست! اینجا را کلیک کنید تا اشتراک آن هم‌اکنون حذف شود." + reply_by_email: "برای پاسخگویی، به این ایمیل جواب بده یا بازدید کنید از {base_url}%{url}% در مرورگر خود." visit_link_to_respond: "برای پاسخگویی، لینک {base_url}%{url}% را در مرورگر خود مشاهده کنید." posted_by: "نوشته شده توسط {username}% در تاریخ {post_date}%" + user_invited_to_private_message_pm: + subject_template: "[%{site_name}] %{username} شما را به یک پیام دعوت کرده است: '%{topic_title}'" + text_body_template: "\n%{username} شما را به یک پیام دعوت کرده\n\n\n> **%{topic_title}**\n\n>\n\n> %{topic_excerpt}\n\n\nat \n\n\n> %{site_title} -- %{site_description}\n\n\nلطفا از این پیوند بازدید کنید تا پیام را ببینید: %{base_url}%{url}\n" + user_invited_to_topic: + subject_template: "[%{site_name}] %{username} شما را به یک جستار دعوت کرده '%{topic_title}'" + text_body_template: "\n%{username} به گفتگو دعوت شده است\n\n\n> **%{topic_title}**\n\n>\n\n> %{topic_excerpt}\n\nat \n\n\n> %{site_title} -- %{site_description}\n\n\nلطفا از این پیوند بازدید کنید تا پیام را ببینید: %{base_url}%{url}\n" user_replied: subject_template: "[%{site_name}] %{topic_title}" text_body_template: | @@ -813,20 +1151,34 @@ fa_IR: --- %{respond_instructions} digest: + why: "یک گزارش کوتاه از %{site_link} از آخرین باری که بازدید کردید در %{last_seen_at}" subject_template: "[%{site_name}] خلاصه" new_activity: "فعالیت جدید در موضوعات و نوشته‌های شما:" top_topics: "نوشته‌های محبوب" other_new_topics: "موضوعات محبوب" + unsubscribe: "این دایجست اراسال شده از %{site_link} وقتی ما شما را برای مدت طولانی ندیده باشیم. برای لغو اشتراک %{unsubscribe_link}." click_here: "اینجا کلیک کنید" from: "%{site_name} خلاصه" read_more: "بیش‌تر بخوانید" + more_topics: "جستارهای جدیدی%{new_topics_since_seen} وجود داشت." more_topics_category: "موضوعات جدید بیشتر" posts: other: "%{count} نوشته ها" forgot_password: subject_template: "[%{site_name}] باز یابی رمز عبور" + text_body_template: | + شخصی برای ریست رمز عبور سوال کرد[%{site_name}](%{base_url}). + + + اگر شما نبود٬ می توانید با خیال راحت این ایمیل را نادیده بگیرید. + + + بر روی پیوند پیش رو برای انتخاب رمز عبور جدید کلیک کنید. + + %{base_url}/users/password-reset/%{email_token} set_password: subject_template: "تنظیم رمز عبور [%{site_name}] " + text_body_template: "شخصی برای اضافه کردن رمز عبور به حساب کاربری شما پرسیده در [%{site_name}](%{base_url}). در روش دیگر٬‌ شما می توانید با وارد شوید از طریق سرویس دیگر مثل (گوگل٬‌ فیس بوک٬‌غیره) که ایمیل برابر استفاده می کنند. \n\n\nاگر شما نبود٬ می توانید با خیال راحت این ایمیل را نادیده بگیرید.\n\nبر روی پیوند پیش رو برای انتخاب رمز عبور جدید کلیک کنید.\n\n%{base_url}/users/password-reset/%{email_token}\n" account_created: subject_template: "[%{site_name}] حساب کاربری جدید شما" text_body_template: "حساب کاربری جدید برای شما ساخته شد در %{site_name}\n\nبر روری پیوند پیش رو کلیک کنید برای انتخاب رمز برای حساب کاربری جدیدتان: \n\n%{base_url}/users/password-reset/%{email_token}\n" diff --git a/config/locales/server.fi.yml b/config/locales/server.fi.yml index 163f2fa2b5..7b6ccd0e7d 100644 --- a/config/locales/server.fi.yml +++ b/config/locales/server.fi.yml @@ -79,11 +79,11 @@ fi: one: "Pahoittelut, uudet käyttäjät voivat kirjoittaa yhden vastauksen samaan ketjuun." other: "Pahoittelut, uudet käyttäjät voivat kirjoittaa %{count} vastausta samaan ketjuun." embed: - start_discussion: "Aloita keskustelu" - continue: "Jatka keskustelua" + start_discussion: "Lisää kommentti" + continue: "Siirry keskusteluun" more_replies: - one: "1 kommentti lisää" - other: "%{count} kommenttia lisää" + one: "1 muu kommentti" + other: "%{count} muuta kommenttia" loading: "Haetaan kommentteja..." permalink: "Ikilinkki" imported_from: "Tämä on kommenttiketju artikkelille %{link}" @@ -138,6 +138,7 @@ fi: groups: errors: can_not_modify_automatic: "Et voi muokata automaattista ryhmää" + member_already_exist: "'%{username}' on jo ryhmän jäsen." default_names: everyone: "kaikki" admins: "ylläpitäjät" @@ -457,7 +458,7 @@ fi: email_title: 'Viestiketju"%{title}" kaipaa valvojan huomiota' email_body: "%{link}\n\n%{message}" flagging: - you_must_edit: '

      Viestisi on liputettu muiden käyttäjien toimesta. Käy lukemassa saapuneet viestisi.

      ' + you_must_edit: '

      Viestisi on liputettu muiden käyttäjien toimesta. Käy lukemassa saapuneet viestisi.

      ' user_must_edit: '

      Tämä viesti on liputettu ja siksi piilotettu väliaikaisesti.

      ' archetypes: regular: @@ -600,7 +601,6 @@ fi: host_names_warning: "Sivuston config/database.yml tiedosto käyttää oletusisäntänimeä. Päivitä se käyttämään sivuston isäntänimeä." gc_warning: 'Palvelimesi käyttää rubyn oletuksia roskienkeräyksessä, joka ei anna parasta mahdollista suorituskykyä. Lue tämä ketju: Tuning Ruby and Rails for Discourse.' sidekiq_warning: 'Sidekiq ei ole käynnissä. Monet tehtävät, kuten sähköpostien lähettäminen, suoritetaan asynkronisesti sidekiqin avulla. Varmista, että vähintään yksi sidekiq prosessi on käynnissä. Opiskele lisää Sidekiqista täältä.' - queue_size_warning: 'Jonossa olevien tehtävien määrä on %{queue_size}, joka on suuri. Tämä voi viitata ongelmaan Sidekiq prosess(e)issa, tai sinun voi olla järkevää lisätä Sidekiq workerien määrää.' memory_warning: 'Palvelimella on alle 1GB muistia. Vähintään 1 GB muistia on suositeltavaa.' both_googles_warning: "Olet ottanut käyttöön sekä enable_google_logins että enable_google_oauth2_logins sivun asetuksissa. Ota enable_google_logins pois käytöstä." google_oauth2_config_warning: 'Palvelin on konfiguroitu hyväksymään kirjautuminen Google OAuth2:n kautta (enable_google_oauth2_logins), mutta client id ja client secret arvoja ei ole asetettu. Päivitä arvot sivuston asetuksissa.Voit lukea lisätietoja tästä oppaasta.' @@ -720,6 +720,9 @@ fi: cooldown_minutes_after_hiding_posts: "Kuinka monta minuuttia käyttäjän tulee odottaa, ennen kuin hän voi muokata liputuksen seurauksena piilotettua viestiä" max_topics_in_first_day: "Kuinka monta ketjua uusi käyttäjä saa luoda ensimmäisenä päivänään sivustolla." max_replies_in_first_day: "Kuinka monta vastausta uusi käyttäjä saa kirjoittaa ensimmäisenä päivänään sivustolla." + tl2_additional_likes_per_day_multiplier: "Nosta tykkäysten päivittäistä rajaa tasolla lt2 (konkari) kertomalla tällä luvulla" + tl3_additional_likes_per_day_multiplier: "Nosta tykkäysten päivittäistä rajaa tasolla lt3 (mestari) kertomalla tällä luvulla" + tl4_additional_likes_per_day_multiplier: "Nosta tykkäysten päivittäistä rajaa tasolla lt4 (johtaja) kertomalla tällä luvulla" num_flags_to_block_new_user: "Jos uuden käyttäjän viesti saa näin monta roskaposti-liputusta num_users_to_block_new_user eri käyttäjältä, piilota kaikki hänen viestinsä ja estä viestien luominen. 0 poistaa tämän toiminnon käytöstä." num_users_to_block_new_user: "Jos uuden käyttäjän viesti saa näin monelta käyttäjältä num_flags_to_block_new_user roskaposti-liputusta, piilota kaikki hänen viestinsä ja estä viestien luominen. 0 poistaa tämän toiminnon käytöstä." notify_mods_when_user_blocked: "Jos käyttäjä estetään automaattisesti, lähetä viesti kaikille valvojille." @@ -755,8 +758,8 @@ fi: email_token_grace_period_hours: "Unohtuneen salasanan / tilin vahvistamisen tokenit ovat vielä voimassa (n) tuntia käyttämisen jälkeen." enable_badges: "Ota käyttöön arvomerkkijärjestelmä" allow_index_in_robots_txt: "Määrittele robots.txt-tiedostossa, että hakukoneet saavat luetteloida sivuston." - email_domains_blacklist: "Lista sähköposti-verkkotunnuksista, joista käyttäjät eivät voi luoda tiliä. Esimerkiksi mailinator.com trashmail.net" - email_domains_whitelist: "Lista sähköposti-verkkotunnuksista, joista käyttäjien pitää luoda tilinsä. VAROITUS: Käyttäjiä, joiden sähköpostiosoite on muusta verkkotunnuksesta ei sallita!" + email_domains_blacklist: "Pystyviivalla eroteltu lista sähköposti-verkkotunnuksista, joista käyttäjät eivät voi luoda tiliä. Esimerkiksi mailinator.com|trashmail.net" + email_domains_whitelist: "Pystyviivalla eroteltu lista sähköposti-verkkotunnuksista, joista käyttäjien pitää luoda tilinsä. VAROITUS: Käyttäjiä, joiden sähköpostiosoite on muusta verkkotunnuksesta ei sallita!" forgot_password_strict: "Älä paljasta tilin olemassaoloa unohtuneen salasanan kyselyssä." log_out_strict: "Kun kirjaudutaan ulos, kirjaa käyttäjä ulos kaikilta laitteilta" version_checks: "Pingaa Discourse Hubia päivityksistä ja näytä viesti /admin hallintapaneelissa kun uusi versio on saatavilla" @@ -978,6 +981,8 @@ fi: enable_emoji: "Ota emoji käyttöön" emoji_set: "Minkälaisa emojia haluaisit käyttää?" enforce_square_emoji: "Pakota neliö kuvasuhteeksi kaikille emojille." + approve_post_count: "Viestien lukumäärä, joka tarkastetaan uusilta käyttäjiltä" + approve_unless_trust_level: "Tätä luottamustasoa alhaisempien käyttäjien viestit tarkastetaan" errors: invalid_email: "Sähköpostiosoite ei kelpaa." invalid_username: "Tällä nimellä ei löydy käyttäjää." @@ -1435,6 +1440,12 @@ fi: Pahoittelemme, että sähköpostin lähettäminen tänne %{destination} (otsikolla %{former_title}) ei onnistunut. Emme löytäneet viestisi sisältöä sähköpostista. **Varmista, että kirjoitit viestisi sähköpostin alkuun** -- emme pysty käsittelemään lainausten sekaan kirjoitettuja vastauksia + email_reject_invalid_access: + subject_template: "[%{site_name}] Sähköpostiongelma -- Pääsy estetty" + text_body_template: | + Pahoittelut, sähköpostiviestiäsi tänne: %{destination} (otsikolla %{former_title}) ei voitu toimittaa. + + Tililläsi ei ole riittäviä oikeuksia, jotta saisit lähettää uusia ketjuja tälle alueelle. Jos uskot, että tämä johtuu virheestä, ota yhteyttä henkilökuntaan. email_reject_post_error: subject_template: "[%{site_name}] Sähköpostiongelma -- Lähetysvirhe" text_body_template: | diff --git a/config/locales/server.fr.yml b/config/locales/server.fr.yml index 55624d9eb2..f75ba7d3bb 100644 --- a/config/locales/server.fr.yml +++ b/config/locales/server.fr.yml @@ -20,6 +20,7 @@ fr: is_reserved: "est réservé" purge_reason: "Supprimé automatiquement comme compte abandonné, non activé" disable_remote_images_download_reason: "Le téléchargement des images externes a été désactivé faute de place suffisante sur le disque." + anonymous: "Anonyme" errors: format: '%{attribute} %{message}' messages: @@ -120,6 +121,7 @@ fr: next_page: "page suivante →" prev_page: "← page précédente" page_num: "Page %{num}" + home_title: "page d'accueil" topics_in_category: "Sujets dans la catégorie '%{category}'" rss_posts_in_topic: "Flux RSS de '%{topic}'" rss_topics_in_category: "Flux RSS des sujets dans la catégorie '%{category}'" @@ -136,6 +138,7 @@ fr: groups: errors: can_not_modify_automatic: "Vous ne pouvez pas modifier un groupe automatique" + member_already_exist: "'%{username}' est déjà membre de ce groupe." default_names: everyone: "tous" admins: "administrateurs" @@ -450,7 +453,7 @@ fr: email_title: 'Ce sujet "%{title}" requière l''attention d''un modérateur' email_body: "%{link}\n\n%{message}" flagging: - you_must_edit: '

      Votre message a été signalé par la communauté. Veuillez regarder vos messages.

      ' + you_must_edit: '

      Votre message a été signalé par la communauté. Veuillez regarder vos messages.

      ' user_must_edit: '

      Ce message a été signalé par la communauté et temporairement masqué.

      ' archetypes: regular: @@ -593,7 +596,6 @@ fr: host_names_warning: "Votre fichier config/database.yml utilise le nom d'hôte par défaut. Veuillez renseigner votre nom d'hôte." gc_warning: 'Votre serveur utilise les paramètres par défaut de collection du GC de ruby, ce qui ne vous donnera pas les meilleures performances. Merci de lire ce sujet sur l''optimisation des performances de Ruby et Rails pour Discourse.' sidekiq_warning: 'Sidekiq n''est pas lancé. De nombreuses tâches, comme l''envoi des courriels, sont exécutées de manière asynchrone par sidekiq. Assurez-vous d''avoir au moins un processus sidekiq de lancé. En savoir plus sur sidekiq.' - queue_size_warning: 'Il y a %{queue_size} tâches dans la file d''attente, ce qui est beaucoup. Cela peut provenir d''un problème avec les processus Sidekiq, ou à un manque de processus Sidekiq travailleurs.' memory_warning: 'Votre serveur dispose de moins de 1 Go de mémoire vive. Au moins 1 Go de RAM est recommandé.' enable_google_logins_warning: "AVERTISSEMENT! Votre méthode actuelle d'authentication Google ne fonctionnera plus à partir du 20 avril 2015! Veuillez passer à la nouvelle méthode dès maintenant!" both_googles_warning: "Vous avez les options enable_google_logins et enable_google_oauth2_logins d'activer en même temps. Veuillez désactiver l'option enable_google_logins (obsolète)." @@ -611,7 +613,7 @@ fr: title_nag: "Saisissez le nom de votre site. Modifier le titre sous Paramètres du site." site_description_missing: "Saisissez une phrase courte qui décrira votre site et apparaîtra dans les moteurs de recherche. Mettez site_description à jour dans les Paramètres du site." consumer_email_warning: "Votre site est configuré pour envoyer les courriels en utilisant Gmail (ou un autre site de courriels pour utilisateur standard). Gmail limite le nombre d'emails que vous pouvez envoyer. Nous vous conseillons d'utiliser un autre service d'envoi de courriels afin d'assurer une meilleure délivrabilité." - site_contact_username_warning: "Saisissez le pseudo d'un responsable sympathique qui enverra automatiquement les messages importants. Mettez à jour site_contact_username dans les paramètres du site." + site_contact_username_warning: "Saisissez le pseudo d'un responsable sympathique à partir duquel sera envoyé les messages importants. Mettez à jour site_contact_username dans les Paramètres du site." notification_email_warning: "Les courriels de notification ne serot pas envoyés depuis une adresse de courriel valide sur votre domaine ; l'envoie des courriels sera aléatoire et peu fiable. Veuillez saisir une adresse de courriel locale dans notification_email dans les Paramètres du site." s3_deprecation_warning: "ATTENTION ! Le support d'Amazon S3 pour l'hébergement des images et des pièces jointes va bientôt être abandonné. Merci de suivre ces instructions pour migrer vers de l'hébergement local." content_types: @@ -714,6 +716,9 @@ fr: cooldown_minutes_after_hiding_posts: "Nombre de minutes qu'un utilisateur doit attendre avant de pouvoir modifier un message masqué via un signalement de la communauté" max_topics_in_first_day: "Le nombre maximum de sujets qu'un utilisateur est autorisé à créer lors de son premier jour sur le site" max_replies_in_first_day: "Le nombre maximum de réponses qu'un utilisateur est autorisé à créer lors de son premier jour sur le site" + tl2_additional_likes_per_day_multiplier: "Augmenter la limite de J'aime par jour pour les utilisateurs de niveau 2 (membres) en la multipliant par ce nombre" + tl3_additional_likes_per_day_multiplier: "Augmenter la limite de J'aime par jour pour les utilisateurs de niveau 3 (réguliers) en la multipliant par ce nombre" + tl4_additional_likes_per_day_multiplier: "Augmenter la limite de J'aime par jour pour les utilisateurs de niveau 4 (meneurs) en la multipliant par ce nombre" num_flags_to_block_new_user: "Si le message d'un nouvel utilisateur obtient plusieurs signalements pour spam de la part de num_users_to_block_new_user différents utilisateurs, masquer tous ses messages et l'empêcher de poster à l'avenir. 0 désactive cette fonctionnalité." num_users_to_block_new_user: "Si le message d'un nouvel utilisateur obtient num_flags_to_block_new_user signalements pour spam de la part nombreux utilisateurs différents, masquer tous ses messages et l'empêcher de poster à l'avenir. 0 désactive cette fonctionnalité." notify_mods_when_user_blocked: "Si un utilisateur est bloqué automatiquement, envoyer un message à tous les modérateurs." @@ -749,8 +754,6 @@ fr: email_token_grace_period_hours: "Les jetons (tokens) de Mot de passe oublié / Activation de comptes sont encore valides pour une période de grâce de (n) heures après leur expiration." enable_badges: "Activer le système de badges" allow_index_in_robots_txt: "Spécifier dans robots.txt que le site est autorisé à être indexer par les robots des moteurs de recherche." - email_domains_blacklist: "Liste des domaines de courriel qui ne sont pas autorisé lors de la création de compte. Exemple: mailinator.com|trashmail.net" - email_domains_whitelist: "Liste des domaines de courriel avec lesquelles les utilisateurs DOIVENT s'enregistrer. ATTENTION : les utilisateurs ayant une adresse de courriel sur un autre domaine ne pourrons pas s'enregistrer." forgot_password_strict: "Ne pas tenir informé de l'existance d'un compte utilisateur quand un utilisateur utilise le formulaire d'oubli de mot de passe." log_out_strict: "Lors de la déconnexion, déconnecter TOUTES les sessions pour l'utilisateur sur tous les appareils" version_checks: "Ping les serveurs de Discourse afin d'obtenir les mises à jours et affiche les nouveaux messages d'information dans le tableau de bord /admin" @@ -856,6 +859,7 @@ fr: email_time_window_mins: "Attendre (n) minutes avant l'envoi des courriels de notification, afin de laisser une chance aux utilisateurs de modifier ou finaliser leurs messages." email_posts_context: "Combien de réponses précédentes doit-on inclure dans les courriels de notifications pour situer le contexte." flush_timings_secs: "A quelle fréquence les données de timing doivent être vider, en secondes." + title_max_word_length: "Le nombre maximum de caractères dans le titre d'un sujet." title_min_entropy: "L'entropie minimale (caractères unique, les caractères en langues étrangères compte pour plus) requise pour le titre d'un sujet." body_min_entropy: "L'entropie minimale (caractères unique, les caractères en langues étrangères compte pour plus) requise pour le corps d'un message." title_fancy_entities: "Convertir les caractères ASCII commun en jolies entitées HTML dans les titres des sujets, comme SmartyPants http://daringfireball.net/projects/smartypants/" @@ -933,7 +937,10 @@ fr: max_daily_gravatar_crawls: "Nombre maximum de fois que Discourse vérifiera Gravatar pour des avatars personnalisés en une journée." public_user_custom_fields: "Une liste blanche des champs personnalisés pour un utilisateur qui peuvent être affichés publiquement." staff_user_custom_fields: "Une liste blanche des champs personnalisés pour un utilisateur qui peuvent être vus par l'équipe." - enable_user_directory: "Fournir un répertoire des utilisateurs pour la navigation" + enable_user_directory: "Fournir un répertoire des utilisateurs" + allow_anonymous_posting: "Permettre aux utilisateurs de passer en mode anonyme" + anonymous_posting_min_trust_level: "Le niveau de confiance minimum pour passer en mode anonyme." + anonymous_account_duration_minutes: "Pour protéger l'anonymat, créer un nouveau compte anonyme tous les N minutes pour chaque utilisateur. Exemple: si 600 est choisi, dès 600 minutes après le dernier message ET que l'utilisateur passe en mode anonyme, un nouveau compte anonyme lui sera crée." allow_profile_backgrounds: "Autoriser les utilisateurs à envoyer des arrières-plans de profil." sequential_replies_threshold: "Nombre de messages qu'un utilisateur doit poster d'affilé dans un sujet avant d'être rappelé à l'ordre pour multiple réponses." enable_mobile_theme: "Les appareils mobiles utilisent un thème adapté aux mobiles, avec la possibilité de passer à la totalité du site. Désactivez cette option si vous voulez utiliser une feuille de style personnalisée qui répond à tous les types de client." @@ -941,6 +948,7 @@ fr: suppress_uncategorized_badge: "Ne pas afficher le badge pour les sujets non catégorisés dans les listes des sujets." global_notice: "Affiche un bandeau global URGENT pour tout les utilisateurs du site, laissez vide pour le cacher (HTML autorisé)." disable_edit_notifications: "Désactiver les notifications de modifications par l'utilisateur système lorsque l'option 'download_remote_images_to_local' est activée." + full_name_required: "Le nom complet est requis dans le profil utilisateur." enable_names: "Autoriser l'affichage des noms complets des utilisateurs dans leur profil, sur leur carte d'utilisateur et dans les courriels. Décocher pour cacher les noms complets partout." display_name_on_posts: "Afficher le nom complet de l'utilisateur dans ses messages en plus de son @pseudo." invites_per_page: "Afficher les invitations sur la page de l'utilisateur." @@ -967,6 +975,8 @@ fr: enable_emoji: "Activer les emojis" emoji_set: "Comment aimeriez-vous vos emoji ?" enforce_square_emoji: "Forcer tous les emojiis à être carrés." + approve_post_count: "Le nombre de messages d'un nouvel utilisateur qui doivent être approuvés" + approve_unless_trust_level: "Les messages des utilisateurs qui n'ont pas atteint ce niveau de confiance doivent être approuvés" errors: invalid_email: "Adresse de courriel invalide." invalid_username: "Il n'y a pas d'utilisateur ayant ce pseudo." @@ -990,8 +1000,8 @@ fr: posted: "%{display_username} a répondu à %{link}" moved_post: "%{display_username} a déplacé votre message vers %{link}" private_message: "%{display_username} vous a envoyé un message : %{link}" - invited_to_private_message: "%{display_username} vous a invité dans une conversation : %{link}" - invited_to_topic: "%{display_username} vous a invité dans une discussion: %{link}" + invited_to_private_message: "%{display_username} vous a invité dans une discussion: %{link}" + invited_to_topic: "%{display_username} vous a invité dans un sujet: %{link}" invitee_accepted: "%{display_username} a accepté votre invitation" linked: "%{display_username} a mentionné l'un de vos messages : %{link}" granted_badge: "Vous avez gagné %{link}" @@ -1242,6 +1252,11 @@ fr: Cependant, si le message est signalé par la communauté une seconde fois, il restera marqué jusqu’à l'intervention d'un modérateur – et ils pourront prendre d'autres mesures y compris l'éventuelle suspension de votre compte. Pour plus d'informations, merci de vous en référer aux [règles de la communauté](%{base_url}/guidelines). + usage_tips: + text_body_template: "Quelques astuces pour vous aider à démarrer rapidement.\n\n## Continuez de descendre\n\nIl n'y a pas de bouton Page Suivante ni de numéro de page – pour en lire plus, **il vous suffit de descendre !**\n\nLorsque de nouvelles réponses arrivent, elles apparaissent automatiquement. \n\n## Où suis-je ?\n\n- Pour la recherche, votre page d'utilisateur, ou le menu, utiliser les **boutons icônes ☰ en haut à droite**.\n\n- Dans la liste des sujets, le titre vous emmènera toujours vers le prochain message non lu. Utiliser les colonnes Activité ou Messages pour allez au premier ou au dernier message. \n\n- Lorsque vous lisez un sujet, retournez en haut de celui ↑ en cliquant sur le titre. Cliquez sur la barre de progression en bas à droite pour avoir une navigation complète, ou utilisez les touches Home et Fin. \n\n \n\n## Comment je réponds ?\n\n- Pour répondre au sujet dans sa globalité, utilisez le bouton \"Répondre\" tout en bas de la page.\n\n- Pour répondre à un message spécifique, utilisez le bouton \"Répondre\" \ + \ sur le message.\n\n - Si vous voulez continuer le sujet dans une section différente, mais garder le lien entre votre sujet et le message qui vous l'a inspiré, utilisez la fonction Répondre en créant un nouveau sujet à droite de chaque message.\n\nPour citer quelqu'un dans votre message, sélectionnez le texte que vous voulez citer et appuyez sur un des boutons Répondre.\n\n\n\nPour mentionner le pseudo d'un utilisateur, commencez à taper `@` et une liste d'auto-complétion apparaîtra.\n\n\n\nConcernant les [icones Emoji](http://www.emoji.codes/), commencez par écrire `:` ou le traditionnel smiley `:)` :smile: \n\n## Que puis-je faire d'autre ?\n\nÀ la fin de chaque message il y a un ensemble de boutons pour les différentes actions possibles.\n\n\n\nPour faire savoir à quelqu'un que vous avez apprécié son message, cliquez sur le bouton *j'aime** en bas du message. Si vous voyez un problème avec un message, n'hésitez pas à cliquer sur le bouton **signaler** pour avertir\ + \ en privé l'auteur ou les modérateurs du contenu de ce message.\n\nVous pouvez aussi **partager** un liens vers un message ou l'ajouter à vos **signets** pour le retrouver sur votre page d'utilisateur. \n\n## Qui me parle ?\n\nQuand quelqu'un répond à votre message, vous cite, ou mentionne votre `@pseudo`, un nombre apparaitra immédiatement en haut à droite de la page. Utilisez-le pour consulter vos **notifications**.\n\n\n\nNe soyez pas inquiêt de manquer des notifications – \nLes réponses (et les messages directs) vous seront envoyés par courriel si vous n'êtes pas présent sur le site lorsqu'ils sont envoyés. \n\n## Quand est-ce qu'une conversation est nouvelle ?\n\nPar défaut, toutes les conversations de moins de deux jours sont considérées comme nouvelles, et chaque sujets auxquels vous avez participé (répondus, créés ou lu pendant un long moment) seront automatiquements suivis. \n\nVous verrez le badge bleu de nouveauté et le nombre de nouveaux messages au côté de ces discussions:\n\n\n\nVous pouvez modifier l'état du suivi des notifications d'une discussion en utilisant les boutons en bas de la discussion (vous pouvez également\ + \ le modifier au niveau des catégories). Pour changer la façon dont vous suivez les discussions, ou pour définir de nouveaux suivis, consultez [vos préférences utilisateurs](%{base_url}/my/preferences). \n\n## Quelles sont les choses que je ne peux pas faire ?\n\nLes nouveaux utilisateurs sont limités pour des raisons de sécurité. Plus vous participerez, plus vous gagnerez la confiance de la communauté et les restrictions disparaîtrons. A plus haut [niveau de confiance](https://meta.discourse.org/t/what-do-user-trust-levels-do/4924), vous gagnerez de nouvelles compétences pour nous aider à gérer la communauté.\n" welcome_user: subject_template: "Bienvenue sur %{site_name} !" text_body_template: "Merci d'avoir rejoint %{site_name} et bienvenue ! \n\n%{new_user_tips}\n\nNous croyons au [comportement communautaire civilisé](%{base_url}/guidelines) en tous temps. \n\nAmusez-vous bien ! \n\n(Si, en tant que nouvel utilisateur, vous avez besoin de communiquer avec un [responsable](%{base_url}/about), répondez simplement à ce message.)\n" @@ -1299,16 +1314,19 @@ fr: subject_template: "Échec de l'exportation des données " text_body_template: "Nous sommes désolés, l'exportation de vos données a échoué. Veuillez consultez les logs ou contactez un modérateur." email_reject_trust_level: + subject_template: "[%{site_name}] Incident d'email -- Niveau de confiance insuffisant " text_body_template: | Nous sommes désolé, mais l'envoi de votre courriel à destination de {destination} (intitulé %{former_title}) n'a pas fonctionné. Votre compte n'a pas le niveau de confiance requis pour créer un nouveau sujet via cette adresse de courriel. Si vous pouvez que c'est une erreur, contacter un membre de l'équipe du site. email_reject_no_account: + subject_template: "[%{site_name}] Problème de courriel - Compte utilisateur inconnu" text_body_template: | Malheureusement votre courriel à %{destination} (titled %{former_title}) a échoué. Aucun compte d'utilisateur avec cette adresse existe. Essayez de l'envoyer depuis une autre adresse, ou contactez un membre de l'équipe. email_reject_empty: + subject_template: "[%{site_name}] Problème de courriel - sans contenu" text_body_template: | Malheureusement votre courriel à %{destination} (titled %{former_title}) a échoué. @@ -1316,16 +1334,25 @@ fr: Si vous avez reçu ce message et que vous _pensez_ avoir envoyé du contenu, réenvoyez-le au format HTML (et non pas seulement au format text brut) . email_reject_parsing: + subject_template: "[%{site_name}] Problème de courriel - contenu non reconnu." text_body_template: | Nous sommes désolés, mais l'envoi de votre courriel à destination de {destination} (intitulé %{former_title}) n'a pas fonctionné. Nous n'avons pas trouvé votre réponse dans ce courriel. **Assurez-vous d'avoir écrit votre réponse tout en haut du courriel** -- il nous est impossible de traiter les réponses imbriquées. + email_reject_invalid_access: + subject_template: "[%{site_name}] Problème de courriel -- Accès invalide" + text_body_template: | + Nous sommes désolé, mais votre email à destination de {destination} (intitulé %{former_title}) n'a pas fonctionné. + + Votre compte n'a pas les privilèges pour créer un nouveau sujet dans cette catégorie. Si vous trouvez que c'est une erreur, contacter l’équipe du site. email_reject_post_error: + subject_template: "[%{site_name}] Incident d'email -- Erreur d'envoi d'un message" text_body_template: | Nous sommes désolé, mais l'envoi de votre courriel à destination de {destination} (intitulé %{former_title}) n'a pas fonctionné. Cela peut-être à cause de: format trop complexe, message trop long ou trop court. Veuillez réessayer, ou rédigé votre message directement sur le site si le problème persiste. email_reject_post_error_specified: + subject_template: "[%{site_name}] Incident d'email -- Erreur d'envoi d'un message" text_body_template: | Nous sommes désolé, mais l'envoi de votre courriel à destination de {destination} (intitulé %{former_title}) n'a pas fonctionné. @@ -1335,31 +1362,37 @@ fr: Si vous pouvez corriger les erreurs, veuillez réessayer. email_reject_reply_key: + subject_template: "[%{site_name}] Problème de courriel -- Mauvaise clé de réponse" text_body_template: | Nous sommes désolé, mais l'envoi de votre courriel à destination de {destination} (intitulé %{former_title}) n'a pas fonctionné. La clé de réponse du fournisseur est invalide ou inconnu, et nous ne pouvons pas savoir à quel sujet s’adresse cette réponse. Contactez un membre de l'équipe du site. email_reject_destination: + subject_template: "[%{site_name}] Problème de courriel - Adresse de destinataire inconnue" text_body_template: | Nous sommes désolé, mais l'envoi de votre courriel à destination de {destination} (intitulé %{former_title}) n'a pas fonctionné. Aucune adresse de destination n'est reconnue. Veuillez vérifier que l'adresse du site est bien renseignée dans le champs To: (et non dans les champs C:: ou Bcc:), et que vous envoyez bien à l'adresse de courriel fournie par l'équipe. email_reject_topic_not_found: + subject_template: "[%{site_name}] Erreur de courriel -- Le sujet est introuvable" text_body_template: | Nous sommes désolé, mais votre courriel à destination de {destination} (intitulé %{former_title}) n'a pas fonctionné. Le sujet est introuvable et a peut-être été supprimé. Si vous considérez que c'est une erreur, contacter un responsable. email_reject_topic_closed: + subject_template: "[%{site_name}] Erreur de courriel -- Le sujet est fermé" text_body_template: | Nous sommes désolé, mais votre courriel à destination de {destination} (intitulé %{former_title}) n'a pas fonctionné. Le sujet est fermé. Si vous considérez que c'est une erreur, contacter un responsable. email_reject_auto_generated: + subject_template: "[%{site_name}] Problème de courriel - Réponse automatique" text_body_template: | Nous sommes désolé, mais votre email à destination de {destination} (intitulé %{former_title}) n'a pas fonctionné. Votre réponse était générée automatiquement, ce que nous n'acceptons pas. Si vous considérez qu'il s'agit d'une erreur, prenez contact avec un responsable. email_error_notification: + subject_template: "[%{site_name}] Incident d'email -- Erreur d'authentification POP3" text_body_template: | Il y a eu un erreur d'authentification lors de la récupération des courriels depuis le serveur POP. @@ -1434,6 +1467,10 @@ fr: posted_by: "Ecrit par %{username} le %{post_date}" user_invited_to_private_message_pm: subject_template: "[%{site_name}] %{username} vous a invité dans la conversation '%{topic_title}'" + text_body_template: "\n%{username} vous a invité dans un message\n\n> **%{topic_title}**\n>\n> %{topic_excerpt}\n\nsur \n\n> %{site_title} -- %{site_description}\n\nVeuillez suivre ce lien pour voir le message: %{base_url}%{url}\n" + user_invited_to_topic: + subject_template: "[%{site_name}] %{username} vous a invité dans le sujet '%{topic_title}'" + text_body_template: "\n%{username} vous a invité à une conversation\n\n> **%{topic_title}**\n>\n> %{topic_excerpt}\n\nsur \n\n> %{site_title} -- %{site_description}\n\nVeuillez suivre ce lien pour voir le message: %{base_url}%{url}\n" user_replied: subject_template: "[%{site_name}] %{topic_title}" text_body_template: | @@ -1910,6 +1947,75 @@ fr:

      badges: long_descriptions: + autobiographer: | + Bla bla bla + Bla bla bla + first_like: | + Bla bla bla + Bla bla bla + first_link: | + Bla bla bla + Bla bla bla + first_quote: | + Bla bla bla + Bla bla bla + first_share: | + Bla bla bla + Bla bla bla + read_guidelines: | + Bla bla bla + Bla bla bla + reader: | + Bla bla bla + Bla bla bla + editor: | + Bla bla bla + Bla bla bla first_flag: | Les signalements sont essentiels à la santé de la communauté. Si vous remarquez des messages qui requièrent l'attention d'un modérateur, s'il vous plaît, - n'hésitez pas à les signaler. À partir du niveau de confiance 1, vous pouvez également utiliser le formulaire de signalement pour envoyer des messages aux autres utilisateurs. + n'hésitez pas à les signaler. À partir du niveau de confiance 1, vous pouvez également utiliser le formulaire de signalement pour envoyer des messages directs aux autres utilisateurs. + nice_share: | + Bla bla bla + Bla bla bla + welcome: | + Bla bla bla + Bla bla bla + anniversary: | + Bla bla bla + Bla bla bla + good_share: | + Bla bla bla + Bla bla bla + great_share: | + Bla bla bla + Bla bla bla + nice_post: | + Bla bla bla + Bla bla bla + nice_topic: | + Bla bla bla + Bla bla bla + good_post: | + Bla bla bla + Bla bla bla + good_topic: | + Bla bla bla + Bla bla bla + great_post: | + Bla bla bla + Bla bla bla + great_topic: | + Bla bla bla + Bla bla bla + basic: | + Bla bla bla + Bla bla bla + member: | + Bla bla bla + Bla bla bla + regular: | + Bla bla bla + Bla bla bla + leader: | + Bla bla bla + Bla bla bla diff --git a/config/locales/server.he.yml b/config/locales/server.he.yml index 58425fb1f3..5ebef37780 100644 --- a/config/locales/server.he.yml +++ b/config/locales/server.he.yml @@ -440,7 +440,7 @@ he: email_title: 'הנושא "%{title}" דורש תשומת לב של מנהל' email_body: "%{link}\n\n%{message}" flagging: - you_must_edit: '

      הפרסום שלך סומן על ידי הקהילה. אנא בדוק/בדקי את ההודעות שלך.

      ' + you_must_edit: '

      הפרסום שלך סומן על ידי הקהילה. אנא בדוק/בדקי את ההודעות שלך.

      ' user_must_edit: '

      פרסום זה סומן על ידי הקהילה וכרגע מוסתר באופן זמני.

      ' archetypes: regular: @@ -583,7 +583,6 @@ he: 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: Tuning Ruby and Rails for Discourse.' 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. Learn about Sidekiq here.' - 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.' enable_google_logins_warning: "זהירות! התמיכה במתודת הזיהוי הנוכחית של גוגל מסתיימת ב-20 לאפריל 2015!\nאנא החליפו למתודה החדשה עכשיו!" both_googles_warning: "שתי האפשרויות, enable_google_logins וגם enable_google_oauth2_logins מסומנים הגדרות האתר. בטלו את enable_google_logins." @@ -739,8 +738,6 @@ he: email_token_grace_period_hours: "סיסמאות שכחת סיסמא / הפעלת חשבון עדיין זמינים לזמן חסד של (n) שעות לאחר שהופקו." enable_badges: "הפעלת מערכת התגים (badges)" allow_index_in_robots_txt: "פרטו ב-robots.txt שלאתר זה מותר להיות מאונדקס על ידי מנועי חיפוש." - email_domains_blacklist: "רשימה של מתחמי דוא\"ל (email domains) בהם למשתמשים אסור לרשום חשבונות. לדוגמא: mailinator.com trashmail.net" - email_domains_whitelist: "רשימת של מתחמי דוא\"ל (email domains) שמשתמשים חייבים(!) כדי להירשם ולפתוח חשבון. אזהרה: משתמשים עם כתובות דוא\"ל אחרות מאלו המפורטות כאן לא יאושרו באתר!" forgot_password_strict: "אל תעדכנו משתמשים על קיום חשבון כאשר הם משתמשים ב\"שכחתי סיסמא\"." log_out_strict: "בהתנתקות, נתקו את כל ההפעלות של המשתמ/ת בכל המכשירים" version_checks: "שלחו פינג להאב של Discourse לעדכוני גרסה וכדי להציג מסרים אודות גרסאות בלוח התצוגה של האדמין" diff --git a/config/locales/server.it.yml b/config/locales/server.it.yml index a757a2b584..cd7395a772 100644 --- a/config/locales/server.it.yml +++ b/config/locales/server.it.yml @@ -423,7 +423,7 @@ it: email_title: 'L''argomento "%{title}" richiede l''attenzione di un moderatore' email_body: "%{link}\n\n%{message}" flagging: - you_must_edit: '

      Il tuo messaggio è stato segnalato dalla comunità. Controlla i tuoi messaggi.

      ' + you_must_edit: '

      Il tuo messaggio è stato segnalato dalla comunità. Controlla i tuoi messaggi.

      ' user_must_edit: '

      Questo messaggio è stato segnalato dalla comunità ed è stato temporaneamente nascosto.

      ' archetypes: regular: @@ -566,7 +566,6 @@ it: host_names_warning: "Il tuo file config/database.yml usa l'hostname di default: localhost. Aggiornalo con l'hostname del tuo sito." gc_warning: 'Il tuo server usa i parametri di garbage collection di default di ruby, che potrebbero non garantirti le migliori prestazioni. Leggi questo argomento sulla taratura delle prestazioni: Tuning Ruby and Rails for Discourse.' sidekiq_warning: 'Sidekiq non è in esecuzione. Molte attività, come l''invio di email, sono eseguite in maniera asincrona da sidekiq. Assicurati che almeno un processo sidekiq sia in esecuzione. Leggi altro su sidekiq qui.' - queue_size_warning: 'Il numero di job in coda è %{queue_size}, troppo alto. Potrebbe esserci un problema con i processi Sidekiq, oppure potresti dover aggiungere altri Sidekiq worker.' memory_warning: 'Il tuo server gira con meno di 1 GB di memoria. Si raccomanda almeno 1 GB di memoria.' enable_google_logins_warning: "ATTENZIONE! Il metodo di autenticazione che stai usando non verrà più supportato a partire dal 20 Aprile 2015. Cambia metodo di autenticazione ora!" both_googles_warning: "Hai entrambe le impostazioni enable_google_logins e enable_google_oauth2_logins attivate. Disabilita enable_google_logins." @@ -721,8 +720,6 @@ it: email_token_grace_period_hours: "I messaggi di password dimenticata / attivazione account sono ancora validi per un periodo di grazia di (n) ore dopo essere stati convalidati." enable_badges: "Attiva il sistema a targhette" allow_index_in_robots_txt: "Specifica nel file robots.txt che questo sito permette l'indicizzazione da parte dei motori di ricerca." - email_domains_blacklist: "Una lista di domini email con cui gli utenti non possono registrare un account. Ad esempio: mailinator.com trashmail.net" - email_domains_whitelist: "Una lista di domini email che gli utenti DEVONO usare per registrare un account. ATTENZIONE: gli utenti con un dominio email diverso da quelli elencati non saranno permessi!" forgot_password_strict: "Non informare gli utenti dell'esistenza dell'account quando richiamano la finestra per la password dimenticata." log_out_strict: "Quando si fa logout, esci da TUTTE le sessioni dell'utente su tutti i dispositivi" version_checks: "Verifica su Discourse Hub l'esistenza di aggiornamenti e mostra i messaggi per le nuove versioni nel cruscotto /admin" diff --git a/config/locales/server.ja.yml b/config/locales/server.ja.yml index 9c10e95b13..687ee43a7e 100644 --- a/config/locales/server.ja.yml +++ b/config/locales/server.ja.yml @@ -514,7 +514,6 @@ ja: host_names_warning: "現在 config/database.yml ファイルは、デフォルトの localhost をホスト名として使用しています。あなたのサイトのホスト名に更新してください。" gc_warning: '現在サーバはデフォルトの ruby ガベージコレクションパラメータを使用しており、パフォーマンスが最適化されていません。パフォーマンス・チューニングの方法についてはこちらのトピックを参考にしてください: Tuning Ruby and Rails for Discourse.' sidekiq_warning: 'Sidekiq が起動していません。メール送信等、多くのタスクが sidekiq により非同期に実行されます。少なくとも sidekiq のプロセスを1つは起動してください。Sidekiq についてはこちらを参考にしてください。' - queue_size_warning: 'キューに入っているジョブの数が多すぎます (%{queue_size})。Sidekiq プロセスに問題があるか、Sidekiq ワーカを追加する必要がある可能性があります。' memory_warning: '現在サーバが 1GB 未満の総メモリで起動しています。推奨メモリサイズは 1GB 以上です。' enable_google_logins_warning: "WARNING! Support is ending for your current method of Google authentication on April 20, 2015! Please switch to the new method now!" facebook_config_warning: 'サーバが Facebook アカウントによるサインアップ・ログイン可能な設定 (enable_facebook_logins) になっていますが、app id と app secret が設定されていません。サイトの設定 にて設定を更新してください。詳しくはこちらを参考にしてください。' @@ -657,8 +656,6 @@ ja: email_token_grace_period_hours: "パスワードリマインダ、アカウントアクティベート時のトークンを無効するときに、何時間猶予を与えるか" enable_badges: "バッジシステムを有効にする" allow_index_in_robots_txt: "サーチエンジンにインデックスを許可するようにrobots.txtを指定する" - email_domains_blacklist: "ユーザ登録を拒否するメールドメインのリスト 例: mailinator.com|trashmail.net" - email_domains_whitelist: "ユーザー登録に必要なメールドメインのリスト。警告: 指定したメールドメイン以外のユーザは許可されません！" forgot_password_strict: "パスワードリマインダダイアログで、アカウントの存在を通知しない" log_out_strict: "ログアウトした際に、そのユーザーの全デバイスのセッションをログアウトさせる" version_checks: "Discourse Hub にアップデート、新バージョンの有無を問い合わせ /admin ダッシュボードにバージョンメッセージを表示する" diff --git a/config/locales/server.ko.yml b/config/locales/server.ko.yml index 87a143b3cb..2fdaf28cec 100644 --- a/config/locales/server.ko.yml +++ b/config/locales/server.ko.yml @@ -452,7 +452,6 @@ ko: host_names_warning: "당신의 config/database.yml 파일은 기본 호스트네임을 사용하고 있습니다. 사이트의 호스트네임으로 업데이트 하세요." gc_warning: '당신의 서버는 최상의 성능을 내지 못하는 기본 ruby garbage collection parameter를 사용하고 있습니다. 성능 튜닝에 대해 읽어보세요. : Discourse를 위한 루비와 레일즈 튜닝.' sidekiq_warning: 'Sidekiq 이 현재 실행되고 있지 않습니다. Sidekiq는 이메일 전송 같은 많은 작업들을 비동기식으로 처리합니다. 적어도 하나의 sidekiq 프로세서를 실행시켜 주세요. Sidekiq 배우기.' - queue_size_warning: '큐 작업의 수가 %{queue_size} 개 입니다. 너무 많습니다. Sidekqi에 문제가 있을 수 있습니다. Sidekiq Worker를 더 추가하세요.' memory_warning: '당신의 서버는 1GB 이하 메모리로 실행되고 있습니다. 적어도 1GB 이상의 메모리를 사용하세요.' both_googles_warning: "이 사이트 세팅에서 Google OpenID 인증과 Google OAuth2 인증을 동시에 사용하기로 체크하였습니다. Google OpenID인증 설정(enable_google_logins)을 비활성화 해주세요." google_oauth2_config_warning: 'Google OAuth2 인증을 통한 로그인과 회원가입(enable_google_oauth2_logins)을 설정하였습니다. 하지만, 아직 Client ID와 Client Secret을 입력하지 않았습니다. the Site Settings and update the settings. 자세히 알아보기.' @@ -578,8 +577,6 @@ ko: email_token_grace_period_hours: "비밀번호 찾기, 계정 활성화에 사용되는 토큰은 사용되어진 이후 유효한 기간(시간)" enable_badges: "훈장 시스템 활성화" allow_index_in_robots_txt: "이 사이트가 검색엔진에 의해 인덱스되는 것을 허용합니다.(robots.txt 수정)" - email_domains_blacklist: "허용하지 않는 Email 도메인을 파이프(|)기호로 구분하여 입력. 예: mailinator.com|trashmail.net" - email_domains_whitelist: "허용하는 Email 도메인을 파이프(|)기호로 구분하여 입력. 경고: 여기에 주어진 email domain이 아닌 경우 모두 거부됩니다." new_version_emails: "사용가능한 새로운 업데이트가 있으면 등록된 contact_email 주소로 메일을 발송하여 알려줍니다." port: "Use this HTTP port rather than the default of port 80. Leave blank for none, mainly useful for development" force_hostname: "Specify a hostname in the URL. Leave blank for none, mainly useful for development" diff --git a/config/locales/server.nl.yml b/config/locales/server.nl.yml index e2cb1c4304..e3811ba4bb 100644 --- a/config/locales/server.nl.yml +++ b/config/locales/server.nl.yml @@ -554,7 +554,6 @@ nl: host_names_warning: "Het bestand config/database.yml heeft localhost als standaard hostname. Verander dat in de hostname van je site." gc_warning: 'Je server gebruikt de standaard ruby garbage collection instellingen, en daarmee krijg je niet de beste prestaties. Lees deze topic over instellingen voor prestaties: Tuning Ruby and Rails for Discourse.' sidekiq_warning: 'Sidekiq draait niet. Veel taken, zoals het versturen van e-mails, worden asynchroon uitgevoerd door sidekiq. Zorg ervoor dat er altijd een sidekiq process draait. Hier is meer informatie over sidekiq.' - queue_size_warning: 'Het aantal taken in de wachtrij (%{queue_size}_ is best hoog. Dit kan duiden op problemen met het Sidekiq proces. Of je moet meer Sidekiq workers toevoegen.' memory_warning: 'Jouw server draait met minder dan 1 GB aan geheugen. Ten minste 1 GB geheugen is aanbevolen.' facebook_config_warning: 'De server is geconfigureerd om registratie en inloggen via Facebook mogelijk te maken (enable_facebook_logins), maar er zijn geen app id en app secret waarden opgegeven. Ga naar de Instellingen en vul de waarden in. Zie deze uitleg voor meer informatie.' twitter_config_warning: 'De server is geconfigureerd om registratie en inloggen via Twitter mogelijk te maken (enable_twitter_logins), maar er zijn geen key en secret waarden opgegeven. Ga naar de Instellingen en vul de waarden in. Zie deze uitleg voor meer informatie.' diff --git a/config/locales/server.pl_PL.yml b/config/locales/server.pl_PL.yml index 83dbae6548..6ffcaba811 100644 --- a/config/locales/server.pl_PL.yml +++ b/config/locales/server.pl_PL.yml @@ -591,7 +591,6 @@ pl_PL: host_names_warning: "Twój plik config/database.yml używa domyślnej nazwy serwera localhost. Zmień go by używał nazwy serwera Twojej strony." gc_warning: 'Twój serwer wykorzystuje domyślne ustawienia odśmiecacza ruby, który nie da Ci optymalnej wydajności. Przeczytaj ten temat o optymalizacji wydajności: Tuning Ruby and Rails for Discourse.' sidekiq_warning: 'Sidekiq nie działa. Wiele zadań, takich jak wysyłanie emaili, jest wykonywane asynchronicznie przez sidekiqa. Zagwarantuj, że przynajmniej jeden proces sidekiqa działa. Dowiedz się więcej o Sidekiqu.' - queue_size_warning: 'Długość kolejki prac to %{queue_size}. To dużo. Może to oznaczać problem z Sidekiq lub konieczność zwiększenia ilości jego procesów.' memory_warning: 'Twój serwer działa z mniej niż 1 GB pamięci całkowitej. Przynajmniej 1 GB pamięci jest zalecany.' both_googles_warning: "W ustawieniach serwisu włączono zarówno enable_google_logins jak i enable_google_oauth2_logins. Wyłącz enable_google_logins." google_oauth2_config_warning: 'Serwis umożliwia rejestrację i logowanie poprzez Google OAuth2 (enable_google_oauth2_logins), ale ''client id'' oraz ''client secret'' nie są jeszcze ustawione. Przejdź do Ustawień i wprowadź te wartości. Zobacz ten przewodnik, aby dowiedzieć się więcej.' diff --git a/config/locales/server.pt.yml b/config/locales/server.pt.yml index bb88f265c1..ff02c95419 100644 --- a/config/locales/server.pt.yml +++ b/config/locales/server.pt.yml @@ -20,10 +20,49 @@ pt: is_reserved: "está reservado" purge_reason: "Automaticamente eliminado devido a abandono, conta inativada" disable_remote_images_download_reason: "O download remoto de imagens foi desativado por não haver espaço disponível no disco." + anonymous: "Anónimo" errors: + format: '%{attribute} %{message}' messages: too_long_validation: "está limitado a %{max} caracteres; inseriu %{length}." invalid_boolean: "Valor lógico inválido." + taken: "já está a ser utilizado" + accepted: tem que ser aceite + blank: não pode estar em branco + present: tem que estar em branco + confirmation: "não corresponde %{attribute}" + empty: não pode estar vazio + equal_to: tem que ser igual a %{count} + even: tem que ser par + exclusion: está reservado + greater_than: tem que ser maior que %{count} + greater_than_or_equal_to: tem que ser maior ou igual a %{count} + inclusion: não está incluído na lista + invalid: é inválido + less_than: tem que ser menos que %{count} + less_than_or_equal_to: tem que ser menos ou igual a %{count} + not_a_number: não é um número + not_an_integer: tem que ser um inteiro + odd: tem que ser ímpar + record_invalid: 'A validação falhou: %{errors}' + restrict_dependent_destroy: + one: "Não é possível eliminar o registo pois existe um %{record} dependente" + many: "Não é possível eliminar o registo pois existem %{record} dependentes" + too_long: + one: é muito comprido (o máximo é 1 caracter) + other: é muito comprido (o máximo são %{count} caracteres) + too_short: + one: é muito curto (o mínimo é 1 caracter) + other: é muito curto (o mínimo são %{count} caracteres) + wrong_length: + one: tem o comprimento errado (deve ter 1 caracter) + other: tem o comprimento errado (deve ter %{count} caracteres) + other_than: "tem que ser diferente de %{count}" + template: + body: 'Ocorreram problemas com os seguintes campos:' + header: + one: 1 erro impediu este %{model} de ser gravado + other: '%{count} erros impediram este %{model} de ser gravado' embed: load_from_remote: "Ocorreu um erro no carregamento dessa mensagem." bulk_invite: @@ -33,6 +72,8 @@ pt: backup_file_should_be_tar_gz: "O ficheiro da cópia de segurança deve ser um arquivo .tar.gz" not_enough_space_on_disk: "Não existe espaço suficiente no disco para carregar esta cópia de segurança." not_logged_in: "Necessita de ter sessão iniciada para fazer isso." + not_found: "O URL ou recurso pedido não foi encontrado." + invalid_access: "Não tem permissões para visualizar o recurso pedido." read_only_mode_enabled: "Este sítio encontra-se no modo só de leitura. As interações estão desativadas." too_many_replies: one: "Pedimos desculpa mas novos utilizadores estão temporariamente limitados a 1 resposta no mesmo tópico." @@ -72,6 +113,7 @@ pt: other: "Pedimos desculpa, utilizadores novos podem colocar apenas %{count} hiperligações nas mensagens." spamming_host: "Pedimos desculpa, não pode colocar uma hiperligação para esse servidor." user_is_suspended: "Utilizadores suspensos não têm permissão para publicar." + topic_not_found: "Algo de errado ocorreu. Talvez este tópico tenha sido fechado ou eliminado enquanto olhava para ele?" just_posted_that: "é demasiado semelhante ao que publicaste recentemente" has_already_been_used: "já foi usado" invalid_characters: "contem caracteres inválidos" @@ -79,6 +121,7 @@ pt: next_page: "próxima página →" prev_page: "← página anterior" page_num: "Página %{num}" + home_title: "Início" topics_in_category: "Tópicos na categoria '%{category}'" rss_posts_in_topic: "Feed RSS de '%{topic}'" rss_topics_in_category: "Feed RSS dos tópicos da categoria '%{category}'" @@ -86,13 +129,16 @@ pt: num_posts: "Mensagens:" num_participants: "Participantes:" read_full_topic: "Ler tópico completo" + private_message_abbrev: "Msg" rss_description: latest: "Tópicos recentes" hot: "Tópicos quentes" too_late_to_edit: "Essa mensagem foi criada há muito tempo. Já não pode ser editada ou apagada." + excerpt_image: "imagem" groups: errors: can_not_modify_automatic: "Não pode modificar um grupo automático" + member_already_exist: "'%{username}' já é membro deste grupo." default_names: everyone: "todos" admins: "administradores" @@ -119,6 +165,14 @@ pt: Para mais, [verifique as diretrizes da comunidade](/guidelines). Este painel irá aparecer apenas para o seu primeiro %{education_posts_text}. avatar: "### Que tal uma nova imagem para a sua conta? \n\nPublicou alguns tópicos e respostas, mas o seu avatar não é tão original como você o é -- é o mesmo avatar padrão que todos os novos utilizadores têm .\n\nJá considerou **[visitar o seu perfil de utilizador](%{profile_path})** e fazer o envio de uma imagem personalizada que o representa?\n\nÉ mais fácil acompanhar as discussões da comunidade e encontrar pessoas interessantes em conversas quando todas as pessoas têm um avatar exclusivo!\n" + sequential_replies: | + ### Considere responder a várias mensagens de uma única vez + + Em vez de várias respostas sequenciais a um tópico, por favor considere uma única resposta que inclua citações de mensagens anteriores ou referências a @nome. + + Pode editar a sua resposta anterior para adicionar uma citação ao destacar o texto e selecionar o botão resposta com citação que aparece. + + É mais fácil para todos ler tópicos que tenham poucas respostas em profundidade em vez de muitas mas pequenas respostas individuais. dominating_topic: |+ ### Deixe que os outros se juntem à conversa @@ -163,6 +217,8 @@ pt: attributes: password: common: "é uma das 10000 palavras-passe mais comuns. Por favor use uma palavra-passe mais segura." + same_as_username: "é a mesma que o seu nome de utilizador. Por favor utilize uma palavra-passe mais segura." + same_as_email: "é a mesma que o seu email. Por favor utilize uma palavra-passe mais segura." ip_address: signup_not_allowed: "O registo não é permitido através desta conta." color_scheme_color: @@ -343,12 +399,16 @@ pt: title: 'Spam' description: 'Esta mensagem é publicidade. Não é útil nem relevante para o tópico atual, mas apenas de natureza promocional.' long_form: 'sinalizou isto como spam' + email_title: '"%{title}" foi sinalizado como spam' + email_body: "%{link}\n\n%{message}" inappropriate: title: 'Inapropriado' description: 'Esta mensagem contém conteúdo que uma pessoa sensata iria considerar ofensivo, abusivo, ou como uma violação das diretrizes da nossa comunidade.' long_form: 'sinalizou isto como inapropriado' notify_user: + title: 'Mensagem @{{username}}' description: 'Esta mensagem contém algo sobre o qual quero falar com esta pessoa diretamente e em privado. Não representa motivo para ter alguma sinalização.' + long_form: 'utilizador com mensagens' email_title: 'A sua mensagem em "%{title}"' email_body: "%{link}\n\n%{message}" notify_moderators: @@ -385,6 +445,7 @@ pt: email_title: 'O tópico "%{title}" requer a atenção do moderador' email_body: "%{link}\n\n%{message}" flagging: + you_must_edit: '

      A sua mensagem foi sinalizada pela comunidade.Por favor consulte as suas mensagens.

      ' user_must_edit: '

      Esta mensagem foi sinalizada pela comunidade e está temporariamente oculta.

      ' archetypes: regular: @@ -411,6 +472,7 @@ pt: xaxis: "Dia" yaxis: "Número de visitas" signups: + title: "Novos Utilizadores" xaxis: "Dia" yaxis: "Número de novos utilizadores" topics: @@ -448,18 +510,23 @@ pt: user_to_user_private_messages: title: "Utilizador-a-Utilizador" xaxis: "Dia" + yaxis: "Número de mensagens" system_private_messages: title: "Sistema" xaxis: "Dia" + yaxis: "Número de mensagens" moderator_warning_private_messages: title: "Alerta ao Moderador" xaxis: "Dia" + yaxis: "Número de mensagens" notify_moderators_private_messages: title: "Notificação aos Moderadores" xaxis: "Dia" + yaxis: "Número de mensagens" notify_user_private_messages: title: "Notificar o Uilizador" xaxis: "Dia" + yaxis: "Número de mensagens" top_referrers: title: "As Melhores Referências" xaxis: "Utilizador" @@ -475,14 +542,54 @@ pt: title: "Os Melhores Tópicos Referenciados" xaxis: "Tópico" num_clicks: "Cliques" + page_view_anon_reqs: + title: "Anónimo" + xaxis: "Dia" + yaxis: "Pedidos de API Anónimos" + page_view_logged_in_reqs: + title: "Com Sessão Iniciada" + xaxis: "Dia" + yaxis: "Pedidos API de Sessão Iniciada" + page_view_crawler_reqs: + title: "Rastreador Web" + xaxis: "Dia" + yaxis: "Pedidos API de Rastreadores Web" + page_view_total_reqs: + title: "Total" + xaxis: "Dia" + yaxis: "Total de Pedidos API" + http_background_reqs: + title: "Fundo" + xaxis: "Dia" + yaxis: "Pedidos usados para atualização e acompanhamento ao vivo" + http_2xx_reqs: + title: "Status 2xx (OK)" + xaxis: "Dia" + yaxis: "Pedidos bem-sucedidos (Status 2xx)" + http_3xx_reqs: + title: "HTTP 3xx (Redirecionar)" + xaxis: "Dia" + yaxis: "Pedidos de Redirecionamento (Status 3xx)" + http_4xx_reqs: + title: "HTTP 4xx (Erro do Cliente)" + xaxis: "Dia" + yaxis: "Erros de Cliente (Status 4xx)" + http_5xx_reqs: + title: "HTTP 5xx (Erro de Servidor)" + xaxis: "Dia" + yaxis: "Erros de Servidor (Estado 5xx)" + http_total_reqs: + title: "Total" + xaxis: "Dia" + yaxis: "Total de pedidos" dashboard: rails_env_warning: "O seu servidor está a executar em modo %{env}." ruby_version_warning: "Está a utilizar uma versão do Ruby 2.0.0 que é conhecida por ter alguns problemas. Por favor atualize para o nível 247 ou posterior." host_names_warning: "O ficheiro config/database.yml está a utilizar o nome do servidor local por defeito. Modifique para usar o nome do servidor do seu sítio." gc_warning: 'O seu servidor está a utilizar a recolha de lixo do ruby com os parâmetros por defeito, os quais não irão propocionar a melhor performance. Leia este tópico sobre ajuste de performance: Afinar Ruby and Rails para o Discourse.' sidekiq_warning: 'Sidekiq não está em execução. Muitas tarefas, como envio de emails, são executadas de forma assíncrona pelo sidekiq. Por favor certifique-se de que pelo menos um processo sidekiq está em execução. Aprenda sobre Sidekiq aqui.' - queue_size_warning: 'O número de tarefas agendadas é %{queue_size}, o que é alto. Isto pode indicar um problema com o(s) processo(s) Sidekiq, ou pode estar a precisar de mais "Sidekiq workers".' memory_warning: 'O seu servidor está a executar com menos de 1 GB de memória total. Pelo menos 1 GB é a quantidade de memória recomendada.' + enable_google_logins_warning: "AVISO! O suporte para o seu método atual de autenticação Google irá terminar a 20 de Abril de 2015! Por favor mude para um novo método já!" both_googles_warning: "Tanto enable_google_logins e enable_google_oauth2_logins estão assinalados nas configurações do sítio. Desative enable_google_logins." google_oauth2_config_warning: 'O servidor está configurado para permitir inscrever-se e entrar com o Google OAuth2 (enable_google_oauth2_logins), mas o id e os valores privados do cliente não estão configurados. Vá às Configurações do Sítio e atualize as definições. Veja este guia para saber mais.' facebook_config_warning: 'O servidor está configurado para permitir inscrever-se e entrar com o Facebook (enable_facebook_logins), mas o id e os valores privados da aplicação não estão configurados. Vá às Configurações do Sítio e atualize as definições. Veja este guia para saber mais.' @@ -492,7 +599,15 @@ pt: s3_backup_config_warning: 'O servidor está configurado para carregar cópias de segurança para s3, mas pelo menos uma das seguintes configurações não está definida: s3_access_key_id, s3_secret_access_key ou s3_backup_bucket. Vá às Configurações do Sítio e atualize as definições. Veja "How to set up image uploads to S3?" para saber mais.' image_magick_warning: 'O servidor está configurado para criar miniaturas de imagens grandes, mas o ImageMagick não está instalado. Instale o ImageMagick usando o seu gestor de pacotes preferido ou aceda a para descarregar a última versão.' failing_emails_warning: 'Há %{num_failed_jobs} tarefas de envio de emails que falharam. Verifique o ficheiro config/discourse.conf e assegure-se que as configurações do servidor de email estão corretas. Veja as tarefas que falharam no Sidekiq.' + default_logo_warning: "Defina os logótipos gráficos do seu sítio. Atualize logo_url, logo_small_url, e favicon_url nas Configurações do Sítio." + contact_email_missing: "Introduza um endereço de email de contacto para que possa ser alcançado para assuntos urgentes relativamente ao seu sítio. Atualize-o nas Configurações do Sítio." + contact_email_invalid: "O email de contacto do sítio é inválido. Atualize-o nas Configurações do Sítio." + title_nag: "Introduza o nome do seu sítio. Atualize o título nas Configurações do Sítio." + site_description_missing: "Introduza uma descrição de uma frase do seu sítio que irá aparecer nos resultados da pesquisa. Atualize a descrição_sítio nas Configurações do Sítio." consumer_email_warning: "O seu sítio está configurado para usar Gmail (ou outro serviço de email)O Gmail limita a quantidade de emails que pode enviar. Considere usar um serviço de envio de emails como mandrill.com para assegurar a entregabilidade dos emails enviados." + site_contact_username_warning: "Introduza o nome de uma conta de utilizador de um membro do pessoal de onde possam ser enviadas mensagens importantes automatizadas. Atualize sítio_contato_nomedeutilizador nas Configurações do Sítio." + notification_email_warning: "Não estão a ser enviados emails de notificação a partir de um endereço de email válido no seu domínio; a entrega do email será errática e não fiável. Por favor configure notificaçao_email para um endereço de email local válido nas Configurações do Sítio." + s3_deprecation_warning: "AVISO! O Amazon S3 irá tornar-se obsoleto brevemente para armazenamento de imagens/anexos. Por favor, siga as instruções para migrar para armazenamento local." content_types: education_new_reply: title: "Educação do Novo Utilizador: Primeiras Respostas" @@ -505,8 +620,10 @@ pt: description: "Orientação e informação essencial para novos utilizadores." welcome_user: title: "Bem-vindo: Novo Utilizador" + description: "Uma mensagem enviada automaticamente para todos os novos utilizadores quando estes se inscrevem." welcome_invite: title: "Bem-vindo: Utilizador Convidado" + description: "Uma mensagem enviada automaticamente para todos os novos utilizadores assim que aceitam o convite de outro utilizador para participar." login_required_welcome_message: title: "Início de Sessão Obrigatório: Mensagem de Boas-vindas" description: "Mensagem de boas-vindas exibida a utilizadores que não têm sessão iniciada quando a configuração 'início de sessão obrigatório' está ativa." @@ -528,15 +645,22 @@ pt: default_locale: "Idioma padrão para esta instância do Discourse (ISO 639-1 Code)" allow_user_locale: "Permitir aos utilizadores escolherem a sua própria língua preferencial para a interface." min_post_length: "Tamanho mínimo permitido por mensagem, em caracteres" + min_first_post_length: "Tamanho mínimo permitido para a primeira mensagem (corpo do tópico), em caracteres" + min_private_message_post_length: "Tamanho mínimo permitido para mensagens, em caracteres" max_post_length: "Tamanho máximo permitido por mensagem, em caracteres" min_topic_title_length: "Tamanho mínimo permitido por título de cada tópico, em caracteres" max_topic_title_length: "Tamanho máximo permitido por título de cada tópico, em caracteres" + min_private_message_title_length: "Tamanho mínimo permitido por título nas mensagens, em caracteres" min_search_term_length: "Tamanho mínimo válido para termos de pesquisa, em caracteres" allow_uncategorized_topics: "Permitir a criação de tópicos sem categoria." uncategorized_description: "Descrição da categoria sem classificação. Deixar em branco para nenhuma descrição." allow_duplicate_topic_titles: "Permitir tópicos com títulos idênticos e duplicados." unique_posts_mins: "Quantos minutos antes que um utilizador possa criar uma mensagem com o mesmo conteúdo outra vez?" educate_until_posts: "Quando um utilizador começar a escrever as primeiras (n) novas mensagens, mostrar o painel pop-up de educação do novo utilizador no editor." + title: "O nome deste sítio, tal como usado na etiqueta do título." + site_description: "Descrever este sítio em uma frase, tal como usado na etiqueta de descrição meta." + contact_email: "Endereço de email do principal contato para este sítio. Usado para notificações críticas tais como sinalizações não tratadas, assim como no formulário de contato /sobre para assuntos urgentes." + contact_url: "URL de Contato para este sítio. Utilizado no formulário de contato /sobre para assuntos urgentes." queue_jobs: "PROGRAMADORES APENAS! AVISO! Por defeito, fila de trabalhos no sidekiq. Se não estiver ativa, o seu sítio irá ficar corrompido." crawl_images: "Recuperar imagens de URLs remotos para inserir o comprimento e largura corretos." download_remote_images_to_local: "Converter imagens remotas em imagens locais ao descarregá-las; isto previne imagens corrompidas." @@ -556,8 +680,11 @@ pt: post_excerpt_maxlength: "Tamanho máximo do excerto/sumário de uma mensagem." post_onebox_maxlength: "Tamanho máximo de uma mensagem Discourse de caixa única, em caracteres." onebox_domains_whitelist: "Lista de domínios que permitem colocar em caixa única; estes domínios devem suportar OpenGraph ou oEmbed. Teste-os em http://iframely.com/debug" + logo_url: "A imagem do logótipo no canto superior esquerdo do seu sítio; quando deixado em branco, o texto do título do sítio será exibido." digest_logo_url: "Logótipo alternativo usado no topo do resumo de email do seu sítio. Se for deixado em branco `logo_url` será usado. ex: http://exemplo.com/logo.png" + logo_small_url: "A pequena imagem do logótipo no canto superior esquerdo, visível quando arrastado para baixo. Quando deixado em branco, um glifo do início será exibido." favicon_url: "Um favicon para o seu sítio, veja http://en.wikipedia.org/wiki/Favicon" + mobile_logo_url: "A imagem do logótipo com posição fixa usada no canto superior esquerdo do seu sítio móvel. Quando deixado em branco, `logo_url` será usado." apple_touch_icon_url: "Ícone usado para dispositivos Apple. Tamanho recomendado é 144px por 144px." notification_email: "Para: endereço de email usado ao enviar emails essenciais do sistema. O domínio especificado aqui deverá ter SPF, DKIM e registos PTR inversos configurados corretamente para a chegada do email." email_custom_headers: "A lista delimitada por barras verticais de cabeçalhos de e-mail personalizados" @@ -568,6 +695,7 @@ pt: summary_likes_required: "Número mínimo de gostos num tópico antes que 'Resumir Este Tópico' seja ativo." summary_percent_filter: "Quando um utilizador clica em 'Resumir Este Tópico', mostrar as melhores % de mensagens" summary_max_results: "Número máximo de mensagens devolvidas por 'Resumo deste Tópico'" + enable_private_messages: "Permitir que utilizadores de nível de confiança 1 possam criar e responder a mensagens" enable_long_polling: "O sistema de mensagens usado para notificações pode fazer solicitações longas" long_polling_base_url: "URL base usada para solicitação ao servidor (quando um CDN serve conteúdo dinâmico, certifique-se de configurá-lo para a 'pull' original) ex: http://origem.sítio.com" long_polling_interval: "Quantidade de tempo que um servidor deve esperar antes de notificar os clientes quando não há dados para serem enviados (apenas utilizadores ligados)" @@ -580,6 +708,9 @@ pt: cooldown_minutes_after_hiding_posts: "Número de minutos que o utilizador deve esperar antes de poder editar uma mensagem oculta devido a sinalizações por parte da comunidade" max_topics_in_first_day: "O número máximo de tópicos que é o utilizador pode criar no seu primeiro dia no Fórum." max_replies_in_first_day: "Número máximo de mensagens que um utilizador pode criar no seu primeiro dia no Fórum." + tl2_additional_likes_per_day_multiplier: "Aumentar limite de gostos por dia para nc2 (membro) ao multiplicar por este número" + tl3_additional_likes_per_day_multiplier: "Aumentar limite de gostos por dia para nc3 (habitual) ao multiplicar por este número" + tl4_additional_likes_per_day_multiplier: "Aumentar limite de gostos por dia para nc4 (líder) ao multiplicar por este número" num_flags_to_block_new_user: "Se uma mensagem de um novo utilizador receber esta quantidade de sinalizações da parte de num_users_to_block_new_user diferentes utilizadores, esconder todas as suas mensagens e prevenir mensagens futuras. 0 para desativar." num_users_to_block_new_user: "Se uma mensagem de um novo utilizador receber num_flags_to_block_new_user sinalizações de spam deste número de diferentes utilizadores, esconder todas as suas mensagens e prevenir mensagens futuras. 0 para desativar." notify_mods_when_user_blocked: "Se um utilizador for bloqueado de forma automática, enviar uma mensagem a todos os moderadores." @@ -595,10 +726,13 @@ pt: enable_noscript_support: "Ativar o suporte básico para pesquisas em motores de pesquisa através da etiqueta noscript" allow_moderators_to_create_categories: "Permitir que os moderadores criem novas categorias" cors_origins: "Permitidos compartilhamentos de recursos de origem-cruzada (CORS). Cada origem deve incluir http:// ou https://. A variável de ambiente DISCOURSE_ENABLE_CORS tem que estar configurada a verdadeiro para ativar o CORS." + top_menu: "Determinar que elementos aparecem na navegação da página principal, e em que ordem. Exemplo últimos|novos|não lidos|categorias|topo|lidos|publicados|marcadores" post_menu: "Determine que itens irão aparecer no menu de mensagens, e em que ordem. Exemplo\ngostar|editar|sinalizar|eliminar|partilhar|marcar|responder" post_menu_hidden_items: "Os elementos do menu a serem escondidos por defeito no menu de mensagens a não ser que se clique na elipse de expansão." share_links: "Determinar que elementos aparecem no diálogo de partilha, e em que ordem." track_external_right_clicks: "Acompanhar cliques externos que são clicados com o botão direito (ex: abrir num novo separador) desativado por padrão pois este reescreve URLs" + site_contact_username: "Um nome de utilizador válido de um membro do pessoal de onde enviar todas as mensagens automatizadas. Quando deixado em branco, a conta padrão do Sistema será usada." + send_welcome_message: "Enviar a todos os novos utilizadores uma mensagem de boas-vindas com um guia de início rápido." suppress_reply_directly_below: "Não mostrar a contagem de respostas expansível quando há apenas uma única resposta diretamente abaixo desta publicação." suppress_reply_directly_above: "Não mostrar em-resposta-a expansível quando há apenas uma única resposta diretamente acima desta publicação." suppress_reply_when_quoting: "Não mostraR em-resposta-a expansível numa mensagem quando esta cita uma resposta." @@ -612,9 +746,10 @@ pt: email_token_grace_period_hours: "Os símbolos para palavra-passe esquecida /conta ativada são válidos por um período de carência de (n) horas após serem recuperados" enable_badges: "Ativar o sistema de distintivos" allow_index_in_robots_txt: "Especificar em robots.txt que este sítio permite ser indexado pelos motores de pesquisa." - email_domains_blacklist: "Lista de domínios de email que os utilizadores não podem usar para registo de contas. Exemplo: mailinator.com trashmail.net" + email_domains_blacklist: "Lista de domínios de email que os utilizadores não podem usar para registo de contas. Exemplo: mailinator.com|trashmail.net" email_domains_whitelist: "Lista de domínios de email que os utilizadores DEVEM usar para registar contas. AVISO: Utilizadores com domínios de email diferentes dos listados não serão permitidos!" forgot_password_strict: "Não informar os utilizadores da existência da conta quando estes utilizam o diálogo de password esquecida." + log_out_strict: "Ao terminar sessão, saia de TODAS as sessões do utilizador em todos dispositivos" version_checks: "Fazer o ping do Discourse Hub para atualização de versões e mostrar mensagens sobre novas versões no painel /admin" new_version_emails: "Enviar um email para o endereço contact_email quando uma nova versão do Discourse estiver disponível." port: "PROGRAMADOR APENAS! AVISO! Utilize esta porta HTTP em vez da porta 80. Deixar em branco para usar a porta padrão 80." @@ -627,9 +762,13 @@ pt: max_username_length: "Tamanho máximo do nome de utilizador, em caracteres. AVISO: QUAISQUER UTILIZADORES COM NOMES MAIORES QUE ISTO SERÃO PROIBIDOS DE ACEDER AO SÍTIO." min_password_length: "Tamanho mínimo da palavra-passe." block_common_passwords: "Não permitir palavras-passe que estejam nas 10,000 palavras-passe mais comuns." + enable_sso: "Ativar inscrição única através de um sítio externo (AVISO: pode impedir alguém de iniciar sessão, INCLUINDO A SUA, se não estiver configurada apropriadamente quando ativa! Também desativa convites)" + enable_sso_provider: "Implementar o protocolo do provedor SSO do Discourse no caminho /session/sso_provider, requer que sso_secret seja configurado" sso_url: "URL da inscrição única" + sso_secret: "String secreta usada para autenticar criptograficamente informação SSO, garanta que tem 10 ou mais caracteres" sso_overrides_email: "Substitui o email local por um email externo de um SSO (AVISO: discrepâncias podem ocorrer devido a normalização de emails locais)" sso_overrides_username: "Substitui nomes de utilizador locais por nomes de utilizadores externos de um SSO (AVISO: discrepâncias podem ocorrer diferenças no nome de utilizador length/requirements)" + sso_overrides_name: "Substitui o nome local por um nome externo de um SSO" sso_overrides_avatar: "Substitui o avatar do utilizador com avatares externos de um SSO. Se ativo, é altamente recomendada a desativação de allow_uploaded_avatars" enable_local_logins: "Ativar contas com nome de utilizador e senha de forma local (Nota: isto tem que estar ativo para que os convites funcionem)" allow_new_registrations: "Permitir registo de novos utilizadores. Desmarcar isto para prevenir que alguém crie uma nova conta." @@ -664,6 +803,8 @@ pt: max_bookmarks_per_day: "Número máximo de marcadores por utilizador por dia." max_edits_per_day: "Número máximo de edições por utilizador por dia." max_topics_per_day: "Número máximo de tópicos que um utilizador pode criar por dia." + max_private_messages_per_day: "Número máximo de mensagens que os utilizadores podem criar por dia." + max_invites_per_day: "Número máximo de convites que um utilizador pode enviar por dia." suggested_topics: "Número de tópicos sugeridos mostrados no final de um tópico." limit_suggested_to_category: "Apenas mostrar tópicos da categoria atual nos tópicos sugeridos." clean_up_uploads: "Remover carregamentos orfãos não referenciados para prevenir alojamento ilegal. AVISO: poderá querer criar uma cópia de segurança da diretoria /uploads antes de ativar esta configuração." @@ -712,12 +853,14 @@ pt: email_time_window_mins: "Esperar (n) minutos antes de enviar quaisquer emails de notificação, para dar aos utilizadores a hipótese de editarem e finalizarem as suas mensagens." email_posts_context: "Quantas respostas prévias a serem incluídas como contexto em emails de notificação." flush_timings_secs: "Com que frequência o servidor é alimentado com dados de sincronização, em segundos." + title_max_word_length: "Tamanho máximo permitido de comprimento de palavras, em caracteres, no título de um tópico." title_min_entropy: "Entropia mínima (caracteres únicos, contagem não-inglesa para mais) necessária para o título de um tópico." body_min_entropy: "Entropia mínima (caracteres únicos, contagem não-inglesa para mais) necessária para o corpo de uma mensagem." title_fancy_entities: "Converter caracteres ASCII comuns em entidades HTML nos títulos dos tópicos, ala SmartyPants http://daringfireball.net/projects/smartypants/" min_title_similar_length: "Tamanho mínimo do título antes de ser verificado por tópicos semelhantes." min_body_similar_length: "Tamanho mínimo do corpo de uma mensagem antes de ser verificado por tópicos semelhantes." category_colors: "Lista de valores hexadecimais das cores permitidas nas categorias." + category_style: "Estilo visível para distintivos de categorias." max_image_size_kb: "Tamanho máximo da imagem carregada em kB. Este deverá ser configurado em nginx (client_max_body_size) / apache ou também proxy." max_attachment_size_kb: "Tamanho máximo dos anexos carregados em kB. Este deverá ser configurado em nginx (client_max_body_size) / apache ou também proxy." authorized_extensions: "Lista de extensões permitidas para carregamento (utilizar '*' para ativar todos os tipos de ficheiros)" @@ -741,6 +884,7 @@ pt: newuser_spam_host_threshold: "Quantas vezes um novo utilizador pode publicar uma hiperligação no mesmo servidor dentro das suas mensagens `newuser_spam_host_posts` antes de ser considerada como spam." white_listed_spam_host_domains: "Lista de domínios excluídos dos testes de spam. Novos utilizadores nunca irão ser restritos da criação de mensagens com hiperligações a esses domínios." staff_like_weight: "Quanto é o fator de ponderação extra a dar aos gostos provenientes do pessoal." + topic_view_duration_hours: "Contar uma nova visualização do tópico uma vez por IP/Utilizador a cada N horas" levenshtein_distance_spammer_emails: "Ao fazer a correspondência de e-mails de spam, o número de caracteres de diferença que ainda permitirá uma correspondência difusa." max_new_accounts_per_registration_ip: "Se já há (n) contas com nível de confiança 0 a partir deste IP (e nenhum é um membro do pessoal ou em nível de confiança 2 ou superior), parar de aceitar novos registos a partir desse IP." min_ban_entries_for_roll_up: "Ao clicar no botão Agrupar, irá criar uma nova entrada de sub-rede banida se houver pelo menos (N) entradas." @@ -748,6 +892,7 @@ pt: max_age_unmatched_ips: "Eliminar entradas IP não encontradas após (N) dias." num_flaggers_to_close_topic: "Número mínimo de sinalizações únicas que são necessárias para automaticamente pausar um tópico para intervenção." num_flags_to_close_topic: "Número mínimo de sinalizações ativas que são necessárias para automaticamente pausar um tópico para intervenção." + auto_respond_to_flag_actions: "Ativar respostas automáticas ao eliminar uma bandeira." reply_by_email_enabled: "Ativar respostas aos tópicos por email." reply_by_email_address: "Modelo para endereços emails recebidos com função resposta por email, por exemplo: %{reply_key}@resposta.exemplo.com ou resposta+%{reply_key}@exemplo.com" disable_emails: "Impedir que Discourse envie qualquer tipo de emails" @@ -774,13 +919,22 @@ pt: allow_uploaded_avatars: "Permitir que utilizadores carreguem avatars personalizados." allow_animated_avatars: "Permitir que os utilizadores usem avatars com imagens animadas gifs. AVISO: executar a tarefa avatars:atualizar após mudança de configuração." allow_animated_thumbnails: "Gera miniaturas de imagens ou gifs animados." + default_avatars: "URLs para avatars que serão usados por defeito para novos utilizadores até que estes o mudem." automatically_download_gravatars: "Descarregar Gravatars para os utilizadores após criação de conta ou mudança de email." digest_topics: "Número máximo de tópicos a serem apresentados no resumo do email." digest_min_excerpt_length: "Tamanho mínimo do excerto da mensagem no resumo do email, em caracteres." default_digest_email_frequency: "Por defeito, quantas vezes os utilizadores recebem emails de resumo. Os utilizadores podem alterar esta configuração nas suas preferências." + suppress_digest_email_after_days: "Suprimir emails de resumos para utilizadores não vistos no sítio por mais de (n) dias." + disable_digest_emails: "Desativar os emails de resumo para todos os utilizadores." default_external_links_in_new_tab: "Abrir hiperligações externas num novo separador. Os utilizadores podem alterar isto nas suas preferências." detect_custom_avatars: "Se deve ou não haver uma verificação de que os utilizadores carregaram avatars personalizados." max_daily_gravatar_crawls: "Número máximo de vezes que o Discourse irá verificar o Gravatar para avatars personalizados, por dia" + public_user_custom_fields: "Lista de campos personalizados para um utilizador e que podem ser exibidos publicamente." + staff_user_custom_fields: "Lista de campos personalizados para um utilizador e que podem ser exibidos ao pessoal." + enable_user_directory: "Forneça uma diretoria de utilizadores para navegação" + allow_anonymous_posting: "Permitir que os utilizadores alterem para o modo anónimo" + anonymous_posting_min_trust_level: "Nível de confiança mínimo necessário para ativar publicações anónimas" + anonymous_account_duration_minutes: "Para proteger o anonimato crie uma nova conta anónima a cada N minutos para cada utilizador. Exemplo: se configurado para 600, assim que passarem 600 minutos desde a última mensagem E o utilizador altere para anónimo, uma nova conta anónima é criada." allow_profile_backgrounds: "Permitir que os utilizadores carreguem fundos de perfil." sequential_replies_threshold: "Número de mensagens que um utilizador tem que fazer em linha num tópico antes de ser relembrado acerca de demasiadas respostas sequenciais." enable_mobile_theme: "Os dispositivos móveis usam um tema mobile-friendly, com a possibilidade de mudar para o sítio completo. Desative isto se quer usar um estilo personalizado que é totalmente responsivo." @@ -788,12 +942,16 @@ pt: suppress_uncategorized_badge: "Não mostrar distintivos para tópicos sem categoria nas listagens de tópicos." global_notice: "Exibir um banner global URGENTE, EMERGÊNCIA a todos os visitantes, mudar para branco para esconder (HTML permitido)." disable_edit_notifications: "Desativa notificações de edição do sistema quando 'download_remote_images_to_local' está ativo." + full_name_required: "O nome completo é um campo obrigatório no perfil de utilizador." + enable_names: "Mostrar o nome completo do utilizador no seu perfil, cartão de utilizador, e emails. Desativar para esconder o nome completo em todos os locais." display_name_on_posts: "Mostrar o nome completo de um utilizador nas suas mensagens em adição ao seu @nome-de-utilizador." invites_per_page: "Convites por defeito exibidos na página do utilizador." short_progress_text_threshold: "Após o número de mensagens num tópico passar acima deste número, a barra de progresso irá apenas mostrar o número da mensagem atual. Se alterar a largura da barra de progresso, poderá ter que mudar este valor." default_code_lang: "Linguagem de programação por defeito a aplicar no destaque da sintaxe em blocos de código GitHub (lang-auto, ruby, python, etc.)" warn_reviving_old_topic_age: "Quando alguém começa a responder a um tópico em que a última resposta é mais antiga que estes dias, um aviso será exibido. Desativar ao configurar para 0." autohighlight_all_code: "Forçar o destaque do código a todos os blocos de código pré-formatados mesmo quando não se especifica a linguagem." + highlighted_languages: "Incluídas regras de destaque da sintaxe (Aviso: incluir demasiadas linguagens pode impactar o desempenho) ver: https://highlightjs.org/static/demo/ para uma demonstração" + embeddable_host: "Servidor que pode incorporar os comentários deste fórum Discourse. Apenas o nome do servidor, não começar com http://" feed_polling_enabled: "INCORPORAR APENAS: incorporar feeds RSS/ATOM como mensagens." feed_polling_url: "INCORPORAR APENAS: URL dos feeds de RSS/ATOM para embutir." embed_by_username: "Nome de utilizador Discourse do utilizador que cria tópicos embebidos." @@ -810,6 +968,9 @@ pt: prevent_anons_from_downloading_files: "Previna que utilizadores anónimos descarreguem anexos. AVISO: isto irá fazer com que quaisquer atributos (que não sejam imagens) publicados como anexos não funcionem." enable_emoji: "Ativar emoji" emoji_set: "Como gostaria de ter o seu emoji?" + enforce_square_emoji: "Forçar uma relação de aspecto quadrado para todos os emojis." + approve_post_count: "A quantidade de mensagens de um novo utilizador que devem ser aprovadas" + approve_unless_trust_level: "Mensagens para utilizadores abaixo deste nível de confiança devem ser aprovados" errors: invalid_email: "Endereço de email inválido." invalid_username: "Não existe nenhum utilizador com esse nome de utilizador." @@ -818,10 +979,12 @@ pt: invalid_integer_max: "O valor não pode ser superior a %{max}." invalid_integer: "O valor deve ser um inteiro." regex_mismatch: "O valor não coincide com o formato exigido." + must_include_latest: "O menu do topo deve incluir o separador 'último'" invalid_string: "Valor inválido." invalid_string_min_max: "Deve ser entre %{min} e %{max} caracteres." invalid_string_min: "Deve ser pelo menos %{min} caracteres." invalid_string_max: "Não deve ser mais que %{max} caracteres." + invalid_reply_by_email_address: "O valor deve conter '%{reply_key}' e ser diferente do email de notificação." notification_types: mentioned: "%{display_username} mencionou-o em %{link}" liked: "%{display_username} gostou da sua mensagem %{link}" @@ -830,6 +993,9 @@ pt: edited: "%{display_username} editou a sua mensagem em %{link}" posted: "%{display_username} publicou em %{link}" moved_post: "%{display_username} moveu a sua mensagem para %{link}" + private_message: "%{display_username} enviou-lhe uma mensagem: %{link}" + invited_to_private_message: "%{display_username} convidou-o para uma mensagem: %{link}" + invited_to_topic: "%{display_username} convidou-o para um tópico: %{link}" invitee_accepted: "%{display_username} aceitou o seu convite" linked: "%{display_username} hiperligou-o em %{link}" granted_badge: "Ganhou %{link}" @@ -902,11 +1068,14 @@ pt: active: "A sua conta está ativa e pronta para ser utilizada." activate_email: "

      Está quase no final! Enviámos um email de ativação para %{email}. Por favor siga as instruções no email para ativar a sua conta.

      Se não receber o email, verifique a sua pasta de spam, ou tente autenticar-se novamente para enviar outro email de ativação.

      " not_activated: "Ainda não pode iniciar sessão. Enviámos um email de ativação para si. Por favor siga as instruções no email para ativar a sua conta." + not_allowed_from_ip_address: "Não pode iniciar sessão como %{username} a partir desse endereço IP." + admin_not_allowed_from_ip_address: "Não pode iniciar sessão como administrador a partir desse endereço IP." suspended: "Não pode iniciar sessão até %{date}." suspended_with_reason: "Não pode iniciar sessão até %{date}. Motivo da sua suspensão: %{reason}" errors: "%{errors}" not_available: "Não disponível. Tente %{suggestion}?" something_already_taken: "Algo de errado ocorreu, talvez o nome de utilizador ou o email já estejam registados. Tente a hiperligação Esqueci a minha palavra-passe." + omniauth_error: "Pedimos desculpa, ocorreu um erro ao autorizar a sua conta. Talvez não tenha aprovado a sua autorização?" omniauth_error_unknown: "Algo ocorreu ao processar o seu início de sessão, por favor tente novamente." new_registrations_disabled: "Neste momento não é permitido novo registo de contas." password_too_long: "As palavras-passe estão limitadas a 200 caracteres." @@ -967,6 +1136,8 @@ pt: %{base_url}/users/password-reset/%{email_token} test_mailer: subject_template: "[%{site_name}] Teste de entrega de email" + text_body_template: "Este é um email de teste de\n\n[**%{base_url}**][0]\n\nA entrega do email é complicada. Aqui estão alguns pontos importantes a verificar primeiro:\n\n - *Certifique-se* que configurou o `email de notificação` de: endereço correto nas configurações do seu sítio. **O domínio especificado no endereço “de” nos emails que envia é o domínio que será validado**. \n\n- Conhecer como observar o código fonte dos emails no seu email cliente, de modo a que possa examinar cabeçalhos de email à procura de pistas importantes. No Gmail, é a opção “mostrar original” no menu drop down no canto superior direito de cada email.\n\n- **IMPORTANTE:** O seu ISP tem um registo de DNS inverso inserido para associar os nomes de domínio aos endereços IP de onde envia o seu email? [Teste o seu registo de PTR Inverso][2] aqui. Se o seu ISP não inserir o DNS inverso apropriado, é muito improvável que qualquer um dos seus emails seja entregue.\n\n- Estará o seu domínio [registo SPF][8] correto? [Teste o seu registo SPF][1] aqui. Note que TXT é o tipo de registo oficial para SPF. \n\n- Estará o seu domínio [registo DKIM][3] correto? Isto irá melhorar significativamente a entrega de emails. [Teste o seu registo DKIM][7] aqui.\n\n- Se correr o seu próprio servidor de email, certifique-se que os IPs do seu servidor de email não [estão em nenhuma lista negra de email] [4]. Verifique também que é enviado um nome de servidor qualificado que resolve\ + \ o DNS na sua mensagem HELO. Se não for, isto irá fazer com que o seu email seja rejeitado por muitos serviços de email.\n\n(A maneira *fácil* é criar uma conta gratuita em [Mandrill][md] ou [Mailgun][mg] ou [Mailjet][mj], que tem vários planos de email gratuitos e será bom para pequenas comunidades. Irá precisar na mesma de configurar os registos SPF e o DKIM no seu DNS!) \n\nEsperamos que tenha recebido este teste de entrega de email sem problemas! \n\nBoa sorte, \n\nOs seus amigos em [Discourse](http://www.discourse.org)\n\n[0]: %{base_url}\n[1]: http://www.kitterman.com/spf/validate.html\n[2]: http://mxtoolbox.com/ReverseLookup.aspx\n[3]: http://www.dkim.org/\n[4]: http://whatismyipaddress.com/blacklist-check\n[7]: http://dkimcore.org/tools/dkimrecordcheck.html\n[8]: http://www.openspf.org/SPF_Record_Syntax\n[md]: http://mandrill.com\n[mg]: http://www.mailgun.com/\n[mj]: https://www.mailjet.com/pricing\n" new_version_mailer: subject_template: "[%{site_name}] Nova versão Discourse, atualização disponível" text_body_template: | @@ -1011,6 +1182,11 @@ pt: subject_template: one: "1 sinalização à espera de ser tratada" other: "%{count} sinalizações à espera de serem tratadas" + flag_reasons: + off_topic: "A sua mensagem foi marcada como **fora do contexto**: a comunidade sente que não se enquadra neste tópico, conforme o seu título e a sua primeira mensagem." + inappropriate: "A sua mensagem foi sinalizada como **inapropriada**: a comunidade sente que é ofensiva, abusiva ou que é uma violação das nossas [diretrizes da comunidade](/guidelines)." + spam: "A sua mensagem foi marcada como **spam**: a comunidade sente que é um anúncio, algo que é excecionalmente promocional na sua natureza em vez de ser útil ou relevante para o tópico tal como seria esperado." + notify_moderators: "A sua mensagem foi marcada **para atenção do moderador**: a comunidade sente que algo na sua mensagem requer intervenção manual de um membro do pessoal." flags_dispositions: agreed: "Obrigado por nos informar. Concordamos que existe um problema e estamos a analisá-lo." agreed_and_deleted: "Obrigado por nos informar. Concordamos que existe um problema e removemos a mensagem." @@ -1035,10 +1211,44 @@ pt: Contudo, se a mensagem for escondida pela comunidade uma segunda vez, irá manter-se escondida até ser tratada pelo pessoal – e poderão ainda ocorrer ações, incluindo uma possível suspensão da sua conta. Para orientação adicional, por favor consulte as [diretrizes da comunidade](%{base_url}/guidelines). + usage_tips: + text_body_template: "Algumas dicas para que possa começar: \n\n## Continue a arrastar para baixo \n\nNão há botões para páginas seguintes nem números de páginas – para ler mais, **simplesmente continue a arrastar para baixo!**\n\nÀ medida que novas mensagens vão surgindo, estas irão aparecer automaticamente. \n\n## Onde estou?\n\n - Para pesquisar, para a sua página de utilizador ou para o menu, use o botão com o **icone ☰ no canto superior direito**.\n\n- Qualquer título de tópico irá levá-lo à próxima mensagem não lida. Utilize o tempo da última atividade e o contador de mensagens para ir para o início ou para o final. \n\n- Ao ler um tópico, salte para o topo ↑ ao selecionar o título do tópico. Selecione a barra de progresso verde no canto inferior direito para controlos de navegação completos, ou utilize página principal e chavesfinais.\n\n\n\n## Como posso responder?\n\n- Para responder ao tópico geral, utilize o botão de Resposta no final de cada página.\n\n- Para responder a uma mensagem específica, utilize o botão de Resposta nessa mensagem.\n\n-Para levar a conversa para um rumo diferente, mas mantê-las hiperligadas utilize Responder como Tópico hiperligado à direita desta mensagem.\n\n. Para citar alguém na sua resposta, selecione o texto que pretende citar, e de seguida pressione qualquer um dos botões de Resposta.\n\n\nPara mencionar alguém na sua resposta, mencione os seus nomes. Digite `@` e o preenchimento automático irá aparecer.\n\n\n\nPara [Emoji padrão](http://www.emoji.codes/), simplesmente comece a digitar `:` ou os tradicionais risonhos `:)` :smile:\n\n## O que posso fazer mais?\n\nHá botões de ação no final de cada publicação.\n\n\n\nPara deixar alguém saber que gostou das suas mensagens, utilize o botão **gosto**. Se vir um problema com uma mensagem, avise-os ou avise o nosso pessoal em privado utilizando o botão de **sinalização**.\n\nPode também **partilhar** uma hiperligação de uma publicação, ou **marcá-la** para mais tarde ter a referência na sua página de utilizador.\n\nQuem está a falar comigo?\n\nQuando alguém responde à sua mensagem, cita a sua mensagem ou menciona o seu `@nome-de-utilizador`, um número irá aparecer imediatamente no canto superior direito na página. Utilize-o ao aceder às suas **notificações**.\n\t\n\n\nNão se preocupe em falhar uma resposta – irá receber emails com respostas (e mensagens) se não estiver online quando estas chegam.\n\n## Quando são as conversações consideradas novas?\n\nPor defeito, todas as conversações com menos de dois dias são consideradas novas, e qualquer conversação onde tenha participado (respondido, criado, ou lido por um extenso período) irão ser automaticamente acompanhadas. \n\nVerá o indicador numérico e o indicador azul (novo) junto desses tópicos: \n\n\nPode alterar o estado individual das notificações de um tópico através do controlo no final do tópico (isto também pode ser definido por categoria). Para mudar a maneira como os tópicos são acompanhados, ou a definição de novo, consulte [as suas preferências](%{base_url}/my/preferences). \n\n## Porque não posso fazer certas coisas?\n\nNovos utilizadores estão um pouco limitados por razões de segurança. À medida que for participando, irá ganhar confiança por parte da comunidade, tornar-se um cidadão completo e essas limitações serão automaticamente removidas. Com um [nível de confiança] suficientemente alto (https://meta.discourse.org/t/what-do-user-trust-levels-do/4924), irá ganhar ainda mais capacidades para ajudar-nos a gerir a comunidade em conjunto.\n" welcome_user: subject_template: "Bem-vindo a %{site_name}!" + text_body_template: | + Obrigado por se juntar a %{site_name}, e bem-vindo! + + %{new_user_tips} + + Nós acreditamos no [comportamento civilizado da comunidade](%{base_url}/diretrizes) em qualquer altura. + + Desfrute da sua estadia! + + (Se precisar de comunicar com [membros do pessoal](%{base_url}/sobre) como um novo utilizador, simplesmente responda a esta mensagem.) welcome_invite: subject_template: "Bem-vindo a %{site_name}!" + text_body_template: | + Obrigado por ter aceite o convite para %{site_name} -- bem-vindo! + + Criámos uma nova conta **%{username}** para si, e neste momento encontra-se com sessão iniciada. Pode mudar o seu nome ao visitar [o seu perfil de utilizador][prefs]. + + Para iniciar sessão novamente mais tarde: + + 1. **Use sempre o mesmo endereço de email do convite original** quando iniciar sessão. De outra forma não saberemos que é você! + + 2. Crie uma palavra-passe única para [o seu perfil de utilizador][prefs], e use-o para iniciar sessão. + + %{new_user_tips} + + Nós acreditamos num [comportamento civilizado da comunidade](%{base_url}/diretrizes) em qualquer altura. + + Desfrute da sua estadia! + + (Se precisar de comunicar com [membros do pessoal](%{base_url}/sobre) como um novo utilizador, simplesmente responda a esta mensagem.) + + [prefs]: %{user_preferences_url} backup_succeeded: subject_template: "Cópia de segurança completa corretamente" text_body_template: "A cópia de segurança foi feita corretamente.\nVisite a [admin > secção de cópias de segurança](/admin/backups) para descarregar a sua nova cópia de segurança." @@ -1080,20 +1290,29 @@ pt: ``` csv_export_succeeded: subject_template: "Exportação de dados completa" + text_body_template: | + A sua exportação dos dados foi bem-sucedida! :dvd: + + %{file_name} (%{file_size}) + + A hiperligação acima será válida por 48 horas.. csv_export_failed: subject_template: "A exportação dos dados falhou" text_body_template: "Pedimos desculpa mas a sua exportação de dados falhou. Por favor verifique os registos do log ou contacte um membro do pessoal." email_reject_trust_level: + subject_template: "[%{site_name}] Problema de email -- Nível de Confiança Insuficiente" text_body_template: | Pedimos desculpa mas a sua mensagem de email para %{destination} (titled %{former_title}) não funcionou. A sua conta não tem o nível de confiança necessário para publicar novos tópicos para este endereço de email. Se acredita que isto é um erro, contacte um membro do pessoal. email_reject_no_account: + subject_template: "[%{site_name}] Problema de email -- Conta Desconhecida" text_body_template: | Pedimos desculpa mas a sua mensagem de email %{destination} (titled %{former_title}) não funcionou. Não há nenhuma conta de utilizador conhecida com este endereço de email. Tente enviar a partir de um endereço de email diferente, ou contacte um membro do pessoal. email_reject_empty: + subject_template: "[%{site_name}] Problema de email -- Sem Conteúdo" text_body_template: | Pedimos desculpa mas a sua mensagem de email para %{destination} (titled %{former_title}) não funcionou. @@ -1101,16 +1320,25 @@ pt: Se está a ter este erro e se _realmente_ colocou conteúdo, tente novamente com conteúdo HTML incluído no seu email (e não apenas texto simples). email_reject_parsing: + subject_template: "[%{site_name}] Problema de email -- Conteúdo não reconhecido" text_body_template: | Pedimos desculpa mas a sua mensagem de email para %{destination} (titled %{former_title}) não funcionou. Não conseguimos encontrar nenhuma resposta no email fornecido. **Certifique-se que a sua resposta está no topo do email** -- não conseguimos processar respostas em linha. + email_reject_invalid_access: + subject_template: "[%{site_name}] Problema de email -- Acesso Inválido" + text_body_template: | + Pedimos desculpa, mas a sua mensagem de email para %{destination} (título %{former_title}) não funcionou. + + A sua conta não tem privilégios para publicar novos tópicos nessa categoria. Se acredita que isto é um erro, contacte um membro do pessoal. email_reject_post_error: + subject_template: "[%{site_name}] Problema de email -- Erro de publicação" text_body_template: | Pedimos desculpa mas a sua mensagem de email para %{destination} (titled %{former_title}) não funcionou. Algumas causas possíveis são: formatação complexa, mensagem demasiado grande, mensagem demasiado pequena. Por favor tente novamente, ou publique através do sítio se isto continuar. email_reject_post_error_specified: + subject_template: "[%{site_name}] Problema de email -- Erro de publicação" text_body_template: | Pedimos desculpa mas a sua mensagem de email para %{destination} (titled %{former_title}) não funcionou. @@ -1120,26 +1348,37 @@ pt: Se conseguir corrigir o problema, tente novamente. email_reject_reply_key: + subject_template: "[%{site_name}] Problema de email -- Chave de Resposta Desconhecida" text_body_template: | Pedimos desculpa mas a sua mensagem de email para %{destination} (titled %{former_title}) não funcionou. A chave de resposta fornecida é inválida ou desconhecida, por isso não sabemos a que resposta corresponde este email. Contacte um membro do pessoal. email_reject_destination: + subject_template: "[%{site_name}] Problema de email -- Endereço Para: Desconhecido" text_body_template: | Pedimos desculpa mas a sua mensagem de email para %{destination} (titled %{former_title}) não funcionou. Nenhum dos endereços de destino é reconhecido. Por favor, certifique-se que o endereço do sítio está na linha Para: (não em Cc: ou em Bcc:), e que está a enviar para o endereço de email correto fornecido pelo pessoal. email_reject_topic_not_found: + subject_template: "[%{site_name}] Problema de email -- Tópico Não Encontrado" text_body_template: | Pedimos desculpa mas a sua mensagem de email para %{destination} (titled %{former_title}) não funcionou. O tópico não foi encontrado, poderá ter sido eliminado. Se acredita que isto é um erro, contacte um membro do pessoal. email_reject_topic_closed: + subject_template: "[%{site_name}] Problema de email -- Tópico Encerrado" text_body_template: | Pedimos desculpa mas a sua mensagem de email para %{destination} (titled %{former_title}) não funcionou. O tópico está fechado. Se acredita que isto é um erro, contacte um membro do pessoal. + email_reject_auto_generated: + subject_template: "[%{site_name}] Problema de email -- Resposta Gerada Automaticamente" + text_body_template: | + Pedimos desculpa, mas a sua mensagem de email para %{destination} (título %{former_title}) não funcionou. + + A sua resposta ao email foi auto gerada, o qual não aceitamos. Se acredita que isto é um erro, contacte um membro do pessoal. email_error_notification: + subject_template: "[%{site_name}] Problema de email -- Erro de autenticação POP" text_body_template: | Ocorreu um erro de autenticação ao recuperar emails do servidor POP. @@ -1212,6 +1451,36 @@ pt: reply_by_email: "Para responder, responda a este email ou visite %{base_url}%{url} no seu navegador." visit_link_to_respond: "Para responder visite %{base_url}%{url} no seu navegador." posted_by: "Publicado por %{username} em %{post_date}" + user_invited_to_private_message_pm: + subject_template: "[%{site_name}] %{username} convidou-o para uma mensagem '%{topic_title}'" + text_body_template: |2 + + %{username} convidou-o para uma mensagem + + >%{username} + > + > %{topic_excerpt} + + at + + > %{site_title} -- %{site_description} + + Por favor visite esta hiperligação para visualizar a mensagem: %{base_url}%{url} + user_invited_to_topic: + subject_template: "[%{site_name}] %{username} convidou-o para um tópico '%{topic_title}'" + text_body_template: |2 + + %{username} convidou-o para uma discussão + + > **%{topic_title}** + > + > %{topic_excerpt} + + em + + > %{site_title} -- %{site_description} + + Por favor visite esta hiperligação para visualizar a mensagem: %{base_url}%{url} user_replied: subject_template: "[%{site_name}] %{topic_title}" text_body_template: | @@ -1259,6 +1528,7 @@ pt: %{respond_instructions} digest: why: "Um breve sumário de %{site_link} desde a sua última visita em %{last_seen_at}" + subject_template: "Resumo [%{site_name}]" new_activity: "Nova atividade nos seus tópicos e mensagens:" top_topics: "Mensagens populares" other_new_topics: "Tópicos populares" @@ -1304,6 +1574,23 @@ pt: %{base_url}/users/authorize-email/%{email_token} signup_after_approval: subject_template: "Foi aprovado no %{site_name}!" + text_body_template: | + Bem-vindo a %{site_name}! + + Um membro do pessoal aprovou a sua conta em %{site_name}. + + Clique na seguinte hiperligação para confirmar e ativar a sua nova conta: + %{base_url}/utilizadores/ativar-conta/%{email_token} + + Se a hiperligação acima não for clicável, tente copiá-la e colá-la na barra de endereço do seu navegador de internet. + + %{new_user_tips} + + Nós acreditamos em [comportamento civilizado da comunidade](%{base_url}/diretrizes) em todas as alturas. + + Desfrute da sua estadia! + + (Se precisar de comunicar com [membros do pessoal](%{base_url}/sobre) como um novo utilizador, apenas responda a esta mensagem.) signup: subject_template: "[%{site_name}] Ativar a sua nova conta" text_body_template: | @@ -1333,7 +1620,10 @@ pt: unauthorized: "Pedimos desculpa, o ficheiro que está a tentar carregar não está autorizado (extensões autorizadas: %{authorized_extensions})." pasted_image_filename: "Imagem colada" store_failure: "Falha ao armazenar o carregamento #%{upload_id} para o utilizador #%{user_id}." + attachments: + too_large: "Pedimos desculpa, o ficheiro que está a tentar carregar é muito grande (o tamanho máximo é %{max_size_kb}KB)." images: + too_large: "Pedimos desculpa, a imagem que está a tentar carregar é muito grande (o tamanho máximo é %{max_size_kb}KB), por favor redimensione-a e tente novamente." fetch_failure: "Pedimos desculpa, ocorreu um erro ao transferir a imagem." unknown_image_type: "Pedimos desculpa, mas o ficheiro que tentou carregar não parece ser uma imagem." size_not_found: "Pedimos desculpa, mas não conseguimos determinar o tamanho da imagem. É possível que seu ficheiro de imagem esteja corrompido?" @@ -1342,6 +1632,7 @@ pt: spam_hosts: "Este novo utilizador tentou criar múltiplas mensagens com hiperligações ao mesmo domínio. Verifique as configurações do sítio em newuser_spam_host_threshold." email_log: no_user: "Não foi possível encontrar o utilizador com o id %{user_id}" + suspended_not_pm: "O utilizador está suspenso, sem mensagens" seen_recently: "O utilizador foi visto recentemente" post_not_found: "Não foi possível encontrar a mensagem com o id %{post_id}" notification_already_read: "A notificação sobre o qual este email se trata já foi lida" @@ -1355,6 +1646,7 @@ pt: body_blank: "corpo está em branco" color_schemes: base_theme_name: "Base" + about: "Sobre" guidelines: "Diretrizes" privacy: "Privacidade" edit_this_page: "Editar esta página" @@ -1365,6 +1657,11 @@ pt: Edite a primeira mensagem neste tópico para alterar os conteúdos da página %{page_name}. guidelines_topic: title: "FAQ/Diretrizes" + body: "\n\n## [Isto é um Local Civilizado para Discussão](#civilizado)\n\nPor favor trate este fórum de discussão com o mesmo respeito com que trataria um parque público. Nós somos também uma comunidade de partilha de recursos — um local para partilhar habilidades, conhecimento e interesses através de conversações.\n\nEstas não são regras rígidas e rápidas, meramente para ajuda do julgamento humano da nossa comunidade. Utilize estas diretrizes para manter este local limpo e iluminado para discussões públicas civilizadas.\n\n\n\n## [Melhorar a discussão](#melhorar) \n\nAjude-nos a fazer deste um óptimo local para discussões ao trabalhar constantemente para melhorar de alguma maneira, mesmo que pequena. Se não tem a certeza que a sua mensagem adiciona algo à conversação, pense novamente no que quer dizer e tente novamente mais tarde.\n\nOs tópicos discutidos aqui têm importância para nós, e queremos agir como se também fossem importantes para si. Seja respeitador dos tópicos e das pessoas que o debatem, mesmo que discorde do que está a ser dito.\n\nUma maneira de melhorar o debate é descobrindo os que já estão a ocorrer. Por favor perca algum tempo a pesquisar os tópicos existentes aqui antes de responder ou começar um novo, e terá melhores hipóteses de conhecer outros que partilhem os mesmos interesses que você.\n\n\n\n## [Seja Agradável, Mesmo Que\ + \ Discorde](#agradável) \n\nPode desejar responder a algo ao discordar do mesmo. Não há qualquer problema nisso. Mas lembre-se de _criticar ideias, não pessoas_. Por favor, evite:\n\n*Chamar Nomes. \n*Adicionar ataques pessoais. \n* Responder ao tom de uma mensagem e não ao seu conteúdo. \n*Contradições instintivas\n\nPelo contrário, forneça contra-argumentos que melhorem a conversação.\n\n\n\n## [A Sua Participação Conta](#participe)\n\nAs conversações que temos aqui definem o tom para toda a gente. Ajude-nos a influenciar o futuro desta comunidade ao escolher comprometer-se nos debates que tornam este fórum um local interessante para se estar — e evite os que não o fazem.\n\nO Discourse fornece ferramentas que permitem que a comunidade identifique as melhores (e piores) contribuições: favoritos, marcadores, gostos, sinalizações, respostas, edições, e por aí adiante. Utilize estas ferramentas para melhorar a sua própria experiência e de todos os outros também.\n\nVamos tentar deixar o nosso parque melhor do que quando o encontrámos.\n\n\n\n## [Se vir um Problema, Sinalize-o](#sinalize-problemas)\n\nOs moderadores têm uma autoridade especial; estes são responsáveis por este fórum. Assim como você o é. Com a sua ajuda, os moderadores podem ser facilitadores da comunidade, não apenas zeladores ou polícias.\n\nQuando vir mau comportamento, não responda. O reconhecimento\ + \ encoraja o mau comportamento, consome a sua energia e gasta o tempo de todos. Apenas sinalize-o. Se houver sinalizações suficientes, ações irão ser tomadas, seja automaticamente ou por intervenção dos moderadores.\n\nDe maneira a manter a ordem da comunidade, os moderadores reservam-se ao direito de remover qualquer conteúdo e qualquer conta de utilizador por qualquer razão em qualquer altura. Os moderadores não prevêem novas mensagens em qualquer maneira; os moderadores e os operadores do sítio não têm qualquer responsabilidade por qualquer conteúdo publicado pela comunidade.\n\n\n\n## [Seja sempre civilizado](#seja-civilizado)\n\nNada estraga mais uma conversação saudável do que insolências:\n\n *Seja civilizado. Não publique nada que uma pessoa sensata consideraria ofensiva, abusiva ou de ódio. \n*Mantenha-o limpo. Não publique nada obsceno ou sexualmente explicito. \n*Respeite os outros. Não assedie ou magoe ninguém, não personifique pessoas, e não exponha as suas informações pessoais. \n*Respeite o fórum. Não publique spam ou qualquer outra coisa que vandalize o fórum.\n\nEstes não são termos concretos com definições precisas — evite até a _aparência_ de qualquer uma destas coisas. Se não tem certeza, pergunte-se a si próprio como se sentiria se a sua mensagem fosse capa no New York Times.\n\nEste é um fórum público, e motores de pesquisa indexam estes debates. Mantenha a linguagem, hiperligações\ + \ e imagens seguras para família e amigos.\n\n\n\n## [Mantenha-o Organizado](#manter-organizado)\n\nFaça o esforço para colocar as coisas no local certo, para que possamos passar mais tempo a debater e menos a limpar. Por isso:\n\n*Não comece um tópico na categoria errada. \n*Não cruze mensagens sobre o mesmo tema em múltiplos tópicos. \n*Não publique respostas sem conteúdo. \n*Não desvie um tópico ao mudar o seu centro de atenção. \n*Não assine as suas mensagens — qualquer mensagem tem a sua informação de perfil anexada à mesma.\n\nEm vez de publicar “+1” ou “Concordo”, utilize o botão Gosto. Em vez de levar um tópico existente para uma direção completamente diferente, utilize Responder como Novo Tópico.\n\n\n\n## [Publique Apenas As Suas Próprias Coisas](#roubo)\n\nNão pode publicar nada digital que pertença a qualquer outra pessoa, sem a sua permissão. Não pode publicar descrições de, hiperligações a, ou métodos para roubar propriedade intelectual de outras pessoas (software, vídeo, áudio, imagens), ou para quebrar qualquer outra lei.\n\n\n\n## [Patrocinado Por Si](#poder)\n\nEste sítio é operado pelos seus [membros locais amigáveis](/sobre) e por *si*, a comunidade. Se tem alguma questão adicional sobre como as coisas funcionam por aqui, abra um novo tópico em [categoria meta](/c/meta) e iremos debatê-lo. Se ocorrer algum assunto crítico ou urgente\ + \ que pode ser tratado por um tópico meta ou por uma sinalização, contacte-nos através do [página do pessoal](/sobre).\n\n\n\n## [Termos de Serviço](#tds)\n\nSim, a legalidade é chata, mas temos que nos proteger – e por extensão, protegê-lo a si e aos seus dados – contra companheiros inimigos. Temos os [Termos de Serviço](/tds) que descrevem o seu (e o nosso) comportamento e direitos relativamente a conteúdo, privacidade e leis. Para usar este serviço tem que concordar em cumprir os nossos [TDS](/tds).\n" tos_topic: title: "Termos de Serviço" body: "Os seguintes termos e condições governam todo o uso do sítio %{company_domain} e todo o conteúdo, serviços e produtos disponíveis no ou através do sítio, incluindo mas não limitado a, %{company_domain} Software do Fórum, %{company_domain} Suporte do Fórum e serviço de alojamento %{company_domain} (\"Alojamento\"), (em conjunto, o Sítio). O Sítio é propriedade e operado por %{company_full_name} (\"%{company_name}\"). O Sítio oferecido está sujeito à sua aprovação sem nenhuma modificação de todos os termos e condições contidos aqui e todas as outras regras de operação políticas (incluindo, sem limitação, %{company_domain}’s [Política de Privacidade](/privacy) e [Diretrizes da Comunidade](/faq)) e procedimentos que possam ser publicados de tempos em tempos neste Sítio por %{company_name} (coletivamente, the \"Acordo\").\n\nPor favor leia este Acordo com cuidado antes de aceder ou usar o Sítio. Ao aceder ou usar qualquer parte do Sítio, concorda em estar limitado pelos termos e condições deste acordo. Se não concorda com todos os termos e condições deste acordo, então não deve aceder ao Sítio ou usar qualquer um dos serviços. Se estes termos e condições são considerados uma oferta de %{company_name}, a sua aceitação é expressamente limitada a estes termos. O Sítio está disponível apenas a indíviduos que têm pelo menos 13 anos de idade.\n\n\n\n## [1. A Sua Conta %{company_domain} ](#1)\n\nSe criar uma conta\ @@ -1464,3 +1761,103 @@ pt: Se decidirmos alterar a nossa política de privacidade, iremos publicar as mudanças nesta página. Este documento é CC-BY-SA. Foi atualizado pela última vez em 31 de Maio de 2013. + static: + search_help: | +

      Dicas

      +

      +

        +
      • A correspondência de títulos está priorizada, por isso em caso de dúvida, pesquise por títulos
        • +
      • Palavras únicas e incomuns irão sempre produzir os melhores resultados
        • +
      • Sempre que possível, direcione a sua pesquisa para uma categoria, utilizador ou tópico em particular
        • +
      +

      +

      Opções

      +

      + + + + + + +
      order:viewsorder:latest
      status:openstatus:closedstatus:archivedstatus:norepliesstatus:singleuser
      category:foouser:foo
      in:likesin:postedin:watchingin:trackingin:private
      in:bookmarks
      +

      +

      + rainbows category:parks status:open order:latest + irá retornar uma pesquisa por tópicos que contém a palavra "rainbows" na categoria "parks" que não estão fechados ou arquivados, ordenados pela data da última mensagem. +

      + badges: + long_descriptions: + autobiographer: | + Blá Blá Blá + Blá Blá Blá + first_like: | + Blá Blá Blá + Blá Blá Blá + first_link: | + Blá Blá Blá + Blá Blá Blá + first_quote: | + Blá Blá Blá + Blá Blá Blá + first_share: | + Blá Blá Blá + Blá Blá Blá + read_guidelines: | + Blá Blá Blá + Blá Blá Blá + reader: | + Blá Blá Blá + Blá Blá Blá + editor: | + Blá Blá Blá + Blá Blá Blá + first_flag: | + Sinalizar é crítico para a saúde da nossa comunidade. Se notar qualquer mensagem que requer a atenção do moderador por favor + não hesite em sinalizá-la. Pode também usar o diálogo de sinalização para enviar mensagens aos utilizadores + assim que chegar + ao nível de confiança 1. + nice_share: | + Blá Blá Blá + Blá Blá Blá + welcome: | + Blá Blá Blá + Blá Blá Blá + anniversary: | + Blá Blá Blá + Blá Blá Blá + good_share: | + Blá Blá Blá + Blá Blá Blá + great_share: | + Blá Blá Blá + Blá Blá Blá + nice_post: | + Blá Blá Blá + Blá Blá Blá + nice_topic: | + Blá Blá Blá + Blá Blá Blá + good_post: | + Blá Blá Blá + Blá Blá Blá + good_topic: | + Blá Blá Blá + Blá Blá Blá + great_post: | + Blá Blá Blá + Blá Blá Blá + great_topic: | + Blá Blá Blá + Blá Blá Blá + basic: | + Blá Blá Blá + Blá Blá Blá + member: | + Blá Blá Blá + Blá Blá Blá + regular: | + Blá Blá Blá + Blá Blá Blá + leader: | + Blá Blá Blá + Blá Blá Blá diff --git a/config/locales/server.pt_BR.yml b/config/locales/server.pt_BR.yml index fe49ed8eee..c627553fd5 100644 --- a/config/locales/server.pt_BR.yml +++ b/config/locales/server.pt_BR.yml @@ -26,7 +26,7 @@ pt_BR: messages: too_long_validation: "está limitado para %{max} caracteres; você entrou com %{length}." invalid_boolean: "Boleano inválido." - taken: "já foi escolhido" + taken: "já está sendo usado" accepted: tem que ser aceito blank: não pode estar em branco present: deve estar em branco @@ -138,6 +138,7 @@ pt_BR: groups: errors: can_not_modify_automatic: "Você não pode modificar um grupo automático" + member_already_exist: "'%{username}' já é um membro deste grupo." default_names: everyone: "todos" admins: "admins" @@ -447,7 +448,7 @@ pt_BR: email_title: 'O tópico "%{title}" requer atenção do moderador' email_body: "%{link}\n\n%{message}" flagging: - you_must_edit: '

      Sua mensagem foi marcada pela comunidade. Por favor veja suas mensagens.

      ' + you_must_edit: '

      Sua mensagem foi marcada pela comunidade. Por favor veja suas mensagens.

      ' user_must_edit: '

      Conteúdo sinalizado escondido.

      ' archetypes: regular: @@ -590,7 +591,6 @@ pt_BR: host_names_warning: "O arquivo config/database.yml está usando hostname padrão localhost. Modifique para usar o hostname do seu site." gc_warning: 'Seu servidor está rodando a coleta de lixo do ruby com os parâmetros padrão (default ruby garbage collection parameters), os quais não irão propiciar a melhor performance. Leia este tópico sobre ajuste de performance: Tuning Ruby and Rails for Discourse.' sidekiq_warning: 'Sidekiq não está em execução. Muitas tarefas, como envio de emails, são executadas de forma assíncrona pelo sidekiq. Por favor certifique-se de que ao menos um processo sidekiq esteja execução. Aprenda sobre Sidekiq aqui.' - queue_size_warning: 'O número de tarefas agendadas é %{queue_size}, o que é alto. Isto pode indicar um problema com o(s) processo(s) Sidekiq, ou você pode estar precisando de mais Sidekiq workers.' memory_warning: 'Seu servidor está rodando com menos de 1 GB de memória total. Pelo menos 1 GB é quantidade de memória recomendada.' enable_google_logins_warning: "AVISO! Termino do suporte ao método atual de autenticação do Google em 20 de Abril, 2015! Por favor mudar para novo método agora!" both_googles_warning: "Você tem enable_google_logins e enable_google_oauth2_logins ativados nas configurações do site. Desative o enable_google_logins." @@ -746,8 +746,6 @@ pt_BR: email_token_grace_period_hours: "Tokens de esqueceu senha / ativar conta ainda serão válidas por um período extra de (n) horas depois de serem resgatados." enable_badges: "Habilita o sistema de emblemas (experimental)" allow_index_in_robots_txt: "Especificar no robots.txt que este site é permitido de ser indexado por sistemas de busca na web." - email_domains_blacklist: "Uma lista de domínios de email com os quais os usuários não são permitidos de registrar contas. Exemplo: mailinator.com trashmail.net" - email_domains_whitelist: "Uma lista de domínios de email com os quais os usuários DEVEM registrar contas. AVISO: Usuários com domínios de email outros que aqueles listados não serão permitidos!" forgot_password_strict: "Não informar usuários da existência de uma conta quando eles usam o diálogo de esquecimento de senha." log_out_strict: "Quando deslogando, deslogar TODAS as sessões do usuário em todos os dispositivos" version_checks: "Pingar Discourse Hub para atualizações de versão e exibir mensagens de versão no Painel em /admin" @@ -1415,6 +1413,12 @@ pt_BR: subject_template: "[%{site_name}] Problema com email -- Conteúdo não reconhecido" text_body_template: | Desculpe-nos, mas seu e-mail para %{destination} (entitulado %{former_title}) não funcionou. Não conseguimos encontrar onde sua resposta estava no e-mail. **Tenha certeza de escrever a resposta no topo do e-mail** -- tudo após o início da mensagem respondida é descartado. + email_reject_invalid_access: + subject_template: "[%{site_name}] Email -- Acesso Inválido" + text_body_template: | + Desculpe, mas a mensagem do email %{destination} (titled %{former_title}) não funcionou. + + Sua conta não possui privilégios para postar novos topicos nessa categoria. Se acredita que isso esteja errado, entre em contato com um dos membros responsáveis.. email_reject_post_error: subject_template: "[%{site_name}] Problema com email -- Erro de postagem" text_body_template: | diff --git a/config/locales/server.ru.yml b/config/locales/server.ru.yml index 34c29c862c..f0a2de07ec 100644 --- a/config/locales/server.ru.yml +++ b/config/locales/server.ru.yml @@ -60,8 +60,13 @@ ru: one: недопустимой длины (должен быть 1 символ) few: недопустимой длины (должно быть %{count} символов) other: недопустимой длины (должно быть %{count} символов) + other_than: "не должно быть равно %{count}" template: body: 'Обнаружены ошибки в следующих полях:' + header: + one: 1 ошибка препятствует сохранению %{model} + few: '%{count} ошибки препятствует сохранению %{model}' + other: '%{count} ошибок препятствуют сохранению %{model}' embed: load_from_remote: "Произошла ошибка при загрузке сообщения." bulk_invite: @@ -123,6 +128,7 @@ ru: next_page: "следующая страница →" prev_page: "← предыдущая страница" page_num: "Страница %{num}" + home_title: "Домой" topics_in_category: "Темы в разделе «%{category}»" rss_posts_in_topic: "RSS лента темы '%{topic}" rss_topics_in_category: "RSS лента тем в разделе '%{category}'" @@ -130,6 +136,7 @@ ru: num_posts: "Сообщений:" num_participants: "Участников:" read_full_topic: "Читать всю тему" + private_message_abbrev: "Сообщ." rss_description: latest: "Последние темы" hot: "Популярные темы" @@ -425,7 +432,9 @@ ru: description: 'Это сообщение может быть оскорбительным или нарушает правила поведения.' long_form: 'отметить как неуместное' notify_user: + title: 'Отправить сообщение @{{username}}' description: 'Это сообщение содержит что-то, на что я хочу обратить внимание автора в приватном диалоге. Не отправлять жалобу модераторам.' + long_form: 'оповещаемый пользователь' email_title: 'Ваше сообщение в теме "%{title}"' email_body: "%{link}\n\n%{message}\n" notify_moderators: @@ -462,6 +471,7 @@ ru: email_title: 'Тема "%{title}" требует внимания модератора' email_body: "%{link}\n\n%{message}" flagging: + you_must_edit: '

      На ваше сообщение были поданы жалобы. Посмотрите ваши сообщения.

      ' user_must_edit: '

      На это сообщение поступили жалобы от участников сообщества, поэтому оно временно скрыто.

      ' archetypes: regular: @@ -604,16 +614,26 @@ ru: host_names_warning: "Ваш файл config/database.yml использует локальное имя хоста по умолчанию. Поменяйте его на имя хоста вашего сайта." gc_warning: 'Ваш сервер использует параметры ruby garbage collection по умолчанию, что ведет не к лучшей производительности. Прочитайте эту тему про настройку производительности: Tuning Ruby and Rails for Discourse.' sidekiq_warning: 'Sidekiq не запущен. Сейчас многие задачи, такие как отправка электронных писем, выполняются асинхронно. Пожалуйста, убедитесь, что хотя бы один процесс sidekiq запущен. Узнайте больше о Sidekiq здесь.' - queue_size_warning: 'Количество задач в очереди достигло большого размера %{queue_size}. Это может привести к проблемам с процессом(ами) Sidekiq, или вам придется добавить больше Sidekiq workers.' memory_warning: 'Общее количество памяти, используемое вашим сервером, составляет менее 1 GB. Рекомендовано использовать минимум 1 GB.' + enable_google_logins_warning: "ВНИМАНИЕ! Поддержка используемого вами метода аутентификации Google заканчивается 20 апреля 2015! Пожалуйста, перейдите на новый метод аутентификации!" both_googles_warning: "Обе опции включены в настройках сайта: enable_google_logins и enable_google_oauth2_logins. Выключите enable_google_logins." + google_oauth2_config_warning: 'Сервер позволяет регистрацию и вход на сайт с использованием учетной записи Google OAuth2 (enable_google_oauth2_logins), но id и секретные значения не заданы. Пройдите в раздел Настройки сайта и обновите настройки. Ознакомьтесь с данным руководством для получения дополнительной информации.' + facebook_config_warning: 'Сервер позволяет регистрацию и вход на сайт с использованием учетной записи Facebook (enable_facebook_logins), но id и секретные значения не заданы. Пройдите в раздел Настройки сайта и обновите настройки. Ознакомьтесь с данным руководством для получения дополнительной информации.' + twitter_config_warning: 'Сервер позволяет регистрацию и вход на сайт с использованием учетной записи Twitter (enable_twitter_logins), но id и секретные значения не заданы. Пройдите в раздел Настройки сайта и обновите настройки. Ознакомьтесь с данным руководством для получения дополнительной информации.' + github_config_warning: 'Сервер позволяет регистрацию и вход на сайт с использованием учетной записи GitHub (enable_github_logins), но id и секретные значения не заданы. Пройдите в раздел Настройки сайта и обновите настройки. Ознакомьтесь с данным руководством для получения дополнительной информации.' s3_config_warning: 'Сервер сконфигурирован на загрузку файлов в хранилище S3, однако не указаны некоторые значения из списка: s3_access_key_id, s3_secret_access_key или s3_upload_bucket. Перейдите в Настройки сайта и установите необходимые значения. Для получения дополнительной информации перейдите по ссылке How to set up image uploads to S3?.' s3_backup_config_warning: 'Сервер сконфигурирован на загрузку резервных копий в хранилище S3, однако не заданы все необходимые настройки : s3_access_key_id, s3_secret_access_key, s3_backup_bucket. Перейдите в настройки сайта и установите необходимые значения. Для получения дополнительной информации перейдите по ссылке How to set up image uploads to S3?.' image_magick_warning: 'Сервер сконфигурирован на создание превью больших изображений, однако на сервере не установлен ImageMagick. Установите ImageMagick используя системный менеджер пакетов, или пройдите по ссылке для загрузки последней версии.' failing_emails_warning: 'Провалено %{num_failed_jobs} почтовых задач. Проверьте файл config/discourse.conf и убедитесь, что почтовые настройки правильные. Просмотр проваленных задач Sidekiq.' + default_logo_warning: "Установите графические логотипы для вашего сайта. Обновите параметры logo_url, logo_small_url и favicon_url в Настройках сайта." + contact_email_missing: "Установите контактный email, чтобы мы могли оповестить вас о срочных делах, связанных с сайтом. Обновите параметры в Настройках сайта." contact_email_invalid: "Контактный адрес сайта некорректен. Обновите его в Настройках сайта." title_nag: "Введите название вашего сайта. Обновите заголовок в Настройках сайта." + site_description_missing: "Добавьте короткое описание вашего сайта, которое будет отображаться в результатах поиска. Обновите параметр site_description в Настройках сайта." consumer_email_warning: "Сайт настроен на использование Gmail (или другого почтового сервиса) для отправки сообщений. Gmail имеет ограничения на количество отправляемых сообщений. Вы можете рассмотреть возможность использования альтернативного поставщика услуг (например, mandrill.com) для обеспечения бесперебойности доставки почтовых сообщений." + site_contact_username_warning: "Введите псевдоним учетной записи персонала, от чьего имени будут отправляться важные автоматические сообщения. Обновите параметр site_contact_username в Настройках сайта." + notification_email_warning: "Email уведомления отправляются с некорректного адреса электронной почты на вашем домене; доставка сообщений будет ненадежна. Пожалуйста, установите в параметре notification_email правильный локальный адрес электронной почты в Настройках сайта." + s3_deprecation_warning: "ВНИМАНИЕ! Поддержка Amazon S3 для хранения изображений и вложений скоро будет отключена. Пожалуйста, следуйте инструкциям для миграции на локальное хранилище." content_types: education_new_reply: title: "Обучение нового пользователя: Первые ответы" @@ -626,8 +646,10 @@ ru: description: "Руководство и необходимая информация для новых пользователей." welcome_user: title: "Приветствие: новый пользователь" + description: "Сообщение, автоматически отправляемое каждому новому пользователю после регистрации." welcome_invite: title: "Приветствие: Приглашенный пользователь" + description: "Сообщение, автоматически отправляемое каждому новому приглашенному пользователю после того, как он примет приглашение." login_required_welcome_message: title: "Требуется вход: приветствие" description: "Приветствие, отображаемое пользователям, не вошедшим на сайт, если опция 'требуется вход' включена." @@ -649,9 +671,12 @@ ru: default_locale: "Язык по умолчанию для данного экземпляра Discourse (ISO 639-1 Code)" allow_user_locale: "Позволять пользователям выбирать язык интерфейса" min_post_length: "Минимально допустимое количество символов в одном сообщении." + min_first_post_length: "Минимально допустимое количество символов в первом сообщении (или теле темы)" + min_private_message_post_length: "Минимально допустимое количество символов в сообщении в беседе." max_post_length: "Максимально допустимое количество символов в одном сообщении." min_topic_title_length: "Максимально допустимое количество символов в названии темы." max_topic_title_length: "Максимально допустимое количество символов в названии темы." + min_private_message_title_length: "Минимально допустимое количество символов в заголовке сообщения в беседе." min_search_term_length: "Минимальное количество символов в поисковом запросе." allow_uncategorized_topics: "Разрешить создание тем вне разделов." uncategorized_description: "Описание раздела для тем \"без раздела\". Будет скрыто есть оставить пустым." @@ -660,6 +685,8 @@ ru: educate_until_posts: "Количество первых сообщений новых пользователей, для которых необходимо показывать всплывающую подсказку с советами для новичков." title: "Название этого сайта. Будет использоваться в HTML-тэге title." site_description: "Опишите сайт одним предложением для использования описания в мета-теге description." + contact_email: "Адрес электронной почты ключевого контактного лица, ответственного за этот сайт. Используется для критических уведомлений, таких как необработанные жалобы или срочные обращения через контактную форму /about." + contact_url: "Контактный URL для этого сайта. Используется для срочных обращений через контактную форму /about." queue_jobs: "ТОЛЬКО ДЛЯ РАЗРАБОТЧИКОВ! ВНИМАНИЕ! По умолчанию задачи обрабатываются асинхронно в очереди sidekiq. Если настройка выключена, ваш сайт может не работать." crawl_images: "Скачивать картинки с других сайтов для автоматического определения их размеров." download_remote_images_to_local: "Скачивать картинки, вставленные в сообщения ссылками на другие сайты, и хранить их локально, чтобы предотвратить их изменения или утерю." @@ -681,24 +708,36 @@ ru: onebox_domains_whitelist: "Список доменов, разрешенных для умной вставки. Эти домены должны поддерживать OpenGraph или oEmbed. Проверьте их по ссылке http://iframely.com/debug" logo_url: "Логотип сайта, отображаемый сверху слева. Если оставить пустым, будет использован текст заголовка сайта." digest_logo_url: "Альтернативный логотип для использования вверху письма-дайджеста. Если оставить пустым, будет использован логотип из настройки `logo_url`. Пример: http://example.com/logo.png" + logo_small_url: "Уменьшенный логотип вашего сайта, используется сверху слева вместо основного логотипа при прокрутке списка тем вниз. Если не указан, будет отображаться основной логотип." favicon_url: "favicon вашего сайта, дополнительная информация: http://en.wikipedia.org/wiki/Favicon" + mobile_logo_url: "Логотип для отображения вверху в мобильной версии сайта. Если оставить пустым, будет использован логотип из настройки `logo_url`." apple_touch_icon_url: "Иконка используемая для тач-устройств Apple. Рекомендуемый размер 144 x 144 px." notification_email: "Отправитель: E-mail использующийся при отправке всех системных писем. Домен, указанный здесь должен иметь правильно сконфигурированные SPF, DKIM и reverse PTR записи, для успешной отправки." email_custom_headers: "Разделенный чертой список дополнительных заголовков в почтовых сообщениях" email_subject: "Настраиваемый формат темы для стандартных писем. Смотри https://meta.discourse.org/t/customize-subject-format-for-standard-emails/20801" + use_https: "Полный URL адрес сайта (Discourse.base_url) должен быть http или https? НЕ АКТИВИРУЙТЕ ЭТУ НАСТРОЙКУ ДО ТЕХ ПОР, ПОКА HTTPS НЕ БУДЕТ ПОЛНОСТЬЮ НАСТРОЕН И ВКЛЮЧЕН!" summary_score_threshold: "Минимальная оценка сообщения, необходимая для его включения в сводку по теме" summary_posts_required: "Минимальное количество сообщение в теме для активации кнопки \"Сводка по теме\"" summary_likes_required: "Минимальное количество симпатий в теме для активации кнопки \"Сводка по теме\"" summary_percent_filter: "При нажатии на кнопку \"Сводка по теме\", показывать лучшие % сообщений" + summary_max_results: "Максимальное количество сообщений, выводимых в 'Обзоре темы'" + enable_private_messages: "Разрешить пользователям 1-го уровеня доверия писать и отвечать на личные сообщения" enable_long_polling: "Использовать механизм long polling для уведомлений о событиях" - anon_polling_interval: "Как часто следует опрашивать клиентов анонимных пользователей в миллисекундах" + long_polling_base_url: "Базовый URL, используемый для long polling (при использовании CDN для раздачи динамического контента установите в этом параметре адрес origin pull), например: http://origin.site.com" + long_polling_interval: "Время, которое ожидает сервер до ответа клиентам, когда нет данных для отправки (только для пользователей, вошедших на сайт)" + polling_interval: "Если не используется long polling, как часто следует вошедшим клиентам опрашивать сервер, в миллисекундах" + anon_polling_interval: "Как часто следует анонимным клиентам опрашивать сервер, в миллисекундах" + background_polling_interval: "Как часто следует клиентам опрашивать сервер, в миллисекундах (когда окно находится в фоновом режиме)" auto_track_topics_after: "Глобальное количество миллисекунд по умолчанию до того, как тема начинает автоматически отслеживаться (0 - всегда, -1 - никогда)" new_topic_duration_minutes: "Глобальное количество минут по умолчанию, в течение которых тема оценивается как новая, пользователи могут переназначать (-1 - всегда, -2 – для последнего посещения)" flags_required_to_hide_post: "Количество жалоб, по достижении которого сообщение автоматически скрывается, и личное сообщение об этом посылается автору (0 - никогда)" cooldown_minutes_after_hiding_posts: "Количество минут, которое должен подождать пользователь перед редактированием сообщения скрытого по жалобам" max_topics_in_first_day: "Максимальное количество тем, которое пользователь может создать в первый день на сайте" max_replies_in_first_day: "Максимальное количество ответов, которое пользователь может сделать в первый день на сайте" + num_flags_to_block_new_user: "Если сообщения нового пользователя получат данное количество жалоб на спам от num_users_to_block_new_user различных пользователей, скрыть все сообщения этого пользователя и отказать ему в публикации новых сообщений. 0 отключает данную функцию." + num_users_to_block_new_user: "Если сообщения нового пользователя получат num_flags_to_block_new_user жалоб на спам от такого количества различных пользователей, скрыть все сообщения этого пользователя и отказать ему в публикации новых сообщений. 0 отключает данную функцию." notify_mods_when_user_blocked: "Отправить сообщение всем модераторам, если пользователь заблокирован автоматически." + flag_sockpuppets: "Если новый пользователь отвечает на тему с того же IP адреса как и новый пользователь, кто начал тему, отметить оба их сообщения как возможный спам." traditional_markdown_linebreaks: "Использовать стандартный способ переноса строки в Markdown: строка должна заканчиваться двумя пробелами, чтобы перенос строки после нее сработал." post_undo_action_window_mins: "Количество минут, в течение которых пользователь может отменить действия, связанные с сообщениями: 'Мне нравится', 'Жалоба' и др." must_approve_users: "Персонал должен подтвердить регистрации новых пользователей перед тем, как им будет разрешен доступ к сайту." @@ -706,17 +745,25 @@ ru: ga_domain_name: "Google analytics (ga.js) доменное имя, например: mysite.com; смотрите http://google.com/analytics" ga_universal_tracking_code: "Google Universal Analytics (analytics.js) tracking code код, например: UA-12345678-9; больше информации можно узнать на странице http://google.com/analytics" ga_universal_domain_name: "Google Universal Analytics (analytics.js) доменное имя, например: mysite.com; больше можно найти на странице http://google.com/analytics" + enable_escaped_fragments: "Откатиться на Google's Ajax-Crawling API, если поисковый робот не обнаружен. См. https://support.google.com/webmasters/answer/174992?hl=en" enable_noscript_support: "Включить поддержку тэга noscript для поисковых роботов" allow_moderators_to_create_categories: "Разрешить модераторам создавать новые разделы" + cors_origins: "Разрешенные источники для cross-origin запросов (CORS). Каждый запрос должен включать http:// или https://. Чтобы включить CORS, переменная окружения DISCOURSE_ENABLE_CORS должна быть установлена в значение true." + top_menu: "Определите, какие элементы должны располагаться в навигации на главной странице и в каком порядке. Пример: latest|new|unread|categories|top|read|posted|bookmarks" post_menu: "Определите, какие элементы должны отображаться в меню у сообщения и в какой последовательности. Пример: like|edit|flag|delete|share|bookmark|reply" post_menu_hidden_items: "Пункты меню действий над сообщением, которые должны быть спрятаны и появляться по нажатию на кнопку с троеточием." share_links: "Определите, какие элементы должны отображаться в окне 'Поделиться' и в какой последовательности." track_external_right_clicks: "Отслеживать внешние ссылки, открытые правой кнопкой мыши (например: открыть в новой вкладке), по умолчанию отключено, так как это перезаписывает пути" + site_contact_username: "Все автоматические сообщения будут отправляться от имени этого пользователя. Если оставить пустым, то будет использован системный пользователь по умолчанию - System." + send_welcome_message: "Отправлять всем новым пользователям приветственное сообщение с короткой инструкцией о возможностях форума." + suppress_reply_directly_below: "Не показывать разворачиваемое количество ответов на сообщение, если есть всего лишь один ответ непосредственно ниже." + suppress_reply_directly_above: "Не показывать разворачивемый блок \"в ответ на\" для сообщения, если есть всего лишь одно сообщение непосредственно выше." + suppress_reply_when_quoting: "Не показывать разворачивемый блок \"в ответ на\", если сообщение уже содержит цитату." + max_reply_history: "Максимальное число разворачивающихся ответов в блоке \"в ответ на\"" redirect_users_to_top_page: "Автоматически перенаправлять новых и давно отсутствующих пользователей к началу страницы." show_email_on_profile: "Показать Email пользователя в профиле (видно только себе и персоналу)" enable_badges: "Включить систему наград" allow_index_in_robots_txt: "Разрешить поисковикам индексировать сайт в robots.txt" - email_domains_blacklist: "Список почтовых доменов, с которых запрещена регистрация учетных записей. Пример: mailinator.com trashmail.net" version_checks: "Проверять обновления и показывать сообщения о новых версиях на панели администратора" port: "Внимание, только для разработчиков! Использовать порт HTTP отличный от значения по умолчанию. Оставьте это поле пустым для использования стандартного 80-го порта." force_hostname: "Внимание, только для разработчиков! Укажите имя хоста для формирования URL или оставьте пустым для значения по умолчанию." diff --git a/config/locales/server.sq.yml b/config/locales/server.sq.yml index 10c61a0149..f4753967eb 100644 --- a/config/locales/server.sq.yml +++ b/config/locales/server.sq.yml @@ -491,7 +491,6 @@ sq: 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: Tuning Ruby and Rails for Discourse.' 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. Learn about Sidekiq here.' - 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.' both_googles_warning: "You have both enable_google_logins and enable_google_oauth2_logins checked in the site settings. Disable enable_google_logins." 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 the Site Settings and update the settings. See this guide to learn more.' @@ -622,8 +621,6 @@ sq: email_token_grace_period_hours: "Forgot password / activate account tokens are still valid for a grace period of (n) hours after being redeemed." enable_badges: "Aktivizo sistemin e targetave" allow_index_in_robots_txt: "Specify in robots.txt that this site is allowed to be indexed by web search engines." - email_domains_blacklist: "A list of email domains that users are not allowed to register accounts with. Example: mailinator.com trashmail.net" - email_domains_whitelist: "A list of email domains that users MUST register accounts with. WARNING: Users with email domains other than those listed will not be allowed!" forgot_password_strict: "Don't inform users of an account's existance when they use the forgot password dialog." version_checks: "Ping the Discourse Hub for version updates and show new version messages on the /admin dashboard" new_version_emails: "Send an email to the contact_email address when a new version of Discourse is available." diff --git a/config/locales/server.sv.yml b/config/locales/server.sv.yml index 3918c486fa..df29bd87ce 100644 --- a/config/locales/server.sv.yml +++ b/config/locales/server.sv.yml @@ -441,7 +441,6 @@ sv: 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: Tuning Ruby and Rails for Discourse.' 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. Learn about Sidekiq here.' - queue_size_warning: 'Antalet köade jobb är %{queue_size}, vilket är högt. Det skulle kunna indikera ett problem med Sidekiq-processen/-erna, eller så kanske du behöver lägga till fler Sidekiq workers.' memory_warning: 'Your server is running with less than 1 GB of total memory. At least 1 GB of memory is recommended.' s3_config_warning: 'Servern är konfigurerad till att ladda upp filer till s3, men minst en av följande inställningar är inte satt: s3_access_key_id, s3_secret_access_key eller s3_upload_bucket. Gå till Inställningar och uppdatera dem. Se "How to set up image uploads to S3?" för att lära dig mer.' consumer_email_warning: "Din sida är konfigurerad till att använda Gmail (eller någon annan konsumenttjänst) för att skicka email. Gmail limits how many emails you can send. Consider using an email service provider like mandrill.com to ensure email deliverability." diff --git a/config/locales/server.te.yml b/config/locales/server.te.yml index 8b4c7486ff..870c27c79c 100644 --- a/config/locales/server.te.yml +++ b/config/locales/server.te.yml @@ -525,7 +525,6 @@ te: rails_env_warning: "మీ సర్వరు %(env) రీతిలో నడుస్తోంది" ruby_version_warning: "మీరు రూబీ 2.0.0 వాడుతున్నారు. ఇది సమస్యలతో కూడినది. దయచేసి పేచీ స్థాయి 247 లేదా ఆపైకి ఉన్నతీకరించగలరు" host_names_warning: "మీ config/database.yml దస్త్రం అప్రమేయ లోకల్ హోస్ట్ వాడుతున్నది. దాన్ని మీ సైటు పేరుకు మార్చగలరు. " - queue_size_warning: "వరుసలో ఉన్న ఉద్యోగాల సంఖ్య %{queue_size}, ఏది ఆధిక్యత.ఈ సైడ్‌కిక్ ప్రక్రియ(లు) ఒక సమస్య సూచిస్తుంది , లేదా \nమీకు మరింతమంది సైడ్‌కిక్ కార్మికులు అవసరం కావచ్చు." memory_warning: 'మీ సర్వరు ఒక జీబీ కన్నా తక్కువ మెమరీతో నడుస్తున్నది. కనీసం ఒక జీబీ అయినా ఉండుట మంచిది. ' contact_email_missing: "మీరు మీ సైట్ యొక్క సంప్రదింపు ఈ-మెయిల్ నమోదు చేయండి దాని ద్వారా సైట్‌కు సంబంధించిన అత్యవసర విషయాలు అందుకొంటారు. సైట్ సెట్టింగ్స్‌ లో అప్‌డేట్ చేయండి." contact_email_invalid: "సైట్ సంప్రదింపు ఈ-మెయిల్ చెల్లదు.సైట్ సెట్టింగ్స్‌ లో అప్‌డేట్ చేయండి." diff --git a/config/locales/server.tr_TR.yml b/config/locales/server.tr_TR.yml index 8c5b14b5d4..5b67bb9f61 100644 --- a/config/locales/server.tr_TR.yml +++ b/config/locales/server.tr_TR.yml @@ -538,7 +538,6 @@ tr_TR: host_names_warning: "config/database.yml dosyasınızda, bilgisayar adı olarak varsayılan değer olan \"localhost\" ayarlı. Değeri, sitenizin bilgisayar adını kullanacak biçimde güncelleyiniz." gc_warning: 'Sunucunuz, Ruby''nin varsayılan çöp toplama ayarlarını kullanıyor ki bu size en iyi performansı vermeyecektir. Performansı ayarı için şu konuyu okuyun: Discourse için Ruby on Rails Ayarları.' sidekiq_warning: 'Sidekiq çalışmıyor. E-posta yollamak gibi gibi birçok asenkron görev sidekiq''in işidir. En az bir tane sidekiq süreci çalıştırdığınızdan emin olun. Sidekiq ile ilgili bilgi burada.' - queue_size_warning: 'Kuyrukta çok fazla, %{queue_size} tane iş var. Bu Sidekiq süreçleriyle ilgili bir sorunu gösteriyor olabilir, daha fazla Sidekiq işçisi eklemeniz gerekebilir.' memory_warning: 'Sunucunuz toplam 1GB''tan az bellek ile çalışıyor. En az 1GB bellek tavsiye edilmektedir.' both_googles_warning: "Site ayarlarında enable_google_logins ve enable_google_oauth2_logins ayarlarından her ikisi de etkin. enable_google_logins ayarını devre dışı bırakın." google_oauth2_config_warning: 'Sunucu Google OAuth2 (enable_google_oauth2_logins) ile üyelik oluşturulması ve giriş yapılmasına elveriyor, fakat the kullanıcı IDsi and gizli kullanıcı değerleri henüz ayarlanmamış. Site Ayarları sayfasına gidin ve ayarları güncelleyin. Daha fazla bilgi için bu yönetmeliğe bakın.' @@ -681,8 +680,6 @@ tr_TR: email_token_grace_period_hours: "Parolamı unuttum / hesabı etkinleştir jetonları kullanıldıktan sonra (n) saat boyunca hala geçerlidir." enable_badges: "Rozet sistemini etkinleştir" allow_index_in_robots_txt: "robots.txt dosyasında bu sitenin arama motorları tarafından indekslenmesine izin verildiğini belirt." - email_domains_blacklist: "Kullanıcıların kayıt olurken kullanamayacağı e-posta alan adlarının listesi. Örneğin: mailinator.com trashmail.net" - email_domains_whitelist: "Kullanıcıların kayıt olurken kullanmak ZORUNDA olduğu e-posta alan adlarının listesi. UYARI: Bu listede yer almayan e-posta uzantıları kabul edilmeyecektir!" forgot_password_strict: "Parolamı unuttum alanını kullanırlarken, kullanıcıları hesabın varlığından haberdar etme. " log_out_strict: "Çıkış yapılırken, kullanıcının tüm cihazlardaki TÜM seanslarını sonlandır" version_checks: "Discourse Hub'a versiyon güncellemeleri için ping yolla ve yeni versiyon mesajlarına /admin gösterge panelinde yer ver" diff --git a/config/locales/server.uk.yml b/config/locales/server.uk.yml index b2a8b2d31d..a9efe73d6f 100644 --- a/config/locales/server.uk.yml +++ b/config/locales/server.uk.yml @@ -284,7 +284,6 @@ uk: 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: Tuning Ruby and Rails for Discourse.' 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. Learn about Sidekiq here.' - 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.' 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 the Site Settings and update the settings. See this guide to learn more.' 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 the Site Settings and update the settings. See this guide to learn more.' diff --git a/config/locales/server.zh_CN.yml b/config/locales/server.zh_CN.yml index 329ee67609..ccd291f6e3 100644 --- a/config/locales/server.zh_CN.yml +++ b/config/locales/server.zh_CN.yml @@ -131,6 +131,7 @@ zh_CN: groups: errors: can_not_modify_automatic: "你不能修改一个自动组" + member_already_exist: "“%{username}”已经是群组成员了。" default_names: everyone: "任何人" admins: "管理面板" @@ -423,7 +424,7 @@ zh_CN: email_title: '"%{title}" 主题需要你的关注' email_body: "%{link}\n\n%{message}" flagging: - you_must_edit: '

      你的帖子被社群成员标记了。请查看你的消息。

      ' + you_must_edit: '

      你的帖子被社群成员标记了。请查看你的消息。

      ' user_must_edit: '

      你的帖子已经被社群标记并被临时隐藏。

      ' archetypes: regular: @@ -566,7 +567,6 @@ zh_CN: host_names_warning: "你的 config/database.yml 文件使用的是缺省的 localhost 主机名。请更改成你的站点主机名。" gc_warning: '你的服务器使用的是缺省的 ruby 垃圾回收参数，这个配置无法提供最高性能。请阅读此性能调优文档：Tuning Ruby and Rails for Discourse。' sidekiq_warning: 'Sidekiq 不在运行。很多任务，例如发送电子邮件，是异步的被 sidekiq 调度执行的。请确保至少运行一个 sidekiq 进程。了解 Sidekiq。' - queue_size_warning: '队列中的任务数为 %{queue_size}，任务较多。这可能因为 Sidekiq 进程出问题导致，或者需要更多的 Sidekiq 进程。' memory_warning: '你的服务器环境内存少于 1GB，我们建议至少要有 1GB 内存。' enable_google_logins_warning: "警告。Google 将在2015年4月20日停止支持 OpenID 登录。请使用新方法！" both_googles_warning: "你在站点设置中同时启用了 enable_google_logins 和 enable_google_oauth2_logins。禁用 enable_google_logins。" @@ -687,6 +687,9 @@ zh_CN: cooldown_minutes_after_hiding_posts: "当一个帖子因为标记而隐藏之后，用户需要等待多少分钟才能编辑帖子" max_topics_in_first_day: "新用户在第一天内最多可以创建的主题数" max_replies_in_first_day: "新用户在第一天内最大可以创建的回复数" + tl2_additional_likes_per_day_multiplier: "增加信任等级 2（成员）的赞限制，可提供一个乘数与原始值相乘" + tl3_additional_likes_per_day_multiplier: "增加信任等级 3（常规）的赞限制，可提供一个乘数与原始值相乘" + tl4_additional_likes_per_day_multiplier: "增加信任等级 4（领导）的赞限制，可提供一个乘数与原始值相乘" num_flags_to_block_new_user: "如果一个新用户的帖子被其他 num_users_to_block_new_user 个用户标记为垃圾，隐藏他们的所有帖子并阻止其之后的发帖。0 表示禁用这个特性。" num_users_to_block_new_user: "如果一个新用户的帖子被许多其他用户 num_flags_to_block_new_user 标记为垃圾，隐藏他们的所有帖子并阻止其之后发帖。0 表示禁用这个特性。" notify_mods_when_user_blocked: "如果一个用户被自动封禁了，发送一个消息给所有管理员。" @@ -722,8 +725,8 @@ zh_CN: email_token_grace_period_hours: "“忘记密码”/“激活账户” token 在使用后仍旧有效的小时数(n)。" enable_badges: "启用徽章系统" allow_index_in_robots_txt: "在 robots.txt 中详细指出这个站点允许被网页搜索引擎检索。" - email_domains_blacklist: "一个邮箱域名黑名单列表，其中的域名将不能用来注册账户，例如：mailinator.com trashmail.net" - email_domains_whitelist: "一个电子邮箱域名的列表，用户只能使用这些邮箱域名注册。警告：用户使用不包含在这个列表里的邮箱域名，将无法成功注册。" + email_domains_blacklist: "用管道符“|”分隔的邮箱域名黑名单列表，其中的域名将不能用来注册账户，例如：mailinator.com|trashmail.net" + email_domains_whitelist: "用管道符“|”分隔的电子邮箱域名的列表，用户必须使用这些邮箱域名注册。警告：用户使用不包含在这个列表里的邮箱域名，将无法成功注册。" forgot_password_strict: "在找回密码对话框中不告知用户账户的存在。" log_out_strict: "登出时，登出用户所有设备的会话" version_checks: "访问 Discourse Hub 来检查版本更新，并在管理面板 /admin 显示新版本信息" @@ -945,6 +948,8 @@ zh_CN: enable_emoji: "启用绘文字（emoji）" emoji_set: "你喜欢哪一种 emoji？" enforce_square_emoji: "强制为所有 emojis 设置正方形比例。" + approve_post_count: "新用户需要被审核的帖子数量" + approve_unless_trust_level: "该信任等级之下的用户的帖子必须被审核" errors: invalid_email: "电子邮箱地址无效。" invalid_username: "没有这个用户名的用户。" @@ -1373,6 +1378,12 @@ zh_CN: 我们很抱歉，但是你发送至 %{destination}（名为 %{former_title}）的邮件无法发送。 我们不能找到你邮件中的回复。**请确认将你的回复置于邮件顶端**——我们不能处理行内回复。 + email_reject_invalid_access: + subject_template: "[%{site_name}] 电子邮件错误 -- 无权限" + text_body_template: | + 我们很抱歉，但是您发送至 %{destination}（名为 %{former_title}）的邮件无法发送。 + + 您的账户没有足够的权限在该分类发布一个新主题。如果您坚信这是一个错误，联系一个职员。 email_reject_post_error: subject_template: "[%{site_name}] 邮件问题 -- 发表错误" text_body_template: | diff --git a/config/locales/server.zh_TW.yml b/config/locales/server.zh_TW.yml index 5f93af3503..1d607d9264 100644 --- a/config/locales/server.zh_TW.yml +++ b/config/locales/server.zh_TW.yml @@ -20,6 +20,7 @@ zh_TW: is_reserved: "保留權利" purge_reason: "自動刪除被遺棄、未啟用賬戶" disable_remote_images_download_reason: "磁盤空間不足，圖像下載已被禁用。" + anonymous: "匿名" errors: format: '%{attribute} %{message}' messages: @@ -113,6 +114,7 @@ zh_TW: next_page: "下一頁 →" prev_page: "← 上一頁" page_num: "%{num} 頁" + home_title: "主頁" topics_in_category: "分類 '%{category}' 中的討論話題" rss_posts_in_topic: "'%{topic}' 的 RSS feed" rss_topics_in_category: "分類 '%{category}' 中討論話題的 RSS feed" @@ -120,6 +122,7 @@ zh_TW: num_posts: "文章：" num_participants: "參與者：" read_full_topic: "閱讀整個話題" + private_message_abbrev: "消息" rss_description: latest: "最新討論話題" hot: "熱門討論話題" @@ -128,6 +131,7 @@ zh_TW: groups: errors: can_not_modify_automatic: "你無法修改自動群組" + member_already_exist: "'%{username}' 已經是群組成員了。" default_names: everyone: "所有人" admins: "管理員" @@ -498,7 +502,6 @@ zh_TW: host_names_warning: "伺服器上 config/database.yml 的主機名稱為 localhost 。請更改成你的網站主機名稱。" gc_warning: '伺服器正在使用的 ruby 可能僅啟用了預設的 垃圾回收設定 (garbage collection), 這個設定無法提供最佳效能。請瀏覽此效能設定的資訊: Tuning Ruby and Rails for Discourse。' sidekiq_warning: 'Sidekiq 未有執行。很多程序, 如發送電子郵件, 需要 sidekiq 非同步 (asynchronous) 執行的。請確保至少運行一個 sidekiq 程序。瞭解 Sidekiq。' - queue_size_warning: '排定中的任務數量為%{queue_size}，任務較多。這可能是因為 Sidekiq 程序出現問題, 或者需要更多的 Sidekiq 程序。' memory_warning: '伺服器記憶體少於 1GB，建議配置至少 1GB 記憶體' enable_google_logins_warning: "警告！當前的 Google 認證方法將於2015年4月20日結束！請現在切換到新方法！" both_googles_warning: "你已將網站設定中 enable_google_logins 和 enable_google_oauth2_logins 兩者皆勾選。請停用 enable_google_logins。" @@ -644,8 +647,6 @@ zh_TW: email_token_grace_period_hours: "\"忘記密碼\" / \"重啟帳號\" 的 token 在使用後仍舊有效的小時數 (n)" enable_badges: "啟用勳章系統" allow_index_in_robots_txt: "在 robots.txt 中記錄這個網站允許被搜尋引擎索引的部分" - email_domains_blacklist: "Email域名的黑名單，在此名單內的域名將無法註冊，例如：mailinator.com trashmail.net" - email_domains_whitelist: "Email域名的白名單，使用者 \"必須\" 使用此帳號來註冊，注意：使用者如果使用其他Email的域名將無法註冊" forgot_password_strict: "在找回密碼對話框中不告知用戶帳戶的存在。" log_out_strict: "登出時，登出用戶所有設備上的所有時段" version_checks: "訪問 Discourse Hub 來檢查版本更新，並在管理面板 /admin 顯示新版本訊息" From 40b22bf367635522c52761c0530dcf7aea3fcdcb Mon Sep 17 00:00:00 2001 From: Sam Saffron Date: Wed, 22 Apr 2015 23:54:54 +1000 Subject: [PATCH 111/113] PERF: improve performance for featured user calculation --- app/models/topic_featured_users.rb | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/app/models/topic_featured_users.rb b/app/models/topic_featured_users.rb index a192cfe942..d00aaeda14 100644 --- a/app/models/topic_featured_users.rb +++ b/app/models/topic_featured_users.rb @@ -24,6 +24,8 @@ class TopicFeaturedUsers def self.ensure_consistency!(topic_id=nil) + filter = "#{"AND t.id = #{topic_id.to_i}" if topic_id}" + sql = < t.user_id AND p.user_id <> t.last_post_user_id + #{filter} GROUP BY t.id, p.user_id ), @@ -69,7 +72,7 @@ WHERE x.id = tt.id AND COALESCE(featured_user2_id,-99) <> COALESCE(featured_user2,-99) OR COALESCE(featured_user3_id,-99) <> COALESCE(featured_user3,-99) OR COALESCE(featured_user4_id,-99) <> COALESCE(featured_user4,-99) -) #{"AND x.id = #{topic_id.to_i}" if topic_id} +) SQL Topic.exec_sql(sql) From 27aa0bc0565d614f80a8351fc976588aac40125c Mon Sep 17 00:00:00 2001 From: Sam Saffron Date: Thu, 23 Apr 2015 00:10:09 +1000 Subject: [PATCH 112/113] PERF: eliminate query that grabs every post number on topic page. --- lib/topic_view.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/topic_view.rb b/lib/topic_view.rb index a53fc0f408..657c985b1f 100644 --- a/lib/topic_view.rb +++ b/lib/topic_view.rb @@ -416,10 +416,10 @@ class TopicView end def closest_post_to(post_number) - closest_posts = filter_post_ids_by("@(post_number - #{post_number})") - return nil if closest_posts.empty? + closest_post = @filtered_posts.order("@(post_number - #{post_number})").limit(1).pluck(:id) + return nil if closest_post.empty? - filtered_post_ids.index(closest_posts.first) || filtered_post_ids[0] + filtered_post_ids.index(closest_post.first) || filtered_post_ids[0] end end From 985d0268de45f336ce2ddd429fc1eaf00128b264 Mon Sep 17 00:00:00 2001 From: Neil Lalonde Date: Wed, 22 Apr 2015 11:11:31 -0400 Subject: [PATCH 113/113] Version bump to v1.3.0.beta6 --- lib/version.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/version.rb b/lib/version.rb index ade36a11ff..5c47cbe496 100644 --- a/lib/version.rb +++ b/lib/version.rb @@ -5,7 +5,7 @@ module Discourse MAJOR = 1 MINOR = 3 TINY = 0 - PRE = 'beta5' + PRE = 'beta6' STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.') end