about summary refs log tree commit diff
path: root/app/views
diff options
context:
space:
mode:
Diffstat (limited to 'app/views')
-rw-r--r--app/views/auth/confirmations/new.html.haml6
-rw-r--r--app/views/auth/passwords/edit.html.haml8
-rw-r--r--app/views/auth/passwords/new.html.haml6
-rw-r--r--app/views/auth/registrations/edit.html.haml12
-rw-r--r--app/views/auth/registrations/new.html.haml12
-rw-r--r--app/views/auth/sessions/new.html.haml8
-rw-r--r--app/views/auth/shared/_links.html.haml11
-rw-r--r--app/views/layouts/application.html.haml2
-rw-r--r--app/views/layouts/public.html.haml4
-rw-r--r--app/views/settings/preferences/show.html.haml12
-rw-r--r--app/views/settings/profiles/show.html.haml8
-rw-r--r--app/views/settings/shared/_links.html.haml6
-rw-r--r--app/views/shared/_error_messages.html.haml5
13 files changed, 46 insertions, 54 deletions
diff --git a/app/views/auth/confirmations/new.html.haml b/app/views/auth/confirmations/new.html.haml
index f34135c63..a5a228cfa 100644
--- a/app/views/auth/confirmations/new.html.haml
+++ b/app/views/auth/confirmations/new.html.haml
@@ -1,12 +1,12 @@
 - content_for :page_title do
-  Confirmation instructions
+  = t('auth.resend_confirmation')
 
 = simple_form_for(resource, as: resource_name, url: confirmation_path(resource_name), html: { method: :post }) do |f|
   = render 'shared/error_messages', object: resource
 
-  = f.input :email, autofocus: true, required: true, placeholder: 'E-mail address', input_html: { 'aria-label' => 'E-mail address' }
+  = f.input :email, autofocus: true, required: true, placeholder: t('simple_form.labels.defaults.email'), input_html: { 'aria-label' => t('simple_form.labels.defaults.email') }
 
   .actions
-    = f.button :button, "Resend confirmation instructions", type: :submit
+    = f.button :button, t('auth.resend_confirmation'), type: :submit
 
 .form-footer= render "auth/shared/links"
diff --git a/app/views/auth/passwords/edit.html.haml b/app/views/auth/passwords/edit.html.haml
index caae60f21..706684a74 100644
--- a/app/views/auth/passwords/edit.html.haml
+++ b/app/views/auth/passwords/edit.html.haml
@@ -1,14 +1,14 @@
 - content_for :page_title do
-  Set new password
+  = t('auth.set_new_password')
 
 = simple_form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :put }) do |f|
   = render 'shared/error_messages', object: resource
   = f.input :reset_password_token, as: :hidden
 
-  = f.input :password, autofocus: true, autocomplete: "off", placeholder: 'New password', input_html: { 'aria-label' => 'New password' }
-  = f.input :password_confirmation, autocomplete: "off", placeholder: 'Confirm new password', input_html: { 'aria-label' => 'Confirm new password' }
+  = f.input :password, autofocus: true, autocomplete: "off", placeholder: t('simple_form.labels.defaults.new_password'), input_html: { 'aria-label' => t('simple_form.labels.defaults.new_password') }
+  = f.input :password_confirmation, autocomplete: "off", placeholder: t('simple_form.labels.defaults.confirm_new_password'), input_html: { 'aria-label' => t('simple_form.labels.defaults.confirm_new_password') }
 
   .actions
-    = f.button :button, "Change my password", type: :submit
+    = f.button :button, t('auth.set_new_password'), type: :submit
 
 .form-footer= render "devise/shared/links"
diff --git a/app/views/auth/passwords/new.html.haml b/app/views/auth/passwords/new.html.haml
index 8bed953a5..077a6cea3 100644
--- a/app/views/auth/passwords/new.html.haml
+++ b/app/views/auth/passwords/new.html.haml
@@ -1,12 +1,12 @@
 - content_for :page_title do
-  Reset password
+  = t('auth.reset_password')
 
 = simple_form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :post }) do |f|
   = render 'shared/error_messages', object: resource
 
-  = f.input :email, autofocus: true, required: true, placeholder: 'E-mail address', input_html: { 'aria-label' => 'E-mail address' }
+  = f.input :email, autofocus: true, required: true, placeholder: t('simple_form.labels.defaults.email'), input_html: { 'aria-label' => t('simple_form.labels.defaults.email') }
 
   .actions
-    = f.button :button, "Reset password", type: :submit
+    = f.button :button, t('auth.reset_password'), type: :submit
 
 .form-footer= render "auth/shared/links"
diff --git a/app/views/auth/registrations/edit.html.haml b/app/views/auth/registrations/edit.html.haml
index 807b043fc..91e0fe142 100644
--- a/app/views/auth/registrations/edit.html.haml
+++ b/app/views/auth/registrations/edit.html.haml
@@ -1,15 +1,15 @@
 - content_for :page_title do
-  Change password
+  = t('auth.change_password')
 
 = simple_form_for(resource, as: resource_name, url: registration_path(resource_name), html: { method: :put }) do |f|
   = render 'shared/error_messages', object: resource
 
-  = f.input :email, placeholder: 'E-mail address', input_html: { 'aria-label' => 'E-mail address' }
-  = f.input :password, autocomplete: "off", placeholder: 'New password', input_html: { 'aria-label' => 'New password' }
-  = f.input :password_confirmation, autocomplete: "off", placeholder: 'Confirm new password', input_html: { 'aria-label' => 'Confirm new password' }
-  = f.input :current_password, autocomplete: "off", placeholder: 'Current password', input_html: { 'aria-label' => 'Current password' }
+  = f.input :email, placeholder: t('simple_form.labels.defaults.email'), input_html: { 'aria-label' => t('simple_form.labels.defaults.email') }
+  = f.input :password, autocomplete: "off", placeholder: t('simple_form.labels.defaults.new_password'), input_html: { 'aria-label' => t('simple_form.labels.defaults.new_password') }
+  = f.input :password_confirmation, autocomplete: "off", placeholder: t('simple_form.labels.defaults.confirm_new_password'), input_html: { 'aria-label' => t('simple_form.labels.defaults.confirm_new_password') }
+  = f.input :current_password, autocomplete: "off", placeholder: t('simple_form.labels.defaults.current_password'), input_html: { 'aria-label' => t('simple_form.labels.defaults.current_password') }
 
   .actions
-    = f.button :button, "Save changes", type: :submit
+    = f.button :button, t('generic.save_changes'), type: :submit
 
 .form-footer= render "settings/shared/links"
diff --git a/app/views/auth/registrations/new.html.haml b/app/views/auth/registrations/new.html.haml
index d78a8d06b..7fd36f009 100644
--- a/app/views/auth/registrations/new.html.haml
+++ b/app/views/auth/registrations/new.html.haml
@@ -1,17 +1,17 @@
 - content_for :page_title do
-  Sign up
+  = t('auth.register')
 
 = simple_form_for(resource, as: resource_name, url: registration_path(resource_name)) do |f|
   = render 'shared/error_messages', object: resource
 
   = f.simple_fields_for :account do |ff|
-    = ff.input :username, autofocus: true, placeholder: 'Username', required: true, input_html: { 'aria-label' => 'Username' }
+    = ff.input :username, autofocus: true, placeholder: t('simple_form.labels.defaults.username'), required: true, input_html: { 'aria-label' => t('simple_form.labels.defaults.username') }
 
-  = f.input :email, placeholder: 'E-mail address', required: true, input_html: { 'aria-label' => 'E-mail address' }
-  = f.input :password, autocomplete: "off", placeholder: 'Password', required: true, input_html: { 'aria-label' => 'Password' }
-  = f.input :password_confirmation, autocomplete: "off", placeholder: 'Confirm password', required: true, input_html: { 'aria-label' => 'Confirm password' }
+  = f.input :email, placeholder: t('simple_form.labels.defaults.email'), required: true, input_html: { 'aria-label' => t('simple_form.labels.defaults.email') }
+  = f.input :password, autocomplete: "off", placeholder: t('simple_form.labels.defaults.password'), required: true, input_html: { 'aria-label' => t('simple_form.labels.defaults.password') }
+  = f.input :password_confirmation, autocomplete: "off", placeholder: t('simple_form.labels.defaults.confirm_password'), required: true, input_html: { 'aria-label' => t('simple_form.labels.defaults.confirm_password') }
 
   .actions
-    = f.button :button, "Sign up", type: :submit
+    = f.button :button, t('auth.register'), type: :submit
 
 .form-footer= render "auth/shared/links"
diff --git a/app/views/auth/sessions/new.html.haml b/app/views/auth/sessions/new.html.haml
index ced85d20c..93b9629f1 100644
--- a/app/views/auth/sessions/new.html.haml
+++ b/app/views/auth/sessions/new.html.haml
@@ -1,11 +1,11 @@
 - content_for :page_title do
-  Log in
+  = t('auth.login')
 
 = simple_form_for(resource, as: resource_name, url: session_path(resource_name)) do |f|
-  = f.input :email, autofocus: true, placeholder: 'E-mail address', required: true, input_html: { 'aria-label' => 'E-mail address' }
-  = f.input :password, placeholder: 'Password', required: true, input_html: { 'aria-label' => 'Password' }
+  = f.input :email, autofocus: true, placeholder: t('simple_form.labels.defaults.email'), required: true, input_html: { 'aria-label' => t('simple_form.labels.defaults.email') }
+  = f.input :password, placeholder: t('simple_form.labels.defaults.password'), required: true, input_html: { 'aria-label' => t('simple_form.labels.defaults.password') }
 
   .actions
-    = f.button :button, "Log in", type: :submit
+    = f.button :button, t('auth.login'), type: :submit
 
 .form-footer= render "auth/shared/links"
diff --git a/app/views/auth/shared/_links.html.haml b/app/views/auth/shared/_links.html.haml
index d24c7d98f..08b385092 100644
--- a/app/views/auth/shared/_links.html.haml
+++ b/app/views/auth/shared/_links.html.haml
@@ -1,15 +1,12 @@
 %ul.no-list
   - if controller_name != 'sessions'
-    %li= link_to "Log in", new_session_path(resource_name)
+    %li= link_to t('auth.login'), new_session_path(resource_name)
 
   - if devise_mapping.registerable? && controller_name != 'registrations'
-    %li= link_to "Sign up", new_registration_path(resource_name)
+    %li= link_to t('auth.register'), new_registration_path(resource_name)
 
   - if devise_mapping.recoverable? && controller_name != 'passwords' && controller_name != 'registrations'
-    %li= link_to "Forgot your password?", new_password_path(resource_name)
+    %li= link_to t('auth.forgot_password'), new_password_path(resource_name)
 
   - if devise_mapping.confirmable? && controller_name != 'confirmations'
-    %li= link_to "Didn't receive confirmation instructions?", new_confirmation_path(resource_name)
-
-  - if devise_mapping.lockable? && resource_class.unlock_strategy_enabled?(:email) && controller_name != 'unlocks'
-    %li= link_to "Didn't receive unlock instructions?", new_unlock_path(resource_name)
+    %li= link_to t('auth.didnt_get_confirmation'), new_confirmation_path(resource_name)
diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml
index fbb48d621..7e28d27ec 100644
--- a/app/views/layouts/application.html.haml
+++ b/app/views/layouts/application.html.haml
@@ -14,7 +14,7 @@
       = "#{yield(:page_title)} - " if content_for?(:page_title)
       Mastodon
 
-    = stylesheet_link_tag    'application', media: 'all'
+    = stylesheet_link_tag 'application', media: 'all'
     = csrf_meta_tags
 
     = yield :header_tags
diff --git a/app/views/layouts/public.html.haml b/app/views/layouts/public.html.haml
index 0e56bef1f..e6de7d017 100644
--- a/app/views/layouts/public.html.haml
+++ b/app/views/layouts/public.html.haml
@@ -6,8 +6,6 @@
   .footer
     %span.domain= link_to Rails.configuration.x.local_domain, root_path
     %span.powered-by
-      \//
-      powered by
-      = link_to 'Mastodon', 'https://github.com/Gargron/mastodon'
+      = t('generic.powered_by', link: link_to('Mastodon', 'https://github.com/Gargron/mastodon')).html_safe
 
 = render template: "layouts/application"
diff --git a/app/views/settings/preferences/show.html.haml b/app/views/settings/preferences/show.html.haml
index 9fc4e91ca..21a6dbd5d 100644
--- a/app/views/settings/preferences/show.html.haml
+++ b/app/views/settings/preferences/show.html.haml
@@ -1,16 +1,16 @@
 - content_for :page_title do
-  Preferences
+  = t('settings.preferences')
 
 = simple_form_for current_user, url: settings_preferences_path, html: { method: :put } do |f|
   = render 'shared/error_messages', object: current_user
 
   = f.simple_fields_for :notification_emails, current_user.settings(:notification_emails) do |ff|
-    = ff.input :follow, as: :boolean, wrapper: :with_label, label: 'Send e-mail when someone follows you'
-    = ff.input :reblog, as: :boolean, wrapper: :with_label, label: 'Send e-mail when someone reblogs your status'
-    = ff.input :favourite, as: :boolean, wrapper: :with_label, label: 'Send e-mail when someone favourites your status'
-    = ff.input :mention, as: :boolean, wrapper: :with_label, label: 'Send e-mail when someone mentions you'
+    = ff.input :follow, as: :boolean, wrapper: :with_label
+    = ff.input :reblog, as: :boolean, wrapper: :with_label
+    = ff.input :favourite, as: :boolean, wrapper: :with_label
+    = ff.input :mention, as: :boolean, wrapper: :with_label
 
   .actions
-    = f.button :button, 'Save changes', type: :submit
+    = f.button :button, t('generic.save_changes'), type: :submit
 
 .form-footer= render "settings/shared/links"
diff --git a/app/views/settings/profiles/show.html.haml b/app/views/settings/profiles/show.html.haml
index df0cc3227..c2f1adb12 100644
--- a/app/views/settings/profiles/show.html.haml
+++ b/app/views/settings/profiles/show.html.haml
@@ -1,15 +1,15 @@
 - content_for :page_title do
-  Edit profile
+  = t('settings.edit_profile')
 
 = simple_form_for @account, url: settings_profile_path, html: { method: :put } do |f|
   = render 'shared/error_messages', object: @account
 
-  = f.input :display_name, placeholder: 'Display name'
-  = f.input :note, placeholder: 'Bio'
+  = f.input :display_name, placeholder: t('simple_form.labels.defaults.display_name')
+  = f.input :note, placeholder: t('simple_form.labels.defaults.note')
   = f.input :avatar, wrapper: :with_label
   = f.input :header, wrapper: :with_label
 
   .actions
-    = f.button :button, 'Save changes', type: :submit
+    = f.button :button, t('generic.save_changes'), type: :submit
 
 .form-footer= render "settings/shared/links"
diff --git a/app/views/settings/shared/_links.html.haml b/app/views/settings/shared/_links.html.haml
index 520300416..44f097950 100644
--- a/app/views/settings/shared/_links.html.haml
+++ b/app/views/settings/shared/_links.html.haml
@@ -1,7 +1,7 @@
 %ul.no-list
   - if controller_name != 'profiles'
-    %li= link_to "Edit profile", settings_profile_path
+    %li= link_to t('settings.edit_profile'), settings_profile_path
   - if controller_name != 'preferences'
-    %li= link_to "Preferences", settings_preferences_path
+    %li= link_to t('settings.preferences'), settings_preferences_path
   - if controller_name != 'registrations'
-    %li= link_to "Change password", edit_user_registration_path
+    %li= link_to t('auth.change_password'), edit_user_registration_path
diff --git a/app/views/shared/_error_messages.html.haml b/app/views/shared/_error_messages.html.haml
index 269365359..b73890216 100644
--- a/app/views/shared/_error_messages.html.haml
+++ b/app/views/shared/_error_messages.html.haml
@@ -1,6 +1,3 @@
 - if object.errors.any?
   .flash-message#error_explanation
-    %strong
-      Something isn't quite right yet! Please review
-      = pluralize(object.errors.count, 'error')
-      below:
+    %strong= t('generic.validation_errors', count: object.errors.count)