From 51f0de6843354624b7d9bba82a78bee6f261dd39 Mon Sep 17 00:00:00 2001 From: "Ben Sheldon [he/him]" Date: Wed, 15 Feb 2023 21:36:51 -0800 Subject: [PATCH] Ensure all i18n locale keys are under `good_job` namespace (#850) --- app/helpers/good_job/application_helper.rb | 15 +- app/views/good_job/shared/_navbar.erb | 2 +- config/locales/en.yml | 126 +++++++-------- config/locales/es.yml | 126 +++++++-------- config/locales/fr.yml | 126 +++++++-------- config/locales/nl.yml | 126 +++++++-------- config/locales/ru.yml | 174 ++++++++++----------- config/locales/ua.yml | 174 ++++++++++----------- i18n-tasks.yml | 4 +- 9 files changed, 437 insertions(+), 436 deletions(-) diff --git a/app/helpers/good_job/application_helper.rb b/app/helpers/good_job/application_helper.rb index b9828336c..56006643c 100644 --- a/app/helpers/good_job/application_helper.rb +++ b/app/helpers/good_job/application_helper.rb @@ -5,20 +5,21 @@ def format_duration(sec) return unless sec if sec < 1 - t 'duration.milliseconds', ms: (sec * 1000).floor + t 'good_job.duration.milliseconds', ms: (sec * 1000).floor elsif sec < 10 - t 'duration.less_than_10_seconds', sec: sec.floor + t 'good_job.duration.less_than_10_seconds', sec: sec.floor elsif sec < 60 - t 'duration.seconds', sec: sec.floor + t 'good_job.duration.seconds', sec: sec.floor elsif sec < 3600 - t 'duration.minutes', min: (sec / 60).floor, sec: (sec % 60).floor + t 'good_job.duration.minutes', min: (sec / 60).floor, sec: (sec % 60).floor else - t 'duration.hours', hour: (sec / 3600).floor, min: ((sec % 3600) / 60).floor + t 'good_job.duration.hours', hour: (sec / 3600).floor, min: ((sec % 3600) / 60).floor end end - def relative_time(timestamp, **args) - text = timestamp.future? ? "in #{time_ago_in_words(timestamp, **args)}" : "#{time_ago_in_words(timestamp, **args)} ago" + def relative_time(timestamp, **options) + options = options.reverse_merge({ scope: "good_job.datetime.distance_in_words" }) + text = timestamp.future? ? "in #{time_ago_in_words(timestamp, **options)}" : "#{time_ago_in_words(timestamp, **options)} ago" tag.time(text, datetime: timestamp, title: timestamp) end diff --git a/app/views/good_job/shared/_navbar.erb b/app/views/good_job/shared/_navbar.erb index 49509ffd9..c923ce5d8 100644 --- a/app/views/good_job/shared/_navbar.erb +++ b/app/views/good_job/shared/_navbar.erb @@ -11,7 +11,7 @@ <%= link_to jobs_path, class: ["nav-link", ("active" if controller_name == 'jobs')] do %> <%= t(".jobs") %> <% jobs_count = GoodJob::Job.count %> - <%= number_to_human(jobs_count) %> + <%= number_to_human(jobs_count, unit: "good_job.number") %> <% end %>
  • diff --git a/config/locales/en.yml b/config/locales/en.yml index dada212e9..1d5e00886 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -1,51 +1,69 @@ --- en: - datetime: - distance_in_words: - about_x_hours: - one: about 1 hour - other: about %{count} hours - about_x_months: - one: about 1 month - other: about %{count} months - about_x_years: - one: about 1 year - other: about %{count} years - almost_x_years: - 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_seconds: - one: 1 second - other: "%{count} seconds" - x_years: - one: 1 year - other: "%{count} years" - duration: - hours: "%{hour}h %{min}m" - less_than_10_seconds: "%{sec}s" - milliseconds: "%{ms}ms" - minutes: "%{min}m %{sec}s" - seconds: "%{sec}s" good_job: + datetime: + distance_in_words: + about_x_hours: + one: about 1 hour + other: about %{count} hours + about_x_months: + one: about 1 month + other: about %{count} months + about_x_years: + one: about 1 year + other: about %{count} years + almost_x_years: + 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_seconds: + one: 1 second + other: "%{count} seconds" + x_years: + one: 1 year + other: "%{count} years" + duration: + hours: "%{hour}h %{min}m" + less_than_10_seconds: "%{sec}s" + milliseconds: "%{ms}ms" + minutes: "%{min}m %{sec}s" + seconds: "%{sec}s" + number: + format: + delimiter: "," + separator: "." + human: + decimal_units: + format: "%n%u" + units: + billion: B + million: M + quadrillion: Q + thousand: K + trillion: T + unit: '' + format: + delimiter: "," + precision: 3 + separator: "." shared: footer: last_update_html: Last updated @@ -63,21 +81,3 @@ en: running: Running scheduled: Scheduled succeeded: Succeeded - number: - format: - delimiter: "," - separator: "." - human: - decimal_units: - format: "%n%u" - units: - billion: B - million: M - quadrillion: Q - thousand: K - trillion: T - unit: '' - format: - delimiter: "," - precision: 3 - separator: "." diff --git a/config/locales/es.yml b/config/locales/es.yml index 3b2e1f98c..b94f6df77 100644 --- a/config/locales/es.yml +++ b/config/locales/es.yml @@ -1,51 +1,69 @@ --- es: - datetime: - distance_in_words: - about_x_hours: - one: alrededor de 1 hora - other: alrededor de %{count} horas - about_x_months: - one: alrededor de 1 mes - other: alrededor de %{count} meses - about_x_years: - one: alrededor de 1 año - other: alrededor de %{count} años - almost_x_years: - one: casi 1 año - other: casi %{count} años - half_a_minute: medio minuto - less_than_x_minutes: - one: menos de un minuto - other: menos de %{count} minutos - less_than_x_seconds: - one: menos de 1 segundo - other: menos de %{count} segundos - over_x_years: - one: más de 1 año - other: durante %{count} años - x_days: - one: 1 día - other: "%{count} días" - x_minutes: - one: 1 minuto - other: "%{count} minutos" - x_months: - one: 1 mes - other: "%{count} meses" - x_seconds: - one: 1 segundo - other: "%{count} segundos" - x_years: - one: 1 año - other: "%{count} años" - duration: - hours: "%{hour}h %{min}m" - less_than_10_seconds: "%{sec}s" - milliseconds: "%{ms}ms" - minutes: "%{min}m %{sec}s" - seconds: "%{sec}s" good_job: + datetime: + distance_in_words: + about_x_hours: + one: alrededor de 1 hora + other: alrededor de %{count} horas + about_x_months: + one: alrededor de 1 mes + other: alrededor de %{count} meses + about_x_years: + one: alrededor de 1 año + other: alrededor de %{count} años + almost_x_years: + one: casi 1 año + other: casi %{count} años + half_a_minute: medio minuto + less_than_x_minutes: + one: menos de un minuto + other: menos de %{count} minutos + less_than_x_seconds: + one: menos de 1 segundo + other: menos de %{count} segundos + over_x_years: + one: más de 1 año + other: durante %{count} años + x_days: + one: 1 día + other: "%{count} días" + x_minutes: + one: 1 minuto + other: "%{count} minutos" + x_months: + one: 1 mes + other: "%{count} meses" + x_seconds: + one: 1 segundo + other: "%{count} segundos" + x_years: + one: 1 año + other: "%{count} años" + duration: + hours: "%{hour}h %{min}m" + less_than_10_seconds: "%{sec}s" + milliseconds: "%{ms}ms" + minutes: "%{min}m %{sec}s" + seconds: "%{sec}s" + number: + format: + delimiter: " " + separator: "," + human: + decimal_units: + format: "%n%u" + units: + billion: B + million: M + quadrillion: q + thousand: k + trillion: T + unit: '' + format: + delimiter: " " + precision: 3 + separator: "," shared: footer: last_update_html: Última actualización @@ -63,21 +81,3 @@ es: running: Corriendo scheduled: Programado succeeded: Acierto - number: - format: - delimiter: " " - separator: "," - human: - decimal_units: - format: "%n%u" - units: - billion: B - million: M - quadrillion: q - thousand: k - trillion: T - unit: '' - format: - delimiter: " " - precision: 3 - separator: "," diff --git a/config/locales/fr.yml b/config/locales/fr.yml index 68f0d84a0..d9386250f 100644 --- a/config/locales/fr.yml +++ b/config/locales/fr.yml @@ -1,51 +1,69 @@ --- fr: - datetime: - distance_in_words: - about_x_hours: - one: environ 1 heure - other: environ %{count} heures - about_x_months: - one: environ 1 heure - other: environ %{count} heures - about_x_years: - one: environ 1 an - other: environ %{count} ans - almost_x_years: - one: presque 1 an - other: presque %{count} ans - half_a_minute: une demi-minute - less_than_x_minutes: - one: moins d'une minute - other: moins de %{count} minutes - less_than_x_seconds: - one: moins d'une seconde - other: moins de %{count} secondes - over_x_years: - one: plus d'un an - other: plus de %{count} ans - x_days: - one: 1 jour - other: "%{count} jours" - x_minutes: - one: 1 minute - other: "%{count} minutes" - x_months: - one: 1 mois - other: "%{count} mois" - x_seconds: - one: 1 seconde - other: "%{count} secondes" - x_years: - one: 1 an - other: "%{count} ans" - duration: - hours: "%{hour}h %{min}m" - less_than_10_seconds: "%{sec}s" - milliseconds: "%{ms}ms" - minutes: "%{min}m %{sec}s" - seconds: "%{sec}s" good_job: + datetime: + distance_in_words: + about_x_hours: + one: environ 1 heure + other: environ %{count} heures + about_x_months: + one: environ 1 heure + other: environ %{count} heures + about_x_years: + one: environ 1 an + other: environ %{count} ans + almost_x_years: + one: presque 1 an + other: presque %{count} ans + half_a_minute: une demi-minute + less_than_x_minutes: + one: moins d'une minute + other: moins de %{count} minutes + less_than_x_seconds: + one: moins d'une seconde + other: moins de %{count} secondes + over_x_years: + one: plus d'un an + other: plus de %{count} ans + x_days: + one: 1 jour + other: "%{count} jours" + x_minutes: + one: 1 minute + other: "%{count} minutes" + x_months: + one: 1 mois + other: "%{count} mois" + x_seconds: + one: 1 seconde + other: "%{count} secondes" + x_years: + one: 1 an + other: "%{count} ans" + duration: + hours: "%{hour}h %{min}m" + less_than_10_seconds: "%{sec}s" + milliseconds: "%{ms}ms" + minutes: "%{min}m %{sec}s" + seconds: "%{sec}s" + number: + format: + delimiter: " " + separator: "," + human: + decimal_units: + format: "%n%u" + units: + billion: B + million: M + quadrillion: q + thousand: k + trillion: T + unit: '' + format: + delimiter: " " + precision: 3 + separator: "," shared: footer: last_update_html: Dernière mise à jour @@ -63,21 +81,3 @@ fr: running: En cours scheduled: Programmés succeeded: Réussis - number: - format: - delimiter: " " - separator: "," - human: - decimal_units: - format: "%n%u" - units: - billion: B - million: M - quadrillion: q - thousand: k - trillion: T - unit: '' - format: - delimiter: " " - precision: 3 - separator: "," diff --git a/config/locales/nl.yml b/config/locales/nl.yml index 992f9991c..c60e404c1 100644 --- a/config/locales/nl.yml +++ b/config/locales/nl.yml @@ -1,51 +1,69 @@ --- nl: - datetime: - distance_in_words: - about_x_hours: - one: ongeveer 1 uur - other: ongeveer %{count} uren - about_x_months: - one: ongeveer 1 maand - other: ongeveer %{count} maanden - about_x_years: - one: ongeveer 1 jaar - other: ongeveer %{count} jaren - almost_x_years: - one: bijna 1 jaar - other: bijna %{count} jaren - half_a_minute: halve minuut - less_than_x_minutes: - one: minder dan één minuut - other: minder dan %{count} minuten - less_than_x_seconds: - one: minder dan 1 seconde - other: minder dan %{count} seconden - over_x_years: - one: meer dan 1 jaar - other: meer dan %{count} jaren - x_days: - one: 1 dag - other: "%{count} dagen" - x_minutes: - one: 1 minuut - other: "%{count} minuten" - x_months: - one: 1 maand - other: "%{count} maanden" - x_seconds: - one: 1 seconde - other: "%{count} seconden" - x_years: - one: 1 jaar - other: "%{count} jaren" - duration: - hours: "%{hour}h %{min}m" - less_than_10_seconds: "%{sec}s" - milliseconds: "%{ms}ms" - minutes: "%{min}m %{sec}s" - seconds: "%{sec}s" good_job: + datetime: + distance_in_words: + about_x_hours: + one: ongeveer 1 uur + other: ongeveer %{count} uren + about_x_months: + one: ongeveer 1 maand + other: ongeveer %{count} maanden + about_x_years: + one: ongeveer 1 jaar + other: ongeveer %{count} jaren + almost_x_years: + one: bijna 1 jaar + other: bijna %{count} jaren + half_a_minute: halve minuut + less_than_x_minutes: + one: minder dan één minuut + other: minder dan %{count} minuten + less_than_x_seconds: + one: minder dan 1 seconde + other: minder dan %{count} seconden + over_x_years: + one: meer dan 1 jaar + other: meer dan %{count} jaren + x_days: + one: 1 dag + other: "%{count} dagen" + x_minutes: + one: 1 minuut + other: "%{count} minuten" + x_months: + one: 1 maand + other: "%{count} maanden" + x_seconds: + one: 1 seconde + other: "%{count} seconden" + x_years: + one: 1 jaar + other: "%{count} jaren" + duration: + hours: "%{hour}h %{min}m" + less_than_10_seconds: "%{sec}s" + milliseconds: "%{ms}ms" + minutes: "%{min}m %{sec}s" + seconds: "%{sec}s" + number: + format: + delimiter: "." + separator: "," + human: + decimal_units: + format: "%n%u" + units: + billion: B + million: M + quadrillion: Q + thousand: K + trillion: T + unit: '' + format: + delimiter: "." + precision: 3 + separator: "," shared: footer: last_update_html: Laatst bijgewerkt @@ -63,21 +81,3 @@ nl: running: Rennen scheduled: Gepland succeeded: Geslaagd - number: - format: - delimiter: "." - separator: "," - human: - decimal_units: - format: "%n%u" - units: - billion: B - million: M - quadrillion: Q - thousand: K - trillion: T - unit: '' - format: - delimiter: "." - precision: 3 - separator: "," diff --git a/config/locales/ru.yml b/config/locales/ru.yml index 13d901269..69ffb2d16 100644 --- a/config/locales/ru.yml +++ b/config/locales/ru.yml @@ -1,75 +1,93 @@ --- ru: - datetime: - distance_in_words: - about_x_hours: - few: около %{count} часов - many: около %{count} часов - one: около 1 часа - other: около %{count} часа - about_x_months: - few: около %{count} месяцев - many: около %{count} месяцев - one: около 1 месяца - other: около %{count} месяца - about_x_years: - few: около %{count} лет - many: около %{count} лет - one: около 1 года - other: около %{count} лет - almost_x_years: - few: почти %{count} года - many: почти %{count} лет - one: почти 1 год - other: почти %{count} лет - half_a_minute: полминуты - less_than_x_minutes: - few: меньше %{count} минут - many: меньше %{count} минут - one: меньше 1 минуты - other: меньше %{count} минуты - less_than_x_seconds: - few: меньше %{count} секунд - many: меньше %{count} секунд - one: меньше 1 секунды - other: меньше %{count} секунды - over_x_years: - few: больше %{count} лет - many: больше %{count} лет - one: больше 1 года - other: больше %{count} лет - x_days: - few: "%{count} дня" - many: "%{count} дней" - one: 1 день - other: "%{count} дня" - x_minutes: - few: "%{count} минуты" - many: "%{count} минут" - one: 1 минуту - other: "%{count} минуты" - x_months: - few: "%{count} месяца" - many: "%{count} месяцев" - one: 1 месяц - other: "%{count} месяца" - x_seconds: - few: "%{count} секунды" - many: "%{count} секунд" - one: 1 секунду - other: "%{count} секунды" - x_years: - few: "%{count} года" - many: "%{count} лет" - one: 1 год - other: "%{count} года" - duration: - hours: "%{hour}h %{min}m" - less_than_10_seconds: "%{sec}s" - milliseconds: "%{ms}мс" - minutes: "%{min}м %{sec}с" - seconds: "%{sec}s" good_job: + datetime: + distance_in_words: + about_x_hours: + few: около %{count} часов + many: около %{count} часов + one: около 1 часа + other: около %{count} часа + about_x_months: + few: около %{count} месяцев + many: около %{count} месяцев + one: около 1 месяца + other: около %{count} месяца + about_x_years: + few: около %{count} лет + many: около %{count} лет + one: около 1 года + other: около %{count} лет + almost_x_years: + few: почти %{count} года + many: почти %{count} лет + one: почти 1 год + other: почти %{count} лет + half_a_minute: полминуты + less_than_x_minutes: + few: меньше %{count} минут + many: меньше %{count} минут + one: меньше 1 минуты + other: меньше %{count} минуты + less_than_x_seconds: + few: меньше %{count} секунд + many: меньше %{count} секунд + one: меньше 1 секунды + other: меньше %{count} секунды + over_x_years: + few: больше %{count} лет + many: больше %{count} лет + one: больше 1 года + other: больше %{count} лет + x_days: + few: "%{count} дня" + many: "%{count} дней" + one: 1 день + other: "%{count} дня" + x_minutes: + few: "%{count} минуты" + many: "%{count} минут" + one: 1 минуту + other: "%{count} минуты" + x_months: + few: "%{count} месяца" + many: "%{count} месяцев" + one: 1 месяц + other: "%{count} месяца" + x_seconds: + few: "%{count} секунды" + many: "%{count} секунд" + one: 1 секунду + other: "%{count} секунды" + x_years: + few: "%{count} года" + many: "%{count} лет" + one: 1 год + other: "%{count} года" + duration: + hours: "%{hour}h %{min}m" + less_than_10_seconds: "%{sec}s" + milliseconds: "%{ms}мс" + minutes: "%{min}м %{sec}с" + seconds: "%{sec}s" + number: + format: + delimiter: " " + separator: "," + human: + decimal_units: + format: "%n%u" + units: + billion: Б + million: М + quadrillion: Q + thousand: К + trillion: Т + unit: '' + format: + delimiter: " " + precision: 3 + separator: "," shared: footer: last_update_html: Последнее обновление @@ -87,21 +105,3 @@ ru: running: Бег scheduled: по расписанию succeeded: удалось - number: - format: - delimiter: " " - separator: "," - human: - decimal_units: - format: "%n%u" - units: - billion: Б - million: М - quadrillion: Q - thousand: К - trillion: Т - unit: '' - format: - delimiter: " " - precision: 3 - separator: "," diff --git a/config/locales/ua.yml b/config/locales/ua.yml index 4fa431268..4ad4f0b5e 100644 --- a/config/locales/ua.yml +++ b/config/locales/ua.yml @@ -1,75 +1,93 @@ --- ua: - datetime: - distance_in_words: - about_x_hours: - few: близько %{count} години - many: близько %{count} годин - one: близько 1 години - other: близько %{count} години - about_x_months: - few: близько %{count} місяців - many: близько %{count} місяців - one: близько 1 місяцю - other: близько %{count} місяцю - about_x_years: - few: близько %{count} років - many: близько %{count} років - one: близько 1 року - other: близько %{count} років - almost_x_years: - few: майже %{count} роки - many: майже %{count} років - one: майже 1 рік - other: майже %{count} років - half_a_minute: пів хвилини - less_than_x_minutes: - few: менше %{count} хвилин - many: менше %{count} хвилин - one: менше 1 хвилини - other: менше %{count} хвилини - less_than_x_seconds: - few: менше %{count} секунд - many: менше %{count} секунд - one: менше 1 секунди - other: менше %{count} секунди - over_x_years: - few: більше %{count} років - many: більше %{count} років - one: більше 1 року - other: більше %{count} років - x_days: - few: "%{count} дня" - many: "%{count} днів" - one: 1 день - other: "%{count} дня" - x_minutes: - few: "%{count} хвилини" - many: "%{count} хвилин" - one: 1 хвилину - other: "%{count} хвилини" - x_months: - few: "%{count} місяцю" - many: "%{count} місяців" - one: 1 місяць - other: "%{count} місяцю" - x_seconds: - few: "%{count} секунди" - many: "%{count} секунд" - one: 1 секунду - other: "%{count} секунди" - x_years: - few: "%{count} року" - many: "%{count} років" - one: 1 рік - other: "%{count} року" - duration: - hours: "%{hour}h %{min}m" - less_than_10_seconds: "%{sec}s" - milliseconds: "%{ms}мс" - minutes: "%{min}м %{sec}с" - seconds: "%{sec}s" good_job: + datetime: + distance_in_words: + about_x_hours: + few: близько %{count} години + many: близько %{count} годин + one: близько 1 години + other: близько %{count} години + about_x_months: + few: близько %{count} місяців + many: близько %{count} місяців + one: близько 1 місяцю + other: близько %{count} місяцю + about_x_years: + few: близько %{count} років + many: близько %{count} років + one: близько 1 року + other: близько %{count} років + almost_x_years: + few: майже %{count} роки + many: майже %{count} років + one: майже 1 рік + other: майже %{count} років + half_a_minute: пів хвилини + less_than_x_minutes: + few: менше %{count} хвилин + many: менше %{count} хвилин + one: менше 1 хвилини + other: менше %{count} хвилини + less_than_x_seconds: + few: менше %{count} секунд + many: менше %{count} секунд + one: менше 1 секунди + other: менше %{count} секунди + over_x_years: + few: більше %{count} років + many: більше %{count} років + one: більше 1 року + other: більше %{count} років + x_days: + few: "%{count} дня" + many: "%{count} днів" + one: 1 день + other: "%{count} дня" + x_minutes: + few: "%{count} хвилини" + many: "%{count} хвилин" + one: 1 хвилину + other: "%{count} хвилини" + x_months: + few: "%{count} місяцю" + many: "%{count} місяців" + one: 1 місяць + other: "%{count} місяцю" + x_seconds: + few: "%{count} секунди" + many: "%{count} секунд" + one: 1 секунду + other: "%{count} секунди" + x_years: + few: "%{count} року" + many: "%{count} років" + one: 1 рік + other: "%{count} року" + duration: + hours: "%{hour}h %{min}m" + less_than_10_seconds: "%{sec}s" + milliseconds: "%{ms}мс" + minutes: "%{min}м %{sec}с" + seconds: "%{sec}s" + number: + format: + delimiter: " " + separator: "," + human: + decimal_units: + format: "%n%u" + units: + billion: Блн + million: Млн + quadrillion: Q + thousand: Тис + trillion: Трил + unit: '' + format: + delimiter: " " + precision: 3 + separator: "," shared: footer: last_update_html: Оснаннє оновлення @@ -87,21 +105,3 @@ ua: running: Біг scheduled: за розкладом succeeded: вдалося - number: - format: - delimiter: " " - separator: "," - human: - decimal_units: - format: "%n%u" - units: - billion: Блн - million: Млн - quadrillion: Q - thousand: Тис - trillion: Трил - unit: '' - format: - delimiter: " " - precision: 3 - separator: "," diff --git a/i18n-tasks.yml b/i18n-tasks.yml index 6748716b8..435060c00 100644 --- a/i18n-tasks.yml +++ b/i18n-tasks.yml @@ -96,9 +96,9 @@ search: ## Consider these keys used: ignore_unused: - "activerecord.attributes.*" - - "datetime.*" + - "good_job.datetime.*" - "good_job.status.*" - - "number.*" + - "good_job.number.*" ## Exclude these keys from the `i18n-tasks eq-base' report: # ignore_eq_base: