about summary refs log tree commit diff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--app/controllers/about_controller.rb1
-rw-r--r--app/controllers/settings/preferences_controller.rb2
-rw-r--r--app/controllers/settings/profiles_controller.rb2
-rw-r--r--app/helpers/accounts_helper.rb4
-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
-rw-r--r--config/locales/en.yml44
-rw-r--r--config/locales/simple_form.en.yml26
19 files changed, 91 insertions, 88 deletions
diff --git a/app/controllers/about_controller.rb b/app/controllers/about_controller.rb
index 56ad6365d..7df58444f 100644
--- a/app/controllers/about_controller.rb
+++ b/app/controllers/about_controller.rb
@@ -7,7 +7,6 @@ class AboutController < ApplicationController
   end
 
   def terms
-    @state = 'TBD'
   end
 
   private
diff --git a/app/controllers/settings/preferences_controller.rb b/app/controllers/settings/preferences_controller.rb
index 7acef5e25..4dc2cd61f 100644
--- a/app/controllers/settings/preferences_controller.rb
+++ b/app/controllers/settings/preferences_controller.rb
@@ -15,7 +15,7 @@ class Settings::PreferencesController < ApplicationController
     current_user.settings(:notification_emails).mention   = user_params[:notification_emails][:mention]   == '1'
 
     if current_user.save
-      redirect_to settings_preferences_path, notice: 'Changes successfully saved!'
+      redirect_to settings_preferences_path, notice: I18n.t('generic.changes_saved_msg')
     else
       render action: :show
     end
diff --git a/app/controllers/settings/profiles_controller.rb b/app/controllers/settings/profiles_controller.rb
index bd4fa2c46..deff8fc7e 100644
--- a/app/controllers/settings/profiles_controller.rb
+++ b/app/controllers/settings/profiles_controller.rb
@@ -11,7 +11,7 @@ class Settings::ProfilesController < ApplicationController
 
   def update
     if @account.update(account_params)
-      redirect_to settings_profile_path, notice: 'Changes successfully saved!'
+      redirect_to settings_profile_path, notice: I18n.t('generic.changes_saved_msg')
     else
       render action: :show
     end
diff --git a/app/helpers/accounts_helper.rb b/app/helpers/accounts_helper.rb
index 17c7b4b82..af23a78d1 100644
--- a/app/helpers/accounts_helper.rb
+++ b/app/helpers/accounts_helper.rb
@@ -3,8 +3,8 @@
 module AccountsHelper
   def pagination_options
     {
-      previous_label: safe_join([fa_icon('chevron-left'), 'Prev'], ' '),
-      next_label: safe_join(['Next', fa_icon('chevron-right')], ' '),
+      previous_label: safe_join([fa_icon('chevron-left'), t('pagination.prev')], ' '),
+      next_label: safe_join([t('pagination.next'), fa_icon('chevron-right')], ' '),
       inner_window: 1,
       outer_window: 0,
     }
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)
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 065395716..55b062c0d 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1,23 +1,23 @@
-# Files in the config/locales directory are used for internationalization
-# and are automatically loaded by Rails. If you want to use locales other
-# than English, add the necessary files in this directory.
-#
-# To use the locales, use `I18n.t`:
-#
-#     I18n.t 'hello'
-#
-# In views, this is aliased to just `t`:
-#
-#     <%= t('hello') %>
-#
-# To use a different locale, set it with `I18n.locale`:
-#
-#     I18n.locale = :es
-#
-# This would use the information in config/locales/es.yml.
-#
-# To learn more, please read the Rails Internationalization guide
-# available at http://guides.rubyonrails.org/i18n.html.
-
 en:
-  hello: "Hello world"
+  auth:
+    login: Log in
+    register: Sign up
+    forgot_password: Forgot your password?
+    didnt_get_confirmation: Didn't receive confirmation instructions?
+    resend_confirmation: Resend confirmation instructions
+    reset_password: Reset password
+    set_new_password: Set new password
+    change_password: Change password
+  generic:
+    save_changes: Save changes
+    validation_errors:
+      one: Something isn't quite right yet! Please review the error below
+      other: Something isn't quite right yet! Please review %{count} errors below
+    powered_by: powered by %{link}
+    changes_saved_msg: Changes successfully saved!
+  pagination:
+    next: Next
+    prev: Prev
+  settings:
+    edit_profile: Edit profile
+    preferences: Preferences
diff --git a/config/locales/simple_form.en.yml b/config/locales/simple_form.en.yml
index 237438334..34bc94963 100644
--- a/config/locales/simple_form.en.yml
+++ b/config/locales/simple_form.en.yml
@@ -5,15 +5,27 @@ en:
     required:
       text: 'required'
       mark: '*'
-      # You can uncomment the line below if you need to overwrite the whole required html.
-      # When using html, text and mark won't be used.
-      # html: '<abbr title="required">*</abbr>'
     error_notification:
       default_message: "Please review the problems below:"
-    # Examples
-    # labels:
-    #   defaults:
-    #     password: 'Password'
+
+    labels:
+      defaults:
+        email: E-mail address
+        password: Password
+        username: Username
+        confirm_password: Confirm password
+        new_password: New password
+        confirm_new_password: Confirm new password
+        current_password: Current password
+        display_name: Display name
+        note: Bio
+        avatar: Avatar
+        header: Header
+      notification_emails:
+        follow: Send e-mail when someone follows you
+        reblog: Send e-mail when someone reblogs your status
+        favourite: Send e-mail when someone favourites your status
+        mention: Send e-mail when someone mentions you
     #   user:
     #     new:
     #       email: 'E-mail to sign in.'
generated by cgit-pink (git 2.37.1) at 2024-11-21 22:47:53 +0000