Leatherface/mastodon
1
0
Fork 0
mirror of https://github.com/glitch-soc/mastodon.git synced 2025-12-13 07:49:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit 'f7b1769e8a69e2831493f3a704d68efa5cf9beff' into glitch-soc/merge-upstream

Browse Source
This commit is contained in:
Claire
2025-03-19 20:09:14 +01:00
parent 26659425d3 f7b1769e8a
commit 971690caf2
10 changed files with 50 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/javascript/mastodon/locales/it.json
View File

@@ -36,7 +36,7 @@
"account.followers.empty": "Ancora nessuno segue questo utente.",
"account.followers_counter": "{count, plural, one {{counter} seguace} other {{counter} seguaci}}",
"account.following": "Seguiti",
"account.following_counter": "{count, plural, one {{counter} segui} other {{counter} segui}}",
"account.following_counter": "{count, plural, one {{counter} segui} other {{counter} seguiti}}",
"account.follows.empty": "Questo utente non segue ancora nessuno.",
"account.go_to_profile": "Vai al profilo",
"account.hide_reblogs": "Nascondi condivisioni da @{name}",

2
app/serializers/rest/terms_of_service_serializer.rb
View File

@@ -4,7 +4,7 @@ class REST::TermsOfServiceSerializer < ActiveModel::Serializer
attributes :effective_date, :effective, :content, :succeeded_by
def effective_date
object.effective_date.iso8601
(object.effective_date || object.published_at).iso8601
end
def effective

2
app/views/admin/terms_of_service/index.html.haml
View File

@@ -11,7 +11,7 @@
.dot-indicator.success
.dot-indicator__indicator
%span
- if @terms_of_service.effective?
- if @terms_of_service.effective? || @terms_of_service.effective_date.nil?
= t('admin.terms_of_service.live')
- else
= t('admin.terms_of_service.going_live_on_html', date: tag.time(l(@terms_of_service.effective_date), class: 'formatted', date: @terms_of_service.effective_date.iso8601))