kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Merge branch '32747-translation-of-dates-for-cycle-analytics-is-incomplete' into 'master'

Browse source 
Add translations for elapsed time in words

Closes #32747

See merge request !11769
This commit is contained in:
James Lopez 2017-06-02 15:43:59 +00:00
commit 1bf76c7620
3 changed files with 72 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/serializers/entity_date_helper.rb
View file

@ -4,7 +4,7 @@ module EntityDateHelper
def interval_in_words(diff)
return 'Not started' unless diff
"#{distance_of_time_in_words(Time.now, diff)} ago"
distance_of_time_in_words(Time.now, diff, scope: 'datetime.time_ago_in_words')
end
# Converts seconds into a hash such as:

36
config/locales/en.yml
View file

@ -13,3 +13,39 @@ en:
pagination:
previous: "Prev"
next: "Next"
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"
about_x_hours:
one: "about 1 hour ago"
other: "about %{count} hours ago"
x_days:
one: "1 day ago"
other: "%{count} days ago"
about_x_months:
one: "about 1 month ago"
other: "about %{count} months ago"
x_months:
one: "1 month ago"
other: "%{count} months ago"
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"
almost_x_years:
one: "almost 1 year ago"
other: "almost %{count} years ago"

35
config/locales/es.yml
View file

@ -61,6 +61,41 @@ es:
- :month
- :year
datetime:
time_ago_in_words:
half_a_minute: "hace medio minuto"
less_than_x_seconds:
one: "hace menos de 1 segundo"
other: "hace menos de %{count} segundos"
x_seconds:
one: "hace 1 segundo"
other: "hace %{count} segundos"
less_than_x_minutes:
one: "hace menos de un minuto"
other: "hace menos de %{count} minutos"
x_minutes:
one: "hace 1 minuto"
other: "hace %{count} minutos"
about_x_hours:
one: "hace alrededor de 1 hora"
other: "hace alrededor de %{count} horas"
x_days:
one: "hace un día"
other: "hace %{count} días"
about_x_months:
one: "hace alrededor de 1 mes"
other: "hace alrededor de %{count} meses"
x_months:
one: "hace 1 mes"
other: "hace %{count} meses"
about_x_years:
one: "hace alrededor de 1 año"
other: "hace alrededor de %{count} años"
over_x_years:
one: "hace más de 1 año"
other: "hace %{count} años"
almost_x_years:
one: "hace casi 1 año"
other: "hace casi %{count} años"
distance_in_words:
about_x_hours:
one: alrededor de 1 hora