From 546c4718e781f8900ba6498307ccb1e659de5edd Mon Sep 17 00:00:00 2001 From: Eugen Rochko Date: Tue, 15 Nov 2016 23:56:03 +0100 Subject: Localizations for most server-side strings --- app/mailers/notification_mailer.rb | 8 +-- app/views/about/index.html.haml | 21 ++---- app/views/about/terms.en.html.haml | 76 ++++++++++++++++++++++ app/views/about/terms.html.haml | 76 ---------------------- app/views/accounts/_header.html.haml | 10 +-- app/views/accounts/_nothing_here.html.haml | 2 +- app/views/accounts/followers.html.haml | 3 +- app/views/accounts/following.html.haml | 4 +- .../mailer/confirmation_instructions.en.html.erb | 5 ++ .../mailer/confirmation_instructions.en.text.erb | 5 ++ .../auth/mailer/confirmation_instructions.html.erb | 5 -- .../auth/mailer/confirmation_instructions.text.erb | 5 -- app/views/auth/mailer/password_change.en.html.erb | 3 + app/views/auth/mailer/password_change.en.text.erb | 3 + app/views/auth/mailer/password_change.html.erb | 3 - app/views/auth/mailer/password_change.text.erb | 3 - .../mailer/reset_password_instructions.en.html.erb | 8 +++ .../mailer/reset_password_instructions.en.text.erb | 8 +++ .../mailer/reset_password_instructions.html.erb | 8 --- .../mailer/reset_password_instructions.text.erb | 8 --- app/views/layouts/mailer.text.erb | 2 +- app/views/notification_mailer/favourite.text.erb | 2 +- app/views/notification_mailer/follow.text.erb | 2 +- app/views/notification_mailer/mention.text.erb | 2 +- app/views/notification_mailer/reblog.text.erb | 2 +- app/views/oauth/authorizations/new.html.haml | 10 +-- app/views/stream_entries/_favourite.html.haml | 2 +- app/views/stream_entries/_follow.html.haml | 2 +- 28 files changed, 138 insertions(+), 150 deletions(-) create mode 100644 app/views/about/terms.en.html.haml delete mode 100644 app/views/about/terms.html.haml create mode 100644 app/views/auth/mailer/confirmation_instructions.en.html.erb create mode 100644 app/views/auth/mailer/confirmation_instructions.en.text.erb delete mode 100644 app/views/auth/mailer/confirmation_instructions.html.erb delete mode 100644 app/views/auth/mailer/confirmation_instructions.text.erb create mode 100644 app/views/auth/mailer/password_change.en.html.erb create mode 100644 app/views/auth/mailer/password_change.en.text.erb delete mode 100644 app/views/auth/mailer/password_change.html.erb delete mode 100644 app/views/auth/mailer/password_change.text.erb create mode 100644 app/views/auth/mailer/reset_password_instructions.en.html.erb create mode 100644 app/views/auth/mailer/reset_password_instructions.en.text.erb delete mode 100644 app/views/auth/mailer/reset_password_instructions.html.erb delete mode 100644 app/views/auth/mailer/reset_password_instructions.text.erb (limited to 'app') diff --git a/app/mailers/notification_mailer.rb b/app/mailers/notification_mailer.rb index 2ed562979..33bea4c79 100644 --- a/app/mailers/notification_mailer.rb +++ b/app/mailers/notification_mailer.rb @@ -8,7 +8,7 @@ class NotificationMailer < ApplicationMailer @status = status return unless @me.user.settings(:notification_emails).mention - mail to: @me.user.email, subject: "You were mentioned by #{@status.account.acct}" + mail to: @me.user.email, subject: I18n.t('notification_mailer.mention.subject', name: @status.account.acct) end def follow(followed_account, follower) @@ -16,7 +16,7 @@ class NotificationMailer < ApplicationMailer @account = follower return unless @me.user.settings(:notification_emails).follow - mail to: @me.user.email, subject: "#{@account.acct} is now following you" + mail to: @me.user.email, subject: I18n.t('notification_mailer.follow.subject', name: @account.acct) end def favourite(target_status, from_account) @@ -25,7 +25,7 @@ class NotificationMailer < ApplicationMailer @status = target_status return unless @me.user.settings(:notification_emails).favourite - mail to: @me.user.email, subject: "#{@account.acct} favourited your status" + mail to: @me.user.email, subject: I18n.t('notification_mailer.favourite.subject', name: @account.acct) end def reblog(target_status, from_account) @@ -34,6 +34,6 @@ class NotificationMailer < ApplicationMailer @status = target_status return unless @me.user.settings(:notification_emails).reblog - mail to: @me.user.email, subject: "#{@account.acct} reblogged your status" + mail to: @me.user.email, subject: I18n.t('notification_mailer.reblog.subject', name: @account.acct) end end diff --git a/app/views/about/index.html.haml b/app/views/about/index.html.haml index e9e2f9d93..307d75c81 100644 --- a/app/views/about/index.html.haml +++ b/app/views/about/index.html.haml @@ -6,24 +6,15 @@ = image_tag 'logo.png' Mastodon - %p - Mastodon is a - %em free, open-source - social network server. A - %em decentralized - alternative to commercial platforms, it avoids the risks of a single company monopolizing your communication. Anyone can run Mastodon and participate in the - %em social network - seamlessly. - %p - %em= Rails.configuration.x.local_domain - is a Mastodon instance. + %p= t('about.about_mastodon').html_safe + %p= t('about.about_instance', instance: Rails.configuration.x.local_domain).html_safe .screenshot= image_tag 'screenshot.png' .actions .info - = link_to 'Terms', terms_path - = link_to 'Source code', 'https://github.com/Gargron/mastodon' + = link_to t('about.terms'), terms_path + = link_to t('about.source_code'), 'https://github.com/Gargron/mastodon' - = link_to 'Get started', new_user_registration_path, class: 'button' - = link_to 'Log in', new_user_session_path, class: 'button' + = link_to t('about.get_started'), new_user_registration_path, class: 'button' + = link_to t('auth.login'), new_user_session_path, class: 'button' diff --git a/app/views/about/terms.en.html.haml b/app/views/about/terms.en.html.haml new file mode 100644 index 000000000..9fb318053 --- /dev/null +++ b/app/views/about/terms.en.html.haml @@ -0,0 +1,76 @@ +- content_for :page_title do + #{Rails.configuration.x.local_domain} Terms of Service and Privacy Policy + +.wrapper + %h2 Privacy Policy + + %h3#collect What information do we collect? + + %p We collect information from you when you register on our site and gather data when you participate in the forum by reading, writing, and evaluating the content shared here. + + %p When registering on our site, you may be asked to enter your name and e-mail address. You may, however, visit our site without registering. Your e-mail address will be verified by an email containing a unique link. If that link is visited, we know that you control the e-mail address. + + %p When registered and posting, we record the IP address that the post originated from. We also may retain server logs which include the IP address of every request to our server. + + %h3#use What do we use your information for? + + %p Any of the information we collect from you may be used in one of the following ways: + + %ul + %li To personalize your experience — your information helps us to better respond to your individual needs. + %li To improve our site — we continually strive to improve our site offerings based on the information and feedback we receive from you. + %li To improve customer service — your information helps us to more effectively respond to your customer service requests and support needs. + %li To send periodic emails — The email address you provide may be used to send you information, notifications that you request about changes to topics or in response to your user name, respond to inquiries, and/or other requests or questions. + + %h3#protect How do we protect your information? + + %p We implement a variety of security measures to maintain the safety of your personal information when you enter, submit, or access your personal information. + + %h3#data-retention What is your data retention policy? + + %p We will make a good faith effort to: + + %ul + %li Retain server logs containing the IP address of all requests to this server no more than 90 days. + %li Retain the IP addresses associated with registered users and their posts no more than 5 years. + + %h3#cookies Do we use cookies? + + %p Yes. Cookies are small files that a site or its service provider transfers to your computer's hard drive through your Web browser (if you allow). These cookies enable the site to recognize your browser and, if you have a registered account, associate it with your registered account. + + %p We use cookies to understand and save your preferences for future visits and compile aggregate data about site traffic and site interaction so that we can offer better site experiences and tools in the future. We may contract with third-party service providers to assist us in better understanding our site visitors. These service providers are not permitted to use the information collected on our behalf except to help us conduct and improve our business. + + %h3#disclose Do we disclose any information to outside parties? + + %p We do not sell, trade, or otherwise transfer to outside parties your personally identifiable information. This does not include trusted third parties who assist us in operating our site, conducting our business, or servicing you, so long as those parties agree to keep this information confidential. We may also release your information when we believe release is appropriate to comply with the law, enforce our site policies, or protect ours or others rights, property, or safety. However, non-personally identifiable visitor information may be provided to other parties for marketing, advertising, or other uses. + + %h3#third-party Third party links + + %p Occasionally, at our discretion, we may include or offer third party products or services on our site. These third party sites have separate and independent privacy policies. We therefore have no responsibility or liability for the content and activities of these linked sites. Nonetheless, we seek to protect the integrity of our site and welcome any feedback about these sites. + + %h3#coppa Children's Online Privacy Protection Act Compliance + + %p + Our site, products and services are all directed to people who are at least 13 years old or older. If this server is in the USA, and you are under the age of 13, per the requirements of COPPA + = surround '(', '),' do + = link_to 'Children\'s Online Privacy Protection Act', 'https://en.wikipedia.org/wiki/Children%27s_Online_Privacy_Protection_Act' + do not use this site. + + %h3#online Online Privacy Policy Only + + %p This online privacy policy applies only to information collected through our site and not to information collected offline. + + %h3#consent Your Consent + + %p By using our site, you consent to our web site privacy policy. + + %h3#changes Changes to our Privacy Policy + + %p If we decide to change our privacy policy, we will post those changes on this page. + + %p This document is CC-BY-SA. It was last updated May 31, 2013. + + %p + Originally adapted from the + = succeed '.' do + = link_to 'Discourse privacy policy', 'https://github.com/discourse/discourse' diff --git a/app/views/about/terms.html.haml b/app/views/about/terms.html.haml deleted file mode 100644 index 9fb318053..000000000 --- a/app/views/about/terms.html.haml +++ /dev/null @@ -1,76 +0,0 @@ -- content_for :page_title do - #{Rails.configuration.x.local_domain} Terms of Service and Privacy Policy - -.wrapper - %h2 Privacy Policy - - %h3#collect What information do we collect? - - %p We collect information from you when you register on our site and gather data when you participate in the forum by reading, writing, and evaluating the content shared here. - - %p When registering on our site, you may be asked to enter your name and e-mail address. You may, however, visit our site without registering. Your e-mail address will be verified by an email containing a unique link. If that link is visited, we know that you control the e-mail address. - - %p When registered and posting, we record the IP address that the post originated from. We also may retain server logs which include the IP address of every request to our server. - - %h3#use What do we use your information for? - - %p Any of the information we collect from you may be used in one of the following ways: - - %ul - %li To personalize your experience — your information helps us to better respond to your individual needs. - %li To improve our site — we continually strive to improve our site offerings based on the information and feedback we receive from you. - %li To improve customer service — your information helps us to more effectively respond to your customer service requests and support needs. - %li To send periodic emails — The email address you provide may be used to send you information, notifications that you request about changes to topics or in response to your user name, respond to inquiries, and/or other requests or questions. - - %h3#protect How do we protect your information? - - %p We implement a variety of security measures to maintain the safety of your personal information when you enter, submit, or access your personal information. - - %h3#data-retention What is your data retention policy? - - %p We will make a good faith effort to: - - %ul - %li Retain server logs containing the IP address of all requests to this server no more than 90 days. - %li Retain the IP addresses associated with registered users and their posts no more than 5 years. - - %h3#cookies Do we use cookies? - - %p Yes. Cookies are small files that a site or its service provider transfers to your computer's hard drive through your Web browser (if you allow). These cookies enable the site to recognize your browser and, if you have a registered account, associate it with your registered account. - - %p We use cookies to understand and save your preferences for future visits and compile aggregate data about site traffic and site interaction so that we can offer better site experiences and tools in the future. We may contract with third-party service providers to assist us in better understanding our site visitors. These service providers are not permitted to use the information collected on our behalf except to help us conduct and improve our business. - - %h3#disclose Do we disclose any information to outside parties? - - %p We do not sell, trade, or otherwise transfer to outside parties your personally identifiable information. This does not include trusted third parties who assist us in operating our site, conducting our business, or servicing you, so long as those parties agree to keep this information confidential. We may also release your information when we believe release is appropriate to comply with the law, enforce our site policies, or protect ours or others rights, property, or safety. However, non-personally identifiable visitor information may be provided to other parties for marketing, advertising, or other uses. - - %h3#third-party Third party links - - %p Occasionally, at our discretion, we may include or offer third party products or services on our site. These third party sites have separate and independent privacy policies. We therefore have no responsibility or liability for the content and activities of these linked sites. Nonetheless, we seek to protect the integrity of our site and welcome any feedback about these sites. - - %h3#coppa Children's Online Privacy Protection Act Compliance - - %p - Our site, products and services are all directed to people who are at least 13 years old or older. If this server is in the USA, and you are under the age of 13, per the requirements of COPPA - = surround '(', '),' do - = link_to 'Children\'s Online Privacy Protection Act', 'https://en.wikipedia.org/wiki/Children%27s_Online_Privacy_Protection_Act' - do not use this site. - - %h3#online Online Privacy Policy Only - - %p This online privacy policy applies only to information collected through our site and not to information collected offline. - - %h3#consent Your Consent - - %p By using our site, you consent to our web site privacy policy. - - %h3#changes Changes to our Privacy Policy - - %p If we decide to change our privacy policy, we will post those changes on this page. - - %p This document is CC-BY-SA. It was last updated May 31, 2013. - - %p - Originally adapted from the - = succeed '.' do - = link_to 'Discourse privacy policy', 'https://github.com/discourse/discourse' diff --git a/app/views/accounts/_header.html.haml b/app/views/accounts/_header.html.haml index ec2233b77..0063d9f16 100644 --- a/app/views/accounts/_header.html.haml +++ b/app/views/accounts/_header.html.haml @@ -2,9 +2,9 @@ - if user_signed_in? && current_account.id != @account.id .controls - if current_account.following?(@account) - = link_to 'Unfollow', unfollow_account_path(@account), data: { method: :post }, class: 'button' + = link_to t('accounts.unfollow'), unfollow_account_path(@account), data: { method: :post }, class: 'button' - else - = link_to 'Follow', follow_account_path(@account), data: { method: :post }, class: 'button' + = link_to t('accounts.follow'), follow_account_path(@account), data: { method: :post }, class: 'button' .avatar= image_tag @account.avatar.url(:large) %h1.name @@ -17,13 +17,13 @@ .details-counters .counter{ class: active_nav_class(account_url(@account)) } = link_to account_url(@account) do - %span.counter-label Posts + %span.counter-label= t('accounts.posts') %span.counter-number= @account.statuses.count .counter{ class: active_nav_class(following_account_url(@account)) } = link_to following_account_url(@account) do - %span.counter-label Following + %span.counter-label= t('accounts.following') %span.counter-number= @account.following.count .counter{ class: active_nav_class(followers_account_url(@account)) } = link_to followers_account_url(@account) do - %span.counter-label Followers + %span.counter-label= t('accounts.followers') %span.counter-number= @account.followers.count diff --git a/app/views/accounts/_nothing_here.html.haml b/app/views/accounts/_nothing_here.html.haml index faa1feb20..0c6dc1168 100644 --- a/app/views/accounts/_nothing_here.html.haml +++ b/app/views/accounts/_nothing_here.html.haml @@ -1 +1 @@ -%p.nothing-here There is nothing here! +%p.nothing-here= t('accounts.nothing_here') diff --git a/app/views/accounts/followers.html.haml b/app/views/accounts/followers.html.haml index 7a6e270ac..493491020 100644 --- a/app/views/accounts/followers.html.haml +++ b/app/views/accounts/followers.html.haml @@ -1,6 +1,5 @@ - content_for :page_title do - People who follow - = display_name(@account) + = t('accounts.people_who_follow', name: display_name(@account)) = render partial: 'header' diff --git a/app/views/accounts/following.html.haml b/app/views/accounts/following.html.haml index 95843f64d..370cd6c48 100644 --- a/app/views/accounts/following.html.haml +++ b/app/views/accounts/following.html.haml @@ -1,7 +1,5 @@ - content_for :page_title do - People whom - = display_name(@account) - follows + = t('accounts.people_followed_by', name: display_name(@account)) = render partial: 'header' diff --git a/app/views/auth/mailer/confirmation_instructions.en.html.erb b/app/views/auth/mailer/confirmation_instructions.en.html.erb new file mode 100644 index 000000000..69e9ff80f --- /dev/null +++ b/app/views/auth/mailer/confirmation_instructions.en.html.erb @@ -0,0 +1,5 @@ +

Welcome <%= @resource.email %>!

+ +

You can confirm your Mastodon account email through the link below:

+ +

<%= link_to 'Confirm my account', confirmation_url(@resource, confirmation_token: @token) %>

diff --git a/app/views/auth/mailer/confirmation_instructions.en.text.erb b/app/views/auth/mailer/confirmation_instructions.en.text.erb new file mode 100644 index 000000000..bb21cf8e2 --- /dev/null +++ b/app/views/auth/mailer/confirmation_instructions.en.text.erb @@ -0,0 +1,5 @@ +Welcome <%= @resource.email %>! + +You can confirm your Mastodon account email through the link below: + +<%= confirmation_url(@resource, confirmation_token: @token) %> diff --git a/app/views/auth/mailer/confirmation_instructions.html.erb b/app/views/auth/mailer/confirmation_instructions.html.erb deleted file mode 100644 index 69e9ff80f..000000000 --- a/app/views/auth/mailer/confirmation_instructions.html.erb +++ /dev/null @@ -1,5 +0,0 @@ -

Welcome <%= @resource.email %>!

- -

You can confirm your Mastodon account email through the link below:

- -

<%= link_to 'Confirm my account', confirmation_url(@resource, confirmation_token: @token) %>

diff --git a/app/views/auth/mailer/confirmation_instructions.text.erb b/app/views/auth/mailer/confirmation_instructions.text.erb deleted file mode 100644 index bb21cf8e2..000000000 --- a/app/views/auth/mailer/confirmation_instructions.text.erb +++ /dev/null @@ -1,5 +0,0 @@ -Welcome <%= @resource.email %>! - -You can confirm your Mastodon account email through the link below: - -<%= confirmation_url(@resource, confirmation_token: @token) %> diff --git a/app/views/auth/mailer/password_change.en.html.erb b/app/views/auth/mailer/password_change.en.html.erb new file mode 100644 index 000000000..a1bc77463 --- /dev/null +++ b/app/views/auth/mailer/password_change.en.html.erb @@ -0,0 +1,3 @@ +

Hello <%= @resource.email %>!

+ +

We're contacting you to notify you that your password on Mastodon has been changed.

diff --git a/app/views/auth/mailer/password_change.en.text.erb b/app/views/auth/mailer/password_change.en.text.erb new file mode 100644 index 000000000..27581e604 --- /dev/null +++ b/app/views/auth/mailer/password_change.en.text.erb @@ -0,0 +1,3 @@ +Hello <%= @resource.email %>! + +We're contacting you to notify you that your password on Mastodon has been changed. diff --git a/app/views/auth/mailer/password_change.html.erb b/app/views/auth/mailer/password_change.html.erb deleted file mode 100644 index a1bc77463..000000000 --- a/app/views/auth/mailer/password_change.html.erb +++ /dev/null @@ -1,3 +0,0 @@ -

Hello <%= @resource.email %>!

- -

We're contacting you to notify you that your password on Mastodon has been changed.

diff --git a/app/views/auth/mailer/password_change.text.erb b/app/views/auth/mailer/password_change.text.erb deleted file mode 100644 index 27581e604..000000000 --- a/app/views/auth/mailer/password_change.text.erb +++ /dev/null @@ -1,3 +0,0 @@ -Hello <%= @resource.email %>! - -We're contacting you to notify you that your password on Mastodon has been changed. diff --git a/app/views/auth/mailer/reset_password_instructions.en.html.erb b/app/views/auth/mailer/reset_password_instructions.en.html.erb new file mode 100644 index 000000000..643b43319 --- /dev/null +++ b/app/views/auth/mailer/reset_password_instructions.en.html.erb @@ -0,0 +1,8 @@ +

Hello <%= @resource.email %>!

+ +

Someone has requested a link to change your password on Mastodon. You can do this through the link below.

+ +

<%= link_to 'Change my password', 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/auth/mailer/reset_password_instructions.en.text.erb b/app/views/auth/mailer/reset_password_instructions.en.text.erb new file mode 100644 index 000000000..fe73b0165 --- /dev/null +++ b/app/views/auth/mailer/reset_password_instructions.en.text.erb @@ -0,0 +1,8 @@ +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/auth/mailer/reset_password_instructions.html.erb b/app/views/auth/mailer/reset_password_instructions.html.erb deleted file mode 100644 index 643b43319..000000000 --- a/app/views/auth/mailer/reset_password_instructions.html.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.

- -

<%= link_to 'Change my password', 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/auth/mailer/reset_password_instructions.text.erb b/app/views/auth/mailer/reset_password_instructions.text.erb deleted file mode 100644 index fe73b0165..000000000 --- a/app/views/auth/mailer/reset_password_instructions.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/layouts/mailer.text.erb b/app/views/layouts/mailer.text.erb index 632702439..ae52173b5 100644 --- a/app/views/layouts/mailer.text.erb +++ b/app/views/layouts/mailer.text.erb @@ -2,4 +2,4 @@ --- -Mastodon notifications from <%= Rails.configuration.x.local_domain %> +<%= t('application_mailer.signature', instance: Rails.configuration.x.local_domain) %> diff --git a/app/views/notification_mailer/favourite.text.erb b/app/views/notification_mailer/favourite.text.erb index 1b6fa274c..b2e1e3e9e 100644 --- a/app/views/notification_mailer/favourite.text.erb +++ b/app/views/notification_mailer/favourite.text.erb @@ -1,5 +1,5 @@ <%= display_name(@me) %>, -Your status was favourited by <%= @account.acct %>: +<%= t('notification_mailer.favourite.body', name: @account.acct) %> <%= render partial: 'status' %> diff --git a/app/views/notification_mailer/follow.text.erb b/app/views/notification_mailer/follow.text.erb index 4098e4846..4b2ec142c 100644 --- a/app/views/notification_mailer/follow.text.erb +++ b/app/views/notification_mailer/follow.text.erb @@ -1,5 +1,5 @@ <%= display_name(@me) %>, -<%= @account.acct %> is now following you! +<%= t('notification_mailer.follow.body', name: @account.acct) %> <%= web_url("accounts/#{@account.id}") %> diff --git a/app/views/notification_mailer/mention.text.erb b/app/views/notification_mailer/mention.text.erb index 72dc1b009..31a294bb9 100644 --- a/app/views/notification_mailer/mention.text.erb +++ b/app/views/notification_mailer/mention.text.erb @@ -1,5 +1,5 @@ <%= display_name(@me) %>, -You were mentioned by <%= @status.account.acct %> in: +<%= t('notification_mailer.mention.body', name: @status.account.acct) %> <%= render partial: 'status' %> diff --git a/app/views/notification_mailer/reblog.text.erb b/app/views/notification_mailer/reblog.text.erb index 2077e949e..7af8052ca 100644 --- a/app/views/notification_mailer/reblog.text.erb +++ b/app/views/notification_mailer/reblog.text.erb @@ -1,5 +1,5 @@ <%= display_name(@me) %>, -Your status was reblogged by <%= @account.acct %>: +<%= t('notification_mailer.reblog.body', name: @account.acct) %> <%= render partial: 'status' %> diff --git a/app/views/oauth/authorizations/new.html.haml b/app/views/oauth/authorizations/new.html.haml index ba5d426f5..cd6e93e08 100644 --- a/app/views/oauth/authorizations/new.html.haml +++ b/app/views/oauth/authorizations/new.html.haml @@ -1,11 +1,11 @@ +- content_for :page_title do + = t('doorkeeper.authorizations.new.title') + .oauth-prompt - %h2 - Application - %strong=@pre_auth.client.name - requests access to your account + %h2= t('doorkeeper.authorizations.new.prompt', name: @pre_auth.client.name) %p - It will be able to + = t('doorkeeper.authorizations.new.able_to') = @pre_auth.scopes.map { |scope| t(scope, scope: [:doorkeeper, :scopes]) }.map { |s| "#{s}"}.to_sentence.html_safe = form_tag oauth_authorization_path, method: :post, class: 'simple_form' do diff --git a/app/views/stream_entries/_favourite.html.haml b/app/views/stream_entries/_favourite.html.haml index 85e3a0824..aac90dcdf 100644 --- a/app/views/stream_entries/_favourite.html.haml +++ b/app/views/stream_entries/_favourite.html.haml @@ -1,5 +1,5 @@ .entry.entry-favourite .content %strong= favourite.account.acct - favourited a post by + = t('stream_entries.favourited') %strong= favourite.status.account.acct diff --git a/app/views/stream_entries/_follow.html.haml b/app/views/stream_entries/_follow.html.haml index f6ec8c4f5..1a2e2c554 100644 --- a/app/views/stream_entries/_follow.html.haml +++ b/app/views/stream_entries/_follow.html.haml @@ -1,5 +1,5 @@ .entry.entry-follow .content %strong= link_to follow.account.acct, account_path(follow.account) - is now following + = t('stream_entries.is_now_following') %strong= link_to follow.target_account.acct, TagManager.instance.url_for(follow.target_account) -- cgit