diff --git a/app/helpers/instance_helper.rb b/app/helpers/instance_helper.rb index 70027cca918..22a19c52b57 100644 --- a/app/helpers/instance_helper.rb +++ b/app/helpers/instance_helper.rb @@ -6,6 +6,6 @@ module InstanceHelper end def site_hostname - Rails.configuration.x.local_domain + @site_hostname ||= Addressable::URI.parse("//#{Rails.configuration.x.local_domain}").display_uri.host end end diff --git a/app/javascript/images/elephant_ui_greeting.svg b/app/javascript/images/elephant_ui_greeting.svg new file mode 100644 index 00000000000..f3eb4b142a1 --- /dev/null +++ b/app/javascript/images/elephant_ui_greeting.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/app/javascript/images/mailer/icon_cached.png b/app/javascript/images/mailer/icon_cached.png new file mode 100644 index 00000000000..e62c064c837 Binary files /dev/null and b/app/javascript/images/mailer/icon_cached.png differ diff --git a/app/javascript/images/mailer/icon_done.png b/app/javascript/images/mailer/icon_done.png new file mode 100644 index 00000000000..0d2ef0cb87e Binary files /dev/null and b/app/javascript/images/mailer/icon_done.png differ diff --git a/app/javascript/images/mailer/icon_email.png b/app/javascript/images/mailer/icon_email.png new file mode 100644 index 00000000000..aae9d2bb9fd Binary files /dev/null and b/app/javascript/images/mailer/icon_email.png differ diff --git a/app/javascript/images/mailer/icon_grade.png b/app/javascript/images/mailer/icon_grade.png new file mode 100644 index 00000000000..895b57d0a47 Binary files /dev/null and b/app/javascript/images/mailer/icon_grade.png differ diff --git a/app/javascript/images/mailer/icon_lock_open.png b/app/javascript/images/mailer/icon_lock_open.png new file mode 100644 index 00000000000..9f62eadc2fa Binary files /dev/null and b/app/javascript/images/mailer/icon_lock_open.png differ diff --git a/app/javascript/images/mailer/icon_person_add.png b/app/javascript/images/mailer/icon_person_add.png new file mode 100644 index 00000000000..3453060aec2 Binary files /dev/null and b/app/javascript/images/mailer/icon_person_add.png differ diff --git a/app/javascript/images/mailer/icon_reply.png b/app/javascript/images/mailer/icon_reply.png new file mode 100644 index 00000000000..8bce4955c98 Binary files /dev/null and b/app/javascript/images/mailer/icon_reply.png differ diff --git a/app/javascript/images/mailer/logo_full.png b/app/javascript/images/mailer/logo_full.png new file mode 100644 index 00000000000..1c4f3328720 Binary files /dev/null and b/app/javascript/images/mailer/logo_full.png differ diff --git a/app/javascript/images/mailer/logo_transparent.png b/app/javascript/images/mailer/logo_transparent.png new file mode 100644 index 00000000000..8fda4f67f66 Binary files /dev/null and b/app/javascript/images/mailer/logo_transparent.png differ diff --git a/app/javascript/mastodon/actions/onboarding.js b/app/javascript/mastodon/actions/onboarding.js new file mode 100644 index 00000000000..a161c50efed --- /dev/null +++ b/app/javascript/mastodon/actions/onboarding.js @@ -0,0 +1,14 @@ +import { openModal } from './modal'; +import { changeSetting, saveSettings } from './settings'; + +export function showOnboardingOnce() { + return (dispatch, getState) => { + const alreadySeen = getState().getIn(['settings', 'onboarded']); + + if (!alreadySeen) { + dispatch(openModal('ONBOARDING')); + dispatch(changeSetting(['onboarded'], true)); + dispatch(saveSettings()); + } + }; +}; diff --git a/app/javascript/mastodon/containers/mastodon.js b/app/javascript/mastodon/containers/mastodon.js index 8ae3b727af9..d1710445b53 100644 --- a/app/javascript/mastodon/containers/mastodon.js +++ b/app/javascript/mastodon/containers/mastodon.js @@ -2,6 +2,7 @@ import React from 'react'; import { Provider } from 'react-redux'; import PropTypes from 'prop-types'; import configureStore from '../store/configureStore'; +import { showOnboardingOnce } from '../actions/onboarding'; import { BrowserRouter, Route } from 'react-router-dom'; import { ScrollContext } from 'react-router-scroll-4'; import UI from '../features/ui'; @@ -39,6 +40,8 @@ export default class Mastodon extends React.PureComponent { const handlerUrl = window.location.protocol + '//' + window.location.host + '/intent?uri=%s'; window.setTimeout(() => navigator.registerProtocolHandler('web+mastodon', handlerUrl, 'Mastodon'), 5 * 60 * 1000); } + + store.dispatch(showOnboardingOnce()); } componentWillUnmount () { diff --git a/app/javascript/mastodon/features/ui/components/modal_root.js b/app/javascript/mastodon/features/ui/components/modal_root.js index dbfb46ee747..5839ba40a64 100644 --- a/app/javascript/mastodon/features/ui/components/modal_root.js +++ b/app/javascript/mastodon/features/ui/components/modal_root.js @@ -9,6 +9,7 @@ import VideoModal from './video_modal'; import BoostModal from './boost_modal'; import ConfirmationModal from './confirmation_modal'; import { + OnboardingModal, MuteModal, ReportModal, EmbedModal, @@ -17,6 +18,7 @@ import { const MODAL_COMPONENTS = { 'MEDIA': () => Promise.resolve({ default: MediaModal }), + 'ONBOARDING': OnboardingModal, 'VIDEO': () => Promise.resolve({ default: VideoModal }), 'BOOST': () => Promise.resolve({ default: BoostModal }), 'CONFIRM': () => Promise.resolve({ default: ConfirmationModal }), diff --git a/app/javascript/mastodon/features/ui/components/onboarding_modal.js b/app/javascript/mastodon/features/ui/components/onboarding_modal.js new file mode 100644 index 00000000000..9b713cf9ee5 --- /dev/null +++ b/app/javascript/mastodon/features/ui/components/onboarding_modal.js @@ -0,0 +1,324 @@ +import React from 'react'; +import { connect } from 'react-redux'; +import PropTypes from 'prop-types'; +import ImmutablePropTypes from 'react-immutable-proptypes'; +import { defineMessages, injectIntl, FormattedMessage } from 'react-intl'; +import ReactSwipeableViews from 'react-swipeable-views'; +import classNames from 'classnames'; +import Permalink from '../../../components/permalink'; +import ComposeForm from '../../compose/components/compose_form'; +import Search from '../../compose/components/search'; +import NavigationBar from '../../compose/components/navigation_bar'; +import ColumnHeader from './column_header'; +import { List as ImmutableList } from 'immutable'; +import { me } from '../../../initial_state'; + +const noop = () => { }; + +const messages = defineMessages({ + home_title: { id: 'column.home', defaultMessage: 'Home' }, + notifications_title: { id: 'column.notifications', defaultMessage: 'Notifications' }, + local_title: { id: 'column.community', defaultMessage: 'Local timeline' }, + federated_title: { id: 'column.public', defaultMessage: 'Federated timeline' }, +}); + +const PageOne = ({ acct, domain }) => ( +
+
+

+

+
+ +
+
+
+ +
+ +
+ @{acct}@{domain} +
+
+ +

+
+
+); + +PageOne.propTypes = { + acct: PropTypes.string.isRequired, + domain: PropTypes.string.isRequired, +}; + +const PageTwo = ({ myAccount }) => ( +
+
+
+ + + +
+
+ +

+
+); + +PageTwo.propTypes = { + myAccount: ImmutablePropTypes.map.isRequired, +}; + +const PageThree = ({ myAccount }) => ( +
+
+ + +
+ +
+
+ +

#illustration, introductions: #introductions }} />

+

+
+); + +PageThree.propTypes = { + myAccount: ImmutablePropTypes.map.isRequired, +}; + +const PageFour = ({ domain, intl }) => ( +
+
+
+
+
+

+
+ +
+
+

+
+
+ +
+
+
+
+ +
+
+
+
+ +

+
+
+); + +PageFour.propTypes = { + domain: PropTypes.string.isRequired, + intl: PropTypes.object.isRequired, +}; + +const PageSix = ({ admin, domain }) => { + let adminSection = ''; + + if (admin) { + adminSection = ( +

+ @{admin.get('acct')} }} /> +
+ }} /> +

+ ); + } + + return ( +
+

+ {adminSection} +

GitHub }} />

+

}} />

+

+
+ ); +}; + +PageSix.propTypes = { + admin: ImmutablePropTypes.map, + domain: PropTypes.string.isRequired, +}; + +const mapStateToProps = state => ({ + myAccount: state.getIn(['accounts', me]), + admin: state.getIn(['accounts', state.getIn(['meta', 'admin'])]), + domain: state.getIn(['meta', 'domain']), +}); + +@connect(mapStateToProps) +@injectIntl +export default class OnboardingModal extends React.PureComponent { + + static propTypes = { + onClose: PropTypes.func.isRequired, + intl: PropTypes.object.isRequired, + myAccount: ImmutablePropTypes.map.isRequired, + domain: PropTypes.string.isRequired, + admin: ImmutablePropTypes.map, + }; + + state = { + currentIndex: 0, + }; + + componentWillMount() { + const { myAccount, admin, domain, intl } = this.props; + this.pages = [ + , + , + , + , + , + ]; + }; + + componentDidMount() { + window.addEventListener('keyup', this.handleKeyUp); + } + + componentWillUnmount() { + window.addEventListener('keyup', this.handleKeyUp); + } + + handleSkip = (e) => { + e.preventDefault(); + this.props.onClose(); + } + + handleDot = (e) => { + const i = Number(e.currentTarget.getAttribute('data-index')); + e.preventDefault(); + this.setState({ currentIndex: i }); + } + + handlePrev = () => { + this.setState(({ currentIndex }) => ({ + currentIndex: Math.max(0, currentIndex - 1), + })); + } + + handleNext = () => { + const { pages } = this; + this.setState(({ currentIndex }) => ({ + currentIndex: Math.min(currentIndex + 1, pages.length - 1), + })); + } + + handleSwipe = (index) => { + this.setState({ currentIndex: index }); + } + + handleKeyUp = ({ key }) => { + switch (key) { + case 'ArrowLeft': + this.handlePrev(); + break; + case 'ArrowRight': + this.handleNext(); + break; + } + } + + handleClose = () => { + this.props.onClose(); + } + + render () { + const { pages } = this; + const { currentIndex } = this.state; + const hasMore = currentIndex < pages.length - 1; + + const nextOrDoneBtn = hasMore ? ( + + ) : ( + + ); + + return ( +
+ + {pages.map((page, i) => { + const className = classNames('onboarding-modal__page__wrapper', `onboarding-modal__page__wrapper-${i}`, { + 'onboarding-modal__page__wrapper--active': i === currentIndex, + }); + + return ( +
{page}
+ ); + })} + + +
+
+ +
+ +
+ {pages.map((_, i) => { + const className = classNames('onboarding-modal__dot', { + active: i === currentIndex, + }); + + return ( +
+ ); + })} +
+ +
+ {nextOrDoneBtn} +
+
+
+ ); + } + +} diff --git a/app/javascript/mastodon/features/ui/util/async-components.js b/app/javascript/mastodon/features/ui/util/async-components.js index a03c4cefd8e..d6586680b8f 100644 --- a/app/javascript/mastodon/features/ui/util/async-components.js +++ b/app/javascript/mastodon/features/ui/util/async-components.js @@ -94,6 +94,10 @@ export function Mutes () { return import(/* webpackChunkName: "features/mutes" */'../../mutes'); } +export function OnboardingModal () { + return import(/* webpackChunkName: "modals/onboarding_modal" */'../components/onboarding_modal'); +} + export function MuteModal () { return import(/* webpackChunkName: "modals/mute_modal" */'../components/mute_modal'); } diff --git a/app/javascript/mastodon/locales/en.json b/app/javascript/mastodon/locales/en.json index b1dbaa69802..ac25a57a2ce 100644 --- a/app/javascript/mastodon/locales/en.json +++ b/app/javascript/mastodon/locales/en.json @@ -181,7 +181,8 @@ "onboarding.page_four.home": "The home timeline shows posts from people you follow.", "onboarding.page_four.notifications": "The notifications column shows when someone interacts with you.", "onboarding.page_one.federation": "Mastodon is a network of independent servers joining up to make one larger social network. We call these servers instances.", - "onboarding.page_one.handle": "You are on {domain}, so your full handle is {handle}", + "onboarding.page_one.full_handle": "Your full handle", + "onboarding.page_one.handle_hint": "This is what you would tell your friends to search for.", "onboarding.page_one.welcome": "Welcome to Mastodon!", "onboarding.page_six.admin": "Your instance's admin is {admin}.", "onboarding.page_six.almost_done": "Almost done...", diff --git a/app/javascript/mastodon/locales/zh-CN.json b/app/javascript/mastodon/locales/zh-CN.json index b6435a26061..a02211b8ae7 100644 --- a/app/javascript/mastodon/locales/zh-CN.json +++ b/app/javascript/mastodon/locales/zh-CN.json @@ -139,6 +139,7 @@ "loading_indicator.label": "加载中……", "media_gallery.toggle_visible": "切换显示/隐藏", "missing_indicator.label": "找不到内容", + "missing_indicator.sublabel": "无法找到此资源", "mute_modal.hide_notifications": "同时隐藏来自这个用户的通知", "navigation_bar.blocks": "被屏蔽的用户", "navigation_bar.community_timeline": "本站时间轴", @@ -174,7 +175,8 @@ "onboarding.page_four.home": "你的“主页”时间轴上显示的是你的关注对象所发布的嘟文。", "onboarding.page_four.notifications": "如果有人与你互动了，他们就会出现在“通知”栏中哦～", "onboarding.page_one.federation": "Mastodon 是由一系列独立的服务器共同打造的强大的社交网络，我们将这些各自独立而又相互连接的服务器叫做“实例”。", - "onboarding.page_one.handle": "你是在 {domain} 上注册的，所以你的完整用户地址是 {handle}。", + "onboarding.page_one.full_handle": "你的完整用户地址", + "onboarding.page_one.handle_hint": "你的朋友们需要这个才能通过搜索功能找到你。", "onboarding.page_one.welcome": "欢迎来到 Mastodon！", "onboarding.page_six.admin": "{admin} 是你所在服务器实例的管理员。", "onboarding.page_six.almost_done": "差不多了……", @@ -197,6 +199,8 @@ "privacy.public.short": "公开", "privacy.unlisted.long": "所有人可见，但不会出现在公共时间轴上", "privacy.unlisted.short": "不公开", + "regeneration_indicator.label": "加载中……", + "regeneration_indicator.sublabel": "你的主页时间轴正在准备中！", "relative_time.days": "{number}天", "relative_time.hours": "{number}时", "relative_time.just_now": "刚刚", diff --git a/app/javascript/styles/mailer.scss b/app/javascript/styles/mailer.scss index b3bcc9209c5..dbe070f9a3c 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, @@ -235,6 +235,12 @@ h5 { color: lighten($ui-base-color, 34%); } +.input-cell { + h5 { + margin-top: 4px; + } +} + .input { td { background: darken($ui-base-color, 8%); @@ -512,3 +518,29 @@ ul { 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 89d4b2ebaea..9e858e9ca51 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; } @@ -2760,6 +2764,7 @@ flex: 1 1 auto; align-items: center; justify-content: center; + @supports(display: grid) { // hack to fix Chrome <57 contain: strict; } @@ -2805,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; @@ -3300,6 +3342,7 @@ z-index: 100; } +.onboarding-modal, .error-modal, .embed-modal { background: $ui-secondary-color; @@ -3310,6 +3353,25 @@ flex-direction: column; } +.onboarding-modal__pager { + height: 80vh; + width: 80vw; + max-width: 520px; + max-height: 470px; + + .react-swipeable-view-container > div { + width: 100%; + height: 100%; + box-sizing: border-box; + display: none; + flex-direction: column; + align-items: center; + justify-content: center; + display: flex; + user-select: text; + } +} + .error-modal__body { height: 80vh; width: 80vw; @@ -3343,6 +3405,23 @@ text-align: center; } +@media screen and (max-width: 550px) { + .onboarding-modal { + width: 100%; + height: 100%; + border-radius: 0; + } + + .onboarding-modal__pager { + width: 100%; + height: auto; + max-width: none; + max-height: none; + flex: 1 1 auto; + } +} + +.onboarding-modal__paginator, .error-modal__footer { flex: 0 0 auto; background: darken($ui-secondary-color, 8%); @@ -3353,20 +3432,35 @@ min-width: 33px; } + .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-base-color; + + &:hover, + &:focus, + &:active { + color: darken($ui-base-color, 4%); + } } } } @@ -3375,6 +3469,239 @@ justify-content: center; } +.onboarding-modal__dots { + flex: 1 1 auto; + display: flex; + align-items: center; + justify-content: center; +} + +.onboarding-modal__dot { + width: 14px; + height: 14px; + border-radius: 14px; + background: darken($ui-secondary-color, 16%); + margin: 0 3px; + cursor: pointer; + + &:hover { + background: darken($ui-secondary-color, 18%); + } + + &.active { + cursor: default; + background: darken($ui-secondary-color, 24%); + } +} + +.onboarding-modal__page__wrapper { + pointer-events: none; + padding: 25px; + padding-bottom: 0; + + &.onboarding-modal__page__wrapper--active { + pointer-events: auto; + } +} + +.onboarding-modal__page { + cursor: default; + line-height: 21px; + + h1 { + font-size: 18px; + font-weight: 500; + color: $ui-base-color; + margin-bottom: 20px; + } + + a { + color: $ui-highlight-color; + + &:hover, + &:focus, + &:active { + color: lighten($ui-highlight-color, 4%); + } + } + + .navigation-bar a { + color: inherit; + } + + p { + font-size: 16px; + color: lighten($ui-base-color, 8%); + margin-top: 10px; + margin-bottom: 10px; + + &:last-child { + margin-bottom: 0; + } + + strong { + font-weight: 500; + background: $ui-base-color; + color: $ui-secondary-color; + border-radius: 4px; + font-size: 14px; + padding: 3px 6px; + + @each $lang in $cjk-langs { + &:lang(#{$lang}) { + font-weight: 700; + } + } + } + } +} + +.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 { + &__lead { + padding: 65px; + padding-top: 45px; + padding-bottom: 0; + margin-bottom: 10px; + + h1 { + font-size: 26px; + line-height: 36px; + margin-bottom: 8px; + } + + p { + margin-bottom: 0; + } + } + + &__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; + } +} + +.onboarding-modal__page-two, +.onboarding-modal__page-three, +.onboarding-modal__page-four, +.onboarding-modal__page-five { + p { + text-align: left; + } + + .figure { + background: darken($ui-base-color, 8%); + color: $ui-secondary-color; + margin-bottom: 20px; + border-radius: 4px; + padding: 10px; + text-align: center; + font-size: 14px; + box-shadow: 1px 2px 6px rgba($base-shadow-color, 0.3); + + .onboarding-modal__image { + border-radius: 4px; + margin-bottom: 10px; + } + + &.non-interactive { + pointer-events: none; + text-align: left; + } + } +} + +.onboarding-modal__page-four__columns { + .row { + display: flex; + margin-bottom: 20px; + + & > div { + flex: 1 1 0; + margin: 0 10px; + + &:first-child { + margin-left: 0; + } + + &:last-child { + margin-right: 0; + } + + p { + text-align: center; + } + } + + &:last-child { + margin-bottom: 0; + } + } + + .column-header { + color: $primary-text-color; + } +} + +@media screen and (max-width: 320px) and (max-height: 600px) { + .onboarding-modal__page p { + font-size: 14px; + line-height: 20px; + } + + .onboarding-modal__page-two .figure, + .onboarding-modal__page-three .figure, + .onboarding-modal__page-four .figure, + .onboarding-modal__page-five .figure { + font-size: 12px; + margin-bottom: 10px; + } + + .onboarding-modal__page-four__columns .row { + margin-bottom: 10px; + } + + .onboarding-modal__page-four__columns .column-header { + padding: 5px; + font-size: 12px; + } +} + +.onboard-sliders { + display: inline-block; + max-width: 30px; + max-height: auto; + margin-left: 10px; +} + <<<<<<< HEAD .onboarding-modal__dots { flex: 1 1 auto; diff --git a/app/views/layouts/mailer.html.haml b/app/views/layouts/mailer.html.haml index 85029ec7684..ad15754d519 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/notification_mailer/favourite.html.haml b/app/views/notification_mailer/favourite.html.haml index f26b08b18e8..7d1b494d096 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 1290e2bc414..31a2b744540 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 41efeafaf6a..44f1911c403 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 619c580ce74..479fed41ccd 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 61c6ee6be8c..85b202cf932 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 087c6a9ae4a..00000000000 --- 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 77cc589e67c..00000000000 --- 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 0419adef0fe..00000000000 --- 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 e9d83b3f8e6..00000000000 --- 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 76727b3bef2..00000000000 --- 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 796913abb99..00000000000 --- 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 7730715f8d8..00000000000 --- 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 8e37fc641a2..00000000000 --- 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 0f999bcbcb2..1f088a16f4f 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 0486c3c5cf9..00000000000 --- 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 ce9411173e4..00000000000 --- 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 99868ba8afc..00000000000 --- 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 c46400f07c1..00000000000 --- 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 3c14896b3c7..00000000000 --- 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 3739c99d499..00000000000 --- 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 fe04fe3d05f..00000000000 --- 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 f20082e1664..00000000000 --- 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 578f7acb59b..00000000000 --- 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 884f75401b3..00000000000 --- 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 60fe9db0d95..00000000000 --- 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 e7cb7e18813..00000000000 --- 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 64ffb97996b..00000000000 --- 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 00000000000..e01eecb27e2 --- /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 01b1c69e29f..00000000000 --- 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 25d901f163d..00000000000 --- 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 97197246118..00000000000 --- 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 45dc0665090..7e82f23e4ad 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 33ee6d10b67..00000000000 --- 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 2305ef83451..00000000000 --- 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 134a79e9555..00000000000 --- 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 00000000000..2b58415f562 --- /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 d59ac58c424..00000000000 --- 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 ae0161f317a..00000000000 --- 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 c2fdfc82c3d..00000000000 --- 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 3ae461c97ac..00000000000 --- 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 192faf9ad94..00000000000 --- 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 0c2995958dc..00000000000 --- 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 d90c3fdebdc..00000000000 --- 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 f068f1cd67c..00000000000 --- 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 1f601c6b295..00000000000 --- 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 2e9377dff14..26314a21793 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 1a67fd40709..00000000000 --- 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 ea187670e3c..00000000000 --- 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 aa29b9b2bd5..00000000000 --- 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 33accd99c86..00000000000 --- 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 1707976c11d..00000000000 --- 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 9fe9116d95c..00000000000 --- 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 bd2efee0f35..00000000000 --- 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 eb7368ba921..00000000000 --- 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 6a3556daec4..00000000000 --- 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 6e0666d8dd6..00000000000 --- 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 9082201c0ce..00000000000 --- 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 b6df7322698..00000000000 --- 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 00000000000..77a37894ee6 --- /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 0d28a207cce..00000000000 --- 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 873c5f9624f..00000000000 --- 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 dbc065173ec..00000000000 --- 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 c1c735b3ac9..00000000000 --- 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 3ae22609393..e3be8e295e6 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 5326e45126c..00000000000 --- 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 6f174bb3e1a..00000000000 --- 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 032718f8115..00000000000 --- 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 00000000000..b5e530251d4 --- /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 977d78137f2..00000000000 --- 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 0dfc85a3660..00000000000 --- 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 ca4c494c3b4..00000000000 --- 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 7ed22dc2cd4..00000000000 --- 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 8abafcc99f7..00000000000 --- 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 0b01ba906cc..00000000000 --- 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 c826d5fc887..00000000000 --- 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 07fa3644a55..00000000000 --- 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 63c96c06b69..00000000000 --- 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 c0e6775d4a9..5d9ce6a7534 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 cd7cfc3732e..00000000000 --- 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 1de485c2e06..00000000000 --- 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 9ed607b5815..00000000000 --- 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 eda133db28b..00000000000 --- 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 387dc7c3e1b..00000000000 --- 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 5a5219589bc..00000000000 --- 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 2b34afc489d..00000000000 --- 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 2abff0c0d1b..00000000000 --- 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 4ede067ab36..00000000000 --- 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 31707dee101..00000000000 --- 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 86ea32b0576..00000000000 --- 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 946426119ff..00000000000 --- 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 00000000000..4fbef16ee9c --- /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 fe73b0165c0..00000000000 --- 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 a0b84b9a444..00000000000 --- 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 f7cd888471a..00000000000 --- 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 index 0823efa1ae6..d734da67db2 100644 --- a/app/views/user_mailer/welcome.html.haml +++ b/app/views/user_mailer/welcome.html.haml @@ -17,7 +17,7 @@ %tbody %tr %td - = image_tag full_pack_url('icon_done.svg'), alt: '' + = 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' @@ -30,7 +30,7 @@ %table.content-section{ cellspacing: 0, cellpadding: 0 } %tbody %tr - %td.content-cell + %td.content-cell.content-start .email-row .col-3 %table.column{ cellspacing: 0, cellpadding: 0 } @@ -46,7 +46,7 @@ %table.column{ cellspacing: 0, cellpadding: 0 } %tbody %tr - %td.column-cell.content-start + %td.column-cell %p= t 'user_mailer.welcome.full_handle_hint', instance: @instance %table.email-table{ cellspacing: 0, cellpadding: 0 } @@ -69,7 +69,7 @@ %table.column{ cellspacing: 0, cellpadding: 0 } %tbody %tr - %td.column-cell + %td.column-cell.padded %table.button.button-small{ align: 'left', cellspacing: 0, cellpadding: 0 } %tbody %tr @@ -89,7 +89,7 @@ %table.column{ cellspacing: 0, cellpadding: 0 } %tbody %tr - %td.column-cell + %td.column-cell.padded %table.button.button-small{ align: 'left', cellspacing: 0, cellpadding: 0 } %tbody %tr @@ -109,7 +109,7 @@ %table.column{ cellspacing: 0, cellpadding: 0 } %tbody %tr - %td.column-cell + %td.column-cell.padded %table.button.button-small{ align: 'left', cellspacing: 0, cellpadding: 0 } %tbody %tr diff --git a/config/locales/devise.zh-CN.yml b/config/locales/devise.zh-CN.yml index dd6b48795c3..4ee021fcc3c 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/zh-CN.yml b/config/locales/zh-CN.yml index 25cfe5a8a87..7deb241a15a 100644 --- a/config/locales/zh-CN.yml +++ b/config/locales/zh-CN.yml @@ -591,7 +591,7 @@ zh-CN: back: 回到 Mastodon delete: 删除帐户 development: 开发 - edit_profile: 更改个人信息 + edit_profile: 更改个人资料 export: 导出 followers: 已授权的关注者 import: 导入 @@ -712,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/webpack/configuration.js b/config/webpack/configuration.js index a38d9d11dea..f6b4d4c61c6 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 4ea3ce80c78..84d83cc6603 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 5936b5fcf74..098ab46ac72 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/spec/mailers/user_mailer_spec.rb b/spec/mailers/user_mailer_spec.rb index 9f17993e0ef..6b430b5056d 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',