From 6594f1e3333ae31bbc55d98b84596dd5bd8b631e Mon Sep 17 00:00:00 2001 From: KMY Date: Fri, 16 Feb 2024 19:12:13 +0900 Subject: [PATCH 1/2] =?UTF-8?q?Fix:=20=E7=99=BB=E9=8C=B2=E6=99=82=E9=96=93?= =?UTF-8?q?=E5=B8=AF=E3=81=AE=E3=83=86=E3=82=B9=E3=83=88=E3=81=AE=E3=82=A8?= =?UTF-8?q?=E3=83=A9=E3=83=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- spec/controllers/auth/registrations_controller_spec.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spec/controllers/auth/registrations_controller_spec.rb b/spec/controllers/auth/registrations_controller_spec.rb index 23ce3093d7e3f1..8c1d4c2333401a 100644 --- a/spec/controllers/auth/registrations_controller_spec.rb +++ b/spec/controllers/auth/registrations_controller_spec.rb @@ -409,7 +409,7 @@ def create_other_user current = Time.now.utc today = current.beginning_of_day - today += 1.day if current.hour > 10 + today += 1.day if current.hour >= 10 travel_to today + 10.hours end From 4c7aa81faa608638b6f4f500f4861774a2cc783c Mon Sep 17 00:00:00 2001 From: KMY Date: Fri, 16 Feb 2024 20:35:03 +0900 Subject: [PATCH 2/2] Fix test --- app/javascript/mastodon/components/visibility_icon.tsx | 4 ++-- app/javascript/mastodon/locales/en.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/javascript/mastodon/components/visibility_icon.tsx b/app/javascript/mastodon/components/visibility_icon.tsx index 044012de8c508e..bc0fd782dd5b76 100644 --- a/app/javascript/mastodon/components/visibility_icon.tsx +++ b/app/javascript/mastodon/components/visibility_icon.tsx @@ -47,11 +47,11 @@ const messages = defineMessages({ }, limited_short: { id: 'privacy.limited.short', - defaultMessage: 'Limited menbers only', + defaultMessage: 'Limited', }, mutual_short: { id: 'privacy.mutual.short', - defaultMessage: 'Mutual only', + defaultMessage: 'Mutual', }, circle_short: { id: 'privacy.circle.short', diff --git a/app/javascript/mastodon/locales/en.json b/app/javascript/mastodon/locales/en.json index 4dd6fa96639812..775caae5c585a8 100644 --- a/app/javascript/mastodon/locales/en.json +++ b/app/javascript/mastodon/locales/en.json @@ -557,7 +557,7 @@ "privacy.login.long": "Visible for login users only", "privacy.login.short": "Login only", "privacy.mutual.long": "Mutual followers only", - "privacy.mutual.short": "Mutual only", + "privacy.mutual.short": "Mutual", "privacy.personal.short": "Yourself only", "privacy.private.long": "Only your followers", "privacy.private.short": "Followers",