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

bug/fix_missing_translation #81

Merged
merged 9 commits into from
Jan 16, 2024
+4 −1
Merged

bug/fix_missing_translation #81

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
7a6ac0a
initial commit for bug/fix_missing_translation
oma-s Jan 16, 2024
a4ba31c
add translation
oma-s Jan 16, 2024
dc79bd7
prettify syntax
oma-s Jan 16, 2024
9aca75a
add magic comment for i18n
oma-s Jan 16, 2024
d421bc5
fix test
oma-s Jan 16, 2024
5e24b11
remove deletion of tasks
oma-s Jan 16, 2024
8e612be
adapt spec
oma-s Jan 16, 2024
4ff695a
revert changes
oma-s Jan 16, 2024
d9ebdaf
revert spec
oma-s Jan 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
1 change: 1 addition & 0 deletions app/models/user/slack_profile.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ def set_status(type:, emoji:, until_date:)
# i18n-tasks-use t("users.slack_profile.paid_status_text")
# i18n-tasks-use t("users.slack_profile.sick_status_text")
# i18n-tasks-use t("users.slack_profile.unpaid_status_text")
# i18n-tasks-use t("users.slack_profile.non_working_status_text")
Slack.instance.set_status(slack_id: ensure_slack_id!, text: I18n.t("users.slack_profile.#{type}_status_text"), emoji:, until_time: until_date.end_of_day)
end

Expand Down
2 changes: 1 addition & 1 deletion app/views/leaves/_leave.html.slim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
.card__icon = leave.unicode_emoji
.card__header-content
.card__title = [leave.user.display_name, leave.title].map(&:presence).compact.join(" / ")
.card__subtitle #{date_range leave.leave_during.min, leave.leave_during.max, format: :long} (#{leave.days.count} days)
.card__subtitle #{date_range leave.days.first, leave.days.last, format: :long} (#{leave.days.count} days)
/ i18n-tasks-use t('leave.status.approved')
/ i18n-tasks-use t('leave.status.rejected')
/ i18n-tasks-use t('leave.status.pending_approval')
Expand Down
1 change: 1 addition & 0 deletions config/locales/en.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,7 @@ en:
remaining_holidays: Remaining holidays
salary_history: Salary History
slack_profile:
non_working_status_text: Non-working day
paid_status_text: On vacation
sick_status_text: On sick leave
unpaid_status_text: Away
Expand Down
1 change: 1 addition & 0 deletions spec/models/sprint_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,7 @@
end

it "mentions birthdays" do
travel_to "2023-01-23"
john.update! born_on: "1989-02-01", hired_on: "2019-04-25"
sprint.send_sprint_start_notification
text = <<~TEXT
Expand Down
Loading