Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix: 登録時間帯のテストのエラー #569

Merged
merged 2 commits into from
Feb 16, 2024
Merged

Fix: 登録時間帯のテストのエラー #569

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6594f1e
Fix: 登録時間帯のテストのエラー
kmycode Feb 16, 2024
4c7aa81
Fix test
kmycode Feb 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions app/javascript/mastodon/components/visibility_icon.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
2 changes: 1 addition & 1 deletion app/javascript/mastodon/locales/en.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion spec/controllers/auth/registrations_controller_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
Loading