Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Jérome Perrin
gitlab-ce
Commits
d9238ee6
Commit
d9238ee6
authored
Jun 09, 2017
by
Bob Van Landuyt
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Translate time tooltips.
Let the backend do the translation.
parent
fc7cb8d1
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
202 additions
and
35 deletions
+202
-35
app/assets/javascripts/lib/utils/datetime_utility.js
app/assets/javascripts/lib/utils/datetime_utility.js
+1
-1
app/helpers/application_helper.rb
app/helpers/application_helper.rb
+2
-2
config/locales/en.yml
config/locales/en.yml
+199
-32
No files found.
app/assets/javascripts/lib/utils/datetime_utility.js
View file @
d9238ee6
...
...
@@ -34,7 +34,7 @@ window.dateFormat = dateFormat;
w
.
gl
.
utils
.
localTimeAgo
=
function
(
$timeagoEls
,
setTimeago
=
true
)
{
$timeagoEls
.
each
((
i
,
el
)
=>
{
el
.
setAttribute
(
'
title
'
,
gl
.
utils
.
formatDate
(
el
.
getAttribute
(
'
datetime
'
)
));
el
.
setAttribute
(
'
title
'
,
el
.
getAttribute
(
'
title
'
));
if
(
setTimeago
)
{
// Recreate with custom template
...
...
app/helpers/application_helper.rb
View file @
d9238ee6
...
...
@@ -167,9 +167,9 @@ module ApplicationHelper
css_classes
=
short_format
?
'js-short-timeago'
:
'js-timeago'
css_classes
<<
"
#{
html_class
}
"
unless
html_class
.
blank?
element
=
content_tag
:time
,
time
.
strftime
(
"%b %d, %Y"
),
element
=
content_tag
:time
,
l
(
time
,
format:
"%b %d, %Y"
),
class:
css_classes
,
title:
time
.
to_time
.
in_time_zone
.
to_s
(
:medium
),
title:
l
(
time
.
to_time
.
in_time_zone
,
format: :short
),
datetime:
time
.
to_time
.
getutc
.
iso8601
,
data:
{
toggle:
'tooltip'
,
...
...
config/locales/en.yml
View file @
d9238ee6
...
...
@@ -2,7 +2,6 @@
# See https://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points.
en
:
hello
:
"
Hello
world"
errors
:
messages
:
label_already_exists_at_group_level
:
"
already
exists
at
group
level
for
%{group}.
Please
choose
another
one."
...
...
@@ -13,39 +12,207 @@ en:
pagination
:
previous
:
"
Prev"
next
:
"
Next"
date
:
abbr_day_names
:
-
Sun
-
Mon
-
Tue
-
Wed
-
Thu
-
Fri
-
Sat
abbr_month_names
:
-
-
Jan
-
Feb
-
Mar
-
Apr
-
May
-
Jun
-
Jul
-
Aug
-
Sep
-
Oct
-
Nov
-
Dec
day_names
:
-
Sunday
-
Monday
-
Tuesday
-
Wednesday
-
Thursday
-
Friday
-
Saturday
formats
:
default
:
"
%Y-%m-%d"
long
:
"
%B
%d,
%Y"
short
:
"
%b
%d"
month_names
:
-
-
January
-
February
-
March
-
April
-
May
-
June
-
July
-
August
-
September
-
October
-
November
-
December
order
:
-
:year
-
:month
-
:day
datetime
:
time_ago_in_words
:
half_a_minute
:
"
half
a
minute
ago"
less_than_x_seconds
:
one
:
"
less
than
1
second
ago"
other
:
"
less
than
%{count}
seconds
ago"
x_seconds
:
one
:
"
1
second
ago"
other
:
"
%{count}
seconds
ago"
less_than_x_minutes
:
one
:
"
less
than
a
minute
ago"
other
:
"
less
than
%{count}
minutes
ago"
x_minutes
:
one
:
"
1
minute
ago"
other
:
"
%{count}
minutes
ago"
distance_in_words
:
about_x_hours
:
one
:
"
about
1
hour
ago"
other
:
"
about
%{count}
hours
ago"
x_days
:
one
:
"
1
day
ago"
other
:
"
%{count}
days
ago"
one
:
about 1 hour
other
:
about %{count} hours
about_x_months
:
one
:
"
about
1
month
ago"
other
:
"
about
%{count}
months
ago"
x_months
:
one
:
"
1
month
ago"
other
:
"
%{count}
months
ago"
one
:
about 1 month
other
:
about %{count} months
about_x_years
:
one
:
"
about
1
year
ago"
other
:
"
about
%{count}
years
ago"
over_x_years
:
one
:
"
over
1
year
ago"
other
:
"
over
%{count}
years
ago"
one
:
about 1 year
other
:
about %{count} years
almost_x_years
:
one
:
"
almost
1
year
ago"
other
:
"
almost
%{count}
years
ago"
one
:
almost 1 year
other
:
almost %{count} years
half_a_minute
:
half a minute
less_than_x_minutes
:
one
:
less than a minute
other
:
less than %{count} minutes
less_than_x_seconds
:
one
:
less than 1 second
other
:
less than %{count} seconds
over_x_years
:
one
:
over 1 year
other
:
over %{count} years
x_days
:
one
:
1 day
other
:
"
%{count}
days"
x_minutes
:
one
:
1 minute
other
:
"
%{count}
minutes"
x_months
:
one
:
1 month
other
:
"
%{count}
months"
x_years
:
one
:
1 year
other
:
"
%{count}
years"
x_seconds
:
one
:
1 second
other
:
"
%{count}
seconds"
prompts
:
day
:
Day
hour
:
Hour
minute
:
Minute
month
:
Month
second
:
Seconds
year
:
Year
errors
:
format
:
"
%{attribute}
%{message}"
messages
:
accepted
:
must be accepted
blank
:
can't be blank
present
:
must be blank
confirmation
:
doesn't match %{attribute}
empty
:
can't be empty
equal_to
:
must be equal to %{count}
even
:
must be even
exclusion
:
is reserved
greater_than
:
must be greater than %{count}
greater_than_or_equal_to
:
must be greater than or equal to %{count}
inclusion
:
is not included in the list
invalid
:
is invalid
less_than
:
must be less than %{count}
less_than_or_equal_to
:
must be less than or equal to %{count}
model_invalid
:
"
Validation
failed:
%{errors}"
not_a_number
:
is not a number
not_an_integer
:
must be an integer
odd
:
must be odd
required
:
must exist
taken
:
has already been taken
too_long
:
one
:
is too long (maximum is 1 character)
other
:
is too long (maximum is %{count} characters)
too_short
:
one
:
is too short (minimum is 1 character)
other
:
is too short (minimum is %{count} characters)
wrong_length
:
one
:
is the wrong length (should be 1 character)
other
:
is the wrong length (should be %{count} characters)
other_than
:
must be other than %{count}
template
:
body
:
'
There
were
problems
with
the
following
fields:'
header
:
one
:
1 error prohibited this %{model} from being saved
other
:
"
%{count}
errors
prohibited
this
%{model}
from
being
saved"
helpers
:
select
:
prompt
:
Please select
submit
:
create
:
Create %{model}
submit
:
Save %{model}
update
:
Update %{model}
number
:
currency
:
format
:
delimiter
:
"
,"
format
:
"
%u%n"
precision
:
2
separator
:
"
."
significant
:
false
strip_insignificant_zeros
:
false
unit
:
"
$"
format
:
delimiter
:
"
,"
precision
:
3
separator
:
"
."
significant
:
false
strip_insignificant_zeros
:
false
human
:
decimal_units
:
format
:
"
%n
%u"
units
:
billion
:
Billion
million
:
Million
quadrillion
:
Quadrillion
thousand
:
Thousand
trillion
:
Trillion
unit
:
'
'
format
:
delimiter
:
'
'
precision
:
3
significant
:
true
strip_insignificant_zeros
:
true
storage_units
:
format
:
"
%n
%u"
units
:
byte
:
one
:
Byte
other
:
Bytes
gb
:
GB
kb
:
KB
mb
:
MB
tb
:
TB
percentage
:
format
:
delimiter
:
'
'
format
:
"
%n%"
precision
:
format
:
delimiter
:
'
'
support
:
array
:
last_word_connector
:
"
,
and
"
two_words_connector
:
"
and
"
words_connector
:
"
,
"
time
:
am
:
am
formats
:
default
:
"
%a,
%d
%b
%Y
%H:%M:%S
%z"
long
:
"
%B
%d,
%Y
%H:%M"
short
:
"
%d
%b
%H:%M"
pm
:
pm
Write
Preview
Markdown
is supported
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