From: Thibaut Girka <thib@sitedethib.com>
Date: Thu, 3 Oct 2019 09:10:12 +0000 (+0200)
Subject: Merge branch 'master' into glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=a84aedb7a7f050cbf5293351723f55a904992b3a;p=mastodon.git

Merge branch 'master' into glitch-soc/merge-upstream

Conflicts:
- app/models/media_attachment.rb
  Upstream raised max image size from 8MB to 10MB while our limit is
  configurable. Raised the default to 10MB.
---

a84aedb7a7f050cbf5293351723f55a904992b3a
diff --cc app/javascript/mastodon/locales/ja.json
index d59b2c7f2,82e73d148..074c79103
--- a/app/javascript/mastodon/locales/ja.json
+++ b/app/javascript/mastodon/locales/ja.json
@@@ -271,9 -271,8 +275,9 @@@
    "navigation_bar.pins": "固定したトゥート",
    "navigation_bar.preferences": "ユーザー設定",
    "navigation_bar.public_timeline": "連合タイムライン",
 +  "navigation_bar.misc": "その他",
    "navigation_bar.security": "セキュリティ",
-   "notification.and_n_others": "と、他 {count} 件",
+   "notification.and_n_others": "and {count, plural, one {# other} other {# others}}",
    "notification.favourite": "{name}さんがあなたのトゥートをお気に入りに登録しました",
    "notification.follow": "{name}さんにフォローされました",
    "notification.mention": "{name}さんがあなたに返信しました",
diff --cc app/models/media_attachment.rb
index cbe23810b,630dab55a..4f06a40cf
--- a/app/models/media_attachment.rb
+++ b/app/models/media_attachment.rb
@@@ -103,8 -115,8 +115,8 @@@ class MediaAttachment < ApplicationReco
      original: VIDEO_FORMAT,
    }.freeze
  
-   IMAGE_LIMIT = (ENV['MAX_IMAGE_SIZE'] || 8.megabytes).to_i
 -  IMAGE_LIMIT = 10.megabytes
 -  VIDEO_LIMIT = 40.megabytes
++  IMAGE_LIMIT = (ENV['MAX_IMAGE_SIZE'] || 10.megabytes).to_i
 +  VIDEO_LIMIT = (ENV['MAX_VIDEO_SIZE'] || 40.megabytes).to_i
  
    belongs_to :account,          inverse_of: :media_attachments, optional: true
    belongs_to :status,           inverse_of: :media_attachments, optional: true