Skip to content

Commit

Permalink
Fix missing source strings and inconsistent lead text style in admin …
Browse files Browse the repository at this point in the history
…UI (#16052)
  • Loading branch information
Gargron authored Apr 17, 2021
1 parent b3ceb3d commit 480d7c9
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 9 deletions.
2 changes: 0 additions & 2 deletions app/helpers/application_helper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -91,8 +91,6 @@ def visibility_icon(status)
fa_icon('unlock', title: I18n.t('statuses.visibilities.unlisted'))
elsif status.private_visibility? || status.limited_visibility?
fa_icon('lock', title: I18n.t('statuses.visibilities.private'))
elsif status.direct_visibility?
fa_icon('envelope', title: I18n.t('statuses.visibilities.direct'))
end
end

Expand Down
3 changes: 1 addition & 2 deletions app/views/admin/follow_recommendations/show.html.haml
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,7 @@
- content_for :header_tags do
= javascript_pack_tag 'admin', async: true, crossorigin: 'anonymous'

.simple_form
%p.hint= t('admin.follow_recommendations.description_html')
%p= t('admin.follow_recommendations.description_html')

%hr.spacer/

Expand Down
5 changes: 3 additions & 2 deletions app/views/admin/rules/index.html.haml
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
- content_for :page_title do
= t('admin.rules.title')

.simple_form
%p.hint= t('admin.rules.description')
%p= t('admin.rules.description_html')

%hr.spacer/

- if can? :create, :rule
= simple_form_for @rule, url: admin_rules_path do |f|
Expand Down
4 changes: 2 additions & 2 deletions app/views/user_mailer/webauthn_enabled.text.erb
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<%= t 'devise.mailer.webauthn_credentia.added.title' %>
<%= t 'devise.mailer.webauthn_credential.added.title' %>

===

<%= t 'devise.mailer.webauthn_credentia.added.explanation' %>
<%= t 'devise.mailer.webauthn_credential.added.explanation' %>

=> <%= edit_user_registration_url %>
7 changes: 6 additions & 1 deletion config/locales/en.yml
Original file line number Diff line number Diff line change
Expand Up @@ -315,10 +315,12 @@ en:
new:
create: Create announcement
title: New announcement
publish: Publish
published_msg: Announcement successfully published!
scheduled_for: Scheduled for %{time}
scheduled_msg: Announcement scheduled for publication!
title: Announcements
unpublish: Unpublish
unpublished_msg: Announcement successfully unpublished!
updated_msg: Announcement successfully updated!
custom_emojis:
Expand Down Expand Up @@ -552,8 +554,10 @@ en:
updated_at: Updated
rules:
add_new: Add rule
description: While most claim to have read and agree to the terms of service, usually people do not read through until after a problem arises. Make it easier to see your server's rules at a glance by providing them in a flat bullet point list. Try to keep individual rules short and simple, but try not to split them up into many separate items either.
delete: Delete
description_html: While most claim to have read and agree to the terms of service, usually people do not read through until after a problem arises. <strong>Make it easier to see your server's rules at a glance by providing them in a flat bullet point list.</strong> Try to keep individual rules short and simple, but try not to split them up into many separate items either.
edit: Edit rule
empty: No server rules have been defined yet.
title: Server rules
settings:
activity_api_enabled:
Expand Down Expand Up @@ -695,6 +699,7 @@ en:
add_new: Add new
delete: Delete
edit_preset: Edit warning preset
empty: You haven't defined any warning presets yet.
title: Manage warning presets
admin_mailer:
new_pending_account:
Expand Down

0 comments on commit 480d7c9

Please sign in to comment.