mirrors/mastodon
1
0
Fork 0
mirror of https://github.com/mastodon/mastodon.git synced 2024-11-24 21:45:06 +01:00
Code Issues Projects Releases Wiki Activity

Fix missing source strings and inconsistent lead text style in admin UI (#16052)

Browse Source
This commit is contained in:
Eugen Rochko 2021-04-17 11:12:49 +02:00 committed by GitHub
parent b3ceb3dcc4
commit 480d7c9478
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/helpers/application_helper.rb
View File

@ -91,8 +91,6 @@ module ApplicationHelper
fa_icon('unlock', title: I18n.t('statuses.visibilities.unlisted')) fa_icon('unlock', title: I18n.t('statuses.visibilities.unlisted'))
elsif status.private_visibility? || status.limited_visibility? elsif status.private_visibility? || status.limited_visibility?
fa_icon('lock', title: I18n.t('statuses.visibilities.private')) fa_icon('lock', title: I18n.t('statuses.visibilities.private'))
elsif status.direct_visibility?
fa_icon('envelope', title: I18n.t('statuses.visibilities.direct'))
end end
end end

3
app/views/admin/follow_recommendations/show.html.haml
View File

@ -4,8 +4,7 @@
- content_for :header_tags do - content_for :header_tags do
= javascript_pack_tag 'admin', async: true, crossorigin: 'anonymous' = javascript_pack_tag 'admin', async: true, crossorigin: 'anonymous'
.simple_form %p= t('admin.follow_recommendations.description_html')
%p.hint= t('admin.follow_recommendations.description_html')
%hr.spacer/ %hr.spacer/

5
app/views/admin/rules/index.html.haml
View File

@ -1,8 +1,9 @@
- content_for :page_title do - content_for :page_title do
= t('admin.rules.title') = t('admin.rules.title')
.simple_form %p= t('admin.rules.description_html')
%p.hint= t('admin.rules.description')
%hr.spacer/
- if can? :create, :rule - if can? :create, :rule
= simple_form_for @rule, url: admin_rules_path do |f| = simple_form_for @rule, url: admin_rules_path do |f|

4
app/views/user_mailer/webauthn_enabled.text.erb
View File

@ -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 %> => <%= edit_user_registration_url %>

7
config/locales/en.yml
View File

@ -315,10 +315,12 @@ en:
new: new:
create: Create announcement create: Create announcement
title: New announcement title: New announcement
publish: Publish
published_msg: Announcement successfully published! published_msg: Announcement successfully published!
scheduled_for: Scheduled for %{time} scheduled_for: Scheduled for %{time}
scheduled_msg: Announcement scheduled for publication! scheduled_msg: Announcement scheduled for publication!
title: Announcements title: Announcements
unpublish: Unpublish
unpublished_msg: Announcement successfully unpublished! unpublished_msg: Announcement successfully unpublished!
updated_msg: Announcement successfully updated! updated_msg: Announcement successfully updated!
custom_emojis: custom_emojis:
@ -552,8 +554,10 @@ en:
updated_at: Updated updated_at: Updated
rules: rules:
add_new: Add rule 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 edit: Edit rule
empty: No server rules have been defined yet.
title: Server rules title: Server rules
settings: settings:
activity_api_enabled: activity_api_enabled:
@ -695,6 +699,7 @@ en:
add_new: Add new add_new: Add new
delete: Delete delete: Delete
edit_preset: Edit warning preset edit_preset: Edit warning preset
empty: You haven't defined any warning presets yet.
title: Manage warning presets title: Manage warning presets
admin_mailer: admin_mailer:
new_pending_account: new_pending_account: