summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEugen Rochko <eugen@zeonfederated.com>2021-04-17 11:12:49 +0200
committerGitHub <noreply@github.com>2021-04-17 11:12:49 +0200
commit480d7c9478a9be3ac668b21402a269db41b10b18 (patch)
tree4504c4bedb85d0b933f8f14cef16fb2d216c6f22
parentb3ceb3dcc4df62803aa967d7aecee686973a8996 (diff)
Fix missing source strings and inconsistent lead text style in admin UI (#16052)
-rw-r--r--app/helpers/application_helper.rb2
-rw-r--r--app/views/admin/follow_recommendations/show.html.haml3
-rw-r--r--app/views/admin/rules/index.html.haml5
-rw-r--r--app/views/user_mailer/webauthn_enabled.text.erb4
-rw-r--r--config/locales/en.yml7
5 files changed, 12 insertions, 9 deletions
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index bf5742d34f2..fc2d2fea995 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -91,8 +91,6 @@ module ApplicationHelper
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
diff --git a/app/views/admin/follow_recommendations/show.html.haml b/app/views/admin/follow_recommendations/show.html.haml
index 1f050329a44..5b949a16504 100644
--- a/app/views/admin/follow_recommendations/show.html.haml
+++ b/app/views/admin/follow_recommendations/show.html.haml
@@ -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/
diff --git a/app/views/admin/rules/index.html.haml b/app/views/admin/rules/index.html.haml
index 3b069d083f0..4fb993ad078 100644
--- a/app/views/admin/rules/index.html.haml
+++ b/app/views/admin/rules/index.html.haml
@@ -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|
diff --git a/app/views/user_mailer/webauthn_enabled.text.erb b/app/views/user_mailer/webauthn_enabled.text.erb
index 4c233fefbd9..d4482a69bbc 100644
--- a/app/views/user_mailer/webauthn_enabled.text.erb
+++ b/app/views/user_mailer/webauthn_enabled.text.erb
@@ -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 %>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index afab6d9b565..88acf31645a 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -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:
@@ -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:
@@ -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: