diff options
| author | kibigo! <marrus-sh@users.noreply.github.com> | 2017-10-11 10:43:10 -0700 |
|---|---|---|
| committer | kibigo! <marrus-sh@users.noreply.github.com> | 2017-10-11 10:43:10 -0700 |
| commit | 8d6b9ba4946b5b159af0fbd130637a226a286796 (patch) | |
| tree | 9def26711682d29338cfa1b081822029a01669eb /app/views/user_mailer | |
| parent | f0a2a6c875e9294f0ea1d4c6bc90529e41a2dc37 (diff) | |
| parent | 476e79b8e340c9103352a0799e102e4aca1a5593 (diff) | |
Merge upstream 2.0ish #165
Diffstat (limited to 'app/views/user_mailer')
3 files changed, 28 insertions, 2 deletions
diff --git a/app/views/user_mailer/confirmation_instructions.en.html.erb b/app/views/user_mailer/confirmation_instructions.en.html.erb index f28a38be2..cd0d70377 100644 --- a/app/views/user_mailer/confirmation_instructions.en.html.erb +++ b/app/views/user_mailer/confirmation_instructions.en.html.erb @@ -3,10 +3,13 @@ <p>You just created an account on <%= @instance %>.</p> <p>To confirm your inscription, please click on the following link : <br> -<%= link_to 'Confirm my account', confirmation_url(@resource, confirmation_token: @token) %> +<%= link_to 'Confirm my account', confirmation_url(@resource, confirmation_token: @token) %></p> + +<p>If the above link did not work, copy and paste this URL into your address bar: <br> +<span><%= confirmation_url(@resource, confirmation_token: @token) %></span> <p>Please also check out our <%= link_to 'terms and conditions', terms_url %>.</p> <p>Sincerely,<p> -<p>The <%= @instance %> team</p> \ No newline at end of file +<p>The <%= @instance %> team</p> diff --git a/app/views/user_mailer/confirmation_instructions.ko.html.erb b/app/views/user_mailer/confirmation_instructions.ko.html.erb new file mode 100644 index 000000000..a749cd97b --- /dev/null +++ b/app/views/user_mailer/confirmation_instructions.ko.html.erb @@ -0,0 +1,13 @@ +<p>안녕하세요 <%= @resource.email %> 님!</p> + +<p><%= @instance %>에 새로 계정을 만들었습니다.</p> + +<p>아래 링크를 눌러 회원가입을 완료 하세요:<br> +<%= link_to '계정 활성화', confirmation_url(@resource, confirmation_token: @token) %></p> + +<p>만약 위의 링크가 작동하지 않는다면 아래 URL을 복사하여 주소창에 붙여넣으세요</p> +<span><%= confirmation_url(@resource, confirmation_token: @token) %></span> + +<p> <%= link_to '약관', terms_url %>도 확인 바랍니다.</p> + +<p><%= @instance %> 드림</p> diff --git a/app/views/user_mailer/confirmation_instructions.ko.text.erb b/app/views/user_mailer/confirmation_instructions.ko.text.erb new file mode 100644 index 000000000..c46400f07 --- /dev/null +++ b/app/views/user_mailer/confirmation_instructions.ko.text.erb @@ -0,0 +1,10 @@ +안녕하세요 <%= @resource.email %> 님! + +<%= @instance %>에 새로 계정을 만들었습니다. + +아래 링크를 눌러 회원가입을 완료 하세요. +<%= confirmation_url(@resource, confirmation_token: @token) %> + +약관도 확인 바랍니다. <%= terms_url %> + +<%= @instance %> 드림 |