commontator 5.1.0 → 6.0.0.pre.1

data/config/locales/de.yml

@@ -1,24 +1,3 @@
-# Files in the config/locales directory are used for internationalization
-# and are automatically loaded by Rails. If you want to use locales other
-# than English, add the necessary files in this directory.
-#
-# To use the locales, use `I18n.t`:
-#
-#     I18n.t 'hello'
-#
-# In views, this is aliased to just `t`:
-#
-#     <%= t('hello') %>
-#
-# To use a different locale, set it with `I18n.locale`:
-#
-#     I18n.locale = :es
-#
-# This would use the information in config/locales/es.yml.
-#
-# To learn more, please read the Rails Internationalization guide
-# available at http://guides.rubyonrails.org/i18n.html.
-
 ---
 de:
   activerecord:
@@ -48,53 +27,54 @@ de:
     comment:
       actions:
         cancel: Abbrechen
-        confirm_delete: "Sind Sie sicher, dass sie diesen Kommentar löschen wollen?"
-        create: "Kommentar speichern"
+        confirm_delete: Sind Sie sicher, dass sie diesen Kommentar löschen wollen?
+        create: Kommentar speichern
         delete: Löschen
         edit: Bearbeiten
-        new: "Neuer Kommentar"
+        new: Neuer Kommentar
         undelete: Löschen rückgängig
-        update: "Kommentar bearbeiten"
+        update: Kommentar bearbeiten
+        reply: Auf Kommentar antworten.
       errors:
-        already_deleted: "Dieser Kommentar wurde bereits gelöscht."
+        already_deleted: Dieser Kommentar wurde bereits gelöscht.
         create: "Kommentar kann nicht veröffentlicht werden:"
-        double_posted: "Kommentar ist ein Duplikat."
-        not_deleted: "Dieser Kommentar wurde nicht gelöscht.."
+        double_posted: Kommentar ist ein Duplikat.
+        not_deleted: Dieser Kommentar wurde nicht gelöscht..
         update: "Kommentar kann nicht bearbeitet werden:"
       status:
-        created_at: "Veröffentlich am %{created_at}."
-        deleted_by: "Kommentar gelöscht von %{deleter_name}."
-        updated_at: "Bearbeitet von %{editor_name} am %{updated_at}."
+        created_at: Veröffentlich am %{created_at}.
+        deleted_by: Kommentar gelöscht von %{deleter_name}.
+        updated_at: Bearbeitet von %{editor_name} am %{updated_at}.
+      replying: "%{creator_name} Antworten"
     email:
       comment_created:
         body: "%{creator_name} kommentierte zu %{commontable_name}:"
         subject: "%{creator_name} veröffentlichte einen Kommentar zu %{commontable_name}"
-      thread_link_html: "<a href=\"%{comment_url}\">Hier klicken</a> um alle Kommentare zu %{commontable_name} zu sehen."
-    require_login: "Sie müssen sich anmelden bevor sie einen Kommentar veröffentlichen können."
+      thread_link_html: <a href="%{comment_url}">Hier klicken</a> um alle Kommentare zu %{commontable_name} zu sehen.
+    require_login: Sie müssen sich anmelden bevor sie einen Kommentar veröffentlichen können.
     subscription:
       actions:
-        confirm_unsubscribe: "Sind Sie sicher, dass sie keine Nachrichten mehr zur Diskussion erhalten möchten?"
         subscribe: Subscribe
         unsubscribe: Unsubscribe
       errors:
-        already_subscribed: "Sie erhalten zu der Diskussion bereits Aktualisierungen"
-        not_subscribed: "Sie erhalten zu der Diskussion keine Nachrichten."
+        already_subscribed: Sie erhalten zu der Diskussion bereits Aktualisierungen
+        not_subscribed: Sie erhalten zu der Diskussion keine Nachrichten.
     thread:
       actions:
-        show_all: "Alle Kommentare anzeigen"
-        filter: "Kommentare filtern"
-        close: "Diskussion beenden"
-        confirm_close: "Sind Sie sicher, dass sie die Diskussion schliessen wollen?"
-        reopen: "Diskussion wieder eröffnen"
-        show: "Kommentare anzeigen"
-        hide: "Kommentare ausblenden"
+        show_all: Alle Kommentare anzeigen
+        filter: Kommentare filtern
+        close: Diskussion beenden
+        confirm_close: Sind Sie sicher, dass sie die Diskussion schliessen wollen?
+        reopen: Diskussion wieder eröffnen
+        show: Kommentare anzeigen
+        hide: Kommentare ausblenden
       errors:
-        already_closed: "Diese Diskussion ist bereits geschlossen."
-        not_closed: "Diese Diskussion ist nicht geschlossen."
+        already_closed: Diese Diskussion ist bereits geschlossen.
+        not_closed: Diese Diskussion ist nicht geschlossen.
       status:
-        cannot_post: "Zurzeit können keine neuen Kommentare verfasst werden."
-        closed: "Kommentare (geschlossen von %{closer_name})"
+        cannot_post: Zurzeit können keine neuen Kommentare verfasst werden.
+        closed: Kommentare (geschlossen von %{closer_name})
         open: Kommentare
   time:
     formats:
-      commontator: "%d. %B %Y um %H:%m %Z"
+      commontator: "%d. %B %Y um %H:%M %Z"

data/config/locales/en.yml

@@ -16,8 +16,18 @@
 #
 # This would use the information in config/locales/es.yml.
 #
+# The following keys must be escaped otherwise they will not be retrieved by
+# the default I18n backend:
+#
+# true, false, on, off, yes, no
+#
+# Instead, surround them with single quotes.
+#
+# en:
+#   'true': 'foo'
+#
 # To learn more, please read the Rails Internationalization guide
-# available at http://guides.rubyonrails.org/i18n.html.
+# available at https://guides.rubyonrails.org/i18n.html.
 
 ---
 en:
@@ -48,52 +58,53 @@ en:
     comment:
       actions:
         cancel: Cancel
-        confirm_delete: "Are you sure you want to delete this comment?"
-        create: "Post Comment"
+        confirm_delete: Are you sure you want to delete this comment?
+        create: Post Comment
         delete: Delete
         edit: Edit
-        new: "New Comment"
+        new: New Comment
         undelete: Undelete
-        update: "Modify Comment"
+        update: Modify Comment
+        reply: Reply to Comment.
       errors:
-        already_deleted: "This comment has already been deleted."
+        already_deleted: This comment has already been deleted.
         create: "This comment could not be posted because:"
-        double_posted: "is a duplicate of another comment."
-        not_deleted: "This comment is not deleted."
+        double_posted: is a duplicate of another comment.
+        not_deleted: This comment is not deleted.
         update: "This comment could not be modified because:"
       status:
-        created_at: "Posted on %{created_at}."
-        deleted_by: "Comment deleted by %{deleter_name}."
-        updated_at: "Last modified by %{editor_name} on %{updated_at}."
+        created_at: Posted on %{created_at}.
+        deleted_by: Comment deleted by %{deleter_name}.
+        updated_at: Last modified by %{editor_name} on %{updated_at}.
+      replying: Replying to %{creator_name}
     email:
       comment_created:
         body: "%{creator_name} commented on %{commontable_name}:"
         subject: "%{creator_name} posted a comment on %{commontable_name}"
-      thread_link_html: "<a href=\"%{comment_url}\">Click here</a> to view all comments on %{commontable_name}."
-    require_login: "You must login before you can post a comment."
+      thread_link_html: <a href="%{comment_url}">Click here</a> to view all comments on %{commontable_name}.
+    require_login: You must login before you can post a comment.
     subscription:
       actions:
-        confirm_unsubscribe: "Are you sure you want to unsubscribe from this discussion?"
         subscribe: Subscribe
         unsubscribe: Unsubscribe
       errors:
-        already_subscribed: "You are already subscribed to this discussion."
-        not_subscribed: "You are not subscribed to this discussion."
+        already_subscribed: You are already subscribed to this discussion.
+        not_subscribed: You are not subscribed to this discussion.
     thread:
       actions:
-        show_all: "Show All Comments"
-        filter: "Filter Comments"
-        close: "Close Discussion"
-        confirm_close: "Are you sure you want to close this discussion?"
-        reopen: "Reopen Discussion"
-        show: "Show Comments"
-        hide: "Hide Comments"
+        show_all: Show All Comments
+        filter: Filter Comments
+        close: Close Discussion
+        confirm_close: Are you sure you want to close this discussion?
+        reopen: Reopen Discussion
+        show: Show Comments
+        hide: Hide Comments
       errors:
-        already_closed: "This discussion has already been closed."
-        not_closed: "This discussion is not closed."
+        already_closed: This discussion has already been closed.
+        not_closed: This discussion is not closed.
       status:
-        cannot_post: "New comments cannot be posted at this time."
-        closed: "Comments (Closed by %{closer_name})"
+        cannot_post: New comments cannot be posted at this time.
+        closed: Comments (Closed by %{closer_name})
         open: Comments
   time:
     formats:

data/config/locales/pt-BR.yml

@@ -1,3 +1,4 @@
+---
 pt-BR:
   activerecord:
     attributes:
@@ -26,53 +27,54 @@ pt-BR:
     comment:
       actions:
         cancel: Cancelar
-        confirm_delete: "Tem certeza que deseja remover esse comentário?"
-        create: "Postar comentário"
+        confirm_delete: Tem certeza que deseja remover este comentário?
+        create: Postar comentário
         delete: Deletar
         edit: Editar
-        new: "Novo comentário"
+        new: Novo comentário
         undelete: Desfazer
-        update: "Editar comentário"
+        update: Editar comentário
+        reply: Responder ao comentário.
       errors:
-        already_deleted: "esse comentário já foi removido."
-        create: "Esse comentário não pôde ser postado porque:"
-        double_posted: "é um comentário duplicado."
-        not_deleted: "Esse comentário não foi removido."
-        update: "Esse comentário não pôde ser editado porque:"
+        already_deleted: Este comentário já foi removido.
+        create: "Este comentário não pôde ser postado porque:"
+        double_posted: é um comentário duplicado.
+        not_deleted: Este comentário não foi removido.
+        update: "Este comentário não pôde ser editado porque:"
       status:
-        created_at: "Postado em %{created_at}."
-        deleted_by: "Comentário removido por %{deleter_name}."
-        updated_at: "Última edição por %{editor_name} em %{updated_at}."
+        created_at: Postado em %{created_at}.
+        deleted_by: Comentário removido por %{deleter_name}.
+        updated_at: Editado por %{editor_name} em %{updated_at}.
+      replying: Respondendo a %{creator_name}
     email:
       comment_created:
         body: "%{creator_name} comentou em %{commontable_name}:"
         subject: "%{creator_name} postou um comentário em %{commontable_name}"
-      thread_link_html: "<a href=\"%{comment_url}\">Clique aqui</a> para ver todos os comentários em %{commontable_name}."
-    require_login: "Você deve fazer login para postar um comentário."
+      thread_link_html: <a href="%{comment_url}">Clique aqui</a> para ver todos os comentários em %{commontable_name}.
+    require_login: Você deve fazer login para postar um comentário.
     subscription:
       actions:
-        confirm_unsubscribe: "Tem certeza que deseja cancelar sua inscrição nessa discussão?"
         subscribe: Inscrever-se
         unsubscribe: Cancelar inscrição
       errors:
-        already_subscribed: "Você já está inscrito nessa discussão."
-        not_subscribed: "Você não está inscrito nessa discussão."
+        already_subscribed: Você já está inscrito nessa discussão.
+        not_subscribed: Você não está inscrito nessa discussão.
     thread:
       actions:
-        show_all: "Mostrar todos os comentários"
-        filter: "Filtrar comentários"
-        close: "Fechar discussão"
-        confirm_close: "Tem certeza que deseja fechar a discussão?"
-        reopen: "Reabrir discussão"
-        show: "Mostrar comentários"
-        hide: "Esconder comentários"
+        show_all: Mostrar todos os comentários
+        filter: Filtrar comentários
+        close: Fechar discussão
+        confirm_close: Tem certeza que deseja fechar a discussão?
+        reopen: Reabrir discussão
+        show: Mostrar comentários
+        hide: Esconder comentários
       errors:
-        already_closed: "Essa discussão já foi fechada."
-        not_closed: "Essa discussão não está fechada."
+        already_closed: Essa discussão já foi fechada.
+        not_closed: Essa discussão não está fechada.
       status:
-        cannot_post: "Não é possível postar novos comentários."
-        closed: "Comentários (Fechado por %{closer_name})"
+        cannot_post: Não é possível postar novos comentários.
+        closed: Comentários (Fechado por %{closer_name})
         open: Comentários
   time:
     formats:
-      commontator: "%b %d %Y às %I:%M%p %Z"
+      commontator: "%d de %B de %Y às %H:%M %Z"

data/config/locales/ru.yml

@@ -1,3 +1,4 @@
+---
 ru:
   activerecord:
     attributes:
@@ -14,65 +15,69 @@ ru:
     models:
       commontator/comment:
         one: комментарий
+        many: комментарии
         other: комментарии
       commontator/subscription:
         one: подписка
+        many: подписки
         other: подписки
       commontator/thread:
         one: обсуждение
+        many: обсуждения
         other: обсуждения
   commontator:
     anonymous: Аноним
     comment:
       actions:
         cancel: Отменить
-        confirm_delete: "Вы уверены, что хотите удалить комментарий?"
-        create: "Оставить Комментарий"
+        confirm_delete: Вы уверены, что хотите удалить комментарий?
+        create: Оставить Комментарий
         delete: Удалить
         edit: Редактировать
-        new: "Новый Комментарий"
+        new: Новый Комментарий
         undelete: Восстановить
-        update: "Изменить Комментарий"
+        update: Изменить Комментарий
+        reply: Ответить на Комментарий.
       errors:
-        already_deleted: "Этот комментарий был удален."
-        create: "Комментарий нельзя оставить потому что"
-        double_posted: "этот комментарий уже есть."
-        not_deleted: "Этот комментарий не удален."
-        update: "Этот комментарий нельзя изменить потому что"
+        already_deleted: Этот комментарий был удален.
+        create: Комментарий нельзя оставить потому что
+        double_posted: этот комментарий уже есть.
+        not_deleted: Этот комментарий не удален.
+        update: Этот комментарий нельзя изменить потому что
       status:
-        created_at: "Создан %{created_at}."
-        deleted_by: "Комментарий был удален %{deleter_name}."
-        updated_at: "Редактировал %{editor_name}, %{updated_at}."
+        created_at: Создан %{created_at}.
+        deleted_by: Комментарий был удален %{deleter_name}.
+        updated_at: Редактировал %{editor_name}, %{updated_at}.
+      replying: Отвечая %{creator_name}
     email:
       comment_created:
         body: "%{creator_name} комментировал %{commontable_name}:"
         subject: "%{creator_name} оставил комментарий к %{commontable_name}"
-      thread_link_html: "<a href=\"%{comment_url}\">Нажмите здесь</a> чтобы посмотреть все комментарии к %{commontable_name}."
-    require_login: "Вы должны залогиниться прежде чем оставить комментарий."
+      thread_link_html: <a href="%{comment_url}">Нажмите здесь</a> чтобы посмотреть все комментарии к %{commontable_name}.
+    require_login: Вы должны залогиниться прежде чем оставить комментарий.
     subscription:
       actions:
-        confirm_unsubscribe: "Вы уверены, что хотите отписать от обсуждения?"
         subscribe: Подписаться
         unsubscribe: Отписаться
       errors:
-        already_subscribed: "Вы уже подписаны на это обсуждение."
-        not_subscribed: "Вы не подписаны на это обсуждение."
+        already_subscribed: Вы уже подписаны на это обсуждение.
+        not_subscribed: Вы не подписаны на это обсуждение.
     thread:
       actions:
-        show_all: "Показать все комментарии"
-        filter: "Фильтровать комментарии"
-        close: "Закрыть обсуждение"
-        confirm_close: "Вы уверены, что хотите закрыть обсуждение?"
-        reopen: "Открыть заново обсуждение"
-        show: "Показать комментарии"
-        hide: "скрыть комментарии"
+        show_all: Показать все комментарии
+        filter: Фильтровать комментарии
+        close: Закрыть обсуждение
+        confirm_close: Вы уверены, что хотите закрыть обсуждение?
+        reopen: Открыть заново обсуждение
+        show: Показать комментарии
+        hide: скрыть комментарии
       errors:
-        already_closed: "Это обсуждение было закрыто."
-        not_closed: "Это обсуждение не закрыто."
+        already_closed: Это обсуждение было закрыто.
+        not_closed: Это обсуждение не закрыто.
       status:
-        cannot_post: "Новый комментарии нельзя разместить в данный момент."
-        closed: "Комментарии (Закрыты %{closer_name})"
+        cannot_post: Новый комментарии нельзя разместить в данный момент.
+        closed: Комментарии (Закрыты %{closer_name})
         open: Комментарии
   time:
     formats:
-      commontator: "%b %d %Y в %I:%M%p %Z"
+      commontator: "%d %b %Y в %H:%M %Z"

data/config/locales/zh.yml

@@ -1,78 +1,95 @@
-zh:
+---
+zh: &zh
   activerecord:
     attributes:
       commontator/comment:
-        body: "留言"
-        creator: "留言者"
-        editor: "編輯"
-        thread: "討論"
+        body: 留言
+        creator: 留言者
+        editor: 編輯
+        thread: 討論
       commontator/subscription:
-        subscriber: "訂閱者"
-        thread: "討論"
+        subscriber: 訂閱者
+        thread: 討論
       commontator/thread:
-        commontable: "可以留言"
+        commontable: 可以留言
     models:
       commontator/comment:
-        one: "留言"
-        other: "留言"
+        one: 留言
+        other: 留言
       commontator/subscription:
-        one: "訂閱"
-        other: "訂閱"
+        one: 訂閱
+        other: 訂閱
       commontator/thread:
-        one: "討論"
-        other: "討論"
+        one: 討論
+        other: 討論
   commontator:
-    anonymous: "匿名"
+    anonymous: 匿名
     comment:
       actions:
-        cancel: "取消"
-        confirm_delete: "確定要刪除這筆留言嗎？"
-        create: "發佈"
-        delete: "刪除"
-        edit: "編輯"
-        new: "新留言"
-        undelete: "未刪除"
-        update: "修改留言"
+        cancel: 取消
+        confirm_delete: 確定要刪除這筆留言嗎？
+        create: 發佈
+        delete: 刪除
+        edit: 編輯
+        new: 新留言
+        undelete: 未刪除
+        update: 修改留言
+        reply: 回复评论
       errors:
-        already_deleted: "此留言已經被刪除了"
+        already_deleted: 此留言已經被刪除了
         create: "此留言無法發佈因為:"
-        double_posted: "已經有一筆相同的留言。"
-        not_deleted: "此留言未被刪除"
+        double_posted: 已經有一筆相同的留言。
+        not_deleted: 此留言未被刪除
         update: "此留言無法被修改因為:"
       status:
-        created_at: "於%{created_at}發佈"
-        deleted_by: "被%{deleter_name}刪除"
-        updated_at: "最在於%{updated_at}被%{editor_name}修改"
+        created_at: 於%{created_at}發佈
+        deleted_by: 被%{deleter_name}刪除
+        updated_at: 最在於%{updated_at}被%{editor_name}修改
+      replying: 回复%{creator_name}
     email:
       comment_created:
         body: "%{creator_name}留言於%{commontable_name}"
         subject: "%{creator_name}於%{commontable_name}發佈了一則留言"
-      thread_link_html: "<a href=\"%{comment_url}\">點此處</a>看%{commontable_name}的所有留言"
-    require_login: "你需要先登入"
+      thread_link_html: <a href="%{comment_url}">點此處</a>看%{commontable_name}的所有留言
+    require_login: 你需要先登入
     subscription:
       actions:
-        confirm_unsubscribe: "你確定要去取消訂閱此則討論嗎？"
-        subscribe: "訂閱"
-        unsubscribe: "取消訂閱"
+        subscribe: 訂閱
+        unsubscribe: 取消訂閱
       errors:
-        already_subscribed: "你已經訂閱過了"
-        not_subscribed: "你沒有訂閱過"
+        already_subscribed: 你已經訂閱過了
+        not_subscribed: 你沒有訂閱過
     thread:
       actions:
-        show_all: "列出所有留言"
-        filter: "過濾留言"
-        close: "關閉討論"
-        confirm_close: "你確定要關閉此討論嗎？?"
-        reopen: "回復討論"
-        show: "打開留言"
-        hide: "关闭留言"
+        show_all: 列出所有留言
+        filter: 過濾留言
+        close: 關閉討論
+        confirm_close: 你確定要關閉此討論嗎？
+        reopen: 回復討論
+        show: 打開留言
+        hide: 关闭留言
       errors:
-        already_closed: "此討論已經被關閉"
-        not_closed: "此討論尚未被關閉"
+        already_closed: 此討論已經被關閉
+        not_closed: 此討論尚未被關閉
       status:
-        cannot_post: "現在還不能發佈"
-        closed: "留言已經被%{closer_name}關閉"
+        cannot_post: 現在還不能發佈
+        closed: 留言已經被%{closer_name}關閉
         open: 留言
   time:
     formats:
-      commontator: "%b %d %Y 於 %I:%M%p %Z"
+      commontator: "%Y年%m月%d日 於 %H:%M %Z"
+
+zh-CN:
+  <<: *zh
+
+zh-HK:
+  <<: *zh
+
+zh-TW:
+  <<: *zh
+
+zh-YUE:
+  <<: *zh
+  time:
+    formats:
+      commontator: "%Y年%m月%d號 於 %H:%M %Z"