Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update ru translation. #1228

Merged
merged 1 commit into from
Jan 31, 2017
Merged

Update ru translation. #1228

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 21 additions & 20 deletions WcaOnRails/config/locales/ru.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,13 +116,13 @@ ru:
cellName: Финал
g:
#original_hash: e861dcf
#original_hash: 4c66ad0
name: Комбинированный Третий раунд
#original_hash: 86f4b05
#original_hash: 4c66ad0
cellName: Комбинированный Третий
h:
#original_hash: 4c66ad0
name: Комбинированная квалификация
#original_hash: 4c66ad0
cellName: Комбинированная квалификация
common:
#original_hash: 2513cf0
Expand All @@ -139,6 +139,9 @@ ru:
average: Среднее
#original_hash: e7f6fc5
solves: Сборки
date:
#original_hash: acb6273
no_date: Нет даты
user:
#original_hash: 603a218
wca_id: WCA ID
Expand Down Expand Up @@ -298,6 +301,8 @@ ru:
name: Имя
#original_hash: a6b9d69
birthday: День Рождения
#original_hash: c5497bc
registration_competition_events: Дисциплины
competition_tab:
#original_hash: 4f9be05
content: Заметки
Expand Down Expand Up @@ -969,8 +974,6 @@ ru:
registration_closed: Регистрация закрыта
#original_hash: e0bb243
cannot_be_deleted_and_accepted: Невозможно одновременно принять и удалить регистрацию.
#original_hash: bf9a828
can_register: Пользователь должен мочь зарегистрироваться на соревнование.
#original_hash: a38d024
must_register: нужно выбрать хотя бы одну дисциплину
registration_info_people:
Expand Down Expand Up @@ -1041,11 +1044,11 @@ ru:
edit: Редактировать
#original_hash: 0ab725c
country_plural:
other: '%{count} WTF'
many: '%{count} стран'
few: '%{count} страны'
one: '%{count} страна'
zero: ноль стран
one: '%{count} страна'
few: '%{count} страны'
many: '%{count} стран'
other: '%{count} WTF'
#original_hash: 1feee0e
export_csv: Экспорт в CSV
#original_hash: 84add5b
Expand Down Expand Up @@ -1123,8 +1126,8 @@ ru:
have_registered: >-
Вы зарегистрировались на %{comp}. Вы можете просмотреть свою регистрацию
ниже.
#original_hash: 4d966e0
entry_fee: Взнос за участие
#original_hash: fa52a9b
entry_fee: 'Взнос за участие %{fee}'
#original_hash: 3c9141f
contact_organizer: 'Свяжитесь с организаторам, если хотите что-то изменить.'
#original_hash: 59354fd
Expand Down Expand Up @@ -1195,11 +1198,11 @@ ru:
website: Сайт
#original_hash: 680567f
organizer_plural:
other: WTF
many: Организаторы
few: Организаторы
one: Организатор
zero: Организаторов
one: Организатор
few: Организаторы
many: Организаторы
other: WTF
#original_hash: 6afa61e
delegate:
zero: WCA Делегаты
Expand Down Expand Up @@ -1373,8 +1376,6 @@ ru:
end_date_before_start: Дата окончания не может быть до даты начала.
#original_hash: be3933b
span_too_many_days: 'Соревнование не может длиться более %{max_days} дней.'
#original_hash: f42a238
unscheduled: незапланированные
new:
#original_hash: 1208df7
create_competition: Создать соревнование
Expand Down Expand Up @@ -1402,11 +1403,11 @@ ru:
nearby_competitions:
#original_hash: 241801a
competitions:
other: '%{count} WTF'
many: '%{count} соревнований'
few: '%{count} соревнования'
one: '%{count} соревнование'
zero: Нет соревнований
one: '%{count} соревнование'
few: '%{count} соревнования'
many: '%{count} соревнований'
other: '%{count} WTF'
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LOL I just noticed this. @Claster, could you explain this?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That shouldn't be visible, because :other key is not used. We check it with Philippe:

(byebug) (0..100000).each { |c| if (I18n.t('toto.akey', count: c) == "other") then puts c end }
 0..100000

Here is the code, one can check that :other branch is never reached.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Strange. So is this a bug with @jonatanklosko's app that it's requiring you to enter these keys, even though they're not used? Or is it a bug with our local testing code?

Either way, this seems good to merge to me.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

None of it, probably a bug in rails-i18n, or some requirement to have "other" that we don't know of.
i18n-spec (that checks for missing pluralization keys), uses this set of keys for Russian too.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's for decimals probably, see svenfuchs/rails-i18n#703 (comment). In Polish I just copy other as it doesn't matter.

#original_hash: e3528ec
label: 'Близкие соревнования (в пределах %{days} дней и %{kms} км)'
#original_hash: 3446062
Expand Down