Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
open-source
aoz-003
Commits
b9f4663a
Verified
Commit
b9f4663a
authored
Jul 17, 2018
by
Kaspar Vollenweider
👻
Browse files
use I18n format instead of format string in format_helper
parent
5a4fc09f
Pipeline
#22717
passed with stage
in 35 minutes and 7 seconds
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
app/helpers/format_helper.rb
View file @
b9f4663a
...
...
@@ -12,10 +12,8 @@ module FormatHelper
return
''
if
hours
.
blank?
dates
=
hours
.
map
(
&
:meeting_date
)
return
format_hours_multiple_dates_semester
(
dates
)
if
dates
.
size
>
1
'%s. Semester %s'
%
[
BillingExpense
.
semester_of_year
(
dates
.
first
),
BillingExpense
.
semester_display_year
(
dates
.
first
)
]
I18n
.
t
(
'semester.one_semester'
,
number:
BillingExpense
.
semester_of_year
(
dates
.
first
),
year:
BillingExpense
.
semester_display_year
(
dates
.
first
))
end
def
format_hours_multiple_dates_semester
(
dates
)
...
...
@@ -26,11 +24,14 @@ module FormatHelper
max_year
=
BillingExpense
.
semester_display_year
(
max_date
)
max_semester
=
BillingExpense
.
semester_of_year
(
max_date
)
if
max_year
!=
min_year
'%i. Semester %i – %i. Semester %i'
%
[
min_semester
,
min_year
,
max_semester
,
max_year
]
'%s – %s'
%
[
I18n
.
t
(
'semester.one_semester'
,
number:
min_semester
,
year:
min_year
),
I18n
.
t
(
'semester.one_semester'
,
number:
max_semester
,
year:
max_year
)
]
elsif
min_semester
==
max_semester
'%i. Semester %i'
%
[
max_semester
,
max_year
]
I18n
.
t
(
'semester.one_semester'
,
number:
max_semester
,
year:
max_year
)
else
'%i. – %i. Semester %i'
%
[
min
_semester
,
max
_s
e
me
ster
,
max_year
]
I18n
.
t
(
'semester.two
_semester
s
_s
a
me
_year'
,
year:
max_year
)
end
end
end
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment