From 5ee9b3cd19d4a13fcec155deb6c01a062d8e7012 Mon Sep 17 00:00:00 2001 From: Guo Xiang Tan Date: Wed, 18 May 2016 10:33:21 +0800 Subject: [PATCH 01/51] FIX: Don't throw uncaught error warning when in readonly mode. --- app/assets/javascripts/discourse/lib/screen-track.js.es6 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/app/assets/javascripts/discourse/lib/screen-track.js.es6 b/app/assets/javascripts/discourse/lib/screen-track.js.es6 index 60704ac4bb..fa52eab6fc 100644 --- a/app/assets/javascripts/discourse/lib/screen-track.js.es6 +++ b/app/assets/javascripts/discourse/lib/screen-track.js.es6 @@ -124,6 +124,9 @@ export default class { const postNumbers = Object.keys(newTimings).map(v => parseInt(v, 10)); controller.readPosts(topicId, postNumbers); } + }).catch(e => { + const error = e.jqXHR; + if (error.status === 405 && error.responseJSON.error_type === "read_only") return; }); } else if (this._anonCallback) { // Anonymous viewer - save to localStorage From 2c2c47fe4e457dcef985510fcc3664b75e7f1a13 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9gis=20Hanol?= Date: Thu, 19 May 2016 22:16:23 +0200 Subject: [PATCH 02/51] add support for 'command + up/down' to go to first/last post --- app/assets/javascripts/discourse/lib/keyboard-shortcuts.js.es6 | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/assets/javascripts/discourse/lib/keyboard-shortcuts.js.es6 b/app/assets/javascripts/discourse/lib/keyboard-shortcuts.js.es6 index f44bc3c40a..e186bac804 100644 --- a/app/assets/javascripts/discourse/lib/keyboard-shortcuts.js.es6 +++ b/app/assets/javascripts/discourse/lib/keyboard-shortcuts.js.es6 @@ -15,6 +15,7 @@ const bindings = { 'd': {postAction: 'deletePost'}, 'e': {postAction: 'editPost'}, 'end': {handler: 'goToLastPost', anonymous: true}, + 'command+down': {handler: 'goToLastPost', anonymous: true}, 'f': {handler: 'toggleBookmarkTopic'}, 'g h': {path: '/', anonymous: true}, 'g l': {path: '/latest', anonymous: true}, @@ -26,6 +27,7 @@ const bindings = { 'g p': {path: '/my/activity'}, 'g m': {path: '/my/messages'}, 'home': {handler: 'goToFirstPost', anonymous: true}, + 'command+up': {handler: 'goToFirstPost', anonymous: true}, 'j': {handler: 'selectDown', anonymous: true}, 'k': {handler: 'selectUp', anonymous: true}, 'l': {click: '.topic-post.selected button.toggle-like'}, From 0cf5a1705a3b498a88212b66211650a2ea7e1ff2 Mon Sep 17 00:00:00 2001 From: Sam Date: Fri, 20 May 2016 12:35:09 +1000 Subject: [PATCH 03/51] FIX: custom field index must only index short values --- ...160520022627_shorten_topic_custom_fields_index.rb | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 db/migrate/20160520022627_shorten_topic_custom_fields_index.rb diff --git a/db/migrate/20160520022627_shorten_topic_custom_fields_index.rb b/db/migrate/20160520022627_shorten_topic_custom_fields_index.rb new file mode 100644 index 0000000000..8226c7556f --- /dev/null +++ b/db/migrate/20160520022627_shorten_topic_custom_fields_index.rb @@ -0,0 +1,12 @@ +class ShortenTopicCustomFieldsIndex < ActiveRecord::Migration + def up + remove_index :topic_custom_fields, :value + add_index :topic_custom_fields, [:value, :name], + name: 'topic_custom_fields_value_key_idx', + where: 'value IS NOT NULL AND char_length(value) < 400' + end + def down + remove_index :topic_custom_fields, :value, name: 'topic_custom_fields_value_key_idx' + add_index :topic_custom_fields, :value + end +end From 063483400942819287979e4204515cc2d39ae9cf Mon Sep 17 00:00:00 2001 From: Guo Xiang Tan Date: Fri, 20 May 2016 15:12:25 +0800 Subject: [PATCH 04/51] Some fixes related to optimized images (#4233) * FIX: No need to manually include relation. * FIX: OR instead of chaining relation. --- app/models/upload.rb | 1 - lib/tasks/avatars.rake | 6 +++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/app/models/upload.rb b/app/models/upload.rb index 5783a94d2d..dec7de8f2f 100644 --- a/app/models/upload.rb +++ b/app/models/upload.rb @@ -41,7 +41,6 @@ class Upload < ActiveRecord::Base ) if thumbnail - optimized_images << thumbnail self.width = width self.height = height save(validate: false) diff --git a/lib/tasks/avatars.rake b/lib/tasks/avatars.rake index c27dac792f..4c1da8fd54 100644 --- a/lib/tasks/avatars.rake +++ b/lib/tasks/avatars.rake @@ -21,9 +21,9 @@ task "avatars:clean" => :environment do puts "Cleaning up avatar thumbnails" puts - OptimizedImage.where("upload_id IN (SELECT custom_upload_id FROM user_avatars)") - .where("upload_id IN (SELECT gravatar_upload_id FROM user_avatars)") - .where("upload_id IN (SELECT uploaded_avatar_id FROM users)") + OptimizedImage.where("upload_id IN (SELECT custom_upload_id FROM user_avatars) OR + upload_id IN (SELECT gravatar_upload_id FROM user_avatars) OR + upload_id IN (SELECT uploaded_avatar_id FROM users)") .find_each do |optimized_image| optimized_image.destroy! putc "." if (i += 1) % 10 == 0 From c4f93846f95cb37acbe2fa725614494a2ecbee36 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9gis=20Hanol?= Date: Fri, 20 May 2016 11:35:47 +0200 Subject: [PATCH 05/51] add linebreaks when uploading a file --- app/assets/javascripts/discourse/lib/utilities.js | 2 +- test/javascripts/lib/utilities-test.js.es6 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/assets/javascripts/discourse/lib/utilities.js b/app/assets/javascripts/discourse/lib/utilities.js index 16fb66b631..491e2b6a2b 100644 --- a/app/assets/javascripts/discourse/lib/utilities.js +++ b/app/assets/javascripts/discourse/lib/utilities.js @@ -269,7 +269,7 @@ Discourse.Utilities = { // is Audio/Video return Discourse.Utilities.uploadLocation(upload.url); } else { - return '' + upload.original_filename + ' (' + I18n.toHumanSize(upload.filesize) + ')'; + return '' + upload.original_filename + ' (' + I18n.toHumanSize(upload.filesize) + ')\n'; } }, diff --git a/test/javascripts/lib/utilities-test.js.es6 b/test/javascripts/lib/utilities-test.js.es6 index 3cea33cbed..c9f35a948b 100644 --- a/test/javascripts/lib/utilities-test.js.es6 +++ b/test/javascripts/lib/utilities-test.js.es6 @@ -92,7 +92,7 @@ var getUploadMarkdown = function(filename) { test("getUploadMarkdown", function() { ok(getUploadMarkdown("lolcat.gif") === ''); - ok(getUploadMarkdown("important.txt") === 'important.txt (42 Bytes)'); + ok(getUploadMarkdown("important.txt") === 'important.txt (42 Bytes)\n'); }); test("isAnImage", function() { From e2df79ee9e8d93dd1af25a0b360ddbd352ef3232 Mon Sep 17 00:00:00 2001 From: Arpit Jalan Date: Fri, 20 May 2016 15:44:19 +0530 Subject: [PATCH 06/51] FIX: handle posts with no user on needs approval page --- app/serializers/queued_post_serializer.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/serializers/queued_post_serializer.rb b/app/serializers/queued_post_serializer.rb index 43892fa292..b2d215cf5e 100644 --- a/app/serializers/queued_post_serializer.rb +++ b/app/serializers/queued_post_serializer.rb @@ -30,7 +30,7 @@ class QueuedPostSerializer < ApplicationSerializer end def include_can_delete_user? - user.trust_level == TrustLevel[0] + user && user.trust_level == TrustLevel[0] end end From 4eeae880b6c20d0770ab5b6578727da18fa1dcbe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9gis=20Hanol?= Date: Sat, 21 May 2016 12:49:29 +0200 Subject: [PATCH 07/51] fix deprecation comment in momentjs --- lib/javascripts/moment.js | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/lib/javascripts/moment.js b/lib/javascripts/moment.js index d5e925c1d5..7f1d25a4c5 100644 --- a/lib/javascripts/moment.js +++ b/lib/javascripts/moment.js @@ -1171,10 +1171,7 @@ } utils_hooks__hooks.createFromInputFallback = deprecate( - 'moment construction falls back to js Date. This is ' + - 'discouraged and will be removed in upcoming major ' + - 'release. Please refer to ' + - 'https://github.com/moment/moment/issues/1407 for more info.', + 'moment construction falls back to js Date. This is discouraged and will be removed in upcoming major release. Please refer to https://github.com/moment/moment/issues/1407 for more info.', function (config) { config._d = new Date(config._i + (config._useUTC ? ' UTC' : '')); } From feffe23cc5fd7dffa68137b156910ee831ad6aa2 Mon Sep 17 00:00:00 2001 From: James Kiesel Date: Sat, 21 May 2016 06:17:54 -0700 Subject: [PATCH 08/51] FEATURE: More granular mailing list mode (#4068) * Rearrange frontend to account for mailing list mode * Allow update of user preference for mailing list frequency * Add mailing list frequency estimate * Simplify frequency estimate; disable activity summary for mailing list mode * Remove combined updates * Add specs for enqueue mailing list mode job * Write mailing list method for mailer * Fix linting error * Account for stale topics * Add translations for default mailing list setting * One query for mailing list topics * Fix failing spec * WIP * Flesh out html template * First pass at text-based mailing list summary * Add user avatar * Properly format posts for mailing list * Move make_all_links_absolute into Email::Styles * Apply first_seen_at to user * Send mailing list email summary hourly based on first_seen_at * Branch and test cleanup * Use existing mailing list mode estimate * Fix failing specs --- .../discourse/controllers/preferences.js.es6 | 18 +++ .../components/preference-checkbox.hbs | 2 +- .../discourse/templates/user/preferences.hbs | 31 ++++- app/helpers/user_notifications_helper.rb | 4 +- .../notify_mailing_list_subscribers.rb | 2 +- .../scheduled/enqueue_mailing_list_emails.rb | 27 ++++ app/mailers/user_notifications.rb | 42 ++++-- app/models/mailing_list_mode_site_setting.rb | 19 +++ app/models/post.rb | 8 ++ app/models/user.rb | 1 + app/models/user_option.rb | 1 + app/serializers/user_option_serializer.rb | 1 + app/services/user_updater.rb | 1 + .../user_notifications/mailing_list.html.erb | 76 +++++++++++ .../user_notifications/mailing_list.text.erb | 31 +++++ config/locales/client.en.yml | 12 +- config/locales/server.en.yml | 13 ++ config/site_settings.yml | 3 + ...9073132_add_mailing_list_mode_frequency.rb | 5 + .../20160326001747_add_user_first_visit.rb | 5 + lib/email/styles.rb | 12 ++ lib/pretty_text.rb | 27 +--- spec/components/pretty_text_spec.rb | 65 ++++----- spec/jobs/enqueue_mailing_list_emails_spec.rb | 128 ++++++++++++++++++ .../notify_mailing_list_subscribers_spec.rb | 9 +- spec/mailers/user_notifications_spec.rb | 63 +++++++++ .../mailing_list_mode_site_setting_spec.rb | 17 +++ spec/models/user_spec.rb | 23 ++++ 28 files changed, 567 insertions(+), 79 deletions(-) create mode 100644 app/jobs/scheduled/enqueue_mailing_list_emails.rb create mode 100644 app/models/mailing_list_mode_site_setting.rb create mode 100644 app/views/user_notifications/mailing_list.html.erb create mode 100644 app/views/user_notifications/mailing_list.text.erb create mode 100644 db/migrate/20160309073132_add_mailing_list_mode_frequency.rb create mode 100644 db/migrate/20160326001747_add_user_first_visit.rb create mode 100644 spec/jobs/enqueue_mailing_list_emails_spec.rb create mode 100644 spec/models/mailing_list_mode_site_setting_spec.rb diff --git a/app/assets/javascripts/discourse/controllers/preferences.js.es6 b/app/assets/javascripts/discourse/controllers/preferences.js.es6 index 6ccc5bb22b..733268a168 100644 --- a/app/assets/javascripts/discourse/controllers/preferences.js.es6 +++ b/app/assets/javascripts/discourse/controllers/preferences.js.es6 @@ -62,6 +62,24 @@ export default Ember.Controller.extend(CanCheckEmails, { return this.siteSettings.available_locales.split('|').map(s => ({ name: s, value: s })); }, + @computed() + frequencyEstimate() { + var estimate = this.get('model.mailing_list_posts_per_day'); + if (!estimate || estimate < 2) { + return I18n.t('user.mailing_list_mode.few_per_day'); + } else { + return I18n.t('user.mailing_list_mode.many_per_day', { dailyEmailEstimate: estimate }); + } + }, + + @computed() + mailingListModeOptions() { + return [ + {name: I18n.t('user.mailing_list_mode.daily'), value: 0}, + {name: this.get('frequencyEstimate'), value: 1} + ]; + }, + previousRepliesOptions: [ {name: I18n.t('user.email_previous_replies.always'), value: 0}, {name: I18n.t('user.email_previous_replies.unless_emailed'), value: 1}, diff --git a/app/assets/javascripts/discourse/templates/components/preference-checkbox.hbs b/app/assets/javascripts/discourse/templates/components/preference-checkbox.hbs index b47200bf5a..f7931d5918 100644 --- a/app/assets/javascripts/discourse/templates/components/preference-checkbox.hbs +++ b/app/assets/javascripts/discourse/templates/components/preference-checkbox.hbs @@ -1,4 +1,4 @@ diff --git a/app/assets/javascripts/discourse/templates/user/preferences.hbs b/app/assets/javascripts/discourse/templates/user/preferences.hbs index 644b9a84b7..9c14f6b457 100644 --- a/app/assets/javascripts/discourse/templates/user/preferences.hbs +++ b/app/assets/javascripts/discourse/templates/user/preferences.hbs @@ -185,9 +185,6 @@ {{preference-checkbox labelKey="user.email_in_reply_to" checked=model.user_option.email_in_reply_to}} {{preference-checkbox labelKey="user.email_private_messages" checked=model.user_option.email_private_messages}} {{preference-checkbox labelKey="user.email_direct" checked=model.user_option.email_direct}} - {{#unless siteSettings.disable_mailing_list_mode}} - {{preference-checkbox warning="checkMailingList" labelKey="user.mailing_list_mode" checked=model.user_option.mailing_list_mode}} - {{/unless}} {{preference-checkbox labelKey="user.email_always" checked=model.user_option.email_always}} {{#unless model.user_option.email_always}}
@@ -198,11 +195,33 @@ {{/if}}
{{/unless}} - - - +
+ + {{#if canReceiveDigest}} + {{preference-checkbox labelKey="user.email_digests.title" disabled=model.user_option.mailing_list_mode checked=model.user_option.email_digests}} + {{#if model.user_option.email_digests}} +
+ {{combo-box valueAttribute="value" content=digestFrequencies value=model.user_option.digest_after_minutes}} +
+ {{/if}} + {{/if}} +
+ + {{#unless siteSettings.disable_mailing_list_mode}} +
+ + {{preference-checkbox labelKey="user.mailing_list_mode.enabled" warning="checkMailingList" checked=model.user_option.mailing_list_mode}} +
{{{i18n 'user.mailing_list_mode.instructions'}}}
+ {{#if model.user_option.mailing_list_mode}} +
+ {{combo-box valueAttribute="value" content=mailingListModeOptions value=model.user_option.mailing_list_mode_frequency}} +
+ {{/if}} +
+ {{/unless}} +
{{desktop-notification-config}} diff --git a/app/helpers/user_notifications_helper.rb b/app/helpers/user_notifications_helper.rb index 4c088836d1..39553ffcab 100644 --- a/app/helpers/user_notifications_helper.rb +++ b/app/helpers/user_notifications_helper.rb @@ -65,9 +65,9 @@ module UserNotificationsHelper normalize_name(post.user.name) != normalize_name(post.user.username) end - def format_for_email(post, use_excerpt) + def format_for_email(post, use_excerpt, style: nil) html = use_excerpt ? post.excerpt : post.cooked - PrettyText.format_for_email(html, post).html_safe + PrettyText.format_for_email(html, post, style: style).html_safe end end diff --git a/app/jobs/regular/notify_mailing_list_subscribers.rb b/app/jobs/regular/notify_mailing_list_subscribers.rb index 38cb079a3d..bbae4bb8b3 100644 --- a/app/jobs/regular/notify_mailing_list_subscribers.rb +++ b/app/jobs/regular/notify_mailing_list_subscribers.rb @@ -16,7 +16,7 @@ module Jobs users = User.activated.not_blocked.not_suspended.real .joins(:user_option) - .where(user_options: {mailing_list_mode: true}) + .where(user_options: {mailing_list_mode: true, mailing_list_mode_frequency: 1}) .where('NOT EXISTS( SELECT 1 FROM topic_users tu diff --git a/app/jobs/scheduled/enqueue_mailing_list_emails.rb b/app/jobs/scheduled/enqueue_mailing_list_emails.rb new file mode 100644 index 0000000000..2417264928 --- /dev/null +++ b/app/jobs/scheduled/enqueue_mailing_list_emails.rb @@ -0,0 +1,27 @@ +module Jobs + + class EnqueueMailingListEmails < Jobs::Scheduled + every 1.hour + + def execute(args) + return if SiteSetting.disable_mailing_list_mode? + target_user_ids.each do |user_id| + Jobs.enqueue(:user_email, type: :mailing_list, user_id: user_id) + end + end + + def target_user_ids + # Users who want to receive daily mailing list emails + User.real + .not_suspended + .joins(:user_option) + .where(active: true, staged: false, user_options: {mailing_list_mode: true, mailing_list_mode_frequency: 0}) + .where("#{!SiteSetting.must_approve_users?} OR approved OR moderator OR admin") + .where("date_part('hour', first_seen_at) = date_part('hour', CURRENT_TIMESTAMP)") # where the hour of first_seen_at is the same as the current hour + .where("COALESCE(first_seen_at, '2010-01-01') <= CURRENT_TIMESTAMP - '23 HOURS'::INTERVAL") # don't send unless you've been around for a day already + .pluck(:id) + end + + end + +end diff --git a/app/mailers/user_notifications.rb b/app/mailers/user_notifications.rb index 4b9ffa2725..a1b5361f03 100644 --- a/app/mailers/user_notifications.rb +++ b/app/mailers/user_notifications.rb @@ -73,16 +73,27 @@ class UserNotifications < ActionMailer::Base end end - def digest(user, opts={}) - @user = user - @base_url = Discourse.base_url + def mailing_list(user, opts={}) + @since = opts[:since] || 1.day.ago + @since_formatted = short_date(@since) + @new_topic_posts = Post.mailing_list_new_topics(user, @since).group_by(&:topic) || {} + @existing_topic_posts = Post.mailing_list_updates(user, @since).group_by(&:topic) || {} + @posts_by_topic = @new_topic_posts.merge @existing_topic_posts + return unless @posts_by_topic.present? + + build_summary_for(user) + build_email @user.email, + from_alias: I18n.t('user_notifications.mailing_list.from', site_name: SiteSetting.title), + subject: I18n.t('user_notifications.mailing_list.subject_template', + site_name: @site_name, + date: @date) + end + + def digest(user, opts={}) + build_summary_for(user) min_date = opts[:since] || @user.last_emailed_at || @user.last_seen_at || 1.month.ago - @site_name = SiteSetting.email_prefix.presence || SiteSetting.title - - @header_color = ColorScheme.hex_for_name('header_background') - @anchor_color = ColorScheme.hex_for_name('tertiary') @last_seen_at = short_date(@user.last_seen_at || @user.created_at) # A list of topics to show the user @@ -106,10 +117,8 @@ class UserNotifications < ActionMailer::Base end @featured_topics, @new_topics = @featured_topics[0..4], @featured_topics[5..-1] - @markdown_linker = MarkdownLinker.new(Discourse.base_url) - @unsubscribe_key = DigestUnsubscribeKey.create_key_for(@user) - build_email user.email, + build_email @user.email, from_alias: I18n.t('user_notifications.digest.from', site_name: SiteSetting.title), subject: I18n.t('user_notifications.digest.subject_template', site_name: @site_name, @@ -396,4 +405,17 @@ class UserNotifications < ActionMailer::Base build_email(user.email, email_opts) end + + private + + def build_summary_for(user) + @user = user + @date = short_date(Time.now) + @base_url = Discourse.base_url + @site_name = SiteSetting.email_prefix.presence || SiteSetting.title + @header_color = ColorScheme.hex_for_name('header_background') + @anchor_color = ColorScheme.hex_for_name('tertiary') + @markdown_linker = MarkdownLinker.new(@base_url) + @unsubscribe_key = DigestUnsubscribeKey.create_key_for(@user) + end end diff --git a/app/models/mailing_list_mode_site_setting.rb b/app/models/mailing_list_mode_site_setting.rb new file mode 100644 index 0000000000..b2a8291d00 --- /dev/null +++ b/app/models/mailing_list_mode_site_setting.rb @@ -0,0 +1,19 @@ +require_dependency 'enum_site_setting' + +class MailingListModeSiteSetting < EnumSiteSetting + def self.valid_value?(val) + val.to_i.to_s == val.to_s && + values.any? { |v| v[:value] == val.to_i } + end + + def self.values + @values ||= [ + { name: 'user.mailing_list_mode.daily', value: 0 }, + { name: 'user.mailing_list_mode.individual', value: 1 } + ] + end + + def self.translate_names? + true + end +end diff --git a/app/models/post.rb b/app/models/post.rb index 981a0ba924..65a1e7fcbd 100644 --- a/app/models/post.rb +++ b/app/models/post.rb @@ -65,6 +65,14 @@ class Post < ActiveRecord::Base scope :with_topic_subtype, ->(subtype) { joins(:topic).where('topics.subtype = ?', subtype) } scope :visible, -> { joins(:topic).where('topics.visible = true').where(hidden: false) } scope :secured, lambda { |guardian| where('posts.post_type in (?)', Topic.visible_post_types(guardian && guardian.user))} + scope :for_mailing_list, ->(user, since) { + created_since(since) + .joins(:topic) + .where(topic: Topic.for_digest(user, 100.years.ago)) # we want all topics with new content, regardless when they were created + .order('posts.created_at ASC') + } + scope :mailing_list_new_topics, ->(user, since) { for_mailing_list(user, since).where('topics.created_at > ?', since) } + scope :mailing_list_updates, ->(user, since) { for_mailing_list(user, since).where('topics.created_at <= ?', since) } delegate :username, to: :user diff --git a/app/models/user.rb b/app/models/user.rb index 8d68c337b0..a410a71161 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -476,6 +476,7 @@ class User < ActiveRecord::Base update_previous_visit(now) # using update_column to avoid the AR transaction update_column(:last_seen_at, now) + update_column(:first_seen_at, now) unless self.first_seen_at end def self.gravatar_template(email) diff --git a/app/models/user_option.rb b/app/models/user_option.rb index d986a2885b..ad4ac23a49 100644 --- a/app/models/user_option.rb +++ b/app/models/user_option.rb @@ -24,6 +24,7 @@ class UserOption < ActiveRecord::Base def set_defaults self.email_always = SiteSetting.default_email_always self.mailing_list_mode = SiteSetting.default_email_mailing_list_mode + self.mailing_list_mode_frequency = SiteSetting.default_email_mailing_list_mode_frequency self.email_direct = SiteSetting.default_email_direct self.automatically_unpin_topics = SiteSetting.default_topics_automatic_unpin self.email_private_messages = SiteSetting.default_email_private_messages diff --git a/app/serializers/user_option_serializer.rb b/app/serializers/user_option_serializer.rb index 591b07e457..a6ea26da13 100644 --- a/app/serializers/user_option_serializer.rb +++ b/app/serializers/user_option_serializer.rb @@ -2,6 +2,7 @@ class UserOptionSerializer < ApplicationSerializer attributes :user_id, :email_always, :mailing_list_mode, + :mailing_list_mode_frequency, :email_digests, :email_private_messages, :email_direct, diff --git a/app/services/user_updater.rb b/app/services/user_updater.rb index 747ce7d15b..fa9c57736f 100644 --- a/app/services/user_updater.rb +++ b/app/services/user_updater.rb @@ -9,6 +9,7 @@ class UserUpdater OPTION_ATTR = [ :email_always, :mailing_list_mode, + :mailing_list_mode_frequency, :email_digests, :email_direct, :email_private_messages, diff --git a/app/views/user_notifications/mailing_list.html.erb b/app/views/user_notifications/mailing_list.html.erb new file mode 100644 index 0000000000..efd6ac3df8 --- /dev/null +++ b/app/views/user_notifications/mailing_list.html.erb @@ -0,0 +1,76 @@ +
+ + + + + + + +
+ + <% if logo_url.blank? %> + <%= SiteSetting.title %> + <% else %> + + <% end %> +
+
+ <%= raw(t 'user_notifications.mailing_list.why', site_link: html_site_link(@anchor_color), date: @since_formatted) %> +
+
+ +
+

<%= t('user_notifications.mailing_list.new_topics') %>

+
    + <% @new_topic_posts.keys.each do |topic| %> +
  • + <%= raw format_topic_title(topic.title) %> + <%= @new_topic_posts[topic].length %> + <%= category_badge(topic.category, inline_style: true, absolute_url: true) %> +
    • + <% end %> +
+

<%= t('user_notifications.mailing_list.topic_updates') %>

+
    + <% @existing_topic_posts.keys.each do |topic| %> +
  • + <%= raw format_topic_title(topic.title) %> + <%= @existing_topic_posts[topic].length %> + <%= category_badge(topic.category, inline_style: true, absolute_url: true) %> +
    • + <% end %> +
+
+ + <% @posts_by_topic.keys.each do |topic| %> + + + + + + + + + + <% end %> +
+

+ <%= raw format_topic_title(topic.title) %> +

+
+ <% @posts_by_topic[topic].each do |post| %> +
+ +

+ '><%= post.user.name || post.user.username %> + - + <%= I18n.l(post.created_at, format: :long) %> +

+ <%= raw format_for_email(post, false, style: :notification) %> +
+
+ <% end %> + <%= t('user_notifications.mailing_list.view_this_topic') %> +
+ <%= t('user_notifications.mailing_list.back_to_top') %> +
diff --git a/app/views/user_notifications/mailing_list.text.erb b/app/views/user_notifications/mailing_list.text.erb new file mode 100644 index 0000000000..5208a9f085 --- /dev/null +++ b/app/views/user_notifications/mailing_list.text.erb @@ -0,0 +1,31 @@ +<%- site_link = raw(@markdown_linker.create(@site_name, '/')) %> +<%= raw(t 'user_notifications.mailing_list.why', site_link: site_link, date: @since_formatted) %> + +<%- if @new_topic_posts.keys.present? -%> + ### <%= t 'user_notifications.mailing_list.new_topics' %> + <%- @new_topic_posts.keys.each do |topic| %> + <%= raw(@markdown_linker.create(topic.title, topic.relative_url)) %> + <%- end -%> +<%- end -%> + +<%- if @existing_topic_posts.keys.present? -%> + ### <%= t 'user_notifications.mailing_list.new_topics' %> + <%- @existing_topic_posts.keys.each do |topic| -%> + <%= raw(@markdown_linker.create(topic.title, topic.relative_url)) %> + <%= @existing_topic_posts[topic].length %> + <%- end -%> +<%- end -%> + +-------------------------------------------------------------------------------- + +<%- @posts_by_topic.keys.each do |topic| %> + ### <%= raw(@markdown_linker.create(topic.title, topic.relative_url)) %> + + <%- @posts_by_topic[topic].each do |post| -%> + <%= post.user.name || post.user.username %> - <%= post.created_at %> +-------------------------------------------------------------------------------- + <%= post.raw %> + + + <%- end -%> +<%- end %> diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml index 80c13dabd3..5a4c386f43 100644 --- a/config/locales/client.en.yml +++ b/config/locales/client.en.yml @@ -504,7 +504,17 @@ en: suspended_notice: "This user is suspended until {{date}}." suspended_reason: "Reason: " github_profile: "Github" - mailing_list_mode: "Send me an email for every new post (unless I mute the topic or category)" + email_activity_summary: "Activity Summary" + mailing_list_mode: + label: "Mailing list mode" + enabled: "Enable mailing list mode." + instructions: | + This setting overrides the activity summary.
+ Muted topics and categories are not included in these emails. + daily: "Send daily updates." + individual: "Send an email for every new post." + many_per_day: "Send me an email for every new post (about {{dailyEmailEstimate}} per day)." + few_per_day: "Send me an email for every new post (less than 2 per day)." watched_categories: "Watched" watched_categories_instructions: "You will automatically watch all new topics in these categories. You will be notified of all new posts and topics, and a count of new posts will also appear next to the topic." tracked_categories: "Tracked" diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml index 0c73c7d857..663ea6a9b4 100644 --- a/config/locales/server.en.yml +++ b/config/locales/server.en.yml @@ -28,6 +28,7 @@ en: short_no_year: "%B %-d" # Format directives: http://ruby-doc.org/core-2.2.0/Time.html#method-i-strftime date_only: "%B %-d, %Y" + long: "%B %-d, %Y, %l:%M%P" date: # Do not remove the brackets and commas and do not translate the first month name. It should be "null". month_names: @@ -35,6 +36,8 @@ en: <<: *datetime_formats time: <<: *datetime_formats + am: "am" + pm: "pm" title: "Discourse" topics: "Topics" @@ -1300,6 +1303,7 @@ en: default_email_private_messages: "Send an email when someone messages the user by default." default_email_direct: "Send an email when someone quotes/replies to/mentions or invites the user by default." default_email_mailing_list_mode: "Send an email for every new post by default." + default_email_mailing_list_mode_frequency: "Users who enable mailing list mode will receive emails this often by default." disable_mailing_list_mode: "Disallow users from enabling mailing list mode." default_email_always: "Send an email notification even when the user is active by default." default_email_previous_replies: "Include previous replies in emails by default." @@ -2278,6 +2282,15 @@ en: more_topics: "There were %{new_topics_since_seen} other new topics." more_topics_category: "More new topics:" + mailing_list: + why: "All activity on %{site_link} for %{date}" + subject_template: "[%{site_name}] Summary for %{date}" + unsubscribe: "This summary is sent daily due to mailing list mode being enabled. To unsubscribe %{unsubscribe_link}." + from: "%{site_name} summary" + new_topics: "New topics" + topic_updates: "Topic updates" + view_this_topic: "View this topic" + back_to_top: "Back to top" forgot_password: subject_template: "[%{site_name}] Password reset" text_body_template: | diff --git a/config/site_settings.yml b/config/site_settings.yml index fc59c05897..3f993bb21d 100644 --- a/config/site_settings.yml +++ b/config/site_settings.yml @@ -1128,6 +1128,9 @@ user_preferences: default_email_private_messages: true default_email_direct: true default_email_mailing_list_mode: false + default_email_mailing_list_mode_frequency: + enum: 'MailingListModeSiteSetting' + default: 1 disable_mailing_list_mode: default: false client: true diff --git a/db/migrate/20160309073132_add_mailing_list_mode_frequency.rb b/db/migrate/20160309073132_add_mailing_list_mode_frequency.rb new file mode 100644 index 0000000000..dcdce07c40 --- /dev/null +++ b/db/migrate/20160309073132_add_mailing_list_mode_frequency.rb @@ -0,0 +1,5 @@ +class AddMailingListModeFrequency < ActiveRecord::Migration + def change + add_column :user_options, :mailing_list_mode_frequency, :integer, default: 0, null: false + end +end diff --git a/db/migrate/20160326001747_add_user_first_visit.rb b/db/migrate/20160326001747_add_user_first_visit.rb new file mode 100644 index 0000000000..50e000ab00 --- /dev/null +++ b/db/migrate/20160326001747_add_user_first_visit.rb @@ -0,0 +1,5 @@ +class AddUserFirstVisit < ActiveRecord::Migration + def change + add_column :users, :first_seen_at, :datetime + end +end diff --git a/lib/email/styles.rb b/lib/email/styles.rb index a82c8459f3..25076ab72f 100644 --- a/lib/email/styles.rb +++ b/lib/email/styles.rb @@ -90,6 +90,7 @@ module Email style('.rtl', 'direction: rtl;') style('td.body', 'padding-top:5px;', colspan: "2") style('.whisper td.body', 'font-style: italic; color: #9c9c9c;') + style('.lightbox-wrapper .meta', 'display: none') correct_first_body_margin correct_footer_style reset_tables @@ -186,6 +187,17 @@ module Email @fragment.to_s end + def make_all_links_absolute + site_uri = URI(Discourse.base_url) + @fragment.css("a").each do |link| + begin + link["href"] = "#{site_uri}#{link['href']}" unless URI(link["href"].to_s).host.present? + rescue URI::InvalidURIError, URI::InvalidComponentError + # leave it + end + end + end + private def replace_relative_urls diff --git a/lib/pretty_text.rb b/lib/pretty_text.rb index bfdcbbcd92..5ff3c054f1 100644 --- a/lib/pretty_text.rb +++ b/lib/pretty_text.rb @@ -386,31 +386,16 @@ module PrettyText fragment.to_html end - # Given a Nokogiri doc, convert all links to absolute - def self.make_all_links_absolute(doc) - site_uri = nil - doc.css("a").each do |link| - href = link["href"].to_s - begin - uri = URI(href) - site_uri ||= URI(Discourse.base_url) - link["href"] = "#{site_uri}#{link['href']}" unless uri.host.present? - rescue URI::InvalidURIError, URI::InvalidComponentError - # leave it - end - end - end - def self.strip_image_wrapping(doc) doc.css(".lightbox-wrapper .meta").remove end - def self.format_for_email(html, post = nil) - doc = Nokogiri::HTML.fragment(html) - DiscourseEvent.trigger(:reduce_cooked, doc, post) - make_all_links_absolute(doc) - strip_image_wrapping(doc) - doc.to_html + def self.format_for_email(html, post = nil, style: nil) + Email::Styles.new(html, style: style).tap do |doc| + doc.make_all_links_absolute + doc.send :"format_#{style}" if style + DiscourseEvent.trigger(:reduce_cooked, doc, post) + end.to_html end protected diff --git a/spec/components/pretty_text_spec.rb b/spec/components/pretty_text_spec.rb index 63e2eca471..d66de21387 100644 --- a/spec/components/pretty_text_spec.rb +++ b/spec/components/pretty_text_spec.rb @@ -286,41 +286,6 @@ HTML end end - describe "make_all_links_absolute" do - let(:base_url) { "http://baseurl.net" } - - def make_abs_string(html) - doc = Nokogiri::HTML.fragment(html) - described_class.make_all_links_absolute(doc) - doc.to_html - end - - before do - Discourse.stubs(:base_url).returns(base_url) - end - - it "adds base url to relative links" do - html = "

@wiseguy, @trollol what do you guys think?

" - output = make_abs_string(html) - expect(output).to eq("

@wiseguy, @trollol what do you guys think?

") - end - - it "doesn't change external absolute links" do - html = "

Check out this guy.

" - expect(make_abs_string(html)).to eq(html) - end - - it "doesn't change internal absolute links" do - html = "

Check out this guy.

" - expect(make_abs_string(html)).to eq(html) - end - - it "can tolerate invalid URLs" do - html = "

Check out this guy.

" - expect { make_abs_string(html) }.to_not raise_error - end - end - describe "strip_image_wrapping" do def strip_image_wrapping(html) doc = Nokogiri::HTML.fragment(html) @@ -339,8 +304,36 @@ HTML end describe 'format_for_email' do + let(:base_url) { "http://baseurl.net" } + let(:post) { Fabricate(:post) } + + before do + Discourse.stubs(:base_url).returns(base_url) + end + it 'does not crash' do - PrettyText.format_for_email('test') + PrettyText.format_for_email('test', post) + end + + it "adds base url to relative links" do + html = "

@wiseguy, @trollol what do you guys think?

" + output = described_class.format_for_email(html, post) + expect(output).to eq("

@wiseguy, @trollol what do you guys think?

") + end + + it "doesn't change external absolute links" do + html = "

Check out this guy.

" + expect(described_class.format_for_email(html, post)).to eq(html) + end + + it "doesn't change internal absolute links" do + html = "

Check out this guy.

" + expect(described_class.format_for_email(html, post)).to eq(html) + end + + it "can tolerate invalid URLs" do + html = "

Check out this guy.

" + expect { described_class.format_for_email(html, post) }.to_not raise_error end end diff --git a/spec/jobs/enqueue_mailing_list_emails_spec.rb b/spec/jobs/enqueue_mailing_list_emails_spec.rb new file mode 100644 index 0000000000..820ed1e812 --- /dev/null +++ b/spec/jobs/enqueue_mailing_list_emails_spec.rb @@ -0,0 +1,128 @@ +require 'rails_helper' +require_dependency 'jobs/base' + +describe Jobs::EnqueueMailingListEmails do + + describe '#target_users' do + + context 'unapproved users' do + Given!(:unapproved_user) { Fabricate(:active_user, approved: false, first_seen_at: 24.hours.ago) } + When do + SiteSetting.must_approve_users = true + unapproved_user.user_option.update(mailing_list_mode: true, mailing_list_mode_frequency: 0) + end + Then { expect(Jobs::EnqueueMailingListEmails.new.target_user_ids.include?(unapproved_user.id)).to eq(false) } + + # As a moderator + And { unapproved_user.update_column(:moderator, true) } + And { expect(Jobs::EnqueueMailingListEmails.new.target_user_ids.include?(unapproved_user.id)).to eq(true) } + + # As an admin + And { unapproved_user.update_attributes(admin: true, moderator: false) } + And { expect(Jobs::EnqueueMailingListEmails.new.target_user_ids.include?(unapproved_user.id)).to eq(true) } + + # As an approved user + And { unapproved_user.update_attributes(admin: false, moderator: false, approved: true ) } + And { expect(Jobs::EnqueueMailingListEmails.new.target_user_ids.include?(unapproved_user.id)).to eq(true) } + end + + context 'staged users' do + let!(:staged_user) { Fabricate(:active_user, staged: true, last_emailed_at: 1.year.ago, last_seen_at: 1.year.ago) } + + it "doesn't return staged users" do + expect(Jobs::EnqueueMailingListEmails.new.target_user_ids.include?(staged_user.id)).to eq(false) + end + end + + context "inactive user" do + let!(:inactive_user) { Fabricate(:user, active: false) } + + it "doesn't return users who have been emailed recently" do + expect(Jobs::EnqueueMailingListEmails.new.target_user_ids.include?(inactive_user.id)).to eq(false) + end + end + + context "suspended user" do + let!(:suspended_user) { Fabricate(:user, suspended_till: 1.week.from_now, suspended_at: 1.day.ago) } + + it "doesn't return users who are suspended" do + expect(Jobs::EnqueueMailingListEmails.new.target_user_ids.include?(suspended_user.id)).to eq(false) + end + end + + context 'users with mailing list mode on' do + let(:user) { Fabricate(:active_user, first_seen_at: 24.hours.ago) } + let(:user_option) { user.user_option } + subject { Jobs::EnqueueMailingListEmails.new.target_user_ids } + before do + user_option.update(mailing_list_mode: true, mailing_list_mode_frequency: 0) + end + + it "returns a user whose first_seen_at matches the current hour" do + expect(subject).to include user.id + end + + it "returns a user seen multiple days ago" do + user.update(first_seen_at: 72.hours.ago) + expect(subject).to include user.id + end + + it "doesn't return a user who has never been seen" do + user.update(first_seen_at: nil) + expect(subject).to_not include user.id + end + + it "doesn't return users with mailing list mode off" do + user_option.update(mailing_list_mode: false) + expect(subject).to_not include user.id + end + + it "doesn't return users with mailing list mode set to 'individual'" do + user_option.update(mailing_list_mode_frequency: 1) + expect(subject).to_not include user.id + end + + it "doesn't return a user who has received the mailing list summary earlier" do + user.update(first_seen_at: 5.hours.ago) + expect(subject).to_not include user.id + end + + it "doesn't return a user who was first seen today" do + user.update(first_seen_at: 2.minutes.ago) + expect(subject).to_not include user.id + end + end + + end + + describe '#execute' do + + let(:user) { Fabricate(:user) } + + context "mailing list emails are enabled" do + before do + Jobs::EnqueueMailingListEmails.any_instance.expects(:target_user_ids).returns([user.id]) + end + + it "enqueues the mailing list email job" do + Jobs.expects(:enqueue).with(:user_email, type: :mailing_list, user_id: user.id) + Jobs::EnqueueMailingListEmails.new.execute({}) + end + end + + context "mailing list emails are disabled" do + before do + Jobs::EnqueueMailingListEmails.any_instance.expects(:target_user_ids).never + end + + it "does not enqueue the mailing list email job" do + SiteSetting.disable_mailing_list_mode = true + Jobs.expects(:enqueue).with(:user_email, type: :mailing_list, user_id: user.id).never + Jobs::EnqueueMailingListEmails.new.execute({}) + end + end + + end + + +end diff --git a/spec/jobs/notify_mailing_list_subscribers_spec.rb b/spec/jobs/notify_mailing_list_subscribers_spec.rb index f63b4225cc..75e32073d9 100644 --- a/spec/jobs/notify_mailing_list_subscribers_spec.rb +++ b/spec/jobs/notify_mailing_list_subscribers_spec.rb @@ -34,10 +34,17 @@ describe Jobs::NotifyMailingListSubscribers do context "with a valid post" do let!(:post) { Fabricate(:post, user: user) } - it "sends the email to the user" do + it "sends the email to the user if the frequency is set to 'always'" do + user.user_option.update(mailing_list_mode: true, mailing_list_mode_frequency: 1) UserNotifications.expects(:mailing_list_notify).with(user, post).once Jobs::NotifyMailingListSubscribers.new.execute(post_id: post.id) end + + it "does not send the email to the user if the frequency is set to 'daily'" do + user.user_option.update(mailing_list_mode: true, mailing_list_mode_frequency: 0) + UserNotifications.expects(:mailing_list_notify).never + Jobs::NotifyMailingListSubscribers.new.execute(post_id: post.id) + end end context "with a deleted post" do diff --git a/spec/mailers/user_notifications_spec.rb b/spec/mailers/user_notifications_spec.rb index 00ceb74a3a..c1f0c6f065 100644 --- a/spec/mailers/user_notifications_spec.rb +++ b/spec/mailers/user_notifications_spec.rb @@ -76,6 +76,69 @@ describe UserNotifications do end + describe '.mailing_list' do + subject { UserNotifications.mailing_list(user) } + + context "without new posts" do + it "doesn't send the email" do + expect(subject.to).to be_blank + end + end + + context "with new posts" do + let(:user) { Fabricate(:user) } + let(:topic) { Fabricate(:topic, user: user) } + let!(:new_post) { Fabricate(:post, topic: topic, created_at: 2.hours.ago, raw: "Feel the Bern") } + let!(:old_post) { Fabricate(:post, topic: topic, created_at: 25.hours.ago, raw: "Make America Great Again") } + let(:old_topic) { Fabricate(:topic, user: user, created_at: 10.days.ago) } + let(:new_post_in_old_topic) { Fabricate(:post, topic: old_topic, created_at: 2.hours.ago, raw: "Yes We Can") } + let(:stale_post) { Fabricate(:post, topic: old_topic, created_at: 2.days.ago, raw: "A New American Century") } + + it "works" do + expect(subject.to).to eq([user.email]) + expect(subject.subject).to be_present + expect(subject.from).to eq([SiteSetting.notification_email]) + expect(subject.html_part.body.to_s).to include topic.title + expect(subject.text_part.body.to_s).to be_present + end + + it "includes posts less than 24 hours old" do + expect(subject.html_part.body.to_s).to include new_post.cooked + end + + it "does not include posts older than 24 hours old" do + expect(subject.html_part.body.to_s).to_not include old_post.cooked + end + + it "includes topics created over 24 hours ago which have new posts" do + new_post_in_old_topic + expect(subject.html_part.body.to_s).to include old_topic.title + expect(subject.html_part.body.to_s).to include new_post_in_old_topic.cooked + expect(subject.html_part.body.to_s).to_not include stale_post.cooked + end + + it "includes multiple topics" do + new_post_in_old_topic + expect(subject.html_part.body.to_s).to include topic.title + expect(subject.html_part.body.to_s).to include old_topic.title + end + + it "does not include topics not updated for the past 24 hours" do + stale_post + expect(subject.html_part.body.to_s).to_not include old_topic.title + expect(subject.html_part.body.to_s).to_not include stale_post.cooked + end + + it "includes email_prefix in email subject instead of site title" do + SiteSetting.email_prefix = "Try Discourse" + SiteSetting.title = "Discourse Meta" + + expect(subject.subject).to match(/Try Discourse/) + expect(subject.subject).not_to match(/Discourse Meta/) + end + end + end + describe '.digest' do subject { UserNotifications.digest(user) } diff --git a/spec/models/mailing_list_mode_site_setting_spec.rb b/spec/models/mailing_list_mode_site_setting_spec.rb new file mode 100644 index 0000000000..d8ccc7e4aa --- /dev/null +++ b/spec/models/mailing_list_mode_site_setting_spec.rb @@ -0,0 +1,17 @@ +require 'rails_helper' + +describe MailingListModeSiteSetting do + describe 'valid_value?' do + it 'returns true for a valid value as an int' do + expect(DigestEmailSiteSetting.valid_value?(0)).to eq true + end + + it 'returns false for a valid value as a string' do + expect(DigestEmailSiteSetting.valid_value?('0')).to eq true + end + + it 'returns false for an out of range value' do + expect(DigestEmailSiteSetting.valid_value?(3)).to eq false + end + end +end diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb index 92e12e9e71..63a0dcfb2a 100644 --- a/spec/models/user_spec.rb +++ b/spec/models/user_spec.rb @@ -596,6 +596,29 @@ describe User do end + describe "update_last_seen!" do + let (:user) { Fabricate(:user) } + let!(:first_visit_date) { Time.zone.now } + let!(:second_visit_date) { 2.hours.from_now } + + it "should update the last seen value" do + expect(user.last_seen_at).to eq nil + user.update_last_seen!(first_visit_date) + expect(user.reload.last_seen_at).to be_within_one_second_of(first_visit_date) + end + + it "should update the first seen value if it doesn't exist" do + user.update_last_seen!(first_visit_date) + expect(user.reload.first_seen_at).to be_within_one_second_of(first_visit_date) + end + + it "should not update the first seen value if it doesn't exist" do + user.update_last_seen!(first_visit_date) + user.update_last_seen!(second_visit_date) + expect(user.reload.first_seen_at).to be_within_one_second_of(first_visit_date) + end + end + describe "last_seen_at" do let(:user) { Fabricate(:user) } From c012b18601e9b79ed64e713a043bdfd707985727 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9gis=20Hanol?= Date: Sat, 21 May 2016 20:13:00 +0200 Subject: [PATCH 09/51] FIX: sending email wasn't working anymore when a plugin used 'reduce_cooked' (cc @gdpelican) --- app/helpers/user_notifications_helper.rb | 4 ++-- app/views/user_notifications/mailing_list.html.erb | 2 +- lib/email/styles.rb | 4 ++++ lib/pretty_text.rb | 4 ++-- 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/app/helpers/user_notifications_helper.rb b/app/helpers/user_notifications_helper.rb index 39553ffcab..afa80d832a 100644 --- a/app/helpers/user_notifications_helper.rb +++ b/app/helpers/user_notifications_helper.rb @@ -65,9 +65,9 @@ module UserNotificationsHelper normalize_name(post.user.name) != normalize_name(post.user.username) end - def format_for_email(post, use_excerpt, style: nil) + def format_for_email(post, use_excerpt, style = nil) html = use_excerpt ? post.excerpt : post.cooked - PrettyText.format_for_email(html, post, style: style).html_safe + PrettyText.format_for_email(html, post, style).html_safe end end diff --git a/app/views/user_notifications/mailing_list.html.erb b/app/views/user_notifications/mailing_list.html.erb index efd6ac3df8..2cd2116450 100644 --- a/app/views/user_notifications/mailing_list.html.erb +++ b/app/views/user_notifications/mailing_list.html.erb @@ -60,7 +60,7 @@ - <%= I18n.l(post.created_at, format: :long) %>

- <%= raw format_for_email(post, false, style: :notification) %> + <%= raw format_for_email(post, false, :notification) %>
<% end %> diff --git a/lib/email/styles.rb b/lib/email/styles.rb index 25076ab72f..0156fe0643 100644 --- a/lib/email/styles.rb +++ b/lib/email/styles.rb @@ -6,6 +6,10 @@ module Email class Styles @@plugin_callbacks = [] + attr_accessor :fragment + + delegate :css, to: :fragment + def initialize(html, opts=nil) @html = html @opts = opts || {} diff --git a/lib/pretty_text.rb b/lib/pretty_text.rb index 5ff3c054f1..e3e5cc756b 100644 --- a/lib/pretty_text.rb +++ b/lib/pretty_text.rb @@ -390,11 +390,11 @@ module PrettyText doc.css(".lightbox-wrapper .meta").remove end - def self.format_for_email(html, post = nil, style: nil) + def self.format_for_email(html, post = nil, style = nil) Email::Styles.new(html, style: style).tap do |doc| + DiscourseEvent.trigger(:reduce_cooked, doc, post) doc.make_all_links_absolute doc.send :"format_#{style}" if style - DiscourseEvent.trigger(:reduce_cooked, doc, post) end.to_html end From 8f8ad3fe4afc294ce9088151a7ffc53c03415d36 Mon Sep 17 00:00:00 2001 From: Steve Kemp Date: Sun, 22 May 2016 11:54:03 +0300 Subject: [PATCH 10/51] Allow an (optional) post-creation time to be submitted. (#4205) * Allow an (optional) post-creation time to be submitted. This should allow a new post to be created with an initial date/time specified by the caller, which will be useful for people writing importers.. * Only allow `created_at` to be submitted via the API. This addresses the previous concern. --- app/controllers/posts_controller.rb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/app/controllers/posts_controller.rb b/app/controllers/posts_controller.rb index 2a21e8607d..e1d0831b26 100644 --- a/app/controllers/posts_controller.rb +++ b/app/controllers/posts_controller.rb @@ -544,7 +544,7 @@ class PostsController < ApplicationController :reply_to_post_number, :auto_track, :typing_duration_msecs, - :composer_open_duration_msecs + :composer_open_duration_msecs, ] # param munging for WordPress @@ -557,6 +557,10 @@ class PostsController < ApplicationController # We allow `embed_url` via the API permitted << :embed_url + + # We allow `created_at` via the API + permitted << :created_at + end params.require(:raw) From f387dfe2263ef198701d8876977881ce99fe385c Mon Sep 17 00:00:00 2001 From: Arpit Jalan Date: Sun, 22 May 2016 18:31:46 +0530 Subject: [PATCH 11/51] FIX: mixed case group mentions were not getting highligted in composer --- app/controllers/users_controller.rb | 2 +- spec/controllers/users_controller_spec.rb | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 719dcf37aa..af4708fb7e 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -211,7 +211,6 @@ class UsersController < ApplicationController def is_local_username usernames = params[:usernames] usernames = [params[:username]] if usernames.blank? - usernames.each(&:downcase!) groups = Group.where(name: usernames).pluck(:name) mentionable_groups = @@ -223,6 +222,7 @@ class UsersController < ApplicationController end usernames -= groups + usernames.each(&:downcase!) result = User.where(staged: false) .where(username_lower: usernames) diff --git a/spec/controllers/users_controller_spec.rb b/spec/controllers/users_controller_spec.rb index 43887f1ea5..9edaa64734 100644 --- a/spec/controllers/users_controller_spec.rb +++ b/spec/controllers/users_controller_spec.rb @@ -1516,6 +1516,7 @@ describe UsersController do describe ".is_local_username" do let(:user) { Fabricate(:user) } + let(:group) { Fabricate(:group, name: "Discourse") } it "finds the user" do xhr :get, :is_local_username, username: user.username @@ -1524,6 +1525,13 @@ describe UsersController do expect(json["valid"][0]).to eq(user.username) end + it "finds the group" do + xhr :get, :is_local_username, username: group.name + expect(response).to be_success + json = JSON.parse(response.body) + expect(json["valid_groups"][0]).to eq(group.name) + end + it "supports multiples usernames" do xhr :get, :is_local_username, usernames: [user.username, "system"] expect(response).to be_success From 695773db1c3af0142a92cc25d4fe6e852b71e698 Mon Sep 17 00:00:00 2001 From: Sam Date: Thu, 19 May 2016 22:25:08 +1000 Subject: [PATCH 12/51] FEATURE: upgrade from therubyracer to mini_racer This pushes our internal V8 JavaScript engine from Chrome 32 to 50. It also resolves some long standing issues we had with the old wrapper. --- Gemfile | 3 +- Gemfile.lock | 18 ++++---- app/models/site_customization.rb | 2 +- .../tilt/es6_module_transpiler_template.rb | 42 +++++++------------ lib/js_locale_helper.rb | 26 ++++++++---- lib/pretty_text.rb | 38 ++++++++--------- spec/components/js_locale_helper_spec.rb | 9 ++-- 7 files changed, 70 insertions(+), 68 deletions(-) diff --git a/Gemfile b/Gemfile index 178f640533..d96c77701f 100644 --- a/Gemfile +++ b/Gemfile @@ -106,7 +106,8 @@ gem 'sidekiq-statistic' # for sidekiq web gem 'sinatra', require: false -gem 'therubyracer' +gem 'execjs', github: 'rails/execjs', require: false +gem 'mini_racer' gem 'thin', require: false gem 'highline', require: false gem 'rack-protection' # security diff --git a/Gemfile.lock b/Gemfile.lock index 5ed3677067..3491b735a1 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,3 +1,9 @@ +GIT + remote: git://github.com/rails/execjs.git + revision: 22476229323cbec3befa8b690cc6c7c3957a0044 + specs: + execjs (2.6.0) + GEM remote: https://rubygems.org/ specs: @@ -94,7 +100,6 @@ GEM erubis (2.7.0) eventmachine (1.2.0.1) excon (0.45.4) - execjs (2.6.0) exifr (1.2.4) fabrication (2.9.8) fakeweb (1.3.0) @@ -144,7 +149,7 @@ GEM librarian (0.1.2) highline thor (~> 0.15) - libv8 (3.16.14.13) + libv8 (5.0.71.48.3) listen (0.7.3) logster (1.2.3) loofah (2.0.3) @@ -159,6 +164,8 @@ GEM method_source (0.8.2) mime-types (2.99.1) mini_portile2 (2.1.0) + mini_racer (0.1.3) + libv8 (~> 5.0) minitest (5.8.4) mocha (1.1.0) metaclass (~> 0.0.1) @@ -284,7 +291,6 @@ GEM redis (3.3.0) redis-namespace (1.5.2) redis (~> 3.0, >= 3.0.4) - ref (2.0.0) rest-client (1.8.0) http-cookie (>= 1.0.2, < 2.0) mime-types (>= 1.16, < 3.0) @@ -373,9 +379,6 @@ GEM activesupport (>= 4.0) sprockets (>= 3.0.0) stackprof (0.2.9) - therubyracer (0.12.2) - libv8 (~> 3.16.14.0) - ref thin (1.6.4) daemons (~> 1.0, >= 1.0.9) eventmachine (~> 1.0, >= 1.0.4) @@ -417,6 +420,7 @@ DEPENDENCIES ember-rails (= 0.18.5) ember-source (= 1.12.2) excon + execjs! fabrication (= 2.9.8) fakeweb (~> 1.3.0) fast_blank @@ -439,6 +443,7 @@ DEPENDENCIES memory_profiler message_bus (= 2.0.0.beta.11) mime-types + mini_racer minitest mocha mock_redis @@ -493,7 +498,6 @@ DEPENDENCIES sinatra spork-rails stackprof - therubyracer thin timecop uglifier diff --git a/app/models/site_customization.rb b/app/models/site_customization.rb index a74e188a23..562c544f40 100644 --- a/app/models/site_customization.rb +++ b/app/models/site_customization.rb @@ -59,7 +59,7 @@ SCRIPT begin code = transpile(node.inner_html, node['version']) node.replace("") - rescue Tilt::ES6ModuleTranspilerTemplate::JavaScriptError => ex + rescue MiniRacer::RuntimeError => ex node.replace("") end end 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 58eb0e678c..68b2ca990b 100644 --- a/lib/es6_module_transpiler/tilt/es6_module_transpiler_template.rb +++ b/lib/es6_module_transpiler/tilt/es6_module_transpiler_template.rb @@ -1,22 +1,9 @@ require 'execjs' require 'babel/transpiler' +require 'mini_racer' module Tilt - class Console - def initialize(prefix=nil) - @prefix = prefix || '' - end - - def log(msg) - Rails.logger.info("#{@prefix}#{msg}") - end - - def error(msg) - Rails.logger.error("#{@prefix}#{msg}") - end - end - class ES6ModuleTranspilerTemplate < Tilt::Template self.default_mime_type = 'application/javascript' @@ -30,10 +17,19 @@ module Tilt def self.create_new_context # timeout any eval that takes longer than 15 seconds - ctx = V8::Context.new(timeout: 15000) + ctx = MiniRacer::Context.new(timeout: 15000) ctx.eval("var self = this; #{File.read(Babel::Transpiler.script_path)}") ctx.eval("module = {}; exports = {};"); ctx.load("#{Rails.root}/lib/es6_module_transpiler/support/es6-module-transpiler.js") + ctx.attach("rails.logger.info", proc{|err| Rails.logger.info(err.to_s)}) + ctx.attach("rails.logger.error", proc{|err| Rails.logger.error(err.to_s)}) + ctx.eval < e - raise JavaScriptError.new(e.message, e.backtrace) - end + yield end - rval end def whitelisted?(path) @@ -98,7 +84,7 @@ module Tilt def babel_transpile(source) klass = self.class klass.protect do - klass.v8['console'] = Console.new("BABEL: babel-eval: ") + klass.v8.eval("console.prefix = 'BABEL: babel-eval: ';") @output = klass.v8.eval(babel_source(source)) end end @@ -108,7 +94,7 @@ module Tilt klass = self.class klass.protect do - klass.v8['console'] = Console.new("BABEL: #{scope.logical_path}: ") + klass.v8.eval("console.prefix = 'BABEL: #{scope.logical_path}: ';") @output = klass.v8.eval(generate_source(scope)) end diff --git a/lib/js_locale_helper.rb b/lib/js_locale_helper.rb index db4821a37b..eb2f1a19d3 100644 --- a/lib/js_locale_helper.rb +++ b/lib/js_locale_helper.rb @@ -154,15 +154,25 @@ module JsLocaleHelper result end - def self.compile_message_format(locale, format) - ctx = V8::Context.new - ctx.load(Rails.root + 'lib/javascripts/messageformat.js') - path = Rails.root + "lib/javascripts/locale/#{locale}.js" - ctx.load(path) if File.exists?(path) - ctx.eval("mf = new MessageFormat('#{locale}');") - ctx.eval("mf.precompile(mf.parse(#{format.inspect}))") + @mutex = Mutex.new + def self.with_context + @mutex.synchronize do + yield @ctx ||= begin + ctx = MiniRacer::Context.new + ctx.load(Rails.root + 'lib/javascripts/messageformat.js') + ctx + end + end + end - rescue V8::Error => e + def self.compile_message_format(locale, format) + with_context do |ctx| + path = Rails.root + "lib/javascripts/locale/#{locale}.js" + ctx.load(path) if File.exists?(path) + ctx.eval("mf = new MessageFormat('#{locale}');") + ctx.eval("mf.precompile(mf.parse(#{format.inspect}))") + end + rescue MiniRacer::EvalError => e message = "Invalid Format: " << e.message "function(){ return #{message.inspect};}" end diff --git a/lib/pretty_text.rb b/lib/pretty_text.rb index e3e5cc756b..b328f230f3 100644 --- a/lib/pretty_text.rb +++ b/lib/pretty_text.rb @@ -1,4 +1,4 @@ -require 'v8' +require 'mini_racer' require 'nokogiri' require_dependency 'url_helper' require_dependency 'excerpt_parser' @@ -7,7 +7,9 @@ require_dependency 'discourse_tagging' module PrettyText - class Helpers + module Helpers + extend self + def t(key, opts) key = "js." + key unless opts @@ -81,6 +83,7 @@ module PrettyText nil end end + end @mutex = Mutex.new @@ -92,9 +95,11 @@ module PrettyText def self.create_new_context # timeout any eval that takes longer than 15 seconds - ctx = V8::Context.new(timeout: 15000) + ctx = MiniRacer::Context.new(timeout: 15000) - ctx["helpers"] = Helpers.new + Helpers.instance_methods.each do |method| + ctx.attach("helpers.#{method}", Helpers.method(method)) + end ctx_load(ctx, "vendor/assets/javascripts/md5.js", @@ -198,6 +203,7 @@ module PrettyText # we use the exact same markdown converter as the client # TODO: use the same extensions on both client and server (in particular the template for mentions) baked = nil + text = text || "" protect do context = v8 @@ -206,8 +212,9 @@ module PrettyText context_opts = opts || {} context_opts[:sanitize] = true unless context_opts[:sanitize] == false - context['opts'] = context_opts - context['raw'] = text + + context.eval("opts = #{context_opts.to_json};") + context.eval("raw = #{text.inspect};") if Post.white_listed_image_classes.present? Post.white_listed_image_classes.each do |klass| @@ -258,8 +265,10 @@ module PrettyText # leaving this here, cause it invokes v8, don't want to implement twice def self.avatar_img(avatar_template, size) protect do - v8['avatarTemplate'] = avatar_template - v8['size'] = size + v8.eval < e - raise JavaScriptError.new(e.message, e.backtrace) - end + rval = yield end rval end diff --git a/spec/components/js_locale_helper_spec.rb b/spec/components/js_locale_helper_spec.rb index 1b26efe88c..125474f93d 100644 --- a/spec/components/js_locale_helper_spec.rb +++ b/spec/components/js_locale_helper_spec.rb @@ -1,5 +1,6 @@ require 'rails_helper' require_dependency 'js_locale_helper' +require 'mini_racer' describe JsLocaleHelper do @@ -25,7 +26,7 @@ describe JsLocaleHelper do end def setup_message_format(format) - @ctx = V8::Context.new + @ctx = MiniRacer::Context.new @ctx.eval('MessageFormat = {locale: {}};') @ctx.load(Rails.root + 'lib/javascripts/locale/en.js') compiled = JsLocaleHelper.compile_message_format('en', format) @@ -72,7 +73,7 @@ describe JsLocaleHelper do end it 'handles message format special keys' do - ctx = V8::Context.new + ctx = MiniRacer::Context.new ctx.eval("I18n = {};") JsLocaleHelper.set_translations 'en', { @@ -149,7 +150,7 @@ describe JsLocaleHelper do SiteSetting.default_locale = 'ru' I18n.locale = :uk - ctx = V8::Context.new + ctx = MiniRacer::Context.new ctx.eval('var window = this;') ctx.load(Rails.root + 'app/assets/javascripts/locales/i18n.js') ctx.eval(JsLocaleHelper.output_locale(I18n.locale)) @@ -167,7 +168,7 @@ describe JsLocaleHelper do LocaleSiteSetting.values.each do |locale| it "generates valid date helpers for #{locale[:value]} locale" do js = JsLocaleHelper.output_locale(locale[:value]) - ctx = V8::Context.new + ctx = MiniRacer::Context.new ctx.eval('var window = this;') ctx.load(Rails.root + 'app/assets/javascripts/locales/i18n.js') ctx.eval(js) From f06266f31e1293363d04bb3647ad5b99939af53a Mon Sep 17 00:00:00 2001 From: Sam Date: Fri, 20 May 2016 17:06:44 +1000 Subject: [PATCH 13/51] execjs 2.7 was just released to support mini_racer --- Gemfile | 3 +-- Gemfile.lock | 9 ++------- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/Gemfile b/Gemfile index d96c77701f..29c9292d08 100644 --- a/Gemfile +++ b/Gemfile @@ -105,8 +105,7 @@ gem 'sidekiq-statistic' # for sidekiq web gem 'sinatra', require: false - -gem 'execjs', github: 'rails/execjs', require: false +gem 'execjs', require: false gem 'mini_racer' gem 'thin', require: false gem 'highline', require: false diff --git a/Gemfile.lock b/Gemfile.lock index 3491b735a1..8ebfd949b7 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,9 +1,3 @@ -GIT - remote: git://github.com/rails/execjs.git - revision: 22476229323cbec3befa8b690cc6c7c3957a0044 - specs: - execjs (2.6.0) - GEM remote: https://rubygems.org/ specs: @@ -100,6 +94,7 @@ GEM erubis (2.7.0) eventmachine (1.2.0.1) excon (0.45.4) + execjs (2.7.0) exifr (1.2.4) fabrication (2.9.8) fakeweb (1.3.0) @@ -420,7 +415,7 @@ DEPENDENCIES ember-rails (= 0.18.5) ember-source (= 1.12.2) excon - execjs! + execjs fabrication (= 2.9.8) fakeweb (~> 1.3.0) fast_blank From 9285168aa433c24db86a4c89e69d2c08a127c121 Mon Sep 17 00:00:00 2001 From: Sam Date: Mon, 23 May 2016 11:58:20 +1000 Subject: [PATCH 14/51] use trusty --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index dc5a82fc36..03b1f5f1b3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -33,6 +33,7 @@ services: - redis-server sudo: false +dist: trusty cache: directories: From 1adf24656c0035bd8741a697e211876932e9c415 Mon Sep 17 00:00:00 2001 From: Sam Date: Mon, 23 May 2016 12:04:44 +1000 Subject: [PATCH 15/51] get trusty working on travis --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 03b1f5f1b3..43ef9e8166 100644 --- a/.travis.yml +++ b/.travis.yml @@ -32,7 +32,7 @@ rvm: services: - redis-server -sudo: false +sudo: required dist: trusty cache: From 64e59564dd41cd739ef53e3dcc79b197557a9e6a Mon Sep 17 00:00:00 2001 From: Sam Date: Mon, 23 May 2016 12:23:15 +1000 Subject: [PATCH 16/51] update gems --- Gemfile.lock | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 8ebfd949b7..deae609a31 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -38,16 +38,16 @@ GEM minitest (~> 5.1) thread_safe (~> 0.3, >= 0.3.4) tzinfo (~> 1.1) - annotate (2.7.0) + annotate (2.7.1) activerecord (>= 3.2, < 6.0) - rake (~> 10.4) + rake (>= 10.4, < 12.0) arel (6.0.3) - aws-sdk (2.2.9) - aws-sdk-resources (= 2.2.9) - aws-sdk-core (2.2.9) + aws-sdk (2.3.7) + aws-sdk-resources (= 2.3.7) + aws-sdk-core (2.3.7) jmespath (~> 1.0) - aws-sdk-resources (2.2.9) - aws-sdk-core (= 2.2.9) + aws-sdk-resources (2.3.7) + aws-sdk-core (= 2.3.7) babel-source (5.8.34) babel-transpiler (0.7.0) babel-source (>= 4.0, < 6) @@ -108,7 +108,7 @@ GEM fast_xs (0.8.0) ffi (1.9.10) flamegraph (0.9.5) - foreman (0.78.0) + foreman (0.82.0) thor (~> 0.19.1) fspath (2.1.1) gctools (0.2.3) @@ -117,7 +117,7 @@ GEM globalid (0.3.6) activesupport (>= 4.1.0) guess_html_encoding (0.0.11) - hashie (3.4.3) + hashie (3.4.4) highline (1.7.8) hiredis (0.6.1) htmlentities (4.3.4) @@ -133,12 +133,14 @@ GEM progress (~> 3.0, >= 3.0.1) image_size (1.4.1) in_threads (1.3.1) - jmespath (1.1.3) + jmespath (1.2.4) + json_pure (>= 1.8.1) jquery-rails (4.0.5) rails-dom-testing (~> 1.0) railties (>= 4.2.0) thor (>= 0.14, < 2.0) json (1.8.3) + json_pure (1.8.3) jwt (1.5.2) kgio (2.10.0) librarian (0.1.2) @@ -161,12 +163,12 @@ GEM mini_portile2 (2.1.0) mini_racer (0.1.3) libv8 (~> 5.0) - minitest (5.8.4) + minitest (5.9.0) mocha (1.1.0) metaclass (~> 0.0.1) mock_redis (0.15.4) moneta (0.8.0) - msgpack (0.7.4) + msgpack (0.7.6) multi_json (1.11.2) multi_xml (0.5.5) multipart-post (2.0.0) @@ -272,14 +274,14 @@ GEM activesupport (= 4.2.6) rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) - raindrops (0.15.0) - rake (10.5.0) + raindrops (0.16.0) + rake (11.1.2) rake-compiler (0.9.9) rake rb-fsevent (0.9.7) - rb-inotify (0.9.5) + rb-inotify (0.9.7) ffi (>= 0.5.0) - rbtrace (0.4.7) + rbtrace (0.4.8) ffi (>= 1.0.6) msgpack (>= 0.4.3) trollop (>= 1.16.2) @@ -290,7 +292,7 @@ GEM http-cookie (>= 1.0.2, < 2.0) mime-types (>= 1.16, < 3.0) netrc (~> 0.7) - rinku (1.7.3) + rinku (2.0.0) rmmseg-cpp (0.2.9) rspec (3.2.0) rspec-core (~> 3.2.0) @@ -385,15 +387,13 @@ GEM trollop (2.1.2) tzinfo (1.2.2) thread_safe (~> 0.1) - uglifier (2.7.2) - execjs (>= 0.3.0) - json (>= 1.8.0) + uglifier (3.0.0) + execjs (>= 0.3.0, < 3) unf (0.1.4) unf_ext unf_ext (0.0.7.1) - unicorn (5.0.1) + unicorn (5.1.0) kgio (~> 2.6) - rack raindrops (~> 0.7) PLATFORMS From 26084397c1219040dc9d8810e73d985b53dd80c6 Mon Sep 17 00:00:00 2001 From: Guo Xiang Tan Date: Mon, 23 May 2016 10:25:25 +0800 Subject: [PATCH 17/51] FIX: Check if file exists upfront. --- lib/file_store/local_store.rb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/lib/file_store/local_store.rb b/lib/file_store/local_store.rb index a4068e57d1..e9bbdab6a1 100644 --- a/lib/file_store/local_store.rb +++ b/lib/file_store/local_store.rb @@ -12,11 +12,10 @@ module FileStore def remove_file(url) return unless is_relative?(url) path = public_dir + url + return if !File.exists?(path) tombstone = public_dir + url.sub("/uploads/", "/tombstone/") FileUtils.mkdir_p(Pathname.new(tombstone).dirname) FileUtils.move(path, tombstone, :force => true) - rescue Errno::ENOENT - # don't care if the file isn't there end def has_been_uploaded?(url) From 3a140a982fd1d55b9f2e7e6a2416a6a57423c774 Mon Sep 17 00:00:00 2001 From: Guo Xiang Tan Date: Mon, 23 May 2016 11:22:25 +0800 Subject: [PATCH 18/51] Fix build. --- spec/components/file_store/local_store_spec.rb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/spec/components/file_store/local_store_spec.rb b/spec/components/file_store/local_store_spec.rb index 28f741f1aa..68724c5777 100644 --- a/spec/components/file_store/local_store_spec.rb +++ b/spec/components/file_store/local_store_spec.rb @@ -40,6 +40,7 @@ describe FileStore::LocalStore do it "moves the file to the tombstone" do FileUtils.expects(:mkdir_p) FileUtils.expects(:move) + File.expects(:exists?).returns(true) upload = Upload.new upload.stubs(:url).returns("/uploads/default/42/253dc8edf9d4ada1.png") store.remove_upload(upload) @@ -52,6 +53,7 @@ describe FileStore::LocalStore do it "moves the file to the tombstone" do FileUtils.expects(:mkdir_p) FileUtils.expects(:move) + File.expects(:exists?).returns(true) oi = OptimizedImage.new oi.stubs(:url).returns("/uploads/default/_optimized/42/253dc8edf9d4ada1.png") store.remove_optimized_image(upload) From b2d59a8de3cdc32deca1736a163b8507e1e11dc4 Mon Sep 17 00:00:00 2001 From: Sam Date: Mon, 23 May 2016 15:29:23 +1000 Subject: [PATCH 19/51] update docker test --- lib/tasks/docker.rake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/tasks/docker.rake b/lib/tasks/docker.rake index 0045fcee42..8e847c698f 100644 --- a/lib/tasks/docker.rake +++ b/lib/tasks/docker.rake @@ -15,7 +15,7 @@ task 'docker:test' do puts "Starting background redis" @redis_pid = Process.spawn('redis-server --dir tmp/test_data/redis') - @postgres_bin = "/usr/lib/postgresql/9.3/bin/" + @postgres_bin = "/usr/lib/postgresql/9.5/bin/" `#{@postgres_bin}initdb -D tmp/test_data/pg` # speed up db, never do this in production mmmmk From ab5337b79ca4e5dab3a0028dd54f2857023938a9 Mon Sep 17 00:00:00 2001 From: David Keller Date: Mon, 23 May 2016 08:12:02 +0200 Subject: [PATCH 20/51] Correct typo preventing script from running. (#4234) Signed-off-by: David Keller --- script/import_scripts/punbb.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/script/import_scripts/punbb.rb b/script/import_scripts/punbb.rb index a5d54372f1..6b8fad7f50 100644 --- a/script/import_scripts/punbb.rb +++ b/script/import_scripts/punbb.rb @@ -43,7 +43,7 @@ class ImportScripts::PunBB < ImportScripts::Base break if results.size < 1 - next if all_records_exist? :users, users.map {|u| u["id"].to_i} + next if all_records_exist? :users, results.map {|u| u["id"].to_i} create_users(results, total: total_count, offset: offset) do |user| { id: user['id'], From 8c525080076e31b003f8a0152490cf32de9da53f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9gis=20Hanol?= Date: Mon, 23 May 2016 09:33:29 +0200 Subject: [PATCH 21/51] warn users it may take a while to un/zip backup --- lib/backup_restore/backuper.rb | 4 ++-- lib/backup_restore/restorer.rb | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/backup_restore/backuper.rb b/lib/backup_restore/backuper.rb index b55d735907..163bc84508 100644 --- a/lib/backup_restore/backuper.rb +++ b/lib/backup_restore/backuper.rb @@ -257,12 +257,12 @@ module BackupRestore end end - log "Gzipping archive..." + log "Gzipping archive, this may take a while..." `gzip -5 #{tar_filename}` end def after_create_hook - log "Executing the after_create_hook for the backup" + log "Executing the after_create_hook for the backup..." backup = Backup.create_from_filename("#{File.basename(@archive_basename)}.tar.gz") backup.after_create_hook end diff --git a/lib/backup_restore/restorer.rb b/lib/backup_restore/restorer.rb index 15c177240e..3b843998ab 100644 --- a/lib/backup_restore/restorer.rb +++ b/lib/backup_restore/restorer.rb @@ -161,7 +161,7 @@ module BackupRestore end def unzip_archive - log "Unzipping archive..." + log "Unzipping archive, this may take a while..." FileUtils.cd(@tmp_directory) { `gzip --decompress '#{@archive_filename}'` } end From b6db022051ccadfcc53948c6eda9a198b6be0a90 Mon Sep 17 00:00:00 2001 From: Jeff Atwood Date: Mon, 23 May 2016 03:36:26 -0700 Subject: [PATCH 22/51] de-emphasize notification state text slightly --- app/assets/stylesheets/desktop/topic-post.scss | 14 +++++++++++--- app/assets/stylesheets/mobile/topic-post.scss | 11 +++++++++-- 2 files changed, 20 insertions(+), 5 deletions(-) diff --git a/app/assets/stylesheets/desktop/topic-post.scss b/app/assets/stylesheets/desktop/topic-post.scss index 079020e04b..f417858dd6 100644 --- a/app/assets/stylesheets/desktop/topic-post.scss +++ b/app/assets/stylesheets/desktop/topic-post.scss @@ -448,7 +448,7 @@ a.star { padding: 10px 10px 0 0; p { line-height: 32px; - color: $primary; + color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%)); } .btn { margin-bottom: 5px; @@ -757,8 +757,16 @@ $topic-avatar-width: 45px; border: 1px solid dark-light-diff($primary, $secondary, 90%, -60%); box-shadow: 0 1px 5px rgba(0,0,0, .4); background-clip: padding-box; - span {font-size: 0.857em;} - .title {font-weight: bold; display: block; font-size: 1em;} + span { + font-size: 0.857em; + color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%)); + } + span.title { + font-weight: bold; + display: block; + font-size: 1em; + color: $primary; + } } .dropdown-menu a { display: block; diff --git a/app/assets/stylesheets/mobile/topic-post.scss b/app/assets/stylesheets/mobile/topic-post.scss index 6fba9b16a6..b7b820a3c0 100644 --- a/app/assets/stylesheets/mobile/topic-post.scss +++ b/app/assets/stylesheets/mobile/topic-post.scss @@ -327,10 +327,11 @@ a.star { } } -/* this is to force the drop-down notification state description para below the button */ + #topic-footer-buttons p { - clear: both; + clear: both; /* this is to force the drop-down notification state description para below the button */ margin: 0; + color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%)); } #suggested-topics { @@ -408,6 +409,12 @@ iframe { margin-right: 5px; padding-top: 1px; } + span { + color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%)); + } + span.title { + color: $primary; + } } .btn-group { From a3672621258bb17d67b77c4d2ef42a6a7517460d Mon Sep 17 00:00:00 2001 From: Jeff Atwood Date: Mon, 23 May 2016 05:02:24 -0700 Subject: [PATCH 23/51] UX: simpler "white box" for oneboxes --- 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 46052351fb..5eb272d11c 100644 --- a/app/assets/stylesheets/common/base/onebox.scss +++ b/app/assets/stylesheets/common/base/onebox.scss @@ -88,7 +88,7 @@ a.loading-onebox { } aside.onebox { - @include post-aside; + border: 5px solid dark-light-diff($primary, $secondary, 90%, -85%); padding: 12px 25px 12px 12px; font-size: 1em; From 667dd54a23b705d4286ac0b2a8d398c13675963b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9gis=20Hanol?= Date: Mon, 23 May 2016 16:18:30 +0200 Subject: [PATCH 24/51] FEATURE: new 'crop_tall_images' site setting --- app/models/optimized_image.rb | 26 +++++++++++++++++++ app/models/upload.rb | 14 +++++----- config/locales/server.en.yml | 1 + config/site_settings.yml | 1 + lib/cooked_post_processor.rb | 15 +++++++++-- lib/image_sizer.rb | 15 +++++++++++ spec/components/cooked_post_processor_spec.rb | 18 ++++++------- 7 files changed, 71 insertions(+), 19 deletions(-) diff --git a/app/models/optimized_image.rb b/app/models/optimized_image.rb index 590724f21e..d228ce0598 100644 --- a/app/models/optimized_image.rb +++ b/app/models/optimized_image.rb @@ -45,6 +45,8 @@ class OptimizedImage < ActiveRecord::Base if extension =~ /\.svg$/i FileUtils.cp(original_path, temp_path) resized = true + elsif opts[:crop] + resized = crop(original_path, temp_path, width, height, opts) else resized = resize(original_path, temp_path, width, height, opts) end @@ -124,6 +126,25 @@ class OptimizedImage < ActiveRecord::Base } end + def self.crop_instructions(from, to, dimensions, opts={}) + %W{ + convert + #{from}[0] + -gravity north + -background transparent + -thumbnail #{opts[:width]} + -crop #{dimensions}+0+0 + -unsharp 2x0.5+0.7+0 + -quality 98 + -profile #{File.join(Rails.root, 'vendor', 'data', 'RT_sRGB.icm')} + #{to} + } + end + + def self.crop_instructions_animated(from, to, dimensions, opts={}) + resize_instructions_animated(from, to, dimensions, opts) + end + def self.downsize_instructions(from, to, dimensions, opts={}) %W{ convert @@ -144,6 +165,11 @@ class OptimizedImage < ActiveRecord::Base optimize("resize", from, to, "#{width}x#{height}", opts) end + def self.crop(from, to, width, height, opts={}) + opts[:width] = width + optimize("crop", from, to, "#{width}x#{height}", opts) + end + def self.downsize(from, to, dimensions, opts={}) optimize("downsize", from, to, dimensions, opts) end diff --git a/app/models/upload.rb b/app/models/upload.rb index dec7de8f2f..e2512efc4c 100644 --- a/app/models/upload.rb +++ b/app/models/upload.rb @@ -29,18 +29,16 @@ class Upload < ActiveRecord::Base thumbnail(width, height).present? end - def create_thumbnail!(width, height) + def create_thumbnail!(width, height, crop=false) return unless SiteSetting.create_thumbnails? - thumbnail = OptimizedImage.create_for( - self, - width, - height, + opts = { filename: self.original_filename, - allow_animation: SiteSetting.allow_animated_thumbnails - ) + allow_animation: SiteSetting.allow_animated_thumbnails, + crop: crop && SiteSetting.crop_tall_images + } - if thumbnail + if thumbnail = OptimizedImage.create_for(self, width, height, opts) self.width = width self.height = height save(validate: false) diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml index 663ea6a9b4..c486de15de 100644 --- a/config/locales/server.en.yml +++ b/config/locales/server.en.yml @@ -1094,6 +1094,7 @@ en: max_users_notified_per_group_mention: "Maximum number of users that may recieve a notification if a group is mentioned (if threshold is met no notifications will be raised)" create_thumbnails: "Create thumbnails and lightbox images that are too large to fit in a post." + crop_tall_images: "When creating a thumbnail of a tall image, crop it instead of generating a thin thumbnail." email_time_window_mins: "Wait (n) minutes before sending any notification emails, to give users a chance to edit and finalize their posts." private_email_time_window_seconds: "Wait (n) seconds before sending any private notification emails, to give users a chance to edit and finalize their messages." diff --git a/config/site_settings.yml b/config/site_settings.yml index 3f993bb21d..2a32d00c72 100644 --- a/config/site_settings.yml +++ b/config/site_settings.yml @@ -613,6 +613,7 @@ files: type: list default: '' create_thumbnails: true + crop_tall_images: true clean_up_uploads: true clean_orphan_uploads_grace_period_hours: 1 purge_deleted_uploads_grace_period_days: 30 diff --git a/lib/cooked_post_processor.rb b/lib/cooked_post_processor.rb index 9bb6b83b04..5234ad70e9 100644 --- a/lib/cooked_post_processor.rb +++ b/lib/cooked_post_processor.rb @@ -194,7 +194,10 @@ class CookedPostProcessor original_width, original_height = get_size(src) # can't reach the image... - if original_width.nil? || original_height.nil? + if original_width.nil? || + original_height.nil? || + original_width == 0 || + original_height == 0 Rails.logger.info "Can't reach '#{src}' to get its dimension." return end @@ -204,8 +207,16 @@ class CookedPostProcessor return if is_a_hyperlink?(img) + crop = false + if SiteSetting.crop_tall_images && (original_width.to_f / original_height.to_f < 0.75) + crop = true + width, height = ImageSizer.crop(original_width, original_height) + img["width"] = width + img["height"] = height + end + if upload = Upload.get_from_url(src) - upload.create_thumbnail!(width, height) + upload.create_thumbnail!(width, height, crop) end add_lightbox!(img, original_width, original_height, upload) diff --git a/lib/image_sizer.rb b/lib/image_sizer.rb index cc4ee8a6b5..3cf9f126fb 100644 --- a/lib/image_sizer.rb +++ b/lib/image_sizer.rb @@ -16,4 +16,19 @@ module ImageSizer [(w * ratio).floor, (h * ratio).floor] end + def self.crop(width, height, opts = {}) + return if width.blank? || height.blank? + + max_width = (opts[:max_width] || SiteSetting.max_image_width).to_f + max_height = (opts[:max_height] || SiteSetting.max_image_height).to_f + + w = width.to_f + h = height.to_f + + return [w.floor, h.floor] if w <= max_width && h <= max_height + + ratio = max_width / w + [max_width.floor, [max_height, (h * ratio)].min.floor] + end + end diff --git a/spec/components/cooked_post_processor_spec.rb b/spec/components/cooked_post_processor_spec.rb index 27e6e3f823..02e36bc8a5 100644 --- a/spec/components/cooked_post_processor_spec.rb +++ b/spec/components/cooked_post_processor_spec.rb @@ -110,7 +110,7 @@ describe CookedPostProcessor do SiteSetting.create_thumbnails = true Upload.expects(:get_from_url).returns(upload) - FastImage.stubs(:size).returns([1000, 2000]) + FastImage.stubs(:size).returns([1750, 2000]) # hmmm this should be done in a cleaner way OptimizedImage.expects(:resize).returns(true) @@ -120,8 +120,8 @@ describe CookedPostProcessor do it "generates overlay information" do cpp.post_process_images - expect(cpp.html).to match_html '

-logo.png1000x2000 1.21 KB + expect(cpp.html).to match_html '

+logo.png1750x2000 1.21 KB

' expect(cpp).to be_dirty end @@ -143,7 +143,7 @@ describe CookedPostProcessor do Discourse.stubs(:base_uri).returns(base_uri) Upload.expects(:get_from_url).returns(upload) - FastImage.stubs(:size).returns([1000, 2000]) + FastImage.stubs(:size).returns([1750, 2000]) # hmmm this should be done in a cleaner way OptimizedImage.expects(:resize).returns(true) @@ -153,8 +153,8 @@ describe CookedPostProcessor do it "generates overlay information" do cpp.post_process_images - expect(cpp.html).to match_html '

-logo.png1000x2000 1.21 KB + expect(cpp.html).to match_html '

+logo.png1750x2000 1.21 KB

' expect(cpp).to be_dirty end @@ -172,7 +172,7 @@ describe CookedPostProcessor do SiteSetting.create_thumbnails = true Upload.expects(:get_from_url).returns(upload) - FastImage.stubs(:size).returns([1000, 2000]) + FastImage.stubs(:size).returns([1750, 2000]) # hmmm this should be done in a cleaner way OptimizedImage.expects(:resize).returns(true) @@ -181,8 +181,8 @@ describe CookedPostProcessor do it "generates overlay information" do cpp.post_process_images - expect(cpp.html).to match_html '

- WAT1000x2000 1.21 KB + expect(cpp.html).to match_html '

+ WAT1750x2000 1.21 KB

' expect(cpp).to be_dirty end From 32d253d484327e4880c1097d03747f0919edebcb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9gis=20Hanol?= Date: Mon, 23 May 2016 16:42:19 +0200 Subject: [PATCH 25/51] remove 'crop_tall_images' site setting but keep the behavior --- app/models/upload.rb | 2 +- config/locales/server.en.yml | 1 - config/site_settings.yml | 1 - lib/cooked_post_processor.rb | 2 +- 4 files changed, 2 insertions(+), 4 deletions(-) diff --git a/app/models/upload.rb b/app/models/upload.rb index e2512efc4c..1b91109714 100644 --- a/app/models/upload.rb +++ b/app/models/upload.rb @@ -35,7 +35,7 @@ class Upload < ActiveRecord::Base opts = { filename: self.original_filename, allow_animation: SiteSetting.allow_animated_thumbnails, - crop: crop && SiteSetting.crop_tall_images + crop: crop } if thumbnail = OptimizedImage.create_for(self, width, height, opts) diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml index c486de15de..663ea6a9b4 100644 --- a/config/locales/server.en.yml +++ b/config/locales/server.en.yml @@ -1094,7 +1094,6 @@ en: max_users_notified_per_group_mention: "Maximum number of users that may recieve a notification if a group is mentioned (if threshold is met no notifications will be raised)" create_thumbnails: "Create thumbnails and lightbox images that are too large to fit in a post." - crop_tall_images: "When creating a thumbnail of a tall image, crop it instead of generating a thin thumbnail." email_time_window_mins: "Wait (n) minutes before sending any notification emails, to give users a chance to edit and finalize their posts." private_email_time_window_seconds: "Wait (n) seconds before sending any private notification emails, to give users a chance to edit and finalize their messages." diff --git a/config/site_settings.yml b/config/site_settings.yml index 2a32d00c72..3f993bb21d 100644 --- a/config/site_settings.yml +++ b/config/site_settings.yml @@ -613,7 +613,6 @@ files: type: list default: '' create_thumbnails: true - crop_tall_images: true clean_up_uploads: true clean_orphan_uploads_grace_period_hours: 1 purge_deleted_uploads_grace_period_days: 30 diff --git a/lib/cooked_post_processor.rb b/lib/cooked_post_processor.rb index 5234ad70e9..60af2b57ac 100644 --- a/lib/cooked_post_processor.rb +++ b/lib/cooked_post_processor.rb @@ -208,7 +208,7 @@ class CookedPostProcessor return if is_a_hyperlink?(img) crop = false - if SiteSetting.crop_tall_images && (original_width.to_f / original_height.to_f < 0.75) + if original_width.to_f / original_height.to_f < 0.75 crop = true width, height = ImageSizer.crop(original_width, original_height) img["width"] = width From b7e29eebe5bdf4aa2c7b888ae486d00423a7d227 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9gis=20Hanol?= Date: Mon, 23 May 2016 21:42:07 +0200 Subject: [PATCH 26/51] hide bounces in rejected email logs --- app/models/incoming_email.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/models/incoming_email.rb b/app/models/incoming_email.rb index 416cc3afc5..1266d665e2 100644 --- a/app/models/incoming_email.rb +++ b/app/models/incoming_email.rb @@ -3,7 +3,7 @@ class IncomingEmail < ActiveRecord::Base belongs_to :topic belongs_to :post - scope :errored, -> { where.not(error: nil) } + scope :errored, -> { where("NOT is_bounce AND LENGTH(COALESCE(error,'')) > 0") } end # == Schema Information From 7beea0493e288bea557ba468f2318d9425dc4a90 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9gis=20Hanol?= Date: Mon, 23 May 2016 22:50:18 +0200 Subject: [PATCH 27/51] add icon next to bounced emails in the sent email logs --- app/assets/javascripts/admin/templates/email-sent.hbs | 5 ++++- app/assets/javascripts/discourse/helpers/fa-icon.js.es6 | 1 + 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/app/assets/javascripts/admin/templates/email-sent.hbs b/app/assets/javascripts/admin/templates/email-sent.hbs index 4854a4e94f..847076f098 100644 --- a/app/assets/javascripts/admin/templates/email-sent.hbs +++ b/app/assets/javascripts/admin/templates/email-sent.hbs @@ -29,7 +29,10 @@ — {{/if}} - {{l.to_address}} + + {{#if l.bounced}}{{fa-icon "repeat" title="admin.email.bounced"}}{{/if}} + {{l.to_address}} + {{l.email_type}} {{#if l.post_url}} diff --git a/app/assets/javascripts/discourse/helpers/fa-icon.js.es6 b/app/assets/javascripts/discourse/helpers/fa-icon.js.es6 index 1d6a4e02ea..043c6a50e6 100644 --- a/app/assets/javascripts/discourse/helpers/fa-icon.js.es6 +++ b/app/assets/javascripts/discourse/helpers/fa-icon.js.es6 @@ -12,6 +12,7 @@ export function iconHTML(icon, params) { params = params || {}; var html = " Date: Tue, 24 May 2016 13:25:47 +1000 Subject: [PATCH 28/51] was failing on latest phantom, fix test --- spec/phantom_js/smoke_test.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/spec/phantom_js/smoke_test.js b/spec/phantom_js/smoke_test.js index 779b686eca..4b4db60c9b 100644 --- a/spec/phantom_js/smoke_test.js +++ b/spec/phantom_js/smoke_test.js @@ -190,6 +190,10 @@ var runTests = function() { return document.querySelector(".topic-list"); }); + test('we have a create topic button', function() { + return document.querySelector("#create-topic"); + }); + exec("open composer", function() { $("#create-topic").click(); }); From addd58d961639f550134e73e152833dd481bb5f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9gis=20Hanol?= Date: Tue, 24 May 2016 15:00:25 +0200 Subject: [PATCH 29/51] fix emoji size in email notifications --- lib/email/styles.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/email/styles.rb b/lib/email/styles.rb index 0156fe0643..a8d646ddff 100644 --- a/lib/email/styles.rb +++ b/lib/email/styles.rb @@ -37,7 +37,7 @@ module Email @fragment.css('img').each do |img| next if img['class'] == 'site-logo' - if img['class'] == "emoji" || img['src'] =~ /plugins\/emoji/ + if img['class'] == "emoji" || img['src'] =~ /(plugins|images)\/emoji/ img['width'] = 20 img['height'] = 20 else From 064603439783c9845ef1857920c0506a9600dde1 Mon Sep 17 00:00:00 2001 From: Arpit Jalan Date: Tue, 24 May 2016 19:33:59 +0530 Subject: [PATCH 30/51] FIX: respect mailing list confirmation dialog response --- .../javascripts/discourse/controllers/preferences.js.es6 | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/app/assets/javascripts/discourse/controllers/preferences.js.es6 b/app/assets/javascripts/discourse/controllers/preferences.js.es6 index 733268a168..729f749af1 100644 --- a/app/assets/javascripts/discourse/controllers/preferences.js.es6 +++ b/app/assets/javascripts/discourse/controllers/preferences.js.es6 @@ -134,13 +134,12 @@ export default Ember.Controller.extend(CanCheckEmails, { Em.run.next(()=>{ const postsPerDay = this.get('model.mailing_list_posts_per_day'); if (!postsPerDay || postsPerDay < 2) { - this.set('model.user_option.mailing_list_mode', true); - return; + return true; } bootbox.confirm(I18n.t("user.enable_mailing_list", {count: postsPerDay}), I18n.t("no_value"), I18n.t("yes_value"), (success) => { - if (success) { - this.set('model.user_option.mailing_list_mode', true); + if (!success) { + this.set('model.user_option.mailing_list_mode', false); } }); }); From d804b477258835f6ddf25fc6a298a40369f4c5c0 Mon Sep 17 00:00:00 2001 From: Neil Lalonde Date: Tue, 24 May 2016 11:58:18 -0400 Subject: [PATCH 31/51] FIX: tags input is too wide when editing a topic --- app/assets/javascripts/discourse/templates/topic.hbs | 1 + app/assets/stylesheets/common/base/tagging.scss | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/app/assets/javascripts/discourse/templates/topic.hbs b/app/assets/javascripts/discourse/templates/topic.hbs index 512927f8a2..e654107a45 100644 --- a/app/assets/javascripts/discourse/templates/topic.hbs +++ b/app/assets/javascripts/discourse/templates/topic.hbs @@ -24,6 +24,7 @@ {{/if}} {{#if canEditTags}} +
{{tag-chooser tags=buffered.tags}} {{/if}} diff --git a/app/assets/stylesheets/common/base/tagging.scss b/app/assets/stylesheets/common/base/tagging.scss index 40ee276863..0a14a1c4ca 100644 --- a/app/assets/stylesheets/common/base/tagging.scss +++ b/app/assets/stylesheets/common/base/tagging.scss @@ -141,6 +141,10 @@ header .discourse-tag {color: $tag-color !important; } margin: 5px 0; } +.title-wrapper .tag-chooser { + width: 500px; +} + .admin-tag { position: relative; float: right; From a38050a272b3a8c47f159007922a09e3c04bbd07 Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Tue, 24 May 2016 14:27:48 -0400 Subject: [PATCH 32/51] FIX: Only delete featured topics if the status changes to a hidden one --- app/models/topic_status_update.rb | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/app/models/topic_status_update.rb b/app/models/topic_status_update.rb index d3befc9f0b..cb8557f2a3 100644 --- a/app/models/topic_status_update.rb +++ b/app/models/topic_status_update.rb @@ -25,9 +25,13 @@ TopicStatusUpdate = Struct.new(:topic, :user) do topic.reload.set_auto_close(nil).save end - # pick up the changes right away as opposed to waiting for - # the schedule - CategoryFeaturedTopic.feature_topics_for(topic.category) + # remove featured topics if we close/archive/make them invisible. Previously we used + # to run the whole featuring logic but that could be very slow and have concurrency + # errors on large sites with many autocloses and topics being created. + if ((status.enabled? && (status.autoclosed? || status.closed? || status.archived?)) || + (status.disabled? && status.visible?)) + CategoryFeaturedTopic.where(topic_id: topic.id).delete_all + end end def create_moderator_post_for(status, message=nil) @@ -81,7 +85,7 @@ TopicStatusUpdate = Struct.new(:topic, :user) do end Status = Struct.new(:name, :enabled) do - %w(pinned_globally pinned autoclosed closed).each do |status| + %w(pinned_globally pinned autoclosed closed visible archived).each do |status| define_method("#{status}?") { name == status } end From 547abda6d67e6909294891e941735de844bd922f Mon Sep 17 00:00:00 2001 From: Jeff Atwood Date: Tue, 24 May 2016 12:10:29 -0700 Subject: [PATCH 33/51] add higher res favicons for onebox --- .../images/favicons/1282043220-favicon.ico | Bin 1150 -> 0 bytes app/assets/images/favicons/amazon.png | Bin 434 -> 2937 bytes app/assets/images/favicons/apple.png | Bin 216 -> 1579 bytes app/assets/images/favicons/discourse.png | Bin 412 -> 4459 bytes app/assets/images/favicons/github.png | Bin 600 -> 3557 bytes app/assets/images/favicons/google_play.png | Bin 655 -> 4835 bytes app/assets/images/favicons/rottentomatoes.png | Bin 834 -> 4219 bytes app/assets/images/favicons/stackexchange.png | Bin 272 -> 1845 bytes app/assets/images/favicons/twitter.png | Bin 415 -> 2217 bytes app/assets/images/favicons/wikipedia.png | Bin 225 -> 1912 bytes app/assets/stylesheets/common/base/onebox.scss | 1 + 11 files changed, 1 insertion(+) delete mode 100644 app/assets/images/favicons/1282043220-favicon.ico diff --git a/app/assets/images/favicons/1282043220-favicon.ico b/app/assets/images/favicons/1282043220-favicon.ico deleted file mode 100644 index 9dbcbb7496164f2c2a66642bca5fd14a35d0cd28..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1150 zcmb`EYeQa1;$% zxj8knjk&2?+Sx^?yLjD5TGAY%Ss9-qDuMKNKGp@y({mP42K8c#Ah@gUPdRZ_2PJ)F?5SYKp#!?#g))Pnn2E>ueWC_fmY zMY8dfzi~zuF42*t%LxAD5L_vRf2sntoEf*I11QV>fOE14@^Zdv6<#Fd3`||5gENH~ znk~YxPz=UH;9EKFaW-(-V>ly=qVVQCsvHm$9`Fi3#HU>y-m%lv7cPMR^H~I<=fQXo zdHvBVs4Q`!q;wWa15jmRvNO3Erx$5)K(Fr@^$Z+G-|z|ahfcvemJi>j7|%LcgX;Qa zDC+>_3#KO4Z-Y?Pje>aJ)s;hC^bp*xT=aO3fbk&m>=SoTzcL8zVhGimC8%mx|2ecu z{o3=tH)c?3&V<7%h0~S|#zW`mb?E1<&@b4bTcptb@EKKn;{Ru_-$UOu>_b=6ess5_ zqupJM#%T=;48zYHd^i diff --git a/app/assets/images/favicons/amazon.png b/app/assets/images/favicons/amazon.png index c81b56e76c53059e1e9fa79c3b4ca4d9fa2f809b..3f074f64f2afb90eb3ceb1ec09861d5d28629452 100644 GIT binary patch literal 2937 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 literal 434 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbMf-TYVISoiWYPc6&;EaT`v3mg|7(R))6)L$u>JJulYyb(|Em-Ke|`4<)#-mgmu%Mj|77=# z8#n&nn*aaFo}Zq#xq%*GFA4Gs4*T&v;9HRI8v*6(K%u#wE{-7*lB@?=lMVrWzG3lX z@63yj%)+0&`(J-;Qim9Wi1o#$pD(Iv__`WSni&_fFj?LF`|=4V#|vM*^~Yu^B-}fH z#z(;5TwVSIP9~##o78;{2eQ-3XInOWIF~Zx@WF!*FBV?zxV%~D!J^FY%QMcsx^4a7 z-@=+XY~8!+^7O;=UuPL+bJwhSz3SJRefx6F7O_5kU-Xr|EO|XcL(+eF$%}kXoF;QG Q06LVx)78&qol`;+0HFKl&j0`b diff --git a/app/assets/images/favicons/apple.png b/app/assets/images/favicons/apple.png index cad2143a4cb1d8a82f75271fc5cdad36713c8c71..aed253c7a1c0e7c74bd1b15f92b75e1deaab9a6c 100644 GIT binary patch literal 1579 zcmV+`2Gse9P)5H=x90uSYC=TQD z5dA&owGIL>dkZrW{d>%-90FigmvkIN^q(>MI0C@9fZK;?sElvo008|NoFBS;KFtA- zLH$!iiwl`&djR7-M2nB~xy=ETyHQa%fP?|I2Jm&@GQyQlcG1!{1{hhEEJHM0JRjKl zT|jv`eEEE4ppK0JhSuiKh6hl-xAohg=c@?E|HQajHU^kjg*y`-K!3>A;{n=Z;meoC z*?d5RObvVb?@6p>Yk+yxa9;7{b7%csY(6ArTpOnRw8TNS9}|?{FSh){{+v4j4bPrVR3o>-;2lja?542Am7ml@v5xKzFg-=tix4@hY}vI1}bS~{_p{IXz@MciJJjdJ;1{(vxF z6tsKB){W@{QaSx{=^L_$%lgL+GDx-w!^P)Q+5rUc50n-DD59Z*3&}js^MN{%kGXM$ zWb&sG4Ii>WekV{L2mmePyO*p)G;+8+A)sGF%Y^=WhBp^K_zQ+_G;XbYaQCLymV+Nq#_DlKDQe-^L z1R!Am&O#JoxE!;$6Sje;!)5GFw_p3Bf5viuTIAB9>z*_GJI@|$2{E&deD z@`csObs0Pc{U%Iywlb4~@<+-B}0rZC$ zy$)+PLo8n$&ulzENQGBE&Q5N@2w+}0?i|45kC+XKC0qpX_~)iJW(FXC2=Mq1V>l>E z#sR$l-^dbRKfLGv$O_B=mR82_KK{;NI5A>&L+}8;WC)<$01v?PAVUBd;3$CiGL`_Z z!UIq{GXxMmfCn&^B>)BpknD7TguV{H1k{@t0!XjJ1CU>42;g}F9)O^;1h^F*0Kb+Y zfVV$902~}zj~T$2#vtbbpJezt%mJJa78fuC;MYN14`6m<1|SXt2tYj}nE?pzK?J}- zqaPyx?P{pgqO>d%fRQzE5GH~41*4fEvI!;t4rUyn-m~h%*K^w-6xE6c<4!;4knB3pgoCbNr>k$ivY$~=Q7}zk8{S=vTUiW=z|X+1}t1FoY)IKfcI)k zSBr}aVVBQur==|gFm3^U1ANKi{Q|T!*$DZqU`AEzx6C{U7eM`#!JZ*nnyd$U{Ljp) z$z<1<_Xd~%@;l7-4GJ>>-v9R}R$>N_)D`7J1JLeauyGRZ_8D;&}5M#T{UC1#v-~uKx4B4j>vS4XwxTWM4imFs=pDNlI_Uv))%) zq&)_zl~!uUSP3xY)46^8HoTpj!ogT4#l6pgYo?amLf97Fe_mWHf2dzR{V$!x=2bF# zOD~Xd(RC-`vb4KEc9R=fQyv{*tNUL0{Xo-jU#X-#Ln5q5<2NVv0^Co~c#uC7x}Tgd z*|_DiGSU1UzDvXrI5*_6KP|t%vm)?@ih;`NQ)K?1UzftC2{XjkVr`c>y^ivvIFjtc zg}>b|P6`vXr$<&RF&!o6Rr2@b2YLJd-#(!u%Z_QFHP~Fu{kAz5fB}G`;sUq;E`ST* d0=NJ!z>j_^SvKn4OdkLM002ovPDHLkV1jt;;@XTm?& z%Y)t4Fec1Zu>T$QwM&E0&LL_}84k&C#sxct(K9w;(j( zzkqww`M5{ZTwNzA7T6!&H{&5k`$bpzOS9uD&+6_I$_uZ2TgVWxzlQO@_Rf1xm;Lw( Oar=S^ diff --git a/app/assets/images/favicons/discourse.png b/app/assets/images/favicons/discourse.png index 210d4118d59f0b2131c63275bb3d0c0166271e15..59be3f7aa264a888de56f913541ed438a3025432 100644 GIT binary patch literal 4459 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 JPDHLkV1n3+^4kCa literal 655 zcmV;A0&x9_P) z)IMe0Kv`Y$(PRG9$vtFHKn^Y zsJu9dd)df!9A^;XqOGZC76Q(O~)0 zV*Jx?<;yOZw{qIav`3V}Jc7$Tb8y7zC%2eUZR^`qAjdv6m z>SF)^04{V=PE!C75U=lm5WnwWzu!>5zd*mQAitjwzwc1L?=ZjbfDpf*AiuvLzrR4= zV6X3R05aJw0001@Nkls{Q*EmsviKdv^;j!H-Jp;-Pc23fK07cb=wEXV59YFvg6*7>BIWH ztlBy1O=efNs*9Pb>s~W|aJt*+Tvb=SWMO8ps=EK|Syr~I>FT5>WOc$;HS7^&d~LhV pM;`zg-*4C*fNXvaZU7Jfz&{fSBN6iYQb_;+002ovPDHLkV1i*BTuJ}{ diff --git a/app/assets/images/favicons/rottentomatoes.png b/app/assets/images/favicons/rottentomatoes.png index ff9041be2c2174e0f12c947428856c5b11451fa0..6344c1922cd4e8ed97b2f6d9a63c5fbd9458b5a5 100644 GIT binary patch literal 4219 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 literal 834 zcmV-I1HJr-P)P>rrTRmba6(KI3>!KMu}P}iD6Osr3@B@A+tV|UHni) z1V(iEBH4|K=mJq#P|`ij>y~%ZrknnI-nq=6FCBQ^b9gwv|MP#&dk)dW0h&};E&0pK z?2|_2l3n_n-Zbawe?~^NG-E?~e0oZOt}(01l&pDOS;fZ^#R;%A%aCPCB?e+T&+gIC-NV7{Y<;K7ysXQqq z3t_1+VO@o>F4Jz>@|&@ly>9+2HkT$W%P);tjrPTnL*FtN;A?RLT6P-IyD=7RtF-7P5x0{fQJ1PkCn?dy zqRb2rP#9WCSWo<^?N@}unWXXbY}LbMH^X%*1>L(PIMbrx(5Ue-I1DefYPmYY0=FZ$ zdsyHj301Pd!@dwToGUb*&fGZk9bS$fEYe+U#P`%Fw6Q?T7~~DMj!&d=GmJ+x|01^_ zTV^pScS|(7Sfq=cbZ|S4C6Q?5>Mg#?Upe0JIXoq$`#!gGi9#x=jl}#xxu3aV zL+$zqIF@VRT&Y336oEEThD9_o_>RHn9Cv6wYADowisr#ab5`;7r^&qOZJ#VMRdmS} zTSGYlM4w#&^$b4XidRX2vlQ$qr$7|Z%v<9(v6)oSY_rREvL5-6*zO419eqN|(OOb? z&Qpl{C5!DGMa;2nhp#3)yyLb z@V*HjJ1!y*uA2Oql&5cy;>8&XZnsfjYZ1+QW+ne)W}-#o56Z{<0wd0Lesi3(nE(I) M07*qoM6N<$g771cL;wH) diff --git a/app/assets/images/favicons/stackexchange.png b/app/assets/images/favicons/stackexchange.png index 77ebf192f02096bb7b7684e4104c6259795f51bb..c33bb9275b22d43c50a5fc81918d092200e75ab2 100644 GIT binary patch literal 1845 zcmV-52g>+~P) zDE8~yJ>Se1rs|w~7iY=<00000000000000000000pzpZ<|Cw_GvCk(5Dz*dbc#NhZ|K{--zh1ml_FaH4YvqtA$$l|a06D*cDP zK@;!|g5Op;{C!Qn8;bWVVrJuJ&JPWzx@S`OpCar%NS{$S*0bQ|hK55;v-SgtjGNm1 z9s=H5)31gT-P5@l4hP}3P9+de{~e+3oAjCeFYx-OCo|bG&T8~@-q zCL5t-*D(6Wzl8v^HT`$vR=IrZ|Noscj5}NiFzds>>-Ycf^8rjY0?Eu(^pF1xA!hAI z#x|9(0O?i1L^_QC4}dKhhh+-@Q2>Ynpa3$yl6T9_i#I(TWw4}3Si0b=SMe%j{;aO{CS%u9|geLM**<*Q2?xc6u`9J z_((fnuxav90Bd;zg}K#pKlAFb;zj=|5 z{LwRfL_a(H$Im)Y0D(Ghr|^GE;r}>`AW;ChCx6tBpA`~53Lrdu0h5mcVC|y-f}QdE zm&B}n6hOSQ|M-f4$wvW%>m+CX;blHj#N?v@;x)n_^%G&?qX6R9zOe970P$;IK)5J? zc<27<6+T+T+D8GzyWrLaG2x>C;+=c5z{y7e#IOA^KYdPApeO*=z6A=9duQ`$>K!kQ zSae6js2`F!zkGVs=%2{t0MEu_82|tPAPM8V)q@?rsK?=}{*fpLEh+nvqUzFns+w~(l+_=VRNbG!J^P=Fl2aSl+^)nDO{^+fqa6ux*q6;0qnveTy?O$+>3BxB9HSbNuwP7HW4TqS|o9*7P(ly0<5k) z-QkV4_GS3vyjiS$Syc6g(-#&gOh(3eYHBH{-o85KUwmDOslz9~p#rQQxw7CeCL&7|Lx* z-t<3=l%CO^GTT^B&5IP`H~SmDkhSmX1GPPFf6tSL7jE zZe)OQ)x<0V6=96OYQXnT4Wsu{=#_M`ShL9yD=KSf@@s6G7!{ZPw4&+V*@v&cu+zUo z)$gL?{SBu%^DktK9mK2+KWOI9E04)pT729lFC|Y|Bu<-}H=4qGH@gDp>lIZ$eP@3@ z13zqxCva4NclLAYzoyk*dhX(~6B)2x0TeA#wdqApV6_5hkqu|%7M;w1#R_0NxzqH9 z)7%?u3|OxKic4>@YXz4vV8H^=>*DAA~1& z7A%0G=}EhD1J=Gp3(%!FBV(}kEm#2KgwJ+GWS#}rJ~(C3`ZH{~d6SuY;~@+H00000 j0000000000ke6=(Mac1bKMc~C00000NkvXXu0mjfh$fMk literal 272 zcmV+r0q_2aP)Z?k87^DWImH{11z4mI$tebEC6N6hXK3k1pz^vqVhP*k&!XB5JSYbE=P!LtjAn=dEr0kd8-!2{&l${;yxz)rSl{s_d`WCbqR0P7}gT=D=g WOh9Q1O%G520000_ZicAjp;qgil@K$Hi&sUnc*VjunlQ8AdLSn&LX@tt(m+553H=R__XniA1(De!138be1NHt(4YOA`K{N1;|t|8cwmTjZ%8iGTW{)_oh__r?JE7bb5Y$yVzq zsByeu^=Cg_?9c3{!-o<-K>nsh-VYo4WeR@Ig%L z%sG}G(|T)w+3&#d0R#5H+)2j=6}11S)4Fq8d=W&=_nL|UNMk$*_8uRwwZNro0A`0u zl1Y}>Aw2HYzq+#Z`l7zLk=>7CdLqEa_p5W@lYSf=&6H>J-jE-M=!FmXFmt9tl5N^v z$4UkqZC(fQB}pY2#-d$kJj_V;QXBIpOLqU4*FgMnVbc6T8DHMf!{5&EIEZ=uU0TI^ zgFhek$eSdv@_Ya^1EimpI%Z8Qozjg+$&%{F>COsaU-?c>}p(b##2O#bzjh)k4+637?{(^?Vm_ zlBp6F>5*3->=`+tlq%sl2NmK8T)H!04-biS0PI|`tsh-GREpBZGzuK;F553aIH}L02L`mLrN>%Ul1Ixq(bFd1d680$mt&--L7Kg zWSFjQs*b$yX&ui{!Fpd1D=le_4_M^wRkWUO|E@K@AmvJcG(v^zowd8G_yk0=-y%&4 zRJ@+J|LOAfm4}TMUw%6vU#cPw+x?F=z9OBfET$)@kV|jUgwyyAB)r1XRSRnY=$zsj z-)Yz1J3hJdUOZ|L)7GYLz^HLw0>{ULTWkhV4QageEH-sTE=PcvR|e#B!SRbK`a)a3 z1B~y;}L?sPePae9vm$Xj(32hJpi6l(dQF?qAZ!F4p>KHRn)E% zKl_`y08y7cg!JHtyXd6q$I-BLbhnDz=>W*KFn*9j#gLx*JuHW3#(TQ&AfhJSPLlKw zrmjf4H*oZdik(BnuP;E9{$b&hKsA{d-Dmv#-4?FBU;_zt{n>v^KOt@6=L`aM{U@4! z#3HXKSIhOc_)ln^(mmg@8QH)0uzipD&pGCZlwZjrm>RvQs_Y?p+GeGjB0Ux3pd(r(|AN48=57 zx~Ldssc!SS*z@h)sa;;-s>m%^*3oIw!Q1QeeaE|q2Qx}%{f4Dj6dXssXA8mc1i+>> zN{8D#$D2sWSY0Z5Wa%=>qI(Gi$lsK@H+g%wKD7ZfTdvXn=ZTGX)IKT~cio9gmn_#Z zBhs&gF8jAMI0mFKb$mZi`XU38?V}k?Ygwe*tmEqkqjVYzn2iDCi=>kUIKE$mmSf!7 z7jj7MLhkDCH{{|asbLe5`?Q4X9=UDI=w7|~1G#jmk8=1gNJ-lQ=lKdmjo->Z5Vu%c z;gPnK);DI+C;_HFvPkiO&8Ug+4?;rgXcDLU^6!rYNV`gh3;#rK*D1zwNp%G-Y4-oU zKv^E7Pf(>_3Tb;Ry3!)8o70P#iX=rsm;DAXJxHSHvf~A5N-?;T;gyyfGyeTXDS9jU z;s*oF{wtj@tfOlHiSul@FnCQY9|tk52~qmhO1gJV2ubXa{t*&hUz#MyWz>V)OuAd* z2|#K{vc)={B%(@n5IBCxB0WARFkKD_ofTjzmql+RZzanu;{CF1Qxru}6h%=KMNt$* rQ4~c{6h%=KMNt$*Q4~c{6h-+TKWIeMZ51}`00000NkvXXu0mjfk!?xF literal 415 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbMf(g2?jS0MfF`>(#^ckA}wn0Nl6 z|H?D^vkp5fI4VDB-@FTt?YBKn*l_;b^AG%MUYvjRW!~-20v+4(_uO3nz!^&3-(=IS9yw5P@48xMg3^T7Vbna!CfBV5s)$c%u z>XZce1vBs$G$w4ku>V2Qsrd$bZM>jBP?MoI# zui0<=+yo8^npV|&$Ssoan^+OK2t*tTukwr$(CZQHhO+qOBlk50PhA`fmM?~V zz*|{{31}pTHa1)Exs3dkJ(!Jplo}>xHSUbW{KBqGNFJ@0iP?ac_($wYnV%6?E(*YJ_gyeWeRN`Q4TKGN^doA(iaISryTC5gv;%;FCtt%4n5qWG5j>P`K zIOaFqn%JF@{Pnk~;~SBJrLh^4-y*Tc#16&(4zGKP0INoR2;<%)$A~&XB;dN_uS{6J zqX`X;abCxzuv^D@{M{H~(}{-gce=2dOpNfhLu=>9@S5kyVfRoN_ZyvzxTnNDuq#$K zMq=M3kFu+C%}Ur!>Wo*eq5?J&33#0xHuH(-Rfwv0hR-jFN4GV#3sV8D{30e8^I;Q+ zJLnP7z^(86er@aueCiCe0xIGx@hV=8)k-3LvochkSDb3(v0L1E+}){=85t0h+A*;y z@OH`cE$#enJ(9S}X_~vKkboz|J+Kc}8%JXQWIT!j9&nn-0(PDJVZ0|RFd}@H95!`) z7KuKdqFJ0fY%`MB&UwTIsh|eFl_Nr{-6F9+(aJxr34i(l1q?*X@g{jH>L|H3WYxw` zk?38*e!MsU-WC&a=j=g+O-7%5CtDp6iGGhf04Ik(`HVV}IMtbCbyIP7i+kWGtj6Kb zNc8GJk27J~nIxL{Q8a)Rw2Vl=H`HTwb|m@<0`?2P`;tbISj!n#EKCXtd>~S=0ajDE zZ=!JS{$=>xUS;2r?~o%EyNColNr2V$k?7)T!`C#C#01Vfb5Byz$!{VBvtl(ngTs~s zNag@%3fxU<&K6JoV(cE!)#nG=NTR^UVeB=eXeI{4-c2V~OX>u0ILR#P#4bvT0v;1j ze^0FPye#5>rV9hPIr=sMsajQ3-~&cswT_5Cj%2#|QzSnnwR|S3upCzPd>x5ihh(;P z#-d}8x_v|f?!xYH-Idz$oY-hdQLh-(_A?n)6Ve|U5Y2_%jA9KiWf#j+A9lBhEi=25 zodz(^|HPc4GyIkYtdx++`ivHSj6~nS@H+U-NmM3mA`9M}MJ8;;w2LM?AWLq|e+L?onI;3M;w1NZ=kN?w(7@lpBpJd<}dl&J2$d!{U!Ah-H*-#nd?y77+>f zg4&of0{u)*(Ox2c-I#^AR|v?I9B+s!Y{XD`=c=1=jmck;=w~98yfggW_GHdhA_314 z;9Az{CFW-#kmeP;-mrm7CG4kQb6kCzLovHhb(5 zxSZH4_?t=PrtF+#(q#0j&QNTMen^3+O+^Av=N}6=AA`xPJ46)@0{|wcuS6f;Bu13K z(iK^P-I~l=DyB0$%^BsjS>HtAXt9Go!sr$gD84hrXwi%^x?d67Z>W_QX{!*vYuC)-f9nplTfC|{mAnH10SJkRqy&+|Ob y^SqHYIGPuq0H1)-w)h121o#B_1o#B_1pEinsFrkF5e@dHbtjrlRX1sjyGCU%@s=7*2Lej>{=EU(6EKDqGS+-RH_2ziGIEGZ*N=`Vy zyJpVKJ*;J%VTK#Dj4eFf3c?HwikX<3eHo7Hx2wk?BUgp6d@foTTz2?B1Lgc*1u W#mr|i`LqD-W$<+Mb6Mw<&;$Ss+E20o diff --git a/app/assets/stylesheets/common/base/onebox.scss b/app/assets/stylesheets/common/base/onebox.scss index 5eb272d11c..13e1fac062 100644 --- a/app/assets/stylesheets/common/base/onebox.scss +++ b/app/assets/stylesheets/common/base/onebox.scss @@ -83,6 +83,7 @@ a.loading-onebox { @mixin onebox-favicon($class, $image) { &.#{$class} .source { background: image-url("favicons/#{$image}.png") no-repeat; + background-size: 16px 16px; padding-left: 20px; } } From 2293fca01277f0995f11d38e35c1b9be56e3b4da Mon Sep 17 00:00:00 2001 From: Neil Lalonde Date: Tue, 24 May 2016 16:15:57 -0400 Subject: [PATCH 34/51] FEATURE: after category name is changed, URLs with old category slug and tag filter will redirect to new category slug --- app/controllers/tags_controller.rb | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/app/controllers/tags_controller.rb b/app/controllers/tags_controller.rb index 6b25d361de..6b08a54f3b 100644 --- a/app/controllers/tags_controller.rb +++ b/app/controllers/tags_controller.rb @@ -167,11 +167,11 @@ class TagsController < ::ApplicationController parent_category_id = nil if parent_slug_or_id.present? parent_category_id = Category.query_parent_category(parent_slug_or_id) - raise Discourse::NotFound if parent_category_id.blank? + redirect_or_not_found and return if parent_category_id.blank? end @filter_on_category = Category.query_category(slug_or_id, parent_category_id) - raise Discourse::NotFound if !@filter_on_category + redirect_or_not_found and return if !@filter_on_category guardian.ensure_can_see!(@filter_on_category) end @@ -197,4 +197,17 @@ class TagsController < ::ApplicationController options end + + def redirect_or_not_found + # automatic redirects for renamed categories + url = params[:parent_category] ? "c/#{params[:parent_category]}/#{params[:category]}" : "c/#{params[:category]}" + permalink = Permalink.find_by_url(url) + + if permalink.present? && permalink.category_id + redirect_to "#{Discourse::base_uri}/tags#{permalink.target_url}/#{params[:tag_id]}", status: :moved_permanently + else + # redirect to 404 + raise Discourse::NotFound + end + end end From 99b95f1fc94fb20ff0ce127c25c64263c05562b1 Mon Sep 17 00:00:00 2001 From: Jeff Atwood Date: Tue, 24 May 2016 23:58:54 -0700 Subject: [PATCH 35/51] use #category text in cat search checkbox --- config/locales/client.en.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml index 5a4c386f43..50f7a44d46 100644 --- a/config/locales/client.en.yml +++ b/config/locales/client.en.yml @@ -1147,7 +1147,7 @@ en: context: user: "Search posts by @{{username}}" - category: "Search the \"{{category}}\" category" + category: "Search the #{{category}} category" topic: "Search this topic" private_messages: "Search messages" From a19e43fd3b83f9e2be632edaf69cc4ce01fe787b Mon Sep 17 00:00:00 2001 From: Sam Date: Wed, 25 May 2016 21:08:48 +1000 Subject: [PATCH 36/51] enough with the malloc limit, not needed --- app/models/admin_dashboard_data.rb | 6 +----- config/deploy.rb.sample | 4 ++-- config/discourse.config.sample | 1 - config/unicorn_upstart.conf | 1 - script/bench.rb | 1 - spec/models/admin_dashboard_data_spec.rb | 14 -------------- 6 files changed, 3 insertions(+), 24 deletions(-) diff --git a/app/models/admin_dashboard_data.rb b/app/models/admin_dashboard_data.rb index b1bec980dd..b5ca6de755 100644 --- a/app/models/admin_dashboard_data.rb +++ b/app/models/admin_dashboard_data.rb @@ -91,7 +91,7 @@ class AdminDashboardData ] add_problem_check :rails_env_check, :ruby_version_check, :host_names_check, - :gc_checks, :ram_check, :google_oauth2_config_check, + :ram_check, :google_oauth2_config_check, :facebook_config_check, :twitter_config_check, :github_config_check, :s3_config_check, :image_magick_check, :failing_emails_check, :default_logo_check, :contact_email_check, @@ -169,10 +169,6 @@ class AdminDashboardData I18n.t("dashboard.host_names_warning") if ['localhost', 'production.localhost'].include?(Discourse.current_hostname) end - def gc_checks - I18n.t("dashboard.gc_warning") if ENV['RUBY_GC_MALLOC_LIMIT'].nil? - end - def sidekiq_check last_job_performed_at = Jobs.last_job_performed_at I18n.t('dashboard.sidekiq_warning') if Jobs.queued > 0 and (last_job_performed_at.nil? or last_job_performed_at < 2.minutes.ago) diff --git a/config/deploy.rb.sample b/config/deploy.rb.sample index aa14a3e96f..363f158906 100644 --- a/config/deploy.rb.sample +++ b/config/deploy.rb.sample @@ -43,7 +43,7 @@ end namespace :deploy do desc 'Start thin servers' task :start, :roles => :app, :except => { :no_release => true } do - run "cd #{current_path} && RUBY_GC_MALLOC_LIMIT=90000000 bundle exec thin -C config/thin.yml start", :pty => false + run "cd #{current_path} && bundle exec thin -C config/thin.yml start", :pty => false end desc 'Stop thin servers' @@ -53,7 +53,7 @@ namespace :deploy do desc 'Restart thin servers' task :restart, :roles => :app, :except => { :no_release => true } do - run "cd #{current_path} && RUBY_GC_MALLOC_LIMIT=90000000 bundle exec thin -C config/thin.yml restart" + run "cd #{current_path} && bundle exec thin -C config/thin.yml restart" end end diff --git a/config/discourse.config.sample b/config/discourse.config.sample index a3f3652fd8..7e8bd8540d 100644 --- a/config/discourse.config.sample +++ b/config/discourse.config.sample @@ -13,7 +13,6 @@ respawn limit 3 30 start on runlevel [2345] stop on runlevel [06] -env RUBY_GC_MALLOC_LIMIT=90000000 env RAILS_ROOT=/var/www/discourse env RAILS_ENV=production env NUM_WEBS=4 diff --git a/config/unicorn_upstart.conf b/config/unicorn_upstart.conf index 49cb2bb778..5f0e3c639e 100644 --- a/config/unicorn_upstart.conf +++ b/config/unicorn_upstart.conf @@ -23,7 +23,6 @@ exec /bin/bash <<'EOT' # set HOME to the setuid user's home, there doesn't seem to be a better, portable way export HOME="$(eval echo ~$(id -un))" export RAILS_ENV=production - export RUBY_GC_MALLOC_LIMIT=90000000 cd /var/www/discourse diff --git a/script/bench.rb b/script/bench.rb index ea79eae9a6..61a3857b81 100644 --- a/script/bench.rb +++ b/script/bench.rb @@ -111,7 +111,6 @@ discourse_env_vars = %w(DISCOURSE_DUMP_HEAP RUBY_GC_HEAP_INIT_SLOTS RUBY_GC_HEAP if @include_env puts "Running with tuned environment" - ENV["RUBY_GC_MALLOC_LIMIT"] = "50_000_000" discourse_env_vars - %w(RUBY_GC_MALLOC_LIMIT).each do |v| ENV.delete v end diff --git a/spec/models/admin_dashboard_data_spec.rb b/spec/models/admin_dashboard_data_spec.rb index 507518a36c..eae7f68079 100644 --- a/spec/models/admin_dashboard_data_spec.rb +++ b/spec/models/admin_dashboard_data_spec.rb @@ -70,20 +70,6 @@ describe AdminDashboardData do end end - describe 'gc_checks' do - subject { described_class.new.gc_checks } - - it 'returns nil when gc params are set' do - ENV.stubs(:[]).with('RUBY_GC_MALLOC_LIMIT').returns(90000000) - expect(subject).to be_nil - end - - it 'returns a string when gc params are not set' do - ENV.stubs(:[]).with('RUBY_GC_MALLOC_LIMIT').returns(nil) - expect(subject).to_not be_nil - end - end - describe 'sidekiq_check' do subject { described_class.new.sidekiq_check } From 5ec98e7ec53e954bb0e5b86ba7819a37bb84c78f Mon Sep 17 00:00:00 2001 From: Arpit Jalan Date: Wed, 25 May 2016 21:53:42 +0530 Subject: [PATCH 37/51] update onebox gem --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index deae609a31..995efb13e0 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -215,7 +215,7 @@ GEM omniauth-twitter (1.2.1) json (~> 1.3) omniauth-oauth (~> 1.1) - onebox (1.5.39) + onebox (1.5.41) htmlentities (~> 4.3.4) moneta (~> 0.8) multi_json (~> 1.11) From fe42b189c95e14f2892aa0a21e4dbc25382bb652 Mon Sep 17 00:00:00 2001 From: Neil Lalonde Date: Wed, 25 May 2016 12:41:32 -0400 Subject: [PATCH 38/51] FIX: vanilla_mysql importer removes everything between the first and last img tags in a post --- script/import_scripts/vanilla_mysql.rb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/script/import_scripts/vanilla_mysql.rb b/script/import_scripts/vanilla_mysql.rb index aba0dd9423..9bf33fd637 100644 --- a/script/import_scripts/vanilla_mysql.rb +++ b/script/import_scripts/vanilla_mysql.rb @@ -320,7 +320,9 @@ class ImportScripts::VanillaSQL < ImportScripts::Base raw.gsub!(/\[attach[^\]]*\]\d+\[\/attach\]/i, "") # sanitize img tags - raw.gsub!(/\/i) {"\n\n"} + # This regexp removes everything between the first and last img tag. The .* is too much. + # If it's needed, it needs to be fixed. + # raw.gsub!(/\/i) {"\n\n"} raw end From 58ceecd47b56075e9721781fc15c048fa523f34d Mon Sep 17 00:00:00 2001 From: Arpit Jalan Date: Wed, 25 May 2016 22:29:47 +0530 Subject: [PATCH 39/51] FIX: support 10 characters tld for user profile website --- app/models/user_profile.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/models/user_profile.rb b/app/models/user_profile.rb index 7137290326..7cbae308d0 100644 --- a/app/models/user_profile.rb +++ b/app/models/user_profile.rb @@ -1,7 +1,7 @@ class UserProfile < ActiveRecord::Base belongs_to :user, inverse_of: :user_profile - WEBSITE_REGEXP = /(^$)|(^(http|https):\/\/[a-z0-9]+([\-\.]{1}[a-z0-9]+)*\.[a-z]{2,9}(([0-9]{1,5})?\/.*)?$)/ix + WEBSITE_REGEXP = /(^$)|(^(http|https):\/\/[a-z0-9]+([\-\.]{1}[a-z0-9]+)*\.[a-z]{2,10}(([0-9]{1,5})?\/.*)?$)/ix validates :bio_raw, length: { maximum: 3000 } validates :website, format: { with: WEBSITE_REGEXP }, allow_blank: true, if: Proc.new { |c| c.new_record? || c.website_changed? } From cf97efb6439eab6eddfcda4823afd21b6c2a891a Mon Sep 17 00:00:00 2001 From: Arpit Jalan Date: Wed, 25 May 2016 23:41:07 +0530 Subject: [PATCH 40/51] make the text field autofocus on admin-login page --- app/views/users/admin_login.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/users/admin_login.html.erb b/app/views/users/admin_login.html.erb index 2eaa56e6b7..9b40e951ec 100644 --- a/app/views/users/admin_login.html.erb +++ b/app/views/users/admin_login.html.erb @@ -8,7 +8,7 @@ <% else %> <%=form_tag({}, method: :put) do %> <%= label_tag(:email, t('admin_login.email_input')) %> - <%= text_field_tag(:email) %>

+ <%= text_field_tag(:email, nil, autofocus: true) %>

<%= submit_tag t('admin_login.submit_button') %> <% end %> <% end %> From a4cd0684813ea36a3c0198ac1b89212abe8d796e Mon Sep 17 00:00:00 2001 From: Neil Lalonde Date: Wed, 25 May 2016 14:55:37 -0400 Subject: [PATCH 41/51] FEATURE: add caps to trust level 3 requirements for posts read and topics viewed, configurable in settings --- app/models/trust_level3_requirements.rb | 10 ++++++++-- config/locales/server.en.yml | 2 ++ config/site_settings.yml | 6 ++++++ spec/models/trust_level3_requirements_spec.rb | 16 +++++++++++++++- 4 files changed, 31 insertions(+), 3 deletions(-) diff --git a/app/models/trust_level3_requirements.rb b/app/models/trust_level3_requirements.rb index 2fb1671d47..2579216f86 100644 --- a/app/models/trust_level3_requirements.rb +++ b/app/models/trust_level3_requirements.rb @@ -95,7 +95,10 @@ class TrustLevel3Requirements end def min_topics_viewed - (TrustLevel3Requirements.num_topics_in_time_period.to_i * (SiteSetting.tl3_requires_topics_viewed.to_f / 100.0)).round + [ + (TrustLevel3Requirements.num_topics_in_time_period.to_i * (SiteSetting.tl3_requires_topics_viewed.to_f / 100.0)).round, + SiteSetting.tl3_requires_topics_viewed_cap + ].min end def posts_read @@ -103,7 +106,10 @@ class TrustLevel3Requirements end def min_posts_read - (TrustLevel3Requirements.num_posts_in_time_period.to_i * (SiteSetting.tl3_requires_posts_read.to_f / 100.0)).round + [ + (TrustLevel3Requirements.num_posts_in_time_period.to_i * (SiteSetting.tl3_requires_posts_read.to_f / 100.0)).round, + SiteSetting.tl3_requires_posts_read_cap + ].min end def topics_viewed_all_time diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml index 663ea6a9b4..ee9d9ebb1f 100644 --- a/config/locales/server.en.yml +++ b/config/locales/server.en.yml @@ -1068,7 +1068,9 @@ en: tl3_requires_days_visited: "Minimum number of days that a user needs to have visited the site in the last (tl3 time period) days to qualify for promotion to trust level 3. Set higher than tl3 time period to disable promotions to tl3. (0 or higher)" tl3_requires_topics_replied_to: "Minimum number of topics a user needs to have replied to in the last (tl3 time period) days to qualify for promotion to trust level 3. (0 or higher)" tl3_requires_topics_viewed: "The percentage of topics created in the last (tl3 time period) days that a user needs to have viewed to qualify for promotion to trust level 3. (0 to 100)" + tl3_requires_topics_viewed_cap: "The maximum required number of topics viewed in the last (tl3 time period) days." tl3_requires_posts_read: "The percentage of posts created in the last (tl3 time period) days that a user needs to have viewed to qualify for promotion to trust level 3. (0 to 100)" + tl3_requires_posts_read_cap: "The maximum required number of posts read in the last (tl3 time period) days." tl3_requires_topics_viewed_all_time: "The minimum total number of topics a user must have viewed to qualify for trust level 3." tl3_requires_posts_read_all_time: "The minimum total number of posts a user must have read to qualify for trust level 3." tl3_requires_max_flagged: "User must not have had more than x posts flagged by x different users in the last (tl3 time period) days to qualify for promotion to trust level 3, where x is this setting's value. (0 or higher)" diff --git a/config/site_settings.yml b/config/site_settings.yml index 3f993bb21d..f58e42c6a2 100644 --- a/config/site_settings.yml +++ b/config/site_settings.yml @@ -708,10 +708,16 @@ trust: default: 25 min: 0 max: 100 + tl3_requires_topics_viewed_cap: + default: 500 + min: 0 tl3_requires_posts_read: default: 25 min: 0 max: 100 + tl3_requires_posts_read_cap: + default: 20000 + min: 0 tl3_requires_topics_viewed_all_time: default: 200 min: 0 diff --git a/spec/models/trust_level3_requirements_spec.rb b/spec/models/trust_level3_requirements_spec.rb index 764aef8ac9..46e3d89992 100644 --- a/spec/models/trust_level3_requirements_spec.rb +++ b/spec/models/trust_level3_requirements_spec.rb @@ -35,12 +35,26 @@ describe TrustLevel3Requirements do expect(tl3_requirements.min_topics_viewed).to eq(23) end + it "min_topics_viewed is capped" do + SiteSetting.tl3_requires_topics_viewed = 75 + described_class.stubs(:num_topics_in_time_period).returns(31) + SiteSetting.tl3_requires_topics_viewed_cap = 20 + expect(tl3_requirements.min_topics_viewed).to eq(20) + end + it "min_posts_read depends on site setting and number of posts created" do SiteSetting.stubs(:tl3_requires_posts_read).returns(66) described_class.stubs(:num_posts_in_time_period).returns(1234) expect(tl3_requirements.min_posts_read).to eq(814) end + it "min_posts_read is capped" do + SiteSetting.tl3_requires_posts_read = 66 + described_class.stubs(:num_posts_in_time_period).returns(1234) + SiteSetting.tl3_requires_posts_read_cap = 600 + expect(tl3_requirements.min_posts_read).to eq(600) + end + it "min_topics_viewed_all_time depends on site setting" do SiteSetting.stubs(:tl3_requires_topics_viewed_all_time).returns(75) expect(tl3_requirements.min_topics_viewed_all_time).to eq(75) @@ -243,7 +257,7 @@ describe TrustLevel3Requirements do end end - describe "requirements" do + context "requirements with defaults" do before do tl3_requirements.stubs(:min_days_visited).returns(50) From 86d50d0017e581f7a49bdc6771f4fb1a81e005c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9gis=20Hanol?= Date: Wed, 25 May 2016 22:20:35 +0200 Subject: [PATCH 42/51] PERF: stream CSV exports so they don't fail when they are too big --- app/jobs/regular/export_csv_file.rb | 206 ++++++++++++++-------------- app/models/user_export.rb | 15 +- 2 files changed, 105 insertions(+), 116 deletions(-) diff --git a/app/jobs/regular/export_csv_file.rb b/app/jobs/regular/export_csv_file.rb index 7c69a3a3fe..4361ac7c33 100644 --- a/app/jobs/regular/export_csv_file.rb +++ b/app/jobs/regular/export_csv_file.rb @@ -6,56 +6,76 @@ module Jobs class ExportCsvFile < Jobs::Base include ActionView::Helpers::NumberHelper - HEADER_ATTRS_FOR = {} - HEADER_ATTRS_FOR['user_archive'] = ['topic_title','category','sub_category','is_pm','post','like_count','reply_count','url','created_at'] - HEADER_ATTRS_FOR['user_list'] = ['id','name','username','email','title','created_at','last_seen_at','last_posted_at','last_emailed_at','trust_level','approved','suspended_at','suspended_till','blocked','active','admin','moderator','ip_address'] - HEADER_ATTRS_FOR['user_stats'] = ['topics_entered','posts_read_count','time_read','topic_count','post_count','likes_given','likes_received'] - HEADER_ATTRS_FOR['user_sso'] = ['external_id','external_email', 'external_username', 'external_name', 'external_avatar_url'] - HEADER_ATTRS_FOR['staff_action'] = ['staff_user','action','subject','created_at','details', 'context'] - HEADER_ATTRS_FOR['screened_email'] = ['email','action','match_count','last_match_at','created_at','ip_address'] - HEADER_ATTRS_FOR['screened_ip'] = ['ip_address','action','match_count','last_match_at','created_at'] - HEADER_ATTRS_FOR['screened_url'] = ['domain','action','match_count','last_match_at','created_at'] - HEADER_ATTRS_FOR['report'] = ['date', 'value'] - sidekiq_options retry: false - attr_accessor :current_user + + HEADER_ATTRS_FOR ||= HashWithIndifferentAccess.new({ + user_archive: ['topic_title','category','sub_category','is_pm','post','like_count','reply_count','url','created_at'], + user_list: ['id','name','username','email','title','created_at','last_seen_at','last_posted_at','last_emailed_at','trust_level','approved','suspended_at','suspended_till','blocked','active','admin','moderator','ip_address'], + user_stats: ['topics_entered','posts_read_count','time_read','topic_count','post_count','likes_given','likes_received'], + user_sso: ['external_id','external_email', 'external_username', 'external_name', 'external_avatar_url'], + staff_action: ['staff_user','action','subject','created_at','details', 'context'], + screened_email: ['email','action','match_count','last_match_at','created_at','ip_address'], + screened_ip: ['ip_address','action','match_count','last_match_at','created_at'], + screened_url: ['domain','action','match_count','last_match_at','created_at'], + report: ['date', 'value'], + }) def execute(args) @entity = args[:entity] @extra = HashWithIndifferentAccess.new(args[:args]) if args[:args] - @file_name = @entity @current_user = User.find_by(id: args[:user_id]) - export_method = "#{@entity}_export".to_sym - data = - if respond_to?(export_method) - send(export_method) - else - raise Discourse::InvalidParameters.new(:entity) - end + export_method = :"#{@entity}_export" + raise Discourse::InvalidParameters.new(:entity) unless respond_to?(export_method) - if data && data.length > 0 - set_file_path - write_csv_file(data) + file_name_prefix = if @entity == "user_archive" + "#{@entity.split('_').join('-')}-#{@current_user.username}-#{Time.now.strftime("%y%m%d-%H%M%S")}" + else + "#{@entity.split('_').join('-')}-#{Time.now.strftime("%y%m%d-%H%M%S")}" end + file = UserExport.create(file_name: file_name_prefix, user_id: @current_user.id) + file_name = "#{file_name_prefix}-#{file.id}.csv" + absolute_path = "#{UserExport.base_directory}/#{file_name}" + + # ensure directory exists + FileUtils.mkdir_p(UserExport.base_directory) unless Dir.exists?(UserExport.base_directory) + + # write to CSV file + CSV.open(absolute_path, "w") do |csv| + csv << get_header + send(export_method).each { |d| csv << d } + end + + # compress CSV file + `gzip -5 #{absolute_path}` + ensure - notify_user + notify_user(file_name, absolute_path) end def user_archive_export - user_archive_data = Post.includes(:topic => :category).where(user_id: @current_user.id).select(:topic_id, :post_number, :raw, :like_count, :reply_count, :created_at).order(:created_at).with_deleted.to_a - user_archive_data.map do |user_archive| - get_user_archive_fields(user_archive) + return enum_for(:user_archive_export) unless block_given? + + Post.includes(topic: :category) + .where(user_id: @current_user.id) + .select(:topic_id, :post_number, :raw, :like_count, :reply_count, :created_at) + .order(:created_at) + .with_deleted + .each do |user_archive| + yield get_user_archive_fields(user_archive) end end def user_list_export + return enum_for(:user_list_export) unless block_given? + user_array = [] user_field_ids = UserField.pluck(:id) + condition = {} if @extra && @extra[:trust_level] && trust_level = TrustLevel.levels[@extra[:trust_level].to_sym] - condition = {trust_level: trust_level} + condition = { trust_level: trust_level } end if SiteSetting.enable_sso @@ -65,8 +85,7 @@ module Jobs user_info_string = add_single_sign_on(user, user_info_string) user_info_string = add_custom_fields(user, user_info_string, user_field_ids) user_info_string = add_group_names(user, user_info_string) - user_array.push(user_info_string.split(",")) - user_info_string = nil + yield user_info_string.split(",") end else # SSO disabled @@ -74,78 +93,78 @@ module Jobs user_info_string = get_base_user_string(user) user_info_string = add_custom_fields(user, user_info_string, user_field_ids) user_info_string = add_group_names(user, user_info_string) - user_array.push(user_info_string.split(",")) - user_info_string = nil + yield user_info_string.split(",") end end - - user_field_ids = nil - user_array end def staff_action_export - if @current_user.admin? - staff_action_data = UserHistory.only_staff_actions.order('id DESC').to_a + return enum_for(:staff_action_export) unless block_given? + + staff_action_data = if @current_user.admin? + UserHistory.only_staff_actions.order('id DESC') else - # moderator - staff_action_data = UserHistory.where(admin_only: false).only_staff_actions.order('id DESC').to_a + UserHistory.where(admin_only: false).only_staff_actions.order('id DESC') end - staff_action_data.map do |staff_action| - get_staff_action_fields(staff_action) + staff_action_data.each do |staff_action| + yield get_staff_action_fields(staff_action) end end def screened_email_export - screened_email_data = ScreenedEmail.order('last_match_at desc').to_a - screened_email_data.map do |screened_email| - get_screened_email_fields(screened_email) + return enum_for(:screened_email_export) unless block_given? + + ScreenedEmail.order('last_match_at DESC').each do |screened_email| + yield get_screened_email_fields(screened_email) end end def screened_ip_export - screened_ip_data = ScreenedIpAddress.order('id desc').to_a - screened_ip_data.map do |screened_ip| - get_screened_ip_fields(screened_ip) + return enum_for(:screened_ip_export) unless block_given? + + ScreenedIpAddress.order('id DESC').each do |screened_ip| + yield get_screened_ip_fields(screened_ip) end end def screened_url_export - screened_url_data = ScreenedUrl.select("domain, sum(match_count) as match_count, max(last_match_at) as last_match_at, min(created_at) as created_at").group(:domain).order('last_match_at DESC').to_a - screened_url_data.map do |screened_url| - get_screened_url_fields(screened_url) + return enum_for(:screened_url_export) unless block_given? + + ScreenedUrl.select("domain, sum(match_count) as match_count, max(last_match_at) as last_match_at, min(created_at) as created_at") + .group(:domain) + .order('last_match_at DESC') + .each do |screened_url| + yield get_screened_url_fields(screened_url) end end def report_export - @extra[:start_date] = @extra[:start_date].to_date if @extra[:start_date].is_a?(String) - @extra[:end_date] = @extra[:end_date].to_date if @extra[:end_date].is_a?(String) - @extra[:category_id] = @extra[:category_id].to_i if @extra[:category_id] - @extra[:group_id] = @extra[:group_id].to_i if @extra[:group_id] - r = Report.find(@extra[:name], @extra) - r.data.map do |row| - [row[:x].to_s(:db), row[:y].to_s(:db)] + return enum_for(:report_export) unless block_given? + + @extra[:start_date] = @extra[:start_date].to_date if @extra[:start_date].is_a?(String) + @extra[:end_date] = @extra[:end_date].to_date if @extra[:end_date].is_a?(String) + @extra[:category_id] = @extra[:category_id].to_i if @extra[:category_id] + @extra[:group_id] = @extra[:group_id].to_i if @extra[:group_id] + Report.find(@extra[:name], @extra).data.each do |row| + yield [row[:x].to_s(:db), row[:y].to_s(:db)] end end def get_header - - case @entity - when 'user_list' - header_array = HEADER_ATTRS_FOR['user_list'] + HEADER_ATTRS_FOR['user_stats'] - if SiteSetting.enable_sso - header_array.concat(HEADER_ATTRS_FOR['user_sso']) + if @entity == 'user_list' + header_array = HEADER_ATTRS_FOR['user_list'] + HEADER_ATTRS_FOR['user_stats'] + header_array.concat(HEADER_ATTRS_FOR['user_sso']) if SiteSetting.enable_sso + user_custom_fields = UserField.all + if user_custom_fields.present? + user_custom_fields.each do |custom_field| + header_array.push("#{custom_field.name} (custom user field)") end - user_custom_fields = UserField.all - if user_custom_fields.present? - user_custom_fields.each do |custom_field| - header_array.push("#{custom_field.name} (custom user field)") - end - end - header_array.push("group_names") - else - header_array = HEADER_ATTRS_FOR[@entity] end + header_array.push("group_names") + else + header_array = HEADER_ATTRS_FOR[@entity] + end header_array end @@ -227,7 +246,7 @@ module Jobs user.username if !user.nil? elsif attr == 'subject' user = User.find_by(id: staff_action.attributes['target_user_id']) - user.nil? ? staff_action.attributes[attr] : "#{user.username} #{staff_action.attributes[attr]}" + user.nil? ? staff_action.attributes[attr] : "#{user.username} #{staff_action.attributes[attr]}" else staff_action.attributes[attr] end @@ -289,43 +308,20 @@ module Jobs screened_url_array end - - def set_file_path - if @entity == "user_archive" - file_name_prefix = "#{@file_name.split('_').join('-')}-#{current_user.username}-#{Time.now.strftime("%y%m%d-%H%M%S")}" - else - file_name_prefix = "#{@file_name.split('_').join('-')}-#{Time.now.strftime("%y%m%d-%H%M%S")}" - end - @file = UserExport.create(file_name: file_name_prefix, user_id: @current_user.id) - @file_name = "#{file_name_prefix}-#{@file.id}.csv" - - # ensure directory exists - dir = File.dirname("#{UserExport.base_directory}/#{@file_name}") - FileUtils.mkdir_p(dir) unless Dir.exists?(dir) - end - - def write_csv_file(data) - # write to CSV file - CSV.open(File.expand_path("#{UserExport.base_directory}/#{@file_name}", __FILE__), "w") do |csv| - csv << get_header - data.each do |value| - csv << value - end - end - # compress CSV file - `gzip -5 #{File.expand_path("#{UserExport.base_directory}/#{@file_name}", __FILE__)}` - end - - def notify_user + def notify_user(file_name, absolute_path) if @current_user - if @file_name != "" && File.exists?("#{UserExport.base_directory}/#{@file_name}.gz") - SystemMessage.create_from_system_user(@current_user, :csv_export_succeeded, download_link: "#{Discourse.base_uri}/export_csv/#{@file_name}.gz", file_name: "#{@file_name}.gz", file_size: number_to_human_size(File.size("#{UserExport.base_directory}/#{@file_name}.gz"))) + if file_name.present? && File.exists?("#{absolute_path}.gz") + SystemMessage.create_from_system_user( + @current_user, + :csv_export_succeeded, + download_link: "#{Discourse.base_uri}/export_csv/#{file_name}.gz", + file_name: "#{file_name}.gz", + file_size: number_to_human_size(File.size("#{absolute_path}.gz")) + ) else SystemMessage.create_from_system_user(@current_user, :csv_export_failed) end end end - end - end diff --git a/app/models/user_export.rb b/app/models/user_export.rb index d231c21b36..71c1143bdf 100644 --- a/app/models/user_export.rb +++ b/app/models/user_export.rb @@ -2,23 +2,16 @@ class UserExport < ActiveRecord::Base def self.get_download_path(filename) path = File.join(UserExport.base_directory, filename) - if File.exists?(path) - return path - else - nil - end + File.exists?(path) ? path : nil end def self.remove_old_exports - expired_exports = UserExport.where('created_at < ?', 2.days.ago).to_a - expired_exports.map do |expired_export| + UserExport.where('created_at < ?', 2.days.ago).find_each do |expired_export| file_name = "#{expired_export.file_name}-#{expired_export.id}.csv.gz" file_path = "#{UserExport.base_directory}/#{file_name}" - if File.exist?(file_path) - File.delete(file_path) - end - UserExport.find(expired_export.id).destroy + File.delete(file_path) if File.exist?(file_path) + expired_export.destroy end end From 28c3e890cafdf160ae230fec07a0c09ee7793aa2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9gis=20Hanol?= Date: Wed, 25 May 2016 22:40:28 +0200 Subject: [PATCH 43/51] FIX: changing mailing list mode frequency wasn't saved --- app/assets/javascripts/discourse/models/user.js.es6 | 1 + 1 file changed, 1 insertion(+) diff --git a/app/assets/javascripts/discourse/models/user.js.es6 b/app/assets/javascripts/discourse/models/user.js.es6 index 55456dfb1a..1526638f7f 100644 --- a/app/assets/javascripts/discourse/models/user.js.es6 +++ b/app/assets/javascripts/discourse/models/user.js.es6 @@ -155,6 +155,7 @@ const User = RestModel.extend({ [ 'email_always', 'mailing_list_mode', + 'mailing_list_mode_frequency', 'external_links_in_new_tab', 'email_digests', 'email_direct', From a7b994160adbe0cbefa91825fc6b1f8744d3dbad Mon Sep 17 00:00:00 2001 From: Jeff Atwood Date: Wed, 25 May 2016 15:32:23 -0700 Subject: [PATCH 44/51] switch to plain X for close in a few places --- .../discourse/templates/composer/group-mentioned.hbs | 2 +- .../javascripts/discourse/templates/composer/similar-topics.hbs | 2 +- app/assets/javascripts/discourse/templates/share.hbs | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/assets/javascripts/discourse/templates/composer/group-mentioned.hbs b/app/assets/javascripts/discourse/templates/composer/group-mentioned.hbs index b59da973c3..f20da40511 100644 --- a/app/assets/javascripts/discourse/templates/composer/group-mentioned.hbs +++ b/app/assets/javascripts/discourse/templates/composer/group-mentioned.hbs @@ -1,2 +1,2 @@ - + {{{body}}} diff --git a/app/assets/javascripts/discourse/templates/composer/similar-topics.hbs b/app/assets/javascripts/discourse/templates/composer/similar-topics.hbs index 257a51ebf1..b10a489c63 100644 --- a/app/assets/javascripts/discourse/templates/composer/similar-topics.hbs +++ b/app/assets/javascripts/discourse/templates/composer/similar-topics.hbs @@ -1,4 +1,4 @@ -{{fa-icon "times-circle"}} +{{fa-icon "close"}}

{{i18n 'composer.similar_topics'}}

    diff --git a/app/assets/javascripts/discourse/templates/share.hbs b/app/assets/javascripts/discourse/templates/share.hbs index c25d776aba..c11aca002e 100644 --- a/app/assets/javascripts/discourse/templates/share.hbs +++ b/app/assets/javascripts/discourse/templates/share.hbs @@ -15,6 +15,6 @@ {{/each}}
    - {{fa-icon "times-circle"}} + {{fa-icon "close"}}
    {{/if}} From 36ba5f6716db95d4b120bf1b89ea0dba02be4080 Mon Sep 17 00:00:00 2001 From: Arpit Jalan Date: Thu, 26 May 2016 07:54:55 +0530 Subject: [PATCH 45/51] FIX: broken onebox avatar image --- lib/pretty_text.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/pretty_text.rb b/lib/pretty_text.rb index b328f230f3..e1341006f3 100644 --- a/lib/pretty_text.rb +++ b/lib/pretty_text.rb @@ -267,7 +267,7 @@ module PrettyText protect do v8.eval < Date: Thu, 26 May 2016 01:08:48 -0700 Subject: [PATCH 46/51] clean up some embed CSS oddities --- app/assets/stylesheets/embed.css.scss | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/app/assets/stylesheets/embed.css.scss b/app/assets/stylesheets/embed.css.scss index 826b4e284c..03af8d2b98 100644 --- a/app/assets/stylesheets/embed.css.scss +++ b/app/assets/stylesheets/embed.css.scss @@ -8,6 +8,10 @@ article.post { border-bottom: 1px solid #ddd; + img.avatar { + border-radius: 50%; + } + &.deleted { background-color: #ffe5e5; } @@ -141,3 +145,12 @@ footer { // load onebox CSS at the end @import "./common/base/onebox"; + +// we apparently use bottom margins on paras in the embed CSS, leading to weirdness +// which we will now clean up +aside.onebox { + margin-bottom: 20px; + p { + margin-bottom: 0 !important; + } +} From a92fd9d701d1ae0d0bcdfda26c5bd33e5d39543e Mon Sep 17 00:00:00 2001 From: David McClure Date: Thu, 26 May 2016 01:13:01 -0700 Subject: [PATCH 47/51] Add Site Setting to use HTML from incoming email when available. (#4236) --- config/locales/server.en.yml | 1 + config/site_settings.yml | 2 ++ lib/email/receiver.rb | 23 ++++++++++++++--------- spec/components/email/receiver_spec.rb | 12 ++++++++++++ 4 files changed, 29 insertions(+), 9 deletions(-) diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml index ee9d9ebb1f..db341f15c5 100644 --- a/config/locales/server.en.yml +++ b/config/locales/server.en.yml @@ -1166,6 +1166,7 @@ en: reply_by_email_enabled: "Enable replying to topics via email." reply_by_email_address: "Template for reply by email incoming email address, for example: %{reply_key}@reply.example.com or replies+%{reply_key}@example.com" + incoming_email_prefer_html: "Use the HTML instead of the text for incoming email. May cause unexcpeted formatting issues!" disable_emails: "Prevent Discourse from sending any kind of emails" diff --git a/config/site_settings.yml b/config/site_settings.yml index f58e42c6a2..18c732a2b9 100644 --- a/config/site_settings.yml +++ b/config/site_settings.yml @@ -544,6 +544,8 @@ email: pop3_polling_username: '' pop3_polling_password: '' log_mail_processing_failures: false + incoming_email_prefer_html: + default: false email_in: default: false client: true diff --git a/lib/email/receiver.rb b/lib/email/receiver.rb index bc2b98005f..d71cf8ca7d 100644 --- a/lib/email/receiver.rb +++ b/lib/email/receiver.rb @@ -212,16 +212,21 @@ module Email text = fix_charset(@mail) end - # prefer text over html - text = trim_discourse_markers(text) if text.present? - text, elided = EmailReplyTrimmer.trim(text, true) if text.present? - return [text, elided] if text.present? + use_html = html.present? && (!text.present? || SiteSetting.incoming_email_prefer_html) + use_text = text.present? unless use_html - # clean the html if that's all we've got - html = Email::HtmlCleaner.new(html).output_html if html.present? - html = trim_discourse_markers(html) if html.present? - html, elided = EmailReplyTrimmer.trim(html, true) if html.present? - return [html, elided] if html.present? + if use_text + text = trim_discourse_markers(text) + text, elided = EmailReplyTrimmer.trim(text, true) + return [text, elided] + end + + if use_html + html = Email::HtmlCleaner.new(html).output_html + html = trim_discourse_markers(html) + html, elided = EmailReplyTrimmer.trim(html, true) + return [html, elided] + end end def fix_charset(mail_part) diff --git a/spec/components/email/receiver_spec.rb b/spec/components/email/receiver_spec.rb index f996028ec1..7a802acd1d 100644 --- a/spec/components/email/receiver_spec.rb +++ b/spec/components/email/receiver_spec.rb @@ -171,6 +171,18 @@ describe Email::Receiver do expect(topic.posts.last.raw).to eq("This is the *text* part.") end + it "prefers html over text when site setting is enabled" do + SiteSetting.incoming_email_prefer_html = true + expect { process(:text_and_html_reply) }.to change { topic.posts.count } + expect(topic.posts.last.raw).to eq('This is the html part.') + end + + it "uses text when prefer_html site setting is enabled but no html is available" do + SiteSetting.incoming_email_prefer_html = true + expect { process(:text_reply) }.to change { topic.posts.count } + expect(topic.posts.last.raw).to eq("This is a text reply :)") + end + it "removes the 'on , wrote' quoting line" do expect { process(:on_date_contact_wrote) }.to change { topic.posts.count } expect(topic.posts.last.raw).to eq("This is the actual reply.") From c1b3912c3699b7d09e665c10baef6acf24348c04 Mon Sep 17 00:00:00 2001 From: Jeff Atwood Date: Thu, 26 May 2016 01:16:33 -0700 Subject: [PATCH 48/51] one more embed CSS tweak --- app/assets/stylesheets/embed.css.scss | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/app/assets/stylesheets/embed.css.scss b/app/assets/stylesheets/embed.css.scss index 03af8d2b98..ae15f2cc66 100644 --- a/app/assets/stylesheets/embed.css.scss +++ b/app/assets/stylesheets/embed.css.scss @@ -154,3 +154,9 @@ aside.onebox { margin-bottom: 0 !important; } } + +// images large enough for the lightbox wrapper don't have bottom margins +// either, unless we add one now +div.lightbox-wrapper { + margin-bottom: 20px; +} From 23799e342208cd910539c3ec5d88a1b56847bc93 Mon Sep 17 00:00:00 2001 From: Arpit Jalan Date: Thu, 26 May 2016 16:00:35 +0530 Subject: [PATCH 49/51] FIX: validate tl3_time_period max value --- config/site_settings.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/config/site_settings.yml b/config/site_settings.yml index 18c732a2b9..a6a000ad4c 100644 --- a/config/site_settings.yml +++ b/config/site_settings.yml @@ -700,6 +700,7 @@ trust: tl3_time_period: default: 100 min: 1 + max: 1000000 tl3_requires_days_visited: default: 50 min: 0 From 7050042088187d169027a60bc0db95a74fd90e79 Mon Sep 17 00:00:00 2001 From: Neil Lalonde Date: Thu, 26 May 2016 11:50:15 -0400 Subject: [PATCH 50/51] Update translations --- config/locales/client.da.yml | 3 + config/locales/client.es.yml | 3 + config/locales/client.fi.yml | 2 + config/locales/client.fr.yml | 21 ++ config/locales/client.it.yml | 34 +++ config/locales/client.ja.yml | 260 +++++++++++-------- config/locales/client.pt.yml | 10 + config/locales/client.ro.yml | 6 +- config/locales/client.sq.yml | 2 +- config/locales/client.zh_CN.yml | 4 +- config/locales/server.ar.yml | 2 +- config/locales/server.es.yml | 5 +- config/locales/server.fi.yml | 5 +- config/locales/server.fr.yml | 22 +- config/locales/server.it.yml | 25 +- config/locales/server.ja.yml | 202 ++++++++++---- config/locales/server.pt.yml | 17 +- config/locales/server.pt_BR.yml | 2 +- config/locales/server.ro.yml | 10 +- config/locales/server.ru.yml | 4 +- config/locales/server.zh_CN.yml | 8 +- plugins/poll/config/locales/client.bs_BA.yml | 3 + plugins/poll/config/locales/client.fr.yml | 4 +- plugins/poll/config/locales/client.ja.yml | 2 +- plugins/poll/config/locales/server.ja.yml | 6 +- public/500.ja.html | 2 +- 26 files changed, 464 insertions(+), 200 deletions(-) diff --git a/config/locales/client.da.yml b/config/locales/client.da.yml index 7c0f49740f..001364a85a 100644 --- a/config/locales/client.da.yml +++ b/config/locales/client.da.yml @@ -111,6 +111,7 @@ da: google+: 'del dette link på Google+' email: 'send dette link i en e-mail' action_codes: + public_topic: "offentliggjorde dette emne %{when}" split_topic: "delte dette emne op %{when}" invited_user: "Inviterede %{who} %{when}" removed_user: "fjernede %{who} %{when}" @@ -285,6 +286,8 @@ da: title: "Brugere" likes_given: "Givet" likes_received: "Modtaget" + topics_entered: "Set" + topics_entered_long: "Læste emner" time_read: "Læsetid" topic_count: "Emner" topic_count_long: "Emner oprettet" diff --git a/config/locales/client.es.yml b/config/locales/client.es.yml index 2a09159056..a265c993c5 100644 --- a/config/locales/client.es.yml +++ b/config/locales/client.es.yml @@ -302,6 +302,8 @@ es: title: "Usuarios" likes_given: "Dados" likes_received: "Recibidos" + topics_entered: "Vistos" + topics_entered_long: "Temas vistos" time_read: "Tiempo de Lectura" topic_count: "Temas" topic_count_long: "Temas creados" @@ -2620,6 +2622,7 @@ es: embed_truncate: "Truncar los posts insertados" embed_whitelist_selector: "Selector CSS para permitir elementos a embeber" embed_blacklist_selector: "Selector CSS para restringir elementos a embeber" + embed_classname_whitelist: "Clases CSS permitidas" feed_polling_enabled: "Importar posts usando RSS/ATOM" feed_polling_url: "URL del feed RSS/ATOM del que extraer datos" save: "Guardar ajustes de Insertado" diff --git a/config/locales/client.fi.yml b/config/locales/client.fi.yml index 6cecab1d41..c19d2c70c0 100644 --- a/config/locales/client.fi.yml +++ b/config/locales/client.fi.yml @@ -111,6 +111,8 @@ fi: google+: 'jaa tämä linkki Google+:ssa' email: 'lähetä tämä linkki sähköpostissa' action_codes: + public_topic: "teki ketjusta julkisen %{when}" + private_topic: "teki ketjusta yksityisen %{when}" split_topic: "pilkkoi tämän ketjun %{when}" invited_user: "kutsui käyttäjän %{who} %{when}" removed_user: "poisti käyttäjän %{who} %{when}" diff --git a/config/locales/client.fr.yml b/config/locales/client.fr.yml index be3d803ee3..0b513115fd 100644 --- a/config/locales/client.fr.yml +++ b/config/locales/client.fr.yml @@ -302,6 +302,8 @@ fr: title: "Utilisateurs" likes_given: "Donnés" likes_received: "Reçus" + topics_entered: "Vus" + topics_entered_long: "Sujets consultés" time_read: "Temps de lecture" topic_count: "Sujets" topic_count_long: "Sujets créés" @@ -2620,6 +2622,7 @@ fr: embed_truncate: "Tronquer les messages intégrés" embed_whitelist_selector: "Sélecteur CSS pour les éléments qui seront autorisés dans les contenus intégrés" embed_blacklist_selector: "Sélecteur CSS pour les éléments qui seront interdits dans les contenus intégrés" + embed_classname_whitelist: "Classes CSS autorisées" feed_polling_enabled: "Importer les messages via flux RSS/ATOM" feed_polling_url: "URL du flux RSS/ATOM à importer" save: "Sauvegarder paramètres d'intégration" @@ -2753,6 +2756,9 @@ fr: watching: title: "Suivie" description: "Vous serez automatiquement abonné aux nouveaux sujets de ces catégories. Vous serez notifié de tous les nouveaux messages et sujets, et le décompte des messages non-lus et nouveaux aussi à côté de chaque sujet." + tracking: + title: "Suivi" + description: "Vous allez suivre automatiquement tous les nouveaux sujets dans ce tag. Le nombre de messages nouveaux et non lus apparaîtra à côté du sujet." regular: title: "Habitué" description: "Vous serez averti si quelqu'un mentionne votre @pseudo ou répond à votre message." @@ -2765,3 +2771,18 @@ fr: new: "Vous n'avez aucun nouveau sujet." read: "Vous n'avez lu aucun sujet pour le moment." posted: "Vous n'avez écrit aucun message pour le moment." + latest: "Il n'y a pas de sujets récents." + hot: "Il n'y a pas de sujets populaires." + bookmarks: "Vous n'avez pas encore de sujets ajoutés aux signets." + top: "Il n'y a pas de meilleurs sujets." + search: "Il n'y a pas de résultats de recherche." + bottom: + latest: "Il n'y a plus de sujets récents." + hot: "Il n'y a plus de sujets populaires." + posted: "Il n'y a plus de sujets publiés." + read: "Il n'y a plus de sujets lus." + new: "Il n'y a plus de nouveaux sujets." + unread: "Il n'y a plus de sujets non lus." + top: "Il n'y a plus de meilleurs sujets." + bookmarks: "Il n'y a plus de sujets ajoutés aux signets." + search: "Il n'y a plus de résultats de recherche." diff --git a/config/locales/client.it.yml b/config/locales/client.it.yml index 93de1785d4..b9983631ae 100644 --- a/config/locales/client.it.yml +++ b/config/locales/client.it.yml @@ -302,6 +302,8 @@ it: title: "Utenti" likes_given: "Dati" likes_received: "Ricevuti" + topics_entered: "Visualizzati" + topics_entered_long: "Argomenti Visualizzati" time_read: "Tempo di Lettura" topic_count: "Argomenti" topic_count_long: "Argomenti Creati" @@ -701,6 +703,9 @@ it: top_badges: "Migliori Targhette" no_badges: "Ancora nessuna targhetta." more_badges: "Altre Targhette" + top_links: "Migliori Collegamenti" + no_links: "Ancora nessun collegamento." + no_likes: "Ancora nessun \"Mi piace\"." associated_accounts: "Login" ip_address: title: "Ultimo indirizzo IP" @@ -2192,6 +2197,8 @@ it: grant_moderation: "assegna moderazione" revoke_moderation: "revoca moderazione" backup_operation: "operazione di backup" + deleted_tag: "etichetta cancellata" + renamed_tag: "etichetta rinominata" screened_emails: title: "Email Scansionate" description: "Quando qualcuno cerca di creare un nuovo account, verrando controllati i seguenti indirizzi email e la registrazione viene bloccata, o eseguita qualche altra azione." @@ -2478,6 +2485,7 @@ it: login: "Accesso" plugins: "Plugin" user_preferences: "Preferenze Utente" + tags: "Etichette" badges: title: Targhette new_badge: Nuova Targhetta @@ -2686,3 +2694,29 @@ it:

    + tagging: + all_tags: "Tutte Le Etichette" + selector_all_tags: "tutte le etichette" + changed: "etichette cambiate:" + tags: "Etichette" + choose_for_topic: "scegli delle etichette opzionali per questo argomento" + delete_tag: "Cancella Etichetta" + delete_confirm: "Sicuro di voler eliminare l'etichetta?" + rename_tag: "Rinomina Etichetta" + rename_instructions: "Scegli un nome per l'etichetta:" + sort_by: "Ordina per:" + sort_by_count: "conteggio" + sort_by_name: "nome" + filters: + without_category: "%{filter} %{tag} argomenti" + with_category: "%{filter} %{tag} argomenti in %{category}" + topics: + bottom: + hot: "Non ci sono ulteriori argomenti caldi." + posted: "Non ci sono ulteriori argomenti pubblicati." + read: "Non ci sono ulteriori argomenti letti." + new: "Non ci sono ulteriori nuovi argomenti." + unread: "Non ci sono ulteriori argomenti non letti." + top: "Non ci sono ulteriori argomenti di punta." + bookmarks: "Non ci sono ulteriori argomenti aggiunti ai segnalibri." + search: "Non ci sono ulteriori risultati di ricerca." diff --git a/config/locales/client.ja.yml b/config/locales/client.ja.yml index 06b4f1e4d3..853ce02b75 100644 --- a/config/locales/client.ja.yml +++ b/config/locales/client.ja.yml @@ -29,8 +29,8 @@ ja: long_no_year: "MMM D h:mm a" long_no_year_no_time: "MMM D" full_no_year_no_time: "MMMM Do" - long_with_year: "YYYY, D MMM h:mm a" - long_with_year_no_time: "YYYY, D MMM" + long_with_year: "YYYY, MMM D h:mm a" + long_with_year_no_time: "YYYY, MMM D" full_with_year_no_time: "MMMM Do, YYYY" long_date_with_year: "MMM D, 'YY LT" long_date_without_year: "MMM D, LT" @@ -38,13 +38,13 @@ ja: long_date_without_year_with_linebreak: "MMM D
    LT" long_date_with_year_with_linebreak: "MMM D, 'YY
    LT" tiny: - half_a_minute: "< 1分" + half_a_minute: "1分前" less_than_x_seconds: - other: "< %{count}秒" + other: "%{count}秒前" x_seconds: other: "%{count}秒" less_than_x_minutes: - other: "< %{count}分" + other: "%{count}分前" x_minutes: other: "%{count}分" about_x_hours: @@ -54,10 +54,10 @@ ja: about_x_years: other: "%{count}年" over_x_years: - other: "> %{count}年" + other: "%{count}年以上前" almost_x_years: other: "%{count}年" - date_month: "MMM D" + date_month: "MMM D日" date_year: "MMM 'YY" medium: x_minutes: @@ -92,12 +92,17 @@ ja: google+: 'Google+ でこのリンクを共有する' email: 'メールでこのリンクを送る' action_codes: + public_topic: "%{when} にこのトピックは公開されました" + private_topic: "%{when} にこのトピックは非公開にされました" invited_user: "%{who} から招待されました: %{when}" autoclosed: - enabled: 'クローズされました // %{when}' + enabled: 'クローズされました: %{when}' closed: - enabled: 'クローズされました // %{when}' - topic_admin_menu: "トピック管理" + enabled: 'クローズされました: %{when}' + visible: + enabled: 'リストに表示: %{when}' + disabled: 'リストから非表示: %{when}' + topic_admin_menu: "トピックの管理" emails_are_disabled: "メールアドレスの送信は管理者によって無効化されています。全てのメール通知は行われません" s3: regions: @@ -113,7 +118,7 @@ ja: ap_northeast_2: "Asia Pacific (Seoul)" sa_east_1: "South America (Sao Paulo)" edit: 'このトピックのタイトルとカテゴリを編集' - not_implemented: "申し訳ありませんが、この機能はまだ実装されていません" + not_implemented: "この機能はまだ実装されていません！" no_value: "いいえ" yes_value: "はい" generic_error: "申し訳ありませんが、エラーが発生しました" @@ -122,14 +127,14 @@ ja: log_in: "ログイン" age: "経過" joined: "参加時刻" - admin_title: "Admin" + admin_title: "管理設定" flags_title: "通報" show_more: "もっと見る" show_help: "オプション" links: "リンク" links_lowercase: other: "リンク" - faq: "よくある質問" + faq: "FAQ" guidelines: "ガイドライン" privacy_policy: "プライバシーポリシー" privacy: "プライバシー" @@ -155,7 +160,7 @@ ja: other: "{{count}}文字" suggested_topics: title: "関連トピック" - pm_title: "提案したメッセージ" + pm_title: "他のメッセージ" about: simple_title: "このサイトについて" title: "%{title}について" @@ -163,7 +168,7 @@ ja: our_admins: "管理者" our_moderators: "モデレータ" stat: - all_time: "今まで" + all_time: "すべて" last_7_days: "過去7日間" last_30_days: "過去30日間" like_count: "いいね！" @@ -191,7 +196,7 @@ ja: topic_count_unread: other: "{{count}} 個の未読トピック。" topic_count_new: - other: "{{count}} 個の新規トピック。" + other: "{{count}} 件の新しいトピック" click_to_show: "クリックして表示" preview: "プレビュー" cancel: "キャンセル" @@ -317,35 +322,35 @@ ja: '9': "引用" '11': "編集" '12': "アイテム送信" - '13': "インボックス" + '13': "受信ボックス" '14': "保留" categories: - all: "全てのカテゴリ" - all_subcategories: "全てのサブカテゴリ" + all: "すべてのカテゴリ" + all_subcategories: "すべてのサブカテゴリ" no_subcategory: "サブカテゴリなし" category: "カテゴリ" category_list: "カテゴリリストを表示" reorder: - title: "カテゴリを並び替える" - title_long: "カテゴリリストを再構築" + title: "カテゴリの並び替え" + title_long: "カテゴリリストを並べ直します" fix_order: "位置を修正" - save: "オーダーを保存" + save: "順番を保存" apply_all: "適用" position: "位置" posts: "投稿" topics: "トピック" - latest: "最新の投稿" - latest_by: "最新投稿： " + latest: "最近の投稿" + latest_by: "最新投稿: " toggle_ordering: "カテゴリの並び替えモードを切り替え" subcategories: "サブカテゴリ:" topic_stats: "新しいトピック数" topic_stat_sentence: - other: "過去 %{unit} 間 %{count} 個の新規トピック。" - post_stats: "新規トピック数:" + other: "過去 %{unit} 間 %{count} 個の新着トピック。" + post_stats: "新着トピック数:" post_stat_sentence: other: "過去 %{unit} 間 %{count} 個の新しい投稿。" ip_lookup: - title: IPアドレスで検索 + title: IPアドレスを検索 hostname: ホスト名 location: 現在地 location_not_found: （不明） @@ -356,7 +361,7 @@ ja: username: "ユーザ名" trust_level: "トラストレベル" read_time: "読んだ時間" - topics_entered: "Topics Entered" + topics_entered: "入力したトピック" post_count: "# 投稿" confirm_delete_other_accounts: "これらのアカウントを削除してもよろしいですか?" user_fields: @@ -367,7 +372,7 @@ ja: mute: "ミュート" edit: "プロフィールを編集" download_archive: "自分の投稿をダウンロード" - new_private_message: "新規メッセージ" + new_private_message: "新しいメッセージ" private_message: "メッセージ" private_messages: "メッセージ" activity_stream: "アクティビティ" @@ -393,7 +398,7 @@ ja: disable_jump_reply: "返信した後に投稿へ移動しない" dynamic_favicon: "新規または更新されたトピックのカウントをブラウザアイコンに表示する" edit_history_public: "投稿の編集履歴を公開する" - external_links_in_new_tab: "外部リンクを全て新しいタブで開く" + external_links_in_new_tab: "外部リンクをすべて別のタブで開く" enable_quoting: "選択したテキストを引用して返信する" change: "変更" moderator: "{{user}} はモデレータです" @@ -404,14 +409,19 @@ ja: suspended_notice: "このユーザは {{date}} まで凍結状態です。" suspended_reason: "理由: " github_profile: "Github" - mailing_list_mode: "投稿される度にメールで通知を受け取る(ミュートにしたトピック、カテゴリ以外)" + email_activity_summary: "アクティビティの情報" + mailing_list_mode: + enabled: "メーリングリストモードを有効にする" + instructions: | + この設定は、アクティビティの情報機能を無効化します。
    + ミュートしているトピックやカテゴリはこれらのメールには含まれません。 watched_categories: "ウォッチ中" watched_categories_instructions: "これらのカテゴリに新しく投稿されたトピックを自動的に参加します。これらのカテゴリに対して新しい投稿があった場合、登録されたメールアドレスと、コミュニティ内の通知ボックスに通知が届き、トピック一覧に新しい投稿数がつきます。" tracked_categories: "追跡中" tracked_categories_instructions: "カテゴリの新しいトピックを自動的に追跡します。トピックに対して新しい投稿があった場合、トピック一覧に新しい投稿数がつきます。" muted_categories: "ミュート中" delete_account: "アカウントを削除する" - delete_account_confirm: "本当にアカウントを削除しますか？削除されたアカウントは復元できません。" + delete_account_confirm: "アカウントを削除してもよろしいですか？削除されたアカウントは復元できません。" deleted_yourself: "あなたのアカウントは削除されました。" delete_yourself_not_allowed: "アカウントを削除できませんでした。サイトの管理者へ連絡してください。" unread_message_count: "メッセージ" @@ -428,15 +438,15 @@ ja: warnings_received: "警告" messages: all: "すべて" - inbox: "Inbox" + inbox: "受信ボックス" sent: "送信済み" archive: "アーカイブ" groups: "自分のグループ" bulk_select: "メッセージを選択" - move_to_inbox: "Inboxへ移動" + move_to_inbox: "受信ボックスへ移動" move_to_archive: "アーカイブ" failed_to_move: "選択したメッセージを移動できませんでした(ネットワークがダウンしている可能性があります)" - select_all: "全てを選択する" + select_all: "すべて選択する" change_password: success: "(メールを送信しました)" in_progress: "(メールを送信中)" @@ -448,7 +458,7 @@ ja: error: "変更中にエラーが発生しました。" change_username: title: "ユーザ名を変更" - confirm: "ユーザ名を変更すると、投稿への引用と @ユーザ名でメンションされた時のリンクが解除されます。本当にユーザ名を変更してもよろしいですか?" + confirm: "ユーザ名を変更すると、投稿への引用と @ユーザ名でメンションされた時のリンクが解除されます。ユーザ名を変更しても本当によろしいですか？" taken: "このユーザ名は既に使われています。" error: "ユーザ名変更中にエラーが発生しました。" invalid: "このユーザ名は無効です。英数字のみ利用可能です。" @@ -481,6 +491,8 @@ ja: ok: "確認用メールを送信します" invalid: "正しいメールアドレスを入力してください" authenticated: "あなたのメールアドレスは {{provider}} によって認証されています" + frequency: + other: "最後に利用されてから{{count}}分以上経過した場合にメールを送ります。" name: title: "名前" instructions: "フルネーム(任意)" @@ -520,24 +532,30 @@ ja: title: "いいねされた時に通知" always: "常時" email_previous_replies: + title: "メールの文章の下部に以前の返信を含める" always: "常に" email_digests: - title: "サイトを訪れていない場合、ダイジェストをメールで送信する" + title: "サイトを訪れていない場合、まとめをメールで送る" every_30_minutes: "30分毎" every_hour: "1時間毎" daily: "毎日" every_three_days: "3日毎" weekly: "毎週" every_two_weeks: "2週間に1回" + include_tl0_in_digests: "新しいユーザからの投稿を含める" email_direct: "誰かが投稿を引用した時、投稿に返信があった時、私のユーザ名にメンションがあった時、またはトピックへの招待があった時にメールで通知を受け取る。" email_private_messages: "メッセージを受け取ったときにメールで通知を受け取る。" - email_always: "フォーラムにアクティブに参加している状態でも常にメール通知を受け取る" + email_always: "常にメールへ通知を送る" other_settings: "その他" categories_settings: "カテゴリ設定" new_topic_duration: label: "以下の条件でトピックを新規と見なす" - not_viewed: "未読のもの" + not_viewed: "未読" last_here: "ログアウトした後に投稿されたもの" + after_1_day: "昨日投稿されたもの" + after_2_days: "2日前に投稿されたもの" + after_1_week: "先週投稿されたもの" + after_2_weeks: "2週間前に投稿されたもの" auto_track_topics: "自動でトピックを追跡する" auto_track_options: never: "追跡しない" @@ -593,13 +611,23 @@ ja: time_read: "読んだ時間" topic_count: other: "つのトピックを作成" + post_count: + other: "つの投稿" + likes_given: + other: "あげた " + likes_received: + other: "もらった " + days_visited: + other: "訪問日数" posts_read: other: "読んだ投稿" bookmark_count: other: "つのブックマーク" no_replies: "まだ返信はありません。" no_topics: "まだトピックはありません。" + top_badges: "最近ゲットしたバッジ" no_badges: "まだバッジはありません。" + more_badges: "バッジをもっと見る" associated_accounts: "関連アカウント" ip_address: title: "最近使用したIPアドレス" @@ -667,7 +695,7 @@ ja: enabled_description: "トピックのまとめを表示されています。" description: "{{replyCount}}件の返信があります。" enable: 'このトピックを要訳する' - disable: '全ての投稿を表示する' + disable: 'すべての投稿を表示する' deleted_filter: enabled_description: "削除された投稿は非表示になっています。" disabled_description: "削除された投稿は表示しています。" @@ -675,8 +703,8 @@ ja: disable: "削除された投稿を表示する" private_message_info: title: "メッセージ" - invite: "友だちを招待する..." - remove_allowed_user: "このメッセージから{{name}}を本当に取り除きますか？" + invite: "他の人を招待する..." + remove_allowed_user: "このメッセージから {{name}} を削除してもよろしいですか？" email: 'メール' username: 'ユーザ名' last_seen: '最終アクティビティ' @@ -693,9 +721,9 @@ ja: invite: "ユーザ名かメールアドレスを入力してください。パスワードリセット用のメールを送信します。" reset: "パスワードをリセット" complete_username: "%{username},アカウントにパスワード再設定メールを送りました。" - complete_email: "%{email}にパスワード再設定メールを送りました。" + complete_email: "%{email}宛にパスワード再設定メールを送信しました。" complete_username_found: "%{username},アカウントにパスワード再設定メールを送りました。" - complete_email_found: "%{email}にパスワード再設定メールを送りました。" + complete_email_found: "%{email}宛にパスワード再設定メールを送信しました。" complete_username_not_found: " %{username}は見つかりませんでした" complete_email_not_found: "%{email}で登録したアカウントがありません。" login: @@ -767,13 +795,14 @@ ja: reply_here: "ここに返信" reply: "返信" cancel: "キャンセル" - create_topic: "トピック作成" + create_topic: "トピックを作る" create_pm: "メッセージ" title: "またはCtrl+Enter" users_placeholder: "ユーザの追加" title_placeholder: "トピックのタイトルを入力してください。" edit_reason_placeholder: "編集する理由は何ですか?" show_edit_reason: "(編集理由を追加)" + reply_placeholder: "文章を入力してください。 Markdown, BBコード, HTMLが使用出来ます。 画像はドラッグアンドドロップで貼り付けられます。" view_new_post: "新しい投稿を見る。" saving: "保存中" saved: "保存完了!" @@ -832,7 +861,7 @@ ja: invitee_accepted: "

    {{username}} accepted your invitation

    " moved_post: "

    {{username}} moved {{description}}

    " linked: "

    {{username}} {{description}}

    " - granted_badge: "

    {{description}}バッジをゲットしました

    " + granted_badge: "

    '{{description}}' バッジをゲット！

    " group_message_summary: other: "

    {{count}}件のメッセージが{{group_name}}へ着ています

    " alt: @@ -844,6 +873,7 @@ ja: invitee_accepted: "招待が承認されました: " moved_post: "投稿を移動しました: " linked: "あなたの投稿にリンク" + granted_badge: "バッジを付与" group_message_summary: "グループ宛のメッセージがあります" popup: mentioned: '"{{topic}}"で{{username}} がタグ付けしました - {{site_title}}' @@ -865,20 +895,25 @@ ja: select_file: "ファイル選択" image_link: "イメージのリンク先" search: - latest_post: "最新の投稿" - select_all: "全てを選択する" + sort_by: "並べ替え" + relevance: "一番関連しているもの" + latest_post: "最近の投稿" + most_viewed: "最も閲覧されている順" + most_liked: "「いいね！」されている順" + select_all: "すべて選択する" + clear_all: "すべてクリア" title: "トピック、投稿、ユーザ、カテゴリを探す" no_results: "何も見つかりませんでした。" - no_more_results: "何も見つかりませんでした。" + no_more_results: "検索結果は以上です。" search_help: 検索ヘルプ searching: "検索中..." post_format: "#{{post_number}} {{username}}から" context: user: "@{{username}}の投稿を検索" - category: "\"{{category}}\" カテゴリで検索する" topic: "このトピックを探す" private_messages: "メッセージ検索" hamburger_menu: "他のトピック一覧やカテゴリを見る" + new_item: "新着" go_back: '戻る' not_logged_in_user: 'ユーザアクティビティと設定ページ' current_user: 'ユーザページに移動' @@ -887,7 +922,7 @@ ja: unlist_topics: "トピックをリストから非表示にする" reset_read: "未読に設定" delete: "トピックを削除" - dismiss_new: "既読に設定" + dismiss_new: "既読にする" toggle: "選択したトピックを切り替え" actions: "操作" change_category: "カテゴリを変更" @@ -897,6 +932,7 @@ ja: choose_new_category: "このトピックの新しいカテゴリを選択してください" selected: other: "あなたは {{count}} トピックを選択しました。" + change_tags: "タグを変更" none: unread: "未読のトピックはありません。" new: "新しいトピックはありません。" @@ -910,13 +946,13 @@ ja: search: "検索結果はありません。" educate: new: '

    新しいトピックがここに表示されます。

    デフォルトで、新しいトピックがある場合は2日間、 new が表示されます。

    設定はプロフィール設定から変更できます。

    ' - unread: '

    新しいトピックがここに表示されます。

    未読のトピックがある場合は、1と表示されます。 もし、

    • トピックを作る
    • トピックに返信
    • 4分以上のトピックを読む場合

    などを設定した場合、トピックを追跡してそれぞれのトピックの下にある通知の設定を経由してウォッチします。

    プロフィール から変更できます。

    ' + unread: '

    新しいトピックがここに表示されます。

    未読のトピックがある場合は、1が表示されます。 もし、

    • トピックを作る
    • トピックに返信
    • トピックを4分以上読む

    などを行った場合、トピックを追跡してそれぞれのトピックの下にある通知の設定を経由してウォッチします。

    プロフィールから変更できます。

    ' bottom: latest: "最新のトピックは以上です。" hot: "ホットなトピックは以上です。" posted: "投稿のあるトピックは以上です。" read: "既読のトピックは以上です。" - new: "新規トピックは以上です。" + new: "新着トピックは以上です。" unread: "未読のトピックは以上です。" category: "{{category}}トピックは以上です。" top: "トップトピックはこれ以上ありません。" @@ -929,11 +965,13 @@ ja: private_message: 'メッセージを書く' archive_message: title: 'アーカイブ' + move_to_inbox: + title: '受信ボックスへ移動' list: 'トピック' - new: '新規トピック' + new: '新着トピック' unread: '未読' new_topics: - other: '{{count}}個の新規トピック' + other: '{{count}}個の新着トピック' unread_topics: other: '{{count}}個の未読トピック' title: 'トピック' @@ -958,7 +996,7 @@ ja: back_to_list: "トピックリストに戻る" options: "トピックオプション" show_links: "このトピック内のリンクを表示" - toggle_information: "トピック詳細をトグル" + toggle_information: "トピックの詳細を切り替え" read_more_in_category: "{{catLink}}の他のトピックを見る or {{latestLink}}。" read_more: "{{catLink}} or {{latestLink}}。" read_more_MF: "{ UNREAD, plural, =0 {} one { 未読 1つ } other { 未読 #つ } } { NEW, plural, =0 {} one { {BOTH, select, true{} false {} other{}} 新規トピック 1つ} other { {BOTH, select, true{} false {} other{}} 新規トピック #つ} } remaining, or {CATEGORY, select, true {{catLink}の他のトピックを読む} false {{latestLink}} other {}}" @@ -1026,7 +1064,7 @@ ja: actions: recover: "トピックの削除を取り消す" delete: "トピックを削除" - open: "トピックを開く" + open: "トピックをオープン" close: "トピックをクローズする" multi_select: "投稿を選択" auto_close: "自動でクローズする..." @@ -1086,6 +1124,7 @@ ja: success: "ユーザにメッセージへの参加を招待しました。" error: "申し訳ありませんが、ユーザ招待中にエラーが発生しました。" group_name: "グループ名" + controls: "オプション" invite_reply: title: '招待' username_placeholder: "ユーザ名" @@ -1137,7 +1176,7 @@ ja: select_replies: '返信と選択' delete: 選択中のものを削除 cancel: 選択を外す - select_all: 全てを選択する + select_all: すべて選択する deselect_all: 全ての選択を外す description: other: {{count}}個の投稿を選択中。 @@ -1207,7 +1246,7 @@ ja: unwiki: "wiki投稿から外す" convert_to_moderator: "スタッフカラーを追加" revert_to_regular: "スタッフカラーを外す" - rebake: "HTMLを再構築" + rebake: "HTMLを再構成" unhide: "表示する" change_owner: "オーナーシップを変更" actions: @@ -1278,7 +1317,7 @@ ja: other: "{{count}}人のユーザがこのポストに投票しました" delete: confirm: - other: "本当にこれらの投稿を削除しますか?" + other: "これらの投稿を削除してもよろしいですか？" revisions: controls: first: "最初のリビジョン" @@ -1311,7 +1350,7 @@ ja: topic_template: "トピックテンプレート" delete: 'カテゴリを削除する' create: '新規カテゴリ' - create_long: '新しいカテゴリを作る' + create_long: '新しいカテゴリを作ります' save: 'カテゴリを保存する' slug: 'カテゴリスラグ' slug_placeholder: '(任意)URL用' @@ -1327,7 +1366,7 @@ ja: foreground_color: "文字表示色" name_placeholder: "簡潔な名前にしてください。" color_placeholder: "任意の Web カラー" - delete_confirm: "本当にこのカテゴリを削除してもよいですか?" + delete_confirm: "このカテゴリを削除してもよろしいですか？" delete_error: "カテゴリ削除に失敗しました。" list: "カテゴリをリストする" no_description: "このカテゴリの説明はありません。トピック定義を編集してください。" @@ -1475,7 +1514,7 @@ ja: lower_title_with_count: other: "{{count}}件" lower_title: "新着" - title: "新規" + title: "新着" title_with_count: other: "最新 ({{count}})" help: "最近投稿されたトピック" @@ -1494,25 +1533,25 @@ ja: title: "トップ" help: "過去年間、月間、週間及び日間のアクティブトピック" all: - title: "今まで" + title: "すべて" yearly: - title: "今年" + title: "年ごと" quarterly: title: "3ヶ月おき" monthly: - title: "今月" + title: "月ごと" weekly: title: "毎週" daily: - title: "毎日" - all_time: "今まで" + title: "日ごと" + all_time: "すべて" this_year: "年" this_quarter: "今季" this_month: "月" this_week: "週" - today: "本日" + today: "今日" other_periods: "次の期間のトピックを見る" - browser_update: 'ここで動作するにはブラウザのバージョンが古すぎます。 。 ここでブラウザアップグレード.' + browser_update: 'ご利用のブラウザのバージョンが古いです。 ブラウザをアップデートしてください。' permission_types: full: "作成 / 返信 / 閲覧" create_post: "返信 / 閲覧" @@ -1661,7 +1700,7 @@ ja: regenerate: "API キーを再生成" revoke: "無効化" confirm_regen: "このAPIキーを新しいものに置き換えてもよろしいですか?" - confirm_revoke: "このキーを無効化しても本当によろしいですか?" + confirm_revoke: "このキーを無効化してもよろしいですか？" info_html: "API キーを使うと、JSON 呼び出しでトピックの作成・更新を行うことが出来ます。" all_users: "全てのユーザ" note_html: "このキーは、秘密にしてください。このキーを持っている全てのユーザは任意のユーザとして、好きな投稿を作成できます" @@ -1708,10 +1747,10 @@ ja: cancel: label: "キャンセル" title: "バックアップ作業をキャンセルする" - confirm: "本当に実行中バックアップ作業をキャンセルしますか？" + confirm: "実行中のバックアップをキャンセルしてもよろしいですか？" backup: label: "バックアップ" - title: "バックアップを作成" + title: "バックアップを行います" confirm: "新しくバックアップを行ってもよろしいですか？" without_uploads: "はい(ファイルは含まない)" download: @@ -1727,10 +1766,10 @@ ja: confirm: "バックアップを復元してもよろしいですか？" rollback: label: "ロールバック" - title: "データベースを元の作業状態にロールバックする" + title: "データベースを前回の状態に戻します" export_csv: user_archive_confirm: "投稿をダウンロードしてもよろしいですか？" - success: "エスクポートを開始しました。処理が完了すると、メッセージで通知されます。" + success: "エクスポートを開始しました。処理が完了した後、メッセージでお知らせします。" failed: "出力失敗。詳しくはログに参考してください。" rate_limit_error: "投稿は1日に1度だけダウンロードできます。また明日お試しください。" button_text: "エクスポート" @@ -1768,7 +1807,7 @@ ja: explain_rescue_preview: "既定スタイルシートでサイトを表示する" save: "保存" new: "新規" - new_style: "新規スタイル" + new_style: "新しいスタイル" import: "インポート" import_title: "ファイルを選択するかテキストをペースト" delete: "削除" @@ -1826,7 +1865,7 @@ ja: email: title: "メール" settings: "設定" - preview_digest: "ダイジェストのプレビュー" + preview_digest: "まとめのプレビュー" sending_test: "テストメールを送信中..." error: "ERROR - %{server_error}" test_error: "テストメールを送れませんでした。メール設定、またはホストをメールコネクションをブロックされていないようを確認してください。" @@ -1859,7 +1898,7 @@ ja: title: "フィルター" user_placeholder: "ユーザ名" address_placeholder: "name@example.com" - type_placeholder: "ダイジェスト、サインアップ..." + type_placeholder: "まとめ、サインアップ..." reply_key_placeholder: "返信キー" skipped_reason_placeholder: "理由" logs: @@ -1881,7 +1920,7 @@ ja: staff_actions: title: "スタッフ操作" instructions: "ユーザ名、アクションをクリックすると、リストはフィルタされます。プロフィール画像をクリックするとユーザページに遷移します" - clear_filters: "全てを表示する" + clear_filters: "すべて表示する" staff_user: "スタッフユーザ" target_user: "対象ユーザ" subject: "対象" @@ -1934,7 +1973,7 @@ ja: screened_ips: title: "スクリーン対象IP" description: '参加中のIPアドレス。IPアドレスをホワイトリストに追加するには "許可" を利用してください。' - delete_confirm: "%{ip_address} のルールを本当に削除しますか?" + delete_confirm: "%{ip_address} のルールを削除してもよろしいですか？" roll_up_confirm: "Are you sure you want to roll up commonly screened IP addresses into subnets?" rolled_up_some_subnets: "Successfully rolled up IP ban entries to these subnets: %{subnets}." rolled_up_no_subnet: "There was nothing to roll up." @@ -1982,7 +2021,7 @@ ja: active: 'アクティブユーザ' new: '新規ユーザ' pending: '保留中のユーザ' - newuser: 'トラストレベル0のユーザ (新規ユーザ)' + newuser: 'トラストレベル0のユーザ (新しいユーザ)' basic: 'トラストレベル1のユーザ (ベーシックユーザ)' staff: "スタッフ" admins: '管理者ユーザ' @@ -2011,17 +2050,18 @@ ja: suspend: "凍結" unsuspend: "凍結解除" suspended: "凍結状態" - moderator: "モデレータ?" - admin: "管理者?" - blocked: "ブロック中?" + moderator: "モデレータ権限の所有" + admin: "管理者権限の所有" + blocked: "ブロック状態" + staged: "ステージドモードの状態" show_admin_profile: "アカウントの管理" edit_title: "タイトルを編集" save_title: "タイトルを保存" refresh_browsers: "ブラウザを強制リフレッシュ" refresh_browsers_message: "全てのクライアントにメッセージが送信されました！" - show_public_profile: "公開されるプロフィールを見る" + show_public_profile: "公開プロフィールを見る" impersonate: 'このユーザになりすます' - ip_lookup: "IP検索" + ip_lookup: "IPアドレスを検索" log_out: "ログアウト" logged_out: "すべてのデバイスでログアウトしました" revoke_admin: '管理者権限を剥奪' @@ -2061,7 +2101,7 @@ ja: other: "全ての投稿を削除できませんでした。%{count}日以上経過した投稿があります。(設定: delete_user_max_post_age)" cant_delete_all_too_many_posts: other: "全ての投稿を削除できませんでした。ユーザは%{count} 件以上投稿しています。(delete_all_posts_max)" - delete_confirm: "本当にこのユーザを削除しますか？" + delete_confirm: "このユーザを削除してもよろしいですか？" delete_and_block: " 削除する。このメールとIPアドレスからのサインアップを以後ブロック" delete_dont_block: "削除する" deleted: "ユーザが削除されました。" @@ -2079,6 +2119,7 @@ ja: deactivate_explanation: "アクティベート解除されたユーザは、メールで再アクティベートする必要があります。" suspended_explanation: "凍結中のユーザはログインできません。" block_explanation: "ブロックされているユーザは投稿およびトピックの作成ができません。" + staged_explanation: "ステージドユーザは特定のトピック宛に、メールを経由して投稿する事が出来ます。" trust_level_change_failed: "ユーザのトラストレベル変更に失敗しました。" suspend_modal_title: "凍結中のユーザ" trust_level_2_users: "トラストレベル2のユーザ" @@ -2187,20 +2228,21 @@ ja: title: バッジ new_badge: 新しいバッジ new: 新規 - name: バッジ名 + name: バッジの名前 badge: バッジ display_name: バッジの表示名 description: バッジの説明 + long_description: 詳しい説明 badge_type: バッジの種類 badge_grouping: グループ badge_groupings: - modal_title: バッジの振り分け + modal_title: バッジのグループ granted_by: 'バッジをつけた人: ' granted_at: 'バッジをつけた日: ' reason_help: (投稿かトピックへのリンク) save: バッジを保存する - delete: バッジを削除する - delete_confirm: 本当にこのバッジを削除しますか？ + delete: 削除 + delete_confirm: このバッジを削除してもよろしいですか？ revoke: 取り消す reason: 理由 expand: '&hellipを展開' @@ -2212,17 +2254,17 @@ ja: no_user_badges: "%{name} はバッジを付けられていません。" no_badges: 付けられるバッジがありません none_selected: "バッジを選択して開始" - allow_title: バッジは、タイトルとして使用されることを許可する - multiple_grant: 複数回付与することができます - listable: パブリックパッジページに表示するバッジ - enabled: バッジシステムを使う + allow_title: バッジをタイトルとして使用されることを許可する + multiple_grant: 何度もゲットできるようにする + listable: 公開されるバッジページにバッジを表示する + enabled: バッジを有効にする icon: アイコン image: 画像 icon_help: "Font Awesomeのクラスか画像のURLを使用してください" query: バッジクエリ(SQL) target_posts: 投稿を対象 - auto_revoke: 毎日失効クエリを実行 - show_posts: バッジページの付与したバッジで投稿を表示 + auto_revoke: 毎日クエリの取り消しを実行 + show_posts: バッジページでバッジを取得したことを投稿する trigger: トリガー trigger_type: none: "毎日更新する" @@ -2279,16 +2321,18 @@ ja: search_help: title: 'Search Help' keyboard_shortcuts_help: - title: 'キーボードショートカット' + title: 'ショートカットキー' jump_to: title: 'ページ移動' home: 'g, h ホーム' latest: 'g, l 最新' - new: 'g, n 新規' + new: 'g, n 新着' unread: 'g, u 未読' categories: 'g, c カテゴリ' top: 'g, t トップ' bookmarks: 'g, b ブックマーク' + profile: 'g, p プロフィール' + messages: 'g, m メッセージ' navigation: title: 'ナビゲーション' jump: '# # 投稿へ' @@ -2300,6 +2344,7 @@ ja: title: 'アプリケーション' create: 'c 新しいトピックを作成' notifications: 'n お知らせを開く' + hamburger_menu: '= メニューを開く' user_profile_menu: 'p ユーザメニュを開く' show_incoming_updated_topics: '. 更新されたトピックを表示する' search: '/ 検索' @@ -2308,7 +2353,7 @@ ja: dismiss_topics: 'Dismiss Topics' actions: title: '操作' - bookmark_topic: 'f トピックのブックマークをトグル' + bookmark_topic: 'f トピックのブックマークを切り替え' pin_unpin_topic: 'shift+pトピックを ピン留め/ピン留め解除' share_topic: 'shift+s トピックをシェア' share_post: 's 投稿をシェアする' @@ -2326,7 +2371,10 @@ ja: mark_tracking: 'm, t トピックを追跡する' mark_watching: 'm, w トピックを参加中にする' badges: + granted_on: "%{date} にゲット" title: バッジ + allow_title: "タイトルとしての使用" + multiple_grant: "何度も取得可能" badge_count: other: "%{count} バッジ" more_badges: @@ -2337,7 +2385,7 @@ ja: none: "" badge_grouping: getting_started: - name: Getting Started + name: はじめの一歩 community: name: コミュニティ trust_level: @@ -2345,4 +2393,12 @@ ja: other: name: その他 posting: - name: 投稿中 + name: 投稿 + tagging: + changed: "タグを変更しました:" + sort_by: "並べ替え:" + topics: + none: + search: "検索結果は何もありません。" + bottom: + search: "検索結果は以上です。" diff --git a/config/locales/client.pt.yml b/config/locales/client.pt.yml index 03cacd03f3..dde9432914 100644 --- a/config/locales/client.pt.yml +++ b/config/locales/client.pt.yml @@ -111,6 +111,8 @@ pt: google+: 'partilhar esta hiperligação no Google+' email: 'enviar esta hiperligação por email' action_codes: + public_topic: "tornei este tópico publico %{when}" + private_topic: "tornei este tópico privado %{when}" split_topic: "dividir este tópico %{when}" invited_user: "Convidou %{who} %{when}" removed_user: "Removeu %{who} %{when}" @@ -2115,6 +2117,7 @@ pt: test_error: "Occorreu um problema no envio do email de teste. Por favor verifique novamente as suas definições de email, verifique se o seu host não está a bloquear conexões de email, e tente novamente." sent: "Enviado" skipped: "Ignorado" + bounced: "Devolvida" received: "Recebido" rejected: "Rejeitado" sent_at: "Enviado em" @@ -2765,3 +2768,10 @@ pt: bottom: latest: "Não há mais tópicos recentes." hot: "Não há mais tópicos quentes." + posted: "Não existem mais tópicos publicados." + read: "Não existem mais tópicos lidos." + new: "Não existem mais tópicos novos." + unread: "Não existem mais tópicos por ler." + top: "Não existem mais tópicos de topo." + bookmarks: "Não existem mais tópicos marcados." + search: "Não existem mais resultados de pesquisa." diff --git a/config/locales/client.ro.yml b/config/locales/client.ro.yml index 61f124d3c3..7d4a573ea8 100644 --- a/config/locales/client.ro.yml +++ b/config/locales/client.ro.yml @@ -554,7 +554,7 @@ ro: username: title: "Nume Utilizator" instructions: "Numele de utilizator trebuie sa fie unic, fără spații, scurt." - short_instructions: "Ceilalți te pot numii @{{username}}." + short_instructions: "Ceilalți te pot menționa ca @{{username}}." available: "Numele de utilizator este valabil." global_match: "Emailul se potrivește numelui de utilizator înregistrat." global_mismatch: "Deja înregistrat. Încearcă:{{suggestion}}?" @@ -1501,10 +1501,11 @@ ro: muted: title: "Silențios" flagging: - title: 'De ce marcați această postare ca fiind privată?' + title: 'Mulțumim că ne ajuți să păstrăm o comunitate civilizată!' action: 'Marcare' take_action: "Actionează" notify_action: 'Mesaj' + official_warning: 'Avertismen Oficial' delete_spammer: "Șterge spammer" delete_confirm: "Sunteți pe punctul de a șterge postarea %{posts} și postările %{topics} ale acestui uitilizator, de a-i anula contul, de a-i bloca autentificarea de la adresa IP %{ip_address}, adresa de email %{email} și de a bloca listarea permanent. Sunteți sigur ca acest utilizator este un spammer?" yes_delete_spammer: "Da, Șterge spammer" @@ -1513,6 +1514,7 @@ ro: submit_tooltip: "Acceptă marcarea privată" take_action_tooltip: "Accesati permisiunea marcarii imediat, nu mai asteptati alte marcaje comune" cant: "Ne pare rău nu puteți marca această postare deocamdată." + notify_staff: 'Notifică un moderator în privat' formatted_name: off_topic: "În afară discuției" inappropriate: "Inadecvat" diff --git a/config/locales/client.sq.yml b/config/locales/client.sq.yml index 293571f464..c8aed6f505 100644 --- a/config/locales/client.sq.yml +++ b/config/locales/client.sq.yml @@ -124,7 +124,7 @@ sq: disabled: 'hapur %{when}' archived: enabled: 'arkivoi %{when}' - disabled: 'çarkivuar %{when}' + disabled: 'paarkivuar %{when}' pinned: enabled: 'mbërthyer %{when}' disabled: 'zbërthyer %{when}' diff --git a/config/locales/client.zh_CN.yml b/config/locales/client.zh_CN.yml index 268a19e197..8847a7f49c 100644 --- a/config/locales/client.zh_CN.yml +++ b/config/locales/client.zh_CN.yml @@ -2602,8 +2602,8 @@ zh_CN:

    tagging: - all_tags: "所以标签" - selector_all_tags: "所以标签" + all_tags: "所有标签" + selector_all_tags: "所有标签" changed: "标签被修改" tags: "标签" choose_for_topic: "为主题选择可选标签" diff --git a/config/locales/server.ar.yml b/config/locales/server.ar.yml index 8042ec3556..6a86bd1bd7 100644 --- a/config/locales/server.ar.yml +++ b/config/locales/server.ar.yml @@ -898,7 +898,7 @@ ar: post_excerpt_maxlength: "الحد الأقصى لطول وظيفة مقتطف / ملخص." post_onebox_maxlength: "الحد الأقصى لطول مشاركة oneboxed Discourse بالأحرف." onebox_domains_whitelist: "قائمة بالمجالات للسماح روابط تفصيلي؛ وينبغي دعم هذه المجالات OpenGraph أو oEmbed. اختبار لهم في http://iframely.com/debug" - logo_url: "صورة الشعار في الجزء العلوي الأيسر من موقع الويب الخاص بك، يجب أن تكون على شكل مستطيل واسع. إذا كان سيتم إظهار غادر نص عنوان موقع على بياض." + logo_url: "صورة الشعار في الجزء العلوي الأيسر من موقع الويب الخاص بك، يجب أن تكون على شكل مستطيل واسع. إذا ترك الحقل فارغا فسيتم استخدام اسم الموقع." logo_small_url: "صورة الشعار صغيرة في الجزء العلوي الأيسر من موقع الويب الخاص بك، يجب أن تكون على شكل مربع، وينظر عند التمرير لأسفل. وإذا ترك فارغا أن أظهرت الصورة الرمزية المنزل." favicon_url: "الأيقونة الخاصة بموقعك, شاهد http://en.wikipedia.org/wiki/Favicon, لتعمل بشكل صحيح ضمن CDN يجب ان تكون بصيغة png." mobile_logo_url: "صورة الشعار الثابتة ستظهر في الجزء العلوي الأيسر في نسخة الجوال من موقعك. يجب أن تكون مربعة. إذا تُركت فارغة، سيتم استخدام الـ `logo_url`. على سبيل المثال: http://example.com/uploads/default/logo.png" diff --git a/config/locales/server.es.yml b/config/locales/server.es.yml index aecd86c1a2..4d93a22e2c 100644 --- a/config/locales/server.es.yml +++ b/config/locales/server.es.yml @@ -31,6 +31,7 @@ es: incoming: default_subject: "Email entrante desde %{email}" show_trimmed_content: "Mostrar contenido recortado" + maximum_staged_user_per_email_reached: "Alcanzado el número máximo de usuarios provisionales creados por email." errors: empty_email_error: "Sucede cuando el texto en bruto del email que recibimos está en blanco." no_message_id_error: "Sucede cuando el email no tiene Id del mensaje en el encabezado." @@ -44,7 +45,7 @@ es: reply_user_not_matching_error: "Sucede cuando una respuesta vino de una dirección de email diferente a la que fue enviada la notificación." topic_not_found_error: "Sucede cuando entró una respuesta pero el tema relacionado ha sido eliminado." topic_closed_error: "Sucede cuando entró una respuesta pero el tema relacionado ha sido cerrado. " - bounced_email_report: "El email es un reporte que ha rebotado." + bounced_email_error: "El email es un reporte de correo rebotado." auto_generated_email_reply: "El email contiene una respuesta a un correo autogenerado." screened_email_error: "Sucede cuando la dirección de email del remitente ya ha sido filtrada." errors: &errors @@ -1120,6 +1121,8 @@ es: default_categories_tracking: "Lista de categorías que están seguidas por defecto" default_categories_muted: "Lista de categorías que están silenciadas por defecto." tagging_enabled: "¿Activar etiquetas para los temas?" + min_trust_to_create_tag: "El mínimo nivel de confianza requerido para crear una etiqueta." + max_tags_per_topic: "El máximo número de etiquetas que se pueden añadir a un tema." errors: invalid_email: "Dirección de correo electrónico inválida. " invalid_username: "No existe ningún usuario con ese nombre de usuario. " diff --git a/config/locales/server.fi.yml b/config/locales/server.fi.yml index 71f1642a11..a661f6aa45 100644 --- a/config/locales/server.fi.yml +++ b/config/locales/server.fi.yml @@ -24,7 +24,7 @@ fi: loading: "Lataa" powered_by_html: 'Voimanlähteenä Discourse, toimii parhaiten, kun JavaScript on käytössä' log_in: "Kirjaudu" - purge_reason: "Poistettu automaattisesti hylättynä, aktivoimattomana tilinä" + purge_reason: "Hylätty, aktivoimaton tili poistettiin automaattisesti" disable_remote_images_download_reason: "Linkattujen kuvien lataaminen poistettiin käytöstä vähäisen tallennustilan vuoksi." anonymous: "Anonyymejä" emails: @@ -172,7 +172,8 @@ fi: private_posts: "Uusimmat yksityisviestit" group_posts: "Uusimmat viestit ryhmässä %{group_name}" group_mentions: "Uusimmat maininnat ryhmässä %{group_name}" - tag: "Tagatut aiheet" + user_posts: "Viimeisimmät viestit käyttäjältä @%{username}" + user_topics: "Viimeisimmät ketjut käyttäjältä @%{username}" too_late_to_edit: "Tämä viesti luotiin liian kauan sitten. Sitä ei voi enää muokata tai poistaa." revert_version_same: "Nykyinen revisio on sama, kuin jonka yrität palauttaa." excerpt_image: "kuva" diff --git a/config/locales/server.fr.yml b/config/locales/server.fr.yml index 0180f61036..ddf4c041b8 100644 --- a/config/locales/server.fr.yml +++ b/config/locales/server.fr.yml @@ -31,6 +31,7 @@ fr: incoming: default_subject: "Courriel arrivant de %{email}" show_trimmed_content: "Montrer le contenu raccourci" + maximum_staged_user_per_email_reached: "Vous avez atteint le nombre maximal d'utilisateurs qui peuvent être créés par mail." errors: empty_email_error: "Arrive quand le courriel reçu était vide." no_message_id_error: "Arrive quand le courrier n'a pas d'en-tête \"Message-Id\"." @@ -44,7 +45,7 @@ fr: reply_user_not_matching_error: "Arrive quand une réponse est venue d'une adresse de courriel différente de celle où a été envoyée la notification." topic_not_found_error: "Arrive quand quelqu'un répond à un sujet qui a été supprimé." topic_closed_error: "Arrive quand quelqu'un répond mais le sujet lié a été fermé." - bounced_email_report: "Le courriel est un rapport de courriel rejeté." + bounced_email_error: "Le courriel est un rapport de courriel rejeté." auto_generated_email_reply: "Email contient une réponse à un email automatiquement généré." screened_email_error: "Arrive quand l'adresse courriel de l'expéditeur est déjà sous surveillance." errors: &errors @@ -713,6 +714,9 @@ fr: 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." subfolder_ends_in_slash: "Votre configuration de sous-répertoire est erronée; DISCOURSE_RELATIVE_URL_ROOT se termine avec une barre oblique ." + email_polling_errored_recently: + one: "La vérification des mails a généré une erreur au cours des 24 dernières heures. Vérifiez le journal pour plus de détails." + other: "La vérification des mails a généré %{count} erreurs au cours des 24 dernières heures. Vérifiez le journal pour plus de détails." bad_favicon_url: "Impossible de charger la favicon. Vérifiez le paramètre favicon_url dans les paramètres du site" site_settings: censored_words: "Mots qui seront automatiquement remplacés par ■■■■" @@ -1105,10 +1109,8 @@ fr: default_categories_watching: "Liste de catégories surveillées par défaut." default_categories_tracking: "Liste de catégories suivies par défaut." default_categories_muted: "Liste de catégories silencées par défaut." - tagging_enabled: "Autoriser les utilisateurs à mettre des tags sur les sujets ?" - min_trust_to_create_tag: "Le niveau de confiance requis pour créer un tag." - max_tags_per_topic: "Le nombre maximum de tags qui peuvent être ajouté à un sujet." - max_tag_length: "The nombre maximum de caractères qui peuvent être utilisés pour un tag." + tagging_enabled: "Activer les tags sur les sujets ?" + tag_style: "Style visuel pour tag badges." errors: invalid_email: "Adresse de courriel invalide." invalid_username: "Il n'y a pas d'utilisateur ayant ce pseudo." @@ -1929,6 +1931,7 @@ fr: avatar: missing: "Désolé, nous ne parvenons pas à trouver un avatar associé à cette adresse mail. Pouvez-vous essayer de la télécharger à nouveau ?" email_log: + post_user_deleted: "L'auteur du message a été supprimé." no_user: "Impossible de trouver l'utilisateur avec l'id %{user_id}" anonymous_user: "L'utilisateur est anonyme" suspended_not_pm: "L'utilisateur est suspendu, pas de message" @@ -2211,25 +2214,23 @@ fr: Ce badge est accordé lorsque vous utilisez tous les 50 de vos j'aime quotidiens. Rappelez-vous de prendre un moment pour aimer les messages qui vous plaisent et d'apprécier encourager vos membres de la communauté pour créer encore plus de grandes discussions à l'avenir. higher_love: name: Amour plus fort + description: A utilisé 50 likes en un jour 5 fois long_description: | Ce badge est accordé lorsque vous utilisez tous les 50 j'aime par jour pendant 5 jours. Merci de prendre le temps activement d'encourager les meilleures conversations chaque jour! crazy_in_love: name: Fou amoureux + description: A utilisé 50 likes en un jour 20 fois long_description: | Ce badge est accordé lorsque vous utilisez tous les 50 de vos j'aime par jour pendant 20 jours. Hou la la! Vous êtes un modèle de régulièrement encourager vos membres de la communauté! thank_you: name: 'Merci ' description: A 20 messages ayant reçu un j'aime et a donné 10 j'aime - long_description: "Ce badge vous est accordé quand vous avez reçu 20 j'aime sur vos messages et en avez donné 10 ou plus en retour. Quand quelqu'un aime vos messages, vous trouvez le temps d'aimer ce que les autres postent à leur tour. \n" gives_back: name: Redonne description: A 100 messages ayant reçu un j'aime et a donné 100 j'aime - long_description: | - Ce badge vous est accordé quand vous avez reçu 100 j'aime et en avez donné 100 ou plus en retour. Merci pour tout cela. empathetic: name: Empathique description: A 500 messages ayant reçu un j'aime et a donné 1000 j'aime - long_description: "Ce badge vous est accordé quand vous avez reçu 500 j'aime et en avez donné 1000 ou plus en retour. Whaou ! Vous êtes un modèle de générosité et d'amour mutuel :two_hearts:. \n" first_emoji: name: Premier Emoji description: A utilisé un emoji dans un message @@ -2253,9 +2254,10 @@ fr: initial_topic_title: Rapports de performances du site topic_invite: user_exists: "Désolé, cet utilisateur a déjà été invité. Vous ne pouvez inviter un utilisateur qu'une seule fois par sujet." + tags: + title: "Tags" time: <<: *datetime_formats activemodel: errors: <<: *errors - rss_by_tag: "Sujets portant le tag %{tag}" diff --git a/config/locales/server.it.yml b/config/locales/server.it.yml index a16c287bd0..c1f7e369b8 100644 --- a/config/locales/server.it.yml +++ b/config/locales/server.it.yml @@ -159,8 +159,16 @@ it: rss_description: latest: "Argomenti più recenti" hot: "Argomenti caldi" + top: "Argomenti di punta" posts: "Ultimi messaggi" + private_posts: "Ultimi messaggi privati" + group_posts: "Ultimi messaggi da %{group_name}" + group_mentions: "Ultime menzioni da %{group_name}" + user_posts: "Ultimi messaggi di @%{username}" + user_topics: "Ultimi argomenti di @%{username}" + tag: "Argomenti etichettati" too_late_to_edit: "Questo messaggio è stato creato troppo tempo fa. Non può più essere modificato né cancellato." + revert_version_same: "La versione attuale è la stessa versione che stai cercando di ripristinare." excerpt_image: "immagine" queue: delete_reason: "Cancellato attraverso la coda di moderazione" @@ -169,6 +177,7 @@ it: can_not_modify_automatic: "Non puoi modificare un gruppo automatico" member_already_exist: "'%{username}' è già membro di questo gruppo." invalid_domain: "'%{domain}' non è un dominio valido." + invalid_incoming_email: "'%{email}' non è un indirizzo email valido." default_names: everyone: "chiunque" admins: "amministratori" @@ -728,7 +737,7 @@ it: share_links: "Determina quali elementi appaiono nella finestra di condivisione e in quale ordine." track_external_right_clicks: "Segui i collegamenti esterni sui quali viene fatto click destro (es: apri in una nuova tab). Disabilitato di default perché riscrive le URL" site_contact_username: "Un utente dello staff valido da cui inviare tutti i messaggi automatici. Se lasciato vuoto verrà usato l'account System di default." - send_welcome_message: "nvia a tutti i nuovi utenti un messaggio di benvenuto con una guida di avvio rapido." + send_welcome_message: "Invia a tutti i nuovi utenti un messaggio di benvenuto con una guida di avvio rapido." suppress_reply_directly_below: "Non mostrare il conteggio espandibile delle risposte quando c'è una sola risposta sotto quel messaggio." suppress_reply_directly_above: "Non mostrare in-risposta-a espandibile in un messaggio quando c'è una sola risposta sopra quel messaggio. " suppress_reply_when_quoting: "Non mostrare in-risposta-a espandibile in un messaggio quando il messaggio include la citazione." @@ -1273,6 +1282,10 @@ it: privacy_topic: title: "Politica della Privacy" badges: + welcome: + description: Hai ricevuto un Mi piace + great_topic: + description: Hai ricevuto 50 Mi piace su 1 argomento first_like: name: Primo "Mi piace" description: Ha messo "Mi piace" a un messaggio @@ -1286,11 +1299,21 @@ it: name: Primo Collegamento first_quote: description: Ha citato un messaggio + appreciated: + description: Hai ricevuto 1 Mi piace su 20 messaggi + respected: + description: Hai ricevuto 2 Mi piace su 100 messaggi + admired: + description: Hai ricevuto 5 Mi piace su 300 messaggi admin_login: success: "email Inviata" error: "Errore!" email_input: "Email Amministratore" submit_button: "Invia Email" + tags: + title: "Etichette" + staff_tag_remove_disallowed: "L'etichetta \"%{tag}\" può essere cancellata soltanto dallo staff." + rss_by_tag: "Argomenti etichettati %{tag}" time: <<: *datetime_formats activemodel: diff --git a/config/locales/server.ja.yml b/config/locales/server.ja.yml index 0bd2d5b1ce..748537b6a3 100644 --- a/config/locales/server.ja.yml +++ b/config/locales/server.ja.yml @@ -9,7 +9,7 @@ ja: dates: short_date_no_year: "MMM D" short_date: "YYYY MMM D" - long_date: "MMMM D, YYYY h:mma" + long_date: "YYYY MMMM D h:mma" date: month_names: [null, 1月, 2月, 3月, 4月, 5月, 6月, 7月, 8月, 9月, 10月, 11月, 12月] title: "Discourse" @@ -23,20 +23,21 @@ ja: emails: incoming: default_subject: "%{email}からメール" + show_trimmed_content: "続きを読む" errors: &errors format: '%{attribute} %{message}' messages: too_long_validation: "は、最大文字数(%{max}文字)を超えています。(入力したのは%{length}文字 ) " - invalid_boolean: "無効なboolean." + invalid_boolean: "無効な選択肢" taken: "は既に使用されています" accepted: に同意する必要があります blank: を入力してください present: は入力しないでください confirmation: "と%{attribute}の入力が一致しません" - empty: 本文が未入力です。. + empty: 本文が入力されていません equal_to: は%{count}にしてください even: は偶数にしてください - exclusion: は予約されています + exclusion: はすでに使われています greater_than: は%{count}より大きい値にしてください greater_than_or_equal_to: は%{count}以上の値にしてください has_already_been_used: "は既に使用されています" @@ -74,7 +75,7 @@ ja: not_logged_in: "ログインしてください。" not_found: "リクエストされたURL、リソースは見つかりませんでした" invalid_access: "リクエストしたリソースの閲覧が許可されていません" - read_only_mode_enabled: "このサイトは読み取り専用モードです。会話は無効になっています。" + read_only_mode_enabled: "このサイトは閲覧専用状態です。変更などの操作は無効になっています。" too_many_replies: other: "申し訳ありません、新しいユーザーの同じトピックへの返信は、一時的に %{count} 回に制限されています。" embed: @@ -82,12 +83,14 @@ ja: continue: "議論を続ける" more_replies: other: "%{count} 以上の返信" - loading: "会話をロードしています…" + loading: "会話を読み込んでいます…" permalink: "パーマリンク" imported_from: "これは、オリジナルエントリ%{link}に対するディスカッショントピックです" in_reply_to: "▶ %{username}" replies: other: "%{count} 通の返信" + no_mentions_allowed: "あなたは他のユーザへメンションを送ることができません。" + no_images_allowed: "新規ユーザは投稿に画像を付ける事はできません。" spamming_host: "申し訳ありませんが、このホストへのリンクを貼ることはできません。" user_is_suspended: "アカウントが凍結中のユーザーは投稿ができません。" topic_not_found: "問題が発生しました。トピックがクローズしたか、閲覧中に削除された可能性があります。" @@ -108,9 +111,10 @@ ja: read_full_topic: "完全なトピックを読む" private_message_abbrev: "メッセージ" rss_description: - latest: "最新トピック" + latest: "最新のトピック" hot: "ホットトピック" posts: "最近の投稿" + private_posts: "最新のプライベートメッセージ" too_late_to_edit: "この投稿の編集・削除期間が過ぎました。編集・削除が出来ません。" excerpt_image: "画像" queue: @@ -161,11 +165,12 @@ ja: 回答を追加する代わりに、以前の回答を編集するか、別のトピックを訪れる事を検討してください。 reviving_old_topic: | - ### このトピックを復活させますか？ + ### このトピックを復活させてもよろしいですか？ - このトピックの最後の回答は%{days}日前です。あなたの回答はトピックを一覧のトップに上げて、以前回答した誰がか気付きます。 + このトピックへの最後の返信は%{days}日前です。 + あなたの返信はトピック一覧の一番上に移動させ、以前に返信した人宛に通知が送られます。 - 本当に過去の議論を続けますか？ + 本当に過去の会話を復元してもよろしいですか？ activerecord: attributes: category: @@ -209,7 +214,7 @@ ja: lounge_welcome: title: "ラウンジへようこそ" category: - topic_prefix: "%{category} カテゴリの定義" + topic_prefix: "%{category}カテゴリについて" errors: uncategorized_parent: "未分類カテゴリは親カテゴリに設定出来ません。" self_parent: "自分自身がサブカテゴリの親になることはできません" @@ -222,7 +227,7 @@ ja: topic_exists_no_oldest: "%{count}個のトピックを持っているため、このカテゴリを削除できません。" trust_levels: newuser: - title: "新規ユーザ" + title: "新しいユーザ" basic: title: "ベーシックユーザ" change_failed_explanation: "%{user_name} を '%{new_trust_level}' に格下げしようとしましたが、既にトラストレベルが '%{current_trust_level}' です。%{user_name} は '%{current_trust_level}' のままになります - もしユーザーを降格させたい場合は、トラストレベルをロックしてください" @@ -236,15 +241,15 @@ ja: other: "%{count} 秒" datetime: distance_in_words: - half_a_minute: "< 1分" + half_a_minute: "1分前" less_than_x_seconds: other: "< %{count} 秒" x_seconds: other: "%{count} 秒" less_than_x_minutes: - other: "< %{count} 分" + other: "%{count}分前" x_minutes: - other: "%{count} 分" + other: "%{count}分" about_x_hours: other: "%{count} 時間" x_days: @@ -266,9 +271,9 @@ ja: x_seconds: other: "%{count} 秒前" less_than_x_minutes: - other: "%{count} 分未満" + other: "%{count}分未満" x_minutes: - other: "%{count} 分前" + other: "%{count}分前" about_x_hours: other: "%{count} 時間前" x_days: @@ -534,7 +539,7 @@ ja: title_nag: "サイトの名前が正しくありません。サイトの設定で更新してください" site_description_missing: "検索結果に表示される説明文を入力してください。サイトの設定で更新してください" consumer_email_warning: "サイトはメール送信に Gmail (または他のカスタムメールサービス) を利用するように設定されています。Gmail で送信可能なメール数には制限があります。メールを確実に送信するために mandrill.com などのメールサービスプロバイダーの利用を検討してください。" - site_contact_username_warning: "重要な自動メッセージを送信するフレンドリースタッフユーザーアカウントの名前を入力してください。サイト設定 のsite_contact_username を更新してください。" + site_contact_username_warning: "重要なメッセージを送るために、スタッフユーザの名前を入力してください。サイト設定 のsite_contact_username を更新してください。" notification_email_warning: "通知用メールがあなたのドメインで有効なメールアドレスから送信されていません。メール配信が不安定になり、信頼性が低くなります。\nサイトの設定で更新してください" site_settings: censored_words: "自動的に ■■■■ で置換されます" @@ -583,12 +588,12 @@ ja: notification_email: "The from: email address used when sending all essential system emails. The domain specified here must have SPF, DKIM and reverse PTR records set correctly for email to arrive." 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_base_url: "ロングポーリングのベースURL(CDNが動的コンテンツを配信している場合、これをoriginに指定してください) eg: http://origin.site.com" long_polling_interval: "ユーザに送信するデータが存在しないとき、サーバが待機する時間(ログインユーザーのみ)" @@ -601,7 +606,7 @@ ja: tl2_additional_likes_per_day_multiplier: "この数字を掛けると TL2 (メンバー) の1日あたりの「いいね！」の上限を増やします" tl3_additional_likes_per_day_multiplier: "この数字を掛けると TL3 (レギュラー) の1日あたりの「いいね！」の上限を増やします" tl4_additional_likes_per_day_multiplier: "この数字を掛けると TL4 (リーダー) の1日あたりの「いいね！」の上限を増やします" - num_flags_to_block_new_user: "新規ユーザの投稿に対して、何人のユーザによりここで指定した数のスパムフラグが立てられたら、全てのポストを非表示状態にした上でこのユーザからのポストを拒否するか。0 で無効化" + num_flags_to_block_new_user: "もし新しいユーザがnum_users_to_block_new_userで定義されている数の通報を受けたらそれらの投稿を全て非表示にし、今後の投稿をブロックします。0で無効にします。" num_users_to_block_new_user: "新規ユーザのポストに対して、ここで指定した数のユーザにより何個のスパムフラグが立てられたら、全てのポストを非表示状態にした上でこのユーザからのポストを拒否するか。0 で無効化" notify_mods_when_user_blocked: "ユーザが自動的にブロックされた際に、すべてのモデレータにメッセージを送信する。" flag_sockpuppets: "トピックを作成したユーザーと同じIPアドレスで、新規ユーザーがトピックに回答した場合、両者を潜在的なスパムとしてフラグを立てるか" @@ -615,7 +620,7 @@ ja: enable_noscript_support: "noscript タグ経由でアクセスしてきた標準サーチエンジンクローラのサポートを有効にする" allow_moderators_to_create_categories: "モデレータのカテゴリ作成を許可" cors_origins: "CORSを許可。オリジンはhttp://かhttps://を含む必要があります。CORSを有効にするには、環境変数　DISCOURSE_ENABLE_CORSにtrueをセットする必要があります" - top_menu: "ホームナビゲーゲションに表示する項目、表示順を指定。例: latest|new|unread|categories|top|read|posted|bookmarks" + 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: "シェアダイアログに表示する項目、表示順を指定" @@ -632,13 +637,13 @@ ja: show_email_on_profile: "プロフィールのメールアドレスを表示(自分とスタッフのみ閲覧できます)" email_token_valid_hours: "パスワードリマインダ、アカウントアクティベート時のトークンを何時間有効にするか" email_token_grace_period_hours: "パスワードリマインダ、アカウントアクティベート時のトークンを無効するときに、何時間猶予を与えるか" - enable_badges: "バッジシステムを有効にする" + 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 ダッシュボードにバージョンメッセージを表示する" + version_checks: "Discourse Hubからのアップデートを確認し、管理ページにバージョンやアップデートメッセージを表示する" new_version_emails: "Discourseの新しいバージョンが利用可能になった際に contact_email アドレスにメールで通知する" port: "開発者用! 警告! デフォルトの80番ポートではなく、ここで指定した HTTP ポートを利用する。空欄でデフォルトの80番ポートを利用。" force_hostname: "開発者用! 警告! URL 内のホスト名を指定。空欄でデフォルト値を利用。" @@ -658,7 +663,7 @@ ja: sso_overrides_avatar: "SSOペイロードから取得した外部サイトのプロフィール画像でローカルのプロフィール画像を上書きする。有効にする場合、プロフィール画像のアップデートを無効にする事を強く薦めます" sso_not_approved_url: "このURLに承認されていないSSOアカウントをリダイレクト" enable_local_logins: "ローカルのユーザ名、パスワードでのログインを有効にする (注意: 招待を使用するには有効にする必要があります)" - allow_new_registrations: "新規ユーザー登録を許可。誰でもユーザーを作れるのを防ぐには、チェックを外してください。" + allow_new_registrations: "新しいユーザの登録を許可。ユーザを誰でも作れないようにするためには、チェックを外してください。" enable_yahoo_logins: "Yahoo 認証を有効にする" enable_google_oauth2_logins: "グーグル Oauth2 認証を有効にします。これはグーグルが現在サポートしている認証方式です。key と secret が必要です。" google_oauth2_client_id: "あなたのGoogleアプリケーションのクライアントID" @@ -678,12 +683,12 @@ ja: enable_s3_backups: "完了時にS3にバックアップをアップロードします。重要: 有効なS3 credentialsがファイル設定に必要です" s3_backup_bucket: "バックアップを保持するバケット。　警告: 必ずプライベートバケットになっていることを確認してください" active_user_rate_limit_secs: "'last_seen_at' フィールドを更新する頻度 (秒)" - verbose_localization: "ローカライゼーションtipsを展開するUIを表示する" + verbose_localization: "翻訳者向けの機能を表示をします" previous_visit_timeout_hours: "'previous' visit とみなす時間 (時間)" rate_limit_create_topic: "トピック作成後、次のトピックを作成するまでにユーザが待たなければならない時間 (秒)" rate_limit_create_post: "ポスト投稿後、次のポストを投稿するまでにユーザが待たなければならない時間 (秒)" - rate_limit_new_user_create_topic: "トピック作成後、次のトピックを作成するまでに新規ユーザが待たなければならない時間 (秒)" - rate_limit_new_user_create_post: "ポスト投稿後、次のポストを投稿するまでに新規ユーザが待たなければならない時間 (秒)" + rate_limit_new_user_create_topic: "新しいユーザがトピックを作った後、次のトピックが作成できるまでの時間(秒)" + rate_limit_new_user_create_post: "投稿後、次のポストを投稿するまでに新しいユーザが待たなければならない時間 (秒)" max_likes_per_day: "ユーザが一日に「いいね！」できる最大数" max_flags_per_day: "ユーザが一日に行える通報の回数" max_bookmarks_per_day: "ユーザが一日にブックマークできる最大数" @@ -725,11 +730,11 @@ ja: tl3_links_no_follow: "トラストレベル3のユーザのポスト内のrel=nofolowを削除しない" min_trust_to_create_topic: "新規にトピックを作成するために必要な最低トラストレベル。" min_trust_to_edit_wiki_post: "ポストをwikiにするために必要な最低トラストレベル" - newuser_max_links: "新規ユーザがポスト内に作成できるリンクの数" - newuser_max_images: "新規ユーザがポスト内にアップロードできる画像の数" - newuser_max_attachments: "新規ユーザがポスト内に添付できるファイルの数" - newuser_max_mentions_per_post: "新規ユーザがポスト内で @name で通知できる最大数" - newuser_max_replies_per_topic: "新規ユーザが１つのトピックで誰かがそれに回答するまでに回答できる最大数" + newuser_max_links: "新しいユーザが投稿内に貼れるリンクの数" + newuser_max_images: "新しいユーザが投稿内にアップロードできる画像の数" + newuser_max_attachments: "新しいユーザが投稿内に添付できるファイルの数" + newuser_max_mentions_per_post: "新しいユーザが投稿内で @name で通知できる最大の数" + newuser_max_replies_per_topic: "新しいユーザが１つのトピックで誰かがそれに回答するまでに回答できる最大の数" max_mentions_per_post: "ユーザがポスト内で@name で通知できる最大数" create_thumbnails: "大きすぎる画像はポストにフィットするように、サムネイルを作成しlightbox 画像を作成する" email_time_window_mins: "ユーザによるポストの最終編集チャンスを与えるために、通知用メール送信までに待つ時間 (分)" @@ -760,7 +765,7 @@ ja: topic_post_like_heat_low: "いいね数/ ポスト数の比率がこの比率を超えると、ポスト数のフィールドがやや強調されます" topic_post_like_heat_medium: "いいね数/ ポスト数の比率がこの比率を超えると、ポスト数のフィールドが適度に強調されます" topic_post_like_heat_high: "いいね数/ ポスト数の比率がこの比率を超えると、ポスト数のフィールドが強く強調されます" - faq_url: "他サイトに FAQ をホストしている場合は、フル URL をここに指定。" + faq_url: "FAQが他のサイトにある場合、URLをここに指定します。" tos_url: "他サイトに利用規約をホストしている場合は、フル URL をここに指定。" privacy_policy_url: "他サイトにプライバシーポリシーをホストしている場合は、フル URL を個々に指定。" white_listed_spam_host_domains: "スパムホスト検査から除外するドメインのリスト。新規ユーザはこれらのドメインでポスト内にリンクを作成することを制限されません" @@ -806,9 +811,9 @@ ja: allow_animated_thumbnails: "アニメgifからアニメーションサムネイルを生成する" default_avatars: "新規ユーザが変更するまで使用されるデフォルトのプロフィール画像URL" automatically_download_gravatars: "アカウントの生成時、メールアドレスの変更時にGravatarをダウンロード" - digest_topics: "ダイジェストメールに表示されるトピックの最大数" - digest_min_excerpt_length: "ダイジェストメール内の投稿の抜粋の最小文字数" - disable_digest_emails: "全てのユーザのダイジェストメールを無効にする" + digest_topics: "まとめメールに表示されるトピックの最大数" + digest_min_excerpt_length: "まとめメール内の投稿の抜粋の最小文字数" + disable_digest_emails: "すべてのユーザのまとめメールを無効にする" detect_custom_avatars: "ユーザがプロフィール画像をアップロードしたか確認する" max_daily_gravatar_crawls: "Discourseがプロフィール画像の確認をgravastarに行う回数の上限" public_user_custom_fields: "パブリックに公開されるカスタムフィールドのホワイトリスト" @@ -839,7 +844,7 @@ ja: embed_by_username: "embedされたトピックの作成者として表示されるDiscourseユーザー名" embed_username_key_from_feed: "フィードからDsicourseユーザ名をプルするキー" embed_truncate: "embedされた投稿をtruncateする" - embed_post_limit: "embedで表示する投稿の最大数" + embed_post_limit: "表示可能な投稿の最大数を埋め込む" embed_whitelist_selector: "embedを許可するエレメントのCSS Selector" embed_blacklist_selector: "embedから削除するエレメントのCSS Selector" notify_about_flags_after: "この数時間後に処理されていない通報がある場合は、contact_emailにメールを送信する。0を設定すると無効になります" @@ -852,6 +857,7 @@ ja: emoji_set: "How would you like your emoji?" enforce_square_emoji: "絵文字のアスペクト比を強制的に揃える" approve_unless_trust_level: "トラストレベル以下のユーザーの投稿には承認が必要" + default_email_previous_replies: "デフォルトでメールの文章に以前の返信を含める" errors: invalid_email: "不正なメールアドレスです" invalid_username: "そのユーザ名のユーザは存在しません" @@ -894,7 +900,7 @@ ja: not_seen_in_a_month: "お帰りなさい！　最近見かけませんでしたね。　これらがあなたが離れてから最も人気のトピックです" move_posts: new_topic_moderator_post: - other: "%{count} 件のポストを新しいトピックに分割しました: %{topic_link}" + other: "%{count}件の投稿を新しいトピックに分割しました: %{topic_link}" existing_topic_moderator_post: other: "%{count} 件のポストを既存のトピックにマージしました: %{topic_link}" change_owner: @@ -945,7 +951,7 @@ ja: something_already_taken: "エラーが発生しました。ユーザ名またはメールアドレスが既に使用中の可能性があります。パスワードリセットを行ってください。" omniauth_error: "あなたの アカウントの認可に失敗しました。アカウントの認可を許可したか確認してください" omniauth_error_unknown: "ログインに失敗しました。もう一度試してください。" - new_registrations_disabled: "新規登録は、この時点で許可されていません" + new_registrations_disabled: "新規登録は現在行えません。" password_too_long: "パスワードは200文字までです" email_too_long: "メールアドレスが長過ぎます。アドレス部は254文字以内に、ドメイン部は253文字以内にする必要があります" reserved_username: "そのユーザー名は許可されていません" @@ -964,7 +970,7 @@ ja: blocked: "は許可されていません。" ip_address: blocked: "あなたのIPアドレスからの新規登録は許可されていません" - max_new_accounts_per_registration_ip: "あなたのIPアドレスからの新規登録は許可されていません(最大数に達しました)。スタッフメンバーに連絡してください" + max_new_accounts_per_registration_ip: "あなたのIPアドレスからの新規登録は行えません(登録可能な数を超えています)。スタッフへお問い合わせください。" flags_reminder: subject_template: other: "%{count}件の通報が対応待ちです" @@ -1002,9 +1008,36 @@ ja: test_mailer: subject_template: "[%{site_name}] メール送信テスト" new_version_mailer: - subject_template: "[%{site_name}] New Discourse version, update available" + subject_template: "[%{site_name}] Discourseの新しいバージョンがあります。" + text_body_template: | + 最新版の[Discourse](http://www.discourse.org)が利用出来ます！ + + 現在利用しているバージョン: %{installed_version} + 新しいバージョン: **%{new_version}** + + - 更新は**[ワンクリックブラウザ・アップグレード](%{base_url}/admin/upgrade)**から簡単にできます。 + + - 更新内容は[GitHubの更新履歴](https://github.com/discourse/discourse/commits/master)をご覧ください。 + + - [meta.discourse.org](http://meta.discourse.org)にて、Discourseに関するお知らせ、話し合い、サポートを行っています。 new_version_mailer_with_notes: - subject_template: "[%{site_name}] update available" + subject_template: "[%{site_name}] アップデートがあります" + text_body_template: |+ + 最新版の[Discourse](http://www.discourse.org)が利用出来ます！ + + 現在利用しているバージョン: %{installed_version} + 新しいバージョン: **%{new_version}** + + - 更新は**[ワンクリックブラウザ・アップグレード](%{base_url}/admin/upgrade)**から簡単にできます。 + + - 更新内容は[GitHubの更新履歴](https://github.com/discourse/discourse/commits/master)をご覧ください。 + + - [meta.discourse.org](http://meta.discourse.org)にて、Discourseに関するお知らせ、話し合い、サポートを行っています。 + + ### リリースノート + + %{notes} + queued_posts_reminder: subject_template: other: "[%{site_name}] %{count} 件の投稿がレビュー待ちです" @@ -1058,7 +1091,7 @@ ja: ``` restore_succeeded: subject_template: "復元が正常に完了しました" - text_body_template: "復元に成功しました" + text_body_template: "復元が完了しました。" restore_failed: subject_template: "復元に失敗しました" text_body_template: | @@ -1083,7 +1116,7 @@ ja: %{logs} ``` csv_export_succeeded: - subject_template: "データ出力完了" + subject_template: "データのダウンロード準備が完了しました" text_body_template: | データ出力が完了しました! :dvd: @@ -1091,8 +1124,8 @@ ja: このダウンロードリンクは48時間有効です csv_export_failed: - subject_template: "データ出力失敗" - text_body_template: "申し訳ありません。データ出力に失敗しました。ログを確認するかスタッフメンバーに連絡してください" + subject_template: "データのエクスポートに失敗しました" + text_body_template: "申し訳ありません。データのエクスポートに失敗しました。ログを確認するかスタッフメンバーにお問い合わせください。" email_reject_no_account: subject_template: "[%{site_name}] Email issue -- 不明なアカウント" email_reject_empty: @@ -1152,16 +1185,18 @@ ja: subject_template: "[%{site_name}] [プライベートメッセージ] %{topic_title}" digest: why: "あなたが最後にアクセスした %{last_seen_at} 以降の %{site_link} のまとめです" - subject_template: "[%{site_name}] ダイジェスト" + subject_template: "[%{site_name}] のまとめ" new_activity: "あなたのトピックおよびポストにおけるアクティビティ:" top_topics: "人気の投稿" other_new_topics: "人気のトピック" - unsubscribe: "このダイジェストは、あなたからのアクセスがしばらくない場合、%{site_link}から送信されます。配信停止はこちら %{unsubscribe_link}" + unsubscribe: "このまとめは、サイトへのアクセスが一定期間無い場合に、%{site_link}から送られます。配信停止はこちらから行えます: %{unsubscribe_link}" click_here: "ここをクリック" - from: "%{site_name} ダイジェスト" + from: "%{site_name} のまとめ" read_more: "もっと読む" more_topics: " %{new_topics_since_seen}個の新しいトピックがありました" more_topics_category: "もっと新しいトピック:" + mailing_list: + new_topics: "新着トピック" forgot_password: subject_template: "[%{site_name}] パスワードのリセット" text_body_template: | @@ -1189,6 +1224,12 @@ ja: 以下のリンクをクリックしてパスワードを設定してください: %{base_url}/users/password-reset/%{email_token} + confirm_new_email: + subject_template: "[%{site_name}] 新しいメールアドレスを確認してください" + text_body_template: | + 以下のリンクをクリックして、%{site_name}で利用するメールアドレスを有効化してください: + + %{base_url}/users/authorize-email/%{email_token} signup_after_approval: subject_template: "%{site_name} への参加承認完了!" signup: @@ -1196,11 +1237,12 @@ ja: text_body_template: | Welcome to %{site_name}! - 次のリンクをクリックして、新たなアカウントの承認およびアクティベーションを行ってください: + リンクをクリックして、アカウントを有効化してください: %{base_url}/users/activate-account/%{email_token} もし、上記のURLがクリックできない場合は、ブラウザのアドレスバーへURLをコピーして貼り付けて下さい。 page_not_found: + title: "ページが見つからないか、アクセス出来ない場所にあります。" popular_topics: "人気" recent_topics: "最新" see_more: "もっと見る" @@ -1248,19 +1290,73 @@ ja: csv_export: boolean_yes: "はい" boolean_no: "いいえ" - static_topic_first_reply: |+ + static_topic_first_reply: | %{page_name}ページのコンテンツを編集するには、このトピックの最初の投稿を編集してください - guidelines_topic: - title: "よくある質問/コミュニティガイドライン" + title: "FAQ/ガイドライン" tos_topic: title: "利用規約" privacy_topic: title: "プライバシーポリシー" + static: + search_help: | +

    マメ知識

    +

    +

      +
    • 検索はタイトルが優先されます。 – 迷った時はタイトルを調べてみましょう。
      • +
    • 調べたい物特有の、他にはない言葉で調べると良いでしょう。
      • +
    • 特定のカテゴリ、トピック、ユーザーページにて検索してみましょう。
      • +
    +

    +

    オプション

    +

    + + + + + + + +
    order:viewsorder:latestorder:likes@usernameuser:foo
    status:openstatus:closedstatus:archivedstatus:norepliesstatus:single_user
    #category-slugcategory:foogroup:foobadge:foo
    in:likesin:postedin:watchingin:trackingin:private
    in:bookmarksin:firstin:pinnedin:unpinnedin:wiki
    posts_count:numbefore:days or dateafter:days or date
    +

    +

    サンプル

    +

    +

      +
    • rainbows #parks で、"parks"カテゴリの"rainbows"という言葉を含むトピックを検索します。
      • +
    • rainbows category:parks status:open order:latest 最終投稿の日付順に並べ替え、”parks”カテゴリの"rainbows"を含むクローズ/アーカイブされていないトピックを検索します。
      • +
    • rainbows category:"parks and gardens" in:bookmarks ブックマークされている"parks and gardens"カテゴリの中で、"rainbows"という言葉を含むトピックを検索します。
      • +
    +

    badges: + editor: + name: 編集者 + description: 最初の投稿を編集する + autobiographer: + name: あなたはだれ？ + description: プロフィールをすべて書く + nice_post: + name: ナイスな返事 + good_post: + name: イカす返事 + great_post: + name: 素晴らしい返事 + nice_topic: + name: ナイスなトピック + good_topic: + name: イカすトピック first_flag: name: はじめの通報 description: 通報した投稿 + read_guidelines: + description: ガイドラインを読む + popular_link: + name: 人気のリンク + hot_link: + name: ウワサのリンク + famous_link: + name: 伝説のリンク + first_emoji: + name: はじめての絵文字 admin_login: success: "メールを送信しました" error: "エラー！" diff --git a/config/locales/server.pt.yml b/config/locales/server.pt.yml index 35f64b1d65..eb4c8272da 100644 --- a/config/locales/server.pt.yml +++ b/config/locales/server.pt.yml @@ -24,7 +24,7 @@ pt: loading: "A carregar" powered_by_html: 'Desenvolvido por Discourse, e melhor visualizado com o JavaScript ativo' log_in: "Iniciar Sessão" - purge_reason: "Automaticamente eliminado devido a abandono, conta inativada" + purge_reason: "Conta removida automaticamente como conta abandonada, desactivada." 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" emails: @@ -35,7 +35,7 @@ pt: empty_email_error: "Acontece quando, a informação não processada, do email recebido veio em branco." no_message_id_error: "Acontece quando o email recebido não tem 'Message-Id' no cabeçalho da mensagem." auto_generated_email_error: "Acontece quando o cabeçalho 'precedence' é definida como: 'list', 'junk' ou 'auto_reply', ou quando algum cabeçalho contém: 'auto-submitted', 'auto-replied' ou 'auto-generated'." - no_body_detected_error: "Acontece quando não conseguimos extrair o corpo da mensagem e não existem anexos." + no_body_detected_error: "Acontece quando não se consegue obter um corpo de mensagem e não existem anexos." inactive_user_error: "Acontece quando o remetente não está activo." blocked_user_error: "Acontece quando o remetente está bloqueado." bad_destination_address: "Acontece quando nenhum dos endereços de email nos campos para/cc/bcc coincide com um endereço de email configurado." @@ -44,6 +44,9 @@ pt: reply_user_not_matching_error: "Acontece quando uma resposta veio de um endereço de email diferente do destinatário da notificação." topic_not_found_error: "Acontece quando a resposta veio de um tópico relacionado mas o tópico relacionado foi apagado." topic_closed_error: "Acontece quando uma resposta chegou mas o tópico relacionado foi fechado." + bounced_email_error: "O email é um relatório devolvido." + auto_generated_email_reply: "O email contém uma resposta a um email gerado automaticamente." + screened_email_error: "Acontece quando a morada de email da pessoa que enviou já foi confirmada." errors: &errors format: '%{attribute} %{message}' messages: @@ -174,6 +177,7 @@ pt: group_mentions: "Últimas menções em %{group_name}" user_posts: "Mensagens mais recentes criados por @%{username}" user_topics: "Tópicos mais recentes criados por @%{username}" + tag: "Tópicos etiquetados" too_late_to_edit: "Essa mensagem foi criada há muito tempo. Já não pode ser editada ou apagada." revert_version_same: "A versão atual é o mesma versão para a qual você está tentando reverter." excerpt_image: "imagem" @@ -181,7 +185,7 @@ pt: delete_reason: "Eliminado através da fila de moderação de mensagens" groups: errors: - can_not_modify_automatic: "Não pode modificar um grupo automático" + can_not_modify_automatic: "Não pode modificar um grupo automatico" member_already_exist: "'%{username}' já é membro deste grupo." invalid_domain: "'%{domain}' não é um domínio válido." invalid_incoming_email: "'%{email}' não é um endereço de email válido." @@ -475,7 +479,7 @@ pt: continue_button: "Continuar para %{site_name}" welcome_to: "Bem-vindo a %{site_name}!" approval_required: "Um moderador tem que aprovar a sua conta antes de poder aceder a este fórum. Irá receber um email quando a sua conta for aprovada!" - missing_session: "Não conseguimos detetar se a sua conta foi criada, por favor assegure-se que tem os cookies ativos." + missing_session: "Não conseguimos detectar se a sua conta foi criada, pelo que pedimos que confirme que tem os cookies possibilitados." post_action_types: off_topic: title: 'Fora de Contexto' @@ -721,6 +725,9 @@ pt: email_polling_errored_recently: one: "A consulta automática de emails gerou um erro nas últimas 24 horas. Consulte em os registos para mais detalhes." other: "A consulta automática de emails gerou %{count} erros nas últimas 24 horas. Consulte em os registos para mais detalhes." + bad_favicon_url: "Não estamos a conseguir carregar o favicon. Pot favor, confirme a sua configuração favicon_url nas Configurações do sítio." + poll_pop3_timeout: "A tentativa de ligação ao servidor POP3 está a ultrapassar o tempo máximo. Email de caixa de entrada não pôde ser obtido. Por favor verifique a sua configuração de POP3 e fornecedor de serviço internet." + poll_pop3_auth_error: "A tentativa de ligação ao servidor POP3 está a falhar por motivos de erro de autenticação. Por favor verifique a sua configuração de POP3." site_settings: censored_words: "Palavras que serão automaticamente substituídas por ■■■■" delete_old_hidden_posts: "Eliminar automaticamente quaisquer mensagens ocultas que permaneçam escondidas por mais de 30 dias." @@ -765,6 +772,7 @@ pt: 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, deve ter uma forma retangular. Quando deixada em branco, o texto do título do sítio será exibido." + digest_logo_url: "O logotipo alternativo usado no topo do email de resumo do seu sítio. Deve ter um formato rectangular amplo. Não pode ser uma imagem em formato SVG. Se deixado em branco, `logo_url` será utilizado." logo_small_url: "A pequena imagem do logótipo no canto superior esquerdo do seu sítio, deve ter uma forma quadrada, visível quando arrastado para baixo. Quando deixado em branco, um glifo de início será exibido." favicon_url: "Um favicon para o seu sítio, veja http://en.wikipedia.org/wiki/Favicon, para trabalhar corretamente sobre um CDN deve ser um png" mobile_logo_url: "A imagem do logótipo com posição fixa utilizada no canto superior esquerdo do seu sítio móvel deve ter uma forma quadrada. Quando deixado em branco, `logo_url` será utilizado. ex: http://exemplo.com/uploads/default/logo.png" @@ -785,6 +793,7 @@ pt: polling_interval: "Quando não está a ocorrer uma solicitação ao servidor, com que frequência devem os clientes ligados requerer uma atualização, em milissegundos" anon_polling_interval: "Com que frequência os clientes não registados podem fazer solicitações ao servidor, em milisegundos" background_polling_interval: "Com que frequência deverão os clientes solicitar o servidor, em milissegundos (quando a janela está em plano de fundo)" + flags_required_to_hide_post: "Número de bandeiras que fazem com que uma mensagem seja automaticamente escondida e uma mensagem enviada ao utilizador (0 se nunca)" 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." diff --git a/config/locales/server.pt_BR.yml b/config/locales/server.pt_BR.yml index 5c22281a6e..e1065c534b 100644 --- a/config/locales/server.pt_BR.yml +++ b/config/locales/server.pt_BR.yml @@ -24,7 +24,7 @@ pt_BR: loading: "Carregando" powered_by_html: 'Desenvolvido por Discourse, melhor visualizado com JavaScript ativado' log_in: "Entrar" - purge_reason: "A conta não verificada, foi excluída." + purge_reason: "Automaticamente eliminada por ser uma conta abandonada, não ativada" disable_remote_images_download_reason: "Download de imagens remotas foi desativado porque não havia espaço suficiente em disco disponível." anonymous: "Anônimo" emails: diff --git a/config/locales/server.ro.yml b/config/locales/server.ro.yml index d44a17e714..98c03ce65a 100644 --- a/config/locales/server.ro.yml +++ b/config/locales/server.ro.yml @@ -340,7 +340,7 @@ ro: please_continue: "Noul dvs cont este confirmat, iar acum sunteți autentificat." continue_button: "Continuă cu %{site_name}" welcome_to: "Bine ați venit la %{site_name}!" - approval_required: "Un moderator trebuie să aprobe manual contul înaine să puteți accesa forumul. Veți primii un email când acesta a fost aprobat!" + approval_required: "Un moderator trebuie să aprobe manual contul înaine să puteți accesa forumul. Vei primi un email când acesta a fost aprobat!" post_action_types: off_topic: title: 'În afară discuției' @@ -352,7 +352,7 @@ ro: long_form: 'marchează aceasta ca spam' inappropriate: title: 'Necorespunzător' - description: 'Această postare are conținut pe care o persoană normală l-ar numii ofesator, abuziv, sau o violare a regulilor comune.' + description: 'Această postare are conținut ce ar putea fi considerat drept ofesator, abuziv, sau o violare a regulilor comune.' long_form: 'marcat ca necorespunzător' notify_user: email_title: 'Despre postarea dvs din "%{title}"' @@ -379,7 +379,7 @@ ro: long_form: 'Marchează asta ca spam' inappropriate: title: 'Necorespunzător' - description: 'Această discuție are conținut pe care o persoană normală l-ar numii ofesantor, abuziv, sau o violare a regulilor comune.' + description: 'Această discuție are conținut ce ar putea fi considerat drept ofesantor, abuziv, sau o violare a regulilor comune.' long_form: 'marcat ca necorespunzător' notify_moderators: title: "Notifică moderatori" @@ -601,7 +601,7 @@ ro: invite_expiry_days: "Cat timp sun valabile cheile de invitație ale utilizatorilor, în zile" invite_passthrough_hours: "Cât timp un utilizator poate folosii o cheie de invitație recuperată anterior pentru autentificare, în ore" invite_only: "Înregistrarea publică este dezactivată, toți utilizatorii noi trebuie să fie exclusiv invitați de un alt membru sau personalul site-ului." - login_required: "Autentificarea e necesară pentru a citii conținutul site-ului, nu permite accesul anonim." + login_required: "Autentificarea este necesară pentru a citi conținutul site-ului, nu permite accesul anonim." min_password_length: "Lungimea minimă de caractere pentru parolă." block_common_passwords: "nu permite parole ce sunt în cele 10,000 cele mai cunoscute parole." enable_local_logins: "Activează numele de utilizator local și a conturilor bazate pe logare cu parola. (Notă: Aceasta trebuie activiată pentru invitații pt a funcționa)" @@ -874,7 +874,7 @@ ro: previous_discussion: "Răspunsurile precedente" unsubscribe: title: "Dezabonare" - description: "Nu sunteți interesat în a primii aceste email-uri? Nicio problemă! Faceți clic dedesubt pentru a vă dezabona imediat:" + description: "Nu ești interesat în a primi aceste email-uri? Nicio problemă! Faceți click dedesubt pentru a vă dezabona imediat:" posted_by: "Postat de %{username} pe data %{post_date}" user_replied: subject_template: "[%{site_name}] %{topic_title}" diff --git a/config/locales/server.ru.yml b/config/locales/server.ru.yml index 606eb21828..213450abba 100644 --- a/config/locales/server.ru.yml +++ b/config/locales/server.ru.yml @@ -12,7 +12,7 @@ ru: long_date: "D MMMM YYYY, HH:mm" datetime_formats: &datetime_formats formats: - short: "%m-%d-%Y" + short: "%d.%m.%Y" date: month_names: [null, Январь, Февраль, Март, Апрель, Май, Июнь, Июль, Август, Сентябрь, Октябрь, Ноябрь, Декабрь] <<: *datetime_formats @@ -22,7 +22,7 @@ ru: loading: "Загрузка..." powered_by_html: 'При поддержке Discourse, лучше всего использовать с включенным JavaScript' log_in: "Войти" - purge_reason: "Автоматически удален, как неактивная, неактивированная учетная запись" + purge_reason: "Деактивированная учетная запись будет автоматически удалена как заброшенная" disable_remote_images_download_reason: "Загрузка картинок была отключена из-за недостаточности места на диске." anonymous: "Гость" emails: diff --git a/config/locales/server.zh_CN.yml b/config/locales/server.zh_CN.yml index a9d2052a26..00a51dab52 100644 --- a/config/locales/server.zh_CN.yml +++ b/config/locales/server.zh_CN.yml @@ -2436,18 +2436,14 @@ zh_CN: thank_you: name: 感谢你 description: 有 20 个被赞的帖子，给出过 10 个赞 - long_description: | - 该徽章授予给收到了 20 个赞，且赞过别人 10 次的你。当别人感谢你的帖子时，你也感谢他们的帖子。 gives_back: name: 回馈 description: 有 100 个被赞的帖子，给出过 100 个赞 - long_description: | - 该徽章授予给收到了 100 个赞，且赞过别人 100 次的你。感谢你回馈赞给社群！ empathetic: name: 感性 description: 有 500 个被赞的帖子，给出过 1000 个赞 - long_description: | - 该徽章授予给收到了 500 个赞，且赞过别人 1000 次的你。哇！你是一个富有同情心且会换位思考的模范。 :two_hearts: + first_emoji: + description: 在帖子中使用表情符号 admin_login: success: "邮件已发送" error: "错误！" diff --git a/plugins/poll/config/locales/client.bs_BA.yml b/plugins/poll/config/locales/client.bs_BA.yml index c03c38e593..da40be0d95 100644 --- a/plugins/poll/config/locales/client.bs_BA.yml +++ b/plugins/poll/config/locales/client.bs_BA.yml @@ -17,5 +17,8 @@ bs_BA: few: "ukupno glasova" other: "ukupno glasova" average_rating: "Prosječna ocjena: %{average}." + cast-votes: + title: "ukupno glasova" + label: "Glasaj" close: label: "Zatvori" diff --git a/plugins/poll/config/locales/client.fr.yml b/plugins/poll/config/locales/client.fr.yml index cb7bcccbd1..a674b4e69b 100644 --- a/plugins/poll/config/locales/client.fr.yml +++ b/plugins/poll/config/locales/client.fr.yml @@ -9,8 +9,8 @@ fr: js: poll: voters: - one: "voteur" - other: "voteurs" + one: "votant" + other: "votants" total_votes: one: "vote au total" other: "votes au total" diff --git a/plugins/poll/config/locales/client.ja.yml b/plugins/poll/config/locales/client.ja.yml index a3b3f1bbb4..b9be616a8b 100644 --- a/plugins/poll/config/locales/client.ja.yml +++ b/plugins/poll/config/locales/client.ja.yml @@ -24,7 +24,7 @@ ja: between_min_and_max_options: "%{min} と %{max} のオプションから選択することができます。" cast-votes: title: "投票する" - label: "すぐ投票！" + label: "今すぐ投票！" show-results: title: "投票結果を表示" label: "結果を表示" diff --git a/plugins/poll/config/locales/server.ja.yml b/plugins/poll/config/locales/server.ja.yml index 7b42aca449..16434983fa 100644 --- a/plugins/poll/config/locales/server.ja.yml +++ b/plugins/poll/config/locales/server.ja.yml @@ -26,9 +26,9 @@ ja: cannot_change_polls_after_5_minutes: "最初の5分を経過すると、投票の追加、削除や名前変更はできません。" op_cannot_edit_options_after_5_minutes: "最初の5分を経過すると投票オプションの追加や削除はできません。投票オプションの編集が必要であれば、モデレータに連絡してください。" staff_cannot_add_or_remove_options_after_5_minutes: "最初の5分を経過すると投票オプションの追加や削除はできません。このトピックを閉じて新しいトピックを作成してください。" - no_polls_associated_with_this_post: "このポストに関連付けられた投票はありません。" - no_poll_with_this_name: "このポストに関連付けられた投票 %{name} はありません。" - post_is_deleted: "削除されたポストに作用することはできません。" + no_polls_associated_with_this_post: "この投稿に関連付けられた投票はありません。" + no_poll_with_this_name: "この投稿に関連付けられた投票 %{name} はありません。" + post_is_deleted: "削除された投稿を操作する事はできません。" topic_must_be_open_to_vote: "投票するトピックはオープンになっている必要があります。" poll_must_be_open_to_vote: "投票するにはオープンになっている必要があります。" topic_must_be_open_to_toggle_status: "状態を切り替えるには、トピックがオープンになっている必要があります。" diff --git a/public/500.ja.html b/public/500.ja.html index 9e698a3fec..48faa075b9 100644 --- a/public/500.ja.html +++ b/public/500.ja.html @@ -5,7 +5,7 @@

    500

    -

    このディスカッションフォーラムに予期しないエラーが発生しました。

    +

    予期しないエラーが発生しました。

    エラーについての詳細情報は記録されました。自動通知を受け取りました。確認致します。

    これ以上のアクションは必要ありません。ただし、エラーが解消されない場合、エラー再現の手順を含めて,このカテゴリ.に投稿することにより詳細情報を提供することができます。

    From 113ce00e6a36f83575da60173ece6af7b20ad0ba Mon Sep 17 00:00:00 2001 From: Neil Lalonde Date: Thu, 26 May 2016 11:51:48 -0400 Subject: [PATCH 51/51] Version bump to v1.6.0.beta6 --- lib/version.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/version.rb b/lib/version.rb index 146324f3b4..919b48142d 100644 --- a/lib/version.rb +++ b/lib/version.rb @@ -5,7 +5,7 @@ module Discourse MAJOR = 1 MINOR = 6 TINY = 0 - PRE = 'beta5' + PRE = 'beta6' STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.') end