{
mMap.set('loaded', true);
mMap.set('isLoading', false);
if (!hadNext) mMap.set('next', next);
- mMap.set('items', wasLoaded ? ids.concat(oldIds) : ids);
+ mMap.set('items', wasLoaded ? ids.concat(oldIds) : oldIds.concat(ids));
mMap.set('isPartial', isPartial);
}));
};
diff --git a/app/javascript/styles/application.scss b/app/javascript/styles/application.scss
index fd6665f65..300040173 100644
--- a/app/javascript/styles/application.scss
+++ b/app/javascript/styles/application.scss
@@ -6,7 +6,6 @@
@import 'mastodon/reset';
@import 'mastodon/basics';
-@import 'mastodon/modal';
@import 'mastodon/containers';
@import 'mastodon/lists';
@import 'mastodon/footer';
@@ -15,7 +14,9 @@
@import 'mastodon/forms';
@import 'mastodon/accounts';
@import 'mastodon/stream_entries';
+@import 'mastodon/boost';
@import 'mastodon/components';
+@import 'mastodon/modal';
@import 'mastodon/emoji_picker';
@import 'mastodon/about';
@import 'mastodon/tables';
diff --git a/app/javascript/styles/mailer.scss b/app/javascript/styles/mailer.scss
index e6422b2ea..dbe070f9a 100644
--- a/app/javascript/styles/mailer.scss
+++ b/app/javascript/styles/mailer.scss
@@ -17,7 +17,7 @@ body {
-ms-text-size-adjust: 100%;
}
-.email_body {
+.email-body {
td,
div,
a,
@@ -228,6 +228,19 @@ h3 {
line-height: 25px;
}
+h5 {
+ font-size: 16px;
+ line-height: 21px;
+ font-weight: 700;
+ color: lighten($ui-base-color, 34%);
+}
+
+.input-cell {
+ h5 {
+ margin-top: 4px;
+ }
+}
+
.input {
td {
background: darken($ui-base-color, 8%);
@@ -356,6 +369,19 @@ h3 {
font-weight: 500 !important;
}
}
+
+ &.button-small {
+ td {
+ border-radius: 4px;
+ font-size: 14px;
+ padding: 8px 16px;
+
+ a {
+ padding: 5px 16px !important;
+ line-height: 26px !important;
+ }
+ }
+ }
}
.button-default {
@@ -379,6 +405,14 @@ h3 {
padding-right: 16px;
}
+.padded-bottom {
+ padding-bottom: 32px;
+}
+
+.margin-bottom {
+ margin-bottom: 20px;
+}
+
.hero-icon {
width: 64px;
@@ -463,8 +497,50 @@ h3 {
border-top: 1px solid lighten($ui-base-color, 8%);
}
+ul {
+ padding-left: 15px;
+ margin-top: 0;
+ margin-bottom: 0;
+ padding-top: 16px;
+
+ li {
+ margin-bottom: 16px;
+ color: lighten($ui-base-color, 26%);
+
+ span {
+ color: $ui-primary-color;
+ }
+ }
+}
+
@media only screen and (min-device-width: 768px) and (max-device-width: 1024px) and (orientation: landscape) {
body {
min-height: 1024px !important;
}
}
+
+@media (max-width: 697px) {
+ .email-container,
+ .col-1,
+ .col-2,
+ .col-3,
+ .col-4,
+ .col-5,
+ .col-6 {
+ width: 100% !important;
+ max-width: none !important;
+ }
+
+ .email-start {
+ padding-top: 16px !important;
+ }
+
+ .email-end {
+ padding-bottom: 16px !important;
+ }
+
+ .padded {
+ padding-left: 0 !important;
+ padding-right: 0 !important;
+ }
+}
diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss
index d13a18ad7..75e37237b 100644
--- a/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@@ -1419,6 +1419,10 @@
color: $primary-text-color;
}
+ a {
+ color: inherit;
+ }
+
.permalink {
text-decoration: none;
}
@@ -1762,7 +1766,7 @@
position: absolute;
top: 0;
left: 0;
- background: lighten($ui-base-color, 13%) url('~images/wave-drawer.png') no-repeat bottom / 100% auto;
+ background: lighten($ui-base-color, 13%) url('data:image/svg+xml;utf8,
') no-repeat bottom / 100% auto;
box-sizing: border-box;
padding: 0;
display: flex;
@@ -1777,7 +1781,7 @@
}
> .mastodon {
- background: url('~images/mastodon-ui.png') no-repeat left bottom / contain;
+ background: url('~images/elephant_ui_plane.svg') no-repeat left bottom / contain;
flex: 1;
}
}
@@ -2154,10 +2158,7 @@
}
}
-@import 'boost';
-
.no-reduce-motion button.icon-button i.fa-retweet {
-
background-position: 0 0;
height: 19px;
transition: background-position 0.9s steps(10);
@@ -2763,6 +2764,7 @@
flex: 1 1 auto;
align-items: center;
justify-content: center;
+
@supports(display: grid) { // hack to fix Chrome <57
contain: strict;
}
@@ -2808,11 +2810,48 @@
}
}
-.pulse-loading {
+.no-reduce-motion .pulse-loading {
transform-origin: center center;
animation: heartbeat 1.5s ease-in-out infinite both;
}
+@keyframes shake-bottom {
+ 0%,
+ 100% {
+ transform: rotate(0deg);
+ transform-origin: 50% 100%;
+ }
+
+ 10% {
+ transform: rotate(2deg);
+ }
+
+ 20%,
+ 40%,
+ 60% {
+ transform: rotate(-4deg);
+ }
+
+ 30%,
+ 50%,
+ 70% {
+ transform: rotate(4deg);
+ }
+
+ 80% {
+ transform: rotate(-2deg);
+ }
+
+ 90% {
+ transform: rotate(2deg);
+ }
+}
+
+.no-reduce-motion .shake-bottom {
+ transform-origin: 50% 100%;
+ animation: shake-bottom 0.8s cubic-bezier(0.455, 0.030, 0.515, 0.955) 2s 2 both;
+}
+
.emoji-picker-dropdown__menu {
background: $simple-background-color;
position: absolute;
@@ -3318,13 +3357,12 @@
height: 80vh;
width: 80vw;
max-width: 520px;
- max-height: 420px;
+ max-height: 470px;
.react-swipeable-view-container > div {
width: 100%;
height: 100%;
box-sizing: border-box;
- padding: 25px;
display: none;
flex-direction: column;
align-items: center;
@@ -3397,23 +3435,32 @@
.onboarding-modal__nav,
.error-modal__nav {
color: darken($ui-secondary-color, 34%);
- background-color: transparent;
border: 0;
font-size: 14px;
font-weight: 500;
- padding: 0;
+ padding: 10px 25px;
line-height: inherit;
height: auto;
+ margin: -10px;
+ border-radius: 4px;
+ background-color: transparent;
&:hover,
&:focus,
&:active {
color: darken($ui-secondary-color, 38%);
+ background-color: darken($ui-secondary-color, 16%);
}
&.onboarding-modal__done,
&.onboarding-modal__next {
- color: $ui-highlight-color;
+ color: $ui-base-color;
+
+ &:hover,
+ &:focus,
+ &:active {
+ color: darken($ui-base-color, 4%);
+ }
}
}
}
@@ -3449,6 +3496,8 @@
.onboarding-modal__page__wrapper {
pointer-events: none;
+ padding: 25px;
+ padding-bottom: 0;
&.onboarding-modal__page__wrapper--active {
pointer-events: auto;
@@ -3476,6 +3525,10 @@
}
}
+ .navigation-bar a {
+ color: inherit;
+ }
+
p {
font-size: 16px;
color: lighten($ui-base-color, 8%);
@@ -3503,29 +3556,56 @@
}
}
+.onboarding-modal__page__wrapper-0 {
+ background: url('~images/elephant_ui_greeting.svg') no-repeat left bottom / auto 250px;
+ height: 100%;
+ padding: 0;
+}
+
.onboarding-modal__page-one {
- display: flex;
- align-items: center;
-}
+ &__lead {
+ padding: 65px;
+ padding-top: 45px;
+ padding-bottom: 0;
+ margin-bottom: 10px;
-.onboarding-modal__page-one__elephant-friend {
- background: url('~images/elephant-friend-1.png') no-repeat center center / contain;
- width: 155px;
- height: 193px;
- margin-right: 15px;
-}
+ h1 {
+ font-size: 26px;
+ line-height: 36px;
+ margin-bottom: 8px;
+ }
-@media screen and (max-width: 400px) {
- .onboarding-modal__page-one {
- flex-direction: column;
- align-items: normal;
+ p {
+ margin-bottom: 0;
+ }
}
- .onboarding-modal__page-one__elephant-friend {
- width: 100%;
- height: 30vh;
- max-height: 160px;
- margin-bottom: 5vh;
+ &__extra {
+ padding-right: 65px;
+ padding-left: 185px;
+ text-align: center;
+ }
+}
+
+.display-case {
+ text-align: center;
+ font-size: 15px;
+ margin-bottom: 15px;
+
+ &__label {
+ font-weight: 500;
+ color: $ui-base-color;
+ margin-bottom: 5px;
+ text-transform: uppercase;
+ font-size: 12px;
+ }
+
+ &__case {
+ background: $ui-base-color;
+ color: $ui-secondary-color;
+ font-weight: 500;
+ padding: 10px;
+ border-radius: 4px;
}
}
@@ -3615,16 +3695,6 @@
}
}
-.onboarding-modal__image {
- border-radius: 8px;
- width: 70vw;
- max-width: 450px;
- max-height: auto;
- display: block;
- margin: auto;
- margin-bottom: 20px;
-}
-
.onboard-sliders {
display: inline-block;
max-width: 30px;
diff --git a/app/javascript/styles/mastodon/modal.scss b/app/javascript/styles/mastodon/modal.scss
index a17476ccb..ceb79bbb9 100644
--- a/app/javascript/styles/mastodon/modal.scss
+++ b/app/javascript/styles/mastodon/modal.scss
@@ -1,5 +1,5 @@
.modal-layout {
- background: $ui-base-color url('~images/wave-modal.png') repeat-x bottom fixed;
+ background: $ui-base-color url('data:image/svg+xml;utf8,
') repeat-x bottom fixed;
display: flex;
flex-direction: column;
height: 100vh;
@@ -15,6 +15,6 @@
> * {
flex: 1;
max-height: 235px;
- background: url('~images/mastodon-ui.png') no-repeat left bottom / contain;
+ background: url('~images/elephant_ui_plane.svg') no-repeat left bottom / contain;
}
}
diff --git a/app/lib/activitypub/activity.rb b/app/lib/activitypub/activity.rb
index 820189d29..0f9e4f263 100644
--- a/app/lib/activitypub/activity.rb
+++ b/app/lib/activitypub/activity.rb
@@ -69,12 +69,13 @@ class ActivityPub::Activity
def distribute(status)
crawl_links(status)
+ notify_about_reblog(status) if reblog_of_local_account?(status)
+ notify_about_mentions(status)
+
# Only continue if the status is supposed to have
# arrived in real-time
return unless @options[:override_timestamps]
- notify_about_reblog(status) if reblog_of_local_account?(status)
- notify_about_mentions(status)
distribute_to_followers(status)
end
diff --git a/app/mailers/user_mailer.rb b/app/mailers/user_mailer.rb
index a7efa73c1..4104f6cd2 100644
--- a/app/mailers/user_mailer.rb
+++ b/app/mailers/user_mailer.rb
@@ -54,4 +54,15 @@ class UserMailer < Devise::Mailer
mail to: @resource.email, subject: I18n.t('devise.mailer.email_changed.subject')
end
end
+
+ def welcome(user)
+ @resource = user
+ @instance = Rails.configuration.x.local_domain
+
+ return if @resource.disabled?
+
+ I18n.with_locale(@resource.locale || I18n.default_locale) do
+ mail to: @resource.email, subject: I18n.t('user_mailer.welcome.subject')
+ end
+ end
end
diff --git a/app/models/account.rb b/app/models/account.rb
index c75ea028e..6df9668d5 100644
--- a/app/models/account.rb
+++ b/app/models/account.rb
@@ -104,7 +104,7 @@ class Account < ApplicationRecord
has_many :lists, through: :list_accounts
# Account migrations
- belongs_to :moved_to_account, class_name: 'Account'
+ belongs_to :moved_to_account, class_name: 'Account', optional: true
scope :remote, -> { where.not(domain: nil) }
scope :local, -> { where(domain: nil) }
diff --git a/app/models/account_domain_block.rb b/app/models/account_domain_block.rb
index 35810b6c2..abcc923b3 100644
--- a/app/models/account_domain_block.rb
+++ b/app/models/account_domain_block.rb
@@ -13,7 +13,7 @@
class AccountDomainBlock < ApplicationRecord
include Paginable
- belongs_to :account, required: true
+ belongs_to :account
validates :domain, presence: true, uniqueness: { scope: :account_id }
after_create :remove_blocking_cache
diff --git a/app/models/admin/action_log.rb b/app/models/admin/action_log.rb
index 4e950fbf7..c437c8ee8 100644
--- a/app/models/admin/action_log.rb
+++ b/app/models/admin/action_log.rb
@@ -16,8 +16,8 @@
class Admin::ActionLog < ApplicationRecord
serialize :recorded_changes
- belongs_to :account, required: true
- belongs_to :target, required: true, polymorphic: true
+ belongs_to :account
+ belongs_to :target, polymorphic: true
default_scope -> { order('id desc') }
diff --git a/app/models/block.rb b/app/models/block.rb
index 284abfe4c..441e6bca3 100644
--- a/app/models/block.rb
+++ b/app/models/block.rb
@@ -13,8 +13,8 @@
class Block < ApplicationRecord
include Paginable
- belongs_to :account, required: true
- belongs_to :target_account, class_name: 'Account', required: true
+ belongs_to :account
+ belongs_to :target_account, class_name: 'Account'
validates :account_id, uniqueness: { scope: :target_account_id }
diff --git a/app/models/conversation_mute.rb b/app/models/conversation_mute.rb
index 248cdfe6e..272eb81af 100644
--- a/app/models/conversation_mute.rb
+++ b/app/models/conversation_mute.rb
@@ -9,6 +9,6 @@
#
class ConversationMute < ApplicationRecord
- belongs_to :account, required: true
- belongs_to :conversation, required: true
+ belongs_to :account
+ belongs_to :conversation
end
diff --git a/app/models/favourite.rb b/app/models/favourite.rb
index c38838f2a..2b1271f31 100644
--- a/app/models/favourite.rb
+++ b/app/models/favourite.rb
@@ -13,8 +13,8 @@
class Favourite < ApplicationRecord
include Paginable
- belongs_to :account, inverse_of: :favourites, required: true
- belongs_to :status, inverse_of: :favourites, counter_cache: true, required: true
+ belongs_to :account, inverse_of: :favourites
+ belongs_to :status, inverse_of: :favourites, counter_cache: true
has_one :notification, as: :activity, dependent: :destroy
diff --git a/app/models/follow.rb b/app/models/follow.rb
index 3fb665afc..f953b8e3e 100644
--- a/app/models/follow.rb
+++ b/app/models/follow.rb
@@ -14,12 +14,11 @@
class Follow < ApplicationRecord
include Paginable
- belongs_to :account, counter_cache: :following_count, required: true
+ belongs_to :account, counter_cache: :following_count
belongs_to :target_account,
class_name: 'Account',
- counter_cache: :followers_count,
- required: true
+ counter_cache: :followers_count
has_one :notification, as: :activity, dependent: :destroy
diff --git a/app/models/follow_request.rb b/app/models/follow_request.rb
index ebf6959ce..bd6c4a0b9 100644
--- a/app/models/follow_request.rb
+++ b/app/models/follow_request.rb
@@ -14,8 +14,8 @@
class FollowRequest < ApplicationRecord
include Paginable
- belongs_to :account, required: true
- belongs_to :target_account, class_name: 'Account', required: true
+ belongs_to :account
+ belongs_to :target_account, class_name: 'Account'
has_one :notification, as: :activity, dependent: :destroy
diff --git a/app/models/import.rb b/app/models/import.rb
index 091fb3044..ba88435bf 100644
--- a/app/models/import.rb
+++ b/app/models/import.rb
@@ -20,7 +20,7 @@ class Import < ApplicationRecord
self.inheritance_column = false
- belongs_to :account, required: true
+ belongs_to :account
enum type: [:following, :blocking, :muting]
diff --git a/app/models/invite.rb b/app/models/invite.rb
index 6907c1f1d..b87a3b722 100644
--- a/app/models/invite.rb
+++ b/app/models/invite.rb
@@ -14,7 +14,7 @@
#
class Invite < ApplicationRecord
- belongs_to :user, required: true
+ belongs_to :user
has_many :users, inverse_of: :invite
scope :available, -> { where(expires_at: nil).or(where('expires_at >= ?', Time.now.utc)) }
diff --git a/app/models/list.rb b/app/models/list.rb
index be85c3b87..a2ec7e84a 100644
--- a/app/models/list.rb
+++ b/app/models/list.rb
@@ -15,7 +15,7 @@ class List < ApplicationRecord
PER_ACCOUNT_LIMIT = 50
- belongs_to :account
+ belongs_to :account, optional: true
has_many :list_accounts, inverse_of: :list, dependent: :destroy
has_many :accounts, through: :list_accounts
diff --git a/app/models/list_account.rb b/app/models/list_account.rb
index 253932590..da46cf032 100644
--- a/app/models/list_account.rb
+++ b/app/models/list_account.rb
@@ -10,9 +10,9 @@
#
class ListAccount < ApplicationRecord
- belongs_to :list, required: true
- belongs_to :account, required: true
- belongs_to :follow, required: true
+ belongs_to :list
+ belongs_to :account
+ belongs_to :follow
validates :account_id, uniqueness: { scope: :list_id }
diff --git a/app/models/media_attachment.rb b/app/models/media_attachment.rb
index 368ccef3a..25b7fd085 100644
--- a/app/models/media_attachment.rb
+++ b/app/models/media_attachment.rb
@@ -62,8 +62,8 @@ class MediaAttachment < ApplicationRecord
},
}.freeze
- belongs_to :account, inverse_of: :media_attachments
- belongs_to :status, inverse_of: :media_attachments
+ belongs_to :account, inverse_of: :media_attachments, optional: true
+ belongs_to :status, inverse_of: :media_attachments, optional: true
has_attached_file :file,
styles: ->(f) { file_styles f },
diff --git a/app/models/mention.rb b/app/models/mention.rb
index 14533e6a9..f864bf8e1 100644
--- a/app/models/mention.rb
+++ b/app/models/mention.rb
@@ -11,8 +11,8 @@
#
class Mention < ApplicationRecord
- belongs_to :account, inverse_of: :mentions, required: true
- belongs_to :status, required: true
+ belongs_to :account, inverse_of: :mentions
+ belongs_to :status
has_one :notification, as: :activity, dependent: :destroy
diff --git a/app/models/mute.rb b/app/models/mute.rb
index ca984641a..da4787179 100644
--- a/app/models/mute.rb
+++ b/app/models/mute.rb
@@ -14,8 +14,8 @@
class Mute < ApplicationRecord
include Paginable
- belongs_to :account, required: true
- belongs_to :target_account, class_name: 'Account', required: true
+ belongs_to :account
+ belongs_to :target_account, class_name: 'Account'
validates :account_id, uniqueness: { scope: :target_account_id }
diff --git a/app/models/notification.rb b/app/models/notification.rb
index 976963528..733f89cf7 100644
--- a/app/models/notification.rb
+++ b/app/models/notification.rb
@@ -26,15 +26,15 @@ class Notification < ApplicationRecord
STATUS_INCLUDES = [:account, :application, :stream_entry, :media_attachments, :tags, mentions: :account, reblog: [:stream_entry, :account, :application, :media_attachments, :tags, mentions: :account]].freeze
- belongs_to :account
- belongs_to :from_account, class_name: 'Account'
- belongs_to :activity, polymorphic: true
+ belongs_to :account, optional: true
+ belongs_to :from_account, class_name: 'Account', optional: true
+ belongs_to :activity, polymorphic: true, optional: true
- belongs_to :mention, foreign_type: 'Mention', foreign_key: 'activity_id'
- belongs_to :status, foreign_type: 'Status', foreign_key: 'activity_id'
- belongs_to :follow, foreign_type: 'Follow', foreign_key: 'activity_id'
- belongs_to :follow_request, foreign_type: 'FollowRequest', foreign_key: 'activity_id'
- belongs_to :favourite, foreign_type: 'Favourite', foreign_key: 'activity_id'
+ belongs_to :mention, foreign_type: 'Mention', foreign_key: 'activity_id', optional: true
+ belongs_to :status, foreign_type: 'Status', foreign_key: 'activity_id', optional: true
+ belongs_to :follow, foreign_type: 'Follow', foreign_key: 'activity_id', optional: true
+ belongs_to :follow_request, foreign_type: 'FollowRequest', foreign_key: 'activity_id', optional: true
+ belongs_to :favourite, foreign_type: 'Favourite', foreign_key: 'activity_id', optional: true
validates :account_id, uniqueness: { scope: [:activity_type, :activity_id] }
validates :activity_type, inclusion: { in: TYPE_CLASS_MAP.values }
diff --git a/app/models/report.rb b/app/models/report.rb
index c36f8db0a..f55fb6d3e 100644
--- a/app/models/report.rb
+++ b/app/models/report.rb
@@ -17,7 +17,7 @@
class Report < ApplicationRecord
belongs_to :account
belongs_to :target_account, class_name: 'Account'
- belongs_to :action_taken_by_account, class_name: 'Account'
+ belongs_to :action_taken_by_account, class_name: 'Account', optional: true
scope :unresolved, -> { where(action_taken: false) }
scope :resolved, -> { where(action_taken: true) }
diff --git a/app/models/session_activation.rb b/app/models/session_activation.rb
index 1d4ebca02..d364f03df 100644
--- a/app/models/session_activation.rb
+++ b/app/models/session_activation.rb
@@ -15,9 +15,9 @@
#
class SessionActivation < ApplicationRecord
- belongs_to :user, inverse_of: :session_activations, required: true
- belongs_to :access_token, class_name: 'Doorkeeper::AccessToken', dependent: :destroy
- belongs_to :web_push_subscription, class_name: 'Web::PushSubscription', dependent: :destroy
+ belongs_to :user, inverse_of: :session_activations
+ belongs_to :access_token, class_name: 'Doorkeeper::AccessToken', dependent: :destroy, optional: true
+ belongs_to :web_push_subscription, class_name: 'Web::PushSubscription', dependent: :destroy, optional: true
delegate :token,
to: :access_token,
diff --git a/app/models/status.rb b/app/models/status.rb
index cb18b0705..e927fb9dd 100644
--- a/app/models/status.rb
+++ b/app/models/status.rb
@@ -34,14 +34,14 @@ class Status < ApplicationRecord
enum visibility: [:public, :unlisted, :private, :direct], _suffix: :visibility
- belongs_to :application, class_name: 'Doorkeeper::Application'
+ belongs_to :application, class_name: 'Doorkeeper::Application', optional: true
- belongs_to :account, inverse_of: :statuses, counter_cache: true, required: true
- belongs_to :in_reply_to_account, foreign_key: 'in_reply_to_account_id', class_name: 'Account'
- belongs_to :conversation
+ belongs_to :account, inverse_of: :statuses, counter_cache: true
+ belongs_to :in_reply_to_account, foreign_key: 'in_reply_to_account_id', class_name: 'Account', optional: true
+ belongs_to :conversation, optional: true
- belongs_to :thread, foreign_key: 'in_reply_to_id', class_name: 'Status', inverse_of: :replies
- belongs_to :reblog, foreign_key: 'reblog_of_id', class_name: 'Status', inverse_of: :reblogs, counter_cache: :reblogs_count
+ belongs_to :thread, foreign_key: 'in_reply_to_id', class_name: 'Status', inverse_of: :replies, optional: true
+ belongs_to :reblog, foreign_key: 'reblog_of_id', class_name: 'Status', inverse_of: :reblogs, counter_cache: :reblogs_count, optional: true
has_many :favourites, inverse_of: :status, dependent: :destroy
has_many :reblogs, foreign_key: 'reblog_of_id', class_name: 'Status', inverse_of: :reblog, dependent: :destroy
diff --git a/app/models/status_pin.rb b/app/models/status_pin.rb
index a72c19750..d3a98d8bd 100644
--- a/app/models/status_pin.rb
+++ b/app/models/status_pin.rb
@@ -11,8 +11,8 @@
#
class StatusPin < ApplicationRecord
- belongs_to :account, required: true
- belongs_to :status, required: true
+ belongs_to :account
+ belongs_to :status
validates_with StatusPinValidator
end
diff --git a/app/models/subscription.rb b/app/models/subscription.rb
index 7f2eeab91..ea1173160 100644
--- a/app/models/subscription.rb
+++ b/app/models/subscription.rb
@@ -19,7 +19,7 @@ class Subscription < ApplicationRecord
MIN_EXPIRATION = 1.day.to_i
MAX_EXPIRATION = 30.days.to_i
- belongs_to :account, required: true
+ belongs_to :account
validates :callback_url, presence: true
validates :callback_url, uniqueness: { scope: :account_id }
diff --git a/app/models/user.rb b/app/models/user.rb
index 65ecb33cd..3cf9900bd 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -50,8 +50,8 @@ class User < ApplicationRecord
devise :registerable, :recoverable, :rememberable, :trackable, :validatable,
:confirmable
- belongs_to :account, inverse_of: :user, required: true
- belongs_to :invite, counter_cache: :uses
+ belongs_to :account, inverse_of: :user
+ belongs_to :invite, counter_cache: :uses, optional: true
accepts_nested_attributes_for :account
has_many :applications, class_name: 'Doorkeeper::Application', as: :owner
@@ -223,5 +223,6 @@ class User < ApplicationRecord
def update_statistics!
BootstrapTimelineWorker.perform_async(account_id)
ActivityTracker.increment('activity:accounts:local')
+ UserMailer.welcome(self).deliver_later
end
end
diff --git a/app/views/layouts/mailer.html.haml b/app/views/layouts/mailer.html.haml
index 85029ec76..ad15754d5 100644
--- a/app/views/layouts/mailer.html.haml
+++ b/app/views/layouts/mailer.html.haml
@@ -24,7 +24,7 @@
%tr
%td.column-cell
= link_to root_url do
- = image_tag full_pack_url('logo_full.svg'), alt: 'Mastodon', height: 34, class: 'logo'
+ = image_tag full_pack_url('logo_full.png'), alt: 'Mastodon', height: 34, class: 'logo'
= yield
@@ -41,15 +41,12 @@
%tr
%td.blank-cell.footer
.email-row
- .col-4
+ .col-6
%table.column{ cellspacing: 0, cellpadding: 0 }
%tbody
%td.column-cell
%p= t 'about.hosted_on', domain: site_hostname
%p= link_to t('application_mailer.notification_preferences'), settings_notifications_url
- .col-2
- %table.column{ cellspacing: 0, cellpadding: 0 }
- %tbody
%td.column-cell.text-right
= link_to root_url do
- = image_tag full_pack_url('logo_transparent.svg'), alt: 'Mastodon', height: 24
+ = image_tag full_pack_url('logo_transparent.png'), alt: 'Mastodon', height: 24
diff --git a/app/views/layouts/mailer.text.erb b/app/views/layouts/mailer.text.erb
index cdb284de8..87b0b2929 100644
--- a/app/views/layouts/mailer.text.erb
+++ b/app/views/layouts/mailer.text.erb
@@ -1,5 +1,5 @@
<%= yield %>
---
-<%= t('application_mailer.signature', instance: site_hostname) %>
+<%= t 'about.hosted_on', domain: site_hostname %>
<%= t('application_mailer.settings', link: settings_preferences_url) %>
diff --git a/app/views/notification_mailer/favourite.html.haml b/app/views/notification_mailer/favourite.html.haml
index f26b08b18..7d1b494d0 100644
--- a/app/views/notification_mailer/favourite.html.haml
+++ b/app/views/notification_mailer/favourite.html.haml
@@ -17,7 +17,7 @@
%tbody
%tr
%td
- = image_tag full_pack_url('icon_grade.svg'), alt:''
+ = image_tag full_pack_url('icon_grade.png'), alt:''
%h1= t 'notification_mailer.favourite.title'
%p.lead= t('notification_mailer.favourite.body', name: @account.acct)
diff --git a/app/views/notification_mailer/follow.html.haml b/app/views/notification_mailer/follow.html.haml
index 1290e2bc4..31a2b7445 100644
--- a/app/views/notification_mailer/follow.html.haml
+++ b/app/views/notification_mailer/follow.html.haml
@@ -17,7 +17,7 @@
%tbody
%tr
%td
- = image_tag full_pack_url('icon_person_add.svg'), alt: ''
+ = image_tag full_pack_url('icon_person_add.png'), alt: ''
%h1= t 'notification_mailer.follow.title'
%p.lead= t('notification_mailer.follow.body', name: @account.acct)
diff --git a/app/views/notification_mailer/follow_request.html.haml b/app/views/notification_mailer/follow_request.html.haml
index 41efeafaf..44f1911c4 100644
--- a/app/views/notification_mailer/follow_request.html.haml
+++ b/app/views/notification_mailer/follow_request.html.haml
@@ -17,7 +17,7 @@
%tbody
%tr
%td
- = image_tag full_pack_url('icon_person_add.svg'), alt: ''
+ = image_tag full_pack_url('icon_person_add.png'), alt: ''
%h1= t 'notification_mailer.follow_request.title'
%p.lead= t('notification_mailer.follow_request.body', name: @account.acct)
diff --git a/app/views/notification_mailer/mention.html.haml b/app/views/notification_mailer/mention.html.haml
index 619c580ce..479fed41c 100644
--- a/app/views/notification_mailer/mention.html.haml
+++ b/app/views/notification_mailer/mention.html.haml
@@ -17,7 +17,7 @@
%tbody
%tr
%td
- = image_tag full_pack_url('icon_reply.svg'), alt: ''
+ = image_tag full_pack_url('icon_reply.png'), alt: ''
%h1= t 'notification_mailer.mention.title'
%p.lead= t('notification_mailer.mention.body', name: @status.account.acct)
diff --git a/app/views/notification_mailer/reblog.html.haml b/app/views/notification_mailer/reblog.html.haml
index 61c6ee6be..85b202cf9 100644
--- a/app/views/notification_mailer/reblog.html.haml
+++ b/app/views/notification_mailer/reblog.html.haml
@@ -17,7 +17,7 @@
%tbody
%tr
%td
- = image_tag full_pack_url('icon_cached.svg'), alt: ''
+ = image_tag full_pack_url('icon_cached.png'), alt: ''
%h1= t 'notification_mailer.reblog.title'
%p.lead= t('notification_mailer.reblog.body', name: @account.acct)
diff --git a/app/views/user_mailer/confirmation_instructions.ar.text.erb b/app/views/user_mailer/confirmation_instructions.ar.text.erb
deleted file mode 100644
index 087c6a9ae..000000000
--- a/app/views/user_mailer/confirmation_instructions.ar.text.erb
+++ /dev/null
@@ -1,12 +0,0 @@
-مرحبا <%= @resource.email %> !
-
-لقد قمت بإنشاء حساب على <%= @instance %>.
-
-لتأكيد التسجيل يرجى النقر على الرابط التالي :
-<%= confirmation_url(@resource, confirmation_token: @token) %>
-
-يرجى الإطلاع على شروط الإستخدام <%= terms_url %>
-
-مع أجمل التحيات،
-
-فريق <%= @instance %>
diff --git a/app/views/user_mailer/confirmation_instructions.ca.text.erb b/app/views/user_mailer/confirmation_instructions.ca.text.erb
deleted file mode 100644
index 77cc589e6..000000000
--- a/app/views/user_mailer/confirmation_instructions.ca.text.erb
+++ /dev/null
@@ -1,12 +0,0 @@
-Benvingut <%= @resource.email %> !
-
-Acabes de crear un compte a <%= @instance %>.
-
-Per confirmar la subscripció, si us plua fes clic en el següent vincle :
-<%= confirmation_url(@resource, confirmation_token: @token) %>
-
-Si us plau també fes un cop d'ull als nostres termes i condicions <%= terms_url %>
-
-Sincerament,
-
-L'equip <%= @instance %>
diff --git a/app/views/user_mailer/confirmation_instructions.en.text.erb b/app/views/user_mailer/confirmation_instructions.en.text.erb
deleted file mode 100644
index 0419adef0..000000000
--- a/app/views/user_mailer/confirmation_instructions.en.text.erb
+++ /dev/null
@@ -1,12 +0,0 @@
-Welcome <%= @resource.email %> !
-
-You just created an account on <%= @instance %>.
-
-To confirm your inscription, please click on the following link :
-<%= confirmation_url(@resource, confirmation_token: @token) %>
-
-Please also check out our terms and conditions <%= terms_url %>
-
-Sincerely,
-
-The <%= @instance %> team
\ No newline at end of file
diff --git a/app/views/user_mailer/confirmation_instructions.es.text.erb b/app/views/user_mailer/confirmation_instructions.es.text.erb
deleted file mode 100644
index e9d83b3f8..000000000
--- a/app/views/user_mailer/confirmation_instructions.es.text.erb
+++ /dev/null
@@ -1,12 +0,0 @@
-¡Bienvenido, <%= @resource.email %>!
-
-Acabas de crear una cuenta en <%= @instance %>.
-
-Para confirmar tu registro, por favor ingresa al siguiente enlace:
-<%= confirmation_url(@resource, confirmation_token: @token) %>
-
-Por favor, también revisa nuestros términos y condiciones <%= terms_url %>
-
-Sinceramente,
-
-El equipo de <%= @instance %>
\ No newline at end of file
diff --git a/app/views/user_mailer/confirmation_instructions.fa.text.erb b/app/views/user_mailer/confirmation_instructions.fa.text.erb
deleted file mode 100644
index 76727b3be..000000000
--- a/app/views/user_mailer/confirmation_instructions.fa.text.erb
+++ /dev/null
@@ -1,12 +0,0 @@
-خوش آمدید <%= @resource.email %> !
-
-شما الان در <%= @instance %> حساب باز کردید.
-
-برای تأیید عضویت، لطفاً روی پیوند زیر کلیک کنید:
-<%= confirmation_url(@resource, confirmation_token: @token) %>
-
-لطفاً همچنین شرایط و مقررات استفادهٔ ما را هم بخوانید <%= terms_url %>
-
-با احترام،
-
-گردانندگان سرور <%= @instance %>
\ No newline at end of file
diff --git a/app/views/user_mailer/confirmation_instructions.fi.text.erb b/app/views/user_mailer/confirmation_instructions.fi.text.erb
deleted file mode 100644
index 796913abb..000000000
--- a/app/views/user_mailer/confirmation_instructions.fi.text.erb
+++ /dev/null
@@ -1,5 +0,0 @@
-Tervetuloa <%= @resource.email %>!
-
-Voit vahvistaa Mastodon tilisi klikkaamalla alla olevaa linkkiä:
-
-<%= confirmation_url(@resource, confirmation_token: @token) %>
diff --git a/app/views/user_mailer/confirmation_instructions.fr.text.erb b/app/views/user_mailer/confirmation_instructions.fr.text.erb
deleted file mode 100644
index 7730715f8..000000000
--- a/app/views/user_mailer/confirmation_instructions.fr.text.erb
+++ /dev/null
@@ -1,14 +0,0 @@
-Bonjour <%= @resource.email %> !
-
-Vous venez de vous créer un compte sur <%= @instance %> et nous vous en remercions.
-
-Pour confirmer votre inscription, merci de cliquer sur le lien suivant :
-<%= confirmation_url(@resource, confirmation_token: @token) %>
-
-Après votre première connexion, vous pourrez accéder à la documentation de l’outil.
-
-Pour rappel, nos conditions d’utilisation sont indiquées ici <%= terms_url %>
-
-Amicalement,
-
-L’équipe <%= @instance %>
diff --git a/app/views/user_mailer/confirmation_instructions.he.text.erb b/app/views/user_mailer/confirmation_instructions.he.text.erb
deleted file mode 100644
index 8e37fc641..000000000
--- a/app/views/user_mailer/confirmation_instructions.he.text.erb
+++ /dev/null
@@ -1,12 +0,0 @@
-שלום <%= @resource.email %> !
-
-הרגע יצרת חשבון בקהילה <%= @instance %>.
-
-כדי לוודא את הרשמתך, יש ללחוץ על הקישורית הבאה :
-<%= confirmation_url(@resource, confirmation_token: @token) %>
-
-יש לעבור גם על תנאי השימוש <%= terms_url %>
-
-בתודה מראש,
-
-צוות ניהול <%= @instance %>
\ No newline at end of file
diff --git a/app/views/user_mailer/confirmation_instructions.html.haml b/app/views/user_mailer/confirmation_instructions.html.haml
index 0f999bcbc..1f088a16f 100644
--- a/app/views/user_mailer/confirmation_instructions.html.haml
+++ b/app/views/user_mailer/confirmation_instructions.html.haml
@@ -17,7 +17,7 @@
%tbody
%tr
%td
- = image_tag full_pack_url('icon_email.svg'), alt: ''
+ = image_tag full_pack_url('icon_email.png'), alt: ''
%h1= t 'devise.mailer.confirmation_instructions.title'
diff --git a/app/views/user_mailer/confirmation_instructions.id.text.erb b/app/views/user_mailer/confirmation_instructions.id.text.erb
deleted file mode 100644
index 0486c3c5c..000000000
--- a/app/views/user_mailer/confirmation_instructions.id.text.erb
+++ /dev/null
@@ -1,12 +0,0 @@
-Selamat datang <%= @resource.email %> !
-
-Anda baru saja membuat akun di <%= @instance %>.
-
-Untuk mengkonfirmasi, silakan klik link berikut ini :
-<%= confirmation_url(@resource, confirmation_token: @token) %>
-
-Silakan cek <%= terms_url %> kami
-
-Hormat kami,
-
-Tim <%= @instance %>
diff --git a/app/views/user_mailer/confirmation_instructions.it.text.erb b/app/views/user_mailer/confirmation_instructions.it.text.erb
deleted file mode 100644
index ce9411173..000000000
--- a/app/views/user_mailer/confirmation_instructions.it.text.erb
+++ /dev/null
@@ -1,12 +0,0 @@
-Benvenuto <%= @resource.email %> !
-
-Hai appena creato un account su <%= @instance %>.
-
-er confermare la tua iscrizione, fai clic sul seguente link :
-<%= confirmation_url(@resource, confirmation_token: @token) %>
-
-Per piacere leggi anche i nostri termini e condizioni <%= terms_url %>
-
-Sinceramente,
-
-Il team <%= @instance %>
\ No newline at end of file
diff --git a/app/views/user_mailer/confirmation_instructions.ja.text.erb b/app/views/user_mailer/confirmation_instructions.ja.text.erb
deleted file mode 100644
index 99868ba8a..000000000
--- a/app/views/user_mailer/confirmation_instructions.ja.text.erb
+++ /dev/null
@@ -1,11 +0,0 @@
-ようこそ<%= @resource.email %>さん
-
-<%= @instance %>にアカウントが作成されました。
-
-以下のリンクをクリックしてMastodonアカウントのメールアドレスを確認してください。
-
-<%= confirmation_url(@resource, confirmation_token: @token) %>
-
-また、インスタンスの<%= link_to '利用規約', terms_url %>についてもご確認ください。
-
-<%= @instance %> チーム
diff --git a/app/views/user_mailer/confirmation_instructions.ko.text.erb b/app/views/user_mailer/confirmation_instructions.ko.text.erb
deleted file mode 100644
index c46400f07..000000000
--- a/app/views/user_mailer/confirmation_instructions.ko.text.erb
+++ /dev/null
@@ -1,10 +0,0 @@
-안녕하세요 <%= @resource.email %> 님!
-
-<%= @instance %>에 새로 계정을 만들었습니다.
-
-아래 링크를 눌러 회원가입을 완료 하세요.
-<%= confirmation_url(@resource, confirmation_token: @token) %>
-
-약관도 확인 바랍니다. <%= terms_url %>
-
-<%= @instance %> 드림
diff --git a/app/views/user_mailer/confirmation_instructions.nl.text.erb b/app/views/user_mailer/confirmation_instructions.nl.text.erb
deleted file mode 100644
index 3c14896b3..000000000
--- a/app/views/user_mailer/confirmation_instructions.nl.text.erb
+++ /dev/null
@@ -1,12 +0,0 @@
-Welkom <%= @resource.email %> !
-
-Je hebt zojuist een account aangemaakt op <%= @instance %>.
-
-Klik op de volgende link om jouw registratie te bevestigen :
-<%= confirmation_url(@resource, confirmation_token: @token) %>
-
-Lees ook onze gebruikersvoorwaarden op <%= terms_url %>
-
-Vriendelijke groet,
-
-De beheerder(s) van <%= @instance %>
diff --git a/app/views/user_mailer/confirmation_instructions.no.text.erb b/app/views/user_mailer/confirmation_instructions.no.text.erb
deleted file mode 100644
index 3739c99d4..000000000
--- a/app/views/user_mailer/confirmation_instructions.no.text.erb
+++ /dev/null
@@ -1,12 +0,0 @@
-Velkommen <%= @resource.email %> !
-
-Du har akkurat opprettet en konto på <%= @instance %>.
-
-For å bekrefte innskriving i manntallet vennligst trykk på følgende lenke :
-<%= confirmation_url(@resource, confirmation_token: @token) %>
-
-Vennligst også les våre brukervilkår <%= terms_url %>
-
-Med vennlig hilsen,
-
-Gjengen bak <%= @instance %>
diff --git a/app/views/user_mailer/confirmation_instructions.oc.text.erb b/app/views/user_mailer/confirmation_instructions.oc.text.erb
deleted file mode 100644
index fe04fe3d0..000000000
--- a/app/views/user_mailer/confirmation_instructions.oc.text.erb
+++ /dev/null
@@ -1,14 +0,0 @@
-Bonjorn <%= @resource.email %> !
-
-Venètz de vos crear un compte sus <%= @instance %> e vos mercegem :)
-
-er confirmar vòstra inscripcion, mercés de clicar sul ligam seguent :
-<%= link_to 'Confirmar mon compte', confirmation_url(@resource, confirmation_token: @token) %>
-
-Aprèp vòstra primièra connexion, poiretz accedir a la documentacion de l’aisina.
-
-Pensatz tanben de gaitar nòstres <%= link_to 'tèrmes e condicions d\'utilizacion', terms_url %>.
-
-Amistosament,
-
-La còla <%= @instance %>
diff --git a/app/views/user_mailer/confirmation_instructions.pl.text.erb b/app/views/user_mailer/confirmation_instructions.pl.text.erb
deleted file mode 100644
index f20082e16..000000000
--- a/app/views/user_mailer/confirmation_instructions.pl.text.erb
+++ /dev/null
@@ -1,12 +0,0 @@
-Witaj, <%= @resource.email %>!
-
-Właśnie utworzyłeś konto na instancji <%= @instance %>.
-
-Aby aktywować konto, odwiedź poniższy link:
-<%= confirmation_url(@resource, confirmation_token: @token) %>
-
-Pamiętaj przeczytać nasz regulamin i zasady użytkowania: <%= terms_url %>
-
-Z pozdrowieniami,
-
-Zespół <%= @instance %>
diff --git a/app/views/user_mailer/confirmation_instructions.pt-BR.text.erb b/app/views/user_mailer/confirmation_instructions.pt-BR.text.erb
deleted file mode 100644
index 578f7acb5..000000000
--- a/app/views/user_mailer/confirmation_instructions.pt-BR.text.erb
+++ /dev/null
@@ -1,12 +0,0 @@
-Boas vindas, <%= @resource.email %>!
-
-Você acabou de criar uma conta na instância <%= @instance %>.
-
-Para confirmar o seu cadastro, por favor clique no link a seguir:
-<%= confirmation_url(@resource, confirmation_token: @token) %>
-
-Por favor, leia também os nossos termos e condições de uso <%= terms_url %>
-
-Atenciosamente,
-
-A equipe da instância <%= @instance %>
diff --git a/app/views/user_mailer/confirmation_instructions.ru.text.erb b/app/views/user_mailer/confirmation_instructions.ru.text.erb
deleted file mode 100644
index 884f75401..000000000
--- a/app/views/user_mailer/confirmation_instructions.ru.text.erb
+++ /dev/null
@@ -1,12 +0,0 @@
-Добро пожаловать, <%= @resource.email %> !
-
-Вы только что завели аккаунт на <%= @instance %>.
-
-Чтобы подтвердить создание аккаунта, пожалуйста, перейдите по этой ссылке:
-<%= confirmation_url(@resource, confirmation_token: @token) %>
-
-Также просим Вас прочитать об условиях использования аккаунта здесь: <%= terms_url %>
-
-Искренне Ваши,
-
-Команда <%= @instance %>
diff --git a/app/views/user_mailer/confirmation_instructions.sr-Latn.text.erb b/app/views/user_mailer/confirmation_instructions.sr-Latn.text.erb
deleted file mode 100644
index 60fe9db0d..000000000
--- a/app/views/user_mailer/confirmation_instructions.sr-Latn.text.erb
+++ /dev/null
@@ -1,12 +0,0 @@
-Dobrodošao <%= @resource.email %> !
-
-Upravo ste napravili nalog na instanci <%= @instance %>.
-
-Da potvrdite Vašu registraciju, molimo Vas kliknite na sledeći link:
-<%= confirmation_url(@resource, confirmation_token: @token) %>
-
-Takođe pogledajte i pravila i uslove korišćenja <%= terms_url %>
-
-S poštovanjem,
-
-<%= @instance %> tim
diff --git a/app/views/user_mailer/confirmation_instructions.sr.text.erb b/app/views/user_mailer/confirmation_instructions.sr.text.erb
deleted file mode 100644
index e7cb7e188..000000000
--- a/app/views/user_mailer/confirmation_instructions.sr.text.erb
+++ /dev/null
@@ -1,12 +0,0 @@
-Добродошао <%= @resource.email %> !
-
-Управо сте направили налог на инстанци <%= @instance %>.
-
-Да потврдите Вашу регистрацију, молимо Вас кликните на следећи линк:
-<%= confirmation_url(@resource, confirmation_token: @token) %>
-
-Такође погледајте и правила и услове коришћења <%= terms_url %>
-
-С поштовањем,
-
-<%= @instance %> тим
diff --git a/app/views/user_mailer/confirmation_instructions.sv.text.erb b/app/views/user_mailer/confirmation_instructions.sv.text.erb
deleted file mode 100644
index 64ffb9799..000000000
--- a/app/views/user_mailer/confirmation_instructions.sv.text.erb
+++ /dev/null
@@ -1,12 +0,0 @@
-Välkommen <%= @resource.email %> !
-
-Du har precis skapat ett konto på <%= @instance %>.
-
-För att bekräfta din inskrift, vänligen klicka på följande länk :
-<%= confirmation_url(@resource, confirmation_token: @token) %>
-
-Vänligen läs även våra användarvillkor <%= terms_url %>
-
-Vänliga hälsningar,
-
-Teamet på <%= @instance %>
diff --git a/app/views/user_mailer/confirmation_instructions.text.erb b/app/views/user_mailer/confirmation_instructions.text.erb
new file mode 100644
index 000000000..e01eecb27
--- /dev/null
+++ b/app/views/user_mailer/confirmation_instructions.text.erb
@@ -0,0 +1,12 @@
+<%= t 'devise.mailer.confirmation_instructions.title' %>
+
+===
+
+<%= t 'devise.mailer.confirmation_instructions.explanation', host: site_hostname %>
+
+=> <%= confirmation_url(@resource, confirmation_token: @token) %>
+
+<%= strip_tags(t('devise.mailer.confirmation_instructions.extra_html', terms_path: about_more_url, policy_path: terms_url)) %>
+
+=> <%= about_more_url %>
+=> <%= terms_url %>
diff --git a/app/views/user_mailer/confirmation_instructions.tr.text.erb b/app/views/user_mailer/confirmation_instructions.tr.text.erb
deleted file mode 100644
index 01b1c69e2..000000000
--- a/app/views/user_mailer/confirmation_instructions.tr.text.erb
+++ /dev/null
@@ -1,13 +0,0 @@
-Aramıza hoşgeldin <%= @resource.email %>
-
-Bu sunucumuzda yeni bir hesap oluşturduğunu görüyoruz: <%= @instance %>.
-
-Siz olduğunuzu teyit edebilmemiz için lütfen aşağıdaki linke tıklayınız:
-
-<%= confirmation_url(@resource, confirmation_token: @token) %>
-
-Ayrıca kullanım şartları ve koşulları sayfamızı inceleyebilirsin <%= terms_url %>
-
-En içten dileklerimizle,
-
-<%= @instance %> ekibi
diff --git a/app/views/user_mailer/confirmation_instructions.zh-cn.text.erb b/app/views/user_mailer/confirmation_instructions.zh-cn.text.erb
deleted file mode 100644
index 25d901f16..000000000
--- a/app/views/user_mailer/confirmation_instructions.zh-cn.text.erb
+++ /dev/null
@@ -1,10 +0,0 @@
-<%= @resource.email %>，你好呀！
-
-你刚刚在 <%= @instance %> 创建了一个帐户呢。
-
-点击下面的链接来完成注册啦：
-<%= confirmation_url(@resource, confirmation_token: @token) %>
-
-记得读一读我们的使用条款哦：<%= terms_url %>
-
-来自 <%= @instance %> 管理团队
\ No newline at end of file
diff --git a/app/views/user_mailer/email_changed.en.text.erb b/app/views/user_mailer/email_changed.en.text.erb
deleted file mode 100644
index 971972461..000000000
--- a/app/views/user_mailer/email_changed.en.text.erb
+++ /dev/null
@@ -1,13 +0,0 @@
-Hello <%= @resource.email %>!
-
-<% if @resource&.unconfirmed_email? %>
-We're contacting you to notify you that the email you use on <%= @instance %> is being changed to <%= @resource.unconfirmed_email %>.
-<% else %>
-We're contacting you to notify you that the email you use on <%= @instance %> has been changed to <%= @resource.email %>.
-<% end %>
-
-If you did not change your email, it is likely that someone has gained access to your account. Please change your password immediately or contact the instance admin if you're locked out of your account.
-
-Sincerely,
-
-The <%= @instance %> team
diff --git a/app/views/user_mailer/email_changed.html.haml b/app/views/user_mailer/email_changed.html.haml
index 45dc06650..7e82f23e4 100644
--- a/app/views/user_mailer/email_changed.html.haml
+++ b/app/views/user_mailer/email_changed.html.haml
@@ -17,7 +17,7 @@
%tbody
%tr
%td
- = image_tag full_pack_url('icon_email.svg'), alt: ''
+ = image_tag full_pack_url('icon_email.png'), alt: ''
%h1= t 'devise.mailer.email_changed.title'
%p.lead= t 'devise.mailer.email_changed.explanation'
diff --git a/app/views/user_mailer/email_changed.ja.text.erb b/app/views/user_mailer/email_changed.ja.text.erb
deleted file mode 100644
index 33ee6d10b..000000000
--- a/app/views/user_mailer/email_changed.ja.text.erb
+++ /dev/null
@@ -1,11 +0,0 @@
-Hello <%= @resource.email %>!
-
-<% if @resource&.unconfirmed_email? %>
-<%= @instance %>で使っているメールアドレスが<%= @resource.unconfirmed_email %>に変更されようとしています。
-<% else %>
-<%= @instance %>で使っているメールアドレスが<%= @resource.email %>に変更されました。
-<% end %>
-
-メールアドレスを変更した覚えがない場合、誰かがあなたのアカウントにアクセスしたおそれがあります。すぐにパスワードを変更するか、アカウントにアクセスできない場合はインスタンスの管理者に連絡してください。
-
-<%= @instance %>チームより
diff --git a/app/views/user_mailer/email_changed.oc.text.erb b/app/views/user_mailer/email_changed.oc.text.erb
deleted file mode 100644
index 2305ef834..000000000
--- a/app/views/user_mailer/email_changed.oc.text.erb
+++ /dev/null
@@ -1,13 +0,0 @@
-Bonjorn <%= @resource.email %> !
-
-<% if @resource&.unconfirmed_email? %>
-Vos contactem per vos senhalar que l’adreça qu’utilizatz per <%= @instance %> es cambiada per aquesta d’aquí <%= @resource.unconfirmed_email %>.
-<% else %>
-Vos contactem per vos senhalar que l’adreça qu’utilizatz per <%= @instance %> es cambiada per aquesta d’aquí <%= @resource.email %>.
-<% end %>
-
-S’avètz pas demandat aqueste cambiament d’adreça, poiriá arribar que qualqu’un mai aguèsse agut accès a vòstre compte. Mercés de cambiar sulpic vòstre senhal o de contactar vòstre administrator d’instància se l’accès a vòstre compte vos es barrat.
-
-Amistosament,
-
-La còla <%= @instance %>
diff --git a/app/views/user_mailer/email_changed.pl.text.erb b/app/views/user_mailer/email_changed.pl.text.erb
deleted file mode 100644
index 134a79e95..000000000
--- a/app/views/user_mailer/email_changed.pl.text.erb
+++ /dev/null
@@ -1,13 +0,0 @@
-Witaj, <%= @resource.email %>!
-
-<% if @resource&.unconfirmed_email? %>
-Informujemy, że e-mail używany przez Ciebie na <%= @instance %> został zmieniony na <%= @resource.unconfirmed_email %>.
-<% else %>
-Informujemy, że e-mail używany przez Ciebie na <%= @instance %> został zmieniony na <%= @resource.email %>.
-<% end %>
-
-Jeżeli to nie Ty, prawdopodobnie ktoś uzyskał dostęp do Twojego konta. Zalecana jest natychmiastowa zmiana hasła lub skontaktowanie się z administratorem, jeżeli nie masz dostępu do swojego konta.
-
-Z pozdrowieniami,
-
-Zespół <%= @instance %>
diff --git a/app/views/user_mailer/email_changed.text.erb b/app/views/user_mailer/email_changed.text.erb
new file mode 100644
index 000000000..2b58415f5
--- /dev/null
+++ b/app/views/user_mailer/email_changed.text.erb
@@ -0,0 +1,9 @@
+<%= t 'devise.mailer.email_changed.title' %>
+
+===
+
+<%= t 'devise.mailer.email_changed.explanation' %>
+
+<%= @resource.unconfirmed_email %>
+
+<%= t 'devise.mailer.email_changed.extra' %>
diff --git a/app/views/user_mailer/email_changed.zh-cn.text.erb b/app/views/user_mailer/email_changed.zh-cn.text.erb
deleted file mode 100644
index d59ac58c4..000000000
--- a/app/views/user_mailer/email_changed.zh-cn.text.erb
+++ /dev/null
@@ -1,11 +0,0 @@
-<%= @resource.email %>，你好呀！
-
-<% if @resource&.unconfirmed_email? %>
-我们发送这封邮件是为了提醒你，你在 <%= @instance %> 上使用的电子邮件地址即将变更为 <%= @resource.unconfirmed_email %>。
-<% else %>
-我们发送这封邮件是为了提醒你，你在 <%= @instance %> 上使用的电子邮件地址已经变更为 <%= @resource.unconfirmed_email %>。
-<% end %>
-
-如果你并没有请求更改你的电子邮件地址，则他人很有可能已经入侵你的帐户。请立即更改你的密码；如果你已经无法访问你的帐户，请联系实例的管理员请求协助。
-
-来自 <%= @instance %> 管理团队
diff --git a/app/views/user_mailer/password_change.ar.text.erb b/app/views/user_mailer/password_change.ar.text.erb
deleted file mode 100644
index ae0161f31..000000000
--- a/app/views/user_mailer/password_change.ar.text.erb
+++ /dev/null
@@ -1,3 +0,0 @@
-صباح الخير <%= @resource.email %> !
-
-نود أن نخبرك أنه قد تم تعديل كلمة مرور ماستدون الخاصة بك بنجاح.
diff --git a/app/views/user_mailer/password_change.ca.text.erb b/app/views/user_mailer/password_change.ca.text.erb
deleted file mode 100644
index c2fdfc82c..000000000
--- a/app/views/user_mailer/password_change.ca.text.erb
+++ /dev/null
@@ -1,3 +0,0 @@
-Hola <%= @resource.email %>!
-
-Aquest correu es per a notificar-te que la teva contrasenya a mastodont.cat ha canviat.
diff --git a/app/views/user_mailer/password_change.en.text.erb b/app/views/user_mailer/password_change.en.text.erb
deleted file mode 100644
index 3ae461c97..000000000
--- a/app/views/user_mailer/password_change.en.text.erb
+++ /dev/null
@@ -1,3 +0,0 @@
-Hello <%= @resource.email %>!
-
-We're contacting you to notify you that your password on <%= @instance %> has been changed.
diff --git a/app/views/user_mailer/password_change.es.text.erb b/app/views/user_mailer/password_change.es.text.erb
deleted file mode 100644
index 192faf9ad..000000000
--- a/app/views/user_mailer/password_change.es.text.erb
+++ /dev/null
@@ -1,3 +0,0 @@
-¡Hola, <%= @resource.email %>!
-
-Te contactamos para notificarte que tu contraseña en <%= @instance %> ha sido modificada.
\ No newline at end of file
diff --git a/app/views/user_mailer/password_change.fa.text.erb b/app/views/user_mailer/password_change.fa.text.erb
deleted file mode 100644
index 0c2995958..000000000
--- a/app/views/user_mailer/password_change.fa.text.erb
+++ /dev/null
@@ -1,3 +0,0 @@
-سلام <%= @resource.email %>!
-
-این پیغام برای این است که به شما بگوییم رمز شما در ماستدون تغییر کرده است.
diff --git a/app/views/user_mailer/password_change.fi.text.erb b/app/views/user_mailer/password_change.fi.text.erb
deleted file mode 100644
index d90c3fdeb..000000000
--- a/app/views/user_mailer/password_change.fi.text.erb
+++ /dev/null
@@ -1,3 +0,0 @@
-Hei <%= @resource.email %>!
-
-Lähetämme tämän viestin ilmoittaaksemme että salasanasi on vaihdettu.
diff --git a/app/views/user_mailer/password_change.fr.text.erb b/app/views/user_mailer/password_change.fr.text.erb
deleted file mode 100644
index f068f1cd6..000000000
--- a/app/views/user_mailer/password_change.fr.text.erb
+++ /dev/null
@@ -1,3 +0,0 @@
-Bonjour <%= @resource.email %> !
-
-Nous vous contactons pour vous informer que votre mot de passe sur Mastodon a bien été modifié.
diff --git a/app/views/user_mailer/password_change.he.text.erb b/app/views/user_mailer/password_change.he.text.erb
deleted file mode 100644
index 1f601c6b2..000000000
--- a/app/views/user_mailer/password_change.he.text.erb
+++ /dev/null
@@ -1,3 +0,0 @@
-שלום <%= @resource.email %>!
-
-רצינו להודיע לך שסיסמתך במסטודון אצלנו הוחלפה.
diff --git a/app/views/user_mailer/password_change.html.haml b/app/views/user_mailer/password_change.html.haml
index 2e9377dff..26314a217 100644
--- a/app/views/user_mailer/password_change.html.haml
+++ b/app/views/user_mailer/password_change.html.haml
@@ -17,7 +17,7 @@
%tbody
%tr
%td
- = image_tag full_pack_url('icon_lock_open.svg'), alt: ''
+ = image_tag full_pack_url('icon_lock_open.png'), alt: ''
%h1= t 'devise.mailer.password_change.title'
%p.lead= t 'devise.mailer.password_change.explanation'
diff --git a/app/views/user_mailer/password_change.id.text.erb b/app/views/user_mailer/password_change.id.text.erb
deleted file mode 100644
index 1a67fd407..000000000
--- a/app/views/user_mailer/password_change.id.text.erb
+++ /dev/null
@@ -1,3 +0,0 @@
-Hai <%= @resource.email %>!
-
-Kami menghubungi anda untuk memberitahu bahwa kata sandi anda di Mastodon telah diubah.
diff --git a/app/views/user_mailer/password_change.it.text.erb b/app/views/user_mailer/password_change.it.text.erb
deleted file mode 100644
index ea187670e..000000000
--- a/app/views/user_mailer/password_change.it.text.erb
+++ /dev/null
@@ -1,3 +0,0 @@
-Ciao <%= @resource.email %>!
-
-Ti stiamo contattando per avvisarti che la tua password su Mastodon è stata cambiata.
diff --git a/app/views/user_mailer/password_change.ja.text.erb b/app/views/user_mailer/password_change.ja.text.erb
deleted file mode 100644
index aa29b9b2b..000000000
--- a/app/views/user_mailer/password_change.ja.text.erb
+++ /dev/null
@@ -1,3 +0,0 @@
-こんにちは<%= @resource.email %>さん
-
-Mastodonアカウントのパスワードが変更されました。
diff --git a/app/views/user_mailer/password_change.nl.text.erb b/app/views/user_mailer/password_change.nl.text.erb
deleted file mode 100644
index 33accd99c..000000000
--- a/app/views/user_mailer/password_change.nl.text.erb
+++ /dev/null
@@ -1,3 +0,0 @@
-Hallo <%= @resource.email %>!
-
-Hierbij laten we jou weten dat jouw wachtwoord op Mastodon is veranderd.
diff --git a/app/views/user_mailer/password_change.no.text.erb b/app/views/user_mailer/password_change.no.text.erb
deleted file mode 100644
index 1707976c1..000000000
--- a/app/views/user_mailer/password_change.no.text.erb
+++ /dev/null
@@ -1,3 +0,0 @@
-Hei <%= @resource.email %>!
-
-Ditt Mastodon-passord har blitt endret.
diff --git a/app/views/user_mailer/password_change.oc.text.erb b/app/views/user_mailer/password_change.oc.text.erb
deleted file mode 100644
index 9fe9116d9..000000000
--- a/app/views/user_mailer/password_change.oc.text.erb
+++ /dev/null
@@ -1,3 +0,0 @@
-Bonjorn <%= @resource.email %> !
-
-Vos contactem per vos avisar qu’avèm ben cambiat vòstre senhal Mastodon.
diff --git a/app/views/user_mailer/password_change.pl.text.erb b/app/views/user_mailer/password_change.pl.text.erb
deleted file mode 100644
index bd2efee0f..000000000
--- a/app/views/user_mailer/password_change.pl.text.erb
+++ /dev/null
@@ -1,3 +0,0 @@
-Witaj, <%= @resource.email %>!
-
-Informujemy, że ostatnio zmieniono Twoje hasło na <%= @instance %>.
diff --git a/app/views/user_mailer/password_change.pt-BR.text.erb b/app/views/user_mailer/password_change.pt-BR.text.erb
deleted file mode 100644
index eb7368ba9..000000000
--- a/app/views/user_mailer/password_change.pt-BR.text.erb
+++ /dev/null
@@ -1,3 +0,0 @@
-Olá, <%= @resource.email %>!
-
-Estamos te contatando para te notificar que a sua senha na instância <%= @instance %> foi modificada.
diff --git a/app/views/user_mailer/password_change.ru.text.erb b/app/views/user_mailer/password_change.ru.text.erb
deleted file mode 100644
index 6a3556dae..000000000
--- a/app/views/user_mailer/password_change.ru.text.erb
+++ /dev/null
@@ -1,3 +0,0 @@
-Здравствуйте, <%= @resource.email %>!
-
-Мы пишем, чтобы оповестить Вас о смене пароля на Вашем аккаунте Mastodon.
diff --git a/app/views/user_mailer/password_change.sr-Latn.text.erb b/app/views/user_mailer/password_change.sr-Latn.text.erb
deleted file mode 100644
index 6e0666d8d..000000000
--- a/app/views/user_mailer/password_change.sr-Latn.text.erb
+++ /dev/null
@@ -1,3 +0,0 @@
-Zdravo <%= @resource.email %>!
-
-Želimo samo da Vas obavestimo da je Vaša lozinka na Mastodont instanci <%= @instance %> promenjena.
diff --git a/app/views/user_mailer/password_change.sr.text.erb b/app/views/user_mailer/password_change.sr.text.erb
deleted file mode 100644
index 9082201c0..000000000
--- a/app/views/user_mailer/password_change.sr.text.erb
+++ /dev/null
@@ -1,3 +0,0 @@
-Здраво <%= @resource.email %>!
-
-Желимо само да Вас обавестимо да је Ваша лозинка на Мастодонт инстанци <%= @instance %> промењена.
diff --git a/app/views/user_mailer/password_change.sv.text.erb b/app/views/user_mailer/password_change.sv.text.erb
deleted file mode 100644
index b6df73226..000000000
--- a/app/views/user_mailer/password_change.sv.text.erb
+++ /dev/null
@@ -1,3 +0,0 @@
-Hej <%= @resource.email %>!
-
-Vi kontaktar dig för att meddela dig att ditt lösenord på <%= @instance %> har blivit ändrat.
diff --git a/app/views/user_mailer/password_change.text.erb b/app/views/user_mailer/password_change.text.erb
new file mode 100644
index 000000000..77a37894e
--- /dev/null
+++ b/app/views/user_mailer/password_change.text.erb
@@ -0,0 +1,7 @@
+<%= t 'devise.mailer.password_change.title' %>
+
+===
+
+<%= t 'devise.mailer.password_change.explanation' %>
+
+<%= t 'devise.mailer.password_change.extra' %>
diff --git a/app/views/user_mailer/password_change.th.text.erb b/app/views/user_mailer/password_change.th.text.erb
deleted file mode 100644
index 0d28a207c..000000000
--- a/app/views/user_mailer/password_change.th.text.erb
+++ /dev/null
@@ -1,3 +0,0 @@
-สวัสดี <%= @resource.email %>!
-
-เราติดต่อมาเพื่อแจ้งให้คุณทราบว่า พาสเวิร์ดของคุณถูกเปลี่ยนแล้ว
diff --git a/app/views/user_mailer/password_change.tr.text.erb b/app/views/user_mailer/password_change.tr.text.erb
deleted file mode 100644
index 873c5f962..000000000
--- a/app/views/user_mailer/password_change.tr.text.erb
+++ /dev/null
@@ -1,8 +0,0 @@
-Merhaba <%= @resource.email %>!
-
-<%= @instance %>'deki parolanızın değiştirildiğini hatırlatmak isteriz.
-
-En içten dileklerimizle,
-
-<%= @instance %> ekibi
-
diff --git a/app/views/user_mailer/password_change.zh-cn.text.erb b/app/views/user_mailer/password_change.zh-cn.text.erb
deleted file mode 100644
index dbc065173..000000000
--- a/app/views/user_mailer/password_change.zh-cn.text.erb
+++ /dev/null
@@ -1,3 +0,0 @@
-<%= @resource.email %>，你好呀！
-
-提醒一下，你在 <%= @instance %> 上的密码被更改了哦。
diff --git a/app/views/user_mailer/reconfirmation_instructions.en.text.erb b/app/views/user_mailer/reconfirmation_instructions.en.text.erb
deleted file mode 100644
index c1c735b3a..000000000
--- a/app/views/user_mailer/reconfirmation_instructions.en.text.erb
+++ /dev/null
@@ -1,12 +0,0 @@
-Hello <%= @resource.unconfirmed_email %>!
-
-You requested a change to the email address you use on <%= @instance %>.
-
-To confirm your new email, please click on the following link:
-<%= confirmation_url(@resource, confirmation_token: @token) %>
-
-Please also check out our terms and conditions <%= terms_url %>
-
-Sincerely,
-
-The <%= @instance %> team
diff --git a/app/views/user_mailer/reconfirmation_instructions.html.haml b/app/views/user_mailer/reconfirmation_instructions.html.haml
index 3ae226093..e3be8e295 100644
--- a/app/views/user_mailer/reconfirmation_instructions.html.haml
+++ b/app/views/user_mailer/reconfirmation_instructions.html.haml
@@ -17,7 +17,7 @@
%tbody
%tr
%td
- = image_tag full_pack_url('icon_email.svg'), alt: ''
+ = image_tag full_pack_url('icon_email.png'), alt: ''
%h1= t 'devise.mailer.reconfirmation_instructions.title'
%p.lead= t 'devise.mailer.reconfirmation_instructions.explanation'
diff --git a/app/views/user_mailer/reconfirmation_instructions.ja.text.erb b/app/views/user_mailer/reconfirmation_instructions.ja.text.erb
deleted file mode 100644
index 5326e4512..000000000
--- a/app/views/user_mailer/reconfirmation_instructions.ja.text.erb
+++ /dev/null
@@ -1,10 +0,0 @@
-こんにちは<%= @resource.unconfirmed_email %>さん
-
-<%= @instance %>で使っているメールアドレスの変更をあなたがリクエストしました。
-
-新しいメールアドレスを確認するには次のリンクをクリックしてください:
-<%= confirmation_url(@resource, confirmation_token: @token) %>
-
-また利用規約もご確認ください <%= terms_url %>
-
-<%= @instance %>チームより
diff --git a/app/views/user_mailer/reconfirmation_instructions.oc.text.erb b/app/views/user_mailer/reconfirmation_instructions.oc.text.erb
deleted file mode 100644
index 6f174bb3e..000000000
--- a/app/views/user_mailer/reconfirmation_instructions.oc.text.erb
+++ /dev/null
@@ -1,12 +0,0 @@
-Bonjorn <%= @resource.unconfirmed_email %> !
-
-Avètz demandat a cambiar vòstra adreça de corrièl qu’utilizatz per <%= @instance %>.
-
-Per confirmar vòstra novèla adreça, mercés de clicar lo ligam seguent :
-<%= confirmation_url(@resource, confirmation_token: @token) %>
-
-Mercés tanben de gaitar nòstres <%= link_to 'terms and conditions', terms_url %>.
-
-Amistosament,
-
-La còla <%= @instance %>
diff --git a/app/views/user_mailer/reconfirmation_instructions.pl.text.erb b/app/views/user_mailer/reconfirmation_instructions.pl.text.erb
deleted file mode 100644
index 032718f81..000000000
--- a/app/views/user_mailer/reconfirmation_instructions.pl.text.erb
+++ /dev/null
@@ -1,12 +0,0 @@
-Witaj, <%= @resource.unconfirmed_email %>!
-
-Dokonano próby zmiany adresu e-mail, którego używasz na <%= @instance %>.
-
-Aby potwierdzić posiadanie tego adresu e-mail, kliknij na poniższy odnośnik:
-<%= confirmation_url(@resource, confirmation_token: @token) %>
-
-Pamiętaj o przeczytaniu naszych zasad użytkowania: <%= terms_url %>
-
-Z pozdrowieniami,
-
-Zespół <%= @instance %>
diff --git a/app/views/user_mailer/reconfirmation_instructions.text.erb b/app/views/user_mailer/reconfirmation_instructions.text.erb
new file mode 100644
index 000000000..b5e530251
--- /dev/null
+++ b/app/views/user_mailer/reconfirmation_instructions.text.erb
@@ -0,0 +1,9 @@
+<%= t 'devise.mailer.reconfirmation_instructions.title' %>
+
+===
+
+<%= t 'devise.mailer.reconfirmation_instructions.explanation' %>
+
+=> <%= confirmation_url(@resource, confirmation_token: @token) %>
+
+<%= t 'devise.mailer.reconfirmation_instructions.extra' %>
diff --git a/app/views/user_mailer/reconfirmation_instructions.zh-cn.text.erb b/app/views/user_mailer/reconfirmation_instructions.zh-cn.text.erb
deleted file mode 100644
index 977d78137..000000000
--- a/app/views/user_mailer/reconfirmation_instructions.zh-cn.text.erb
+++ /dev/null
@@ -1,10 +0,0 @@
-<%= @resource.email %>，你好呀！
-
-你正在更改你在 <%= @instance %> 使用的电子邮件地址。
-
-点击下面的链接以确认操作：
-<%= confirmation_url(@resource, confirmation_token: @token) %>
-
-记得读一读我们的使用条款哦：<%= terms_url %>
-
-来自 <%= @instance %> 管理团队
diff --git a/app/views/user_mailer/reset_password_instructions.ar.text.erb b/app/views/user_mailer/reset_password_instructions.ar.text.erb
deleted file mode 100644
index 0dfc85a36..000000000
--- a/app/views/user_mailer/reset_password_instructions.ar.text.erb
+++ /dev/null
@@ -1,8 +0,0 @@
-صباح الخير <%= @resource.email %>!
-
-لقد طلب أحدهم رابط تعديل كلمة مرور ماستدون الخاصة بك. يمكنك المتابعة و مواصلة التعديل على الرابط التالي.
-
-<%= edit_password_url(@resource, reset_password_token: @token) %>
-
-يمكنك تجاهل هذه الرسالة إن لم تكن من طلب ذلك.
-لن يتم تعديل كلمة المرور الخاصة بك و ستبقى نفسها إلا إذا قمت بالضغط على الرابط أعلاه.
diff --git a/app/views/user_mailer/reset_password_instructions.ca.text.erb b/app/views/user_mailer/reset_password_instructions.ca.text.erb
deleted file mode 100644
index ca4c494c3..000000000
--- a/app/views/user_mailer/reset_password_instructions.ca.text.erb
+++ /dev/null
@@ -1,8 +0,0 @@
-Hola <%= @resource.email %>!
-
-Algú ha sol·licitat un enllaç per canviar la contrasenya a mastodont.cat. Això es pot fer a través del següent enllaç.
-
-<%= edit_password_url(@resource, reset_password_token: @token) %>
-
-Si no has sol·licitat aquest canvi, si us plau, ignora aquest correu.
-La teva contrasenya no canviarà fins que accedeix a l'enllaç de dalt per crear-ne una de nova.
diff --git a/app/views/user_mailer/reset_password_instructions.en.text.erb b/app/views/user_mailer/reset_password_instructions.en.text.erb
deleted file mode 100644
index 7ed22dc2c..000000000
--- a/app/views/user_mailer/reset_password_instructions.en.text.erb
+++ /dev/null
@@ -1,8 +0,0 @@
-Hello <%= @resource.email %>!
-
-Someone has requested a link to change your password on <%= @instance %>. You can do this through the link below.
-
-<%= edit_password_url(@resource, reset_password_token: @token) %>
-
-If you didn't request this, please ignore this email.
-Your password won't change until you access the link above and create a new one.
diff --git a/app/views/user_mailer/reset_password_instructions.es.text.erb b/app/views/user_mailer/reset_password_instructions.es.text.erb
deleted file mode 100644
index 8abafcc99..000000000
--- a/app/views/user_mailer/reset_password_instructions.es.text.erb
+++ /dev/null
@@ -1,8 +0,0 @@
-¡Hola, <%= @resource.email %>!
-
-Alguien pidió un enlace para cambiar tu contraseña en <%= @instance %>. Puedes hacer esto con el siguiente enlace.
-
-<%= edit_password_url(@resource, reset_password_token: @token) %>
-
-Si no fuiste tú, por favor ignora este mensaje.
-Tu contraseña no cambiará hasta que ingreses al enlace y crees una nueva.
diff --git a/app/views/user_mailer/reset_password_instructions.fa.text.erb b/app/views/user_mailer/reset_password_instructions.fa.text.erb
deleted file mode 100644
index 0b01ba906..000000000
--- a/app/views/user_mailer/reset_password_instructions.fa.text.erb
+++ /dev/null
@@ -1,8 +0,0 @@
-سلام <%= @resource.email %>!
-
-یک نفر درخواست کرده تا رمز شما در ماستدون عوض شود. برای این کار روی پیوند زیر کلیک کنید.
-
-<%= edit_password_url(@resource, reset_password_token: @token) %>
-
-اگر شما چنین درخواستی ندادهاید، لطفاً این ایمیل را نادیده بگیرید.
-تا وقتی که شما پیوند بالا را نبینید و رمز تازهای نسازید، رمز شما عوض نخواهد شد.
diff --git a/app/views/user_mailer/reset_password_instructions.fi.text.erb b/app/views/user_mailer/reset_password_instructions.fi.text.erb
deleted file mode 100644
index c826d5fc8..000000000
--- a/app/views/user_mailer/reset_password_instructions.fi.text.erb
+++ /dev/null
@@ -1,8 +0,0 @@
-Hei <%= @resource.email %>!
-
-Joku on pyytänyt salasanvaihto Mastodonissa. Voit tehdä sen allaolevassa linkissä.
-
-<%= edit_password_url(@resource, reset_password_token: @token) %>
-
-Jos et pyytänyt vaihtoa, poista tämä viesti.
-Salasanaasi ei vaihdeta ennen kuin menet ylläolevaan linkkiin ja luot uuden.
diff --git a/app/views/user_mailer/reset_password_instructions.fr.text.erb b/app/views/user_mailer/reset_password_instructions.fr.text.erb
deleted file mode 100644
index 07fa3644a..000000000
--- a/app/views/user_mailer/reset_password_instructions.fr.text.erb
+++ /dev/null
@@ -1,8 +0,0 @@
-Bonjour <%= @resource.email %> !
-
-Quelqu’un a demandé à réinitialiser votre mot de passe sur Mastodon. Vous pouvez effectuer la réinitialisation en cliquant sur le lien ci-dessous.
-
-<%= edit_password_url(@resource, reset_password_token: @token) %>
-
-Si vous n’êtes pas à l’origine de cette demande, vous pouvez ignorer ce message.
-Votre mot de passe ne sera pas modifié tant que vous n’accéderez pas au lien ci-dessus et n’en choisirez pas un nouveau.
diff --git a/app/views/user_mailer/reset_password_instructions.he.text.erb b/app/views/user_mailer/reset_password_instructions.he.text.erb
deleted file mode 100644
index 63c96c06b..000000000
--- a/app/views/user_mailer/reset_password_instructions.he.text.erb
+++ /dev/null
@@ -1,8 +0,0 @@
-שלום <%= @resource.email %>!
-
-מישהו ביקש לינק להחלפת סיסמתך במסטודון. באפשרותך לעשות זאת ע"י בלחיצה על הקישורית שבהמשך.
-
-<%= edit_password_url(@resource, reset_password_token: @token) %>
-
-אם בקשה זו לא הגיעה ממך, אפשר להתעלם מההודעה.
-סיסמתך לא תוחלף לפני שהקישורית תיפתח בדפדפן וסיסמא חדשה תוכנס.
diff --git a/app/views/user_mailer/reset_password_instructions.html.haml b/app/views/user_mailer/reset_password_instructions.html.haml
index c0e6775d4..5d9ce6a75 100644
--- a/app/views/user_mailer/reset_password_instructions.html.haml
+++ b/app/views/user_mailer/reset_password_instructions.html.haml
@@ -17,7 +17,7 @@
%tbody
%tr
%td
- = image_tag full_pack_url('icon_lock_open.svg'), alt: ''
+ = image_tag full_pack_url('icon_lock_open.png'), alt: ''
%h1= t 'devise.mailer.reset_password_instructions.title'
%p.lead= t 'devise.mailer.reset_password_instructions.explanation'
diff --git a/app/views/user_mailer/reset_password_instructions.id.text.erb b/app/views/user_mailer/reset_password_instructions.id.text.erb
deleted file mode 100644
index cd7cfc373..000000000
--- a/app/views/user_mailer/reset_password_instructions.id.text.erb
+++ /dev/null
@@ -1,8 +0,0 @@
-Hai <%= @resource.email %>!
-
-Seseorang telah melakukan permintaan link untuk merubah kata sandi anda di Mastodon. Anda bisa melakukan ini melalui link dibawah ini.
-
-<%= edit_password_url(@resource, reset_password_token: @token) %>
-
-Jika anda tidak memintanya, mohon abaikan email ini.
-Password anda tidak akan diubah kecuali anda mengakses link di atas dan menggantinya.
diff --git a/app/views/user_mailer/reset_password_instructions.it.text.erb b/app/views/user_mailer/reset_password_instructions.it.text.erb
deleted file mode 100644
index 1de485c2e..000000000
--- a/app/views/user_mailer/reset_password_instructions.it.text.erb
+++ /dev/null
@@ -1,8 +0,0 @@
-Ciao <%= @resource.email %>!
-
-Qualcuno ha richiesto un link per cambiare la tua password su Mastodon. Lo puoi fare tramite il link qui sotto.
-
-<%= edit_password_url(@resource, reset_password_token: @token) %>
-
-Se non l'hai richiesto tu, ignora questa email.
-La tua password non verrà cambiata finché non accedi al link qui sopra e ne crei una nuova.
diff --git a/app/views/user_mailer/reset_password_instructions.ja.text.erb b/app/views/user_mailer/reset_password_instructions.ja.text.erb
deleted file mode 100644
index 9ed607b58..000000000
--- a/app/views/user_mailer/reset_password_instructions.ja.text.erb
+++ /dev/null
@@ -1,8 +0,0 @@
-こんにちは<%= @resource.email %>さん
-
-Mastodonアカウントのパスワードの変更がリクエストされました。以下のリンクをクリックして操作を完了できます。
-
-<%= edit_password_url(@resource, reset_password_token: @token) %>
-
-このメールに身に覚えのない場合は無視してください。
-上記のリンクにアクセスし、変更をしない限りパスワードは変更されません。
diff --git a/app/views/user_mailer/reset_password_instructions.nl.text.erb b/app/views/user_mailer/reset_password_instructions.nl.text.erb
deleted file mode 100644
index eda133db2..000000000
--- a/app/views/user_mailer/reset_password_instructions.nl.text.erb
+++ /dev/null
@@ -1,9 +0,0 @@
-Hallo <%= @resource.email %>!
-
-Er heeft iemand een nieuw wachtwoord aangevraagd voor Mastodon. Je kan op de link hieronder klikken om jouw wachtwo
-ord te veranderen.
-
-<%= edit_password_url(@resource, reset_password_token: @token) %>
-
-Je kan deze e-mail negeren wanneer jij dit niet hebt aangevraagd.
-Jouw wachtwoord blijft onveranderd wanneer je niet op bovenstaande link klikt.
diff --git a/app/views/user_mailer/reset_password_instructions.no.text.erb b/app/views/user_mailer/reset_password_instructions.no.text.erb
deleted file mode 100644
index 387dc7c3e..000000000
--- a/app/views/user_mailer/reset_password_instructions.no.text.erb
+++ /dev/null
@@ -1,9 +0,0 @@
-
-Hei <%= @resource.email %>!
-
-Noen har forespurt en lenke til å bytte passord på din Mastodon-bruker. Du kan gjøre det ved å følge lenken under.
-
-<%= edit_password_url(@resource, reset_password_token: @token) %>
-
-Hvis du ikke vil endre ditt passord kan du ignorere denne epost.
-Passordet ditt blir ikke endret før du følger lenken over og endrer det.
diff --git a/app/views/user_mailer/reset_password_instructions.oc.text.erb b/app/views/user_mailer/reset_password_instructions.oc.text.erb
deleted file mode 100644
index 5a5219589..000000000
--- a/app/views/user_mailer/reset_password_instructions.oc.text.erb
+++ /dev/null
@@ -1,8 +0,0 @@
-Bonjorn <%= @resource.email %> !
-
-Qualqu’un a demandat la reïnicializacion de vòstre senhal per Mastodon. Podètz realizar la reïnicializacion en clicant sul ligam çai-jos.
-
-<%= link_to 'Modificar mon senhal', edit_password_url(@resource, reset_password_token: @token) %>
-
-S’avètz pas res demandat, fasquètz pas cas a aqueste corrièl.
-Vòstre senhal cambiarà pas se clicatz pas sul ligam e que ne causissètz pas un novèl.
diff --git a/app/views/user_mailer/reset_password_instructions.pl.text.erb b/app/views/user_mailer/reset_password_instructions.pl.text.erb
deleted file mode 100644
index 2b34afc48..000000000
--- a/app/views/user_mailer/reset_password_instructions.pl.text.erb
+++ /dev/null
@@ -1,9 +0,0 @@
-Witaj, <%= @resource.email %>!
-
-Ktoś próbował zmienić Twoje hasło na <%= @instance %>. Możesz zrobić to klikając w
-poniższy link.
-
-<%= edit_password_url(@resource, reset_password_token: @token) %>
-
-Jeżeli to nie Ty, zignoruj ten e-mail.
-Twoje hasło nie zostanie zmienione, dopóki nie użyjesz linku z podobnej wiadomości.
diff --git a/app/views/user_mailer/reset_password_instructions.pt-BR.text.erb b/app/views/user_mailer/reset_password_instructions.pt-BR.text.erb
deleted file mode 100644
index 2abff0c0d..000000000
--- a/app/views/user_mailer/reset_password_instructions.pt-BR.text.erb
+++ /dev/null
@@ -1,8 +0,0 @@
-Olá, <%= @resource.email %>!
-
-Alguém solicitou um link para mudar a sua senha na instância <%= @instance %>. Você pode fazer isso através do link abaixo:
-
-<%= edit_password_url(@resource, reset_password_token: @token) %>
-
-Se você não solicitou isso, por favor ignore este e-mail.
-A senha não será modificada até que você acesse o link acima e crie uma nova.
diff --git a/app/views/user_mailer/reset_password_instructions.ru.text.erb b/app/views/user_mailer/reset_password_instructions.ru.text.erb
deleted file mode 100644
index 4ede067ab..000000000
--- a/app/views/user_mailer/reset_password_instructions.ru.text.erb
+++ /dev/null
@@ -1,8 +0,0 @@
-Здравствуйте, <%= @resource.email %>!
-
-Кто-то отправил запрос о сбросе пароля для Вашего аккаунта Mastodon. Вы можете использовать для этого следующую ссылку:
-
-<%= edit_password_url(@resource, reset_password_token: @token) %>
-
-Если Вы не запрашивали сброс пароля, пожалуйста, проигнорируйте это сообщение.
-Ваш пароль не будет изменен, пока вы не проследуете по вышеприведенной ссылке и не создадите новый.
diff --git a/app/views/user_mailer/reset_password_instructions.sr-Latn.text.erb b/app/views/user_mailer/reset_password_instructions.sr-Latn.text.erb
deleted file mode 100644
index 31707dee1..000000000
--- a/app/views/user_mailer/reset_password_instructions.sr-Latn.text.erb
+++ /dev/null
@@ -1,8 +0,0 @@
-Zdravo <%= @resource.email %>!
-
-Neko je zatražio link za promenu lozinke na instanci <%= @instance %>. Ovo možete uraditi preko linka ispod.
-
-<%= edit_password_url(@resource, reset_password_token: @token) %>
-
-Ignorišite ovu poruku, ako niste Vi bili ti koji ste zatražili promenu lozinke.
-Lozinka se neće promeniti sve dok ne kliknete link iznad i ne napravite novu lozinku.
diff --git a/app/views/user_mailer/reset_password_instructions.sr.text.erb b/app/views/user_mailer/reset_password_instructions.sr.text.erb
deleted file mode 100644
index 86ea32b05..000000000
--- a/app/views/user_mailer/reset_password_instructions.sr.text.erb
+++ /dev/null
@@ -1,8 +0,0 @@
-Здраво <%= @resource.email %>!
-
-Неко је затражио линк за промену лозинке на инстанци <%= @instance %>. Ово можете урадити преко линка испод.
-
-<%= edit_password_url(@resource, reset_password_token: @token) %>
-
-Игноришите ову поруку, ако нисте Ви били ти који сте затражили промену лозинке.
-Лозинка се неће променити све док не кликнете линк изнад и не направите нову лозинку.
diff --git a/app/views/user_mailer/reset_password_instructions.sv.text.erb b/app/views/user_mailer/reset_password_instructions.sv.text.erb
deleted file mode 100644
index 946426119..000000000
--- a/app/views/user_mailer/reset_password_instructions.sv.text.erb
+++ /dev/null
@@ -1,8 +0,0 @@
-Hej <%= @resource.email %>!
-
-Någon har begärt en länk för att ändra ditt lösenord på <%= @instance %>. Du kan göra det genom länken nedan.
-
-<%= edit_password_url(@resource, reset_password_token: @token) %>
-
-Om du inte begärt detta, ignorerar du det här e-postmeddelandet.
-Ditt lösenord ändras inte förrän du öppnar länken ovan och skapar ett nytt.
diff --git a/app/views/user_mailer/reset_password_instructions.text.erb b/app/views/user_mailer/reset_password_instructions.text.erb
new file mode 100644
index 000000000..4fbef16ee
--- /dev/null
+++ b/app/views/user_mailer/reset_password_instructions.text.erb
@@ -0,0 +1,9 @@
+<%= t 'devise.mailer.reset_password_instructions.title' %>
+
+===
+
+<%= t 'devise.mailer.reset_password_instructions.explanation' %>
+
+=> <%= edit_password_url(@resource, reset_password_token: @token) %>
+
+<%= t 'devise.mailer.reset_password_instructions.extra' %>
diff --git a/app/views/user_mailer/reset_password_instructions.th.text.erb b/app/views/user_mailer/reset_password_instructions.th.text.erb
deleted file mode 100644
index fe73b0165..000000000
--- a/app/views/user_mailer/reset_password_instructions.th.text.erb
+++ /dev/null
@@ -1,8 +0,0 @@
-Hello <%= @resource.email %>!
-
-Someone has requested a link to change your password on Mastodon. You can do this through the link below.
-
-<%= edit_password_url(@resource, reset_password_token: @token) %>
-
-If you didn't request this, please ignore this email.
-Your password won't change until you access the link above and create a new one.
diff --git a/app/views/user_mailer/reset_password_instructions.tr.text.erb b/app/views/user_mailer/reset_password_instructions.tr.text.erb
deleted file mode 100644
index a0b84b9a4..000000000
--- a/app/views/user_mailer/reset_password_instructions.tr.text.erb
+++ /dev/null
@@ -1,13 +0,0 @@
-Merhaba <%= @resource.email %>
-
-Biri <%= @instance %> üzerinden sizin hesabınız için parola değişim isteği gönderdi. Aşağıdaki linke tıklayarak bunu gerçekleştirebilirsiniz.
-
-<%= edit_password_url(@resource, reset_password_token: @token) %>
-
-Eğer bu isteği siz göndermediyseniz, lütfen bu e-postayı görmezden geliniz.
-Siz bu linke tıklayıp yeni bir parola girene kadar parolanız değişmeyecektir.
-
-En içten dileklerimizle,
-
-<%= @instance %> ekibi
-
diff --git a/app/views/user_mailer/reset_password_instructions.zh-cn.text.erb b/app/views/user_mailer/reset_password_instructions.zh-cn.text.erb
deleted file mode 100644
index f7cd88847..000000000
--- a/app/views/user_mailer/reset_password_instructions.zh-cn.text.erb
+++ /dev/null
@@ -1,8 +0,0 @@
-<%= @resource.email %>，你好呀！
-
-有人想修改你在 <%= @instance %> 上的密码呢。如果你确实想修改密码的话，点击下面的链接吧：
-
-<%= edit_password_url(@resource, reset_password_token: @token) %>
-
-如果你不想修改密码的话，还请忽略这封邮件哦。
-在你点击上面的链接并修改密码前，你的密码是不会改变的。
diff --git a/app/views/user_mailer/welcome.html.haml b/app/views/user_mailer/welcome.html.haml
new file mode 100644
index 000000000..d734da67d
--- /dev/null
+++ b/app/views/user_mailer/welcome.html.haml
@@ -0,0 +1,146 @@
+%table.email-table{ cellspacing: 0, cellpadding: 0 }
+ %tbody
+ %tr
+ %td.email-body
+ .email-container
+ %table.content-section{ cellspacing: 0, cellpadding: 0 }
+ %tbody
+ %tr
+ %td.content-cell.hero
+ .email-row
+ .col-6
+ %table.column{ cellspacing: 0, cellpadding: 0 }
+ %tbody
+ %tr
+ %td.column-cell.text-center.padded
+ %table.hero-icon{ align: 'center', cellspacing: 0, cellpadding: 0 }
+ %tbody
+ %tr
+ %td
+ = image_tag full_pack_url('icon_done.png'), alt: ''
+
+ %h1= t 'user_mailer.welcome.title', name: @resource.account.username
+ %p.lead= t 'user_mailer.welcome.explanation'
+
+%table.email-table{ cellspacing: 0, cellpadding: 0 }
+ %tbody
+ %tr
+ %td.email-body
+ .email-container
+ %table.content-section{ cellspacing: 0, cellpadding: 0 }
+ %tbody
+ %tr
+ %td.content-cell.content-start
+ .email-row
+ .col-3
+ %table.column{ cellspacing: 0, cellpadding: 0 }
+ %tbody
+ %tr
+ %td.column-cell.input-cell.text-center.padded-bottom
+ %h5= t 'user_mailer.welcome.full_handle'
+ %table.input{ align: 'center', cellspacing: 0, cellpadding: 0 }
+ %tbody
+ %tr
+ %td= "@#{@resource.account.username}@#{@instance}"
+ .col-3
+ %table.column{ cellspacing: 0, cellpadding: 0 }
+ %tbody
+ %tr
+ %td.column-cell
+ %p= t 'user_mailer.welcome.full_handle_hint', instance: @instance
+
+%table.email-table{ cellspacing: 0, cellpadding: 0 }
+ %tbody
+ %tr
+ %td.email-body
+ .email-container
+ %table.content-section{ cellspacing: 0, cellpadding: 0 }
+ %tbody
+ %tr
+ %td.content-cell.content-start.border-top
+ .email-row
+ .col-4
+ %table.column{ cellspacing: 0, cellpadding: 0 }
+ %tbody
+ %tr
+ %td.column-cell.padded
+ = t 'user_mailer.welcome.edit_profile_step'
+ .col-2
+ %table.column{ cellspacing: 0, cellpadding: 0 }
+ %tbody
+ %tr
+ %td.column-cell.padded
+ %table.button.button-small{ align: 'left', cellspacing: 0, cellpadding: 0 }
+ %tbody
+ %tr
+ %td.button-primary
+ = link_to settings_profile_url do
+ %span= t 'user_mailer.welcome.edit_profile_action'
+ %tr
+ %td.content-cell
+ .email-row
+ .col-4
+ %table.column{ cellspacing: 0, cellpadding: 0 }
+ %tbody
+ %tr
+ %td.column-cell.padded
+ = t 'user_mailer.welcome.review_preferences_step'
+ .col-2
+ %table.column{ cellspacing: 0, cellpadding: 0 }
+ %tbody
+ %tr
+ %td.column-cell.padded
+ %table.button.button-small{ align: 'left', cellspacing: 0, cellpadding: 0 }
+ %tbody
+ %tr
+ %td.button-primary
+ = link_to settings_preferences_url do
+ %span= t 'user_mailer.welcome.review_preferences_action'
+ %tr
+ %td.content-cell.padded-bottom
+ .email-row
+ .col-4
+ %table.column{ cellspacing: 0, cellpadding: 0 }
+ %tbody
+ %tr
+ %td.column-cell.padded
+ = t 'user_mailer.welcome.final_step'
+ .col-2
+ %table.column{ cellspacing: 0, cellpadding: 0 }
+ %tbody
+ %tr
+ %td.column-cell.padded
+ %table.button.button-small{ align: 'left', cellspacing: 0, cellpadding: 0 }
+ %tbody
+ %tr
+ %td.button-primary
+ = link_to web_url do
+ %span= t 'user_mailer.welcome.final_action'
+
+%table.email-table{ cellspacing: 0, cellpadding: 0 }
+ %tbody
+ %tr
+ %td.email-body
+ .email-container
+ %table.content-section{ cellspacing: 0, cellpadding: 0 }
+ %tbody
+ %tr
+ %td.content-cell.border-top
+ .email-row
+ .col-6
+ %table.column{ cellspacing: 0, cellpadding: 0 }
+ %tbody
+ %tr
+ %td.column-cell.padded
+ %h5= t 'user_mailer.welcome.tips'
+ %ul
+ %li
+ %span= t 'user_mailer.welcome.tip_mobile_webapp'
+ %li
+ %span= t 'user_mailer.welcome.tip_bridge_html', bridge_url: 'https://bridge.joinmastodon.org'
+ %li
+ %span= t 'user_mailer.welcome.tip_following'
+ %li
+ %span= t 'user_mailer.welcome.tip_local_timeline', instance: @instance
+ %li
+ %span= t 'user_mailer.welcome.tip_federated_timeline'
diff --git a/app/views/user_mailer/welcome.text.erb b/app/views/user_mailer/welcome.text.erb
new file mode 100644
index 000000000..5bd0cab2a
--- /dev/null
+++ b/app/views/user_mailer/welcome.text.erb
@@ -0,0 +1,30 @@
+<%= t 'user_mailer.welcome.title', name: @resource.account.username %> <%= t 'user_mailer.welcome.explanation' %>
+
+===
+
+<%= t 'user_mailer.welcome.full_handle' %> (<%= "@#{@resource.account.username}@#{@instance}" %>)
+<%= t 'user_mailer.welcome.full_handle_hint', instance: @instance %>
+
+---
+
+<%= t 'user_mailer.welcome.edit_profile_step' %>
+
+=> <%= settings_profile_url %>
+
+<%= t 'user_mailer.welcome.review_preferences_step' %>
+
+=> <%= settings_preferences_url %>
+
+<%= t 'user_mailer.welcome.final_step' %>
+
+=> <%= web_url %>
+
+---
+
+<%= t 'user_mailer.welcome.tips' %>
+
+* <%= t 'user_mailer.welcome.tip_mobile_webapp' %>
+* <%= strip_tags(t('user_mailer.welcome.tip_bridge_html')) %> (https://bridge.joinmastodon.org)
+* <%= t 'user_mailer.welcome.tip_following' %>
+* <%= t 'user_mailer.welcome.tip_local_timeline', instance: @instance %>
+* <%= t 'user_mailer.welcome.tip_federated_timeline' %>
diff --git a/app/workers/activitypub/delivery_worker.rb b/app/workers/activitypub/delivery_worker.rb
index ae86e3dd2..4763856ac 100644
--- a/app/workers/activitypub/delivery_worker.rb
+++ b/app/workers/activitypub/delivery_worker.rb
@@ -3,7 +3,7 @@
class ActivityPub::DeliveryWorker
include Sidekiq::Worker
- sidekiq_options queue: 'push', retry: 8, dead: false
+ sidekiq_options queue: 'push', retry: 16, dead: false
HEADERS = { 'Content-Type' => 'application/activity+json' }.freeze
diff --git a/config/application.rb b/config/application.rb
index c1bf3cef2..ef97dbc06 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -19,6 +19,9 @@ require_relative '../lib/mastodon/redis_config'
module Mastodon
class Application < Rails::Application
+ # Initialize configuration defaults for originally generated Rails version.
+ config.load_defaults 5.1
+
# Settings in config/environments/* take precedence over those specified here.
# Application configuration should go into files in config/initializers
# -- all .rb files in that directory are automatically loaded.
diff --git a/config/locales/ar.yml b/config/locales/ar.yml
index 82e8e998a..eadeaef3e 100644
--- a/config/locales/ar.yml
+++ b/config/locales/ar.yml
@@ -140,7 +140,6 @@ ar:
application_mailer:
salutation: "%{name}،"
settings: 'تغيير تفضيلات البريد الإلكتروني : %{link}'
- signature: إشعارات ماستدون من %{instance}
view: 'View:'
applications:
created: تم إنشاء التطبيق بنجاح
diff --git a/config/locales/bg.yml b/config/locales/bg.yml
index 13d0394a3..56a904895 100644
--- a/config/locales/bg.yml
+++ b/config/locales/bg.yml
@@ -26,7 +26,6 @@ bg:
unfollow: Не следвай
application_mailer:
settings: 'Промяна на предпочитанията за e-mail: %{link}'
- signature: Mastodon известия от %{instance}
view: 'Преглед:'
applications:
invalid_url: Предоставеният URL е невалиден
diff --git a/config/locales/ca.yml b/config/locales/ca.yml
index 5e30abaf5..1092da38d 100644
--- a/config/locales/ca.yml
+++ b/config/locales/ca.yml
@@ -340,7 +340,6 @@ ca:
application_mailer:
salutation: "%{name},"
settings: 'Canvia les preferències de correu: %{link}'
- signature: Notificacions de Mastodon des de %{instance}
view: 'Vista:'
applications:
created: L'aplicació s'ha creat correctament
diff --git a/config/locales/de.yml b/config/locales/de.yml
index 39867e373..7d0cf6349 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -321,7 +321,6 @@ de:
application_mailer:
salutation: "%{name},"
settings: 'E-Mail-Einstellungen ändern: %{link}'
- signature: Mastodon-Benachrichtigungen von %{instance}
view: 'Ansehen:'
applications:
created: Anwendung erstellt
diff --git a/config/locales/devise.zh-CN.yml b/config/locales/devise.zh-CN.yml
index dd6b48795..4ee021fcc 100644
--- a/config/locales/devise.zh-CN.yml
+++ b/config/locales/devise.zh-CN.yml
@@ -18,7 +18,7 @@ zh-CN:
mailer:
confirmation_instructions:
action: 验证电子邮件地址
- explanation: 你在 %{host} 上使用这个电子邮件地址创建了一个帐户。只需点击下面的按钮，即可完成激活。如果你并没有创建过帐户，请忽略此邮件。
+ explanation: 你在 %{host} 上使用这个电子邮件地址创建了一个帐户。只需点击下面的链接，即可完成激活。如果你并没有创建过帐户，请忽略此邮件。
extra_html: 请记得阅读
本实例的相关规定和
我们的使用条款。
subject: Mastodon：确认 %{instance} 帐户信息
title: 验证电子邮件地址
@@ -33,13 +33,13 @@ zh-CN:
subject: Mastodon：密码已被更改
title: 密码已被重置
reconfirmation_instructions:
- explanation: 请确认你的新电子邮件地址以完成更改。
+ explanation: 点击下面的链接来确认你的新电子邮件地址。
extra: 如果你并没有请求本次变更，请忽略此邮件。Mastodon 帐户的电子邮件地址只有在你点击上面的链接后才会更改。
subject: Mastodon：确认 %{instance} 电子邮件地址
title: 验证电子邮件地址
reset_password_instructions:
action: 更改密码
- explanation: 你正在请求更改帐户的密码。
+ explanation: 点击下面的链接来更改帐户的密码。
extra: 如果你并没有请求本次变更，请忽略此邮件。你的密码只有在你点击上面的链接并输入新密码后才会更改。
subject: Mastodon：重置密码信息
title: 重置密码
diff --git a/config/locales/en.yml b/config/locales/en.yml
index bc1e98c56..7c3cd922b 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -341,7 +341,6 @@ en:
notification_preferences: Change e-mail preferences
salutation: "%{name},"
settings: 'Change e-mail preferences: %{link}'
- signature: Mastodon notifications from %{instance}
view: 'View:'
view_profile: View Profile
view_status: View status
@@ -734,6 +733,25 @@ en:
recovery_instructions_html: If you ever lose access to your phone, you can use one of the recovery codes below to regain access to your account.
Keep the recovery codes safe. For example, you may print them and store them with other important documents.
setup: Set up
wrong_code: The entered code was invalid! Are server time and device time correct?
+ user_mailer:
+ welcome:
+ edit_profile_action: Setup profile
+ edit_profile_step: You can customize your profile by uploading an avatar, header, changing your display name and more. If you’d like to review new followers before they’re allowed to follow you, you can lock your account.
+ explanation: Here are some tips to get you started
+ final_action: Start posting
+ final_step: 'Start posting! Even without followers your public messages may be seen by others, for example on the local timeline and in hashtags. You may want to introduce yourself on the #introductions hashtag.'
+ full_handle: Your full handle
+ full_handle_hint: This is what you would tell your friends so they can message or follow you from another instance.
+ review_preferences_action: Change preferences
+ review_preferences_step: Make sure to set your preferences, such as which emails you'd like to receive, or what privacy level you’d like your posts to default to. If you don’t have motion sickness, you could choose to enable GIF autoplay.
+ subject: Welcome to Mastodon
+ tip_bridge_html: If you are coming from Twitter, you can find your friends on Mastodon by using the
bridge app. It only works if they also used the bridge app though!
+ tip_federated_timeline: The federated timeline is a firehose view of the Mastodon network. But it only includes people your neighbours are subscribed to, so it's not complete.
+ tip_following: You follow your server's admin(s) by default. To find more interesting people, check the local and federated timelines.
+ tip_local_timeline: The local timeline is a firehose view of people on %{instance}. These are your immediate neighbours!
+ tip_mobile_webapp: If your mobile browser offers you to add Mastodon to your homescreen, you can receive push notifications. It acts like a native app in many ways!
+ tips: Tips
+ title: Welcome aboard, %{name}!
users:
invalid_email: The e-mail address is invalid
invalid_otp_token: Invalid two-factor code
diff --git a/config/locales/eo.yml b/config/locales/eo.yml
index 847299ac7..bc259957d 100644
--- a/config/locales/eo.yml
+++ b/config/locales/eo.yml
@@ -237,7 +237,6 @@ eo:
subject: Nova raporto por %{instance} (#%{id})
application_mailer:
settings: 'Ŝanĝi la retpoŝt-mesaĝajn preferojn: %{link}'
- signature: Sciigoj de Mastodon el %{instance}
view: 'Vidi:'
applications:
created: Aplikaĵo sukcesa kreis
diff --git a/config/locales/es.yml b/config/locales/es.yml
index d9084787d..7ee2876a9 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -332,7 +332,6 @@ es:
application_mailer:
salutation: "%{name},"
settings: 'Cambiar preferencias de correo: %{link}'
- signature: Notificaciones de Mastodon desde %{instance}
view: 'Vista:'
applications:
created: Aplicación creada exitosamente
diff --git a/config/locales/fa.yml b/config/locales/fa.yml
index 94d4e7594..c498c592c 100644
--- a/config/locales/fa.yml
+++ b/config/locales/fa.yml
@@ -334,7 +334,6 @@ fa:
application_mailer:
salutation: "%{name}،"
settings: 'تغییر تنظیمات ایمیل: %{link}'
- signature: اعلانهای ماستدون از %{instance}
view: 'نمایش:'
applications:
created: برنامه با موفقیت ساخته شد
diff --git a/config/locales/fi.yml b/config/locales/fi.yml
index 2da8427b8..f2ee28ba0 100644
--- a/config/locales/fi.yml
+++ b/config/locales/fi.yml
@@ -25,7 +25,6 @@ fi:
unfollow: Lopeta seuraaminen
application_mailer:
settings: 'Muokkaa sähköpostiasetuksia: %{link}'
- signature: Mastodon-ilmoituksia palvelimelta %{instance}
view: 'Katso:'
applications:
invalid_url: Annettu URL on väärä
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index adcb11f18..09338fdfd 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -334,7 +334,6 @@ fr:
application_mailer:
salutation: "%{name},"
settings: 'Changer les préférences courriel : %{link}'
- signature: Notifications de Mastodon depuis %{instance}
view: 'Voir :'
applications:
created: Application créée avec succès
diff --git a/config/locales/gl.yml b/config/locales/gl.yml
index 55f717249..100e2954c 100644
--- a/config/locales/gl.yml
+++ b/config/locales/gl.yml
@@ -340,7 +340,6 @@ gl:
application_mailer:
salutation: "%{name},"
settings: 'Mudar as preferencias de e-mail: %{link}'
- signature: Notificacións Mastodon de %{instance}
view: 'Vista:'
applications:
created: Creouse con éxito este aplicativo
diff --git a/config/locales/he.yml b/config/locales/he.yml
index 4b977ce1b..1f27dda7a 100644
--- a/config/locales/he.yml
+++ b/config/locales/he.yml
@@ -229,7 +229,6 @@ he:
title: ניהול
application_mailer:
settings: 'שינוי הגדרות דוא"ל: %{link}'
- signature: התראות מסטודון מקהילת %{instance}
view: 'תצוגה:'
applications:
invalid_url: כתובת הקישורית אינה חוקית
diff --git a/config/locales/hr.yml b/config/locales/hr.yml
index 581912420..a3c9aa436 100644
--- a/config/locales/hr.yml
+++ b/config/locales/hr.yml
@@ -26,7 +26,6 @@ hr:
unfollow: Prestani slijediti
application_mailer:
settings: 'Promijeni e-mail postavke: %{link}'
- signature: Mastodon notifikacije sa %{instance}
view: 'Vidi:'
applications:
invalid_url: Uneseni link nije valjan
diff --git a/config/locales/hu.yml b/config/locales/hu.yml
index 77551223f..586503a35 100644
--- a/config/locales/hu.yml
+++ b/config/locales/hu.yml
@@ -12,8 +12,6 @@ hu:
people_who_follow: "%{name} követői"
posts: Bejegyzések
unfollow: Követés abbahagyása
- application_mailer:
- signature: "%{instance} Mastodon értesítései"
auth:
change_password: Jelszó változtatása
didnt_get_confirmation: Nem kaptad meg a megerősítési lépéseket?
diff --git a/config/locales/id.yml b/config/locales/id.yml
index f3a6649d1..6e4d60fd8 100644
--- a/config/locales/id.yml
+++ b/config/locales/id.yml
@@ -151,7 +151,6 @@ id:
title: Administrasi
application_mailer:
settings: 'Ubah pilihan email: %{link}'
- signature: Notifikasi Mastodon dari %{instance}
view: 'Tampilan:'
applications:
invalid_url: URL tidak sesuai
diff --git a/config/locales/io.yml b/config/locales/io.yml
index 4114e5231..db8214768 100644
--- a/config/locales/io.yml
+++ b/config/locales/io.yml
@@ -149,7 +149,6 @@ io:
title: Administration
application_mailer:
settings: 'Chanjar la retpost-mesajala preferi: %{link}'
- signature: Savigi di Mastodon de %{instance}
view: 'Vidar:'
applications:
invalid_url: La URL donita ne esas valida
diff --git a/config/locales/it.yml b/config/locales/it.yml
index ec0209bc1..6ab57d2fc 100644
--- a/config/locales/it.yml
+++ b/config/locales/it.yml
@@ -26,7 +26,6 @@ it:
unfollow: Non seguire più
application_mailer:
settings: 'Cambia le impostazioni per le e-mail: %{link}'
- signature: Notifiche Mastodon da %{instance}
view: 'Guarda:'
applications:
invalid_url: L'URL fornito non è valido
diff --git a/config/locales/ja.yml b/config/locales/ja.yml
index 8b7b678c6..141b5141a 100644
--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@@ -341,7 +341,6 @@ ja:
notification_preferences: メール設定の変更
salutation: "%{name} さん"
settings: 'メール設定の変更: %{link}'
- signature: Mastodon %{instance} インスタンスからの通知
view: 'リンク:'
view_profile: プロフィールを表示
view_status: トゥートを表示
diff --git a/config/locales/ko.yml b/config/locales/ko.yml
index 997dc4856..b254636f3 100644
--- a/config/locales/ko.yml
+++ b/config/locales/ko.yml
@@ -340,7 +340,6 @@ ko:
application_mailer:
notification_preferences: 메일 설정 변경
settings: '메일 설정을 변경: %{link}'
- signature: Mastodon %{instance} 인스턴스로에서 알림
view: 'View:'
view_profile: 프로필 보기
view_status: 게시물 보기
diff --git a/config/locales/nl.yml b/config/locales/nl.yml
index 600d5225d..973dc65d1 100644
--- a/config/locales/nl.yml
+++ b/config/locales/nl.yml
@@ -340,7 +340,6 @@ nl:
application_mailer:
salutation: "%{name},"
settings: 'E-mailvoorkeuren wijzigen: %{link}'
- signature: Mastodon-meldingen van %{instance}
view: 'Bekijk:'
applications:
created: Aanmaken toepassing geslaagd
diff --git a/config/locales/no.yml b/config/locales/no.yml
index 57f8547fc..3b212932e 100644
--- a/config/locales/no.yml
+++ b/config/locales/no.yml
@@ -163,7 +163,6 @@
title: Administrasjon
application_mailer:
settings: 'Endre foretrukne e-postinnstillinger: %{link}'
- signature: Mastodon-notiser fra %{instance}
view: 'Se:'
applications:
invalid_url: Den oppgitte URLen er ugyldig
diff --git a/config/locales/oc.yml b/config/locales/oc.yml
index 40387de70..beb5d1f87 100644
--- a/config/locales/oc.yml
+++ b/config/locales/oc.yml
@@ -340,7 +340,6 @@ oc:
application_mailer:
salutation: "%{name},"
settings: 'Cambiar las preferéncias de corrièl : %{link}'
- signature: Notificacion de Mastodon sus %{instance}
view: 'Veire :'
applications:
created: Aplicacion ben creada
diff --git a/config/locales/pl.yml b/config/locales/pl.yml
index efb955b37..949099a71 100644
--- a/config/locales/pl.yml
+++ b/config/locales/pl.yml
@@ -342,7 +342,6 @@ pl:
notification_preferences: Zmień ustawienia e-maili
salutation: "%{name},"
settings: 'Zmień ustawienia powiadamiania: %{link}'
- signature: Powiadomienie Mastodona z instancji %{instance}
view: 'Zobacz:'
view_status: Wyświetl wpis
applications:
@@ -740,6 +739,25 @@ pl:
recovery_instructions_html: Jeżeli kiedykolwiek utracisz dostęp do telefonu, możesz wykorzystać jeden z kodów zapasowych, aby odzyskać dostęp do konta.
Trzymaj je w bezpiecznym miejscu. Na przykład, wydrukuj je i przechowuj z ważnymi dokumentami.
setup: Skonfiguruj
wrong_code: Wprowadzony kod jest niepoprawny! Czy czas serwera i urządzenia jest poprawny?
+ user_mailer:
+ welcome:
+ edit_profile_action: Skonfiguruj profil
+ edit_profile_step: Możesz dostować profil wysyłając awatar, obraz nagłówka, zmieniając wyświetlaną nazwę i wiele więcej. Jeżeli chcesz, możesz zablokować konto, aby kontrolować, kto może Cię śledzić.
+ explanation: Kilka wskazówek, które pomogą Ci rozpocząć
+ final_action: Zacznij pisać
+ final_step: 'Zacznij tworzyć! Nawet jeżeli nikt Cię nie śledzi, Twoje publiczne wiadomości będą widziane przez innych, na przykład na lokalnej osi czasu i w hashtagach. Możesz też utworzyć wpis wprowadzający używając hashtagu #introductions.'
+ full_handle: Twój pełny adres
+ full_handle_hint: Ten adres możesz podać znajomym, aby mogli skontaktować się z Tobą lub zacząć śledzić z innej instancji.
+ review_preferences_action: Zmień ustawienia
+ review_preferences_step: Upewnij się, że zmieniłeś ustawienia, takie jak maile, które chciałbyś otrzymywać lub domyślne opcje prywatności. Jeżeli nie masz choroby lokomocyjnej, możesz włączyć automatyczne odtwarzanie animacji GIF.
+ subject: Witaj w Mastodonie
+ tip_bridge_html: Jeżeli przybywasz z Twittera, możesz znaleźć znajomych na Mastodonie używając
aplikacji mostku. Działa to tylko, jeżeli oni również z niej korzystali!
+ tip_federated_timeline: Oś czasu federacji przedstawia całą sieć Mastodona. Wyświetla tylko wpisy osób, które śledzą użytkownicy Twojej instancji, więc nie jest kompletna.
+ tip_following: Domyślnie śledzisz administratora/ów swojej instancji. Aby znaleźć więcej ciekawych ludzi, zajrzyj na lokalną i federalną oś czasu.
+ tip_local_timeline: Lokalna oś czasu przedstawia osoby z %{instance}. To Twoi najbliżsi sąsiedzi!
+ tip_mobile_webapp: Jeżeli Twoja przeglądarka pozwala na dodanie Mastodona na ekran główny, będziesz otrzymywać natychmiastowe powiadomienia. Działa to prawie jak natywna aplikacja!
+ tips: Wskazówki
+ title: Witaj na pokładzie, %{name}!
users:
invalid_email: Adres e-mail jest niepoprawny
invalid_otp_token: Kod uwierzytelniający jest niepoprawny
diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml
index 39683bd88..c2830b754 100644
--- a/config/locales/pt-BR.yml
+++ b/config/locales/pt-BR.yml
@@ -340,7 +340,6 @@ pt-BR:
application_mailer:
salutation: "%{name},"
settings: 'Mudar e-mail de preferência: %{link}'
- signature: Notificações do Mastodon de %{instance}
view: 'Visualizar:'
applications:
created: Aplicação criada com sucesso
diff --git a/config/locales/pt.yml b/config/locales/pt.yml
index c0056af4f..618373b91 100644
--- a/config/locales/pt.yml
+++ b/config/locales/pt.yml
@@ -328,7 +328,6 @@ pt:
application_mailer:
salutation: "%{name},"
settings: 'Alterar preferências de email: %{link}'
- signature: notificações Mastodon do %{instance}
view: 'Ver:'
applications:
created: Aplicação criada com sucesso
diff --git a/config/locales/ru.yml b/config/locales/ru.yml
index 6e63aadda..842fd7d54 100644
--- a/config/locales/ru.yml
+++ b/config/locales/ru.yml
@@ -342,7 +342,6 @@ ru:
notification_preferences: Изменить настройки e-mail
salutation: "%{name},"
settings: 'Изменить настройки e-mail: %{link}'
- signature: Уведомления Mastodon от %{instance}
view: 'Просмотр:'
view_status: Просмотреть статус
applications:
diff --git a/config/locales/sr-Latn.yml b/config/locales/sr-Latn.yml
index 964a82d64..ac80e81ec 100644
--- a/config/locales/sr-Latn.yml
+++ b/config/locales/sr-Latn.yml
@@ -336,7 +336,6 @@ sr-Latn:
application_mailer:
salutation: "%{name},"
settings: 'Promeni podešavanja e-pošte: %{link}'
- signature: Mastodont obaveštenje sa instance %{instance}
view: 'Pogledaj:'
applications:
created: Aplikacija uspešno napravljena
diff --git a/config/locales/sr.yml b/config/locales/sr.yml
index 57ccf2008..755396828 100644
--- a/config/locales/sr.yml
+++ b/config/locales/sr.yml
@@ -336,7 +336,6 @@ sr:
application_mailer:
salutation: "%{name},"
settings: 'Промени подешавања е-поште: %{link}'
- signature: Мастодонт обавештење са инстанце %{instance}
view: 'Погледај:'
applications:
created: Апликација успешно направљена
diff --git a/config/locales/sv.yml b/config/locales/sv.yml
index ebb6d6595..b6595cb0d 100644
--- a/config/locales/sv.yml
+++ b/config/locales/sv.yml
@@ -272,7 +272,6 @@ sv:
application_mailer:
salutation: "%{name},"
settings: 'Change e-mail preferences: %{link}'
- signature: Mastodon meddelande från %{instance}
view: 'Granska:'
applications:
created: Ansökan är framgångsrikt skapad
diff --git a/config/locales/th.yml b/config/locales/th.yml
index 2db3aee8a..737b3aa95 100644
--- a/config/locales/th.yml
+++ b/config/locales/th.yml
@@ -153,7 +153,6 @@ th:
title: แอดมิน
application_mailer:
settings: 'เปลี่ยนอีเมล์ preferences: %{link}'
- signature: ฟอร์มการแจ้งเตือนแมสโทดอน %{instance}
view: 'วิว:'
applications:
invalid_url: URL ที่ระบุไม่ถูกตั้ง
diff --git a/config/locales/tr.yml b/config/locales/tr.yml
index 6aff78fa1..23b4d7a24 100644
--- a/config/locales/tr.yml
+++ b/config/locales/tr.yml
@@ -152,7 +152,6 @@ tr:
title: Yönetim
application_mailer:
settings: 'E-mail tercihlerini değiştir: %{link}'
- signature: "%{instance} sunucusundan Mastodon bildirimleri"
view: 'Görüntüle:'
applications:
invalid_url: Verilen URL geçerli değil
diff --git a/config/locales/uk.yml b/config/locales/uk.yml
index 995a682a7..0ddfa9190 100644
--- a/config/locales/uk.yml
+++ b/config/locales/uk.yml
@@ -143,7 +143,6 @@ uk:
title: Адміністрування
application_mailer:
settings: 'Змінити налаштування email: %{link}'
- signature: Сповіщення Mastodon від %{instance}
view: 'Перегляд:'
applications:
invalid_url: Введена URL неправильна
diff --git a/config/locales/zh-CN.yml b/config/locales/zh-CN.yml
index 14382331b..7deb241a1 100644
--- a/config/locales/zh-CN.yml
+++ b/config/locales/zh-CN.yml
@@ -339,7 +339,6 @@ zh-CN:
notification_preferences: 更改电子邮件首选项
salutation: "%{name}："
settings: 使用此链接更改你的电子邮件首选项：%{link}
- signature: 这是一封来自 %{instance} 的 Mastodon 电子邮件通知。
view: 点此链接查看详情：
view_profile: 查看个人资料页
view_status: 查看嘟文
@@ -592,7 +591,7 @@ zh-CN:
back: 回到 Mastodon
delete: 删除帐户
development: 开发
- edit_profile: 更改个人信息
+ edit_profile: 更改个人资料
export: 导出
followers: 已授权的关注者
import: 导入
@@ -713,6 +712,25 @@ zh-CN:
recovery_instructions_html: 如果你的手机无法使用，你可以使用下列任意一个恢复代码来重新获得对帐户的访问权。
请妥善保管好你的恢复代码（例如，你可以将它们打印出来，然后和其他重要的文件放在一起）。
setup: 设置
wrong_code: 输入的认证码无效！请核对一下你的设备显示的时间，如果正确，你可能需要联系一下实例的管理员，让他们校准服务器的时间。
+ user_mailer:
+ welcome:
+ edit_profile_action: 设置个人资料
+ edit_profile_step: 你可以自定义你的个人资料，包括上传头像、横幅图片、更改昵称等等。如果你想在新的关注者关注你之前对他们进行审核，你也可以选择为你的帐户开启保护。
+ explanation: 下面是几个小贴士，希望它们能帮到你
+ final_action: 开始嘟嘟
+ final_step: '开始嘟嘟吧！即便你现在没有关注者，其他人仍然能在本站时间轴或者话题标签等地方看到你的公开嘟文。试着用 #introductions 这个话题标签介绍一下自己吧。'
+ full_handle: 你的完整用户地址
+ full_handle_hint: 你需要把这个告诉你的朋友们，这样他们就能从另一个实例向你发送信息或者关注你。
+ review_preferences_action: 更改首选项
+ review_preferences_step: 记得调整你的偏好设置，比如你想接收什么类型的邮件，或者你想把你的嘟文可见范围默认设置为什么级别。如果你没有晕动病的话，考虑一下启用“自动播放 GIF 动画”这个选项吧。
+ subject: 欢迎来到 Mastodon
+ tip_bridge_html: 如果你刚从 Twitter 来到这里，你可以在
桥梁站（bridge app）上寻找你的朋友。当然，前提是他们也登录了桥梁站！
+ tip_federated_timeline: 跨站公共时间轴可以让你一窥更广阔的 Mastodon 网络。不过，由于它只显示你的邻居们所订阅的内容，所以并不是全部。
+ tip_following: 默认情况下，你会自动关注你所在实例的管理员。想结交更多有趣的人的话，记得多逛逛本站时间轴和跨站公共时间轴哦。
+ tip_local_timeline: 本站时间轴可以让你一窥 %{instance} 上的用户。他们就是离你最近的邻居！
+ tip_mobile_webapp: 如果你的移动设备浏览器允许你将 Mastodon 添加到主屏幕，你就能够接收推送消息。它就像本地应用一样好使！
+ tips: 小贴士
+ title: "%{name}，欢迎你的加入！"
users:
invalid_email: 输入的电子邮件地址无效
invalid_otp_token: 输入的双重认证代码无效
diff --git a/config/locales/zh-HK.yml b/config/locales/zh-HK.yml
index 8ff6d1bf8..ed73b7244 100644
--- a/config/locales/zh-HK.yml
+++ b/config/locales/zh-HK.yml
@@ -152,7 +152,6 @@ zh-HK:
title: 管理
application_mailer:
settings: 修改電郵設定︰%{link}
- signature: 來自 %{instance} 的 Mastodon 通知
view: 進入瀏覽︰
applications:
invalid_url: 所提供的網址不正確
diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml
index e73dbf9cc..bd9f85840 100644
--- a/config/locales/zh-TW.yml
+++ b/config/locales/zh-TW.yml
@@ -123,7 +123,6 @@ zh-TW:
title: 管理介面
application_mailer:
settings: 修改信箱設定︰ %{link}
- signature: 來自 %{instance} 的 Mastodon 通知
view: 進入瀏覽︰
applications:
invalid_url: 網址不正確
diff --git a/config/webpack/configuration.js b/config/webpack/configuration.js
index a38d9d11d..f6b4d4c61 100644
--- a/config/webpack/configuration.js
+++ b/config/webpack/configuration.js
@@ -73,7 +73,7 @@ function formatPublicPath(host = '', path = '') {
const output = {
path: resolve('public', settings.public_output_path),
- publicPath: formatPublicPath(env.ASSET_HOST, settings.public_output_path),
+ publicPath: formatPublicPath(env.ASSET_HOST || env.LOCAL_DOMAIN, settings.public_output_path),
};
module.exports = {
diff --git a/lib/mastodon/premailer_webpack_strategy.rb b/lib/mastodon/premailer_webpack_strategy.rb
index 4ea3ce80c..84d83cc66 100644
--- a/lib/mastodon/premailer_webpack_strategy.rb
+++ b/lib/mastodon/premailer_webpack_strategy.rb
@@ -2,6 +2,9 @@
module PremailerWebpackStrategy
def load(url)
+ public_path_host = ENV['ASSET_HOST'] || ENV['LOCAL_DOMAIN']
+ url = url.gsub(/\A\/\/#{public_path_host}/, '')
+
if Webpacker.dev_server.running?
url = File.join("#{Webpacker.dev_server.protocol}://#{Webpacker.dev_server.host_with_port}", url)
HTTP.get(url).to_s
diff --git a/lib/mastodon/version.rb b/lib/mastodon/version.rb
index 5936b5fcf..098ab46ac 100644
--- a/lib/mastodon/version.rb
+++ b/lib/mastodon/version.rb
@@ -9,11 +9,11 @@ module Mastodon
end
def minor
- 1
+ 2
end
def patch
- 3
+ 0
end
def pre
@@ -21,7 +21,7 @@ module Mastodon
end
def flags
- ''
+ 'rc1'
end
def to_a
diff --git a/lib/tasks/mastodon.rake b/lib/tasks/mastodon.rake
index 38dbed982..486c035de 100644
--- a/lib/tasks/mastodon.rake
+++ b/lib/tasks/mastodon.rake
@@ -341,6 +341,15 @@ namespace :mastodon do
LinkCrawlWorker.push_bulk status_ids
end
+ desc 'Remove all home feed regeneration markers'
+ task remove_regeneration_markers: :environment do
+ keys = Redis.current.keys('account:*:regeneration')
+
+ Redis.current.pipelined do
+ keys.each { |key| Redis.current.del(key) }
+ end
+ end
+
desc 'Check every known remote account and delete those that no longer exist in origin'
task purge_removed_accounts: :environment do
prepare_for_options!
diff --git a/spec/controllers/concerns/user_tracking_concern_spec.rb b/spec/controllers/concerns/user_tracking_concern_spec.rb
index d08095ef8..1e5620221 100644
--- a/spec/controllers/concerns/user_tracking_concern_spec.rb
+++ b/spec/controllers/concerns/user_tracking_concern_spec.rb
@@ -69,6 +69,12 @@ describe ApplicationController, type: :controller do
expect(RegenerationWorker).to have_received(:perform_async)
end
+ it 'sets the regeneration marker to expire' do
+ allow(RegenerationWorker).to receive(:perform_async)
+ get :show
+ expect(Redis.current.ttl("account:#{user.account_id}:regeneration")).to be >= 0
+ end
+
it 'regenerates feed when sign in is older than two weeks' do
get :show
diff --git a/spec/mailers/previews/user_mailer_preview.rb b/spec/mailers/previews/user_mailer_preview.rb
index 6ed0090f4..8d2a9368d 100644
--- a/spec/mailers/previews/user_mailer_preview.rb
+++ b/spec/mailers/previews/user_mailer_preview.rb
@@ -29,4 +29,9 @@ class UserMailerPreview < ActionMailer::Preview
def reset_password_instructions
UserMailer.reset_password_instructions(User.first, 'spec')
end
+
+ # Preview this email at http://localhost:3000/rails/mailers/user_mailer/welcome
+ def welcome
+ UserMailer.welcome(User.first)
+ end
end
diff --git a/spec/mailers/user_mailer_spec.rb b/spec/mailers/user_mailer_spec.rb
index 9f17993e0..6b430b505 100644
--- a/spec/mailers/user_mailer_spec.rb
+++ b/spec/mailers/user_mailer_spec.rb
@@ -23,7 +23,7 @@ describe UserMailer, type: :mailer do
it 'renders confirmation instructions' do
receiver.update!(locale: nil)
- expect(mail.body.encoded).to include receiver.email
+ expect(mail.body.encoded).to include I18n.t('devise.mailer.confirmation_instructions.title')
expect(mail.body.encoded).to include 'spec'
expect(mail.body.encoded).to include Rails.configuration.x.local_domain
end
@@ -38,7 +38,7 @@ describe UserMailer, type: :mailer do
it 'renders reconfirmation instructions' do
receiver.update!(email: 'new-email@example.com', locale: nil)
- expect(mail.body.encoded).to include 'new-email@example.com'
+ expect(mail.body.encoded).to include I18n.t('devise.mailer.reconfirmation_instructions.title')
expect(mail.body.encoded).to include 'spec'
expect(mail.body.encoded).to include Rails.configuration.x.local_domain
expect(mail.subject).to eq I18n.t('devise.mailer.reconfirmation_instructions.subject',
@@ -52,7 +52,7 @@ describe UserMailer, type: :mailer do
it 'renders reset password instructions' do
receiver.update!(locale: nil)
- expect(mail.body.encoded).to include receiver.email
+ expect(mail.body.encoded).to include I18n.t('devise.mailer.reset_password_instructions.title')
expect(mail.body.encoded).to include 'spec'
end
@@ -65,7 +65,7 @@ describe UserMailer, type: :mailer do
it 'renders password change notification' do
receiver.update!(locale: nil)
- expect(mail.body.encoded).to include receiver.email
+ expect(mail.body.encoded).to include I18n.t('devise.mailer.password_change.title')
end
include_examples 'localized subject',
@@ -77,7 +77,7 @@ describe UserMailer, type: :mailer do
it 'renders email change notification' do
receiver.update!(locale: nil)
- expect(mail.body.encoded).to include receiver.email
+ expect(mail.body.encoded).to include I18n.t('devise.mailer.email_changed.title')
end
include_examples 'localized subject',