aboutsummaryrefslogtreecommitdiffstats
path: root/config
diff options
context:
space:
mode:
authorKir2011-11-03 19:07:54 +0400
committerKir2011-11-03 19:07:54 +0400
commita9c97ba576f190c18544919af477753c419036cf (patch)
tree48c8a13e862fa249fad50420b077d6f9b1155d4f /config
parente855fb8574570934cde28cfb190cc3cba31fbec0 (diff)
downloadinboxes-a9c97ba576f190c18544919af477753c419036cf.tar.bz2
REST speakers controller, cganges in locale files
Diffstat (limited to 'config')
-rw-r--r--config/locales/en.yml4
-rw-r--r--config/locales/ru.yml14
2 files changed, 9 insertions, 9 deletions
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 34906af..e7013f5 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -3,12 +3,12 @@ en:
attributes:
discussion:
recipient_tokens: "Recipients"
- views:
+ inboxes:
speakers:
added: "Speaker was added to discussion"
removed: "Speaker was removed from discussion"
discussions:
started: "Discussion started"
- leaved: "You leaved discussion"
+ leaved: "You leaved the discussion"
exists: "Discussion between you and %{user} already exists"
can_not_participate: "You are not listed in this discussion" \ No newline at end of file
diff --git a/config/locales/ru.yml b/config/locales/ru.yml
index cc4844e..f0e4f04 100644
--- a/config/locales/ru.yml
+++ b/config/locales/ru.yml
@@ -5,12 +5,12 @@ ru:
recipient_tokens: "Получатели"
message:
body: "Сообщение"
- views:
+ inboxes:
discussions:
- started: "Чат начат."
- leaved: "Вы покинули дискуссию."
- exists: "Дискуссия между вами и %{user} уже существует."
- can_not_participate: "Вы не состоите в этой дискуссии."
+ started: "Чат начат"
+ leaved: "Вы покинули дискуссию"
+ exists: "Дискуссия между вами и %{user} уже существует"
+ can_not_participate: "Вы не состоите в этой дискуссии"
speakers:
- added: "Участник дискуссии добавлен."
- removed: "Участник дискуссии удален." \ No newline at end of file
+ added: "Участник дискуссии добавлен"
+ removed: "Участник дискуссии удален" \ No newline at end of file