diff options
| author | James Lopez <james@gitlab.com> | 2017-06-02 15:43:59 +0000 |
|---|---|---|
| committer | James Lopez <james@gitlab.com> | 2017-06-02 15:43:59 +0000 |
| commit | 1bf76c7620396b5cbc59b168a67a4de3102457b3 (patch) | |
| tree | 6befeb7e15a6937292f1b1a41b0f5d765cca8955 /config | |
| parent | 69b1a61509066df4668775f0070fe52f0b0adfb6 (diff) | |
| parent | 22c80b3c6dd398fd6d2509e2a5e9ae0cbafb1bdf (diff) | |
| download | gitlab-ce-1bf76c7620396b5cbc59b168a67a4de3102457b3.tar.gz | |
Merge branch '32747-translation-of-dates-for-cycle-analytics-is-incomplete' into 'master'
Add translations for elapsed time in words
Closes #32747
See merge request !11769
Diffstat (limited to 'config')
| -rw-r--r-- | config/locales/en.yml | 36 | ||||
| -rw-r--r-- | config/locales/es.yml | 35 |
2 files changed, 71 insertions, 0 deletions
diff --git a/config/locales/en.yml b/config/locales/en.yml index 12a59be79f0..9d47425950a 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -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" diff --git a/config/locales/es.yml b/config/locales/es.yml index 87e79beee74..0f9dc39535d 100644 --- a/config/locales/es.yml +++ b/config/locales/es.yml @@ -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 |