Adding some localizations
parent
a4313224d9
commit
3ce6ac0ce2
|
@ -7,7 +7,6 @@ class AboutController < ApplicationController
|
||||||
end
|
end
|
||||||
|
|
||||||
def terms
|
def terms
|
||||||
@state = 'TBD'
|
|
||||||
end
|
end
|
||||||
|
|
||||||
private
|
private
|
||||||
|
|
|
@ -15,7 +15,7 @@ class Settings::PreferencesController < ApplicationController
|
||||||
current_user.settings(:notification_emails).mention = user_params[:notification_emails][:mention] == '1'
|
current_user.settings(:notification_emails).mention = user_params[:notification_emails][:mention] == '1'
|
||||||
|
|
||||||
if current_user.save
|
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
|
else
|
||||||
render action: :show
|
render action: :show
|
||||||
end
|
end
|
||||||
|
|
|
@ -11,7 +11,7 @@ class Settings::ProfilesController < ApplicationController
|
||||||
|
|
||||||
def update
|
def update
|
||||||
if @account.update(account_params)
|
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
|
else
|
||||||
render action: :show
|
render action: :show
|
||||||
end
|
end
|
||||||
|
|
|
@ -3,8 +3,8 @@
|
||||||
module AccountsHelper
|
module AccountsHelper
|
||||||
def pagination_options
|
def pagination_options
|
||||||
{
|
{
|
||||||
previous_label: safe_join([fa_icon('chevron-left'), 'Prev'], ' '),
|
previous_label: safe_join([fa_icon('chevron-left'), t('pagination.prev')], ' '),
|
||||||
next_label: safe_join(['Next', fa_icon('chevron-right')], ' '),
|
next_label: safe_join([t('pagination.next'), fa_icon('chevron-right')], ' '),
|
||||||
inner_window: 1,
|
inner_window: 1,
|
||||||
outer_window: 0,
|
outer_window: 0,
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,12 +1,12 @@
|
||||||
- content_for :page_title do
|
- 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|
|
= simple_form_for(resource, as: resource_name, url: confirmation_path(resource_name), html: { method: :post }) do |f|
|
||||||
= render 'shared/error_messages', object: resource
|
= 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
|
.actions
|
||||||
= f.button :button, "Resend confirmation instructions", type: :submit
|
= f.button :button, t('auth.resend_confirmation'), type: :submit
|
||||||
|
|
||||||
.form-footer= render "auth/shared/links"
|
.form-footer= render "auth/shared/links"
|
||||||
|
|
|
@ -1,14 +1,14 @@
|
||||||
- content_for :page_title do
|
- 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|
|
= simple_form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :put }) do |f|
|
||||||
= render 'shared/error_messages', object: resource
|
= render 'shared/error_messages', object: resource
|
||||||
= f.input :reset_password_token, as: :hidden
|
= 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, 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: 'Confirm new password', input_html: { 'aria-label' => 'Confirm 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
|
.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"
|
.form-footer= render "devise/shared/links"
|
||||||
|
|
|
@ -1,12 +1,12 @@
|
||||||
- content_for :page_title do
|
- 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|
|
= simple_form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :post }) do |f|
|
||||||
= render 'shared/error_messages', object: resource
|
= 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
|
.actions
|
||||||
= f.button :button, "Reset password", type: :submit
|
= f.button :button, t('auth.reset_password'), type: :submit
|
||||||
|
|
||||||
.form-footer= render "auth/shared/links"
|
.form-footer= render "auth/shared/links"
|
||||||
|
|
|
@ -1,15 +1,15 @@
|
||||||
- content_for :page_title do
|
- 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|
|
= simple_form_for(resource, as: resource_name, url: registration_path(resource_name), html: { method: :put }) do |f|
|
||||||
= render 'shared/error_messages', object: resource
|
= render 'shared/error_messages', object: resource
|
||||||
|
|
||||||
= f.input :email, placeholder: 'E-mail address', input_html: { 'aria-label' => 'E-mail address' }
|
= 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: 'New password', input_html: { 'aria-label' => 'New password' }
|
= 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: 'Confirm new password', input_html: { 'aria-label' => 'Confirm 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: 'Current password', input_html: { 'aria-label' => 'Current 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
|
.actions
|
||||||
= f.button :button, "Save changes", type: :submit
|
= f.button :button, t('generic.save_changes'), type: :submit
|
||||||
|
|
||||||
.form-footer= render "settings/shared/links"
|
.form-footer= render "settings/shared/links"
|
||||||
|
|
|
@ -1,17 +1,17 @@
|
||||||
- content_for :page_title do
|
- content_for :page_title do
|
||||||
Sign up
|
= t('auth.register')
|
||||||
|
|
||||||
= simple_form_for(resource, as: resource_name, url: registration_path(resource_name)) do |f|
|
= simple_form_for(resource, as: resource_name, url: registration_path(resource_name)) do |f|
|
||||||
= render 'shared/error_messages', object: resource
|
= render 'shared/error_messages', object: resource
|
||||||
|
|
||||||
= f.simple_fields_for :account do |ff|
|
= 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 :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: 'Password', required: true, input_html: { 'aria-label' => 'Password' }
|
= 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: 'Confirm password', required: true, input_html: { 'aria-label' => 'Confirm 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
|
.actions
|
||||||
= f.button :button, "Sign up", type: :submit
|
= f.button :button, t('auth.register'), type: :submit
|
||||||
|
|
||||||
.form-footer= render "auth/shared/links"
|
.form-footer= render "auth/shared/links"
|
||||||
|
|
|
@ -1,11 +1,11 @@
|
||||||
- content_for :page_title do
|
- content_for :page_title do
|
||||||
Log in
|
= t('auth.login')
|
||||||
|
|
||||||
= simple_form_for(resource, as: resource_name, url: session_path(resource_name)) do |f|
|
= 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 :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: 'Password', required: true, input_html: { 'aria-label' => 'Password' }
|
= f.input :password, placeholder: t('simple_form.labels.defaults.password'), required: true, input_html: { 'aria-label' => t('simple_form.labels.defaults.password') }
|
||||||
|
|
||||||
.actions
|
.actions
|
||||||
= f.button :button, "Log in", type: :submit
|
= f.button :button, t('auth.login'), type: :submit
|
||||||
|
|
||||||
.form-footer= render "auth/shared/links"
|
.form-footer= render "auth/shared/links"
|
||||||
|
|
|
@ -1,15 +1,12 @@
|
||||||
%ul.no-list
|
%ul.no-list
|
||||||
- if controller_name != 'sessions'
|
- 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'
|
- 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'
|
- 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'
|
- if devise_mapping.confirmable? && controller_name != 'confirmations'
|
||||||
%li= link_to "Didn't receive confirmation instructions?", new_confirmation_path(resource_name)
|
%li= link_to t('auth.didnt_get_confirmation'), 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)
|
|
||||||
|
|
|
@ -14,7 +14,7 @@
|
||||||
= "#{yield(:page_title)} - " if content_for?(:page_title)
|
= "#{yield(:page_title)} - " if content_for?(:page_title)
|
||||||
Mastodon
|
Mastodon
|
||||||
|
|
||||||
= stylesheet_link_tag 'application', media: 'all'
|
= stylesheet_link_tag 'application', media: 'all'
|
||||||
= csrf_meta_tags
|
= csrf_meta_tags
|
||||||
|
|
||||||
= yield :header_tags
|
= yield :header_tags
|
||||||
|
|
|
@ -6,8 +6,6 @@
|
||||||
.footer
|
.footer
|
||||||
%span.domain= link_to Rails.configuration.x.local_domain, root_path
|
%span.domain= link_to Rails.configuration.x.local_domain, root_path
|
||||||
%span.powered-by
|
%span.powered-by
|
||||||
\//
|
= t('generic.powered_by', link: link_to('Mastodon', 'https://github.com/Gargron/mastodon')).html_safe
|
||||||
powered by
|
|
||||||
= link_to 'Mastodon', 'https://github.com/Gargron/mastodon'
|
|
||||||
|
|
||||||
= render template: "layouts/application"
|
= render template: "layouts/application"
|
||||||
|
|
|
@ -1,16 +1,16 @@
|
||||||
- content_for :page_title do
|
- content_for :page_title do
|
||||||
Preferences
|
= t('settings.preferences')
|
||||||
|
|
||||||
= simple_form_for current_user, url: settings_preferences_path, html: { method: :put } do |f|
|
= simple_form_for current_user, url: settings_preferences_path, html: { method: :put } do |f|
|
||||||
= render 'shared/error_messages', object: current_user
|
= render 'shared/error_messages', object: current_user
|
||||||
|
|
||||||
= f.simple_fields_for :notification_emails, current_user.settings(:notification_emails) do |ff|
|
= 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 :follow, as: :boolean, wrapper: :with_label
|
||||||
= ff.input :reblog, as: :boolean, wrapper: :with_label, label: 'Send e-mail when someone reblogs your status'
|
= ff.input :reblog, as: :boolean, wrapper: :with_label
|
||||||
= ff.input :favourite, as: :boolean, wrapper: :with_label, label: 'Send e-mail when someone favourites your status'
|
= ff.input :favourite, as: :boolean, wrapper: :with_label
|
||||||
= ff.input :mention, as: :boolean, wrapper: :with_label, label: 'Send e-mail when someone mentions you'
|
= ff.input :mention, as: :boolean, wrapper: :with_label
|
||||||
|
|
||||||
.actions
|
.actions
|
||||||
= f.button :button, 'Save changes', type: :submit
|
= f.button :button, t('generic.save_changes'), type: :submit
|
||||||
|
|
||||||
.form-footer= render "settings/shared/links"
|
.form-footer= render "settings/shared/links"
|
||||||
|
|
|
@ -1,15 +1,15 @@
|
||||||
- content_for :page_title do
|
- content_for :page_title do
|
||||||
Edit profile
|
= t('settings.edit_profile')
|
||||||
|
|
||||||
= simple_form_for @account, url: settings_profile_path, html: { method: :put } do |f|
|
= simple_form_for @account, url: settings_profile_path, html: { method: :put } do |f|
|
||||||
= render 'shared/error_messages', object: @account
|
= render 'shared/error_messages', object: @account
|
||||||
|
|
||||||
= f.input :display_name, placeholder: 'Display name'
|
= f.input :display_name, placeholder: t('simple_form.labels.defaults.display_name')
|
||||||
= f.input :note, placeholder: 'Bio'
|
= f.input :note, placeholder: t('simple_form.labels.defaults.note')
|
||||||
= f.input :avatar, wrapper: :with_label
|
= f.input :avatar, wrapper: :with_label
|
||||||
= f.input :header, wrapper: :with_label
|
= f.input :header, wrapper: :with_label
|
||||||
|
|
||||||
.actions
|
.actions
|
||||||
= f.button :button, 'Save changes', type: :submit
|
= f.button :button, t('generic.save_changes'), type: :submit
|
||||||
|
|
||||||
.form-footer= render "settings/shared/links"
|
.form-footer= render "settings/shared/links"
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
%ul.no-list
|
%ul.no-list
|
||||||
- if controller_name != 'profiles'
|
- 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'
|
- if controller_name != 'preferences'
|
||||||
%li= link_to "Preferences", settings_preferences_path
|
%li= link_to t('settings.preferences'), settings_preferences_path
|
||||||
- if controller_name != 'registrations'
|
- if controller_name != 'registrations'
|
||||||
%li= link_to "Change password", edit_user_registration_path
|
%li= link_to t('auth.change_password'), edit_user_registration_path
|
||||||
|
|
|
@ -1,6 +1,3 @@
|
||||||
- if object.errors.any?
|
- if object.errors.any?
|
||||||
.flash-message#error_explanation
|
.flash-message#error_explanation
|
||||||
%strong
|
%strong= t('generic.validation_errors', count: object.errors.count)
|
||||||
Something isn't quite right yet! Please review
|
|
||||||
= pluralize(object.errors.count, 'error')
|
|
||||||
below:
|
|
||||||
|
|
|
@ -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:
|
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
|
||||||
|
|
|
@ -5,15 +5,27 @@ en:
|
||||||
required:
|
required:
|
||||||
text: 'required'
|
text: 'required'
|
||||||
mark: '*'
|
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:
|
error_notification:
|
||||||
default_message: "Please review the problems below:"
|
default_message: "Please review the problems below:"
|
||||||
# Examples
|
|
||||||
# labels:
|
labels:
|
||||||
# defaults:
|
defaults:
|
||||||
# password: 'Password'
|
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:
|
# user:
|
||||||
# new:
|
# new:
|
||||||
# email: 'E-mail to sign in.'
|
# email: 'E-mail to sign in.'
|
||||||
|
|
Reference in New Issue