Mirrors/astuto
1
0
Fork 0
mirror of https://github.com/astuto/astuto.git synced 2025-12-15 11:17:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

Bump ruby to 3.0.6 (#218)

Browse Source 
* Bump ruby to 2.7.8
* Bump listen to 3.5.1 (remove dependency on ruby_dep)
* Bump ruby to 3.0.6
* Fix I18n.translate arguments: from hash to keyword arguments
This commit is contained in:
Riccardo Graziosi
2023-05-09 09:32:18 +02:00
committed by GitHub
parent 5b9edd4745
commit 10f06c9760
17 changed files with 35 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/views/devise/mailer/confirmation_instructions.html.erb
View File

@@ -1,4 +1,4 @@
<p><%= t('mailers.devise.welcome_greeting', { email: @email, site_name: Current.tenant_or_raise!.site_name }) %></p>
<p><%= t('mailers.devise.welcome_greeting', email: @email, site_name: Current.tenant_or_raise!.site_name) %></p>
<p><%= t('mailers.devise.confirmation_instructions.body') %></p>

6
app/views/devise/mailer/email_changed.html.erb
View File

@@ -1,7 +1,7 @@
<p><%= t('mailers.devise.opening_greeting', { email: @email }) %></p>
<p><%= t('mailers.devise.opening_greeting', email: @email) %></p>
<% if @resource.try(:unconfirmed_email?) %>
<p><%= t('mailers.devise.email_changed.body', { email: @resource.unconfirmed_email }) %></p>
<p><%= t('mailers.devise.email_changed.body', email: @resource.unconfirmed_email) %></p>
<% else %>
<p><%= t('mailers.devise.email_changed.body', { email: @resource.email }) %></p>
<p><%= t('mailers.devise.email_changed.body', email: @resource.email) %></p>
<% end %>

2
app/views/devise/mailer/password_change.html.erb
View File

@@ -1,3 +1,3 @@
<p><%= t('mailers.devise.opening_greeting', { email: @resource.email }) %></p>
<p><%= t('mailers.devise.opening_greeting', email: @resource.email) %></p>
<p><%= t('mailers.devise.password_change.body') %></p>

2
app/views/devise/mailer/reset_password_instructions.html.erb
View File

@@ -1,4 +1,4 @@
<p><%= t('mailers.devise.opening_greeting', { email: @resource.email }) %></p>
<p><%= t('mailers.devise.opening_greeting', email: @resource.email) %></p>
<p><%= t('mailers.devise.reset_password.body') %></p>

2
app/views/devise/passwords/edit.html.erb
View File

@@ -15,7 +15,7 @@
<% if @minimum_password_length %>
<small id="passwordHelp" class="form-text text-muted">
(<%= t('common.forms.auth.password_help', { count: @minimum_password_length }) %>)
(<%= t('common.forms.auth.password_help', count: @minimum_password_length) %>)
</small>
<% end %>
</div>

2
app/views/devise/registrations/new.html.erb
View File

@@ -45,7 +45,7 @@
<hr />
<% @o_auths.each do |o_auth| %>
<p>
<%= link_to t('common.forms.auth.sign_up_with', { o_auth: o_auth.name }),
<%= link_to t('common.forms.auth.sign_up_with', o_auth: o_auth.name),
o_auth_start_path(o_auth, reason: 'user') %>
</p>
<% end %>

2
app/views/devise/sessions/new.html.erb
View File

@@ -34,7 +34,7 @@
<hr />
<% @o_auths.each do |o_auth| %>
<p>
<%= link_to t('common.forms.auth.log_in_with', { o_auth: o_auth.name }),
<%= link_to t('common.forms.auth.log_in_with', o_auth: o_auth.name),
o_auth_start_path(o_auth, reason: 'user') %>
</p>
<% end %>

6
app/views/o_auths/test.html.erb
View File

@@ -1,10 +1,10 @@
<!DOCTYPE html>
<html>
<head>
<title><%= t('site_settings.authentication.test_page.title', { name: @o_auth.name }) %></title>
<title><%= t('site_settings.authentication.test_page.title', name: @o_auth.name) %></title>
</head>
<body>
<h1><%= t('site_settings.authentication.test_page.title', { name: @o_auth.name }) %></h1>
<h1><%= t('site_settings.authentication.test_page.title', name: @o_auth.name) %></h1>
<div>
<h2><%= t('site_settings.authentication.test_page.fetched_user_data') %></h2>
@@ -36,7 +36,7 @@
<% end %>
<% if @email_valid and not @name_valid %>
<p><%= t('site_settings.authentication.test_page.warning_configuration', { name: t('defaults.user_full_name') }) %></p>
<p><%= t('site_settings.authentication.test_page.warning_configuration', name: t('defaults.user_full_name')) %></p>
<% end %>
<% if not @email_valid %>

2
app/views/user_mailer/notify_comment_owner.html.erb
View File

@@ -1,5 +1,5 @@
<p>
<%= t('mailers.user.notify_comment_owner.body', { user: @comment.user.full_name, post: @comment.post.title }) %>
<%= t('mailers.user.notify_comment_owner.body', user: @comment.user.full_name, post: @comment.post.title) %>
</p>
<p>

2
app/views/user_mailer/notify_followers_of_post_status_change.html.erb
View File

@@ -1,5 +1,5 @@
<p>
<%= t('mailers.user.notify_followers_of_post_status_change.body', { post: @post }) %>
<%= t('mailers.user.notify_followers_of_post_status_change.body', post: @post) %>
<span style='background-color: <%= @post.post_status.color %>; color: white;'%>>
<%= @post.post_status.name %>
</span>

2
app/views/user_mailer/notify_followers_of_post_update.html.erb
View File

@@ -1,5 +1,5 @@
<p>
<%= t('mailers.user.notify_followers_of_post_update.body', { user: @comment.user.full_name, post: @comment.post.title }) %>
<%= t('mailers.user.notify_followers_of_post_update.body', user: @comment.user.full_name, post: @comment.post.title) %>
</p>
<p>

2
app/views/user_mailer/notify_post_owner.html.erb
View File

@@ -1,5 +1,5 @@
<p>
<%= t('mailers.user.notify_post_owner.body', { user: @comment.user.full_name, post: @comment.post.title }) %>
<%= t('mailers.user.notify_post_owner.body', user: @comment.user.full_name, post: @comment.post.title) %>
</p>
<p>